Removing LoginScreen to the navigation graph
This commit is contained in:
@@ -6,7 +6,6 @@ import androidx.navigation.NavGraphBuilder
|
|||||||
import androidx.navigation.compose.composable
|
import androidx.navigation.compose.composable
|
||||||
import com.ericampire.android.androidstudycase.presentation.screen.explore.ui.ExploreScreen
|
import com.ericampire.android.androidstudycase.presentation.screen.explore.ui.ExploreScreen
|
||||||
import com.ericampire.android.androidstudycase.presentation.screen.home.ui.HomeScreen
|
import com.ericampire.android.androidstudycase.presentation.screen.home.ui.HomeScreen
|
||||||
import com.ericampire.android.androidstudycase.presentation.screen.login.ui.LoginScreen
|
|
||||||
import com.ericampire.android.androidstudycase.presentation.screen.preview.ui.PreviewScreen
|
import com.ericampire.android.androidstudycase.presentation.screen.preview.ui.PreviewScreen
|
||||||
import com.ericampire.android.androidstudycase.util.Destination
|
import com.ericampire.android.androidstudycase.util.Destination
|
||||||
import com.google.accompanist.pager.ExperimentalPagerApi
|
import com.google.accompanist.pager.ExperimentalPagerApi
|
||||||
@@ -27,14 +26,6 @@ fun NavGraphBuilder.addExploreScreen(navController: NavController) {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@ExperimentalMaterialApi
|
|
||||||
@ExperimentalPagerApi
|
|
||||||
fun NavGraphBuilder.addLoginScreen(navController: NavController) {
|
|
||||||
composable(Destination.Login.route) {
|
|
||||||
LoginScreen(navController = navController)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
@ExperimentalPermissionsApi
|
@ExperimentalPermissionsApi
|
||||||
fun NavGraphBuilder.addPreviewScreen(navController: NavController) {
|
fun NavGraphBuilder.addPreviewScreen(navController: NavController) {
|
||||||
composable(Destination.Preview.route) {
|
composable(Destination.Preview.route) {
|
||||||
|
|||||||
-10
@@ -1,10 +0,0 @@
|
|||||||
package com.ericampire.android.androidstudycase.presentation.screen.login.business
|
|
||||||
|
|
||||||
import androidx.lifecycle.ViewModel
|
|
||||||
import com.ericampire.android.androidstudycase.domain.usecase.SaveUserUseCase
|
|
||||||
import javax.inject.Inject
|
|
||||||
|
|
||||||
class LoginViewModel @Inject constructor(
|
|
||||||
private val saveUserUseCase: SaveUserUseCase
|
|
||||||
) : ViewModel() {
|
|
||||||
}
|
|
||||||
-11
@@ -1,11 +0,0 @@
|
|||||||
package com.ericampire.android.androidstudycase.presentation.screen.login.ui
|
|
||||||
|
|
||||||
import androidx.compose.runtime.Composable
|
|
||||||
import androidx.navigation.NavController
|
|
||||||
|
|
||||||
@Composable
|
|
||||||
fun LoginScreen(
|
|
||||||
navController: NavController,
|
|
||||||
) {
|
|
||||||
|
|
||||||
}
|
|
||||||
-2
@@ -19,7 +19,6 @@ import androidx.navigation.compose.currentBackStackEntryAsState
|
|||||||
import androidx.navigation.compose.rememberNavController
|
import androidx.navigation.compose.rememberNavController
|
||||||
import com.ericampire.android.androidstudycase.app.addExploreScreen
|
import com.ericampire.android.androidstudycase.app.addExploreScreen
|
||||||
import com.ericampire.android.androidstudycase.app.addHomeScreen
|
import com.ericampire.android.androidstudycase.app.addHomeScreen
|
||||||
import com.ericampire.android.androidstudycase.app.addLoginScreen
|
|
||||||
import com.ericampire.android.androidstudycase.app.addPreviewScreen
|
import com.ericampire.android.androidstudycase.app.addPreviewScreen
|
||||||
import com.ericampire.android.androidstudycase.util.Destination
|
import com.ericampire.android.androidstudycase.util.Destination
|
||||||
import com.google.accompanist.insets.navigationBarsPadding
|
import com.google.accompanist.insets.navigationBarsPadding
|
||||||
@@ -88,7 +87,6 @@ fun MainScreen() {
|
|||||||
addHomeScreen(navController = navController)
|
addHomeScreen(navController = navController)
|
||||||
addPreviewScreen(navController = navController)
|
addPreviewScreen(navController = navController)
|
||||||
addExploreScreen(navController = navController)
|
addExploreScreen(navController = navController)
|
||||||
addLoginScreen(navController = navController)
|
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
},
|
},
|
||||||
|
|||||||
+2
-2
@@ -10,7 +10,7 @@ import com.google.accompanist.insets.ProvideWindowInsets
|
|||||||
|
|
||||||
private val DarkColorPalette = darkColors(
|
private val DarkColorPalette = darkColors(
|
||||||
primary = AppColor.PrimaryColor,
|
primary = AppColor.PrimaryColor,
|
||||||
primaryVariant = AppColor.Purple700,
|
primaryVariant = AppColor.PrimaryColor,
|
||||||
secondary = AppColor.Teal200,
|
secondary = AppColor.Teal200,
|
||||||
background = Color.Black,
|
background = Color.Black,
|
||||||
surface = Color.Black,
|
surface = Color.Black,
|
||||||
@@ -22,7 +22,7 @@ private val DarkColorPalette = darkColors(
|
|||||||
|
|
||||||
private val LightColorPalette = lightColors(
|
private val LightColorPalette = lightColors(
|
||||||
primary = AppColor.PrimaryColorDark,
|
primary = AppColor.PrimaryColorDark,
|
||||||
primaryVariant = AppColor.Purple700,
|
primaryVariant = AppColor.PrimaryColor,
|
||||||
secondary = AppColor.Teal200,
|
secondary = AppColor.Teal200,
|
||||||
background = Color.White,
|
background = Color.White,
|
||||||
surface = Color.White,
|
surface = Color.White,
|
||||||
|
|||||||
@@ -5,7 +5,6 @@ import kotlinx.coroutines.CoroutineDispatcher
|
|||||||
import kotlinx.coroutines.flow.Flow
|
import kotlinx.coroutines.flow.Flow
|
||||||
import kotlinx.coroutines.flow.catch
|
import kotlinx.coroutines.flow.catch
|
||||||
import kotlinx.coroutines.flow.flowOn
|
import kotlinx.coroutines.flow.flowOn
|
||||||
import kotlinx.coroutines.flow.onStart
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Executes business logic in its execute method and keep posting updates to the result as
|
* Executes business logic in its execute method and keep posting updates to the result as
|
||||||
@@ -14,7 +13,6 @@ import kotlinx.coroutines.flow.onStart
|
|||||||
*/
|
*/
|
||||||
abstract class FlowUseCase<in P, R>(private val coroutineDispatcher: CoroutineDispatcher) {
|
abstract class FlowUseCase<in P, R>(private val coroutineDispatcher: CoroutineDispatcher) {
|
||||||
operator fun invoke(parameters: P): Flow<Result<R>> = execute(parameters)
|
operator fun invoke(parameters: P): Flow<Result<R>> = execute(parameters)
|
||||||
.onStart { emit(Result.Loading) }
|
|
||||||
.catch { e -> emit(Result.Error(Exception(e))) }
|
.catch { e -> emit(Result.Error(Exception(e))) }
|
||||||
.flowOn(coroutineDispatcher)
|
.flowOn(coroutineDispatcher)
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user