main
This commit is contained in:
@@ -1,6 +1,7 @@
|
||||
package `in`.sminnovations.attendanceapp
|
||||
package `in`.sminnovations.attendanceapp.main
|
||||
|
||||
import android.os.Bundle
|
||||
import android.view.WindowManager
|
||||
import androidx.activity.ComponentActivity
|
||||
import androidx.activity.compose.setContent
|
||||
import androidx.activity.enableEdgeToEdge
|
||||
@@ -8,15 +9,15 @@ import dagger.hilt.android.AndroidEntryPoint
|
||||
import `in`.sminnovations.attendanceapp.ui.theme.SMIAttendanceTheme
|
||||
|
||||
@AndroidEntryPoint
|
||||
class MainActivity : ComponentActivity() {
|
||||
class MainAppActivity : ComponentActivity() {
|
||||
override fun onCreate(savedInstanceState: Bundle?) {
|
||||
super.onCreate(savedInstanceState)
|
||||
window.addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON)
|
||||
enableEdgeToEdge()
|
||||
setContent {
|
||||
SMIAttendanceTheme {
|
||||
AppNavigation()
|
||||
MainScreen()
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
@@ -1,11 +1,10 @@
|
||||
package `in`.sminnovations.attendanceapp
|
||||
package `in`.sminnovations.attendanceapp.main
|
||||
|
||||
import androidx.compose.foundation.layout.Box
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.material3.Scaffold
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.navigation.NavController
|
||||
import androidx.navigation.compose.rememberNavController
|
||||
import `in`.sminnovations.attendanceapp.navigation.BottomNavigationBar
|
||||
import `in`.sminnovations.attendanceapp.navigation.Navigation
|
||||
@@ -14,7 +13,6 @@ import `in`.sminnovations.attendanceapp.navigation.data.navItems
|
||||
|
||||
@Composable
|
||||
fun MainScreen(
|
||||
mainNavController: NavController
|
||||
) {
|
||||
val navController = rememberNavController()
|
||||
Scaffold(
|
||||
@@ -23,7 +21,7 @@ fun MainScreen(
|
||||
},
|
||||
content = { padding ->
|
||||
Box(modifier = Modifier.padding(padding)) {
|
||||
Navigation(navController = navController, mainNavHostController = mainNavController, items = navItems)
|
||||
Navigation(navController = navController, items = navItems)
|
||||
}
|
||||
}
|
||||
)
|
||||
Reference in New Issue
Block a user