diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 5c34ad9..5778b11 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -10,11 +10,11 @@ android:label="@string/app_name" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" - android:theme="@style/Theme.Pomodoro"> + android:theme="@style/Theme.Tomato"> + android:theme="@style/Theme.Tomato"> diff --git a/app/src/main/java/org/nsh07/pomodoro/MainActivity.kt b/app/src/main/java/org/nsh07/pomodoro/MainActivity.kt index 1da51a9..7d638fa 100644 --- a/app/src/main/java/org/nsh07/pomodoro/MainActivity.kt +++ b/app/src/main/java/org/nsh07/pomodoro/MainActivity.kt @@ -6,7 +6,7 @@ import androidx.activity.compose.setContent import androidx.activity.enableEdgeToEdge import androidx.activity.viewModels import org.nsh07.pomodoro.ui.AppScreen -import org.nsh07.pomodoro.ui.theme.PomodoroTheme +import org.nsh07.pomodoro.ui.theme.TomatoTheme import org.nsh07.pomodoro.ui.viewModel.UiViewModel class MainActivity : ComponentActivity() { @@ -16,7 +16,7 @@ class MainActivity : ComponentActivity() { super.onCreate(savedInstanceState) enableEdgeToEdge() setContent { - PomodoroTheme { + TomatoTheme { AppScreen(viewModel) } } diff --git a/app/src/main/java/org/nsh07/pomodoro/ui/theme/Theme.kt b/app/src/main/java/org/nsh07/pomodoro/ui/theme/Theme.kt index 06cc51c..af90563 100644 --- a/app/src/main/java/org/nsh07/pomodoro/ui/theme/Theme.kt +++ b/app/src/main/java/org/nsh07/pomodoro/ui/theme/Theme.kt @@ -1,6 +1,5 @@ package org.nsh07.pomodoro.ui.theme -import android.app.Activity import android.os.Build import androidx.compose.foundation.isSystemInDarkTheme import androidx.compose.material3.MaterialTheme @@ -34,7 +33,7 @@ private val LightColorScheme = lightColorScheme( ) @Composable -fun PomodoroTheme( +fun TomatoTheme( darkTheme: Boolean = isSystemInDarkTheme(), // Dynamic color is available on Android 12+ dynamicColor: Boolean = true, diff --git a/app/src/main/java/org/nsh07/pomodoro/ui/timerScreen/TimerScreen.kt b/app/src/main/java/org/nsh07/pomodoro/ui/timerScreen/TimerScreen.kt index 06c8b17..ea719d3 100644 --- a/app/src/main/java/org/nsh07/pomodoro/ui/timerScreen/TimerScreen.kt +++ b/app/src/main/java/org/nsh07/pomodoro/ui/timerScreen/TimerScreen.kt @@ -54,6 +54,7 @@ import androidx.compose.ui.unit.sp import org.nsh07.pomodoro.R import org.nsh07.pomodoro.ui.theme.AppFonts.interDisplayBlack import org.nsh07.pomodoro.ui.theme.AppFonts.openRundeClock +import org.nsh07.pomodoro.ui.theme.TomatoTheme import org.nsh07.pomodoro.ui.viewModel.TimerMode import org.nsh07.pomodoro.ui.viewModel.UiState @@ -196,7 +197,6 @@ fun TimerScreen( cap = StrokeCap.Round, ), wavelength = 60.dp, -// strokeWidth = 16.dp, gapSize = 16.dp ) } @@ -308,5 +308,7 @@ fun TimerScreenPreview() { val uiState = UiState( timeStr = "03:34", nextTimeStr = "5:00", timerMode = TimerMode.SHORT_BREAK ) - TimerScreen(uiState, { 0.3f }, {}, {}) + TomatoTheme { + TimerScreen(uiState, { 0.3f }, {}, {}) + } } diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index 52c511e..bb34809 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -1,5 +1,5 @@ -