diff --git a/app/build.gradle b/app/build.gradle index 64b2f61a..45672751 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -16,7 +16,7 @@ android { applicationId "com.starry.greenstash" minSdk 24 targetSdk 34 - versionCode 28 + versionCode 280 versionName "2.8.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -75,7 +75,7 @@ aboutLibraries { dependencies { - def composeBom = platform('androidx.compose:compose-bom:2023.08.00') + def composeBom = platform('androidx.compose:compose-bom:2023.08.00') implementation composeBom androidTestImplementation composeBom diff --git a/app/src/main/java/com/starry/greenstash/GreenStashApp.kt b/app/src/main/java/com/starry/greenstash/GreenStashApp.kt index bab56826..895082f8 100644 --- a/app/src/main/java/com/starry/greenstash/GreenStashApp.kt +++ b/app/src/main/java/com/starry/greenstash/GreenStashApp.kt @@ -39,7 +39,9 @@ import androidx.compose.ui.ExperimentalComposeUiApi import cat.ereza.customactivityoncrash.config.CaocConfig import com.starry.greenstash.reminder.ReminderNotificationSender import dagger.hilt.android.HiltAndroidApp +import kotlinx.coroutines.ExperimentalCoroutinesApi +@ExperimentalCoroutinesApi @ExperimentalMaterial3Api @ExperimentalAnimationApi @ExperimentalComposeUiApi diff --git a/app/src/main/java/com/starry/greenstash/database/core/GoalWithTransactions.kt b/app/src/main/java/com/starry/greenstash/database/core/GoalWithTransactions.kt index 3b0ae020..10d466d2 100644 --- a/app/src/main/java/com/starry/greenstash/database/core/GoalWithTransactions.kt +++ b/app/src/main/java/com/starry/greenstash/database/core/GoalWithTransactions.kt @@ -25,12 +25,14 @@ package com.starry.greenstash.database.core +import androidx.annotation.Keep import androidx.room.Embedded import androidx.room.Relation import com.starry.greenstash.database.goal.Goal import com.starry.greenstash.database.transaction.Transaction import com.starry.greenstash.database.transaction.TransactionType +@Keep data class GoalWithTransactions( @Embedded val goal: Goal, @Relation( diff --git a/app/src/main/java/com/starry/greenstash/database/goal/Goal.kt b/app/src/main/java/com/starry/greenstash/database/goal/Goal.kt index 01990a62..562c11c2 100644 --- a/app/src/main/java/com/starry/greenstash/database/goal/Goal.kt +++ b/app/src/main/java/com/starry/greenstash/database/goal/Goal.kt @@ -26,12 +26,14 @@ package com.starry.greenstash.database.goal import android.graphics.Bitmap +import androidx.annotation.Keep import androidx.room.ColumnInfo import androidx.room.Entity import androidx.room.PrimaryKey enum class GoalPriority(val value: Int) { High(3), Normal(2), Low(1) } +@Keep @Entity(tableName = "saving_goal") data class Goal( val title: String, diff --git a/app/src/main/java/com/starry/greenstash/database/transaction/Transaction.kt b/app/src/main/java/com/starry/greenstash/database/transaction/Transaction.kt index 6cf59212..8482bcc3 100644 --- a/app/src/main/java/com/starry/greenstash/database/transaction/Transaction.kt +++ b/app/src/main/java/com/starry/greenstash/database/transaction/Transaction.kt @@ -25,6 +25,7 @@ package com.starry.greenstash.database.transaction +import androidx.annotation.Keep import androidx.room.ColumnInfo import androidx.room.Entity import androidx.room.ForeignKey @@ -37,6 +38,7 @@ enum class TransactionType { Deposit, Withdraw, Invalid } +@Keep @Entity( tableName = "transaction", foreignKeys = [ ForeignKey( diff --git a/app/src/main/java/com/starry/greenstash/reminder/ReminderNotificationSender.kt b/app/src/main/java/com/starry/greenstash/reminder/ReminderNotificationSender.kt index 012ddc1a..a5a596f4 100644 --- a/app/src/main/java/com/starry/greenstash/reminder/ReminderNotificationSender.kt +++ b/app/src/main/java/com/starry/greenstash/reminder/ReminderNotificationSender.kt @@ -48,7 +48,9 @@ import com.starry.greenstash.reminder.receivers.ReminderDismissReceiver import com.starry.greenstash.utils.GoalTextUtils import com.starry.greenstash.utils.PreferenceUtils import com.starry.greenstash.utils.Utils +import kotlinx.coroutines.ExperimentalCoroutinesApi +@ExperimentalCoroutinesApi @ExperimentalMaterial3Api @ExperimentalAnimationApi @ExperimentalComposeUiApi diff --git a/app/src/main/java/com/starry/greenstash/ui/screens/home/composables/HomeDialogs.kt b/app/src/main/java/com/starry/greenstash/ui/screens/home/composables/HomeDialogs.kt index 323f6b72..8f1bfca5 100644 --- a/app/src/main/java/com/starry/greenstash/ui/screens/home/composables/HomeDialogs.kt +++ b/app/src/main/java/com/starry/greenstash/ui/screens/home/composables/HomeDialogs.kt @@ -34,9 +34,9 @@ import androidx.compose.material3.ExperimentalMaterial3Api import androidx.compose.material3.Icon import androidx.compose.material3.MaterialTheme import androidx.compose.material3.OutlinedTextField +import androidx.compose.material3.OutlinedTextFieldDefaults import androidx.compose.material3.Text import androidx.compose.material3.TextButton -import androidx.compose.material3.TextFieldDefaults import androidx.compose.runtime.Composable import androidx.compose.runtime.MutableState import androidx.compose.runtime.mutableStateOf @@ -132,9 +132,9 @@ fun ActionDialogs( contentDescription = null ) }, - colors = TextFieldDefaults.outlinedTextFieldColors( + colors = OutlinedTextFieldDefaults.colors( focusedBorderColor = MaterialTheme.colorScheme.primary, - unfocusedBorderColor = MaterialTheme.colorScheme.onBackground + unfocusedBorderColor = MaterialTheme.colorScheme.onBackground, ), shape = RoundedCornerShape(14.dp), singleLine = true, @@ -216,9 +216,9 @@ fun ActionDialogs( contentDescription = null ) }, - colors = TextFieldDefaults.outlinedTextFieldColors( + colors = OutlinedTextFieldDefaults.colors( focusedBorderColor = MaterialTheme.colorScheme.primary, - unfocusedBorderColor = MaterialTheme.colorScheme.onBackground + unfocusedBorderColor = MaterialTheme.colorScheme.onBackground, ), shape = RoundedCornerShape(14.dp), singleLine = true, diff --git a/app/src/main/java/com/starry/greenstash/ui/screens/info/composables/GoalInfoScreen.kt b/app/src/main/java/com/starry/greenstash/ui/screens/info/composables/GoalInfoScreen.kt index 05b5af3e..b166434f 100644 --- a/app/src/main/java/com/starry/greenstash/ui/screens/info/composables/GoalInfoScreen.kt +++ b/app/src/main/java/com/starry/greenstash/ui/screens/info/composables/GoalInfoScreen.kt @@ -101,8 +101,10 @@ import com.starry.greenstash.utils.GoalTextUtils import com.starry.greenstash.utils.PreferenceUtils import com.starry.greenstash.utils.Utils import com.starry.greenstash.utils.getActivity +import kotlinx.coroutines.ExperimentalCoroutinesApi +@ExperimentalCoroutinesApi @ExperimentalFoundationApi @ExperimentalComposeUiApi @ExperimentalAnimationApi @@ -348,6 +350,7 @@ fun GoalNotesCard(notesText: String) { ) } +@ExperimentalCoroutinesApi @ExperimentalMaterialApi @ExperimentalFoundationApi @ExperimentalComposeUiApi @@ -368,6 +371,7 @@ fun TransactionCard(transactions: List, currencySymbol: String) { } } +@ExperimentalCoroutinesApi @ExperimentalMaterial3Api @ExperimentalAnimationApi @ExperimentalComposeUiApi @@ -437,6 +441,7 @@ private fun getRemainingDaysText(context: Context, goalItem: GoalWithTransaction } } +@ExperimentalCoroutinesApi @ExperimentalAnimationApi @ExperimentalComposeUiApi @ExperimentalFoundationApi diff --git a/app/src/main/java/com/starry/greenstash/ui/screens/settings/composables/SettingsScreen.kt b/app/src/main/java/com/starry/greenstash/ui/screens/settings/composables/SettingsScreen.kt index a77dad90..3e3587d3 100644 --- a/app/src/main/java/com/starry/greenstash/ui/screens/settings/composables/SettingsScreen.kt +++ b/app/src/main/java/com/starry/greenstash/ui/screens/settings/composables/SettingsScreen.kt @@ -84,9 +84,11 @@ import com.starry.greenstash.utils.PreferenceUtils import com.starry.greenstash.utils.Utils import com.starry.greenstash.utils.getActivity import com.starry.greenstash.utils.toToast +import kotlinx.coroutines.ExperimentalCoroutinesApi import java.util.concurrent.Executor +@ExperimentalCoroutinesApi @ExperimentalMaterialApi @ExperimentalFoundationApi @ExperimentalComposeUiApi diff --git a/app/src/main/java/com/starry/greenstash/utils/Extensions.kt b/app/src/main/java/com/starry/greenstash/utils/Extensions.kt index 3bd30554..779a86b5 100644 --- a/app/src/main/java/com/starry/greenstash/utils/Extensions.kt +++ b/app/src/main/java/com/starry/greenstash/utils/Extensions.kt @@ -34,7 +34,6 @@ import androidx.compose.runtime.Composable import androidx.compose.runtime.derivedStateOf import androidx.compose.runtime.getValue import androidx.compose.runtime.mutableIntStateOf -import androidx.compose.runtime.mutableStateOf import androidx.compose.runtime.remember import androidx.compose.runtime.setValue import java.io.File diff --git a/app/src/main/java/com/starry/greenstash/widget/configuration/WidgetConfigActivity.kt b/app/src/main/java/com/starry/greenstash/widget/configuration/WidgetConfigActivity.kt index 5a6d4efe..02ef2889 100644 --- a/app/src/main/java/com/starry/greenstash/widget/configuration/WidgetConfigActivity.kt +++ b/app/src/main/java/com/starry/greenstash/widget/configuration/WidgetConfigActivity.kt @@ -96,8 +96,10 @@ import com.starry.greenstash.ui.theme.GreenStashTheme import com.starry.greenstash.utils.PreferenceUtils import com.starry.greenstash.widget.GoalWidget import dagger.hilt.android.AndroidEntryPoint +import kotlinx.coroutines.ExperimentalCoroutinesApi import kotlinx.coroutines.delay +@ExperimentalCoroutinesApi @ExperimentalComposeUiApi @ExperimentalFoundationApi @ExperimentalMaterialApi diff --git a/fastlane/metadata/android/en-US/changelogs/28.txt b/fastlane/metadata/android/en-US/changelogs/280.txt similarity index 100% rename from fastlane/metadata/android/en-US/changelogs/28.txt rename to fastlane/metadata/android/en-US/changelogs/280.txt