From 814f9c5c483fe55e7e520837dbc3cbad08e19929 Mon Sep 17 00:00:00 2001 From: sathwikcs <85106054+sathwikcs@users.noreply.github.com> Date: Wed, 23 Oct 2024 23:21:59 +0530 Subject: [PATCH] main --- .../{MainActivity.kt => main/MainAppActivity.kt} | 11 ++++++----- .../attendanceapp/{ => main}/MainScreen.kt | 6 ++---- 2 files changed, 8 insertions(+), 9 deletions(-) rename app/src/main/java/in/sminnovations/attendanceapp/{MainActivity.kt => main/MainAppActivity.kt} (68%) rename app/src/main/java/in/sminnovations/attendanceapp/{ => main}/MainScreen.kt (76%) diff --git a/app/src/main/java/in/sminnovations/attendanceapp/MainActivity.kt b/app/src/main/java/in/sminnovations/attendanceapp/main/MainAppActivity.kt similarity index 68% rename from app/src/main/java/in/sminnovations/attendanceapp/MainActivity.kt rename to app/src/main/java/in/sminnovations/attendanceapp/main/MainAppActivity.kt index cc08f53..d76f236 100644 --- a/app/src/main/java/in/sminnovations/attendanceapp/MainActivity.kt +++ b/app/src/main/java/in/sminnovations/attendanceapp/main/MainAppActivity.kt @@ -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() } } } -} - +} \ No newline at end of file diff --git a/app/src/main/java/in/sminnovations/attendanceapp/MainScreen.kt b/app/src/main/java/in/sminnovations/attendanceapp/main/MainScreen.kt similarity index 76% rename from app/src/main/java/in/sminnovations/attendanceapp/MainScreen.kt rename to app/src/main/java/in/sminnovations/attendanceapp/main/MainScreen.kt index ea8f018..6d18625 100644 --- a/app/src/main/java/in/sminnovations/attendanceapp/MainScreen.kt +++ b/app/src/main/java/in/sminnovations/attendanceapp/main/MainScreen.kt @@ -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) } } )