Przeglądaj źródła

[MY][Bug] 마이코인 메인 좋아요 북마크 아이콘 간격 조절

Hasemi 7 lat temu
rodzic
commit
36a99315c2

+ 28 - 24
app/src/main/res/layout/fragment_my_main.xml

@@ -8,9 +8,9 @@
   android:orientation="vertical">
 
   <android.support.constraint.ConstraintLayout
-    android:paddingTop="@dimen/action_bar_height"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:paddingTop="@dimen/action_bar_height">
 
     <android.support.constraint.ConstraintLayout
       android:id="@+id/first_layout"
@@ -23,7 +23,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="18dp"
         android:lineSpacingExtra="8sp"
-        android:text="6,900"
+        android:text="@string/my_coin_detail"
         android:textColor="@color/C000000"
         android:textSize="21sp"
         app:layout_constraintEnd_toEndOf="parent"
@@ -73,7 +73,7 @@
         android:layout_height="wrap_content"
         android:layout_marginEnd="4dp"
         android:lineSpacingExtra="4sp"
-        android:text="보유쿠폰"
+        android:text="@string/having_coupon"
         android:textColor="@color/C999999"
         android:textSize="12sp"
         app:layout_constraintEnd_toStartOf="@+id/text_view_coupon_detail"
@@ -86,7 +86,7 @@
         android:layout_height="wrap_content"
         android:layout_marginEnd="26dp"
         android:lineSpacingExtra="4sp"
-        android:text="8"
+        android:text="@string/eight"
         android:textColor="@color/C000000"
         android:textSize="12sp"
         app:layout_constraintEnd_toStartOf="@+id/divider1"
@@ -111,7 +111,7 @@
         android:layout_height="wrap_content"
         android:layout_marginEnd="4dp"
         android:lineSpacingExtra="4sp"
-        android:text="구매/예약"
+        android:text="@string/buy_and_reserve"
         android:textColor="@color/C999999"
         android:textSize="12sp"
         app:layout_constraintEnd_toStartOf="@+id/text_view_buy_count"
@@ -124,7 +124,7 @@
         android:layout_height="wrap_content"
         android:layout_marginEnd="23dp"
         android:lineSpacingExtra="4sp"
-        android:text="5"
+        android:text="@string/eight"
         android:textColor="@color/C000000"
         android:textSize="12sp"
         app:layout_constraintEnd_toStartOf="@+id/divider2"
@@ -149,7 +149,7 @@
         android:layout_height="wrap_content"
         android:layout_marginEnd="4dp"
         android:lineSpacingExtra="4sp"
-        android:text="이벤트"
+        android:text="@string/menu_category2"
         android:textColor="@color/C999999"
         android:textSize="12sp"
         app:layout_constraintEnd_toStartOf="@+id/text_view_event_count"
@@ -161,7 +161,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:lineSpacingExtra="4sp"
-        android:text="3"
+        android:text="@string/three"
         android:textColor="@color/C000000"
         android:textSize="12sp"
         app:layout_constraintEnd_toStartOf="@+id/text_view_event"
@@ -200,7 +200,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="35dp"
         android:lineSpacingExtra="6sp"
-        android:text="한화님을 위한 Lifeplus Benefit"
+        android:text="@string/life_plus_benefit_text"
         android:textColor="@color/C000000"
         android:textSize="15sp"/>
 
@@ -211,7 +211,6 @@
         android:layout_marginTop="15dp"
         android:scaleType="fitXY"
         android:src="@drawable/banner_bg_2"
-
         app:layout_constraintStart_toStartOf="@+id/text_view_benefit"
         app:layout_constraintTop_toBottomOf="@+id/text_view_benefit"/>
 
@@ -234,7 +233,7 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="43dp"
         android:lineSpacingExtra="6sp"
-        android:text="북마크 0 "
+        android:text="@string/book_mark_count"
         android:textColor="@color/C000000"
         android:textSize="15sp"/>
 
@@ -245,12 +244,13 @@
         android:paddingTop="4dp"
         android:paddingEnd="6dp"
         android:paddingBottom="4dp"
+        app:layout_constraintBottom_toBottomOf="@+id/text_view_book_mark"
         app:layout_constraintStart_toEndOf="@+id/text_view_book_mark"
         app:layout_constraintTop_toTopOf="@+id/text_view_book_mark"
-        app:layout_constraintBottom_toBottomOf="@+id/text_view_book_mark"
         app:srcCompat="@drawable/icon_book_mark_arrow"
         tools:layout_editor_absoluteX="42dp"
         tools:layout_editor_absoluteY="9dp"/>
+
       <TextView
         android:id="@+id/text_view_book_mark_recommend"
         android:layout_width="wrap_content"
@@ -258,7 +258,7 @@
         android:layout_marginTop="15dp"
         android:gravity="center_horizontal"
         android:lineSpacingExtra="10sp"
-        android:text="최근 많이 북마크한 콘텐츠 추천"
+        android:text="@string/book_mark_recommend_text"
         android:textColor="@color/C999999"
         android:textSize="12sp"
         app:layout_constraintStart_toStartOf="@+id/text_view_book_mark"
@@ -280,8 +280,8 @@
         android:layout_marginStart="25dp"
         android:scaleType="fitXY"
         android:src="@drawable/img_bestbucket_banner_5"
-        app:layout_constraintEnd_toStartOf="@+id/text_view"
         app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/text_view"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"/>
 
@@ -305,7 +305,7 @@
         android:id="@+id/layout_like_bookmark"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="20dp"
+        android:layout_marginStart="14dp"
         android:layout_marginTop="8dp"
         android:layout_marginEnd="208dp"
         android:layout_marginBottom="16dp"
@@ -321,8 +321,9 @@
           android:layout_height="wrap_content"
           android:background="@null"
           android:button="@null"
-          android:paddingEnd="10dp"
           android:drawableLeft="@drawable/custom_like_check"
+          android:paddingStart="6dp"
+          android:paddingEnd="5dp"
           android:text=""
           app:layout_constraintBottom_toBottomOf="parent"
           app:layout_constraintStart_toStartOf="parent"
@@ -333,11 +334,11 @@
           android:id="@+id/book_mark_check"
           android:layout_width="wrap_content"
           android:layout_height="wrap_content"
-          android:layout_marginStart="8dp"
           android:background="@null"
           android:button="@null"
-          android:paddingEnd="10dp"
           android:drawableLeft="@drawable/custom_book_mark_check"
+          android:paddingStart="6dp"
+          android:paddingEnd="5dp"
           android:text=""
           app:layout_constraintBottom_toBottomOf="parent"
           app:layout_constraintStart_toEndOf="@+id/like_check"
@@ -360,10 +361,11 @@
         android:layout_marginStart="25dp"
         android:scaleType="fitXY"
         android:src="@drawable/img_bestbucket_banner_5"
-        app:layout_constraintEnd_toStartOf="@+id/text_view2"
         app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toStartOf="@+id/text_view2"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"/>
+
       <TextView
         android:id="@+id/text_view2"
         android:layout_width="wrap_content"
@@ -384,7 +386,7 @@
         android:id="@+id/layout_like_bookmark2"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginStart="20dp"
+        android:layout_marginStart="14dp"
         android:layout_marginTop="8dp"
         android:layout_marginEnd="208dp"
         android:layout_marginBottom="16dp"
@@ -401,8 +403,9 @@
           android:background="@null"
           android:button="@null"
           android:drawableLeft="@drawable/custom_like_check"
+          android:paddingStart="5dp"
+          android:paddingEnd="6dp"
           android:text=""
-          android:paddingEnd="10dp"
           app:layout_constraintBottom_toBottomOf="parent"
           app:layout_constraintStart_toStartOf="parent"
           app:layout_constraintTop_toTopOf="parent"
@@ -415,8 +418,9 @@
           android:layout_marginStart="8dp"
           android:background="@null"
           android:button="@null"
-          android:paddingEnd="10dp"
           android:drawableLeft="@drawable/custom_book_mark_check"
+          android:paddingStart="5dp"
+          android:paddingEnd="6dp"
           android:text=""
           app:layout_constraintBottom_toBottomOf="parent"
           app:layout_constraintStart_toEndOf="@+id/like_check2"
@@ -442,7 +446,7 @@
         android:layout_height="wrap_content"
         android:layout_marginBottom="15dp"
         android:lineSpacingExtra="6sp"
-        android:text="버킷리스트"
+        android:text="@string/tutorial_title3"
         android:textColor="@color/C000000"
         android:textSize="15sp"
         />

+ 7 - 1
app/src/main/res/values/strings.xml

@@ -468,5 +468,11 @@
 
   <string name="coin_extinct_notice_1">유효기간이 짧은 순서로 차감됩니다.</string>
   <string name="coin_extinct_notice_2">적립된 코인은 적립시점으로부터 2년이 지나면\n자동 소멸됩니다.</string>
-
+  <string name="having_coupon">보유쿠폰</string>
+  <string name="eight">8</string>
+  <string name="three">3</string>
+  <string name="buy_and_reserve">구매/예약</string>
+  <string name="life_plus_benefit_text">한화님을 위한 Lifeplus Benefit</string>
+  <string name="book_mark_count">북마크 0</string>
+  <string name="book_mark_recommend_text">최근 많이 북마크한 콘텐츠 추천</string>
 </resources>