Skip to content

Commit 2448efb

Browse files
v2.4.0 (#32)
* export strings resources for navigation drawer * Switch to modal bottom sheet for congrats message * Some code clean-ups * Bump version --------- Signed-off-by: starry-shivam <[email protected]>
1 parent 9cd3d88 commit 2448efb

File tree

31 files changed

+362
-64
lines changed

31 files changed

+362
-64
lines changed

.idea/compiler.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/kotlinc.xml

Lines changed: 6 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

.idea/misc.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,8 @@ android {
1616
applicationId "com.starry.greenstash"
1717
minSdk 24
1818
targetSdk 33
19-
versionCode 23
20-
versionName "2.3.0"
19+
versionCode 24
20+
versionName "2.4.0"
2121

2222
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
2323
vectorDrawables {

app/src/main/java/com/starry/greenstash/database/core/GoalWithTransactions.kt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,9 +44,11 @@ data class GoalWithTransactions(
4444
TransactionType.Deposit -> {
4545
acc + transaction.amount
4646
}
47+
4748
TransactionType.Withdraw -> {
4849
acc - transaction.amount
4950
}
51+
5052
else -> {
5153
acc
5254
}

app/src/main/java/com/starry/greenstash/database/transaction/Transaction.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ import androidx.room.ForeignKey
3131
import androidx.room.PrimaryKey
3232
import com.starry.greenstash.database.goal.Goal
3333
import java.text.DateFormat
34-
import java.util.*
34+
import java.util.Date
3535

3636
enum class TransactionType {
3737
Deposit, Withdraw, Invalid

app/src/main/java/com/starry/greenstash/ui/common/ExpandableCard.kt

Lines changed: 18 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,12 +29,27 @@ import androidx.compose.animation.animateContentSize
2929
import androidx.compose.animation.core.LinearOutSlowInEasing
3030
import androidx.compose.animation.core.animateFloatAsState
3131
import androidx.compose.animation.core.tween
32-
import androidx.compose.foundation.layout.*
32+
import androidx.compose.foundation.layout.Column
33+
import androidx.compose.foundation.layout.Row
34+
import androidx.compose.foundation.layout.fillMaxWidth
35+
import androidx.compose.foundation.layout.padding
36+
import androidx.compose.foundation.layout.wrapContentHeight
3337
import androidx.compose.foundation.shape.RoundedCornerShape
3438
import androidx.compose.material.icons.Icons
3539
import androidx.compose.material.icons.filled.ArrowDropDown
36-
import androidx.compose.material3.*
37-
import androidx.compose.runtime.*
40+
import androidx.compose.material3.Card
41+
import androidx.compose.material3.CardDefaults
42+
import androidx.compose.material3.ExperimentalMaterial3Api
43+
import androidx.compose.material3.Icon
44+
import androidx.compose.material3.IconButton
45+
import androidx.compose.material3.MaterialTheme
46+
import androidx.compose.material3.Text
47+
import androidx.compose.material3.surfaceColorAtElevation
48+
import androidx.compose.runtime.Composable
49+
import androidx.compose.runtime.getValue
50+
import androidx.compose.runtime.mutableStateOf
51+
import androidx.compose.runtime.remember
52+
import androidx.compose.runtime.setValue
3853
import androidx.compose.ui.Alignment
3954
import androidx.compose.ui.Modifier
4055
import androidx.compose.ui.draw.rotate

app/src/main/java/com/starry/greenstash/ui/navigation/DrawerScreens.kt

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -27,10 +27,11 @@ package com.starry.greenstash.ui.navigation
2727

2828
import com.starry.greenstash.R
2929

30-
sealed class DrawerScreens(val route: String, val name: String, val icon: Int) {
31-
object Home : DrawerScreens("home", "Home", R.drawable.ic_nav_home)
32-
object Settings : DrawerScreens("settings", "Settings", R.drawable.ic_nav_settings)
33-
object Backups : DrawerScreens("backups", "Backups", R.drawable.ic_nav_backups)
30+
sealed class DrawerScreens(val route: String, val nameResId: Int, val iconResId: Int) {
31+
object Home : DrawerScreens("home", R.string.drawer_home, R.drawable.ic_nav_home)
32+
object Backups : DrawerScreens("backups", R.string.drawer_backups, R.drawable.ic_nav_backups)
33+
object Settings :
34+
DrawerScreens("settings", R.string.drawer_settings, R.drawable.ic_nav_settings)
3435
}
3536

3637

app/src/main/java/com/starry/greenstash/ui/navigation/NavGraph.kt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,9 +25,13 @@
2525

2626
package com.starry.greenstash.ui.navigation
2727

28-
import androidx.compose.animation.*
28+
import androidx.compose.animation.ExperimentalAnimationApi
2929
import androidx.compose.animation.core.FastOutSlowInEasing
3030
import androidx.compose.animation.core.tween
31+
import androidx.compose.animation.fadeIn
32+
import androidx.compose.animation.fadeOut
33+
import androidx.compose.animation.slideInHorizontally
34+
import androidx.compose.animation.slideOutHorizontally
3135
import androidx.compose.foundation.ExperimentalFoundationApi
3236
import androidx.compose.foundation.background
3337
import androidx.compose.material.ExperimentalMaterialApi

app/src/main/java/com/starry/greenstash/ui/screens/backups/BackupScreen.kt

Lines changed: 25 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,14 +27,31 @@ package com.starry.greenstash.ui.screens.backups
2727

2828
import androidx.compose.animation.ExperimentalAnimationApi
2929
import androidx.compose.foundation.ExperimentalFoundationApi
30-
import androidx.compose.foundation.layout.*
30+
import androidx.compose.foundation.layout.Box
31+
import androidx.compose.foundation.layout.Column
32+
import androidx.compose.foundation.layout.PaddingValues
33+
import androidx.compose.foundation.layout.Spacer
34+
import androidx.compose.foundation.layout.fillMaxSize
35+
import androidx.compose.foundation.layout.fillMaxWidth
36+
import androidx.compose.foundation.layout.height
37+
import androidx.compose.foundation.layout.padding
38+
import androidx.compose.foundation.layout.size
3139
import androidx.compose.foundation.rememberScrollState
3240
import androidx.compose.foundation.shape.RoundedCornerShape
3341
import androidx.compose.foundation.verticalScroll
3442
import androidx.compose.material.ExperimentalMaterialApi
3543
import androidx.compose.material.icons.Icons
3644
import androidx.compose.material.icons.filled.ArrowBack
37-
import androidx.compose.material3.*
45+
import androidx.compose.material3.Button
46+
import androidx.compose.material3.ExperimentalMaterial3Api
47+
import androidx.compose.material3.Icon
48+
import androidx.compose.material3.IconButton
49+
import androidx.compose.material3.MaterialTheme
50+
import androidx.compose.material3.Scaffold
51+
import androidx.compose.material3.Text
52+
import androidx.compose.material3.TopAppBar
53+
import androidx.compose.material3.TopAppBarDefaults
54+
import androidx.compose.material3.surfaceColorAtElevation
3855
import androidx.compose.runtime.Composable
3956
import androidx.compose.runtime.getValue
4057
import androidx.compose.ui.Alignment
@@ -47,7 +64,12 @@ import androidx.compose.ui.text.style.TextOverflow
4764
import androidx.compose.ui.unit.dp
4865
import androidx.compose.ui.unit.sp
4966
import androidx.navigation.NavController
50-
import com.airbnb.lottie.compose.*
67+
import com.airbnb.lottie.compose.LottieAnimation
68+
import com.airbnb.lottie.compose.LottieCompositionResult
69+
import com.airbnb.lottie.compose.LottieCompositionSpec
70+
import com.airbnb.lottie.compose.LottieConstants
71+
import com.airbnb.lottie.compose.animateLottieCompositionAsState
72+
import com.airbnb.lottie.compose.rememberLottieComposition
5173
import com.starry.greenstash.MainActivity
5274
import com.starry.greenstash.R
5375
import com.starry.greenstash.utils.getActivity

0 commit comments

Comments
 (0)