Merge pull request #132 from YAPP-Github/release/2.1.0

[Release/2.1.0] (main)

Author: l5x5l

app/src/main/java/com/threegap/bitnagil/navigation/home/HomeBottomNavigationBar.kt

@@ -30,6 +30,7 @@ fun HomeBottomNavigationBar(
     navController: NavController,
 ) {
     val navBackStackEntry by navController.currentBackStackEntryAsState()
+    val currentRoute = navBackStackEntry?.destination?.route
 
     Column {
         HorizontalDivider(
@@ -52,11 +53,13 @@ fun HomeBottomNavigationBar(
                     icon = homeRoute.icon,
                     title = homeRoute.title,
                     onClick = {
-                        navController.navigate(homeRoute.route) {
-                            popUpTo(0) { inclusive = true }
+                        if (currentRoute != homeRoute.route) {
+                            navController.navigate(homeRoute.route) {
+                                popUpTo(0) { inclusive = true }
+                            }
                         }
                     },
-                    selected = navBackStackEntry?.destination?.route == homeRoute.route,
+                    selected = currentRoute == homeRoute.route,
                 )
             }
         }

core/designsystem/src/main/java/com/threegap/bitnagil/designsystem/typography/Type.kt

@@ -101,6 +101,13 @@ class BitnagilTypography internal constructor(
         lineHeight = 30,
         letterSpacing = (-0.5f),
     ),
+    private val _cafe24SsurroundAir2: BitnagilTextStyle = BitnagilTextStyle(
+        fontFamily = cafe24SsurroundAir,
+        fontWeight = FontWeight.Light,
+        fontSize = 16,
+        lineHeight = 24,
+        letterSpacing = (-0.5f),
+    ),
 ) {
     private val _headline1Bold = _headline1.copy(fontWeight = FontWeight.Bold)
     private val _headline1Medium = _headline1.copy(fontWeight = FontWeight.Medium)
@@ -163,6 +170,7 @@ class BitnagilTypography internal constructor(
     val button1: TextStyle @Composable get() = _button1.toDpTextStyle
     val button2: TextStyle @Composable get() = _button2.toDpTextStyle
     val cafe24SsurroundAir: TextStyle @Composable get() = _cafe24SsurroundAir.toDpTextStyle
+    val cafe24SsurroundAir2: TextStyle @Composable get() = _cafe24SsurroundAir2.toDpTextStyle
 }
 
 internal val LocalBitnagilTypography = staticCompositionLocalOf { BitnagilTypography() }