レイアウトの見直し。（その4）

diff --git a/.idea/misc.xml b/.idea/misc.xml
index cfde12e..c839562 100644 (file)
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -160,7 +160,7 @@
   <component name="VisualizationToolProject">
     <option name="state">
       <ProjectState>
-        <option name="scale" value="0.42105263157894735" />
+        <option name="scale" value="0.3511647972389991" />
       </ProjectState>
     </option>
   </component>

diff --git a/wear/src/main/java/net/osdn/gokigen/joggingtimer/stopwatch/MainActivity.java b/wear/src/main/java/net/osdn/gokigen/joggingtimer/stopwatch/MainActivity.java
index a41cfda..b4d4bfe 100644 (file)
--- a/wear/src/main/java/net/osdn/gokigen/joggingtimer/stopwatch/MainActivity.java
+++ b/wear/src/main/java/net/osdn/gokigen/joggingtimer/stopwatch/MainActivity.java
@@ -766,11 +766,11 @@ public class MainActivity extends AppCompatActivity implements IClickCallback, M
             {
                 graphView.setITimerCounter(counter);
                 graphView.setVisibility(View.VISIBLE);
-                listView.setVisibility(View.GONE);
+                listView.setVisibility(View.INVISIBLE);
             }
             else
             {
-                graphView.setVisibility(View.GONE);
+                graphView.setVisibility(View.INVISIBLE);
                 listView.setVisibility(View.VISIBLE);
             }
             //controller.vibrate(30);

diff --git a/wear/src/main/res/layout/activity_detail.xml b/wear/src/main/res/layout/activity_detail.xml
index 6141a53..cd40ce1 100644 (file)
--- a/wear/src/main/res/layout/activity_detail.xml
+++ b/wear/src/main/res/layout/activity_detail.xml
@@ -14,6 +14,8 @@
         android:layout_height="match_parent"
         android:id="@+id/time_list"
         android:orientation="vertical"
+        android:layout_marginStart="@dimen/list_layout_margin"
+        android:layout_marginEnd="@dimen/list_layout_margin"
         android:scrollbarAlwaysDrawVerticalTrack="true">
 
         <TextClock
@@ -26,8 +28,8 @@
             android:format12Hour="HH:mm"
             android:background="@color/background_color"
             android:textColor="@android:color/white"
-            android:textSize="14sp"
-            android:minHeight="24dp"
+            android:textSize="12sp"
+            android:minHeight="22dp"
             android:visibility="visible"
             android:gravity="center"
             />

diff --git a/wear/src/main/res/layout/activity_list.xml b/wear/src/main/res/layout/activity_list.xml
index 364173b..3f51e8a 100644 (file)
--- a/wear/src/main/res/layout/activity_list.xml
+++ b/wear/src/main/res/layout/activity_list.xml
@@ -15,6 +15,8 @@
         android:layout_height="match_parent"
         android:id="@+id/time_list"
         android:orientation="vertical"
+        android:layout_marginStart="@dimen/list_layout_margin"
+        android:layout_marginEnd="@dimen/list_layout_margin"
         android:scrollbarAlwaysDrawVerticalTrack="true">
 
         <TextClock
@@ -27,8 +29,8 @@
             android:format12Hour="HH:mm"
             android:background="@color/background_color"
             android:textColor="@android:color/white"
-            android:textSize="14sp"
-            android:minHeight="24dp"
+            android:textSize="12sp"
+            android:minHeight="22dp"
             android:visibility="visible"
             android:gravity="center"
             />

diff --git a/wear/src/main/res/layout/activity_main.xml b/wear/src/main/res/layout/activity_main.xml
index 5f57611..78f7582 100644 (file)
--- a/wear/src/main/res/layout/activity_main.xml
+++ b/wear/src/main/res/layout/activity_main.xml
@@ -28,8 +28,8 @@
             android:format12Hour="HH:mm"
             android:background="@color/background_color"
             android:textColor="@android:color/white"
-            android:textSize="14sp"
-            android:minHeight="24dp"
+            android:textSize="12sp"
+            android:minHeight="22dp"
             android:visibility="visible"
             android:gravity="center"
             app:layout_constraintEnd_toEndOf="parent"
@@ -51,54 +51,57 @@
             android:visibility="visible"
             android:layout_marginStart="@dimen/indicator_layout_margin"
             android:layout_marginEnd="@dimen/indicator_layout_margin"
+            android:contentDescription="@string/description_time_counter"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/clock" />
 
         <TextView
             android:id="@+id/sub_counter1"
-            android:textColor="@color/white"
-            android:background="@color/background_color"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:textAlignment="textEnd"
-            android:focusable="true"
-            android:clickable="true"
-            android:visibility="visible"
             android:layout_marginStart="@dimen/indicator_layout_margin"
             android:layout_marginEnd="@dimen/indicator_layout_margin"
+            android:background="@color/background_color"
+            android:clickable="true"
+            android:focusable="true"
+            android:text="@string/counter_sub"
+            android:textAlignment="textEnd"
+            android:textColor="@color/white"
+            android:textSize="14sp"
+            android:visibility="visible"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/main_counter"
-            android:textSize="14sp"
-            android:text="@string/counter" />
+            app:layout_constraintTop_toBottomOf="@id/main_counter" />
 
-        <net.osdn.gokigen.joggingtimer.stopwatch.graphview.LapTimeGraphView
-            android:id="@+id/graph_area"
+        <ListView
+            android:id="@+id/laptime_list_area"
             android:layout_width="match_parent"
             android:layout_height="0dp"
-            app:layout_constraintDimensionRatio="h,4:1"
+            android:layout_marginStart="@dimen/indicator_layout_margin"
+            android:layout_marginEnd="@dimen/indicator_layout_margin"
+            app:layout_constraintDimensionRatio="h,10:3"
             android:background="@color/background_color"
             app:layout_constraintTop_toBottomOf="@id/sub_counter1"
-            android:gravity="center"
-            android:clickable="true"
-            android:focusable="true"
-            android:visibility="gone"
+            android:transcriptMode="alwaysScroll"
+            android:visibility="visible"
             android:layout_below="@id/sub_counter1"
             android:layout_above="@id/button_area1"
             />
 
-        <ListView
-            android:id="@+id/laptime_list_area"
+        <net.osdn.gokigen.joggingtimer.stopwatch.graphview.LapTimeGraphView
+            android:id="@+id/graph_area"
             android:layout_width="match_parent"
             android:layout_height="0dp"
             android:layout_marginStart="@dimen/indicator_layout_margin"
             android:layout_marginEnd="@dimen/indicator_layout_margin"
-            app:layout_constraintDimensionRatio="h,4:1"
+            app:layout_constraintDimensionRatio="h,10:3"
             android:background="@color/background_color"
             app:layout_constraintTop_toBottomOf="@id/sub_counter1"
-            android:transcriptMode="alwaysScroll"
-            android:visibility="visible"
+            android:gravity="center"
+            android:clickable="true"
+            android:focusable="true"
+            android:visibility="invisible"
             android:layout_below="@id/sub_counter1"
             android:layout_above="@id/button_area1"
             />
@@ -121,9 +124,9 @@
                 android:layout_gravity="bottom"
                 android:background="@color/background_color"
                 android:clickable="true"
+                android:focusable="true"
                 android:tint="@color/white"
                 android:contentDescription="@string/description_control_button"
-                android:focusable="true"
                 android:src="@drawable/baseline_format_list_bulleted_grey_24"
                 android:visibility="invisible" />
 
@@ -134,22 +137,23 @@
                 android:layout_gravity="bottom"
                 android:background="@color/background_color"
                 android:clickable="true"
-                android:contentDescription="@string/description_control_button"
                 android:focusable="true"
                 android:tint="@color/white"
-                android:visibility="visible"
-                android:src="@drawable/baseline_stop_grey_24" />
+                android:text="@string/description_control_button"
+                android:contentDescription="@string/description_stop_button"
+                android:src="@drawable/baseline_stop_grey_24"
+                android:visibility="visible" />
 
             <ImageButton
                 android:id="@+id/btn1"
                 android:layout_width="@dimen/button_width"
                 android:layout_height="@dimen/button_height"
                 android:layout_gravity="bottom"
+                android:background="@color/background_color"
                 android:clickable="true"
-                android:contentDescription="@string/description_control_button"
                 android:focusable="true"
                 android:tint="@color/white"
-                android:background="@color/background_color"
+                android:contentDescription="@string/description_start_button"
                 android:src="@drawable/baseline_play_arrow_grey_24"
                 android:visibility="visible" />
 

diff --git a/wear/src/main/res/values-ja/strings.xml b/wear/src/main/res/values-ja/strings.xml
index 8a66734..8e0aed8 100644 (file)
--- a/wear/src/main/res/values-ja/strings.xml
+++ b/wear/src/main/res/values-ja/strings.xml
@@ -7,6 +7,7 @@
     <string name="blank"> </string>
     <string name="clock_dummy">HH:MM</string>
     <string name="counter">[88] 00\'00\'00\"0</string>
+    <string name="counter_sub">[88] 00\'00\'00\"0</string>
     <string name="dialog_title_delete">記録の削除</string>
     <string name="dialog_message_delete">削除します </string>
     <string name="dialog_positive_execute">OK</string>
@@ -29,4 +30,7 @@
     <string name="information_modify_time">目標ラップタイムを設定</string>
     <string name="select_reference_title">基準</string>
     <string name="description_control_button"> </string>
+    <string name="description_start_button">Start</string>
+    <string name="description_stop_button">Stop</string>
+    <string name="description_time_counter">Time</string>
 </resources>
\ No newline at end of file

diff --git a/wear/src/main/res/values-round-xhdpi/dimens.xml b/wear/src/main/res/values-round-xhdpi/dimens.xml
index 86d2765..3a5ccab 100644 (file)
--- a/wear/src/main/res/values-round-xhdpi/dimens.xml
+++ b/wear/src/main/res/values-round-xhdpi/dimens.xml
@@ -13,7 +13,8 @@
     <dimen name="list_top_padding">40dp</dimen>
     <dimen name="list_bottom_padding">40dp</dimen>
 
-    <dimen name="indicator_layout_margin">30dp</dimen>
+    <dimen name="indicator_layout_margin">26dp</dimen>
+    <dimen name="list_layout_margin">8dp</dimen>
 
     <dimen name="button_width">50dp</dimen>
     <dimen name="button_height">50dp</dimen>

diff --git a/wear/src/main/res/values-round/dimens.xml b/wear/src/main/res/values-round/dimens.xml
index eeef6b4..b6c1701 100644 (file)
--- a/wear/src/main/res/values-round/dimens.xml
+++ b/wear/src/main/res/values-round/dimens.xml
@@ -13,7 +13,8 @@
     <dimen name="list_top_padding">40dp</dimen>
     <dimen name="list_bottom_padding">40dp</dimen>
 
-    <dimen name="indicator_layout_margin">32dp</dimen>
+    <dimen name="indicator_layout_margin">26dp</dimen>
+    <dimen name="list_layout_margin">8dp</dimen>
 
     <dimen name="button_width">50dp</dimen>
     <dimen name="button_height">50dp</dimen>

diff --git a/wear/src/main/res/values/dimens.xml b/wear/src/main/res/values/dimens.xml
index 6bc33fc..9813733 100644 (file)
--- a/wear/src/main/res/values/dimens.xml
+++ b/wear/src/main/res/values/dimens.xml
@@ -23,6 +23,7 @@
     <dimen name="list_top_padding">0dp</dimen>
     <dimen name="list_bottom_padding">0dp</dimen>
 
+    <dimen name="list_layout_margin">4dp</dimen>
     <dimen name="indicator_layout_margin">2dp</dimen>
 
     <dimen name="button_width">50dp</dimen>

diff --git a/wear/src/main/res/values/strings.xml b/wear/src/main/res/values/strings.xml
index 65963d1..9859265 100644 (file)
--- a/wear/src/main/res/values/strings.xml
+++ b/wear/src/main/res/values/strings.xml
@@ -7,6 +7,7 @@
     <string name="blank"> </string>
     <string name="clock_dummy">HH:MM</string>
     <string name="counter">[88] 00\'00\'00\"0</string>
+    <string name="counter_sub">[88] 00\'00\'00\"0</string>
     <string name="dialog_title_delete">REC. DELETE</string>
     <string name="dialog_message_delete">DELETE OK? </string>
     <string name="dialog_positive_execute">OK</string>
@@ -29,4 +30,7 @@
     <string name="information_modify_time">Set Target LAP Time</string>
     <string name="select_reference_title">Reference</string>
     <string name="description_control_button"> </string>
+    <string name="description_start_button">Start</string>
+    <string name="description_stop_button">Stop</string>
+    <string name="description_time_counter">Time</string>
 </resources>