Skip to content

Commit

Permalink
UI adjustment
Browse files Browse the repository at this point in the history
  • Loading branch information
z5i committed Aug 29, 2020
1 parent a6946a4 commit 9f38b0b
Show file tree
Hide file tree
Showing 5 changed files with 17 additions and 23 deletions.
4 changes: 1 addition & 3 deletions app/src/main/java/com/z5i/periodical/DetailsActivity.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -123,10 +123,8 @@ class DetailsActivity : AppCompatActivity(), View.OnClickListener, TextWatcher {
2, // Cramps
17, // Headache/migraine
3, // Back pain
4, // Middle pain left
5, // Middle pain right
4, // 腰疼
6, // Breast pain/dragging pain
7, // Thrush/candida
8, // Discharge
10, // Temperature fluctuations
11, // Pimples
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/z5i/periodical/MainActivityApp.kt
View file
Original file line number Diff line number Diff line change
Expand Up @@ -294,7 +294,7 @@ class MainActivityApp : AppCompatActivity() {
// Output current year/month
val displayDate = findViewById<TextView>(R.id.displaydate)
@SuppressLint("SimpleDateFormat") val dateFormat = SimpleDateFormat("MMMM yyyy")
displayDate.text = String.format("%s\n平均周期%d 最短周期↓%d 最长周期↑%d",
displayDate.text = String.format("%s\n平均周期🙈%d 最短周期⬇️%d 最长周期⬆️%d",
dateFormat.format(cal.time),
dbMain!!.cycleAverage, dbMain!!.cycleShortest,
dbMain!!.cycleLongest)
Expand Down
28 changes: 14 additions & 14 deletions app/src/main/res/layout/main.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -638,7 +638,7 @@
android:contentDescription="@string/main_calday_su_description"
android:gravity="center"
android:text="@string/main_calday_su"
android:textColor="#ffffffff"
android:textColor="#ff000000"
android:textSize="18sp"
android:textStyle="bold" />

Expand All @@ -647,7 +647,7 @@
android:contentDescription="@string/main_calday_mo_description"
android:gravity="center"
android:text="@string/main_calday_mo"
android:textColor="#ffffffff"
android:textColor="#ff000000"
android:textSize="18sp"
android:textStyle="bold" />

Expand All @@ -656,7 +656,7 @@
android:contentDescription="@string/main_calday_tu_description"
android:gravity="center"
android:text="@string/main_calday_tu"
android:textColor="#ffffffff"
android:textColor="#ff000000"
android:textSize="18sp"
android:textStyle="bold" />

Expand All @@ -665,7 +665,7 @@
android:contentDescription="@string/main_calday_we_description"
android:gravity="center"
android:text="@string/main_calday_we"
android:textColor="#ffffffff"
android:textColor="#ff000000"
android:textSize="18sp"
android:textStyle="bold" />

Expand All @@ -674,7 +674,7 @@
android:contentDescription="@string/main_calday_th_description"
android:gravity="center"
android:text="@string/main_calday_th"
android:textColor="#ffffffff"
android:textColor="#ff000000"
android:textSize="18sp"
android:textStyle="bold" />

Expand All @@ -683,7 +683,7 @@
android:contentDescription="@string/main_calday_fr_description"
android:gravity="center"
android:text="@string/main_calday_fr"
android:textColor="#ffffffff"
android:textColor="#ff000000"
android:textSize="18sp"
android:textStyle="bold" />

Expand All @@ -692,7 +692,7 @@
android:contentDescription="@string/main_calday_sa_description"
android:gravity="center"
android:text="@string/main_calday_sa"
android:textColor="#ffffffff"
android:textColor="#ff000000"
android:textSize="18sp"
android:textStyle="bold" />
</TableRow>
Expand All @@ -710,7 +710,7 @@
android:contentDescription="@string/main_calday_mo_description"
android:gravity="center"
android:text="@string/main_calday_mo"
android:textColor="#ffffffff"
android:textColor="#ff000000"
android:textSize="18sp"
android:textStyle="bold" />

Expand All @@ -719,7 +719,7 @@
android:contentDescription="@string/main_calday_tu_description"
android:gravity="center"
android:text="@string/main_calday_tu"
android:textColor="#ffffffff"
android:textColor="#ff000000"
android:textSize="18sp"
android:textStyle="bold" />

Expand All @@ -728,7 +728,7 @@
android:contentDescription="@string/main_calday_we_description"
android:gravity="center"
android:text="@string/main_calday_we"
android:textColor="#ffffffff"
android:textColor="#ff000000"
android:textSize="18sp"
android:textStyle="bold" />

Expand All @@ -737,7 +737,7 @@
android:contentDescription="@string/main_calday_th_description"
android:gravity="center"
android:text="@string/main_calday_th"
android:textColor="#ffffffff"
android:textColor="#ff000000"
android:textSize="18sp"
android:textStyle="bold" />

Expand All @@ -746,7 +746,7 @@
android:contentDescription="@string/main_calday_fr_description"
android:gravity="center"
android:text="@string/main_calday_fr"
android:textColor="#ffffffff"
android:textColor="#ff000000"
android:textSize="18sp"
android:textStyle="bold" />

Expand All @@ -755,7 +755,7 @@
android:contentDescription="@string/main_calday_sa_description"
android:gravity="center"
android:text="@string/main_calday_sa"
android:textColor="#ffffffff"
android:textColor="#ff000000"
android:textSize="18sp"
android:textStyle="bold" />

Expand All @@ -764,7 +764,7 @@
android:contentDescription="@string/main_calday_su_description"
android:gravity="center"
android:text="@string/main_calday_su"
android:textColor="#ffffffff"
android:textColor="#ff000000"
android:textSize="18sp"
android:textStyle="bold" />
</TableRow>
Expand Down
4 changes: 1 addition & 3 deletions app/src/main/res/values-zh/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -105,10 +105,8 @@
<string name="label_details_ev1" tools:keep="@string/label_details_ev1">爱爱</string>
<string name="label_details_ev2" tools:keep="@string/label_details_ev2">腹疼</string>
<string name="label_details_ev3" tools:keep="@string/label_details_ev3">背疼</string>
<string name="label_details_ev4" tools:keep="@string/label_details_ev4">Middle pain left</string>
<string name="label_details_ev5" tools:keep="@string/label_details_ev5">Middle pain right</string>
<string name="label_details_ev4" tools:keep="@string/label_details_ev4">腰疼</string>
<string name="label_details_ev6" tools:keep="@string/label_details_ev6">胸疼</string>
<string name="label_details_ev7" tools:keep="@string/label_details_ev7">Thrush/candida</string>
<string name="label_details_ev8" tools:keep="@string/label_details_ev8">排泄</string>
<string name="label_details_ev9" tools:keep="@string/label_details_ev9">大出血</string>
<string name="label_details_ev10" tools:keep="@string/label_details_ev10">体温波动</string>
Expand Down
2 changes: 0 additions & 2 deletions app/src/main/res/values/strings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,9 +106,7 @@
<string name="label_details_ev2" tools:keep="@string/label_details_ev2">Cramps</string>
<string name="label_details_ev3" tools:keep="@string/label_details_ev3">Back pain</string>
<string name="label_details_ev4" tools:keep="@string/label_details_ev4">Middle pain left</string>
<string name="label_details_ev5" tools:keep="@string/label_details_ev5">Middle pain right</string>
<string name="label_details_ev6" tools:keep="@string/label_details_ev6">Breast pain/dragging pain</string>
<string name="label_details_ev7" tools:keep="@string/label_details_ev7">Thrush/candida</string>
<string name="label_details_ev8" tools:keep="@string/label_details_ev8">Discharge</string>
<string name="label_details_ev9" tools:keep="@string/label_details_ev9">Intense bleeding</string>
<string name="label_details_ev10" tools:keep="@string/label_details_ev10">Temperature fluctuations</string>
Expand Down

0 comments on commit 9f38b0b

Please sign in to comment.