tdpeuter/2023SELab1-project-Studeez
tdpeuter/2023SELab1-project-Studeez
Archived
1
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity

move drawer en navbar to common.composable

Browse source
This commit is contained in:
brreynie 2023-04-23 00:37:48 +02:00
parent d5b62e0cb9
commit 4e501fbf92
10 changed files with 27 additions and 27 deletions
Download patch file Download diff file Expand all files Collapse all files

8
app/src/main/java/be/ugent/sel/studeez/common/composable/PrimaryScreenComposable.kt
View file

@ -18,10 +18,10 @@ import androidx.compose.runtime.rememberCoroutineScope
import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.tooling.preview.Preview
import be.ugent.sel.studeez.R import be.ugent.sel.studeez.R
import be.ugent.sel.studeez.resources import be.ugent.sel.studeez.resources
import be.ugent.sel.studeez.screens.drawer.Drawer import be.ugent.sel.studeez.common.composable.drawer.Drawer
import be.ugent.sel.studeez.screens.drawer.DrawerActions import be.ugent.sel.studeez.common.composable.drawer.DrawerActions
import be.ugent.sel.studeez.screens.navbar.NavigationBar import be.ugent.sel.studeez.common.composable.navbar.NavigationBar
import be.ugent.sel.studeez.screens.navbar.NavigationBarActions import be.ugent.sel.studeez.common.composable.navbar.NavigationBarActions
import be.ugent.sel.studeez.ui.theme.StudeezTheme import be.ugent.sel.studeez.ui.theme.StudeezTheme
import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.launch import kotlinx.coroutines.launch

2
app/src/main/java/be/ugent/sel/studeez/common/composable/TimerEntry.kt
View file

@ -62,7 +62,7 @@ fun TimerEntryPreview() {
@Composable @Composable
fun TimerDefaultEntryPreview() { fun TimerDefaultEntryPreview() {
val timerInfo = CustomTimerInfo( val timerInfo = CustomTimerInfo(
"my preview timer", "This is the description of the timer", 60 "Default preview timer", "This is the description of the timer", 60
) )
TimerEntry(timerInfo = timerInfo, false, buttonName = R.string.edit) { } TimerEntry(timerInfo = timerInfo, false, buttonName = R.string.edit) { }
} }

2
app/src/main/java/be/ugent/sel/studeez/screens/drawer/DrawerComposable.kt → app/src/main/java/be/ugent/sel/studeez/common/composable/drawer/DrawerComposable.kt
View file

@ -1,4 +1,4 @@
package be.ugent.sel.studeez.screens.drawer package be.ugent.sel.studeez.common.composable.drawer
import androidx.compose.foundation.clickable import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Arrangement

2
app/src/main/java/be/ugent/sel/studeez/screens/drawer/DrawerViewModel.kt → app/src/main/java/be/ugent/sel/studeez/common/composable/drawer/DrawerViewModel.kt
View file

@ -1,4 +1,4 @@
package be.ugent.sel.studeez.screens.drawer package be.ugent.sel.studeez.common.composable.drawer
import be.ugent.sel.studeez.domain.AccountDAO import be.ugent.sel.studeez.domain.AccountDAO
import be.ugent.sel.studeez.domain.LogService import be.ugent.sel.studeez.domain.LogService

2
app/src/main/java/be/ugent/sel/studeez/screens/navbar/NavigationBarComposable.kt → app/src/main/java/be/ugent/sel/studeez/common/composable/navbar/NavigationBarComposable.kt
View file

@ -1,4 +1,4 @@
package be.ugent.sel.studeez.screens.navbar package be.ugent.sel.studeez.common.composable.navbar
import androidx.compose.material.BottomNavigation import androidx.compose.material.BottomNavigation
import androidx.compose.material.BottomNavigationItem import androidx.compose.material.BottomNavigationItem

2
app/src/main/java/be/ugent/sel/studeez/screens/navbar/NavigationBarViewModel.kt → app/src/main/java/be/ugent/sel/studeez/common/composable/navbar/NavigationBarViewModel.kt
View file

@ -1,4 +1,4 @@
package be.ugent.sel.studeez.screens.navbar package be.ugent.sel.studeez.common.composable.navbar
import be.ugent.sel.studeez.domain.AccountDAO import be.ugent.sel.studeez.domain.AccountDAO
import be.ugent.sel.studeez.domain.LogService import be.ugent.sel.studeez.domain.LogService

12
app/src/main/java/be/ugent/sel/studeez/screens/home/HomeScreen.kt
View file

@ -13,12 +13,12 @@ import be.ugent.sel.studeez.common.composable.BasicButton
import be.ugent.sel.studeez.common.composable.PrimaryScreenTemplate import be.ugent.sel.studeez.common.composable.PrimaryScreenTemplate
import be.ugent.sel.studeez.common.ext.basicButton import be.ugent.sel.studeez.common.ext.basicButton
import be.ugent.sel.studeez.resources import be.ugent.sel.studeez.resources
import be.ugent.sel.studeez.screens.drawer.DrawerActions import be.ugent.sel.studeez.common.composable.drawer.DrawerActions
import be.ugent.sel.studeez.screens.drawer.DrawerViewModel import be.ugent.sel.studeez.common.composable.drawer.DrawerViewModel
import be.ugent.sel.studeez.screens.drawer.getDrawerActions import be.ugent.sel.studeez.common.composable.drawer.getDrawerActions
import be.ugent.sel.studeez.screens.navbar.NavigationBarActions import be.ugent.sel.studeez.common.composable.navbar.NavigationBarActions
import be.ugent.sel.studeez.screens.navbar.NavigationBarViewModel import be.ugent.sel.studeez.common.composable.navbar.NavigationBarViewModel
import be.ugent.sel.studeez.screens.navbar.getNavigationBarActions import be.ugent.sel.studeez.common.composable.navbar.getNavigationBarActions
@Composable @Composable
fun HomeRoute( fun HomeRoute(

8
app/src/main/java/be/ugent/sel/studeez/screens/profile/ProfileScreen.kt
View file

@ -16,10 +16,10 @@ import be.ugent.sel.studeez.R
import be.ugent.sel.studeez.common.composable.Headline import be.ugent.sel.studeez.common.composable.Headline
import be.ugent.sel.studeez.common.composable.PrimaryScreenTemplate import be.ugent.sel.studeez.common.composable.PrimaryScreenTemplate
import be.ugent.sel.studeez.resources import be.ugent.sel.studeez.resources
import be.ugent.sel.studeez.screens.drawer.DrawerActions import be.ugent.sel.studeez.common.composable.drawer.DrawerActions
import be.ugent.sel.studeez.screens.drawer.getDrawerActions import be.ugent.sel.studeez.common.composable.drawer.getDrawerActions
import be.ugent.sel.studeez.screens.navbar.NavigationBarActions import be.ugent.sel.studeez.common.composable.navbar.NavigationBarActions
import be.ugent.sel.studeez.screens.navbar.getNavigationBarActions import be.ugent.sel.studeez.common.composable.navbar.getNavigationBarActions
import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.CoroutineScope
import be.ugent.sel.studeez.R.string as AppText import be.ugent.sel.studeez.R.string as AppText

8
app/src/main/java/be/ugent/sel/studeez/screens/timer_overview/TimerOverviewScreen.kt
View file

@ -18,10 +18,10 @@ import be.ugent.sel.studeez.common.ext.basicButton
import be.ugent.sel.studeez.data.local.models.timer_info.CustomTimerInfo import be.ugent.sel.studeez.data.local.models.timer_info.CustomTimerInfo
import be.ugent.sel.studeez.data.local.models.timer_info.TimerInfo import be.ugent.sel.studeez.data.local.models.timer_info.TimerInfo
import be.ugent.sel.studeez.resources import be.ugent.sel.studeez.resources
import be.ugent.sel.studeez.screens.drawer.DrawerActions import be.ugent.sel.studeez.common.composable.drawer.DrawerActions
import be.ugent.sel.studeez.screens.drawer.getDrawerActions import be.ugent.sel.studeez.common.composable.drawer.getDrawerActions
import be.ugent.sel.studeez.screens.navbar.NavigationBarActions import be.ugent.sel.studeez.common.composable.navbar.NavigationBarActions
import be.ugent.sel.studeez.screens.navbar.getNavigationBarActions import be.ugent.sel.studeez.common.composable.navbar.getNavigationBarActions
import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.flowOf import kotlinx.coroutines.flow.flowOf

8
app/src/main/java/be/ugent/sel/studeez/screens/timer_selection/TimerSelectionScreen.kt
View file

@ -13,10 +13,10 @@ import be.ugent.sel.studeez.common.composable.PrimaryScreenTemplate
import be.ugent.sel.studeez.common.composable.TimerEntry import be.ugent.sel.studeez.common.composable.TimerEntry
import be.ugent.sel.studeez.data.local.models.timer_info.TimerInfo import be.ugent.sel.studeez.data.local.models.timer_info.TimerInfo
import be.ugent.sel.studeez.resources import be.ugent.sel.studeez.resources
import be.ugent.sel.studeez.screens.drawer.DrawerActions import be.ugent.sel.studeez.common.composable.drawer.DrawerActions
import be.ugent.sel.studeez.screens.drawer.getDrawerActions import be.ugent.sel.studeez.common.composable.drawer.getDrawerActions
import be.ugent.sel.studeez.screens.navbar.NavigationBarActions import be.ugent.sel.studeez.common.composable.navbar.NavigationBarActions
import be.ugent.sel.studeez.screens.navbar.getNavigationBarActions import be.ugent.sel.studeez.common.composable.navbar.getNavigationBarActions
import kotlinx.coroutines.flow.Flow import kotlinx.coroutines.flow.Flow
import kotlinx.coroutines.flow.flowOf import kotlinx.coroutines.flow.flowOf