From bbffd9586551bf33de6acf2b0eaad93ad3949ab4 Mon Sep 17 00:00:00 2001
From: MRSa <mrsa@myad.jp>
Date: Sun, 11 Mar 2018 23:12:19 +0900
Subject: [PATCH] =?utf8?q?=E5=BE=AE=E8=AA=BF=E6=95=B4=E3=80=82?=
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

---
 .../recorddetail/RecordDetailSetup.java            |  2 +-
 .../joggingtimer/stopwatch/MainActivity.java       | 18 ++++++--
 .../src/main/res/layout-notround/activity_main.xml | 50 ++++++++++++++++++----
 wear/src/main/res/layout-round/activity_main.xml   | 48 +++++++++++++++++----
 4 files changed, 95 insertions(+), 23 deletions(-)

diff --git a/wear/src/main/java/net/osdn/gokigen/joggingtimer/recorddetail/RecordDetailSetup.java b/wear/src/main/java/net/osdn/gokigen/joggingtimer/recorddetail/RecordDetailSetup.java
index e27ee84..9b06e5a 100644
--- a/wear/src/main/java/net/osdn/gokigen/joggingtimer/recorddetail/RecordDetailSetup.java
+++ b/wear/src/main/java/net/osdn/gokigen/joggingtimer/recorddetail/RecordDetailSetup.java
@@ -108,7 +108,7 @@ public class RecordDetailSetup  implements ITimeEntryDatabaseCallback
                             long overallTime = entryTime - startTime;
                             long differenceTime = (lapTime) - (previousLapTime - morePreviousTime);
                             String lapTimeString = "[" + index + "] " + TimeStringConvert.getTimeString(lapTime).toString();
-                            String overallTimeString = TimeStringConvert.getTimeString(overallTime).toString() + "(" + TimeStringConvert.getDiffTimeString(differenceTime).toString() +") ";
+                            String overallTimeString = TimeStringConvert.getTimeString(overallTime).toString() + " (" + TimeStringConvert.getDiffTimeString(differenceTime).toString() +") ";
                             operation.addRecord(new DetailRecord(dataId, iconId, lapTimeString, overallTimeString));
                             morePreviousTime = previousLapTime;
                             previousLapTime = entryTime;
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 ce9152a..8c52e52 100644
--- a/wear/src/main/java/net/osdn/gokigen/joggingtimer/stopwatch/MainActivity.java
+++ b/wear/src/main/java/net/osdn/gokigen/joggingtimer/stopwatch/MainActivity.java
@@ -196,7 +196,7 @@ public class MainActivity extends WearableActivity implements IClickCallback, My
 
             if (timerCounter.isStarted())
             {
-                bgColor = Color.CYAN;
+                bgColor = Color.BLACK;
                 insetLayout.setBackgroundColor(bgColor);
                 insetLayout.invalidate();
 
@@ -222,7 +222,7 @@ public class MainActivity extends WearableActivity implements IClickCallback, My
             }
             else if (timerCounter.isReset())
             {
-                bgColor = Color.WHITE;
+                bgColor = Color.BLACK;
                 insetLayout.setBackgroundColor(bgColor);
                 insetLayout.invalidate();
 
@@ -248,7 +248,7 @@ public class MainActivity extends WearableActivity implements IClickCallback, My
             }
             else
             {
-                bgColor = Color.rgb(250, 80, 80);
+                bgColor = Color.BLACK;
                 insetLayout.setBackgroundColor(bgColor);
                 insetLayout.invalidate();
 
@@ -377,6 +377,9 @@ public class MainActivity extends WearableActivity implements IClickCallback, My
             {
                 // 停止中は、記録一覧を呼び出す
                 launchListActivity();
+
+                // ぶるぶる
+                controller.vibrate(35);
             }
         }
         updateTimerLabel();
@@ -440,6 +443,10 @@ public class MainActivity extends WearableActivity implements IClickCallback, My
         }
     }
 
+    /**
+     *
+     *
+     */
     private void updateMainSubCounter()
     {
         TextView main = findViewById(R.id.main_counter);
@@ -478,7 +485,10 @@ public class MainActivity extends WearableActivity implements IClickCallback, My
         }
     }
 
-
+    /**
+     *
+     *
+     */
     private void updateElapsedTimes()
     {
         String dummy = "";
diff --git a/wear/src/main/res/layout-notround/activity_main.xml b/wear/src/main/res/layout-notround/activity_main.xml
index b6b56f6..269b0a5 100644
--- a/wear/src/main/res/layout-notround/activity_main.xml
+++ b/wear/src/main/res/layout-notround/activity_main.xml
@@ -6,7 +6,7 @@
     android:id="@+id/box_inset_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/white"
+    android:background="@color/black"
     android:padding="@dimen/box_inset_layout_padding"
     tools:context="net.osdn.gokigen.joggingtimer.stopwatch.MainActivity"
     tools:deviceIds="wear">
@@ -15,12 +15,14 @@
         android:id="@+id/relative_main_layout"
         android:layout_width="match_parent"
         android:layout_height="match_parent"
+        android:background="@color/black"
         android:padding="@dimen/inner_frame_layout_padding"
         app:boxedEdges="all">
 
         <TextView
             android:id="@+id/main_counter"
-            android:textColor="@color/dark_grey"
+            android:textColor="@color/white"
+            android:background="@color/black"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textAlignment="center"
@@ -32,7 +34,8 @@
 
         <ImageButton
             android:id="@+id/btn2"
-            android:background="@color/white"
+            android:background="@color/black"
+            android:tint="@color/white"
             android:layout_gravity="bottom"
             android:layout_width="34dp"
             android:layout_height="34dp"
@@ -53,7 +56,8 @@
             android:layout_alignParentBottom="true"
             android:layout_gravity="bottom"
             android:layout_toEndOf="@+id/btn2"
-            android:background="@color/white"
+            android:background="@color/black"
+            android:tint="@color/white"
             android:clickable="true"
             android:contentDescription="@string/blank"
             android:focusable="true"
@@ -63,7 +67,8 @@
 
         <ImageButton
             android:id="@+id/btn1"
-            android:background="@color/white"
+            android:background="@color/black"
+            android:tint="@color/white"
             android:layout_gravity="bottom"
             android:layout_width="80dp"
             android:layout_height="34dp"
@@ -79,7 +84,8 @@
 
         <TextView
             android:id="@+id/sub_counter1"
-            android:textColor="@color/dark_grey"
+            android:textColor="@color/white"
+            android:background="@color/black"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textAlignment="textEnd"
@@ -87,9 +93,11 @@
             android:layout_below="@id/main_counter"
             android:textSize="8pt"
             android:text="@string/blank" />
+
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:background="@color/black"
             android:id="@+id/lap_time_area"
             android:orientation="vertical"
             android:scrollbarAlwaysDrawVerticalTrack="true"
@@ -97,7 +105,8 @@
 
             <TextView
                 android:id="@+id/sub_counter2"
-                android:textColor="@color/dark_grey"
+                android:textColor="@color/white"
+                android:background="@color/black"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:textAlignment="textStart"
@@ -106,7 +115,8 @@
 
             <TextView
                 android:id="@+id/sub_counter3"
-                android:textColor="@color/dark_grey"
+                android:textColor="@color/white"
+                android:background="@color/black"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:textAlignment="textStart"
@@ -115,12 +125,34 @@
 
             <TextView
                 android:id="@+id/sub_counter4"
-                android:textColor="@color/dark_grey"
+                android:textColor="@color/white"
+                android:background="@color/black"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:textAlignment="textStart"
                 android:textSize="7pt"
                 android:text="@string/blank" />
+            <!--
+                        <TextView
+                            android:id="@+id/sub_counter5"
+                            android:background="@color/black"
+                            android:textColor="@color/white"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:textAlignment="textStart"
+                            android:textSize="7pt"
+                            android:text="@string/blank" />
+
+                        <TextView
+                            android:id="@+id/sub_counter6"
+                            android:background="@color/black"
+                            android:textColor="@color/white"
+                            android:layout_width="match_parent"
+                            android:layout_height="wrap_content"
+                            android:textAlignment="textStart"
+                            android:textSize="7pt"
+                            android:text="@string/blank" />
+            -->
         </LinearLayout>
 
         <View
diff --git a/wear/src/main/res/layout-round/activity_main.xml b/wear/src/main/res/layout-round/activity_main.xml
index ede0de1..cff20fe 100644
--- a/wear/src/main/res/layout-round/activity_main.xml
+++ b/wear/src/main/res/layout-round/activity_main.xml
@@ -6,7 +6,7 @@
     android:id="@+id/box_inset_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/white"
+    android:background="@color/black"
     android:padding="@dimen/box_inset_layout_padding"
     tools:context="net.osdn.gokigen.joggingtimer.stopwatch.MainActivity"
     tools:deviceIds="wear">
@@ -20,7 +20,8 @@
 
         <TextView
             android:id="@+id/main_counter"
-            android:textColor="@color/dark_grey"
+            android:textColor="@color/white"
+            android:background="@color/black"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textAlignment="center"
@@ -31,7 +32,8 @@
 
         <ImageButton
             android:id="@+id/btn2"
-            android:background="@color/white"
+            android:background="@color/black"
+            android:tint="@color/white"
             android:layout_gravity="bottom"
             android:layout_width="32dp"
             android:layout_height="28dp"
@@ -52,7 +54,8 @@
             android:layout_alignParentBottom="true"
             android:layout_gravity="bottom"
             android:layout_toEndOf="@+id/btn2"
-            android:background="@color/white"
+            android:background="@color/black"
+            android:tint="@color/white"
             android:clickable="true"
             android:contentDescription="@string/blank"
             android:focusable="true"
@@ -62,7 +65,8 @@
 
         <ImageButton
             android:id="@+id/btn1"
-            android:background="@color/white"
+            android:background="@color/black"
+            android:tint="@color/white"
             android:layout_gravity="bottom"
             android:layout_width="64dp"
             android:layout_height="30dp"
@@ -78,7 +82,8 @@
 
         <TextView
             android:id="@+id/sub_counter1"
-            android:textColor="@color/dark_grey"
+            android:background="@color/black"
+            android:textColor="@color/white"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textAlignment="textEnd"
@@ -90,6 +95,7 @@
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:background="@color/black"
             android:id="@+id/lap_time_area"
             android:orientation="vertical"
             android:scrollbarAlwaysDrawVerticalTrack="true"
@@ -97,7 +103,8 @@
 
             <TextView
                 android:id="@+id/sub_counter2"
-                android:textColor="@color/dark_grey"
+                android:background="@color/black"
+                android:textColor="@color/white"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:textAlignment="textStart"
@@ -106,7 +113,8 @@
 
             <TextView
                 android:id="@+id/sub_counter3"
-                android:textColor="@color/dark_grey"
+                android:background="@color/black"
+                android:textColor="@color/white"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:textAlignment="textStart"
@@ -115,12 +123,34 @@
 
             <TextView
                 android:id="@+id/sub_counter4"
-                android:textColor="@color/dark_grey"
+                android:background="@color/black"
+                android:textColor="@color/white"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:textAlignment="textStart"
                 android:textSize="7pt"
                 android:text="@string/blank" />
+<!--
+            <TextView
+                android:id="@+id/sub_counter5"
+                android:background="@color/black"
+                android:textColor="@color/white"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textAlignment="textStart"
+                android:textSize="7pt"
+                android:text="@string/blank" />
+
+            <TextView
+                android:id="@+id/sub_counter6"
+                android:background="@color/black"
+                android:textColor="@color/white"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textAlignment="textStart"
+                android:textSize="7pt"
+                android:text="@string/blank" />
+-->
         </LinearLayout>
 
         <View
-- 
2.11.0