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 865f3a74..c604c0f9 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 @@ -93,6 +93,7 @@ import com.starry.greenstash.R import com.starry.greenstash.ui.screens.settings.viewmodels.SettingsViewModel import com.starry.greenstash.ui.screens.settings.viewmodels.ThemeMode import com.starry.greenstash.ui.theme.GreenStashTheme +import com.starry.greenstash.ui.theme.greenstashFont import com.starry.greenstash.widget.GoalWidget import dagger.hilt.android.AndroidEntryPoint import kotlinx.coroutines.ExperimentalCoroutinesApi @@ -109,7 +110,6 @@ class WidgetConfigActivity : AppCompatActivity() { private val viewModel: WidgetConfigViewModel by viewModels() private lateinit var settingsViewModel: SettingsViewModel - override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) @@ -162,6 +162,7 @@ class WidgetConfigActivity : AppCompatActivity() { text = stringResource(id = R.string.widget_config_screen_header), maxLines = 1, overflow = TextOverflow.Ellipsis, + fontFamily = greenstashFont ) }, navigationIcon = { IconButton(onClick = { @@ -222,6 +223,7 @@ class WidgetConfigActivity : AppCompatActivity() { text = stringResource(id = R.string.no_goal_set), fontWeight = FontWeight.Medium, fontSize = 18.sp, + fontFamily = greenstashFont, modifier = Modifier.padding(start = 12.dp, end = 12.dp) ) @@ -320,10 +322,10 @@ class WidgetConfigActivity : AppCompatActivity() { Column(modifier = Modifier.padding(8.dp)) { Text( text = title, - fontStyle = MaterialTheme.typography.headlineMedium.fontStyle, fontSize = 20.sp, fontWeight = FontWeight.SemiBold, maxLines = 1, + fontFamily = greenstashFont, overflow = TextOverflow.Ellipsis, color = MaterialTheme.colorScheme.onSurface, ) @@ -332,9 +334,9 @@ class WidgetConfigActivity : AppCompatActivity() { text = description, color = MaterialTheme.colorScheme.onSurface, maxLines = 1, - fontStyle = MaterialTheme.typography.bodySmall.fontStyle, + fontFamily = greenstashFont, fontWeight = FontWeight.Medium, - fontSize = 16.sp, + fontSize = 14.sp, ) Spacer(modifier = Modifier.height(8.dp)) diff --git a/app/src/main/res/drawable/progress_bar_rounded_corners.xml b/app/src/main/res/drawable/progress_bar_rounded_corners.xml index e172dbb1..cc97fff8 100644 --- a/app/src/main/res/drawable/progress_bar_rounded_corners.xml +++ b/app/src/main/res/drawable/progress_bar_rounded_corners.xml @@ -16,7 +16,7 @@ - + diff --git a/app/src/main/res/drawable/textview_border.xml b/app/src/main/res/drawable/textview_border.xml index 6bd8ede2..28befe8f 100644 --- a/app/src/main/res/drawable/textview_border.xml +++ b/app/src/main/res/drawable/textview_border.xml @@ -1,13 +1,11 @@ + - - - + + + android:top="5dp" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/widget_preview.png b/app/src/main/res/drawable/widget_preview.png index 1288ae9f..9c0ee519 100644 Binary files a/app/src/main/res/drawable/widget_preview.png and b/app/src/main/res/drawable/widget_preview.png differ diff --git a/app/src/main/res/drawable/widget_rounded_corners.xml b/app/src/main/res/drawable/widget_rounded_corners.xml new file mode 100644 index 00000000..8555f2f7 --- /dev/null +++ b/app/src/main/res/drawable/widget_rounded_corners.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/goal_widget.xml b/app/src/main/res/layout/goal_widget.xml index a33764d4..0c220ba1 100644 --- a/app/src/main/res/layout/goal_widget.xml +++ b/app/src/main/res/layout/goal_widget.xml @@ -1,10 +1,36 @@ + + + + @@ -25,11 +51,11 @@ android:orientation="vertical"> @@ -119,7 +147,8 @@ android:layout_height="wrap_content" android:layout_marginStart="3dp" android:background="@drawable/textview_border" - android:textColor="?android:attr/textColorPrimary" + android:fontFamily="@font/poppins_light" + android:textColor="?attr/colorOnPrimaryContainer" android:visibility="gone" tools:text="$253.45/week" tools:visibility="visible" /> @@ -130,6 +159,7 @@ android:id="@+id/widgetGoalAchieved" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:fontFamily="@font/poppins_regular" android:text="@string/info_card_goal_achieved" android:textAppearance="@style/TextAppearance.AppCompat.Body1" android:textColor="?android:attr/textColorPrimary" diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d8b29db7..e15bafcf 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -4,7 +4,7 @@ Confirm Cancel - OK + OK Oops! something went wrong. @@ -45,7 +45,7 @@ Congratulations 🥳 - You\'ve reached your saving goal! Your hard work and commitment have led to this well-deserved accomplishment. Celebrate your success! + You\'ve reached your saving goal! Your hard work and commitment have led to this well-deserved accomplishment. Celebrate your success! 🎉 Go back to home diff --git a/app/src/main/res/xml/goal_widget_info.xml b/app/src/main/res/xml/goal_widget_info.xml index 0a3696aa..7dda08cb 100644 --- a/app/src/main/res/xml/goal_widget_info.xml +++ b/app/src/main/res/xml/goal_widget_info.xml @@ -3,12 +3,12 @@ android:configure="com.starry.greenstash.widget.configuration.WidgetConfigActivity" android:description="@string/app_name" android:initialKeyguardLayout="@layout/goal_widget" - android:minWidth="110dp" + android:minWidth="160dp" android:minHeight="40dp" android:minResizeWidth="40dp" android:previewImage="@drawable/widget_preview" android:resizeMode="vertical|horizontal" - android:targetCellWidth="3" + android:targetCellWidth="4" android:targetCellHeight="2" android:updatePeriodMillis="3600000" android:widgetCategory="home_screen" /> \ No newline at end of file