From f733e4bf14417a9bb2ca815b407eb2d23f852d5b Mon Sep 17 00:00:00 2001 From: tdpeuter Date: Thu, 13 Apr 2023 13:18:50 +0200 Subject: [PATCH] #52 Restructuring finalised --- .../sel/studeez/common/composable/DrawerComposable.kt | 1 - .../composable}/PrimaryScreenComposable.kt | 10 +++------- ...olbarComposable.kt => SecondaryScreenComposable.kt} | 4 ++-- .../domain/implementation/FirebaseAccountDAO.kt | 2 -- .../be/ugent/sel/studeez/screens/home/HomeScreen.kt | 4 ++-- .../be/ugent/sel/studeez/screens/log_in/LoginScreen.kt | 2 +- .../ugent/sel/studeez/screens/sign_up/SignUpScreen.kt | 2 +- 7 files changed, 9 insertions(+), 16 deletions(-) rename app/src/main/java/be/ugent/sel/studeez/{screens/templates/primary_screen => common/composable}/PrimaryScreenComposable.kt (84%) rename app/src/main/java/be/ugent/sel/studeez/common/composable/{ToolbarComposable.kt => SecondaryScreenComposable.kt} (94%) diff --git a/app/src/main/java/be/ugent/sel/studeez/common/composable/DrawerComposable.kt b/app/src/main/java/be/ugent/sel/studeez/common/composable/DrawerComposable.kt index 776d96d..2a484b1 100644 --- a/app/src/main/java/be/ugent/sel/studeez/common/composable/DrawerComposable.kt +++ b/app/src/main/java/be/ugent/sel/studeez/common/composable/DrawerComposable.kt @@ -14,7 +14,6 @@ import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.res.vectorResource import androidx.compose.ui.tooling.preview.Preview import be.ugent.sel.studeez.R -import be.ugent.sel.studeez.data.local.models.User import be.ugent.sel.studeez.resources import be.ugent.sel.studeez.ui.theme.StudeezTheme diff --git a/app/src/main/java/be/ugent/sel/studeez/screens/templates/primary_screen/PrimaryScreenComposable.kt b/app/src/main/java/be/ugent/sel/studeez/common/composable/PrimaryScreenComposable.kt similarity index 84% rename from app/src/main/java/be/ugent/sel/studeez/screens/templates/primary_screen/PrimaryScreenComposable.kt rename to app/src/main/java/be/ugent/sel/studeez/common/composable/PrimaryScreenComposable.kt index 5694515..3c7eeb8 100644 --- a/app/src/main/java/be/ugent/sel/studeez/screens/templates/primary_screen/PrimaryScreenComposable.kt +++ b/app/src/main/java/be/ugent/sel/studeez/common/composable/PrimaryScreenComposable.kt @@ -1,4 +1,4 @@ -package be.ugent.sel.studeez.screens.templates.primary_screen +package be.ugent.sel.studeez.common.composable import androidx.compose.foundation.layout.PaddingValues import androidx.compose.material.* @@ -8,17 +8,13 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.ui.tooling.preview.Preview import be.ugent.sel.studeez.R -import be.ugent.sel.studeez.common.composable.CollapsedAddButton -import be.ugent.sel.studeez.common.composable.Drawer -import be.ugent.sel.studeez.common.composable.NavigationBar -import be.ugent.sel.studeez.data.local.models.User import be.ugent.sel.studeez.resources import be.ugent.sel.studeez.ui.theme.StudeezTheme import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.launch @Composable -fun PrimaryScreen( +fun PrimaryScreenTemplate( title: String, onLogoutClick: () -> Unit, content: @Composable (PaddingValues) -> Unit @@ -62,7 +58,7 @@ fun PrimaryScreen( @Composable fun PrimaryScreenPreview() { StudeezTheme { - PrimaryScreen( + PrimaryScreenTemplate( "Preview screen", {} ) {} diff --git a/app/src/main/java/be/ugent/sel/studeez/common/composable/ToolbarComposable.kt b/app/src/main/java/be/ugent/sel/studeez/common/composable/SecondaryScreenComposable.kt similarity index 94% rename from app/src/main/java/be/ugent/sel/studeez/common/composable/ToolbarComposable.kt rename to app/src/main/java/be/ugent/sel/studeez/common/composable/SecondaryScreenComposable.kt index 56320c1..5470566 100644 --- a/app/src/main/java/be/ugent/sel/studeez/common/composable/ToolbarComposable.kt +++ b/app/src/main/java/be/ugent/sel/studeez/common/composable/SecondaryScreenComposable.kt @@ -14,7 +14,7 @@ import be.ugent.sel.studeez.ui.theme.StudeezTheme @Composable // Does not contain floatingActionButton and bottom bar, used in all the other screens -fun SecondaryScreenToolbar( +fun SecondaryScreenTemplate( title: String, popUp: () -> Unit, content: @Composable (PaddingValues) -> Unit @@ -40,7 +40,7 @@ fun SecondaryScreenToolbar( @Preview @Composable fun SecondaryScreenToolbarPreview() { - StudeezTheme { SecondaryScreenToolbar( + StudeezTheme { SecondaryScreenTemplate( "Preview screen", {} ) {} } diff --git a/app/src/main/java/be/ugent/sel/studeez/domain/implementation/FirebaseAccountDAO.kt b/app/src/main/java/be/ugent/sel/studeez/domain/implementation/FirebaseAccountDAO.kt index 4067fdd..434f3ce 100644 --- a/app/src/main/java/be/ugent/sel/studeez/domain/implementation/FirebaseAccountDAO.kt +++ b/app/src/main/java/be/ugent/sel/studeez/domain/implementation/FirebaseAccountDAO.kt @@ -18,8 +18,6 @@ package be.ugent.sel.studeez.domain.implementation import be.ugent.sel.studeez.data.local.models.User import be.ugent.sel.studeez.domain.AccountDAO -import be.ugent.sel.studeez.domain.trace -import com.google.firebase.auth.EmailAuthProvider import com.google.firebase.auth.FirebaseAuth import kotlinx.coroutines.channels.awaitClose import kotlinx.coroutines.flow.Flow diff --git a/app/src/main/java/be/ugent/sel/studeez/screens/home/HomeScreen.kt b/app/src/main/java/be/ugent/sel/studeez/screens/home/HomeScreen.kt index 70f1880..d3c1275 100644 --- a/app/src/main/java/be/ugent/sel/studeez/screens/home/HomeScreen.kt +++ b/app/src/main/java/be/ugent/sel/studeez/screens/home/HomeScreen.kt @@ -5,16 +5,16 @@ import androidx.compose.ui.Modifier import androidx.hilt.navigation.compose.hiltViewModel import be.ugent.sel.studeez.R import be.ugent.sel.studeez.common.composable.BasicButton +import be.ugent.sel.studeez.common.composable.PrimaryScreenTemplate import be.ugent.sel.studeez.common.ext.basicButton import be.ugent.sel.studeez.resources -import be.ugent.sel.studeez.screens.templates.primary_screen.PrimaryScreen @Composable fun HomeScreen( openAndPopUp: (String, String) -> Unit, viewModel: HomeViewModel = hiltViewModel() ) { - PrimaryScreen( + PrimaryScreenTemplate( title = resources().getString(R.string.home), onLogoutClick = { viewModel.onLogoutClick(openAndPopUp) } ) { diff --git a/app/src/main/java/be/ugent/sel/studeez/screens/log_in/LoginScreen.kt b/app/src/main/java/be/ugent/sel/studeez/screens/log_in/LoginScreen.kt index d54ccbf..82ff679 100644 --- a/app/src/main/java/be/ugent/sel/studeez/screens/log_in/LoginScreen.kt +++ b/app/src/main/java/be/ugent/sel/studeez/screens/log_in/LoginScreen.kt @@ -27,7 +27,7 @@ fun LoginScreen( val uiState by viewModel.uiState // TODO Make this a separate kind of screen? - SecondaryScreenToolbar(title = resources().getString(AppText.sign_in), {}) { + SecondaryScreenTemplate(title = resources().getString(AppText.sign_in), {}) { Column( modifier = modifier .fillMaxWidth() diff --git a/app/src/main/java/be/ugent/sel/studeez/screens/sign_up/SignUpScreen.kt b/app/src/main/java/be/ugent/sel/studeez/screens/sign_up/SignUpScreen.kt index 473c53f..9eb9dea 100644 --- a/app/src/main/java/be/ugent/sel/studeez/screens/sign_up/SignUpScreen.kt +++ b/app/src/main/java/be/ugent/sel/studeez/screens/sign_up/SignUpScreen.kt @@ -27,7 +27,7 @@ fun SignUpScreen( val uiState by viewModel.uiState val fieldModifier = Modifier.fieldModifier() - SecondaryScreenToolbar(title = resources().getString(AppText.create_account), {}) { + SecondaryScreenTemplate(title = resources().getString(AppText.create_account), {}) { Column( modifier = modifier .fillMaxWidth()