마이페이지 > 설정 화면 UI 변경 사항 및 기능 구현 (#91)

* ✨ 설정 페이지 UI 구현 및 고객센터 이메일 기능 구현 * ✨ 버전 정보 화면에 노출하도록 구현 * ✨ 웹뷰 컴포넌트 생성 및 개인정보처리방침 url 연결 * ✨ 오픈소스 라이센스 목록 구현 * 🐛 CI/CD fail 수정
Team-Walkie · Nov 17, 2024 · 2075b99 · 2075b99
1 parent 225abef
commit 2075b99
Show file tree

Hide file tree

Showing 18 changed files with 416 additions and 77 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -5,6 +5,7 @@ plugins {
     id("org.jetbrains.kotlin.android")
     id("kotlin-kapt")
     id("com.google.firebase.crashlytics")
+    id("com.google.android.gms.oss-licenses-plugin")
 }
 
 android {
@@ -53,6 +54,7 @@ dependencies {
     implementation(project(":data"))
 
     implementation(libs.bundles.android.base)
+    implementation(libs.play.services.oss.licenses)
 
     val composeBom = platform("androidx.compose:compose-bom:2024.05.00")
     implementation(composeBom)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -33,6 +33,12 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+        <activity
+            android:name="com.google.android.gms.oss.licenses.OssLicensesMenuActivity"
+            android:theme="@style/AppTheme" />
+        <activity
+            android:name="com.google.android.gms.oss.licenses.OssLicensesActivity"
+            android:theme="@style/AppTheme" />
         <service
             android:name="androidx.work.impl.foreground.SystemForegroundService"
             android:foregroundServiceType="location"

diff --git a/app/src/main/res/values/style.xml b/app/src/main/res/values/style.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
+        <item name="android:statusBarColor">@android:color/white</item>
+        <item name="android:windowLightStatusBar">true</item>
+    </style>
+</resources>
diff --git a/build.gradle.kts b/build.gradle.kts
@@ -1,4 +1,14 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
+buildscript {
+    repositories {
+        google()
+        mavenCentral()
+    }
+    dependencies {
+        classpath("com.google.android.gms:oss-licenses-plugin:0.10.6")
+    }
+}
+
 plugins {
     id("com.android.application") version "7.4.2" apply false
     id("com.android.library") version "7.4.2" apply false

diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -13,6 +13,7 @@ android-material = "1.8.0"
 junit = "4.13.2"
 androidx-test-junit = "1.1.5"
 espresso-core = "3.5.1"
+play-services-oss-licenses = "17.1.0"
 
 [libraries]
 androidx-navigation-fragment-ktx = { module = "androidx.navigation:navigation-fragment-ktx", version.ref = "androidx-navigation" }
@@ -34,6 +35,7 @@ hilt = { module = "com.google.dagger:hilt-android", version.ref = "hilt" }
 hilt-complier = { module = "com.google.dagger:hilt-android-compiler", version.ref = "hilt" }
 
 javax-inject = { module = "javax.inject:javax.inject", version.ref = "javax-inject" }
+play-services-oss-licenses = { group = "com.google.android.gms", name = "play-services-oss-licenses", version.ref = "play-services-oss-licenses" }
 
 [bundles]
 navigation = ["androidx-navigation-fragment-ktx", "androidx-navigation-ui-ktx", "androidx-navigation-dynamic-features-fragment"]

diff --git a/presentation/build.gradle.kts b/presentation/build.gradle.kts
@@ -57,6 +57,7 @@ dependencies {
     implementation(project(":domain"))
 
     implementation(libs.bundles.android.base)
+    implementation(libs.play.services.oss.licenses)
 
     val composeBom = platform("androidx.compose:compose-bom:2024.05.00")
     implementation(composeBom)

diff --git a/presentation/src/main/java/com/whyranoid/presentation/reusable/MenuItem.kt b/presentation/src/main/java/com/whyranoid/presentation/reusable/MenuItem.kt
@@ -0,0 +1,81 @@
+package com.whyranoid.presentation.reusable
+
+import androidx.annotation.DrawableRes
+import androidx.annotation.StringRes
+import androidx.compose.foundation.clickable
+import androidx.compose.foundation.layout.Row
+import androidx.compose.foundation.layout.Spacer
+import androidx.compose.foundation.layout.fillMaxWidth
+import androidx.compose.foundation.layout.padding
+import androidx.compose.foundation.layout.size
+import androidx.compose.foundation.layout.width
+import androidx.compose.material3.Icon
+import androidx.compose.material3.Text
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Alignment
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.res.painterResource
+import androidx.compose.ui.res.stringResource
+import androidx.compose.ui.text.style.TextAlign
+import androidx.compose.ui.tooling.preview.Preview
+import androidx.compose.ui.unit.dp
+import com.whyranoid.presentation.R
+import com.whyranoid.presentation.theme.WalkieColor
+import com.whyranoid.presentation.theme.WalkieTheme
+import com.whyranoid.presentation.theme.WalkieTypography
+
+@Composable
+fun MenuItem(
+    @StringRes text: Int,
+    subInfo: String?= null,
+    @DrawableRes icon: Int? = null,
+    onClick: () -> Unit = {}
+) {
+    Row(
+        verticalAlignment = Alignment.CenterVertically,
+        modifier = Modifier
+            .fillMaxWidth()
+            .padding(vertical = 12.dp)
+            .padding(horizontal = 20.dp)
+            .clickable(onClick = onClick)
+    ) {
+        if (icon != null) {
+            Icon(
+                painter = painterResource(id = icon),
+                contentDescription = null,
+                modifier = Modifier.size(22.dp)
+            )
+
+            Spacer(modifier = Modifier.width(8.dp))
+        }
+
+        Text(
+            text = stringResource(id = text),
+            style = WalkieTypography.Body1_Normal
+        )
+
+        if (subInfo != null) {
+            Spacer(modifier = Modifier.width(10.dp))
+
+            Text(
+                text = subInfo,
+                style = WalkieTypography.Body1_Normal,
+                color = WalkieColor.Primary,
+                textAlign = TextAlign.End,
+                modifier = Modifier.weight(1f),
+            )
+        }
+    }
+}
+
+@Preview
+@Composable
+private fun MenuItemPreview() {
+    WalkieTheme {
+        MenuItem(
+            text = R.string.version_info,
+            subInfo = "1.0.0",
+            icon = R.drawable.ic_mobile
+        )
+    }
+}
diff --git a/presentation/src/main/java/com/whyranoid/presentation/screens/AppScreen.kt b/presentation/src/main/java/com/whyranoid/presentation/screens/AppScreen.kt
@@ -1,5 +1,6 @@
 package com.whyranoid.presentation.screens
 
+import android.util.Log
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.layout.safeDrawingPadding
@@ -253,6 +254,14 @@ fun AppScreenContent(
                     }
                 )
             }
+
+            composable(
+                route = Screen.WebViewScreen.route,
+                arguments = Screen.WebViewScreen.arguments,
+            ) {
+                val url = it.arguments?.getString("url")
+                WebViewScreen(url = url)
+            }
         }
 
         val isLoading = ApiResponseDialog.isLoading.collectAsStateWithLifecycle()

diff --git a/presentation/src/main/java/com/whyranoid/presentation/screens/Screen.kt b/presentation/src/main/java/com/whyranoid/presentation/screens/Screen.kt
@@ -6,6 +6,8 @@ import androidx.navigation.NamedNavArgument
 import androidx.navigation.NavType
 import androidx.navigation.navArgument
 import com.whyranoid.presentation.R
+import java.net.URLEncoder
+import java.nio.charset.StandardCharsets
 
 sealed class Screen(
     val route: String,
@@ -143,6 +145,21 @@ sealed class Screen(
         fun route(uid: Long, postId: Long) = "userPostsScreen/$uid/$postId"
     }
 
+    object WebViewScreen : Screen(
+        route = "webViewScreen/{$URL}",
+        arguments = listOf(
+            navArgument(URL) {
+                type = NavType.StringType
+                nullable = true
+            }
+        ),
+    ) {
+        fun createRoute(url: String): String {
+            val encodedUrl = URLEncoder.encode(url, StandardCharsets.UTF_8.toString())
+            return route.replace("{$URL}", encodedUrl)
+        }
+    }
+
     companion object {
         val bottomNavigationItems = listOf(Running, Community, ChallengeMainScreen, MyPage)
 
@@ -151,5 +168,6 @@ sealed class Screen(
         const val IS_FOLLOWING_ARGUMENT = "isFollowing"
         const val PAGE_NO = "pageNo"
         const val POST_ID = "postId"
+        const val URL = "url"
     }
 }
diff --git a/presentation/src/main/java/com/whyranoid/presentation/screens/WebViewScreen.kt b/presentation/src/main/java/com/whyranoid/presentation/screens/WebViewScreen.kt
@@ -0,0 +1,43 @@
+package com.whyranoid.presentation.screens
+
+import android.annotation.SuppressLint
+import android.graphics.Color
+import android.view.ViewGroup
+import android.webkit.WebView
+import android.webkit.WebViewClient
+import androidx.compose.foundation.layout.Box
+import androidx.compose.foundation.layout.fillMaxSize
+import androidx.compose.runtime.Composable
+import androidx.compose.ui.Modifier
+import androidx.compose.ui.viewinterop.AndroidView
+
+@SuppressLint("SetJavaScriptEnabled")
+@Composable
+fun WebViewScreen(
+    url: String?,
+) {
+    Box(modifier = Modifier.fillMaxSize()) {
+        AndroidView(
+            factory = { context ->
+                WebView(context).apply {
+                    setBackgroundColor(Color.TRANSPARENT)
+                    layoutParams = ViewGroup.LayoutParams(
+                        ViewGroup.LayoutParams.MATCH_PARENT,
+                        ViewGroup.LayoutParams.MATCH_PARENT
+                    )
+                    webViewClient = WebViewClient()
+                    settings.apply {
+                        javaScriptEnabled = true
+                        loadWithOverviewMode = true
+                        useWideViewPort = true
+                        domStorageEnabled = true
+                        setSupportZoom(false)
+                    }
+                }
+            },
+            update = { webView ->
+                webView.loadUrl(url ?: "")
+            }
+        )
+    }
+}