diff --git a/app/src/main/java/com/ericampire/android/androidstudycase/app/AppNavigation.kt b/app/src/main/java/com/ericampire/android/androidstudycase/app/AppNavigation.kt index 22c8c63..3bfbd04 100644 --- a/app/src/main/java/com/ericampire/android/androidstudycase/app/AppNavigation.kt +++ b/app/src/main/java/com/ericampire/android/androidstudycase/app/AppNavigation.kt @@ -6,7 +6,6 @@ import androidx.navigation.NavGraphBuilder import androidx.navigation.compose.composable 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.login.ui.LoginScreen import com.ericampire.android.androidstudycase.presentation.screen.preview.ui.PreviewScreen import com.ericampire.android.androidstudycase.util.Destination 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 fun NavGraphBuilder.addPreviewScreen(navController: NavController) { composable(Destination.Preview.route) { diff --git a/app/src/main/java/com/ericampire/android/androidstudycase/presentation/screen/login/business/LoginViewModel.kt b/app/src/main/java/com/ericampire/android/androidstudycase/presentation/screen/login/business/LoginViewModel.kt deleted file mode 100644 index 6abead9..0000000 --- a/app/src/main/java/com/ericampire/android/androidstudycase/presentation/screen/login/business/LoginViewModel.kt +++ /dev/null @@ -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() { -} \ No newline at end of file diff --git a/app/src/main/java/com/ericampire/android/androidstudycase/presentation/screen/login/ui/LoginScreen.kt b/app/src/main/java/com/ericampire/android/androidstudycase/presentation/screen/login/ui/LoginScreen.kt deleted file mode 100644 index 8c863ee..0000000 --- a/app/src/main/java/com/ericampire/android/androidstudycase/presentation/screen/login/ui/LoginScreen.kt +++ /dev/null @@ -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, -) { - -} \ No newline at end of file diff --git a/app/src/main/java/com/ericampire/android/androidstudycase/presentation/screen/main/ui/MainScreen.kt b/app/src/main/java/com/ericampire/android/androidstudycase/presentation/screen/main/ui/MainScreen.kt index 97e3318..ac71275 100644 --- a/app/src/main/java/com/ericampire/android/androidstudycase/presentation/screen/main/ui/MainScreen.kt +++ b/app/src/main/java/com/ericampire/android/androidstudycase/presentation/screen/main/ui/MainScreen.kt @@ -19,7 +19,6 @@ import androidx.navigation.compose.currentBackStackEntryAsState import androidx.navigation.compose.rememberNavController import com.ericampire.android.androidstudycase.app.addExploreScreen 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.util.Destination import com.google.accompanist.insets.navigationBarsPadding @@ -88,7 +87,6 @@ fun MainScreen() { addHomeScreen(navController = navController) addPreviewScreen(navController = navController) addExploreScreen(navController = navController) - addLoginScreen(navController = navController) } ) }, diff --git a/app/src/main/java/com/ericampire/android/androidstudycase/presentation/theme/Theme.kt b/app/src/main/java/com/ericampire/android/androidstudycase/presentation/theme/Theme.kt index 31df401..48636b6 100644 --- a/app/src/main/java/com/ericampire/android/androidstudycase/presentation/theme/Theme.kt +++ b/app/src/main/java/com/ericampire/android/androidstudycase/presentation/theme/Theme.kt @@ -10,7 +10,7 @@ import com.google.accompanist.insets.ProvideWindowInsets private val DarkColorPalette = darkColors( primary = AppColor.PrimaryColor, - primaryVariant = AppColor.Purple700, + primaryVariant = AppColor.PrimaryColor, secondary = AppColor.Teal200, background = Color.Black, surface = Color.Black, @@ -22,7 +22,7 @@ private val DarkColorPalette = darkColors( private val LightColorPalette = lightColors( primary = AppColor.PrimaryColorDark, - primaryVariant = AppColor.Purple700, + primaryVariant = AppColor.PrimaryColor, secondary = AppColor.Teal200, background = Color.White, surface = Color.White, diff --git a/util/src/main/java/com/ericampire/android/androidstudycase/util/usecase/FlowUseCase.kt b/util/src/main/java/com/ericampire/android/androidstudycase/util/usecase/FlowUseCase.kt index 8b97919..5aedac4 100644 --- a/util/src/main/java/com/ericampire/android/androidstudycase/util/usecase/FlowUseCase.kt +++ b/util/src/main/java/com/ericampire/android/androidstudycase/util/usecase/FlowUseCase.kt @@ -5,7 +5,6 @@ import kotlinx.coroutines.CoroutineDispatcher import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.catch 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 @@ -14,7 +13,6 @@ import kotlinx.coroutines.flow.onStart */ abstract class FlowUseCase(private val coroutineDispatcher: CoroutineDispatcher) { operator fun invoke(parameters: P): Flow> = execute(parameters) - .onStart { emit(Result.Loading) } .catch { e -> emit(Result.Error(Exception(e))) } .flowOn(coroutineDispatcher)