Browse Source

@fun: home to main

bai 3 years ago
parent
commit
6c61bfa258

+ 2 - 2
app/src/main/java/com/ys/bdtp/adm/App.kt

@@ -9,7 +9,7 @@ import androidx.compose.ui.platform.LocalContext
 import com.google.accompanist.insets.ProvideWindowInsets
 import com.google.accompanist.systemuicontroller.rememberSystemUiController
 import com.ys.bdtp.adm.app.theme.AdmTheme
-import com.ys.bdtp.adm.mvvm.ui.screen.home.Home
+import com.ys.bdtp.adm.mvvm.ui.screen.main.Main
 import org.kodein.di.compose.onDIContext
 
 @Composable
@@ -33,7 +33,7 @@ fun App() = onDIContext(LocalContext.current) {
                 }
                 //LoginScreen()
                 //MainScreen()
-                Home()
+                Main()
             }
         }
     }

+ 2 - 2
app/src/main/java/com/ys/bdtp/adm/mvvm/ui/screen/flash/Flash.kt

@@ -19,8 +19,8 @@ import com.ys.bdtp.adm.R
 import com.ys.bdtp.adm.app.Token
 import com.ys.bdtp.adm.app.tools.isNet
 import com.ys.bdtp.adm.app.theme.textBlackColor
-import com.ys.bdtp.adm.mvvm.ui.screen.home.LocalNavHostController
-import com.ys.bdtp.adm.mvvm.ui.screen.home.Route
+import com.ys.bdtp.adm.mvvm.ui.screen.main.LocalNavHostController
+import com.ys.bdtp.adm.mvvm.ui.screen.main.Route
 import com.ys.bdtp.adm.mvvm.vm.flash.FlashViewModel
 import org.kodein.di.compose.rememberInstance
 import org.kodein.di.compose.rememberViewModel

+ 2 - 2
app/src/main/java/com/ys/bdtp/adm/mvvm/ui/screen/login/LoginContent.kt

@@ -23,8 +23,8 @@ import com.ys.bdtp.adm.app.theme.blueColor
 import com.ys.bdtp.adm.app.theme.grayColor
 import com.ys.bdtp.adm.app.theme.textBlackColor
 import com.ys.bdtp.adm.mvvm.model.vo.request.Login
-import com.ys.bdtp.adm.mvvm.ui.screen.home.LocalNavHostController
-import com.ys.bdtp.adm.mvvm.ui.screen.home.Route
+import com.ys.bdtp.adm.mvvm.ui.screen.main.LocalNavHostController
+import com.ys.bdtp.adm.mvvm.ui.screen.main.Route
 import com.ys.bdtp.adm.mvvm.vm.login.LoginViewModel
 import kotlinx.coroutines.launch
 import org.kodein.di.compose.rememberInstance

+ 2 - 2
app/src/main/java/com/ys/bdtp/adm/mvvm/ui/screen/home/Home.kt

@@ -1,4 +1,4 @@
-package com.ys.bdtp.adm.mvvm.ui.screen.home
+package com.ys.bdtp.adm.mvvm.ui.screen.main
 
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.CompositionLocalProvider
@@ -18,7 +18,7 @@ import com.ys.bdtp.adm.mvvm.ui.screen.task.Tasks
 val LocalNavHostController = compositionLocalOf<NavHostController?> { null }
 
 @Composable
-fun Home() {
+fun Main() {
     val navController = rememberNavController()
     CompositionLocalProvider(LocalNavHostController provides navController) {
         NavHost(navController = navController, startDestination = Route.Flash) {

+ 1 - 1
app/src/main/java/com/ys/bdtp/adm/mvvm/ui/screen/home/Route.kt

@@ -1,4 +1,4 @@
-package com.ys.bdtp.adm.mvvm.ui.screen.home
+package com.ys.bdtp.adm.mvvm.ui.screen.main
 
 /**
  * 路由对象

+ 1 - 1
app/src/main/java/com/ys/bdtp/adm/mvvm/ui/screen/offline/Offline.kt

@@ -18,7 +18,7 @@ import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import com.ys.bdtp.adm.mvvm.ui.compose.Head
 import com.ys.bdtp.adm.mvvm.ui.compose.HeadRight
-import com.ys.bdtp.adm.mvvm.ui.screen.home.LocalNavHostController
+import com.ys.bdtp.adm.mvvm.ui.screen.main.LocalNavHostController
 import com.ys.bdtp.adm.mvvm.vm.offline.OfflineViewModel
 import org.kodein.di.compose.rememberViewModel
 

+ 1 - 1
app/src/main/java/com/ys/bdtp/adm/mvvm/ui/screen/offline/OfflineHeadLeft.kt

@@ -16,7 +16,7 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import androidx.navigation.NavHostController
 import com.ys.bdtp.adm.R
-import com.ys.bdtp.adm.mvvm.ui.screen.home.LocalNavHostController
+import com.ys.bdtp.adm.mvvm.ui.screen.main.LocalNavHostController
 
 @Composable
 fun OfflineHeadLeft(nav: NavHostController) {

+ 2 - 2
app/src/main/java/com/ys/bdtp/adm/mvvm/ui/screen/project/Project.kt

@@ -15,8 +15,8 @@ import com.ys.bdtp.adm.mvvm.model.nt.SuccessResponse
 import com.ys.bdtp.adm.mvvm.model.db.entity.task.ProjectEntity
 import com.ys.bdtp.adm.mvvm.model.db.entity.UserEntity
 import com.ys.bdtp.adm.mvvm.ui.compose.*
-import com.ys.bdtp.adm.mvvm.ui.screen.home.LocalNavHostController
-import com.ys.bdtp.adm.mvvm.ui.screen.home.Route
+import com.ys.bdtp.adm.mvvm.ui.screen.main.LocalNavHostController
+import com.ys.bdtp.adm.mvvm.ui.screen.main.Route
 import com.ys.bdtp.adm.mvvm.vm.project.ProjectViewModel
 import kotlinx.coroutines.launch
 import org.kodein.di.compose.rememberInstance

+ 2 - 2
app/src/main/java/com/ys/bdtp/adm/mvvm/ui/screen/project/ProjectItem.kt

@@ -17,8 +17,8 @@ import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
 import com.ys.bdtp.adm.R
 import com.ys.bdtp.adm.mvvm.model.db.entity.task.ProjectEntity
-import com.ys.bdtp.adm.mvvm.ui.screen.home.LocalNavHostController
-import com.ys.bdtp.adm.mvvm.ui.screen.home.Route
+import com.ys.bdtp.adm.mvvm.ui.screen.main.LocalNavHostController
+import com.ys.bdtp.adm.mvvm.ui.screen.main.Route
 
 @Composable
 fun ProjectItem(project: ProjectEntity) {

+ 1 - 1
app/src/main/java/com/ys/bdtp/adm/mvvm/ui/screen/task/Task.kt

@@ -26,7 +26,7 @@ import com.ys.bdtp.adm.app.theme.underColor
 import com.ys.bdtp.adm.mvvm.model.db.entity.task.ProjectEntity
 import com.ys.bdtp.adm.mvvm.ui.compose.Head
 import com.ys.bdtp.adm.mvvm.ui.compose.HeadRight
-import com.ys.bdtp.adm.mvvm.ui.screen.home.LocalNavHostController
+import com.ys.bdtp.adm.mvvm.ui.screen.main.LocalNavHostController
 import com.ys.bdtp.adm.mvvm.vm.task.TaskViewModel
 import org.kodein.di.compose.rememberViewModel
 

+ 2 - 2
app/src/main/java/com/ys/bdtp/adm/mvvm/ui/screen/task/TaskContent.kt

@@ -14,8 +14,8 @@ import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.tooling.preview.Preview
 import androidx.compose.ui.unit.dp
 import androidx.compose.ui.unit.sp
-import com.ys.bdtp.adm.mvvm.ui.screen.home.LocalNavHostController
-import com.ys.bdtp.adm.mvvm.ui.screen.home.Route
+import com.ys.bdtp.adm.mvvm.ui.screen.main.LocalNavHostController
+import com.ys.bdtp.adm.mvvm.ui.screen.main.Route
 
 /**
  * 近期任务组件

+ 2 - 2
app/src/main/java/com/ys/bdtp/adm/mvvm/ui/screen/task/TaskSide.kt

@@ -12,8 +12,8 @@ import androidx.compose.ui.unit.dp
 import androidx.navigation.NavHostController
 import com.ys.bdtp.adm.R
 import com.ys.bdtp.adm.mvvm.ui.examine.Space3DActivity.Companion.startSpace3DActivity
-import com.ys.bdtp.adm.mvvm.ui.screen.home.LocalNavHostController
-import com.ys.bdtp.adm.mvvm.ui.screen.home.Route
+import com.ys.bdtp.adm.mvvm.ui.screen.main.LocalNavHostController
+import com.ys.bdtp.adm.mvvm.ui.screen.main.Route
 
 @Composable
 fun TaskSide(nav: NavHostController, projectId: String) {