From d07d36954688f430c25e06312221e8808fe7207a Mon Sep 17 00:00:00 2001 From: Tinsae Date: Mon, 29 Dec 2025 04:42:40 +0100 Subject: [PATCH] almost done --- app/build.gradle.kts | 8 + app/src/main/ic_launcher-playstore.png | Bin 0 -> 14718 bytes .../java/net/tinsae/clocked/AuthViewModel.kt | 4 +- .../java/net/tinsae/clocked/MainActivity.kt | 164 ++++++++------- .../{ActivityList.kt => ListItem.kt} | 122 +++++------- .../clocked/components/LoadingScreen.kt | 18 ++ .../clocked/dashboard/DashboardScreen.kt | 188 +++++++++++------- .../clocked/dashboard/DashboardViewModel.kt | 28 +-- .../net/tinsae/clocked/data/LogRepository.kt | 41 +++- .../net/tinsae/clocked/data/SupabaseClient.kt | 20 -- .../tinsae/clocked/history/HistoryScreen.kt | 21 +- .../clocked/history/HistoryViewModel.kt | 2 +- .../net/tinsae/clocked/service/LogService.kt | 19 +- .../net/tinsae/clocked/util/SupabaseClient.kt | 6 +- .../res/drawable/ic_launcher_foreground.xml | 37 +--- .../res/mipmap-anydpi-v26/ic_launcher.xml | 5 +- .../mipmap-anydpi-v26/ic_launcher_round.xml | 5 +- app/src/main/res/mipmap-hdpi/ic_launcher.webp | Bin 1404 -> 1210 bytes .../res/mipmap-hdpi/ic_launcher_round.webp | Bin 2898 -> 2578 bytes app/src/main/res/mipmap-mdpi/ic_launcher.webp | Bin 982 -> 834 bytes .../res/mipmap-mdpi/ic_launcher_round.webp | Bin 1772 -> 1632 bytes .../main/res/mipmap-xhdpi/ic_launcher.webp | Bin 1900 -> 1524 bytes .../res/mipmap-xhdpi/ic_launcher_round.webp | Bin 3918 -> 3448 bytes .../main/res/mipmap-xxhdpi/ic_launcher.webp | Bin 2884 -> 2266 bytes .../res/mipmap-xxhdpi/ic_launcher_round.webp | Bin 5914 -> 5438 bytes .../main/res/mipmap-xxxhdpi/ic_launcher.webp | Bin 3844 -> 2916 bytes .../res/mipmap-xxxhdpi/ic_launcher_round.webp | Bin 7778 -> 7808 bytes .../res/values/ic_launcher_background.xml | 4 + app/src/main/res/values/strings.xml | 3 + gradle/libs.versions.toml | 3 +- 30 files changed, 380 insertions(+), 318 deletions(-) create mode 100644 app/src/main/ic_launcher-playstore.png rename app/src/main/java/net/tinsae/clocked/components/{ActivityList.kt => ListItem.kt} (62%) create mode 100644 app/src/main/java/net/tinsae/clocked/components/LoadingScreen.kt delete mode 100644 app/src/main/java/net/tinsae/clocked/data/SupabaseClient.kt create mode 100644 app/src/main/res/values/ic_launcher_background.xml diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 790fe5f..0b0dfab 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -87,6 +87,14 @@ dependencies { implementation(libs.supabase.auth) implementation(libs.supabase.postgrest) implementation(libs.ktor.client.android) + implementation(libs.supabase.realtime) + + + + + + + //implementation(libs.supabase.gotrue.live) testImplementation(libs.junit) androidTestImplementation(libs.androidx.junit) diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png new file mode 100644 index 0000000000000000000000000000000000000000..03808ed737279613af9181d22fd37bc0cb544781 GIT binary patch literal 14718 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 literal 0 HcmV?d00001 diff --git a/app/src/main/java/net/tinsae/clocked/AuthViewModel.kt b/app/src/main/java/net/tinsae/clocked/AuthViewModel.kt index 5249ca1..80df16e 100644 --- a/app/src/main/java/net/tinsae/clocked/AuthViewModel.kt +++ b/app/src/main/java/net/tinsae/clocked/AuthViewModel.kt @@ -12,14 +12,17 @@ import io.github.jan.supabase.auth.providers.builtin.Email import io.github.jan.supabase.auth.status.SessionStatus import io.github.jan.supabase.exceptions.BadRequestRestException import io.github.jan.supabase.exceptions.RestException +import kotlinx.coroutines.delay import kotlinx.coroutines.flow.SharingStarted import kotlinx.coroutines.flow.StateFlow +import kotlinx.coroutines.flow.combine import kotlinx.coroutines.flow.map import kotlinx.coroutines.flow.stateIn import kotlinx.coroutines.launch import kotlinx.serialization.json.buildJsonObject import kotlinx.serialization.json.put import net.tinsae.clocked.data.FormType +import net.tinsae.clocked.data.LogRepository import net.tinsae.clocked.util.SupabaseClient // Add this data class here for UI state @@ -52,7 +55,6 @@ class AuthViewModel : ViewModel() { this.email = email this.password = password } - // No need to emit a success event. The isAuthenticated flow will automatically update. } catch (e: Exception) { uiState = uiState.copy(error = parseError(e)) //e.message ?: "An unknown error occurred") } finally { diff --git a/app/src/main/java/net/tinsae/clocked/MainActivity.kt b/app/src/main/java/net/tinsae/clocked/MainActivity.kt index e71f3b2..ad16564 100644 --- a/app/src/main/java/net/tinsae/clocked/MainActivity.kt +++ b/app/src/main/java/net/tinsae/clocked/MainActivity.kt @@ -12,7 +12,6 @@ import androidx.activity.viewModels import androidx.appcompat.app.AppCompatDelegate import androidx.compose.foundation.background import androidx.compose.foundation.isSystemInDarkTheme -import androidx.compose.foundation.layout.Box import androidx.compose.foundation.layout.PaddingValues import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer @@ -26,6 +25,7 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.only import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.safeDrawing +import androidx.compose.foundation.layout.safeDrawingPadding import androidx.compose.material.icons.Icons import androidx.compose.material.icons.automirrored.filled.List import androidx.compose.material.icons.automirrored.filled.Logout @@ -36,17 +36,19 @@ import androidx.compose.material3.IconButton import androidx.compose.material3.MaterialTheme.colorScheme import androidx.compose.material3.MaterialTheme.typography import androidx.compose.material3.Scaffold +import androidx.compose.material3.Surface import androidx.compose.material3.Text import androidx.compose.material3.adaptive.navigationsuite.NavigationSuiteScaffold import androidx.compose.runtime.Composable +import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.collectAsState import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.saveable.rememberSaveable import androidx.compose.runtime.setValue -import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.vector.ImageVector +import androidx.compose.ui.modifier.modifierLocalConsumer import androidx.compose.ui.platform.LocalContext import androidx.compose.ui.platform.LocalLayoutDirection import androidx.compose.ui.res.stringResource @@ -55,22 +57,23 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.core.os.LocaleListCompat import androidx.lifecycle.lifecycleScope +import io.github.jan.supabase.auth.auth +import io.github.jan.supabase.auth.status.SessionStatus import kotlinx.coroutines.flow.distinctUntilChanged import kotlinx.coroutines.flow.map import kotlinx.coroutines.launch +import net.tinsae.clocked.components.ShowLoadingScreen import net.tinsae.clocked.dashboard.DashboardScreen import net.tinsae.clocked.data.Locale +import net.tinsae.clocked.data.LogRepository import net.tinsae.clocked.data.Theme import net.tinsae.clocked.history.HistoryScreen import net.tinsae.clocked.settings.SettingsScreen import net.tinsae.clocked.settings.SettingsViewModel import net.tinsae.clocked.ui.theme.ClockedTheme +import net.tinsae.clocked.util.SupabaseClient import java.text.SimpleDateFormat import java.util.Date -import androidx.compose.material3.CircularProgressIndicator -import androidx.compose.runtime.LaunchedEffect -import io.github.jan.supabase.auth.status.SessionStatus -import net.tinsae.clocked.data.LogRepository class MainActivity : ComponentActivity() { @@ -126,6 +129,25 @@ fun AppEntry(settingsViewModel: SettingsViewModel, authViewModel: AuthViewModel) val settingsState by settingsViewModel.uiState.collectAsState() val sessionStatus by authViewModel.sessionStatus.collectAsState() + + /*LaunchedEffect(Unit) { + SupabaseClient.client.auth.sessionStatus.collect { status -> + if (status is SessionStatus.Authenticated && + SupabaseClient.client.auth.currentSessionOrNull() != null + ) { + LogRepository.fetchLogs() + } else { + return@collect + } + } + }*/ + LaunchedEffect(sessionStatus) { + if (sessionStatus is SessionStatus.Authenticated){ + LogRepository.fetchLogs() + } + } + + val useDarkTheme = when (settingsState.theme) { Theme.LIGHT -> false Theme.DARK -> true @@ -136,29 +158,21 @@ fun AppEntry(settingsViewModel: SettingsViewModel, authViewModel: AuthViewModel) updateLocale(context, settingsState.locale) ClockedTheme(darkTheme = useDarkTheme) { - // Use a 'when' statement to handle all possible states. when (sessionStatus) { + is SessionStatus.Initializing -> { + // Only show loading for the initial session check. + ShowLoadingScreen() + } + is SessionStatus.Authenticated -> { - // If we know the user is authenticated, show the main app. - ClockedApp(settingsViewModel, authViewModel,sessionStatus) + // Just show the app. The ViewModels inside will manage their own loading UI. + ClockedApp(settingsViewModel, authViewModel) } is SessionStatus.NotAuthenticated -> { - // Only if we are certain the user is not logged in, show the login screen. LoginScreen(authViewModel) } - is SessionStatus.Initializing -> { - // While Supabase is loading the session, show a loading indicator. - // This prevents the flicker. - Box( - modifier = Modifier.fillMaxSize(), - contentAlignment = Alignment.Center - ) { - CircularProgressIndicator() - } - } - else -> {} } } @@ -175,67 +189,69 @@ fun updateLocale(context: Context, locale: Locale) { } @Composable -fun ClockedApp(settingsViewModel: SettingsViewModel, authViewModel: AuthViewModel, sessionStatus: SessionStatus) { +fun ClockedApp(settingsViewModel: SettingsViewModel, authViewModel: AuthViewModel) { var currentDestination by rememberSaveable { mutableStateOf(AppDestinations.HOME) } - Scaffold( - modifier = Modifier.fillMaxSize(), - topBar = { - Row( - modifier = Modifier - .fillMaxWidth() - .background(colorScheme.surface) - .padding(WindowInsets.safeDrawing.only(WindowInsetsSides.Top).asPaddingValues()), - //contentAlignment = Alignment.CenterStart - ) { - Text( - modifier = Modifier.padding(horizontal = 16.dp, vertical = 12.dp), - text = stringResource(R.string.app_name), - style = typography.titleLarge, - fontWeight = FontWeight.Bold + + NavigationSuiteScaffold( + navigationSuiteItems = { + AppDestinations.entries.forEach { destination -> + item( + icon = { Icon( + imageVector = destination.icon, + contentDescription = stringResource(destination.label)) + }, + alwaysShowLabel = false, + label = { Text(stringResource(destination.label)) }, + selected = destination == currentDestination, + onClick = { currentDestination = destination } ) - - Spacer(modifier = Modifier.weight(1f)) - - // 2. Use IconButton to make the icon clickable with a ripple effect - IconButton(onClick = { authViewModel.logout() }) { - Icon( - imageVector = Icons.AutoMirrored.Filled.Logout, // Replace with your logout icon - contentDescription = "Logout" - ) - } } - }, - ) { innerPadding -> - val layoutDirection = LocalLayoutDirection.current - val contentPadding = PaddingValues( - start = innerPadding.calculateStartPadding(layoutDirection), - end = innerPadding.calculateEndPadding(layoutDirection), - top = innerPadding.calculateTopPadding(), - bottom = 0.dp - ) + } + ) { + Scaffold( + modifier = Modifier.fillMaxSize(), - NavigationSuiteScaffold( - modifier = Modifier.padding(contentPadding), - navigationSuiteItems = { - AppDestinations.entries.forEach { destination -> - item( - icon = { Icon( - imageVector = destination.icon, - contentDescription = stringResource(destination.label)) - }, - label = { Text(stringResource(destination.label)) }, - selected = destination == currentDestination, - onClick = { currentDestination = destination } - ) + topBar = { + Surface( + color = colorScheme.surfaceContainer, + shadowElevation = 2.dp, // Adds a subtle shadow to lift the bar + modifier = Modifier.fillMaxWidth() + // No padding needed here on the Surface itself + ) { + Row( + // Apply safe area padding to the Row to push content down + modifier = Modifier + .fillMaxWidth() + .padding(WindowInsets.safeDrawing.only(WindowInsetsSides.Top).asPaddingValues()), + verticalAlignment = androidx.compose.ui.Alignment.CenterVertically + ) { + Text( + modifier = Modifier.padding(start = 16.dp), // Vertical padding is handled by Row's alignment + text = stringResource(R.string.app_name), + style = typography.titleLarge, + fontWeight = FontWeight.Bold + ) + + Spacer(modifier = Modifier.weight(1f)) + + IconButton(onClick = { authViewModel.logout() }, modifier = Modifier.padding(10.dp)) { + Icon( + imageVector = Icons.AutoMirrored.Filled.Logout, + contentDescription = "Logout" // Use string resource + ) + } + } } - } - ) { + }, + ) { innerPadding -> + val modifier = Modifier.fillMaxWidth().padding(innerPadding) + when (currentDestination) { - AppDestinations.HOME -> DashboardScreen( modifier = Modifier.fillMaxSize()) - AppDestinations.HISTORY -> HistoryScreen(modifier = Modifier.fillMaxSize()) + AppDestinations.HOME -> DashboardScreen( modifier = modifier) + AppDestinations.HISTORY -> HistoryScreen(modifier = modifier) AppDestinations.SETTING -> SettingsScreen( - modifier = Modifier.fillMaxSize(), + modifier = Modifier, viewModel = settingsViewModel, authViewModel = authViewModel ) diff --git a/app/src/main/java/net/tinsae/clocked/components/ActivityList.kt b/app/src/main/java/net/tinsae/clocked/components/ListItem.kt similarity index 62% rename from app/src/main/java/net/tinsae/clocked/components/ActivityList.kt rename to app/src/main/java/net/tinsae/clocked/components/ListItem.kt index 1faca95..5d4482d 100644 --- a/app/src/main/java/net/tinsae/clocked/components/ActivityList.kt +++ b/app/src/main/java/net/tinsae/clocked/components/ListItem.kt @@ -9,40 +9,40 @@ import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row import androidx.compose.foundation.layout.Spacer import androidx.compose.foundation.layout.fillMaxWidth -import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.offset import androidx.compose.foundation.layout.padding -import androidx.compose.foundation.lazy.LazyColumn -import androidx.compose.foundation.lazy.items +import androidx.compose.foundation.layout.size +import androidx.compose.foundation.layout.width import androidx.compose.material.icons.Icons +import androidx.compose.material.icons.filled.AccessTime import androidx.compose.material.icons.filled.Delete import androidx.compose.material.icons.filled.Edit -import androidx.compose.material3.Card -import androidx.compose.material3.CardDefaults +// Import the new icon from the extended library +import androidx.compose.material.icons.filled.History +import androidx.compose.material3.Divider import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Surface import androidx.compose.material3.Text import androidx.compose.runtime.Composable import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableFloatStateOf -import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.runtime.rememberCoroutineScope import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier -import androidx.compose.ui.draw.clip import androidx.compose.ui.graphics.Color import androidx.compose.ui.input.pointer.pointerInput import androidx.compose.ui.platform.LocalWindowInfo import androidx.compose.ui.res.stringResource -import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.IntOffset import androidx.compose.ui.unit.dp import kotlinx.coroutines.launch import net.tinsae.clocked.R import net.tinsae.clocked.data.Log +import net.tinsae.clocked.data.LogRepository.getRecentLogs import net.tinsae.clocked.ui.theme.cyan import net.tinsae.clocked.ui.theme.red import net.tinsae.clocked.util.Util.formatDuration @@ -50,74 +50,30 @@ import net.tinsae.clocked.util.Util.formatTimestampToLocalDateString import kotlin.math.roundToInt @Composable -fun ActivityList( - modifier: Modifier = Modifier, - onEditLog: (Log) -> Unit = {}, - onDeleteLog: (Log) -> Unit = {}, - recentLogs: List -) { - //var mutableItems by remember { mutableStateOf(items) } - // State to hold the log that should be shown in the dialog. Null means no dialog. - var selectedLogForDialog by remember { mutableStateOf(null) } - - Column(modifier = modifier.fillMaxWidth()) { - Text( - text = stringResource(R.string.recent_activity), - style = MaterialTheme.typography.titleLarge, - modifier = Modifier.padding(horizontal = 16.dp) - ) - Spacer(modifier = Modifier.height(8.dp)) - LazyColumn { - items(recentLogs, key = { it.id }) { log -> - ActivityItem( - log = log, - onEdit = { onEditLog(log) }, - onDelete = {onDeleteLog(log) }, - // When the item is clicked, set it as the selected log for the dialog - onClick = { selectedLogForDialog = log } - ) - } - } - } - - // When a log is selected, show the dialog. - selectedLogForDialog?.let { log -> - DetailsDialog( - log = log, - onDismiss = { selectedLogForDialog = null } - ) - } -} - -@Composable -fun ActivityItem( +fun ListItem( log: Log, onDelete: () -> Unit, onEdit: () -> Unit, - onClick: () -> Unit, // Add onClick callback + onClick: () -> Unit, modifier: Modifier = Modifier ) { val coroutineScope = rememberCoroutineScope() var offsetX by remember { mutableFloatStateOf(0f) } val animatedOffsetX by animateFloatAsState(targetValue = offsetX, label = "offset") - // Use stable LocalConfiguration val screenWidthPx = LocalWindowInfo.current.containerSize.width - - // Define thresholds for swiping val editThreshold = screenWidthPx * 0.4f val deleteThreshold = -screenWidthPx * 0.4f Box( modifier = modifier - .padding(vertical = 4.dp) .fillMaxWidth() + .clickable { onClick() } // Make the whole area clickable ) { - // Background content (icons) + // --- Background content (icons for swipe) --- Row( modifier = Modifier .matchParentSize() - .clip(MaterialTheme.shapes.medium) .background(if (animatedOffsetX > 0) cyan else red) .padding(horizontal = 20.dp), verticalAlignment = Alignment.CenterVertically @@ -139,8 +95,8 @@ fun ActivityItem( } } - // --- Foreground content (the Card) --- - Card( + // --- Foreground content (the new list item UI) --- + Surface( // Use Surface for background color and elevation control modifier = Modifier .offset { IntOffset(animatedOffsetX.roundToInt(), 0) } .pointerInput(Unit) { @@ -152,6 +108,7 @@ fun ActivityItem( onEdit() offsetX = 0f } + offsetX < deleteThreshold -> onDelete() else -> offsetX = 0f } @@ -162,29 +119,48 @@ fun ActivityItem( offsetX += dragAmount } } - .fillMaxWidth() - .clip(MaterialTheme.shapes.medium) - // Use the onClick callback here - .clickable { onClick() }, - elevation = CardDefaults.cardElevation(defaultElevation = 2.dp) + .fillMaxWidth(), + color = MaterialTheme.colorScheme.surface // Ensures background is opaque ) { Column { Row( - modifier = Modifier.padding(start = 16.dp, top = 12.dp, end = 16.dp), - verticalAlignment = Alignment.CenterVertically + modifier = Modifier + .fillMaxWidth() + .padding( 12.dp), + verticalAlignment = Alignment.CenterVertically, ) { + // 1. Leading Icon - CHANGED + Icon( + imageVector = Icons.Default.AccessTime, // Changed to a more relevant round icon + contentDescription = stringResource(R.string.duration_entry_icon), // Added content description + modifier = Modifier.size(40.dp), + tint = MaterialTheme.colorScheme.secondary // Changed to secondary for better contrast + ) + + Spacer(modifier = Modifier.width(16.dp)) + + // 2. Primary Text (using your existing log data) Text( modifier = Modifier.weight(1f), text = formatTimestampToLocalDateString(log.timestamp), style = MaterialTheme.typography.bodyLarge, - fontWeight = FontWeight.SemiBold ) - Text(text = formatDuration(log.duration), style = MaterialTheme.typography.bodyLarge) + + // 3. Trailing Text (using your existing log data) + Text( + text = formatDuration(log.duration), + style = MaterialTheme.typography.bodyMedium, + color = MaterialTheme.colorScheme.onSurfaceVariant + ) } - Text( - text = log.reason ?: "", - style = MaterialTheme.typography.bodyMedium, - modifier = Modifier.padding(start = 16.dp, end = 16.dp, bottom = 12.dp, top = 4.dp) + + // 4. Divider + Divider( + color = MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.5f), + modifier = Modifier + .fillMaxWidth() + // Indent the divider to align with text + .padding(start = 72.dp) // 16dp (padding) + 40dp (icon) + 16dp (spacer) ) } } @@ -193,6 +169,6 @@ fun ActivityItem( @Composable @Preview(showBackground = true) -fun ActivityItemPreview() { - ActivityList(recentLogs = emptyList(), onEditLog = {_->{}}, onDeleteLog = {_->{}}) +fun ListItemPreview() { + ListItem(getRecentLogs().first(), {}, {}, {}) } diff --git a/app/src/main/java/net/tinsae/clocked/components/LoadingScreen.kt b/app/src/main/java/net/tinsae/clocked/components/LoadingScreen.kt new file mode 100644 index 0000000..b47b4ef --- /dev/null +++ b/app/src/main/java/net/tinsae/clocked/components/LoadingScreen.kt @@ -0,0 +1,18 @@ +package net.tinsae.clocked.components + +import androidx.compose.foundation.layout.Box +import androidx.compose.foundation.layout.fillMaxSize +import androidx.compose.material3.CircularProgressIndicator +import androidx.compose.runtime.Composable +import androidx.compose.ui.Alignment +import androidx.compose.ui.Modifier + +@Composable +fun ShowLoadingScreen(){ + Box( + modifier = Modifier.fillMaxSize(), + contentAlignment = Alignment.Center + ) { + CircularProgressIndicator() + } +} \ No newline at end of file diff --git a/app/src/main/java/net/tinsae/clocked/dashboard/DashboardScreen.kt b/app/src/main/java/net/tinsae/clocked/dashboard/DashboardScreen.kt index 60e85a3..98d2fc3 100644 --- a/app/src/main/java/net/tinsae/clocked/dashboard/DashboardScreen.kt +++ b/app/src/main/java/net/tinsae/clocked/dashboard/DashboardScreen.kt @@ -1,5 +1,6 @@ package net.tinsae.clocked.dashboard +import androidx.compose.foundation.background import androidx.compose.foundation.layout.Arrangement import androidx.compose.foundation.layout.Column import androidx.compose.foundation.layout.Row @@ -9,30 +10,37 @@ import androidx.compose.foundation.layout.fillMaxWidth import androidx.compose.foundation.layout.height import androidx.compose.foundation.layout.padding import androidx.compose.foundation.layout.width +import androidx.compose.foundation.lazy.LazyColumn +import androidx.compose.foundation.lazy.items import androidx.compose.material3.Button import androidx.compose.material3.Card import androidx.compose.material3.CardDefaults import androidx.compose.material3.MaterialTheme +import androidx.compose.material3.Surface import androidx.compose.material3.Text import androidx.compose.runtime.Composable -import androidx.compose.runtime.LaunchedEffect import androidx.compose.runtime.collectAsState import androidx.compose.runtime.getValue +import androidx.compose.runtime.mutableStateOf +import androidx.compose.runtime.remember +import androidx.compose.runtime.setValue import androidx.compose.ui.Alignment import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.Color import androidx.compose.ui.res.stringResource +import androidx.compose.ui.text.TextStyle import androidx.compose.ui.text.font.FontWeight import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.compose.ui.unit.sp import androidx.lifecycle.viewmodel.compose.viewModel -import io.github.jan.supabase.auth.status.SessionStatus import net.tinsae.clocked.R -import net.tinsae.clocked.components.ActivityList +import net.tinsae.clocked.components.ListItem import net.tinsae.clocked.components.AddLogDialog +import net.tinsae.clocked.components.DetailsDialog +import net.tinsae.clocked.components.ShowLoadingScreen import net.tinsae.clocked.data.EntryType -import net.tinsae.clocked.data.LogRepository +import net.tinsae.clocked.data.Log import net.tinsae.clocked.ui.theme.ClockedTheme import net.tinsae.clocked.ui.theme.cyan import net.tinsae.clocked.ui.theme.green @@ -45,9 +53,9 @@ fun DashboardScreen( ) { val uiState by viewModel.uiState.collectAsState() - LaunchedEffect(Unit) { + /*LaunchedEffect(Unit) { LogRepository.fetchLogs() - } + }*/ if (uiState.showAddLogDialog) { AddLogDialog( @@ -57,57 +65,80 @@ fun DashboardScreen( ) } - Column( - modifier = modifier - .fillMaxSize() - .padding(16.dp, 0.dp) - ) { - Row( - modifier = Modifier.fillMaxWidth(), - horizontalArrangement = Arrangement.SpaceBetween + if (uiState.isLoading) { + ShowLoadingScreen() + } else { + Column( + modifier = modifier + .fillMaxSize() + .padding(top=16.dp) ) { - SummaryCard(title = stringResource(id = R.string.overtime), value = uiState.overtime, color = green, modifier = Modifier.weight(1f)) - Spacer(modifier = Modifier.width(16.dp)) - SummaryCard(title = stringResource(id = R.string.time_off), value = uiState.timeOff, color = red, modifier = Modifier.weight(1f)) - } + Row( + modifier = Modifier.fillMaxWidth().padding(horizontal = 16.dp), + horizontalArrangement = Arrangement.SpaceEvenly + ) { + SummaryCard( + title = stringResource(id = R.string.overtime), + value = uiState.overtime, + color = green, + modifier = Modifier.weight(1f), + titleStyle = MaterialTheme.typography.titleMedium + ) + Spacer(modifier = Modifier.width(16.dp)) + SummaryCard( + title = stringResource(id = R.string.time_off), + value = uiState.timeOff, + color = red, + modifier = Modifier.weight(1f), + titleStyle = MaterialTheme.typography.titleMedium + ) + } - Spacer(modifier = Modifier.height(16.dp)) + Spacer(modifier = Modifier.height(16.dp)) - NetBalanceCard(value = uiState.netBalance+" / "+uiState.balanceInDays, modifier = Modifier.fillMaxWidth()) - - Spacer(modifier = Modifier.height(16.dp)) - - Row( - modifier = Modifier.fillMaxWidth(), - horizontalArrangement = Arrangement.SpaceAround - ) { - ActionButton( - text = stringResource(id = R.string.add_overtime), - onClick = { viewModel.onAddLogClicked(EntryType.OVERTIME) }, - modifier = Modifier.weight(1f) + SummaryCard( + title = stringResource(id = R.string.net_balance), + value = uiState.netBalance+" ( "+uiState.balanceInDays+")", + color = cyan, + modifier = Modifier.fillMaxWidth().padding(horizontal = 16.dp), + titleStyle = MaterialTheme.typography.titleLarge ) - Spacer(modifier = Modifier.width(16.dp)) - ActionButton( - text = stringResource(id = R.string.add_time_off), - onClick = { viewModel.onAddLogClicked(EntryType.TIME_OFF) }, - modifier = Modifier.weight(1f) + + Spacer(modifier = Modifier.height(16.dp)) + + Row( + modifier = Modifier.fillMaxWidth().padding(horizontal = 16.dp), + horizontalArrangement = Arrangement.SpaceAround + ) { + ActionButton( + text = stringResource(id = R.string.add_overtime), + onClick = { viewModel.onAddLogClicked(EntryType.OVERTIME) }, + modifier = Modifier.weight(1f) + ) + Spacer(modifier = Modifier.width(16.dp)) + ActionButton( + text = stringResource(id = R.string.add_time_off), + onClick = { viewModel.onAddLogClicked(EntryType.TIME_OFF) }, + modifier = Modifier.weight(1f) + ) + } + + Spacer(modifier = Modifier.height(16.dp)) + + ActivityList( + recentLogs = uiState.recentActivities, + modifier = Modifier.weight(1f), + onEditLog = viewModel::editLog, + onDeleteLog = viewModel::deleteLog ) } - Spacer(modifier = Modifier.height(16.dp)) - - ActivityList( - recentLogs = uiState.recentActivities, - modifier = Modifier.weight(1f), - onEditLog = viewModel::editLog, - onDeleteLog = viewModel::deleteLog - ) } } @Composable -fun SummaryCard(title: String, value: String, color: Color, modifier: Modifier = Modifier) { +fun SummaryCard(title: String, titleStyle: TextStyle, value: String, color: Color, modifier: Modifier = Modifier) { Card( modifier = modifier, elevation = CardDefaults.cardElevation(defaultElevation = 4.dp) @@ -117,31 +148,13 @@ fun SummaryCard(title: String, value: String, color: Color, modifier: Modifier = horizontalAlignment = Alignment.CenterHorizontally, verticalArrangement = Arrangement.Center ) { - Text(text = title, style = MaterialTheme.typography.titleMedium) + Text(text = title, style = titleStyle) Spacer(modifier = Modifier.height(8.dp)) Text(text = value, style = MaterialTheme.typography.headlineMedium, color = color, fontWeight = FontWeight.Bold) } } } -@Composable -fun NetBalanceCard(value: String, modifier: Modifier = Modifier) { - Card( - modifier = modifier.fillMaxWidth(), - elevation = CardDefaults.cardElevation(defaultElevation = 4.dp) - ) { - Column( - modifier = Modifier.padding(16.dp), - horizontalAlignment = Alignment.CenterHorizontally, - verticalArrangement = Arrangement.Center - ) { - Text(text = stringResource(id = R.string.net_balance), style = MaterialTheme.typography.titleLarge) - Spacer(modifier = Modifier.height(8.dp)) - Text(text = value, style = MaterialTheme.typography.headlineLarge, color = cyan, fontWeight = FontWeight.Bold) - } - } -} - @Composable fun ActionButton(text: String, onClick: () -> Unit, modifier: Modifier = Modifier) { Button( @@ -152,10 +165,49 @@ fun ActionButton(text: String, onClick: () -> Unit, modifier: Modifier = Modifie } } -@Preview(showBackground = true) + @Composable -fun DashboardScreenPreview() { - ClockedTheme { - //DashboardScreen(viewModel = DashboardViewModel()) +fun ActivityList( + modifier: Modifier = Modifier, + onEditLog: (Log) -> Unit = {}, + onDeleteLog: (Log) -> Unit = {}, + recentLogs: List +) { + //var mutableItems by remember { mutableStateOf(items) } + // State to hold the log that should be shown in the dialog. Null means no dialog. + var selectedLogForDialog by remember { mutableStateOf(null) } + + Column(modifier = modifier.fillMaxWidth()) { + Surface( + color = MaterialTheme.colorScheme.surfaceContainer, + shadowElevation = 2.dp, + modifier = Modifier.fillMaxWidth() + ) { + Text( + text = stringResource(R.string.recent_activity), + style = MaterialTheme.typography.titleLarge, + modifier = Modifier.padding(16.dp) + ) + } + LazyColumn { + items(recentLogs, key = { it.id }) { log -> + ListItem( + modifier = Modifier.padding(horizontal = 16.dp), + log = log, + onEdit = { onEditLog(log) }, + onDelete = {onDeleteLog(log) }, + // When the item is clicked, set it as the selected log for the dialog + onClick = { selectedLogForDialog = log } + ) + } + } + } + + // When a log is selected, show the dialog. + selectedLogForDialog?.let { log -> + DetailsDialog( + log = log, + onDismiss = { selectedLogForDialog = null } + ) } } diff --git a/app/src/main/java/net/tinsae/clocked/dashboard/DashboardViewModel.kt b/app/src/main/java/net/tinsae/clocked/dashboard/DashboardViewModel.kt index 4624e52..79c54e8 100644 --- a/app/src/main/java/net/tinsae/clocked/dashboard/DashboardViewModel.kt +++ b/app/src/main/java/net/tinsae/clocked/dashboard/DashboardViewModel.kt @@ -13,6 +13,9 @@ import kotlinx.coroutines.launch import net.tinsae.clocked.data.EntryType import net.tinsae.clocked.data.Log import net.tinsae.clocked.data.LogRepository +import net.tinsae.clocked.data.LogRepository.getRecentLogs +import net.tinsae.clocked.data.LogRepository.getTotalOvertimeDuration +import net.tinsae.clocked.data.LogRepository.getTotalTimeOffDuration import net.tinsae.clocked.util.Util.formatDuration import kotlin.time.Duration import kotlin.time.Instant @@ -25,7 +28,8 @@ data class DashboardUiState( val balanceInDays: String = "0d", val recentActivities: List = emptyList(), val showAddLogDialog: Boolean = false, - val dialogType: EntryType = EntryType.OVERTIME // Default, will be updated + val dialogType: EntryType = EntryType.OVERTIME, // Default, will be updated + val isLoading: Boolean = true ) class DashboardViewModel : ViewModel() { @@ -33,18 +37,13 @@ class DashboardViewModel : ViewModel() { private val _internalState = MutableStateFlow(DashboardUiState()) val uiState: StateFlow = combine( - LogRepository.logs, // Source 1: The List - _internalState // Source 2: The internal UI state - ) { logs, internalState -> - // THE FIX: The 'logs' parameter is already the List. - // You do not need to call .first() on it. - val allLogs = logs + LogRepository.isLoading, + _internalState + ) { isLoading, internalState -> + val overtimeDuration = getTotalOvertimeDuration() + val timeOffDuration = getTotalTimeOffDuration() - val overtimeDuration = allLogs.filter{ it.type == EntryType.OVERTIME } - .map { it.duration }.fold(Duration.ZERO, Duration::plus) - val timeOffDuration = allLogs.filter { it.type == EntryType.TIME_OFF } - .map { it.duration }.fold(Duration.ZERO, Duration::plus) // Construct the final state using data from both sources. val netBalanceDuration = overtimeDuration + timeOffDuration @@ -53,7 +52,7 @@ class DashboardViewModel : ViewModel() { // 2. Then, calculate the balance in days (assuming an 8-hour workday) // We format it to one decimal place for a clean look. val balanceInDaysValue = netBalanceInHours / 8.0 - val balanceInDaysString = "%.1f".format(balanceInDaysValue) + " days" + val balanceInDaysString = "%.1f".format(balanceInDaysValue) + " d " @@ -61,8 +60,9 @@ class DashboardViewModel : ViewModel() { overtime = formatDuration(overtimeDuration), timeOff = formatDuration(timeOffDuration), netBalance = formatDuration(overtimeDuration + timeOffDuration), - recentActivities = allLogs.take(7), + recentActivities = getRecentLogs(), balanceInDays = balanceInDaysString, + isLoading = isLoading, // Pass through the dialog state from the internal state holder showAddLogDialog = internalState.showAddLogDialog, dialogType = internalState.dialogType @@ -70,7 +70,7 @@ class DashboardViewModel : ViewModel() { }.stateIn( scope = viewModelScope, started = SharingStarted.WhileSubscribed(5000), - initialValue = DashboardUiState() + initialValue = DashboardUiState(isLoading = true) ) diff --git a/app/src/main/java/net/tinsae/clocked/data/LogRepository.kt b/app/src/main/java/net/tinsae/clocked/data/LogRepository.kt index ccc41b0..516579c 100644 --- a/app/src/main/java/net/tinsae/clocked/data/LogRepository.kt +++ b/app/src/main/java/net/tinsae/clocked/data/LogRepository.kt @@ -1,15 +1,18 @@ package net.tinsae.clocked.data -import android.util.Log as LOG import kotlinx.coroutines.CoroutineScope import kotlinx.coroutines.Dispatchers import kotlinx.coroutines.flow.MutableStateFlow import kotlinx.coroutines.flow.asStateFlow import kotlinx.coroutines.flow.update import kotlinx.coroutines.launch -import net.tinsae.clocked.service.* +import net.tinsae.clocked.service.addLogToDB +import net.tinsae.clocked.service.deleteLogFromDB +import net.tinsae.clocked.service.editLogFromDB +import net.tinsae.clocked.service.getAllLogsFromDB import kotlin.time.Duration import kotlin.time.Instant +import android.util.Log as LOG /** * A Singleton Repository that acts as the Single Source of Truth for Log data. @@ -22,25 +25,30 @@ object LogRepository { // A public, read-only StateFlow that ViewModels can collect. val logs = _logs.asStateFlow() - private val repositoryScope = CoroutineScope(Dispatchers.IO) + // Testing code + private val _isLoading = MutableStateFlow(false) // Start as true + val isLoading = _isLoading.asStateFlow() + // testing end - init { - // Fetch initial data when the repository is first created. - fetchLogs() - } + private val repositoryScope = CoroutineScope(Dispatchers.IO) /** * Fetches the latest logs from the service and updates the flow. */ fun fetchLogs() { + // TEST CODE HERE repositoryScope.launch { + + if (_isLoading.value) return@launch // Prevent concurrent fetches + + _isLoading.update { true } try { val latestLogs = getAllLogsFromDB() _logs.update { latestLogs } - LOG.d("LogRepository", "Successfully fetched ${latestLogs.size} logs.") } catch (e: Exception) { LOG.e("LogRepository", "Failed to fetch logs", e) - // Optionally, you could expose an error state here. + } finally { + _isLoading.update { false } } } } @@ -80,4 +88,19 @@ object LogRepository { fetchLogs() } } + + + fun getRecentLogs():List { + return logs.value.take(5) + } + + fun getTotalOvertimeDuration(): Duration { + return logs.value.filter { it.type == EntryType.OVERTIME } + .map { it.duration }.fold(Duration.ZERO, Duration::plus) + } + + fun getTotalTimeOffDuration(): Duration { + return logs.value.filter { it.type == EntryType.TIME_OFF } + .map { it.duration }.fold(Duration.ZERO, Duration::plus) + } } diff --git a/app/src/main/java/net/tinsae/clocked/data/SupabaseClient.kt b/app/src/main/java/net/tinsae/clocked/data/SupabaseClient.kt deleted file mode 100644 index 073bc73..0000000 --- a/app/src/main/java/net/tinsae/clocked/data/SupabaseClient.kt +++ /dev/null @@ -1,20 +0,0 @@ -package net.tinsae.clocked.data - -import io.github.jan.supabase.auth.Auth -import io.github.jan.supabase.createSupabaseClient -import io.github.jan.supabase.postgrest.Postgrest -import net.tinsae.clocked.BuildConfig - -object SupabaseClient { - - val client by lazy { - createSupabaseClient( - supabaseUrl = BuildConfig.SUPABASE_URL, - supabaseKey = BuildConfig.SUPABASE_ANON_KEY - ) { - install(Auth) - install(Postgrest) - } - } - -} diff --git a/app/src/main/java/net/tinsae/clocked/history/HistoryScreen.kt b/app/src/main/java/net/tinsae/clocked/history/HistoryScreen.kt index 75e3109..1c69e84 100644 --- a/app/src/main/java/net/tinsae/clocked/history/HistoryScreen.kt +++ b/app/src/main/java/net/tinsae/clocked/history/HistoryScreen.kt @@ -25,7 +25,7 @@ import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp import androidx.lifecycle.viewmodel.compose.viewModel import net.tinsae.clocked.R -import net.tinsae.clocked.components.ActivityItem +import net.tinsae.clocked.components.ListItem import net.tinsae.clocked.components.DetailsDialog import net.tinsae.clocked.ui.theme.ClockedTheme @@ -51,12 +51,16 @@ fun HistoryScreen( modifier = modifier.fillMaxSize() ) { if (uiState.tabs.isNotEmpty()) { - PrimaryTabRow(selectedTabIndex = uiState.selectedTabIndex) { + PrimaryTabRow(selectedTabIndex = uiState.selectedTabIndex, + modifier = Modifier.fillMaxWidth() + .background(color = MaterialTheme.colorScheme.surfaceContainer) + ) { uiState.tabs.forEachIndexed { index, title -> Tab( + modifier = Modifier.padding( 6.dp), selected = uiState.selectedTabIndex == index, onClick = { viewModel.onTabSelected(index) }, - text = { Text(title) } + text = { Text(title,style = MaterialTheme.typography.titleMedium) } ) } } @@ -71,7 +75,7 @@ fun HistoryScreen( } items(entries, key = { it.id }) { entry -> - ActivityItem( + ListItem( log = entry, modifier = Modifier.padding(horizontal = 16.dp), onDelete = { viewModel.deleteLog(entry) }, @@ -94,15 +98,16 @@ fun HistoryScreen( @Composable fun MonthHeader(text: String, modifier: Modifier = Modifier) { Surface( - modifier = modifier - .fillMaxWidth() - .background(MaterialTheme.colorScheme.background) + modifier = modifier.fillMaxWidth(), + color = MaterialTheme.colorScheme.surfaceContainer, + shadowElevation = 1.dp + ) { Text( text = text, style = MaterialTheme.typography.titleLarge, fontWeight = FontWeight.Bold, - modifier = Modifier.padding(16.dp) + modifier = Modifier.padding(16.dp,10.dp) ) } } diff --git a/app/src/main/java/net/tinsae/clocked/history/HistoryViewModel.kt b/app/src/main/java/net/tinsae/clocked/history/HistoryViewModel.kt index 938e6a6..70ca19f 100644 --- a/app/src/main/java/net/tinsae/clocked/history/HistoryViewModel.kt +++ b/app/src/main/java/net/tinsae/clocked/history/HistoryViewModel.kt @@ -57,7 +57,7 @@ class HistoryViewModel : ViewModel() { }.stateIn( scope = viewModelScope, started = SharingStarted.WhileSubscribed(5000), - initialValue = HistoryUiState() // Start with a default empty state + initialValue = HistoryUiState(isLoading = true) // Start with a default empty state ) fun setTabTitles(titles: List) { diff --git a/app/src/main/java/net/tinsae/clocked/service/LogService.kt b/app/src/main/java/net/tinsae/clocked/service/LogService.kt index 6bb87f5..4800611 100644 --- a/app/src/main/java/net/tinsae/clocked/service/LogService.kt +++ b/app/src/main/java/net/tinsae/clocked/service/LogService.kt @@ -1,13 +1,14 @@ package net.tinsae.clocked.service -import androidx.compose.runtime.retain.retain +import io.github.jan.supabase.auth.auth import io.github.jan.supabase.postgrest.postgrest import io.github.jan.supabase.postgrest.query.Order +import kotlinx.coroutines.delay import net.tinsae.clocked.data.EntryType import net.tinsae.clocked.data.Log import android.util.Log as LOG import net.tinsae.clocked.data.LogEntry -import net.tinsae.clocked.data.SupabaseClient +import net.tinsae.clocked.util.SupabaseClient import kotlin.time.Instant import kotlin.time.Duration @@ -26,10 +27,6 @@ suspend fun getAllLogsFromDB(): List { } } -suspend fun getRecentLogsFromDB(): List { - return getAllLogsFromDB().take(5) -} - suspend fun addLogToDB(type: EntryType, timestamp: Instant, duration: Duration, reason: String?) { val newLog = LogEntry( duration = duration, @@ -78,13 +75,3 @@ suspend fun editLogFromDB(updatedLog: Log): Boolean { false } } - -// --- Calculation functions that operate on a given list of logs --- - -fun getTotalOvertimeDuration(logs: List): Duration { - return logs.filter { it.type == EntryType.OVERTIME }.fold(Duration.ZERO) { acc, log -> acc + log.duration } -} - -fun getTotalTimeOffDuration(logs: List): Duration { - return logs.filter { it.type == EntryType.TIME_OFF }.fold(Duration.ZERO) { acc, log -> acc + log.duration } -} diff --git a/app/src/main/java/net/tinsae/clocked/util/SupabaseClient.kt b/app/src/main/java/net/tinsae/clocked/util/SupabaseClient.kt index df6d9e0..8c201f0 100644 --- a/app/src/main/java/net/tinsae/clocked/util/SupabaseClient.kt +++ b/app/src/main/java/net/tinsae/clocked/util/SupabaseClient.kt @@ -1,8 +1,10 @@ package net.tinsae.clocked.util -import io.github.jan.supabase.auth.Auth import io.github.jan.supabase.createSupabaseClient +import io.github.jan.supabase.auth.Auth import io.github.jan.supabase.postgrest.Postgrest +import io.github.jan.supabase.realtime.Realtime +import io.ktor.client.engine.android.Android import net.tinsae.clocked.BuildConfig object SupabaseClient { @@ -14,6 +16,8 @@ object SupabaseClient { ) { install(Auth) install(Postgrest) + install(Realtime) + httpEngine = Android.create() } } } diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml index 2b068d1..7db116e 100644 --- a/app/src/main/res/drawable/ic_launcher_foreground.xml +++ b/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -1,30 +1,15 @@ - - - - - - - - + android:viewportWidth="960" + android:viewportHeight="960" + android:tint="#1B6184"> + - \ No newline at end of file + android:fillColor="@android:color/white" + android:pathData="M452,800L452,800Q452,800 452,800Q452,800 452,800Q452,800 452,800Q452,800 452,800Q452,800 452,800Q452,800 452,800Q452,800 452,800Q452,800 452,800ZM160,880L160,800L240,800L240,680Q240,619 268.5,565.5Q297,512 348,480Q297,448 268.5,394.5Q240,341 240,280L240,160L160,160L160,80L800,80L800,160L720,160L720,280Q720,328 702,372Q684,416 651,449Q651,449 651,449Q651,449 651,449Q613,459 580,478Q547,497 520,525Q510,523 500.5,521.5Q491,520 480,520Q414,520 367,567Q320,614 320,680L320,800L452,800Q459,822 468.5,842Q478,862 491,880L160,880ZM480,440Q546,440 593,393Q640,346 640,280L640,160L320,160L320,280Q320,346 367,393Q414,440 480,440ZM720,920Q637,920 578.5,861.5Q520,803 520,720Q520,637 578.5,578.5Q637,520 720,520Q803,520 861.5,578.5Q920,637 920,720Q920,803 861.5,861.5Q803,920 720,920ZM480,160Q480,160 480,160Q480,160 480,160L480,160L480,160L480,160Q480,160 480,160Q480,160 480,160ZM692,810L834,668L804,638L692,750L636,694L606,724L692,810Z"/> + + diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml index 6f3b755..7353dbd 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml @@ -1,6 +1,5 @@ - - - + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml index 6f3b755..7353dbd 100644 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml @@ -1,6 +1,5 @@ - - - + + \ No newline at end of file diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.webp b/app/src/main/res/mipmap-hdpi/ic_launcher.webp index c209e78ecd372343283f4157dcfd918ec5165bb3..c38da9d249aa24219ca41967b2afd4bd924b216e 100644 GIT binary patch literal 1210 zcmV;r1V#H&Nk&Gp1ONb6MM6+kP&iDc1ONapN5Byf6^DR?;Qw)15D`i8B*3lzPm%Jk z=!}T$QmiLRpb0PFG9+^Mkks96&S&<`9}E9T30uIWM6MYj8)5}`tdULu*9cAQql0}^ zuoYZ*k2u0i$~H$}{;t0#HS26s7f*uxj{nS{<{>}D&LfUswusn8&3#Z(BR8OEi|3K1 zDk^56#6A;ftt$ZHh)P^;myxs4$y$u@CQ&T{Jo4l*$R@)uRB z#ZMlCG3nX5?nfQ9`47dEZ0v_C*m=46$AgyX={nk1Y3XX}t1SnlXMVdc&64YF{lGzL zy8V#q&vBcH0(^kx$rW7kcz?a*W6F}Si*bafnd=d{GLno`c$)Eb%{lqyXBz~n6L+1OswOGOHtQnPIdgB~ra4#l9eHM#mZ~3x=gHVM*^!2> z0M9z++lD`i&!z5<)o+}%t0`x->O(_24swW|x4Wl!nl>W6GrWJTWh>G(#QPsBXCmb_ z<66g{v(E@}>&aS{XA5YEbl&awH9~Q_?gjCqE#g%~gOQbQehp$8w)B36Q1ebJ{be)6 z&nrL_aybp(vFudrmjoYBglGj70W?x`@Bjb+ literal 1404 zcmV-?1%vuhNk&F=1pok7MM6+kP&il$0000G0000-002h-06|PpNX!5L00Dqw+t%{r zzW2vH!KF=w&cMnnN@{whkTw+#mAh0SV?YL=)3MimFYCWp#fpdtz~8$hD5VPuQgtcN zXl<@<#Cme5f5yr2h%@8TWh?)bSK`O z^Z@d={gn7J{iyxL_y_%J|L>ep{dUxUP8a{byupH&!UNR*OutO~0{*T4q5R6@ApLF! z5{w?Z150gC7#>(VHFJZ-^6O@PYp{t!jH(_Z*nzTK4 zkc{fLE4Q3|mA2`CWQ3{8;gxGizgM!zccbdQoOLZc8hThi-IhN90RFT|zlxh3Ty&VG z?Fe{#9RrRnxzsu|Lg2ddugg7k%>0JeD+{XZ7>Z~{=|M+sh1MF7~ zz>To~`~LVQe1nNoR-gEzkpe{Ak^7{{ZBk2i_<+`Bq<^GB!RYG+z)h;Y3+<{zlMUYd zrd*W4w&jZ0%kBuDZ1EW&KLpyR7r2=}fF2%0VwHM4pUs}ZI2egi#DRMYZPek*^H9YK zay4Iy3WXFG(F14xYsoDA|KXgGc5%2DhmQ1gFCkrgHBm!lXG8I5h*uf{rn48Z!_@ z4Bk6TJAB2CKYqPjiX&mWoW>OPFGd$wqroa($ne7EUK;#3VYkXaew%Kh^3OrMhtjYN?XEoY`tRPQsAkH-DSL^QqyN0>^ zmC>{#F14jz4GeW{pJoRpLFa_*GI{?T93^rX7SPQgT@LbLqpNA}<@2wH;q493)G=1Y z#-sCiRNX~qf3KgiFzB3I>4Z%AfS(3$`-aMIBU+6?gbgDb!)L~A)je+;fR0jWLL-Fu z4)P{c7{B4Hp91&%??2$v9iRSFnuckHUm}or9seH6 z>%NbT+5*@L5(I9j@06@(!{ZI?U0=pKn8uwIg&L{JV14+8s2hnvbRrU|hZCd}IJu7*;;ECgO%8_*W Kmw_-CKmY()leWbG diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-hdpi/ic_launcher_round.webp index b2dfe3d1ba5cf3ee31b3ecc1ced89044a1f3b7a9..ed79b23e63a9731873d90ae748dcedd7c3b76b32 100644 GIT binary patch literal 2578 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 literal 2898 zcmV-Y3$650Nk&FW3jhFDMM6+kP&il$0000G0000-002h-06|PpNWB9900E$G+qN-D z+81ABX7q?;bwx%xBg?kcwr$(C-Tex-ZCkHUw(Y9#+`E5-zuONG5fgw~E2WDng@Bc@ z24xy+R1n%~6xI#u9vJ8zREI)sb<&Il(016}Z~V1n^PU3-_H17A*Bf^o)&{_uBv}Py zulRfeE8g(g6HFhk_?o_;0@tz?1I+l+Y#Q*;RVC?(ud`_cU-~n|AX-b`JHrOIqn(-t&rOg-o`#C zh0LPxmbOAEb;zHTu!R3LDh1QO zZTf-|lJNUxi-PpcbRjw3n~n-pG;$+dIF6eqM5+L();B2O2tQ~|p{PlpNcvDbd1l%c zLtXn%lu(3!aNK!V#+HNn_D3lp z2%l+hK-nsj|Bi9;V*WIcQRTt5j90A<=am+cc`J zTYIN|PsYAhJ|=&h*4wI4ebv-C=Be#u>}%m;a{IGmJDU`0snWS&$9zdrT(z8#{OZ_Y zxwJx!ZClUi%YJjD6Xz@OP8{ieyJB=tn?>zaI-4JN;rr`JQbb%y5h2O-?_V@7pG_+y z(lqAsqYr!NyVb0C^|uclHaeecG)Sz;WV?rtoqOdAAN{j%?Uo%owya(F&qps@Id|Of zo@~Y-(YmfB+chv^%*3g4k3R0WqvuYUIA+8^SGJ{2Bl$X&X&v02>+0$4?di(34{pt* zG=f#yMs@Y|b&=HyH3k4yP&goF2LJ#tBLJNNDo6lG06r}ghC-pC4Q*=x3;|+W04zte zAl>l4kzUBQFYF(E`KJy?ZXd1tnfbH+Z~SMmA21KokJNs#eqcXWKUIC>{TuoKe^vhF z);H)o`t9j~`$h1D`#bxe@E`oE`cM9w(@)5Bp8BNukIwM>wZHfd0S;5bcXA*5KT3bj zc&_~`&{z7u{Et!Z_k78H75gXf4g8<_ul!H$eVspPeU3j&&Au=2R*Zp#M9$9s;fqwgzfiX=E_?BwVcfx3tG9Q-+<5fw z%Hs64z)@Q*%s3_Xd5>S4dg$s>@rN^ixeVj*tqu3ZV)biDcFf&l?lGwsa zWj3rvK}?43c{IruV2L`hUU0t^MemAn3U~x3$4mFDxj=Byowu^Q+#wKRPrWywLjIAp z9*n}eQ9-gZmnd9Y0WHtwi2sn6n~?i#n9VN1B*074_VbZZ=WrpkMYr{RsI ztM_8X1)J*DZejxkjOTRJ&a*lrvMKBQURNP#K)a5wIitfu(CFYV4FT?LUB$jVwJSZz zNBFTWg->Yk0j&h3e*a5>B=-xM7dE`IuOQna!u$OoxLlE;WdrNlN)1 z7**de7-hZ!(%_ZllHBLg`Ir#|t>2$*xVOZ-ADZKTN?{(NUeLU9GbuG-+Axf*AZ-P1 z0ZZ*fx+ck4{XtFsbcc%GRStht@q!m*ImssGwuK+P@%gEK!f5dHymg<9nSCXsB6 zQ*{<`%^bxB($Z@5286^-A(tR;r+p7B%^%$N5h%lb*Vlz-?DL9x;!j<5>~kmXP$E}m zQV|7uv4SwFs0jUervsxVUm>&9Y3DBIzc1XW|CUZrUdb<&{@D5yuLe%Xniw^x&{A2s z0q1+owDSfc3Gs?ht;3jw49c#mmrViUfX-yvc_B*wY|Lo7; zGh!t2R#BHx{1wFXReX*~`NS-LpSX z#TV*miO^~B9PF%O0huw!1Zv>^d0G3$^8dsC6VI!$oKDKiXdJt{mGkyA`+Gwd4D-^1qtNTUK)`N*=NTG-6}=5k6suNfdLt*dt8D| z%H#$k)z#ZRcf|zDWB|pn<3+7Nz>?WW9WdkO5(a^m+D4WRJ9{wc>Y}IN)2Kbgn;_O? zGqdr&9~|$Y0tP=N(k7^Eu;iO*w+f%W`20BNo)=Xa@M_)+o$4LXJyiw{F?a633SC{B zl~9FH%?^Rm*LVz`lkULs)%idDX^O)SxQol(3jDRyBVR!7d`;ar+D7do)jQ}m`g$TevUD5@?*P8)voa?kEe@_hl{_h8j&5eB-5FrYW&*FHVt$ z$kRF9Nstj%KRzpjdd_9wO=4zO8ritN*NPk_9avYrsF(!4))tm{Ga#OY z(r{0buexOzu7+rw8E08Gxd`LTOID{*AC1m*6Nw@osfB%0oBF5sf<~wH1kL;sd zo)k6^VyRFU`)dt*iX^9&QtWbo6yE8XXH?`ztvpiOLgI3R+=MOBQ9=rMVgi<*CU%+d1PQQ0a1U=&b0vkF207%xU0ssI2 diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.webp b/app/src/main/res/mipmap-mdpi/ic_launcher.webp index 4f0f1d64e58ba64d180ce43ee13bf9a17835fbca..fa4a69ff5cb61aabe0949c6f198adf151fd860fb 100644 GIT binary patch literal 834 zcmV-I1HJrGNk&FG0{{S5MM6+kP&iC30{{RoFTe{BpCu`hBuSENWcbq>CiA|}-Aq>+ zjv7gFq})Zf$dAdry`Qd1$dM!|l6>{oYvthg?lD#cq}tY&W&3@<#n`D}A*jHR4ixZ2 zM6fW-+#P;-BM2eHkP9KikcBe)3n@IqD||x=Df}^E!*ZbzVuJp|Z@8o?Lz4D{!^3un zA*@>vNalZkFX1ON_dD!rz>+(I+%*_YGLtY%G@3QK2#F*N(J-2`#{d7nJ8Kgr;Ua4^ zvLt5>5+VQIe;9K9SyuA@`|qp)Hfvc3Nf3<$ zxoa^bVHl!o35h5X4M-T0AsLWFK=OE;+W-E)e!t(-*Xy&z!q4YxwQhVm9lPsd@$>nf zu?|b&Z{5JWTpo)v|KsoX=Q2!KcIH2@-p%~8+s*9WZZEZ)x&Hlr^6SQR)ARZMR7ksR z+pwdG?LutZY}>ZoX*2DP?c}7>wyl4dx>XtHWW4Y9+=}SGBR7&1$uYEhqJ}?czEV^q zx+r(ik_nR1?ISRUhlU~ZSmS7yGvaw%JUZ`11V=l)jMXW60wken|wGC;}o})u!Ct2+H$nc3h zi_mX3b`34n#hUxN7wPQtYTHMaIV>4!uOX0oYkH%@hRL=Zig9uft`-Z5uD~&!Lj6N% ztw_~nc`LLx(2T>)12BAM->IRA2WzRu?Ow3Ey)H#3vZ)`2Pw!KOx>2)Tu1LbGyAS6p zQ+4L@bG;x3uQwZ5hu~U?Zl5=#Q1>#VoVMvrJjb{o&WnC|uLP&sF|Mk5Y?Bw8hvXWX zak~{JFW;HCRJI%B5gOZIeATj}_9>6iST+D1E3vmF@UbnW3%O1%+&ce_>hf0<#lO>IDfX$DxBs=D z;yxJgAuT4Bktxpl9O&FP{hxk$|N4zW<*9dHpZU9N%z+_~XC5J&d7=VcH~!h6V01hy MHP?QALZ{eAVl6nU$N&HU literal 982 zcmV;{11bDcNk&G_0{{S5MM6+kP&il$0000G0000l001ul06|PpNU8t;00Dqo+t#w^ z^1csucXz7-Qrhzl9HuHB%l>&>1tG2^vb*E&k^T3$FG1eQZ51g$uv4V+kI`0<^1Z@N zk?Jjh$olyC%l>)Xq;7!>{iBj&BjJ`P&$fsCfpve_epJOBkTF?nu-B7D!hO=2ZR}

C%4 zc_9eOXvPbC4kzU8YowIA8cW~Uv|eB&yYwAObSwL2vY~UYI7NXPvf3b+c^?wcs~_t{ ze_m66-0)^{JdOMKPwjpQ@Sna!*?$wTZ~su*tNv7o!gXT!GRgivP}ec?5>l1!7<(rT zds|8x(qGc673zrvYIz;J23FG{9nHMnAuP}NpAED^laz3mAN1sy+NXK)!6v1FxQ;lh zOBLA>$~P3r4b*NcqR;y6pwyhZ3_PiDb|%n1gGjl3ZU}ujInlP{eks-#oA6>rh&g+!f`hv#_%JrgYPu z(U^&XLW^QX7F9Z*SRPpQl{B%x)_AMp^}_v~?j7 zapvHMKxSf*Mtyx8I}-<*UGn3)oHd(nn=)BZ`d$lDBwq_GL($_TPaS{UeevT(AJ`p0 z9%+hQb6z)U9qjbuXjg|dExCLjpS8$VKQ55VsIC%@{N5t{NsW)=hNGI`J=x97_kbz@ E0Of=7!T5R>)v=v?|92R;ZKNpKW2Vl% zL9(=MhvuBBZQHhO?f%u+wmq?JYdrmZ{r4Qi6FXU1Z&eOM+f=V&JH3mIDhHAznbzF@ zO3$`!>)U)_*fx^l>>NHb?(y9kh$N$b5CRzSo@L;+k)mYb7^`^%bQKtZ6NFT#O!cK& z@KS*lcO{&o;8Gx>9=68wPWDs~8JNADhlz_2Iq``E_n&5VI!VZC zU-;B3rJS%y0`=oU3uPJzli<<&BxrKv8Da6tb6#?Z6LcBoTzcvLBh`OdGZ}QyCf@n{ z=S*;3x_ARiI{Qzj*!%2GhSim@J%)msVq~r79bx`pL{uBT3UO}yDrR(nV2z0Ve<#w^ zhq+^5BR0zk@=kzxcM>cqfDH>sTxE0TVDkD6!tQvxHyEUM4r&o;{$NN{B5e3+W>kSt zorvB+K+O9nXQcWNS>R~Dei{A)dRVpoqwuW%Y6e7w?C3#aDrjI%Iee*z9_QPd)DH`2 zpse>e;ORdOG?51P#p5W!(iy^};#u6j4hwFU6_X)ECtGKQW!o%;>ICLgHs{(Chu0nv z9vDhbFzawIJG=q$_GjZy5!m!o&HuSn)E%h`ej018Q;N&3dckMz^WsVmmEOQlq?#C*`7_{S#PZ& z1c(%Ipu_xY=LrH;XY*fSyAfG|RU2)J$_;;^6(>Z6{ci2F4h`c1=sHf=5PFIp7&H-f z2DiEnBQ7U17l>dB0%2xUvg>M*72cqWHE$UPP6M!bNg zd)VA1`BnQpkF*G%^Du(|I#^>sG&t@p2g{$vtaDEjWiTO&?TaML0wUh(d1ENv0?{{Y z8T^he<4j(@D=AmkT=-zc(-=Grrh*A7TLIs)tT^runz$=tgM3{`_Ky|;GE-?wt=jPyfU`iF3CQK*0SAqBs zXN9?l+9POeA`fZ&^QGrt&b7za8Jc_Pi~-y>CJO-ftmy>Pd@U+BqactQ+S9e|Kif0M zNV4X_K#rw(kLf>p2AoOmi`hT_isa~k^Ndx0{n*%F=YzUB=_*85*10MAD3K0W6r056jSdyk{s@McbB(8Ze=>sQgNh)Dhy2b~A9 z)Hw{R0*<6(7k2|p08UaH*@PXl@N)Ys?cM~TpT974< zzLU|qi=5m877RIw;3sh|m&T3LcQ?Ld|H;my?K=Et0&IGju^al~i9Z0NS^=Vvi0msz zG;bNPGUsH4dHwa4hvT2FG|xTB+>=EPIS&H0vEKc;5P_IE_b%siD-~2aIN0cp&ou(TMT$i3gbn1R<<{5C8z7-X6~Y literal 1772 zcmVQj4N+cqN`nQhxvX7dAV-`K|Ub$-q+H-5I?Tx0g9jWxd@A|?POE8`3b8fO$T))xP* z(X?&brZw({`)WU&rdAs1iTa0x6F@PIxJ&&L|dpySV!ID|iUhjCcKz(@mE z!x@~W#3H<)4Ae(4eQJRk`Iz3<1)6^m)0b_4_TRZ+cz#eD3f8V;2r-1fE!F}W zEi0MEkTTx}8i1{`l_6vo0(Vuh0HD$I4SjZ=?^?k82R51bC)2D_{y8mi_?X^=U?2|F{Vr7s!k(AZC$O#ZMyavHhlQ7 zUR~QXuH~#o#>(b$u4?s~HLF*3IcF7023AlwAYudn0FV~|odGH^05AYPEfR)8p`i{n zwg3zPVp{+wOsxKc>)(pMupKF!Y2HoUqQ3|Yu|8lwR=?5zZuhG6J?H`bSNk_wPoM{u zSL{c@pY7+c2kck>`^q1^^gR0QB7Y?KUD{vz-uVX~;V-rW)PDcI)$_UjgVV?S?=oLR zf4}zz{#*R_{LkiJ#0RdQLNC^2Vp%JPEUvG9ra2BVZ92(p9h7Ka@!yf9(lj#}>+|u* z;^_?KWdzkM`6gqPo9;;r6&JEa)}R3X{(CWv?NvgLeOTq$cZXqf7|sPImi-7cS8DCN zGf;DVt3Am`>hH3{4-WzH43Ftx)SofNe^-#|0HdCo<+8Qs!}TZP{HH8~z5n`ExcHuT zDL1m&|DVpIy=xsLO>8k92HcmfSKhflQ0H~9=^-{#!I1g(;+44xw~=* zxvNz35vfsQE)@)Zsp*6_GjYD};Squ83<_?^SbALb{a`j<0Gn%6JY!zhp=Fg}Ga2|8 z52e1WU%^L1}15Ex0fF$e@eCT(()_P zvV?CA%#Sy08_U6VPt4EtmVQraWJX` zh=N|WQ>LgrvF~R&qOfB$!%D3cGv?;Xh_z$z7k&s4N)$WYf*k=|*jCEkO19{h_(%W4 zPuOqbCw`SeAX*R}UUsbVsgtuG?xs(#Ikx9`JZoQFz0n*7ZG@Fv@kZk`gzO$HoA9kN z8U5{-yY zvV{`&WKU2$mZeoBmiJrEdzUZAv1sRxpePdg1)F*X^Y)zp^Y*R;;z~vOv-z&)&G)JQ{m!C9cmziu1^nHA z`#`0c>@PnQ9CJKgC5NjJD8HM3|KC(g5nnCq$n0Gsu_DXk36@ql%npEye|?%RmG)

FJ$wK}0tWNB{uH;AM~i diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher.webp index 948a3070fe34c611c42c0d3ad3013a0dce358be0..c30c4ac9aa9ca781ecf413163e78beb76fc6c3c3 100644 GIT binary patch literal 1524 zcmVDsnKa{g*;+qP}nws&J&&DhB})!B5{e09#$7p`*d*vT8)wq0=`$yOS1|0@Ne z$hy0`Zv=?TXBYrT+B_EE%5{s?e+Omwqo11ZI)S?fH9h^ zl<8BaN=9R=vdy258n)Y2GJGkRiQ(hvI;!1nK_ ziE%ZDv^*^o5TtMRe=3AG_B{*DMUGS|#j(bd^m{6ZKd0TD2r{Yicawr0PNhFl`e5ig zW*A8;8zAb;>@HFRk95x$Yk;h>2vz?*#rtRtP(?PO>VL%h0d=^{j@67}FwRGu^-{4-b!e-A(fTs@lfuqk!*y#!2L?Rx>N+?cr9fO=lqlv+LPX`uJ; z0U9yME47u}N;jke^c~#>fF{?qrPlzk_#6TV)Q&GY1%PFjNi?xJwRPMCRCh|M@6}R$ zCaAWXU+Ciayh8w}Pg6?Z14t=m<;aJwmw093PzOOjS~OGe1m?1Dwg;&yG^ za?cD|v%1JFv2E*Dd$!~>6*gK#H*MR$^3zGHEw|Jnx=9cDk*d{jO4w&G07N@3NmZ=^ zPzJYVTt?2%xPRwS=+l_+_h$nD5_Bdl@GEaqui?{z$7Vv>wg0J`E#fomDvb`FoiL4P z;W6we%nd0K10Xr*x^&+wm{Jb6Moi}J=Qs8r*K-duKz%Q%j%&%U_0-*V1ywq6IA#t`c0QwGZpaD&} zl@^5*-(SHxqvnUvfSop{wt**B*R?ZUdM|2KtXdvdpdzUmA=}BLsRFJ*?5`7rw1BIc zMXj!vPDOqDi@?z7X?tDa*Qm1MI-&I0El~mpy7wQTrHF4ds*8FKACu}%F=;?kj$$bW zHDq#@!40TxXGbH=c?{{){np2B(D*8ARA@vcJ0dBp)$rMQ3ZR@(lm1>K&3FW=+U1kv zReI3my4HwFX2eoZsgd);e2lzJ{CSO-&fw>sNp7X@o{;=nkD4DBF{wmKTIe-0d9wr1 zjKxiv6Op60f0aCSY)G6&B0haN+|0w4%*yYQuc2%2H2^f}m$@a1$eTt?Fb^A3H++67 z+S}ESNtb?Q`_3o9%sI@MQ;xKYl+;4R?S-|=GTV=B}q|&wju6c~XvFS)eax3kUlcaCsm8@9 zoFWL|X$e0Dyxic+<0*B@C`_vm{^j*&R}0yr1p zd$5{^f@9(7u$00!bmn2>`>S1^n+TAAx8s>8Km!IaD(>Wb@8ADN&cW>$zyQgDWy`k_ aSP2zoywh#zzYw=C2Y}Wq&Uo;JmX#1s)&7bA literal 1900 zcmV-y2b1_xNk&Fw2LJ$9MM6+kP&il$0000G0001A003VA06|PpNH75a00DqwTbm-~ zullQTcXxO9ki!OCRx^i?oR|n!<8G0=kI^!JSjFi-LL*`V;ET0H2IXfU0*i>o6o6Gy zRq6Ap5(_{XLdXcL-MzlN`ugSdZY_`jXhcENAu)N_0?GhF))9R;E`!bo9p?g?SRgw_ zEXHhFG$0{qYOqhdX<(wE4N@es3VIo$%il%6xP9gjiBri+2pI6aY4 zJbgh-Ud|V%3O!IcHKQx1FQH(_*TK;1>FQWbt^$K1zNn^cczkBs=QHCYZ8b&l!UV{K z{L0$KCf_&KR^}&2Fe|L&?1I7~pBENnCtCuH3sjcx6$c zwqkNkru);ie``q+_QI;IYLD9OV0ZxkuyBz|5<$1BH|vtey$> z5oto4=l-R-Aaq`Dk0}o9N0VrkqW_#;!u{!bJLDq%0092{Ghe=F;(kn} z+sQ@1=UlX30+2nWjkL$B^b!H2^QYO@iFc0{(-~yXj2TWz?VG{v`Jg zg}WyYnwGgn>{HFaG7E~pt=)sOO}*yd(UU-D(E&x{xKEl6OcU?pl)K%#U$dn1mDF19 zSw@l8G!GNFB3c3VVK0?uyqN&utT-D5%NM4g-3@Sii9tSXKtwce~uF zS&Jn746EW^wV~8zdQ1XC28~kXu8+Yo9p!<8h&(Q({J*4DBglPdpe4M_mD8AguZFn~ ztiuO~{6Bx?SfO~_ZV(GIboeR9~hAym{{fV|VM=77MxDrbW6`ujX z<3HF(>Zr;#*uCvC*bpoSr~C$h?_%nXps@A)=l_;({Fo#6Y1+Zv`!T5HB+)#^-Ud_; zBwftPN=d8Vx)*O1Mj+0oO=mZ+NVH*ptNDC-&zZ7Hwho6UQ#l-yNvc0Cm+2$$6YUk2D2t#vdZX-u3>-Be1u9gtTBiMB^xwWQ_rgvGpZ6(C@e23c!^K=>ai-Rqu zhqT`ZQof;9Bu!AD(i^PCbYV%yha9zuoKMp`U^z;3!+&d@Hud&_iy!O-$b9ZLcSRh? z)R|826w}TU!J#X6P%@Zh=La$I6zXa#h!B;{qfug}O%z@K{EZECu6zl)7CiNi%xti0 zB{OKfAj83~iJvmpTU|&q1^?^cIMn2RQ?jeSB95l}{DrEPTW{_gmU_pqTc)h@4T>~& zluq3)GM=xa(#^VU5}@FNqpc$?#SbVsX!~RH*5p0p@w z;~v{QMX0^bFT1!cXGM8K9FP+=9~-d~#TK#ZE{4umGT=;dfvWi?rYj;^l_Zxywze`W z^Cr{55U@*BalS}K%Czii_80e0#0#Zkhlij4-~I@}`-JFJ7$5{>LnoJSs??J8kWVl6|8A}RCGAu9^rAsfCE=2}tHwl93t0C?#+jMpvr7O3`2=tr{Hg$=HlnjVG^ewm|Js0J*kfPa6*GhtB>`fN!m#9J(sU!?(OSfzY*zS(FJ<-Vb zfAIg+`U)YaXv#sY(c--|X zEB+TVyZ%Ie4L$gi#Fc++`h6%vzsS$pjz9aLt+ZL(g;n$Dzy5=m=_TV(3H8^C{r0xd zp#a%}ht55dOq?yhwYPrtp-m1xXp;4X;)NhxxUpgP%XTLmO zcjaFva^}dP3$&sfFTIR_jC=2pHh9kpI@2(6V*GQo7Ws)`j)hd+tr@P~gR*2gO@+1? zG<`_tB+LJuF|SZ9tIec;h%}}6WClT`L>HSW?E{Hp1h^+mlbf_$9zA>!ug>NALJsO{ mU%z=YwVD?}XMya)Bp;vlyE5&E_6!fzx9pwrdz474!~g(M6R?N? diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.webp index 1b9a6956b3acdc11f40ce2bb3f6efbd845cc243f..71ac08bcf80e4b795b6e55a81edb352eea205e26 100644 GIT binary patch literal 3448 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 oIahQ$2*W{a`y=T#Tlh!2u5eB*l5k literal 2884 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 literal 5914 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�(p-{x$&=IACIfoAR!za)F-^da-t3#0Dycnp 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 ORki3WPeB3M9xi0L=&LyZ literal 3844 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 STuZ!iM5%BYaS`i5xyAtThTH-G literal 7778 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

UmY2RIYtNPVDpE$%vda+HD#3m z&VuXJ{BK&Qe+rBa7eq}Q(bq|tn(RrJAk|ztj2(i{d>nmQnM?;HF2k&9sA6up5tmjl z7lySlzMbifH17-m-Lwa_F&e7nOH?ESi3#ckR3tsM+jsck3`oG!uMS}|eAwVXv>}qxwq?QY%QJ0}r@^;fhuUA9W z*BVl>TGo&N004@xSiwDUXUvp51sVmqO3m)=B55aPwf@0=e}cN+$-BdKxY`YrT_4)0 z_d10#i44Q*rFr8MC>*)v$EJvz``(pb{e&*6k+b zsMz%($|1+8hn8c2?P(l@;Rb&CsZeYoCI3?2!LqjbwPXW3z4G$Qfj=cT5Yb%vY0(AX oeb?AaKtwrnc|$|zzw9vfvn^aJJ!zd)XFXqqy0000001=f@-~a#s diff --git a/app/src/main/res/values/ic_launcher_background.xml b/app/src/main/res/values/ic_launcher_background.xml new file mode 100644 index 0000000..c5d5899 --- /dev/null +++ b/app/src/main/res/values/ic_launcher_background.xml @@ -0,0 +1,4 @@ + + + #FFFFFF + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 0ca3105..f457bb3 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -34,6 +34,9 @@ + Overtime − Time Off Recent Activity + or + Duration entry icon + Data diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml index 384407a..8c778f0 100644 --- a/gradle/libs.versions.toml +++ b/gradle/libs.versions.toml @@ -47,8 +47,9 @@ kotlinx-serialization-json = { module = "org.jetbrains.kotlinx:kotlinx-serializa supabase-bom = { group = "io.github.jan-tennert.supabase", name = "bom", version.ref = "supabase" } supabase-postgrest = { group = "io.github.jan-tennert.supabase", name = "postgrest-kt" } supabase-auth = { group = "io.github.jan-tennert.supabase", name = "auth-kt" } +supabase-realtime = { group = "io.github.jan-tennert.supabase", name = "realtime-kt" } ktor-client-android = { group = "io.ktor", name = "ktor-client-android", version.ref = "ktor" } - +# supabase-gotrue-live = { group = "io.github.jan-tennert.supabase", name = "gotrue-live-kt" } [plugins] android-application = { id = "com.android.application", version.ref = "agp" }