[style] #234 Modify note view

Scents-Note · Oct 29, 2022 · 10a36da · 10a36da
1 parent b38d2bc
commit 10a36da
Show file tree

Hide file tree

Showing 7 changed files with 25 additions and 20 deletions.
diff --git a/app/src/main/res/drawable-hdpi/note_star_inactive.png b/app/src/main/res/drawable-hdpi/note_star_inactive.png
diff --git a/app/src/main/res/drawable-mdpi/note_star_inactive.png b/app/src/main/res/drawable-mdpi/note_star_inactive.png
diff --git a/app/src/main/res/drawable-xhdpi/note_star_inactive.png b/app/src/main/res/drawable-xhdpi/note_star_inactive.png
diff --git a/app/src/main/res/drawable-xxhdpi/note_star_inactive.png b/app/src/main/res/drawable-xxhdpi/note_star_inactive.png
diff --git a/app/src/main/res/drawable-xxxhdpi/note_star_inactive.png b/app/src/main/res/drawable-xxxhdpi/note_star_inactive.png
diff --git a/app/src/main/res/layout/activity_note.xml b/app/src/main/res/layout/activity_note.xml
@@ -196,12 +196,26 @@
                     android:layout_marginTop="24dp"
                     android:fontFamily="@font/nanummyeongjo_bold"
                     android:includeFontPadding="false"
-                    android:text="향에 대한 기록."
+                    android:text="향울 자유롭게 표현해보세요."
                     android:textColor="@color/primary_black"
                     android:textSize="14dp"
                     app:layout_constraintStart_toStartOf="@+id/imageView19"
                     app:layout_constraintTop_toBottomOf="@+id/imageView19" />
 
+                <TextView
+                    android:id="@+id/textView24"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_marginStart="4dp"
+                    android:fontFamily="@font/nanummyeongjo"
+                    android:includeFontPadding="false"
+                    android:text="(필수 사항)"
+                    android:textColor="@color/primary_black"
+                    android:textSize="11dp"
+                    app:layout_constraintBottom_toBottomOf="@+id/textView22"
+                    app:layout_constraintStart_toEndOf="@+id/textView22"
+                    app:layout_constraintTop_toTopOf="@+id/textView22" />
+
                 <EditText
                     android:id="@+id/imageView20"
                     setNoteContentsText="@={viewModel.contentsTxt}"
@@ -213,7 +227,7 @@
                     android:layout_marginEnd="18dp"
                     android:fontFamily="@font/notosans_regular"
                     android:gravity="top"
-                    android:hint="향을 자유롭게 표현해보세요.\n\n"
+                    android:hint="@string/text_note_hint"
                     android:includeFontPadding="false"
                     android:maxLines="10"
                     android:paddingHorizontal="18dp"
@@ -244,7 +258,7 @@
                     android:layout_marginTop="26dp"
                     android:fontFamily="@font/nanummyeongjo_bold"
                     android:includeFontPadding="false"
-                    android:text="향에 대한 키워드."
+                    android:text="향을 맡았을 때 어떤 단어가 떠오르나요?"
                     android:textColor="@color/primary_black"
                     android:textSize="14dp"
                     app:layout_constraintStart_toStartOf="@+id/imageView21"
@@ -316,25 +330,13 @@
                     android:layout_marginTop="24dp"
                     android:fontFamily="@font/nanummyeongjo_bold"
                     android:includeFontPadding="false"
-                    android:text="지속력."
+                    android:text="향이 얼마나 지속되나요?"
                     android:textColor="@color/primary_black"
                     android:textSize="14dp"
                     app:layout_constraintStart_toStartOf="@+id/imageView53"
                     app:layout_constraintTop_toBottomOf="@+id/imageView53" />
 
-                <TextView
-                    android:id="@+id/textView24"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="4dp"
-                    android:fontFamily="@font/nanummyeongjo"
-                    android:includeFontPadding="false"
-                    android:text="(필수 사항)"
-                    android:textColor="@color/primary_black"
-                    android:textSize="11dp"
-                    app:layout_constraintBottom_toBottomOf="@+id/textView22"
-                    app:layout_constraintStart_toEndOf="@+id/textView22"
-                    app:layout_constraintTop_toTopOf="@+id/textView22" />
+
 
                 <ImageView
                     android:id="@+id/imageView22"
@@ -456,7 +458,7 @@
                     android:layout_marginTop="52dp"
                     android:fontFamily="@font/nanummyeongjo_bold"
                     android:includeFontPadding="false"
-                    android:text="잔향감."
+                    android:text="잔향의 느낌이 어떤가요?"
                     android:textColor="@color/primary_black"
                     android:textSize="14dp"
                     app:layout_constraintStart_toStartOf="@+id/textView23"
@@ -564,7 +566,7 @@
                     android:layout_marginTop="27dp"
                     android:fontFamily="@font/nanummyeongjo_bold"
                     android:includeFontPadding="false"
-                    android:text="계절감"
+                    android:text="어느 계절에 뿌리고 싶나요?"
                     android:textColor="@color/primary_black"
                     android:textSize="14dp"
                     app:layout_constraintStart_toStartOf="@+id/textView29"
@@ -659,7 +661,7 @@
                     android:layout_marginTop="37dp"
                     android:fontFamily="@font/nanummyeongjo_bold"
                     android:includeFontPadding="false"
-                    android:text="성별"
+                    android:text="누가 뿌리면 좋을까요?"
                     android:textColor="@color/primary_black"
                     android:textSize="14dp"
                     app:layout_constraintStart_toStartOf="@+id/textView34"

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -30,6 +30,9 @@
     <!--perfume detail -->
     <string name="chartPercentFormat" formatted="false">%d%%</string>
 
+    <!--note-->
+    <string name="text_note_hint">향을 맡고 어떤 생각이 떠올랐나요?\n좋은지 나쁜지, 어떤 느낌인지, 떠오른 단어 등\n자유롭게 작성해보세요.</string>
+
     <!--my -->
     <string name="txt_my_perfume_null">아직 시향 노트가 비어 있어요.\n그동안 사용했던 향수\n혹은 시향해봤던 향수를\n기록해보세요.</string>
     <string name="txt_wish_list_null">아직 시향해보고 싶은 향수가 없군요!\n평소에 관심 있었던 향수를\n위시리스트에 추가해보세요!</string>