Merge pull request #557 from TeamBeMe/release/1.0.3

Release/1.0.3
TeamBeMe · Mar 5, 2021 · 669c786 · 669c786
2 parents 4f634d7 + 4ddbc4c
commit 669c786
Show file tree

Hide file tree

Showing 6 changed files with 292 additions and 15 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -15,7 +15,7 @@ android {
         applicationId "com.teambeme.beme"
         minSdkVersion 26
         targetSdkVersion 30
-        versionCode 5
+        versionCode 6
         versionName "1.0.3"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -19,7 +19,8 @@
         android:theme="@style/Theme.BeMe"
         android:usesCleartextTraffic="true">
         <activity android:name=".setting.view.OpenSourceActivity" />
-        <activity android:name=".onboarding.view.OnBoardingActivity" />
+        <activity android:name=".onboarding.view.OnBoardingActivity"
+            android:exported="true" />
         <activity
             android:name=".splash.SplashActivity"
             android:screenOrientation="portrait"
@@ -33,6 +34,7 @@
         <activity android:name=".setting.view.SettingActivity" />
         <activity
             android:name=".signup.view.SignUpActivity"
+            android:exported="true"
             android:screenOrientation="portrait"
             android:windowSoftInputMode="adjustPan" />
         <activity

diff --git a/app/src/main/res/layout/activity_on_boarding.xml b/app/src/main/res/layout/activity_on_boarding.xml
@@ -10,6 +10,7 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:background="@color/white"
         tools:context=".onboarding.view.OnBoardingActivity">
 
         <androidx.viewpager2.widget.ViewPager2
@@ -61,6 +62,7 @@
             android:insetBottom="0dp"
             android:text="BeMe 시작하기"
             android:textSize="16sp"
+            android:textColor="@color/white"
             app:backgroundTint="@null"
             app:layout_constraintBottom_toTopOf="@+id/dots_onboarding_indicator" />
 

diff --git a/app/src/main/res/layout/fragment_term.xml b/app/src/main/res/layout/fragment_term.xml
@@ -121,19 +121,20 @@
             android:layout_marginBottom="400dp"
             android:maxHeight="120dp"
             app:layout_constraintBottom_toTopOf="@+id/linear_term_service"
-            app:layout_constraintTop_toBottomOf="@+id/linear_term_essence">
+            app:layout_constraintTop_toBottomOf="@+id/linear_term_essence"
+            tools:layout_editor_absoluteX="0dp">
 
-            <ImageView
+            <TextView
                 android:id="@+id/img_term_essence"
                 android:layout_width="match_parent"
-                android:layout_height="0dp"
+                android:layout_height="wrap_content"
                 android:background="@color/signup_background_gray"
-                android:maxHeight="140dp"
                 android:paddingHorizontal="28dp"
                 android:paddingVertical="16dp"
                 android:scaleType="fitXY"
                 android:scrollbars="vertical"
-                android:src="@drawable/img_clause_account" />
+                android:textColor="@color/detail_text_gray"
+                android:text="@string/txt_term_personal_info" />
 
         </ScrollView>
 
@@ -188,13 +189,15 @@
             android:background="@color/signup_background_gray"
             app:layout_constraintTop_toBottomOf="@+id/linear_term_service">
 
-            <ImageView
+            <TextView
                 android:id="@+id/img_term_service"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
+                android:paddingHorizontal="28dp"
                 android:paddingVertical="16dp"
                 android:scaleType="fitXY"
-                android:src="@drawable/img_clause_service" />
+                android:textColor="@color/detail_text_gray"
+                android:text="@string/txt_term_service" />
         </ScrollView>
 
         <Button

diff --git a/app/src/main/res/layout/item_onboarding.xml b/app/src/main/res/layout/item_onboarding.xml
@@ -12,7 +12,8 @@
 
     <androidx.constraintlayout.widget.ConstraintLayout
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:background="@color/white">
 
         <ImageView
             android:id="@+id/img_onboarding_explain"