🔀 :: Release/v1.2.0

team-aliens · Mar 12, 2024 · 97a9ff3 · 97a9ff3
2 parents 0f65663 + 90f6e23
commit 97a9ff3
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 13 deletions.
diff --git a/app/build.gradle.kts b/app/build.gradle.kts
@@ -17,8 +17,8 @@ android {
         minSdk = libs.versions.minSdk.get().toInt()
         targetSdk = libs.versions.targetSdk.get().toInt()
 
-        versionCode = 5
-        versionName = "1.1.2-beta02"
+        versionCode = 6
+        versionName = "v1.2.0"
 
         testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
     }

diff --git a/app/src/main/java/team/aliens/dms/android/app/DmsApp.kt b/app/src/main/java/team/aliens/dms/android/app/DmsApp.kt
@@ -34,6 +34,7 @@ import team.aliens.dms.android.feature.editpassword.navigation.EditPasswordNavGr
 import team.aliens.dms.android.feature.signup.SignUpViewModel
 import team.aliens.dms.android.feature.signup.TermsUrl
 import team.aliens.dms.android.feature.signup.navigation.SignUpNavGraph
+import team.aliens.dms.android.network.BuildConfig
 
 @Composable
 fun DmsApp(
@@ -61,7 +62,7 @@ fun DmsApp(
                 hiltViewModel<SignUpViewModel>(parentEntry)
             }
 
-            dependency(TermsScreenDestination) { TermsUrl(value = "https://webview.dms-dsm.com/policy/privacy") }
+            dependency(TermsScreenDestination) { TermsUrl(value = BuildConfig.TERMS_URL) }
 
             dependency(EditPasswordNavGraph) {
                 val parentEntry = remember(navBackStackEntry) {

diff --git a/feature/src/main/java/team/aliens/dms/android/feature/main/mypage/MyPageScreen.kt b/feature/src/main/java/team/aliens/dms/android/feature/main/mypage/MyPageScreen.kt
@@ -2,9 +2,7 @@ package team.aliens.dms.android.feature.main.mypage
 
 import androidx.annotation.StringRes
 import androidx.compose.foundation.BorderStroke
-import androidx.compose.foundation.Image
 import androidx.compose.foundation.layout.Arrangement
-import androidx.compose.foundation.layout.Box
 import androidx.compose.foundation.layout.Column
 import androidx.compose.foundation.layout.PaddingValues
 import androidx.compose.foundation.layout.Row
@@ -13,9 +11,7 @@ import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
 import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.padding
-import androidx.compose.foundation.layout.size
 import androidx.compose.foundation.rememberScrollState
-import androidx.compose.foundation.shape.CircleShape
 import androidx.compose.foundation.verticalScroll
 import androidx.compose.material3.Card
 import androidx.compose.material3.CardDefaults
@@ -31,15 +27,12 @@ import androidx.compose.runtime.mutableStateOf
 import androidx.compose.runtime.remember
 import androidx.compose.ui.Alignment
 import androidx.compose.ui.Modifier
-import androidx.compose.ui.draw.clip
 import androidx.compose.ui.graphics.Color
-import androidx.compose.ui.res.painterResource
 import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.style.TextAlign
 import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
-import coil.compose.rememberAsyncImagePainter
 import com.ramcosta.composedestinations.annotation.Destination
 import team.aliens.dms.android.core.designsystem.AlertDialog
 import team.aliens.dms.android.core.designsystem.ButtonDefaults
@@ -246,6 +239,8 @@ private fun UserInformation(
                 color = DmsTheme.colorScheme.surfaceVariant,
             )
         }
+        // TODO: v1.2.0
+        /*
         Box(
             modifier = Modifier.size(64.dp),
             contentAlignment = Alignment.BottomEnd,
@@ -269,6 +264,7 @@ private fun UserInformation(
                 contentDescription = null,
             )
         }
+         */
     }
 }
 
@@ -471,10 +467,13 @@ private fun Options(
             options = withdrawalOption,
             titleColor = Option.ErrorTitleColor,
         )
+        // TODO: v1.2.0
+        /*
         OptionLayout(
             options = themeOption,
             titleColor = Option.DefaultTitleColor,
         )
+         */
     }
 }
 

diff --git a/feature/src/main/java/team/aliens/dms/android/feature/signin/SignInScreen.kt b/feature/src/main/java/team/aliens/dms/android/feature/signin/SignInScreen.kt
@@ -7,7 +7,6 @@ import androidx.compose.foundation.layout.Row
 import androidx.compose.foundation.layout.Spacer
 import androidx.compose.foundation.layout.fillMaxSize
 import androidx.compose.foundation.layout.fillMaxWidth
-import androidx.compose.foundation.layout.height
 import androidx.compose.foundation.layout.imePadding
 import androidx.compose.foundation.layout.padding
 import androidx.compose.foundation.rememberScrollState
@@ -18,7 +17,6 @@ import androidx.compose.material3.ProvideTextStyle
 import androidx.compose.material3.Scaffold
 import androidx.compose.material3.Text
 import androidx.compose.material3.TopAppBarDefaults
-import androidx.compose.material3.VerticalDivider
 import androidx.compose.runtime.Composable
 import androidx.compose.runtime.getValue
 import androidx.compose.runtime.mutableStateOf
@@ -34,7 +32,6 @@ import androidx.compose.ui.res.stringResource
 import androidx.compose.ui.text.input.ImeAction
 import androidx.compose.ui.text.input.KeyboardType
 import androidx.compose.ui.tooling.preview.Preview
-import androidx.compose.ui.unit.dp
 import androidx.hilt.navigation.compose.hiltViewModel
 import androidx.lifecycle.compose.collectAsStateWithLifecycle
 import com.ramcosta.composedestinations.annotation.Destination
@@ -251,6 +248,8 @@ private fun UnauthorizedActions(
                     .clickable(onClick = onSignUp),
                 text = stringResource(id = R.string.sign_in_sign_up),
             )
+            // TODO: v1.2.0
+            /*
             VerticalDivider(
                 modifier = Modifier.height(12.dp),
                 color = DmsTheme.colorScheme.onSurfaceVariant,
@@ -271,6 +270,7 @@ private fun UnauthorizedActions(
                     .clickable(onClick = onResetPassword),
                 text = stringResource(id = R.string.sign_in_reset_password),
             )
+             */
         }
     }
 }

diff --git a/network/build.gradle.kts b/network/build.gradle.kts
@@ -28,11 +28,18 @@ android {
                 "proguard-rules.pro",
             )
 
+            // TODO: move to :app
             buildConfigField(
                 type = "String",
                 name = "BASE_URL",
                 value = localProperty("PROD_BASE_URL"),
             )
+
+            buildConfigField(
+                type = "String",
+                name = "TERMS_URL",
+                value = localProperty("TERMS_URL"),
+            )
         }
 
         debug {
@@ -41,6 +48,11 @@ android {
                 name = "BASE_URL",
                 value = localProperty("DEV_BASE_URL"),
             )
+            buildConfigField(
+                type = "String",
+                name = "TERMS_URL",
+                value = localProperty("TERMS_URL"),
+            )
         }
     }