Merge pull request #188 from YAPP-admin/release/1.1.0

Release/1.1.0 to main

Author: DongChyeon

.gitignore

@@ -112,6 +112,8 @@ captures/
 
 # Google Services (e.g. APIs or Firebase)
 app/google-services.json
+app/src/debug/google-services.json
+app/src/qa/google-services.json
 
 # Android Patch
 gen-external-apklibs
@@ -171,3 +173,5 @@ fabric.properties
 yapp_attendance_keystore
 .github/api-play-store-key.json
 fastlane/.env
+
+output-metadata.json

app/build.gradle.kts

@@ -23,31 +23,43 @@ android {
 
     defaultConfig {
         applicationId = "com.yapp.app.official"
-        versionCode = 2
-        versionName = "1.0.0"
+        versionCode = 5
+        versionName = "1.1.0"
 
         targetSdk = 35
     }
     buildTypes {
-        getByName("release") {
-            signingConfig = signingConfigs.getByName("release")
+        getByName("debug") {
+            applicationIdSuffix = ".dev"
+            isDebuggable = true
         }
 
         create("qa") {
             initWith(getByName("release"))
+            applicationIdSuffix = ".qa"
             signingConfig = signingConfigs.getByName("release")
             matchingFallbacks += listOf("release")
+            isDebuggable = true
+        }
+
+        getByName("release") {
+            signingConfig = signingConfigs.getByName("release")
         }
     }
 }
 
 dependencies {
     implementation(projects.feature.home)
+    implementation(projects.feature.schedule)
     implementation(projects.feature.notice)
+    implementation(projects.feature.profile)
     implementation(projects.feature.signup)
     implementation(projects.feature.login)
+    implementation(projects.feature.history)
+    implementation(projects.feature.setting)
     implementation(projects.core.designsystem)
-    implementation(projects.core.data) // For di
+    implementation(projects.core.ui)
+    implementation(projects.core.data)
     implementation(projects.core.dataApi)
     implementation(projects.core.domain)
     implementation(projects.core.commonAndroid)

app/src/debug/res/values/strings.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_name">Yapp Official DEV</string>
+</resources>

app/src/main/java/com/yapp/app/YappApp.kt

@@ -0,0 +1,152 @@
+package com.yapp.app
+
+import android.widget.Toast
+import androidx.compose.animation.AnimatedVisibility
+import androidx.compose.animation.slideInVertically
+import androidx.compose.animation.slideOutVertically
+import androidx.compose.foundation.layout.WindowInsets
+import androidx.compose.foundation.layout.consumeWindowInsets
+import androidx.compose.foundation.layout.navigationBars
+import androidx.compose.foundation.layout.padding
+import androidx.compose.material3.Scaffold
+import androidx.compose.runtime.Composable
+import androidx.compose.runtime.getValue
+import androidx.compose.runtime.mutableStateOf
+import androidx.compose.runtime.remember
+import androidx.compose.runtime.setValue
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.platform.LocalContext
+import androidx.compose.ui.platform.LocalUriHandler
+import androidx.compose.ui.unit.dp
+import androidx.hilt.navigation.compose.hiltViewModel
+import androidx.navigation.NavDestination
+import androidx.navigation.NavDestination.Companion.hasRoute
+import androidx.navigation.NavDestination.Companion.hierarchy
+import com.yapp.app.official.YappAppViewModel
+import com.yapp.app.official.navigation.TopLevelDestination
+import com.yapp.app.official.navigation.YappNavHost
+import com.yapp.app.official.ui.NavigatorState
+import com.yapp.core.designsystem.component.alert.YappAlertLongDialog
+import com.yapp.core.ui.R
+import com.yapp.core.ui.component.BottomNavigationBar
+import com.yapp.core.ui.component.BottomNavigationBarItem
+import com.yapp.core.ui.extension.safeOpenUri
+import kotlin.reflect.KClass
+
+
+@Composable
+fun YappApp(
+    navigator: NavigatorState,
+    viewModel: YappAppViewModel = hiltViewModel()
+) {
+
+    var showCommonErrorDialog by remember {
+        mutableStateOf(false)
+    }
+
+    val uriHandler = LocalUriHandler.current
+    val context = LocalContext.current
+
+    Scaffold(
+        bottomBar = {
+            AnimatedVisibility(
+                visible = navigator.shouldShowBottomBar,
+                enter = slideInVertically { it },
+                exit = slideOutVertically { it },
+            ) {
+                val destinations = TopLevelDestination.entries
+                YappBottomNavigationBar(
+                    destinations = destinations,
+                    currentDestination = navigator.currentDestination,
+                    onNavigateToDestination = { destination ->
+                        navigator.navigateToTopLevelDestination(destination)
+                    }
+                )
+            }
+        },
+        contentWindowInsets = WindowInsets(0.dp),
+    ) { padding ->
+        YappNavHost(
+            navigator = navigator,
+            modifier = Modifier
+                .padding(padding)
+                .consumeWindowInsets(
+                    WindowInsets(0.dp).takeIf { !navigator.shouldShowBottomBar } ?: WindowInsets.navigationBars
+                ),
+            handleException = { showCommonErrorDialog = true }
+        )
+    }
+
+    if (showCommonErrorDialog) {
+        CommonErrorDialog(
+            onDismissRequest = { showCommonErrorDialog = false },
+            onActionButtonClick = { showCommonErrorDialog = false },
+            onRecommendActionButtonClick = {
+                viewModel.onCommonErrorDialogRecommendActionButtonClick(
+                    onSuccess = {
+                        uriHandler.safeOpenUri(it)
+                    },
+                    onError = {
+                        Toast.makeText(
+                            context,
+                            context.getString(R.string.toast_message_error_loading_url),
+                            Toast.LENGTH_SHORT
+                        ).show()
+                    }
+                )
+            }
+        )
+    }
+}
+
+@Composable
+private fun CommonErrorDialog(
+    onDismissRequest: () -> Unit,
+    onActionButtonClick: () -> Unit,
+    onRecommendActionButtonClick: () -> Unit,
+) {
+    YappAlertLongDialog(
+        onDismissRequest = onDismissRequest,
+        title = "앗! 예기치 못한 오류가 발생했어요.",
+        body = "재시도 후에도 같은 문제가 발생한다면, \n" +
+                "개발팀에 제보해주세요! \n" +
+                "서비스 품질 향상에 큰 도움이 됩니다 :) ",
+        recommendActionButtonText = "제보하러 가기",
+        actionButtonText = "닫기",
+        onRecommendActionButtonClick = onRecommendActionButtonClick,
+        onActionButtonClick = onActionButtonClick,
+    )
+}
+
+@Composable
+private fun YappBottomNavigationBar(
+    modifier: Modifier = Modifier,
+    destinations: List<TopLevelDestination>,
+    currentDestination: NavDestination?,
+    onNavigateToDestination: (TopLevelDestination) -> Unit
+) {
+    BottomNavigationBar(
+        modifier = modifier
+    ) {
+        destinations.forEach { destination ->
+            val selected = currentDestination.isRouteInHierarchy(destination.baseRoute)
+
+            BottomNavigationBarItem(
+                selected = selected,
+                iconTextId = destination.iconTextId,
+                selectedIcon = destination.selectedIcon,
+                unselectedIcon = destination.unselectedIcon,
+                onClick = {
+                    if (!selected) {
+                        onNavigateToDestination(destination)
+                    }
+                },
+            )
+        }
+    }
+}
+
+private fun NavDestination?.isRouteInHierarchy(route: KClass<*>) =
+    this?.hierarchy?.any {
+        it.hasRoute(route)
+    } ?: false

app/src/main/java/com/yapp/app/official/MainActivity.kt

@@ -1,35 +1,35 @@
 package com.yapp.app.official
 
+import android.content.Intent
 import android.content.pm.PackageManager
 import android.os.Build
-import android.content.Intent
 import android.os.Bundle
 import androidx.activity.ComponentActivity
 import androidx.activity.compose.setContent
 import androidx.activity.enableEdgeToEdge
+import androidx.activity.result.contract.ActivityResultContracts
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.LaunchedEffect
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.setValue
 import androidx.compose.ui.res.stringResource
-import androidx.activity.result.contract.ActivityResultContracts
 import androidx.core.content.ContextCompat
-import com.yapp.app.official.ui.YappApp
+import androidx.core.net.toUri
+import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
+import com.yapp.app.YappApp
 import com.yapp.app.official.ui.rememberNavigator
-import com.yapp.core.designsystem.component.alert.YappAlertDialog
+import com.yapp.core.designsystem.component.alert.YappAlertShortDialog
 import com.yapp.core.designsystem.theme.YappTheme
 import com.yapp.dataapi.OperationsRepository
+import com.yapp.domain.CheckLoginStatusUseCase
 import com.yapp.domain.UpdateDeviceAlarmUseCase
 import com.yapp.domain.runCatchingIgnoreCancelled
+import com.yapp.feature.home.navigation.HomeRoute
 import dagger.hilt.android.AndroidEntryPoint
 import kotlinx.coroutines.MainScope
 import kotlinx.coroutines.launch
 import javax.inject.Inject
-import androidx.core.net.toUri
-import androidx.core.splashscreen.SplashScreen.Companion.installSplashScreen
-import com.yapp.domain.CheckLoginStatusUseCase
-import com.yapp.feature.home.navigation.HomeRoute
 
 
 @AndroidEntryPoint
@@ -43,12 +43,13 @@ class MainActivity : ComponentActivity() {
     @Inject
     lateinit var checkLoginStatusUseCase: CheckLoginStatusUseCase
 
-    private var showForceUpdateDialog by mutableStateOf(false)
-
     private val scope = MainScope()
 
+    private var showForceUpdateDialog by mutableStateOf(false)
+
     private var showSplashScreen by mutableStateOf(true)
 
+
     private val requestPermissionLauncher = registerForActivityResult(
         contract = ActivityResultContracts.RequestPermission(),
         callback = { }
@@ -95,7 +96,7 @@ class MainActivity : ComponentActivity() {
 
     @Composable
     private fun ForceUpdateDialog() {
-        YappAlertDialog(
+        YappAlertShortDialog(
             onDismissRequest = {},
             title = stringResource(R.string.main_activity_force_update_dialog_title),
             body = stringResource(R.string.main_activity_force_update_dialog_body),

app/src/main/java/com/yapp/app/official/YappAppViewModel.kt

@@ -0,0 +1,29 @@
+package com.yapp.app.official
+
+import androidx.lifecycle.ViewModel
+import androidx.lifecycle.viewModelScope
+import com.yapp.core.common.android.record
+import com.yapp.dataapi.OperationsRepository
+import com.yapp.domain.runCatchingIgnoreCancelled
+import dagger.hilt.android.lifecycle.HiltViewModel
+import kotlinx.coroutines.launch
+import javax.inject.Inject
+
+@HiltViewModel
+class YappAppViewModel @Inject constructor(
+    private val operationsRepository: OperationsRepository,
+) : ViewModel() {
+
+    fun onCommonErrorDialogRecommendActionButtonClick(
+        onSuccess: (String) -> Unit,
+        onError: (Throwable) -> Unit,
+    ) = viewModelScope.launch {
+        runCatchingIgnoreCancelled {
+            operationsRepository.getUsageInquiryLink()
+        }.onSuccess(onSuccess)
+            .onFailure {
+                onError(it)
+                it.record()
+            }
+    }
+}

app/src/main/java/com/yapp/app/official/navigation/TopLevelDestination.kt

@@ -0,0 +1,39 @@
+package com.yapp.app.official.navigation
+
+import androidx.annotation.DrawableRes
+import androidx.annotation.StringRes
+import com.yapp.app.official.R
+import kotlin.reflect.KClass
+
+enum class TopLevelDestination(
+    @DrawableRes val selectedIcon: Int,
+    @DrawableRes val unselectedIcon: Int,
+    @StringRes val iconTextId: Int,
+    val route: KClass<*>,
+    val baseRoute: KClass<*> = route,
+) {
+    HOME(
+        selectedIcon = R.drawable.icon_home_selected,
+        unselectedIcon = R.drawable.icon_home_unselected,
+        iconTextId = R.string.menu_home,
+        route = com.yapp.feature.home.navigation.HomeRoute::class,
+    ),
+    SCHEDULE(
+        selectedIcon = R.drawable.icon_schedule_selected,
+        unselectedIcon = R.drawable.icon_schedule_unselected,
+        iconTextId = R.string.menu_schedule,
+        route = com.yapp.feature.schedule.navigation.ScheduleRoute::class,
+    ),
+    BOARD(
+        selectedIcon = R.drawable.icon_board_selected,
+        unselectedIcon = R.drawable.icon_board_unselected,
+        iconTextId = R.string.menu_board,
+        route = com.yapp.feature.notice.navigation.NoticeRoute::class,
+    ),
+    PROFILE(
+        selectedIcon = R.drawable.icon_profile_selected,
+        unselectedIcon = R.drawable.icon_profile_unselected,
+        iconTextId = R.string.menu_profile,
+        route = com.yapp.feature.profile.navigation.ProfileRoute::class,
+    )
+}