Merge pull request #563 from UseHover/development

v1.12.16

Author: alexosugo

app/build.gradle

@@ -45,8 +45,8 @@ android {
         applicationId "com.hover.stax"
         minSdk 21
         targetSdk 32
-        versionCode 173
-        versionName "1.12.15"
+        versionCode 174
+        versionName "1.12.16"
 
         vectorDrawables.useSupportLibrary = true
         multiDexEnabled true

app/src/main/java/com/hover/stax/presentation/home/HomeScreen.kt

@@ -186,52 +186,69 @@ fun PrimaryFeatures(
 @Composable
 private fun FinancialTipCard(
     tipInterface: FinancialTipClickInterface?,
-    financialTip: FinancialTip
+    financialTip: FinancialTip,
+    homeViewModel: HomeViewModel?
 ) {
     val size13 = dimensionResource(id = R.dimen.margin_13)
-    Card(elevation = 0.dp, modifier = Modifier.padding(all = size13)) {
-        Row(modifier = Modifier
-            .padding(all = size13)
-            .clickable { tipInterface?.onTipClicked(null) }) {
 
-            Column(modifier = Modifier.weight(1f)) {
+    Card(elevation = 0.dp, modifier = Modifier.padding(all = size13)) {
+        Column {
+            Row(modifier = Modifier
+                .fillMaxWidth()
+                .padding(all = size13)) {
                 HorizontalImageTextView(
                     drawable = R.drawable.ic_tip_of_day,
                     stringRes = R.string.tip_of_the_day,
-                    Modifier.padding(bottom = 5.dp),
+                    Modifier.weight(1f),
                     MaterialTheme.typography.button
                 )
 
-                Spacer(modifier = Modifier.height(10.dp))
-
-                Text(
-                    text = financialTip.title,
-                    style = MaterialTheme.typography.body2,
-                    textDecoration = TextDecoration.Underline
-                )
+                Image(painter = painterResource(id = R.drawable.ic_close_white),
+                    contentDescription = null,
+                    alignment = Alignment.CenterEnd,
+                    modifier = Modifier.clickable { homeViewModel?.dismissTip(financialTip.id) })
+            }
 
-                Spacer(modifier = Modifier.height(8.dp))
+            Row(modifier = Modifier
+                .padding(horizontal = size13)
+                .clickable { tipInterface?.onTipClicked(null) }) {
+
+                Column(modifier = Modifier.weight(1f)) {
+                    Spacer(modifier = Modifier.height(10.dp))
+
+                    Text(
+                        text = financialTip.title,
+                        style = MaterialTheme.typography.body2,
+                        textDecoration = TextDecoration.Underline
+                    )
+
+                    Spacer(modifier = Modifier.height(8.dp))
+
+                    Text(
+                        text = financialTip.snippet,
+                        style = MaterialTheme.typography.body2,
+                        maxLines = 2,
+                        overflow = TextOverflow.Ellipsis,
+                        modifier = Modifier.padding(bottom = size13, top = 3.dp)
+                    )
+
+                    Text(text = stringResource(id = R.string.read_more),
+                        color = colorResource(id = R.color.brightBlue),
+                        modifier = Modifier
+                            .padding(bottom = size13)
+                            .clickable { tipInterface?.onTipClicked(financialTip.id) }
+                    )
+                }
 
-                Text(
-                    text = financialTip.snippet,
-                    style = MaterialTheme.typography.body2,
-                    maxLines = 2,
-                    overflow = TextOverflow.Ellipsis,
-                    modifier = Modifier.padding(bottom = size13, top = 3.dp)
+                Image(
+                    painter = painterResource(id = R.drawable.tips_fancy_icon),
+                    contentDescription = null,
+                    modifier = Modifier
+                        .size(60.dp)
+                        .padding(start = size13)
+                        .align(Alignment.CenterVertically),
                 )
-                Text(text = stringResource(id = R.string.read_more),
-                    color = colorResource(id = R.color.brightBlue),
-                    modifier = Modifier.clickable { tipInterface?.onTipClicked(financialTip.id) })
             }
-
-            Image(
-                painter = painterResource(id = R.drawable.tips_fancy_icon),
-                contentDescription = null,
-                modifier = Modifier
-                    .size(60.dp)
-                    .padding(start = size13)
-                    .align(Alignment.CenterVertically),
-            )
         }
     }
 }
@@ -372,10 +389,12 @@ fun HomeScreen(
                             homeState.financialTips.firstOrNull {
                                 android.text.format.DateUtils.isToday(it.date!!)
                             }?.let {
-                                FinancialTipCard(
-                                    tipInterface = tipInterface,
-                                    financialTip = homeState.financialTips.first()
-                                )
+                                if (homeState.dismissedTipId != it.id)
+                                    FinancialTipCard(
+                                        tipInterface = tipInterface,
+                                        financialTip = homeState.financialTips.first(),
+                                        homeViewModel
+                                    )
                             }
                         }
                     }
@@ -435,7 +454,7 @@ fun HomeScreenPreview() {
                             BalanceScreenPreview()
                         }
                         item {
-                            FinancialTipCard(tipInterface = null, financialTip = financialTip)
+                            FinancialTipCard(tipInterface = null, financialTip = financialTip, null)
                         }
                     })
                 })