From 036352858fb53dbfe1bcdeb29e8a957a99b1eb47 Mon Sep 17 00:00:00 2001 From: Ekamo-11 <148836598+Ekamo-11@users.noreply.github.com> Date: Wed, 3 Jul 2024 16:46:22 +0900 Subject: [PATCH] =?UTF-8?q?=E8=AD=A6=E5=91=8A=E3=82=92=E6=B6=88=E3=81=99?= =?UTF-8?q?=E3=81=9F=E3=82=81=E3=81=AB=E3=83=AA=E3=82=BD=E3=83=BC=E3=82=B9?= =?UTF-8?q?=E3=82=92=E8=BF=BD=E5=8A=A0=E3=81=97=E3=81=BE=E3=81=97=E3=81=9F?= =?UTF-8?q?=E3=80=81=E3=81=9D=E3=81=AE=E4=BB=96=E3=81=AE=E8=AD=A6=E5=91=8A?= =?UTF-8?q?=E3=82=82=E6=B6=88=E3=81=97=E3=81=BE=E3=81=97=E3=81=9F=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/res/layout/activity_set_up.xml | 20 ++++++++++---------- app/src/main/res/values/strings.xml | 6 ++++++ 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/app/src/main/res/layout/activity_set_up.xml b/app/src/main/res/layout/activity_set_up.xml index d693ab8..966ccbc 100644 --- a/app/src/main/res/layout/activity_set_up.xml +++ b/app/src/main/res/layout/activity_set_up.xml @@ -1,6 +1,5 @@ + android:layout_gravity="start" + android:layout_marginStart="10dp" + android:src="@drawable/back_button" + android:contentDescription="@string/todo" /> @@ -109,7 +109,7 @@ android:id="@+id/setFirstDayButton" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="1日目" + android:text="@string/firstDay" android:layout_marginStart="7sp" android:layout_marginEnd="7sp" tools:ignore="DuplicateIds" /> @@ -118,7 +118,7 @@ android:id="@+id/setSecondDayButton" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="2日目" + android:text="@string/secondDay" android:layout_marginStart="7sp" android:layout_marginEnd="7sp" tools:ignore="DuplicateIds" /> @@ -127,7 +127,7 @@ android:id="@+id/setThirdDayButton" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="3日目" + android:text="@string/threeDay" android:layout_marginStart="7sp" android:layout_marginEnd="7sp" tools:ignore="DuplicateIds" /> @@ -151,7 +151,7 @@ android:id="@+id/startTime" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:hint="未設定" + android:hint="@string/notSetUp" android:textSize="20sp" android:textAlignment="center" android:autofillHints="" @@ -186,7 +186,7 @@ android:id="@+id/endTime" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:hint="未設定" + android:hint="@string/notSetUp" android:textSize="20sp" android:textAlignment="center" android:autofillHints="" diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 588fadf..639e09a 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -16,6 +16,12 @@ 10分 15分 30分 + TODO + 日付設定 + 1日目 + 2日目 + 3日目 + 未設定 1月 2月