diff --git a/app/src/main/java/com/starry/greenstash/ui/navigation/DrawerScreens.kt b/app/src/main/java/com/starry/greenstash/ui/navigation/DrawerScreens.kt
index e4d55a8b..6f9c628a 100644
--- a/app/src/main/java/com/starry/greenstash/ui/navigation/DrawerScreens.kt
+++ b/app/src/main/java/com/starry/greenstash/ui/navigation/DrawerScreens.kt
@@ -28,9 +28,9 @@ package com.starry.greenstash.ui.navigation
import com.starry.greenstash.R
sealed class DrawerScreens(val route: String, val nameResId: Int, val iconResId: Int) {
- object Home : DrawerScreens("home", R.string.drawer_home, R.drawable.ic_nav_home)
- object Backups : DrawerScreens("backups", R.string.drawer_backups, R.drawable.ic_nav_backups)
- object Settings :
+ data object Home : DrawerScreens("home", R.string.drawer_home, R.drawable.ic_nav_home)
+ data object Backups : DrawerScreens("backups", R.string.drawer_backups, R.drawable.ic_nav_backups)
+ data object Settings :
DrawerScreens("settings", R.string.drawer_settings, R.drawable.ic_nav_settings)
}
diff --git a/app/src/main/java/com/starry/greenstash/ui/navigation/Screens.kt b/app/src/main/java/com/starry/greenstash/ui/navigation/Screens.kt
index 566308d8..67d39cd7 100644
--- a/app/src/main/java/com/starry/greenstash/ui/navigation/Screens.kt
+++ b/app/src/main/java/com/starry/greenstash/ui/navigation/Screens.kt
@@ -29,19 +29,19 @@ const val EDIT_GOAL_ARG_KEY = "editGoal"
const val GOAL_INFO_ARG_KEY = "goalId"
sealed class Screens(val route: String) {
- object InputScreen : Screens("input_screen?$EDIT_GOAL_ARG_KEY={$EDIT_GOAL_ARG_KEY}") {
+ data object InputScreen : Screens("input_screen?$EDIT_GOAL_ARG_KEY={$EDIT_GOAL_ARG_KEY}") {
fun withGoalToEdit(goalId: String): String {
return route.replace("{$EDIT_GOAL_ARG_KEY}", goalId)
}
}
- object GoalInfoScreen : Screens("goal_info_screen/{$GOAL_INFO_ARG_KEY}") {
+ data object GoalInfoScreen : Screens("goal_info_screen/{$GOAL_INFO_ARG_KEY}") {
fun withGoalId(goalId: String): String {
return route.replace("{$GOAL_INFO_ARG_KEY}", goalId)
}
}
- object AboutScreen : Screens("about_screen")
- object OSLScreen : Screens("osl_screen")
- object WelcomeScreen : Screens("welcome_screen")
+ data object AboutScreen : Screens("about_screen")
+ data object OSLScreen : Screens("osl_screen")
+ data object WelcomeScreen : Screens("welcome_screen")
}
\ No newline at end of file
diff --git a/app/src/main/java/com/starry/greenstash/ui/screens/home/composables/GoalItem.kt b/app/src/main/java/com/starry/greenstash/ui/screens/home/composables/GoalItem.kt
index 6eccf87a..e6d3bfb3 100644
--- a/app/src/main/java/com/starry/greenstash/ui/screens/home/composables/GoalItem.kt
+++ b/app/src/main/java/com/starry/greenstash/ui/screens/home/composables/GoalItem.kt
@@ -63,6 +63,7 @@ import androidx.compose.ui.unit.sp
import coil.compose.AsyncImage
import coil.request.ImageRequest
import com.starry.greenstash.R
+import com.starry.greenstash.ui.theme.greenstashFont
@Composable
fun GoalItem(
@@ -148,7 +149,8 @@ fun GoalItem(
Text(
text = stringResource(id = R.string.deposit_button).uppercase(),
fontWeight = FontWeight.SemiBold,
- color = MaterialTheme.colorScheme.onSurface
+ color = MaterialTheme.colorScheme.onSurface,
+ fontFamily = greenstashFont
)
}
TextButton(
@@ -157,7 +159,8 @@ fun GoalItem(
Text(
text = stringResource(id = R.string.withdraw_button).uppercase(),
fontWeight = FontWeight.SemiBold,
- color = MaterialTheme.colorScheme.onSurface
+ color = MaterialTheme.colorScheme.onSurface,
+ fontFamily = greenstashFont
)
}
diff --git a/app/src/main/java/com/starry/greenstash/ui/screens/home/composables/HomeAppBars.kt b/app/src/main/java/com/starry/greenstash/ui/screens/home/composables/HomeAppBars.kt
index 8bc52098..833dc629 100644
--- a/app/src/main/java/com/starry/greenstash/ui/screens/home/composables/HomeAppBars.kt
+++ b/app/src/main/java/com/starry/greenstash/ui/screens/home/composables/HomeAppBars.kt
@@ -58,6 +58,7 @@ import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.dp
import com.starry.greenstash.R
import com.starry.greenstash.ui.screens.home.viewmodels.SearchWidgetState
+import com.starry.greenstash.ui.theme.greenstashFont
@ExperimentalMaterial3Api
@Composable
@@ -108,6 +109,7 @@ fun DefaultAppBar(
stringResource(id = R.string.home_screen_header),
maxLines = 1,
overflow = TextOverflow.Ellipsis,
+ fontFamily = greenstashFont
)
}, navigationIcon = {
IconButton(onClick = { onMenuClicked() }) {
diff --git a/app/src/main/java/com/starry/greenstash/ui/screens/home/composables/HomeScreen.kt b/app/src/main/java/com/starry/greenstash/ui/screens/home/composables/HomeScreen.kt
index 6d33b5bd..de1495db 100644
--- a/app/src/main/java/com/starry/greenstash/ui/screens/home/composables/HomeScreen.kt
+++ b/app/src/main/java/com/starry/greenstash/ui/screens/home/composables/HomeScreen.kt
@@ -117,6 +117,7 @@ import com.starry.greenstash.ui.screens.home.viewmodels.FilterField
import com.starry.greenstash.ui.screens.home.viewmodels.FilterSortType
import com.starry.greenstash.ui.screens.home.viewmodels.HomeViewModel
import com.starry.greenstash.ui.screens.home.viewmodels.SearchWidgetState
+import com.starry.greenstash.utils.Utils
import com.starry.greenstash.utils.isScrollingUp
import kotlinx.coroutines.ExperimentalCoroutinesApi
import kotlinx.coroutines.delay
@@ -197,18 +198,19 @@ fun HomeScreenContent(
Spacer(Modifier.height(14.dp))
Text(
- text = stringResource(id = R.string.app_name),
+ text = Utils.getGreeting(),
modifier = Modifier.padding(start = 16.dp, top = 12.dp),
- fontSize = 18.sp,
- fontWeight = FontWeight.Medium,
+ fontSize = 24.sp,
+ fontWeight = FontWeight.SemiBold,
+ color = MaterialTheme.colorScheme.onSurface
)
Divider(
- thickness = 1.dp,
+ thickness = 0.5.dp,
modifier = Modifier
.fillMaxWidth()
.padding(top = 16.dp, bottom = 16.dp),
- color = MaterialTheme.colorScheme.onSurface
+ color = MaterialTheme.colorScheme.onSurface.copy(alpha = 0.2f)
)
items.forEach { item ->
@@ -528,7 +530,7 @@ fun FilterMenuSheet(viewModel: HomeViewModel) {
)
Row(modifier = Modifier.fillMaxWidth()) {
Column(modifier = Modifier.weight(1f), verticalArrangement = Arrangement.Center) {
- FilterField.values().forEach {
+ FilterField.entries.forEach {
FilterButton(
text = it.name,
isSelected = it == viewModel.filterFlowData.value.filterField,
@@ -536,7 +538,7 @@ fun FilterMenuSheet(viewModel: HomeViewModel) {
}
}
Column(modifier = Modifier.weight(1f), verticalArrangement = Arrangement.Center) {
- FilterSortType.values().forEach {
+ FilterSortType.entries.forEach {
FilterButton(
text = it.name,
isSelected = viewModel.filterFlowData.value.sortType.name == it.name,
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 2c26fb25..81b5bf88 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
@@ -95,6 +95,7 @@ import com.starry.greenstash.ui.common.ExpandableCard
import com.starry.greenstash.ui.common.ExpandableTextCard
import com.starry.greenstash.ui.screens.info.viewmodels.InfoViewModel
import com.starry.greenstash.ui.screens.settings.viewmodels.ThemeMode
+import com.starry.greenstash.ui.theme.greenstashFont
import com.starry.greenstash.utils.Utils
import com.starry.greenstash.utils.getActivity
import kotlinx.coroutines.ExperimentalCoroutinesApi
@@ -121,6 +122,7 @@ fun GoalInfoScreen(goalId: String, navController: NavController) {
text = stringResource(id = R.string.info_screen_header),
maxLines = 1,
overflow = TextOverflow.Ellipsis,
+ fontFamily = greenstashFont
)
}, navigationIcon = {
IconButton(onClick = { navController.navigateUp() }) {
diff --git a/app/src/main/java/com/starry/greenstash/ui/screens/input/composables/InputScreen.kt b/app/src/main/java/com/starry/greenstash/ui/screens/input/composables/InputScreen.kt
index c329435b..701fc011 100644
--- a/app/src/main/java/com/starry/greenstash/ui/screens/input/composables/InputScreen.kt
+++ b/app/src/main/java/com/starry/greenstash/ui/screens/input/composables/InputScreen.kt
@@ -132,6 +132,7 @@ import com.starry.greenstash.database.goal.GoalPriority
import com.starry.greenstash.ui.common.SelectableChipGroup
import com.starry.greenstash.ui.navigation.DrawerScreens
import com.starry.greenstash.ui.screens.input.viewmodels.InputViewModel
+import com.starry.greenstash.ui.theme.greenstashFont
import com.starry.greenstash.utils.Utils
import com.starry.greenstash.utils.getActivity
import com.starry.greenstash.utils.hasNotificationPermission
@@ -237,6 +238,7 @@ fun InputScreen(editGoalId: String?, navController: NavController) {
text = topBarText,
maxLines = 1,
overflow = TextOverflow.Ellipsis,
+ fontFamily = greenstashFont
)
}, navigationIcon = {
IconButton(onClick = { navController.navigateUp() }) {
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 fb7e3e6b..7ea5adad 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
@@ -80,6 +80,7 @@ import com.starry.greenstash.R
import com.starry.greenstash.ui.navigation.Screens
import com.starry.greenstash.ui.screens.settings.viewmodels.DateStyle
import com.starry.greenstash.ui.screens.settings.viewmodels.ThemeMode
+import com.starry.greenstash.ui.theme.greenstashFont
import com.starry.greenstash.utils.Utils
import com.starry.greenstash.utils.getActivity
import com.starry.greenstash.utils.toToast
@@ -110,7 +111,8 @@ fun SettingsScreen(navController: NavController) {
Text(
stringResource(id = R.string.settings_screen_header),
maxLines = 1,
- overflow = TextOverflow.Ellipsis
+ overflow = TextOverflow.Ellipsis,
+ fontFamily = greenstashFont
)
}, navigationIcon = {
IconButton(onClick = { navController.navigateUp() }) {
diff --git a/app/src/main/java/com/starry/greenstash/ui/theme/Type.kt b/app/src/main/java/com/starry/greenstash/ui/theme/Type.kt
index d86e5857..48e22f89 100644
--- a/app/src/main/java/com/starry/greenstash/ui/theme/Type.kt
+++ b/app/src/main/java/com/starry/greenstash/ui/theme/Type.kt
@@ -27,14 +27,49 @@ package com.starry.greenstash.ui.theme
import androidx.compose.material3.Typography
import androidx.compose.ui.text.TextStyle
+import androidx.compose.ui.text.font.Font
import androidx.compose.ui.text.font.FontFamily
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.unit.sp
+import com.starry.greenstash.R
+
+val greenstashFont = FontFamily(
+ listOf(
+ Font(
+ resId = R.font.redhatdisplay_black,
+ weight = FontWeight.Black
+ ),
+ Font(
+ resId = R.font.redhatdisplay_bold,
+ weight = FontWeight.Bold
+ ),
+ Font(
+ resId = R.font.redhatdisplay_extrabold,
+ weight = FontWeight.ExtraBold
+ ),
+ Font(
+ resId = R.font.redhatdisplay_light,
+ weight = FontWeight.Light
+ ),
+ Font(
+ resId = R.font.redhatdisplay_medium,
+ weight = FontWeight.Medium
+ ),
+ Font(
+ resId = R.font.redhatdisplay_regular,
+ weight = FontWeight.Normal
+ ),
+ Font(
+ resId = R.font.redhatdisplay_semibold,
+ weight = FontWeight.SemiBold
+ ),
+ )
+)
// Set of Material typography styles to start with
val Typography = Typography(
bodyLarge = TextStyle(
- fontFamily = FontFamily.Default,
+ fontFamily = greenstashFont,
fontWeight =
FontWeight.Normal,
fontSize = 16.sp,
diff --git a/app/src/main/java/com/starry/greenstash/utils/Utils.kt b/app/src/main/java/com/starry/greenstash/utils/Utils.kt
index 268d775b..6e42e1e4 100644
--- a/app/src/main/java/com/starry/greenstash/utils/Utils.kt
+++ b/app/src/main/java/com/starry/greenstash/utils/Utils.kt
@@ -32,6 +32,8 @@ import androidx.biometric.BiometricManager.Authenticators.DEVICE_CREDENTIAL
import java.math.RoundingMode
import java.text.DecimalFormat
import java.text.DecimalFormatSymbols
+import java.text.SimpleDateFormat
+import java.util.Date
import java.util.Locale
object Utils {
@@ -75,4 +77,17 @@ object Utils {
} else {
BIOMETRIC_STRONG or DEVICE_CREDENTIAL
}
+
+ fun getGreeting(): String {
+ val currentTime = System.currentTimeMillis()
+ val simpleDateFormat = SimpleDateFormat("HH", Locale.US)
+
+ return when (simpleDateFormat.format(Date(currentTime)).toInt()) {
+ in 0..11 -> "Good Morning!"
+ in 12..16 -> "Good Afternoon!"
+ in 17..20 -> "Good Evening!"
+ else -> "Good Night!"
+ }
+ }
+
}
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_goal_delete.xml b/app/src/main/res/drawable/ic_goal_delete.xml
index 92001b4d..0906950c 100644
--- a/app/src/main/res/drawable/ic_goal_delete.xml
+++ b/app/src/main/res/drawable/ic_goal_delete.xml
@@ -1,9 +1,15 @@
+
+
+ android:fillColor="#1C274C"
+ android:pathData="M3 6.38597C3 5.90152 3.34538 5.50879 3.77143 5.50879L6.43567 5.50832C6.96502 5.49306 7.43202 5.11033 7.61214 4.54412C7.61688 4.52923 7.62232 4.51087 7.64185 4.44424L7.75665 4.05256C7.8269 3.81241 7.8881 3.60318 7.97375 3.41617C8.31209 2.67736 8.93808 2.16432 9.66147 2.03297C9.84457 1.99972 10.0385 1.99986 10.2611 2.00002H13.7391C13.9617 1.99986 14.1556 1.99972 14.3387 2.03297C15.0621 2.16432 15.6881 2.67736 16.0264 3.41617C16.1121 3.60318 16.1733 3.81241 16.2435 4.05256L16.3583 4.44424C16.3778 4.51087 16.3833 4.52923 16.388 4.54412C16.5682 5.11033 17.1278 5.49353 17.6571 5.50879H20.2286C20.6546 5.50879 21 5.90152 21 6.38597C21 6.87043 20.6546 7.26316 20.2286 7.26316H3.77143C3.34538 7.26316 3 6.87043 3 6.38597Z" />
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_goal_edit.xml b/app/src/main/res/drawable/ic_goal_edit.xml
index 4fedcd4d..ebcafd9c 100644
--- a/app/src/main/res/drawable/ic_goal_edit.xml
+++ b/app/src/main/res/drawable/ic_goal_edit.xml
@@ -1,9 +1,14 @@
+
+
+ android:fillColor="#1C274C"
+ android:pathData="M11.4001 18.1612L11.4001 18.1612L18.796 10.7653C17.7894 10.3464 16.5972 9.6582 15.4697 8.53068C14.342 7.40298 13.6537 6.21058 13.2348 5.2039L5.83882 12.5999L5.83879 12.5999C5.26166 13.1771 4.97307 13.4657 4.7249 13.7838C4.43213 14.1592 4.18114 14.5653 3.97634 14.995C3.80273 15.3593 3.67368 15.7465 3.41556 16.5208L2.05445 20.6042C1.92743 20.9852 2.0266 21.4053 2.31063 21.6894C2.59466 21.9734 3.01478 22.0726 3.39584 21.9456L7.47918 20.5844C8.25351 20.3263 8.6407 20.1973 9.00498 20.0237C9.43469 19.8189 9.84082 19.5679 10.2162 19.2751C10.5343 19.0269 10.823 18.7383 11.4001 18.1612Z" />
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_goal_info.xml b/app/src/main/res/drawable/ic_goal_info.xml
index e3d03104..1ba50119 100644
--- a/app/src/main/res/drawable/ic_goal_info.xml
+++ b/app/src/main/res/drawable/ic_goal_info.xml
@@ -1,9 +1,12 @@
+
+
+ android:fillColor="#1C274C"
+ android:fillType="evenOdd"
+ android:pathData="M22 12C22 17.5228 17.5228 22 12 22C6.47715 22 2 17.5228 2 12C2 6.47715 6.47715 2 12 2C17.5228 2 22 6.47715 22 12ZM12 17.75C12.4142 17.75 12.75 17.4142 12.75 17V11C12.75 10.5858 12.4142 10.25 12 10.25C11.5858 10.25 11.25 10.5858 11.25 11V17C11.25 17.4142 11.5858 17.75 12 17.75ZM12 7C12.5523 7 13 7.44772 13 8C13 8.55228 12.5523 9 12 9C11.4477 9 11 8.55228 11 8C11 7.44772 11.4477 7 12 7Z" />
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_nav_backups.xml b/app/src/main/res/drawable/ic_nav_backups.xml
index 09ca29eb..7c945841 100644
--- a/app/src/main/res/drawable/ic_nav_backups.xml
+++ b/app/src/main/res/drawable/ic_nav_backups.xml
@@ -1,10 +1,14 @@
+
+
-
+ android:fillColor="#1C274C"
+ android:pathData="M16.7137 2.12656C15.8784 1.69663 14.7918 2.39036 12.6187 3.77783L12.0565 4.13679C11.4389 4.53106 11.1301 4.7282 10.7836 4.78478C10.4371 4.84135 10.092 4.75097 9.40191 4.57019L8.77361 4.4056C6.34506 3.76944 5.13079 3.45136 4.43551 4.1312C3.74024 4.81103 4.02442 6.03855 4.59279 8.4936L4.73983 9.12875C4.90135 9.82639 4.9821 10.1752 4.91653 10.5216C4.85096 10.868 4.64648 11.1727 4.23754 11.7821L3.86521 12.3369C2.42609 14.4815 1.70653 15.5538 2.11218 16.4039C2.51782 17.254 3.78002 17.3189 6.30442 17.4487L6.95753 17.4823C7.67487 17.5192 8.03356 17.5377 8.33956 17.6952C8.64557 17.8526 8.86425 18.1314 9.30163 18.6888L9.69981 19.1963C11.2389 21.1578 12.0085 22.1386 12.9545 21.9842C13.9005 21.8297 14.3964 20.6423 15.3882 18.2675L15.6448 17.6531C15.9266 16.9783 16.0675 16.6409 16.3222 16.3918C16.5769 16.1428 16.9165 16.0104 17.5958 15.7454L18.2142 15.5043C20.6046 14.572 21.7997 14.1059 21.9787 13.1603C22.1577 12.2148 21.202 11.416 19.2906 9.81846L18.7961 9.40516C18.2529 8.9512 17.9813 8.7242 17.8327 8.4128C17.6841 8.10139 17.6753 7.74082 17.6578 7.01967L17.6418 6.36312C17.58 3.82537 17.5491 2.5565 16.7137 2.12656Z" />
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_nav_home.xml b/app/src/main/res/drawable/ic_nav_home.xml
index 993f3ab0..c6643e5a 100644
--- a/app/src/main/res/drawable/ic_nav_home.xml
+++ b/app/src/main/res/drawable/ic_nav_home.xml
@@ -1,10 +1,10 @@
-
+ android:fillColor="#1C274C"
+ android:fillType="evenOdd"
+ android:pathData="M2.519,7.823C2,8.771 2,9.915 2,12.204V13.725C2,17.626 2,19.576 3.172,20.788C4.343,22 6.229,22 10,22H14C17.771,22 19.657,22 20.828,20.788C22,19.576 22,17.626 22,13.725V12.204C22,9.915 22,8.771 21.481,7.823C20.962,6.874 20.013,6.286 18.116,5.108L16.116,3.867C14.111,2.622 13.108,2 12,2C10.892,2 9.889,2.622 7.884,3.867L5.884,5.108C3.987,6.286 3.038,6.874 2.519,7.823ZM9.447,15.398C9.114,15.151 8.644,15.221 8.397,15.553C8.151,15.886 8.221,16.356 8.553,16.603C9.526,17.323 10.715,17.75 12,17.75C13.285,17.75 14.474,17.323 15.447,16.603C15.779,16.356 15.849,15.886 15.602,15.553C15.356,15.221 14.886,15.151 14.553,15.398C13.825,15.937 12.946,16.25 12,16.25C11.054,16.25 10.175,15.937 9.447,15.398Z" />
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/ic_nav_settings.xml b/app/src/main/res/drawable/ic_nav_settings.xml
index b0a938c0..1ee6b02f 100644
--- a/app/src/main/res/drawable/ic_nav_settings.xml
+++ b/app/src/main/res/drawable/ic_nav_settings.xml
@@ -1,10 +1,10 @@
-
+ android:fillColor="#1C274C"
+ android:fillType="evenOdd"
+ android:pathData="M14.279,2.152C13.908,2 13.439,2 12.5,2C11.561,2 11.092,2 10.721,2.152C10.227,2.355 9.835,2.745 9.631,3.235C9.537,3.458 9.501,3.718 9.486,4.098C9.465,4.656 9.177,5.172 8.69,5.451C8.203,5.73 7.609,5.72 7.111,5.459C6.773,5.281 6.528,5.183 6.286,5.151C5.756,5.082 5.22,5.224 4.796,5.547C4.478,5.789 4.243,6.193 3.774,7C3.304,7.807 3.07,8.21 3.017,8.605C2.948,9.131 3.091,9.663 3.417,10.083C3.565,10.276 3.774,10.437 4.098,10.639C4.574,10.936 4.88,11.442 4.88,12C4.88,12.558 4.574,13.064 4.098,13.361C3.774,13.563 3.565,13.724 3.416,13.917C3.091,14.337 2.947,14.869 3.017,15.395C3.07,15.789 3.304,16.193 3.774,17C4.243,17.807 4.478,18.211 4.796,18.453C5.22,18.776 5.756,18.918 6.286,18.849C6.528,18.817 6.773,18.719 7.111,18.541C7.609,18.28 8.203,18.27 8.69,18.549C9.177,18.828 9.465,19.344 9.486,19.902C9.501,20.281 9.537,20.542 9.631,20.765C9.835,21.255 10.227,21.645 10.721,21.848C11.092,22 11.561,22 12.5,22C13.439,22 13.908,22 14.279,21.848C14.773,21.645 15.165,21.255 15.369,20.765C15.463,20.542 15.499,20.281 15.514,19.902C15.535,19.344 15.823,18.828 16.31,18.549C16.797,18.27 17.391,18.28 17.889,18.541C18.227,18.719 18.472,18.817 18.714,18.849C19.244,18.918 19.78,18.776 20.204,18.453C20.522,18.211 20.757,17.807 21.226,17C21.696,16.193 21.93,15.789 21.983,15.395C22.052,14.869 21.909,14.337 21.583,13.916C21.435,13.724 21.226,13.563 20.902,13.361C20.426,13.064 20.12,12.558 20.12,12C20.12,11.442 20.426,10.936 20.902,10.639C21.226,10.437 21.435,10.276 21.584,10.083C21.909,9.663 22.052,9.131 21.983,8.605C21.93,8.211 21.696,7.807 21.226,7C20.757,6.193 20.522,5.789 20.204,5.547C19.78,5.224 19.244,5.082 18.714,5.151C18.472,5.183 18.227,5.281 17.889,5.459C17.392,5.72 16.797,5.73 16.31,5.451C15.823,5.172 15.535,4.656 15.514,4.098C15.499,3.718 15.463,3.458 15.369,3.235C15.165,2.745 14.773,2.355 14.279,2.152ZM12.5,15C14.17,15 15.523,13.657 15.523,12C15.523,10.343 14.17,9 12.5,9C10.83,9 9.477,10.343 9.477,12C9.477,13.657 10.83,15 12.5,15Z" />
+
\ No newline at end of file
diff --git a/app/src/main/res/font/redhatdisplay_black.ttf b/app/src/main/res/font/redhatdisplay_black.ttf
new file mode 100644
index 00000000..c2e6c8a6
Binary files /dev/null and b/app/src/main/res/font/redhatdisplay_black.ttf differ
diff --git a/app/src/main/res/font/redhatdisplay_bold.ttf b/app/src/main/res/font/redhatdisplay_bold.ttf
new file mode 100644
index 00000000..c9520566
Binary files /dev/null and b/app/src/main/res/font/redhatdisplay_bold.ttf differ
diff --git a/app/src/main/res/font/redhatdisplay_bolditalic.ttf b/app/src/main/res/font/redhatdisplay_bolditalic.ttf
new file mode 100644
index 00000000..428c430f
Binary files /dev/null and b/app/src/main/res/font/redhatdisplay_bolditalic.ttf differ
diff --git a/app/src/main/res/font/redhatdisplay_extrabold.ttf b/app/src/main/res/font/redhatdisplay_extrabold.ttf
new file mode 100644
index 00000000..53fa55a3
Binary files /dev/null and b/app/src/main/res/font/redhatdisplay_extrabold.ttf differ
diff --git a/app/src/main/res/font/redhatdisplay_italic.ttf b/app/src/main/res/font/redhatdisplay_italic.ttf
new file mode 100644
index 00000000..353c11c9
Binary files /dev/null and b/app/src/main/res/font/redhatdisplay_italic.ttf differ
diff --git a/app/src/main/res/font/redhatdisplay_light.ttf b/app/src/main/res/font/redhatdisplay_light.ttf
new file mode 100644
index 00000000..fe33d8ac
Binary files /dev/null and b/app/src/main/res/font/redhatdisplay_light.ttf differ
diff --git a/app/src/main/res/font/redhatdisplay_medium.ttf b/app/src/main/res/font/redhatdisplay_medium.ttf
new file mode 100644
index 00000000..032e44d3
Binary files /dev/null and b/app/src/main/res/font/redhatdisplay_medium.ttf differ
diff --git a/app/src/main/res/font/redhatdisplay_regular.ttf b/app/src/main/res/font/redhatdisplay_regular.ttf
new file mode 100644
index 00000000..a1cee815
Binary files /dev/null and b/app/src/main/res/font/redhatdisplay_regular.ttf differ
diff --git a/app/src/main/res/font/redhatdisplay_semibold.ttf b/app/src/main/res/font/redhatdisplay_semibold.ttf
new file mode 100644
index 00000000..da13756d
Binary files /dev/null and b/app/src/main/res/font/redhatdisplay_semibold.ttf differ