build: Improvements:

1. Bumped app version numbers and target api 34
2. Removed 3rd party time picker and accompanist navigation animation
3. Migrated from material2 to material3
4. Fixed progress bar on math screen
5. Code cleanup and fix previews for Math screen and List Screen

Author: t-regbs

.idea/compiler.xml

@@ -13,7 +13,7 @@ An Android alarm app in which you solve math problems of varying difficulty to d
 * [ViewModel](https://developer.android.com/topic/libraries/architecture/viewmodel) to store and manage UI-related data in a lifecycle conscious way.
 * [Navigation Material](https://google.github.io/accompanist/navigation-material) - provides Compose Material support for Jetpack Navigation Compose, features composable bottom sheet destinations.
 * [Timber](https://github.com/JakeWharton/timber) - a logger with a small, extensible API which provides utility on top of Android's normal Log class.
-* [Material Design](https://material.io/develop/android/docs/getting-started/)
+* [Material Design](https://material3.io/develop/android/docs/getting-started/)
 * [Coroutines](https://kotlinlang.org/docs/reference/coroutines-overview.html) used to manage the local storage i.e. `writing to and reading from the database`. Coroutines help in managing background threads and reduces the need for callbacks.
 * [Room](https://developer.android.com/topic/libraries/architecture/room) persistence library which provides an abstraction layer over SQLite to allow for more robust database access while harnessing the full power of SQLite.
 * [Dagger Hilt](https://dagger.dev/hilt/) provides a standard way to incorporate Dagger dependency injection into an Android application.

.idea/deploymentTargetDropDown.xml

@@ -9,13 +9,14 @@ plugins {
 }
 
 android {
+    namespace = "com.timilehinaregbesola.mathalarm"
     defaultConfig {
         applicationId = "com.timilehinaregbesola.mathalarm"
-        versionCode = 17
-        versionName = "2.1.0"
-        minSdk = Integer.parseInt(libs.versions.android.min.sdk.get())
-        targetSdk = Integer.parseInt(libs.versions.android.target.sdk.get())
-        compileSdk = Integer.parseInt(libs.versions.android.compile.sdk.get())
+        versionCode = 18
+        versionName = "2.2.0"
+        minSdk = libs.versions.android.min.sdk.get().toInt()
+        targetSdk = libs.versions.android.target.sdk.get().toInt()
+        compileSdk = libs.versions.android.compile.sdk.get().toInt()
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
@@ -34,25 +35,26 @@ android {
         // Flag to enable support for the new language APIs
         isCoreLibraryDesugaringEnabled = true
 
-        sourceCompatibility = JavaVersion.VERSION_11
-        targetCompatibility = JavaVersion.VERSION_11
+        sourceCompatibility = JavaVersion.VERSION_17
+        targetCompatibility = JavaVersion.VERSION_17
     }
 
     kotlinOptions {
         allWarningsAsErrors = false
         freeCompilerArgs = listOf("-Xopt-in=kotlin.RequiresOptIn", "-Xopt-in=kotlin.Experimental")
-        jvmTarget = "11"
+        jvmTarget = "17"
     }
     lint {
         disable += setOf("LogNotTimber", "StringFormatInTimber", "ThrowableNotAtBeginning", "BinaryOperationInTimber", "TimberArgCount", "TimberArgTypes", "TimberTagLength", "TimberExceptionLogging")
     }
 
     buildFeatures {
         compose = true
+        buildConfig = true
     }
 
     composeOptions {
-        kotlinCompilerExtensionVersion = libs.versions.androidx.compose.compiler.get()
+        kotlinCompilerExtensionVersion = "1.5.3"
     }
 
     packagingOptions {
@@ -102,16 +104,13 @@ dependencies {
 
     implementation(libs.androidx.activity.compose)
     implementation(libs.accompanist.navigation.material)
-    implementation(libs.accompanist.navigation.animation)
     implementation(libs.androidx.hilt.navigation.compose)
 
     implementation(libs.timber)
 
     implementation(libs.hilt.android)
     kapt(libs.hilt.android.compiler)
 
-    implementation(libs.vanpra.material.datetime)
-
     implementation(platform(libs.firebase.bom))
     implementation(libs.firebase.analytics)
     implementation(libs.firebase.crashlytics)
@@ -125,7 +124,7 @@ dependencies {
     implementation(composeBom)
     androidTestImplementation(composeBom)
     implementation(libs.androidx.compose.ui)
-    implementation(libs.androidx.compose.material)
+    implementation(libs.androidx.compose.material3)
     implementation(libs.androidx.compose.material.icons)
     debugImplementation(libs.androidx.compose.ui.tooling)
     implementation(libs.androidx.compose.ui.tooling.preview)

.idea/kotlinc.xml

@@ -2,12 +2,12 @@ package com.timilehinaregbesola.mathalarm.presentation.alarmlist.components
 
 import androidx.compose.animation.ExperimentalAnimationApi
 import androidx.compose.foundation.ExperimentalFoundationApi
-import androidx.compose.material.ExperimentalMaterialApi
+import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.test.junit4.createAndroidComposeRule
 import androidx.navigation.compose.NavHost
-import com.google.accompanist.navigation.animation.composable
-import com.google.accompanist.navigation.animation.rememberAnimatedNavController
+import androidx.navigation.compose.composable
+import androidx.navigation.compose.rememberNavController
 import com.google.accompanist.navigation.material.ExperimentalMaterialNavigationApi
 import com.timilehinaregbesola.mathalarm.presentation.MainActivity
 import com.timilehinaregbesola.mathalarm.presentation.ui.MathAlarmTheme
@@ -22,7 +22,7 @@ import org.junit.Rule
 @ExperimentalAnimationApi
 @InternalCoroutinesApi
 @ExperimentalComposeUiApi
-@ExperimentalMaterialApi
+@ExperimentalMaterial3Api
 @ExperimentalFoundationApi
 @HiltAndroidTest
 // @UninstallModules(AppModule::class)
@@ -38,7 +38,7 @@ class AlarmListScreenTest {
         hiltRule.inject()
         composeRule.setContent {
             MathAlarmTheme {
-                val navController = rememberAnimatedNavController()
+                val navController = rememberNavController()
                 NavHost(navController = navController, startDestination = Navigation.NAV_ALARM_LIST) {
                     composable(Navigation.NAV_ALARM_LIST) {
                         ListDisplayScreen(

.idea/migrations.xml

@@ -4,26 +4,45 @@ import android.app.Application
 import android.content.Context
 import androidx.compose.animation.ExperimentalAnimationApi
 import androidx.compose.foundation.ExperimentalFoundationApi
-import androidx.compose.material.ExperimentalMaterialApi
+import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.room.Room
-import com.google.accompanist.navigation.material.ExperimentalMaterialNavigationApi
 import com.timilehinaregbesola.mathalarm.data.AlarmRepository
 import com.timilehinaregbesola.mathalarm.framework.RoomAlarmDataSource
 import com.timilehinaregbesola.mathalarm.framework.Usecases
 import com.timilehinaregbesola.mathalarm.framework.app.permission.AlarmPermission
 import com.timilehinaregbesola.mathalarm.framework.app.permission.AndroidVersion
 import com.timilehinaregbesola.mathalarm.framework.app.permission.AndroidVersionImpl
-import com.timilehinaregbesola.mathalarm.framework.database.*
-import com.timilehinaregbesola.mathalarm.interactors.*
+import com.timilehinaregbesola.mathalarm.framework.database.AlarmDao
+import com.timilehinaregbesola.mathalarm.framework.database.AlarmDatabase
+import com.timilehinaregbesola.mathalarm.framework.database.AlarmMapper
+import com.timilehinaregbesola.mathalarm.framework.database.MIGRATION_2_3
+import com.timilehinaregbesola.mathalarm.framework.database.MIGRATION_3_4
+import com.timilehinaregbesola.mathalarm.interactors.AlarmInteractor
+import com.timilehinaregbesola.mathalarm.interactors.AlarmInteractorImpl
+import com.timilehinaregbesola.mathalarm.interactors.AudioPlayer
+import com.timilehinaregbesola.mathalarm.interactors.NotificationInteractor
 import com.timilehinaregbesola.mathalarm.interactors.NotificationInteractorImpl
+import com.timilehinaregbesola.mathalarm.interactors.PlayerWrapper
 import com.timilehinaregbesola.mathalarm.notification.AlarmNotificationScheduler
 import com.timilehinaregbesola.mathalarm.notification.MathAlarmNotification
 import com.timilehinaregbesola.mathalarm.notification.MathAlarmNotificationChannel
 import com.timilehinaregbesola.mathalarm.presentation.appsettings.AppThemeOptionsMapper
 import com.timilehinaregbesola.mathalarm.provider.CalendarProvider
 import com.timilehinaregbesola.mathalarm.provider.CalendarProviderImpl
-import com.timilehinaregbesola.mathalarm.usecases.*
+import com.timilehinaregbesola.mathalarm.usecases.AddAlarm
+import com.timilehinaregbesola.mathalarm.usecases.CancelAlarm
+import com.timilehinaregbesola.mathalarm.usecases.ClearAlarms
+import com.timilehinaregbesola.mathalarm.usecases.CompleteAlarm
+import com.timilehinaregbesola.mathalarm.usecases.DeleteAlarm
+import com.timilehinaregbesola.mathalarm.usecases.FindAlarm
+import com.timilehinaregbesola.mathalarm.usecases.GetSavedAlarms
+import com.timilehinaregbesola.mathalarm.usecases.RescheduleFutureAlarms
+import com.timilehinaregbesola.mathalarm.usecases.ScheduleAlarm
+import com.timilehinaregbesola.mathalarm.usecases.ScheduleNextAlarm
+import com.timilehinaregbesola.mathalarm.usecases.ShowAlarm
+import com.timilehinaregbesola.mathalarm.usecases.SnoozeAlarm
+import com.timilehinaregbesola.mathalarm.usecases.UpdateAlarm
 import com.timilehinaregbesola.mathalarm.utils.getAlarmManager
 import dagger.Module
 import dagger.Provides
@@ -34,11 +53,9 @@ import kotlinx.coroutines.InternalCoroutinesApi
 import javax.inject.Singleton
 
 @ExperimentalFoundationApi
-@ExperimentalMaterialApi
 @ExperimentalComposeUiApi
 @InternalCoroutinesApi
 @ExperimentalAnimationApi
-@ExperimentalMaterialNavigationApi
 @Module
 @InstallIn(SingletonComponent::class)
 object AppModule {
@@ -126,6 +143,7 @@ object AppModule {
         )
     }
 
+    @OptIn(ExperimentalMaterial3Api::class)
     @Provides
     @Singleton
     fun provideAlarmNotification(
@@ -149,12 +167,10 @@ object AppModule {
     }
 
     @OptIn(
-        ExperimentalMaterialNavigationApi::class,
         ExperimentalAnimationApi::class,
         InternalCoroutinesApi::class,
         ExperimentalComposeUiApi::class,
-        ExperimentalMaterialApi::class,
-        ExperimentalFoundationApi::class
+        ExperimentalFoundationApi::class, ExperimentalMaterial3Api::class
     )
     @Provides
     @Singleton

.idea/misc.xml

@@ -6,13 +6,13 @@ import kotlinx.coroutines.flow.Flow
 @Dao
 interface AlarmDao {
     @Insert(onConflict = OnConflictStrategy.REPLACE)
-    suspend fun addAlarm(alarm: AlarmEntity?): Long
+    suspend fun addAlarm(alarm: AlarmEntity): Long
 
     @Update
-    suspend fun updateAlarm(alarm: AlarmEntity?)
+    suspend fun updateAlarm(alarm: AlarmEntity)
 
     @Delete
-    suspend fun deleteAlarm(alarm: AlarmEntity?)
+    suspend fun deleteAlarm(alarm: AlarmEntity)
 
     @Query("DELETE FROM alarms WHERE alarmid = :id")
     suspend fun deleteAlarmWithId(id: Long?)

README.md

@@ -7,6 +7,10 @@ import android.net.Uri
 import timber.log.Timber
 
 interface AudioPlayer {
+
+    val currentPosition: Int
+    val duration: Int
+
     fun init()
     fun startAlarmAudio()
 
@@ -34,6 +38,10 @@ class PlayerWrapper(
 
     private var player: MediaPlayer? = null
         private set
+    override val currentPosition: Int
+        get() = player?.currentPosition?: 0
+    override val duration: Int
+        get() = player?.duration?: 0
 
     override fun init() {
         player = MediaPlayer().apply {

app/build.gradle.kts

@@ -2,20 +2,18 @@ package com.timilehinaregbesola.mathalarm.interactors
 
 import androidx.compose.animation.ExperimentalAnimationApi
 import androidx.compose.foundation.ExperimentalFoundationApi
-import androidx.compose.material.ExperimentalMaterialApi
+import androidx.compose.material3.ExperimentalMaterial3Api
 import androidx.compose.ui.ExperimentalComposeUiApi
-import com.google.accompanist.navigation.material.ExperimentalMaterialNavigationApi
 import com.timilehinaregbesola.mathalarm.domain.model.Alarm
 import com.timilehinaregbesola.mathalarm.notification.MathAlarmNotification
 import kotlinx.coroutines.InternalCoroutinesApi
 import timber.log.Timber
 
 @ExperimentalFoundationApi
-@ExperimentalMaterialApi
+@ExperimentalMaterial3Api
 @ExperimentalComposeUiApi
 @InternalCoroutinesApi
 @ExperimentalAnimationApi
-@ExperimentalMaterialNavigationApi
 internal class NotificationInteractorImpl(
     private val alarmNotification: MathAlarmNotification,
 ) : NotificationInteractor {

app/src/androidTest/java/com/timilehinaregbesola/mathalarm/presentation/alarmlist/components/AlarmListScreenTest.kt

@@ -5,16 +5,16 @@ import androidx.compose.animation.ExperimentalAnimationApi
 import androidx.compose.animation.core.tween
 import androidx.compose.foundation.ExperimentalFoundationApi
 import androidx.compose.foundation.shape.RoundedCornerShape
-import androidx.compose.material.ExperimentalMaterialApi
-import androidx.compose.material.MaterialTheme
-import androidx.compose.material.Surface
+import androidx.compose.material3.ExperimentalMaterial3Api
+import androidx.compose.material3.MaterialTheme
+import androidx.compose.material3.Surface
 import androidx.compose.runtime.Composable
 import androidx.compose.ui.ExperimentalComposeUiApi
 import androidx.compose.ui.unit.dp
+import androidx.navigation.compose.NavHost
+import androidx.navigation.compose.composable
+import androidx.navigation.compose.rememberNavController
 import androidx.navigation.navDeepLink
-import com.google.accompanist.navigation.animation.AnimatedNavHost
-import com.google.accompanist.navigation.animation.composable
-import com.google.accompanist.navigation.animation.rememberAnimatedNavController
 import com.google.accompanist.navigation.material.ExperimentalMaterialNavigationApi
 import com.google.accompanist.navigation.material.ModalBottomSheetLayout
 import com.google.accompanist.navigation.material.bottomSheet
@@ -37,22 +37,23 @@ import com.timilehinaregbesola.mathalarm.utils.Navigation.NAV_SETTINGS_SHEET
 import com.timilehinaregbesola.mathalarm.utils.Navigation.NAV_SETTINGS_SHEET_ARGUMENT
 import kotlinx.coroutines.InternalCoroutinesApi
 
+@OptIn(ExperimentalMaterialNavigationApi::class)
 @ExperimentalMaterialNavigationApi
 @ExperimentalAnimationApi
 @InternalCoroutinesApi
 @ExperimentalComposeUiApi
-@ExperimentalMaterialApi
+@ExperimentalMaterial3Api
 @ExperimentalFoundationApi
 @Composable
 fun NavGraph(preferences: AlarmPreferencesImpl) {
     val bottomSheetNavigator = rememberBottomSheetNavigator()
-    val navController = rememberAnimatedNavController(bottomSheetNavigator)
-    Surface(color = MaterialTheme.colors.background) {
+    val navController = rememberNavController(bottomSheetNavigator)
+    Surface(color = MaterialTheme.colorScheme.background) {
         ModalBottomSheetLayout(
             bottomSheetNavigator = bottomSheetNavigator,
             sheetShape = RoundedCornerShape(topStart = 40.dp, topEnd = 40.dp),
         ) {
-            AnimatedNavHost(navController = navController, startDestination = NAV_ALARM_LIST) {
+            NavHost(navController = navController, startDestination = NAV_ALARM_LIST) {
                 composable(
                     route = NAV_ALARM_LIST,
                     enterTransition = {