Ns1-j/oplogy
5
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

datePicker #40

Merged
Utahshi merged 11 commits from datePicker into master 2024-07-08 01:21:12 +00:00
Conversation 0 Commits 11 Files Changed 3 +16 -10
2 changed files with 16 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 036352858f - Show all commits

20
app/src/main/res/layout/activity_set_up.xml
View File

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
@ -23,9 +22,10 @@
android:id="@+id/toMain" android:id="@+id/toMain"
android:layout_width="60dp" android:layout_width="60dp"
android:layout_height="60dp" android:layout_height="60dp"
android:layout_gravity="left" android:layout_gravity="start"
android:layout_marginLeft="10dp" android:layout_marginStart="10dp"
android:src="@drawable/back_button"/> android:src="@drawable/back_button"
android:contentDescription="@string/todo" />
<TextView <TextView
@ -91,7 +91,7 @@
<TextView <TextView
android:layout_width="90sp" android:layout_width="90sp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="日付設定" android:text="@string/setUpDate"
android:gravity="center"/> android:gravity="center"/>
<!-- <TextView--> <!-- <TextView-->
@ -109,7 +109,7 @@
android:id="@+id/setFirstDayButton" android:id="@+id/setFirstDayButton"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="1日目" android:text="@string/firstDay"
android:layout_marginStart="7sp" android:layout_marginStart="7sp"
android:layout_marginEnd="7sp" android:layout_marginEnd="7sp"
tools:ignore="DuplicateIds" /> tools:ignore="DuplicateIds" />
@ -118,7 +118,7 @@
android:id="@+id/setSecondDayButton" android:id="@+id/setSecondDayButton"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="2日目" android:text="@string/secondDay"
android:layout_marginStart="7sp" android:layout_marginStart="7sp"
android:layout_marginEnd="7sp" android:layout_marginEnd="7sp"
tools:ignore="DuplicateIds" /> tools:ignore="DuplicateIds" />
@ -127,7 +127,7 @@
android:id="@+id/setThirdDayButton" android:id="@+id/setThirdDayButton"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="3日目" android:text="@string/threeDay"
android:layout_marginStart="7sp" android:layout_marginStart="7sp"
android:layout_marginEnd="7sp" android:layout_marginEnd="7sp"
tools:ignore="DuplicateIds" /> tools:ignore="DuplicateIds" />
@ -151,7 +151,7 @@
android:id="@+id/startTime" android:id="@+id/startTime"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:hint="未設定" android:hint="@string/notSetUp"
android:textSize="20sp" android:textSize="20sp"
android:textAlignment="center" android:textAlignment="center"
android:autofillHints="" android:autofillHints=""
@ -186,7 +186,7 @@
android:id="@+id/endTime" android:id="@+id/endTime"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:hint="未設定" android:hint="@string/notSetUp"
android:textSize="20sp" android:textSize="20sp"
android:textAlignment="center" android:textAlignment="center"
android:autofillHints="" android:autofillHints=""

6
app/src/main/res/values/strings.xml
View File

@ -16,6 +16,12 @@
<string name="tenMinute">10分</string> <string name="tenMinute">10分</string>
<string name="fifteenMinute">15分</string> <string name="fifteenMinute">15分</string>
<string name="thirtyMinute">30分</string> <string name="thirtyMinute">30分</string>
<string name="todo">TODO</string>
<string name="setUpDate">日付設定</string>
<string name="firstDay">1日目</string>
<string name="secondDay">2日目</string>
<string name="threeDay">3日目</string>
<string name="notSetUp">未設定</string>
<string-array name="months_array"> <string-array name="months_array">
<item>1月</item> <item>1月</item>
<item>2月</item> <item>2月</item>