(#2) add setting feature

mash-up-kr · Nov 26, 2019 · cefd5c6 · cefd5c6
1 parent 85bac50
commit cefd5c6
Show file tree

Hide file tree

Showing 3 changed files with 13 additions and 9 deletions.
diff --git a/app/src/main/java/com/mashup/app/setting/SettingFragment.kt b/app/src/main/java/com/mashup/app/setting/SettingFragment.kt
@@ -53,7 +53,7 @@ class SettingFragment : Fragment() {
                     putExtra(Intent.EXTRA_EMAIL, BuildConfig.FEED_BACK_EMAIL)
                     putExtra(
                             Intent.EXTRA_SUBJECT,
-                            "<" + getString(R.string.app_name) + " " + getString(R.string.setting_send_feedback_email) + ">"
+                            "<" + getString(R.string.app_name) + " " + getString(R.string.setting_send_feedback_email_title) + ">"
                     )
                     putExtra(
                             Intent.EXTRA_TEXT,

diff --git a/app/src/main/res/layout/setting_fragment.xml b/app/src/main/res/layout/setting_fragment.xml
@@ -4,7 +4,8 @@
     xmlns:tools="http://schemas.android.com/tools">
 
     <data>
-        <import type="com.mashup.BuildConfig"/>
+
+        <import type="com.mashup.BuildConfig" />
 
         <variable
             name="viewmodel"
@@ -37,7 +38,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="30dp"
                     android:gravity="center"
-                    android:text="피드백 메일"
+                    android:text="@string/setting_tv_send_feedback_email"
                     android:textColor="@color/text"
                     android:textSize="@dimen/text_normal"
                     android:textStyle="bold" />
@@ -48,10 +49,10 @@
                     android:layout_marginTop="13dp"
                     android:gravity="center"
                     android:onClick="@{() -> viewmodel.sendFeedBackEmail()}"
-                    tools:text="[email protected]"
-                    app:email="@{BuildConfig.FEED_BACK_EMAIL}"
                     android:textColor="@color/author"
-                    android:textSize="@dimen/text_normal" />
+                    android:textSize="@dimen/text_normal"
+                    app:email="@{BuildConfig.FEED_BACK_EMAIL}"
+                    tools:text="[email protected]" />
 
                 <View
                     android:layout_width="match_parent"
@@ -64,7 +65,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="30dp"
                     android:gravity="center"
-                    android:text="만든 사람"
+                    android:text="@string/setting_tv_maker"
                     android:textColor="@color/text"
                     android:textSize="@dimen/text_normal"
                     android:textStyle="bold" />
@@ -116,7 +117,7 @@
             android:layout_alignEnd="@+id/card"
             android:layout_marginTop="16dp"
             android:onClick="@{() -> viewmodel.onClickLogoutButton()}"
-            android:text="로그아웃하기"
+            android:text="@string/setting_tv_logout"
             android:textColor="@color/colorPrimary"
             android:textSize="@dimen/text_normal" />
 

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -32,7 +32,10 @@
     <string name="login_error_message_empty_text">이메일 혹은 비밀번호를 채워주세요!</string>
     <string name="error_message_unknown">알 수 없는 에러가 발생했습니다.</string>
 
-    <string name="setting_send_feedback_email">건의사항 보내기</string>
+    <string name="setting_send_feedback_email_title">건의사항 보내기</string>
+    <string name="setting_tv_send_feedback_email">피드백 메일</string>
+    <string name="setting_tv_maker">피드백 메일</string>
+    <string name="setting_tv_logout">로그아웃하기</string>
     <string name="title_notice">전체공지</string>
     <string name="title_setting">설정</string>
 </resources>