OSDN Git Service

レイアウトを見直し(途中)。
authorMRSa <mrsa@myad.jp>
Wed, 12 Apr 2023 14:08:32 +0000 (23:08 +0900)
committerMRSa <mrsa@myad.jp>
Wed, 12 Apr 2023 14:08:32 +0000 (23:08 +0900)
38 files changed:
.idea/assetWizardSettings.xml
.idea/deploymentTargetDropDown.xml
.idea/misc.xml
.idea/modules.xml
wear/build.gradle
wear/src/main/java/net/osdn/gokigen/joggingtimer/stopwatch/MainActivity.java
wear/src/main/res/drawable/baseline_flag_24.xml [new file with mode: 0644]
wear/src/main/res/drawable/baseline_format_list_bulleted_grey_24.xml [new file with mode: 0644]
wear/src/main/res/drawable/baseline_play_arrow_grey_24.xml [new file with mode: 0644]
wear/src/main/res/drawable/baseline_stop_grey_24.xml [new file with mode: 0644]
wear/src/main/res/layout-round/activity_detail.xml [deleted file]
wear/src/main/res/layout-round/activity_list.xml [deleted file]
wear/src/main/res/layout-round/activity_main.xml [deleted file]
wear/src/main/res/layout-round/column_detail.xml [deleted file]
wear/src/main/res/layout-round/column_laptime.xml [deleted file]
wear/src/main/res/layout-round/column_list.xml [deleted file]
wear/src/main/res/layout-round/icon_list.xml [deleted file]
wear/src/main/res/layout-round/information_dialog.xml [deleted file]
wear/src/main/res/layout-round/select_reference_dialog.xml [deleted file]
wear/src/main/res/layout-round/select_set_reference_dialog.xml [deleted file]
wear/src/main/res/layout-round/time_model_picker.xml [deleted file]
wear/src/main/res/layout/activity_detail.xml
wear/src/main/res/layout/activity_list.xml
wear/src/main/res/layout/activity_main.xml
wear/src/main/res/layout/column_detail.xml
wear/src/main/res/layout/column_laptime.xml
wear/src/main/res/layout/column_list.xml
wear/src/main/res/layout/icon_list.xml
wear/src/main/res/layout/information_dialog.xml
wear/src/main/res/layout/time_model_picker.xml
wear/src/main/res/values-ja/strings.xml
wear/src/main/res/values-round-xhdpi/dimens.xml
wear/src/main/res/values-round/arrays.xml [deleted file]
wear/src/main/res/values-round/dimens.xml
wear/src/main/res/values-round/strings.xml [deleted file]
wear/src/main/res/values/colors.xml
wear/src/main/res/values/dimens.xml
wear/src/main/res/values/strings.xml

index aaba25b..58b4ca3 100644 (file)
@@ -18,7 +18,7 @@
                                 <PersistentState>
                                   <option name="values">
                                     <map>
-                                      <entry key="url" value="file:/$PROJECT_DIR$/../../../../APL/Android/sdk/icons/material/materialicons/123/baseline_123_24.xml" />
+                                      <entry key="url" value="file:/$PROJECT_DIR$/../../../Android/android-sdk/icons/material/materialicons/flag/baseline_flag_24.xml" />
                                     </map>
                                   </option>
                                 </PersistentState>
@@ -28,7 +28,8 @@
                         </option>
                         <option name="values">
                           <map>
-                            <entry key="outputName" value="ic_baseline_123_24" />
+                            <entry key="color" value="eeeeee" />
+                            <entry key="outputName" value="baseline_flag_24" />
                             <entry key="sourceFile" value="C:\Users\MRSa" />
                           </map>
                         </option>
index 8c6af3c..17020aa 100644 (file)
@@ -7,11 +7,11 @@
         <deviceKey>
           <Key>
             <type value="VIRTUAL_DEVICE_PATH" />
-            <value value="C:\Users\MRSa\.android\avd\Wear_OS_Square_API_30.avd" />
+            <value value="C:\Users\MRSa\.android\avd\Wear_OS_Small_Round_API_30.avd" />
           </Key>
         </deviceKey>
       </Target>
     </targetSelectedWithDropDown>
-    <timeTargetWasSelectedWithDropDown value="2022-07-09T00:04:35.089277500Z" />
+    <timeTargetWasSelectedWithDropDown value="2023-04-11T14:36:31.355585100Z" />
   </component>
 </project>
\ No newline at end of file
index 7f3707d..dd5b4a6 100644 (file)
   <component name="ProjectType">
     <option name="id" value="Android" />
   </component>
+  <component name="VisualizationToolProject">
+    <option name="state">
+      <ProjectState>
+        <option name="scale" value="0.24294670846394983" />
+      </ProjectState>
+    </option>
+  </component>
   <component name="masterDetails">
     <states>
       <state key="ProjectJDKs.UI">
index 5366941..22e61a3 100644 (file)
@@ -11,6 +11,7 @@
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/wear/JoggingTimer.wear.androidTest.iml" filepath="$PROJECT_DIR$/.idea/modules/wear/JoggingTimer.wear.androidTest.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/wear/JoggingTimer.wear.main.iml" filepath="$PROJECT_DIR$/.idea/modules/wear/JoggingTimer.wear.main.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/wear/JoggingTimer.wear.unitTest.iml" filepath="$PROJECT_DIR$/.idea/modules/wear/JoggingTimer.wear.unitTest.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/OSDN_repositories.JoggingTimer.iml" filepath="$PROJECT_DIR$/.idea/modules/OSDN_repositories.JoggingTimer.iml" />
     </modules>
   </component>
 </project>
\ No newline at end of file
index 03a7c52..ae03d4d 100644 (file)
@@ -20,11 +20,13 @@ android {
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation 'com.google.android.support:wearable:2.9.0'
-    implementation 'com.google.android.gms:play-services-wearable:18.0.0'
+    //implementation 'com.google.android.gms:play-services-wearable:18.0.0'
 
     implementation 'androidx.recyclerview:recyclerview:1.3.0'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
 
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+
     implementation 'androidx.wear:wear:1.2.0'
     compileOnly 'com.google.android.wearable:wearable:2.9.0'
 }
index f51d0be..f2b2e91 100644 (file)
@@ -17,6 +17,8 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.core.widget.NestedScrollView;
 import androidx.fragment.app.FragmentManager;
 import androidx.wear.ambient.AmbientModeSupport;
 import androidx.wear.widget.BoxInsetLayout;
@@ -192,8 +194,8 @@ public class MainActivity extends AppCompatActivity implements IClickCallback, M
     {
         ITimerCounter timerCounter = counter;
         int bgColor;
-        BoxInsetLayout insetLayout = findViewById(R.id.box_inset_layout);
-        RelativeLayout layout = findViewById(R.id.relative_main_layout);
+        NestedScrollView insetLayout = findViewById(R.id.top_layout);
+        ConstraintLayout layout = findViewById(R.id.main_layout);
 
         ImageButton btn1 = findViewById(R.id.btn1);
         ImageButton btn2 = findViewById(R.id.btn2);
diff --git a/wear/src/main/res/drawable/baseline_flag_24.xml b/wear/src/main/res/drawable/baseline_flag_24.xml
new file mode 100644 (file)
index 0000000..7517d96
--- /dev/null
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#EEEEEE"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M14.4,6L14,4H5v17h2v-7h5.6l0.4,2h7V6z"/>
+</vector>
diff --git a/wear/src/main/res/drawable/baseline_format_list_bulleted_grey_24.xml b/wear/src/main/res/drawable/baseline_format_list_bulleted_grey_24.xml
new file mode 100644 (file)
index 0000000..e510ec1
--- /dev/null
@@ -0,0 +1,5 @@
+<vector android:autoMirrored="true" android:height="24dp"
+    android:tint="#EEEEEE" android:viewportHeight="24"
+    android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M4,10.5c-0.83,0 -1.5,0.67 -1.5,1.5s0.67,1.5 1.5,1.5 1.5,-0.67 1.5,-1.5 -0.67,-1.5 -1.5,-1.5zM4,4.5c-0.83,0 -1.5,0.67 -1.5,1.5S3.17,7.5 4,7.5 5.5,6.83 5.5,6 4.83,4.5 4,4.5zM4,16.5c-0.83,0 -1.5,0.68 -1.5,1.5s0.68,1.5 1.5,1.5 1.5,-0.68 1.5,-1.5 -0.67,-1.5 -1.5,-1.5zM7,19h14v-2L7,17v2zM7,13h14v-2L7,11v2zM7,5v2h14L21,5L7,5z"/>
+</vector>
diff --git a/wear/src/main/res/drawable/baseline_play_arrow_grey_24.xml b/wear/src/main/res/drawable/baseline_play_arrow_grey_24.xml
new file mode 100644 (file)
index 0000000..234bcef
--- /dev/null
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#EEEEEE"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M8,5v14l11,-7z"/>
+</vector>
diff --git a/wear/src/main/res/drawable/baseline_stop_grey_24.xml b/wear/src/main/res/drawable/baseline_stop_grey_24.xml
new file mode 100644 (file)
index 0000000..9b7cd40
--- /dev/null
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#EEEEEE"
+    android:viewportHeight="24" android:viewportWidth="24"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="@android:color/white" android:pathData="M6,6h12v12H6z"/>
+</vector>
diff --git a/wear/src/main/res/layout-round/activity_detail.xml b/wear/src/main/res/layout-round/activity_detail.xml
deleted file mode 100644 (file)
index dcabb53..0000000
+++ /dev/null
@@ -1,59 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.wear.widget.drawer.WearableDrawerLayout
-    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"
-    android:id="@+id/detail_drawer_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/black"
-    tools:context="net.osdn.gokigen.joggingtimer.recorddetail.DetailActivity">
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:id="@+id/time_list"
-        android:orientation="vertical"
-        android:scrollbarAlwaysDrawVerticalTrack="true">
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:id="@+id/detail_title_area"
-            android:text="@string/result_detail"
-            android:textAlignment="center"
-            android:clickable="true"
-            android:focusable="true"
-            android:visibility="gone"
-            />
-        <androidx.wear.widget.WearableRecyclerView
-            android:id="@+id/recycler_detail_view"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:scrollbars="vertical"
-            android:clipChildren="true"
-            android:clipToPadding="true"
-            android:paddingTop="@dimen/list_top_padding"
-            android:paddingBottom="@dimen/list_bottom_padding"
-            android:paddingStart="@dimen/list_start_padding"
-            android:paddingEnd="@dimen/list_end_padding"
-            >
-        </androidx.wear.widget.WearableRecyclerView>
-    </LinearLayout>
-
-    <androidx.wear.widget.drawer.WearableNavigationDrawerView
-        android:id="@+id/top_navigation_drawer"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@color/grey"
-        android:visibility="visible"
-        app:navigationStyle="singlePage" />
-
-    <androidx.wear.widget.drawer.WearableActionDrawerView
-        android:id="@+id/bottom_action_drawer"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@color/grey"
-        android:visibility="gone"
-        app:actionMenu="@menu/selector_detail" />
-
-</androidx.wear.widget.drawer.WearableDrawerLayout>
diff --git a/wear/src/main/res/layout-round/activity_list.xml b/wear/src/main/res/layout-round/activity_list.xml
deleted file mode 100644 (file)
index 5669be0..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.wear.widget.drawer.WearableDrawerLayout
-    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"
-    android:id="@+id/list_drawer_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/black"
-    android:layoutMode="clipBounds"
-    tools:context="net.osdn.gokigen.joggingtimer.recordlist.ListActivity">
-
-    <androidx.wear.widget.BoxInsetLayout
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:id="@+id/time_list"
-        android:orientation="vertical"
-        android:scrollbarAlwaysDrawVerticalTrack="true">
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:id="@+id/list_title_area"
-            android:text="@string/result_list"
-            android:textAlignment="center"
-            android:clickable="true"
-            android:focusable="true"
-            android:visibility="gone"
-            />
-        <androidx.wear.widget.WearableRecyclerView
-            android:id="@+id/recycler_list_view"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:clipChildren="true"
-            android:clipToPadding="true"
-            android:paddingTop="@dimen/list_top_padding"
-            android:paddingBottom="@dimen/list_bottom_padding"
-            android:paddingStart="@dimen/list_start_padding"
-            android:paddingEnd="@dimen/list_end_padding"
-            android:scrollbars="vertical"
-            >
-        </androidx.wear.widget.WearableRecyclerView>
-    </androidx.wear.widget.BoxInsetLayout>
-
-    <androidx.wear.widget.drawer.WearableNavigationDrawerView
-        android:id="@+id/list_top_navigation_drawer"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:background="@color/grey"
-        android:visibility="visible"
-        app:navigationStyle="singlePage" />
-
-</androidx.wear.widget.drawer.WearableDrawerLayout>
diff --git a/wear/src/main/res/layout-round/activity_main.xml b/wear/src/main/res/layout-round/activity_main.xml
deleted file mode 100644 (file)
index 44d2e05..0000000
+++ /dev/null
@@ -1,119 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-
-<androidx.wear.widget.BoxInsetLayout 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"
-    android:id="@+id/box_inset_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/black"
-    android:padding="@dimen/box_inset_layout_padding"
-    tools:context="net.osdn.gokigen.joggingtimer.stopwatch.MainActivity"
-    tools:deviceIds="wear">
-
-    <RelativeLayout
-        android:id="@+id/relative_main_layout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:padding="@dimen/inner_frame_layout_padding"
-        app:boxedEdges="all">
-
-        <TextView
-            android:id="@+id/main_counter"
-            android:textColor="@color/white"
-            android:background="@color/black"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:textAlignment="center"
-            android:textSize="12pt"
-            android:focusable="true"
-            android:clickable="true"
-            android:text="@string/counter" />
-
-        <ImageButton
-            android:id="@+id/btn2"
-            android:background="@color/black"
-            android:tint="@color/white"
-            android:layout_gravity="bottom"
-            android:layout_width="32dp"
-            android:layout_height="28dp"
-            android:layout_alignParentStart="true"
-            android:layout_alignParentBottom="true"
-            android:clickable="true"
-            android:focusable="true"
-            android:scaleType="fitEnd"
-            android:visibility="visible"
-            android:contentDescription="@string/blank"
-            android:src="@drawable/ic_format_list_bulleted_black_24dp"
-            />
-
-        <ImageButton
-            android:id="@+id/btn3"
-            android:layout_width="32dp"
-            android:layout_height="28dp"
-            android:layout_alignParentBottom="true"
-            android:layout_gravity="bottom"
-            android:layout_toEndOf="@+id/btn2"
-            android:background="@color/black"
-            android:tint="@color/white"
-            android:clickable="true"
-            android:contentDescription="@string/blank"
-            android:focusable="true"
-            android:scaleType="fitCenter"
-            android:src="@drawable/ic_stop_black_24dp"
-            android:visibility="invisible" />
-
-        <ImageButton
-            android:id="@+id/btn1"
-            android:background="@color/black"
-            android:tint="@color/white"
-            android:layout_gravity="bottom"
-            android:layout_width="64dp"
-            android:layout_height="30dp"
-            android:layout_alignParentEnd="true"
-            android:layout_alignParentBottom="true"
-            android:clickable="true"
-            android:focusable="true"
-            android:scaleType="fitEnd"
-            android:visibility="visible"
-            android:contentDescription="@string/blank"
-            android:src="@drawable/ic_play_arrow_black_24dp"
-            />
-
-        <TextView
-            android:id="@+id/sub_counter1"
-            android:background="@color/black"
-            android:textColor="@color/white"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:textAlignment="textEnd"
-            android:layout_alignStart="@id/main_counter"
-            android:layout_below="@id/main_counter"
-            android:textSize="7pt"
-            android:text="@string/blank" />
-
-        <net.osdn.gokigen.joggingtimer.stopwatch.graphview.LapTimeGraphView
-            android:id="@+id/graph_area"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="@color/black"
-            android:gravity="center"
-            android:clickable="true"
-            android:focusable="true"
-            android:visibility="gone"
-            android:layout_below="@id/sub_counter1"
-            android:layout_above="@id/btn1"
-            />
-
-        <ListView
-            android:id="@+id/laptime_list_area"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/sub_counter1"
-            android:layout_above="@id/btn1"
-            android:transcriptMode="alwaysScroll"
-            android:visibility="visible"
-            />
-    </RelativeLayout>
-</androidx.wear.widget.BoxInsetLayout>
-
diff --git a/wear/src/main/res/layout-round/column_detail.xml b/wear/src/main/res/layout-round/column_detail.xml
deleted file mode 100644 (file)
index 9e75c21..0000000
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:orientation="horizontal"
-    android:clipChildren="true"
-    android:clipToPadding="true"
-    android:paddingTop="@dimen/header_top_padding"
-    android:paddingBottom="@dimen/header_bottom_padding"
-    >
-    <TextView
-        android:id="@+id/detail_lap_count"
-        android:layout_width="24dp"
-        android:layout_height="24dp"
-        android:textStyle="normal"
-        android:textSize="7pt"
-        android:scaleType="fitCenter"
-        android:layout_gravity="center_vertical"
-        android:maxHeight="24dp"
-        android:minWidth="24dp"
-        android:layout_margin="2dp"
-        android:contentDescription="@string/blank"
-        android:tint="@color/white"
-        android:tag="icon0"
-        />
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:id="@+id/detail_list"
-        >
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textStyle="normal"
-            android:textSize="10pt"
-            android:clickable="false"
-            android:focusable="false"
-            android:tag="main0"
-            android:id="@+id/label1"
-            />
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textSize="8pt"
-            android:clickable="false"
-            android:focusable="false"
-            android:tag="sub0"
-            android:id="@+id/label2"
-            />
-    </LinearLayout>
-</LinearLayout>
diff --git a/wear/src/main/res/layout-round/column_laptime.xml b/wear/src/main/res/layout-round/column_laptime.xml
deleted file mode 100644 (file)
index 0bfee9f..0000000
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:orientation="horizontal"
-    android:id="@+id/laptime_item"
-    android:clipChildren="true"
-    android:clipToPadding="true"
-    android:paddingTop="@dimen/header_top_padding"
-    android:paddingBottom="@dimen/header_bottom_padding"
-    >
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textStyle="normal"
-        android:textSize="8pt"
-        android:clickable="true"
-        android:focusable="true"
-        android:tag="lap1"
-        android:id="@+id/label_lap1"
-        android:gravity="start|center_vertical"
-        android:layout_weight="1"
-        />
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textSize="8pt"
-        android:clickable="true"
-        android:focusable="true"
-        android:tag="lap2"
-        android:id="@+id/labal_lap2"
-        android:gravity="center_horizontal|center_vertical"
-        android:layout_weight="5"
-        />
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:textSize="8pt"
-        android:clickable="true"
-        android:focusable="true"
-        android:tag="lap3"
-        android:id="@+id/labal_lap3"
-        android:layout_weight="4"
-        android:gravity="center_horizontal|center_vertical"
-        />
-</LinearLayout>
diff --git a/wear/src/main/res/layout-round/column_list.xml b/wear/src/main/res/layout-round/column_list.xml
deleted file mode 100644 (file)
index 7d322da..0000000
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="fill_parent"
-    android:layout_height="wrap_content"
-    android:orientation="horizontal"
-    android:clipChildren="true"
-    android:clipToPadding="true"
-    android:paddingTop="@dimen/header_top_padding"
-    android:paddingBottom="@dimen/header_bottom_padding"
-    >
-    <ImageView
-        android:id="@+id/gokigen_icon"
-        android:layout_width="20dp"
-        android:layout_height="20dp"
-        android:scaleType="fitCenter"
-        android:src="@drawable/ic_info_outline_black_24dp"
-        android:layout_gravity="center_vertical"
-        android:maxHeight="20dp"
-        android:minWidth="20dp"
-        android:layout_margin="4dp"
-        android:contentDescription="@string/blank"
-        android:tint="@color/white"
-        android:tag="icon"
-        />
-    <LinearLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:orientation="vertical"
-        android:id="@+id/data_list"
-        >
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textStyle="normal"
-            android:textSize="10pt"
-            android:clickable="false"
-            android:focusable="false"
-            android:tag="main"
-            android:id="@+id/main_text"
-            />
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textSize="8pt"
-            android:clickable="false"
-            android:focusable="false"
-            android:tag="sub"
-            android:id="@+id/sub_text"
-            />
-    </LinearLayout>
-</LinearLayout>
diff --git a/wear/src/main/res/layout-round/icon_list.xml b/wear/src/main/res/layout-round/icon_list.xml
deleted file mode 100644 (file)
index fda6ebd..0000000
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/icon_list_layout"
-    android:orientation="horizontal"
-    android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
-    android:padding="@dimen/icon_list_padding"
-    android:background="@color/white"
-    >
-    <TextView android:id="@+id/selection_icon"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:contentDescription="@string/blank"
-        android:foregroundTint="@color/black"
-        android:drawableTint="@color/black"
-        android:drawableEnd="@drawable/ic_build_black_24dp"
-        android:layout_marginEnd="6dp"
-        />
-</LinearLayout>
diff --git a/wear/src/main/res/layout-round/information_dialog.xml b/wear/src/main/res/layout-round/information_dialog.xml
deleted file mode 100644 (file)
index 1562bf8..0000000
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.wear.widget.BoxInsetLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/list_drawer_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:nestedScrollingEnabled="true"
-    android:paddingStart="@dimen/list_start_padding"
-    android:paddingEnd="@dimen/list_end_padding"
-    android:background="@color/white"
->
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        >
-
-        <LinearLayout
-            android:id="@+id/info_edit_data"
-            android:orientation="vertical"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:padding="2dp"
-            >
-            <Spinner
-                android:id="@+id/spinner_selection"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/blank"
-                android:background="@color/white"
-                android:foregroundTint="@color/black"
-                android:visibility="visible" />
-
-            <EditText android:id="@+id/edit_title"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:autoLink="all"
-                android:linksClickable="true"
-                android:inputType="text"
-                android:hint="@string/dialog_title_hint"
-                android:textColor="#000"
-                android:autofillHints="" />
-        </LinearLayout>
-    </ScrollView>
-</androidx.wear.widget.BoxInsetLayout>
diff --git a/wear/src/main/res/layout-round/select_reference_dialog.xml b/wear/src/main/res/layout-round/select_reference_dialog.xml
deleted file mode 100644 (file)
index 4f1bc54..0000000
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.wear.widget.BoxInsetLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/list_drawer_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:nestedScrollingEnabled="true"
-    android:paddingStart="@dimen/list_start_padding"
-    android:paddingEnd="@dimen/list_end_padding"
-    >
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        >
-        <LinearLayout
-            android:id="@+id/layout_select_reference"
-            android:orientation="vertical"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:padding="2dp"
-            >
-            <Spinner
-                android:id="@+id/spinner_select_reference"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/blank"
-                android:visibility="visible" />
-            <Spinner
-                android:id="@+id/show_laptime_mode"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/blank"
-                android:visibility="visible" />
-        </LinearLayout>
-    </ScrollView>
-</androidx.wear.widget.BoxInsetLayout>
diff --git a/wear/src/main/res/layout-round/select_set_reference_dialog.xml b/wear/src/main/res/layout-round/select_set_reference_dialog.xml
deleted file mode 100644 (file)
index 025e124..0000000
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.wear.widget.BoxInsetLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/list_drawer_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:nestedScrollingEnabled="true"
-    android:paddingStart="@dimen/list_start_padding"
-    android:paddingEnd="@dimen/list_end_padding"
-    >
-    <ScrollView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        >
-        <LinearLayout
-            android:id="@+id/select_set_reference"
-            android:orientation="vertical"
-            android:layout_width="fill_parent"
-            android:layout_height="wrap_content"
-            android:padding="2dp"
-            >
-            <Spinner
-                android:id="@+id/spinner_reference_selection"
-                android:layout_width="fill_parent"
-                android:layout_height="wrap_content"
-                android:text="@string/blank"
-                android:visibility="visible" />
-        </LinearLayout>
-    </ScrollView>
-</androidx.wear.widget.BoxInsetLayout>
diff --git a/wear/src/main/res/layout-round/time_model_picker.xml b/wear/src/main/res/layout-round/time_model_picker.xml
deleted file mode 100644 (file)
index 1027932..0000000
+++ /dev/null
@@ -1,103 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<androidx.wear.widget.BoxInsetLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:id="@+id/picker_box_inset_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@color/black"
-    android:padding="@dimen/box_inset_layout_padding"
-    tools:context="net.osdn.gokigen.joggingtimer.stopwatch.MainActivity"
-    tools:deviceIds="wear">
-
-    <LinearLayout
-        android:id="@+id/time_model_data_layout"
-        android:layout_width="fill_parent"
-        android:layout_height="fill_parent"
-        android:orientation="vertical"
-        >
-
-        <TextView
-            android:id="@+id/information_picker"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:text="@string/information_time_picker"
-            />
-        <LinearLayout
-            android:id="@+id/info_laptime_layout"
-            android:layout_width="fill_parent"
-            android:layout_height="fill_parent"
-            android:orientation="horizontal"
-            android:padding="4dp"
-            >
-
-            <TextView
-                android:id="@+id/lap_start"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:text="@string/time_picker_lap_start"
-                />
-            <NumberPicker
-                android:id="@+id/number_picker_lap_count"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="2"
-                />
-            <TextView
-                android:id="@+id/lap_end"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:text="@string/time_picker_lap_end"
-                />
-            <TextView
-                android:id="@+id/lap_blank"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:text="@string/blank"
-                />
-            <NumberPicker
-                android:id="@+id/number_picker_hours"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="2"
-                />
-            <TextView
-                android:id="@+id/separator_hour"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:text="@string/time_picker_hour_separator"
-                />
-            <NumberPicker
-                android:id="@+id/number_picker_minutes"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="2"
-                />
-            <TextView
-                android:id="@+id/separator_minute"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:text="@string/time_picker_minute_separator"
-                />
-            <NumberPicker
-                android:id="@+id/number_picker_seconds"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="2"
-                />
-            <TextView
-                android:id="@+id/separator_second"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="center"
-                android:text="@string/time_picker_second_separator"
-                />
-        </LinearLayout>
-    </LinearLayout>
-</androidx.wear.widget.BoxInsetLayout>
index 75aacc7..f226293 100644 (file)
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             android:scrollbars="vertical"
+            android:clipChildren="true"
+            android:clipToPadding="true"
+            android:paddingTop="@dimen/list_top_padding"
+            android:paddingBottom="@dimen/list_bottom_padding"
+            android:paddingStart="@dimen/list_start_padding"
+            android:paddingEnd="@dimen/list_end_padding"
             >
 
         </androidx.wear.widget.WearableRecyclerView>
index b4caedb..7bc6000 100644 (file)
@@ -7,6 +7,7 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@color/black"
+    android:layoutMode="clipBounds"
     tools:context="net.osdn.gokigen.joggingtimer.recordlist.ListActivity">
 
     <LinearLayout
             android:id="@+id/recycler_list_view"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
+            android:clipChildren="true"
+            android:clipToPadding="true"
+            android:paddingTop="@dimen/list_top_padding"
+            android:paddingBottom="@dimen/list_bottom_padding"
+            android:paddingStart="@dimen/list_start_padding"
+            android:paddingEnd="@dimen/list_end_padding"
             android:scrollbars="vertical"
             >
         </androidx.wear.widget.WearableRecyclerView>
index 3755e19..6e716eb 100644 (file)
 <?xml version="1.0" encoding="utf-8"?>
-
-<androidx.wear.widget.BoxInsetLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.core.widget.NestedScrollView
+    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"
-    android:id="@+id/box_inset_layout"
+    android:id="@+id/top_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/black"
+    android:background="@color/background_color"
     android:padding="@dimen/box_inset_layout_padding"
+    android:scrollbars="vertical"
     tools:context="net.osdn.gokigen.joggingtimer.stopwatch.MainActivity"
     tools:deviceIds="wear">
 
-    <RelativeLayout
-        android:id="@+id/relative_main_layout"
-        android:layout_width="match_parent"
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:id="@+id/main_layout"
         android:layout_height="match_parent"
-        android:background="@color/black"
-        android:padding="@dimen/inner_frame_layout_padding"
-        app:boxedEdges="all">
+        android:layout_width="match_parent"
+        >
+
+        <TextClock
+            android:id="@+id/clock"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="bottom"
+            android:text="@string/clock_dummy"
+            android:format24Hour="HH:mm"
+            android:format12Hour="HH:mm"
+            android:background="@color/background_color"
+            android:textColor="@android:color/white"
+            android:textSize="14sp"
+            android:minHeight="24dp"
+            android:visibility="visible"
+            android:gravity="center"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent" />
 
         <TextView
             android:id="@+id/main_counter"
             android:textColor="@color/white"
-            android:background="@color/black"
+            android:background="@color/background_color"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:textAlignment="center"
-            android:textSize="16pt"
+            android:textSize="28sp"
+            android:minHeight="48dp"
             android:focusable="true"
             android:clickable="true"
-            android:text="@string/counter" />
-
-        <ImageButton
-            android:id="@+id/btn2"
-            android:background="@color/black"
-            android:tint="@color/white"
-            android:layout_gravity="bottom"
-            android:layout_width="45dp"
-            android:layout_height="40dp"
-            android:layout_alignParentStart="true"
-            android:layout_alignParentBottom="true"
-            android:clickable="true"
-            android:focusable="true"
-            android:scaleType="fitCenter"
+            android:text="@string/counter"
             android:visibility="visible"
-            android:contentDescription="@string/blank"
-            android:src="@drawable/ic_format_list_bulleted_black_24dp"
-            />
-
-        <ImageButton
-            android:id="@+id/btn3"
-            android:layout_width="45dp"
-            android:layout_height="40dp"
-            android:layout_alignParentBottom="true"
-            android:layout_gravity="bottom"
-            android:layout_toEndOf="@+id/btn2"
-            android:background="@color/black"
-            android:tint="@color/white"
-            android:clickable="true"
-            android:contentDescription="@string/blank"
-            android:focusable="true"
-            android:scaleType="fitCenter"
-            android:src="@drawable/ic_stop_black_24dp"
-            android:visibility="invisible" />
-
-        <ImageButton
-            android:id="@+id/btn1"
-            android:background="@color/black"
-            android:tint="@color/white"
-            android:layout_gravity="bottom"
-            android:layout_width="80dp"
-            android:layout_height="40dp"
-            android:layout_alignParentEnd="true"
-            android:layout_alignParentBottom="true"
-            android:clickable="true"
-            android:focusable="true"
-            android:scaleType="fitEnd"
-            android:visibility="visible"
-            android:contentDescription="@string/blank"
-            android:src="@drawable/ic_play_arrow_black_24dp"
-            />
+            android:layout_marginStart="@dimen/indicator_layout_margin"
+            android:layout_marginEnd="@dimen/indicator_layout_margin"
+            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/black"
+            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:layout_alignStart="@id/main_counter"
-            android:layout_below="@id/main_counter"
-            android:textSize="8pt"
-            android:text="@string/blank" />
+            android:visibility="visible"
+            android:layout_marginStart="@dimen/indicator_layout_margin"
+            android:layout_marginEnd="@dimen/indicator_layout_margin"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/main_counter"
+            android:textSize="14sp"
+            android:text="@string/counter" />
 
         <net.osdn.gokigen.joggingtimer.stopwatch.graphview.LapTimeGraphView
             android:id="@+id/graph_area"
             android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:background="@color/black"
+            android:layout_height="0dp"
+            app:layout_constraintDimensionRatio="h,4:1"
+            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:layout_below="@id/sub_counter1"
-            android:layout_above="@id/btn1"
+            android:layout_above="@id/button_area1"
             />
 
         <ListView
             android:id="@+id/laptime_list_area"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/sub_counter1"
-            android:layout_above="@id/btn1"
+            android:layout_height="0dp"
+            app:layout_constraintDimensionRatio="h,4:1"
+            android:background="@color/background_color"
+            app:layout_constraintTop_toBottomOf="@id/sub_counter1"
             android:transcriptMode="alwaysScroll"
             android:visibility="visible"
             />
-    </RelativeLayout>
-</androidx.wear.widget.BoxInsetLayout>
+
+        <LinearLayout
+            android:id="@+id/button_area1"
+            android:layout_width="match_parent"
+            android:layout_height="48dp"
+            android:background="@color/background_color"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/laptime_list_area"
+            android:gravity="center"
+            android:orientation="horizontal">
+
+            <ImageButton
+                android:id="@+id/btn2"
+                android:layout_width="48dp"
+                android:layout_height="48dp"
+                android:layout_gravity="bottom"
+                android:background="@color/background_color"
+                android:clickable="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" />
+
+            <ImageButton
+                android:id="@+id/btn3"
+                android:layout_width="48dp"
+                android:layout_height="48dp"
+                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" />
+
+            <ImageButton
+                android:id="@+id/btn1"
+                android:layout_width="48dp"
+                android:layout_height="48dp"
+                android:layout_gravity="bottom"
+                android:clickable="true"
+                android:contentDescription="@string/description_control_button"
+                android:focusable="true"
+                android:tint="@color/white"
+                android:background="@color/background_color"
+                android:src="@drawable/baseline_play_arrow_grey_24"
+                android:visibility="visible" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/button_area2"
+            android:layout_width="match_parent"
+            android:layout_height="48dp"
+            app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toBottomOf="@id/button_area1"
+            android:gravity="center"
+            android:orientation="horizontal">
+
+            <ImageButton
+                android:id="@+id/btn_01"
+                android:layout_width="48dp"
+                android:layout_height="48dp"
+                android:layout_gravity="bottom"
+                android:background="@null"
+                android:clickable="true"
+                android:contentDescription="@string/description_control_button"
+                android:focusable="true"
+                android:src="@drawable/ic_play_arrow_black_24dp"
+                android:visibility="visible" />
+
+            <ImageButton
+                android:id="@+id/btn_02"
+                android:layout_width="48dp"
+                android:layout_height="48dp"
+                android:layout_gravity="bottom"
+                android:background="@null"
+                android:clickable="true"
+                android:contentDescription="@string/description_control_button"
+                android:focusable="true"
+                android:src="@drawable/ic_format_list_bulleted_black_24dp"
+                android:visibility="visible" />
+
+            <ImageButton
+                android:id="@+id/btn_03"
+                android:layout_width="48dp"
+                android:layout_height="48dp"
+                android:layout_gravity="bottom"
+                android:background="@null"
+                android:clickable="true"
+                android:contentDescription="@string/description_control_button"
+                android:focusable="true"
+                android:visibility="visible"
+                android:src="@drawable/ic_stop_black_24dp" />
+        </LinearLayout>
+
+    </androidx.constraintlayout.widget.ConstraintLayout>
+</androidx.core.widget.NestedScrollView>
index 2e91103..9e75c21 100644 (file)
@@ -3,6 +3,10 @@
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:orientation="horizontal"
+    android:clipChildren="true"
+    android:clipToPadding="true"
+    android:paddingTop="@dimen/header_top_padding"
+    android:paddingBottom="@dimen/header_bottom_padding"
     >
     <TextView
         android:id="@+id/detail_lap_count"
index aa1d836..3dd302b 100644 (file)
@@ -4,6 +4,10 @@
     android:layout_height="wrap_content"
     android:orientation="horizontal"
     android:id="@+id/laptime_item"
+    android:clipChildren="true"
+    android:clipToPadding="true"
+    android:paddingTop="@dimen/header_top_padding"
+    android:paddingBottom="@dimen/header_bottom_padding"
     >
     <TextView
         android:layout_width="wrap_content"
index 3f95cd1..e2bd464 100644 (file)
@@ -3,6 +3,10 @@
     android:layout_width="fill_parent"
     android:layout_height="wrap_content"
     android:orientation="horizontal"
+    android:clipChildren="true"
+    android:clipToPadding="true"
+    android:paddingTop="@dimen/header_top_padding"
+    android:paddingBottom="@dimen/header_bottom_padding"
     >
     <ImageView
         android:id="@+id/gokigen_icon"
index b54ebc0..ed2bdbf 100644 (file)
@@ -4,7 +4,7 @@
     android:orientation="horizontal"
     android:layout_width="fill_parent"
     android:layout_height="fill_parent"
-    android:padding="8dp"
+    android:padding="@dimen/icon_list_padding"
     android:background="@color/white"
     >
     <TextView android:id="@+id/selection_icon"
index 565f292..b2c4a80 100644 (file)
@@ -5,7 +5,10 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:nestedScrollingEnabled="true"
-    android:background="@color/white">
+    android:paddingStart="@dimen/list_start_padding"
+    android:paddingEnd="@dimen/list_end_padding"
+    android:background="@color/white"
+>
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
index 2cba056..1027932 100644 (file)
     tools:deviceIds="wear">
 
     <LinearLayout
-    android:id="@+id/time_model_data_layout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    >
-
-    <TextView
-        android:id="@+id/information_picker"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:text="@string/information_time_picker"
-        />
-    <LinearLayout
-        android:id="@+id/info_laptime_layout"
+        android:id="@+id/time_model_data_layout"
         android:layout_width="fill_parent"
         android:layout_height="fill_parent"
-        android:orientation="horizontal"
-        android:padding="4dp"
+        android:orientation="vertical"
         >
 
         <TextView
-            android:id="@+id/lap_start"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:text="@string/time_picker_lap_start"
-            />
-        <NumberPicker
-            android:id="@+id/number_picker_lap_count"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="2"
-            />
-        <TextView
-            android:id="@+id/lap_end"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:text="@string/time_picker_lap_end"
-            />
-        <TextView
-            android:id="@+id/lap_blank"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:text="@string/blank"
-            />
-        <NumberPicker
-            android:id="@+id/number_picker_hours"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="2"
-            />
-        <TextView
-            android:id="@+id/separator_hour"
+            android:id="@+id/information_picker"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:text="@string/time_picker_hour_separator"
-            />
-        <NumberPicker
-            android:id="@+id/number_picker_minutes"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="2"
-            />
-        <TextView
-            android:id="@+id/separator_minute"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:text="@string/time_picker_minute_separator"
-            />
-        <NumberPicker
-            android:id="@+id/number_picker_seconds"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_weight="2"
-            />
-        <TextView
-            android:id="@+id/separator_second"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center"
-            android:text="@string/time_picker_second_separator"
+            android:text="@string/information_time_picker"
             />
+        <LinearLayout
+            android:id="@+id/info_laptime_layout"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:orientation="horizontal"
+            android:padding="4dp"
+            >
+
+            <TextView
+                android:id="@+id/lap_start"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:text="@string/time_picker_lap_start"
+                />
+            <NumberPicker
+                android:id="@+id/number_picker_lap_count"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="2"
+                />
+            <TextView
+                android:id="@+id/lap_end"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:text="@string/time_picker_lap_end"
+                />
+            <TextView
+                android:id="@+id/lap_blank"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:text="@string/blank"
+                />
+            <NumberPicker
+                android:id="@+id/number_picker_hours"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="2"
+                />
+            <TextView
+                android:id="@+id/separator_hour"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:text="@string/time_picker_hour_separator"
+                />
+            <NumberPicker
+                android:id="@+id/number_picker_minutes"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="2"
+                />
+            <TextView
+                android:id="@+id/separator_minute"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:text="@string/time_picker_minute_separator"
+                />
+            <NumberPicker
+                android:id="@+id/number_picker_seconds"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_weight="2"
+                />
+            <TextView
+                android:id="@+id/separator_second"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center"
+                android:text="@string/time_picker_second_separator"
+                />
+        </LinearLayout>
     </LinearLayout>
-</LinearLayout>
 </androidx.wear.widget.BoxInsetLayout>
index 1f18323..8a66734 100644 (file)
@@ -5,7 +5,8 @@
     <string name="result_detail">ラップタイム詳細</string>
     <string name="app_title">ジョギングタイマ</string>
     <string name="blank"> </string>
-    <string name="counter">00\'00\"0</string>
+    <string name="clock_dummy">HH:MM</string>
+    <string name="counter">[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>
@@ -27,4 +28,5 @@
     <string name="information_time_picker">LAPと総時間を入力</string>
     <string name="information_modify_time">目標ラップタイムを設定</string>
     <string name="select_reference_title">基準</string>
+    <string name="description_control_button"> </string>
 </resources>
\ No newline at end of file
index 54273b8..ca288d0 100644 (file)
@@ -12,4 +12,6 @@
     <dimen name="list_end_padding">20dp</dimen>
     <dimen name="list_top_padding">40dp</dimen>
     <dimen name="list_bottom_padding">40dp</dimen>
+
+    <dimen name="indicator_layout_margin">30dp</dimen>
 </resources>
diff --git a/wear/src/main/res/values-round/arrays.xml b/wear/src/main/res/values-round/arrays.xml
deleted file mode 100644 (file)
index 571f964..0000000
+++ /dev/null
@@ -1,150 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <array name="icon_selection">
-        <item>@drawable/ic_label_outline_black_24dp</item>
-        <item>@drawable/ic_bookmark_black_24dp</item>
-        <item>@drawable/ic_book_black_24dp</item>
-        <item>@drawable/ic_receipt_black_24dp</item>
-        <item>@drawable/ic_info_outline_black_24dp</item>
-        <item>@drawable/ic_check_circle_black_24dp</item>
-        <item>@drawable/ic_info_black_24dp</item>
-        <item>@drawable/ic_warning_black_24dp</item>
-        <item>@drawable/ic_thumb_down_black_24dp</item>
-        <item>@drawable/ic_thumb_up_black_24dp</item>
-        <item>@drawable/ic_star_border_black_24dp</item>
-        <item>@drawable/ic_star_half_black_24dp</item>
-        <item>@drawable/ic_star_black_24dp</item>
-        <item>@drawable/ic_timer_black_24dp</item>
-        <item>@drawable/ic_history_black_24dp</item>
-        <item>@drawable/ic_update_black_24dp</item>
-        <item>@drawable/ic_timer_off_black_24dp</item>
-        <item>@drawable/ic_block_black_24dp</item>
-        <item>@drawable/ic_do_not_disturb_black_24dp</item>
-        <item>@drawable/ic_sentiment_very_dissatisfied_black_24dp</item>
-        <item>@drawable/ic_mood_bad_black_24dp</item>
-        <item>@drawable/ic_sentiment_dissatisfied_black_24dp</item>
-        <item>@drawable/ic_sentiment_neutral_black_24dp</item>
-        <item>@drawable/ic_sentiment_satisfied_black_24dp</item>
-        <item>@drawable/ic_mood_black_24dp</item>
-        <item>@drawable/ic_sentiment_very_satisfied_black_24dp</item>
-        <item>@drawable/ic_child_care_black_24dp</item>
-        <item>@drawable/ic_flag_black_24dp</item>
-        <item>@drawable/ic_directions_walk_black_24dp</item>
-        <item>@drawable/ic_directions_run_black_24dp</item>
-        <item>@drawable/ic_directions_bike_black_24dp</item>
-        <item>@drawable/ic_rowing_black_24dp</item>
-        <item>@drawable/ic_directions_boat_black_24dp</item>
-        <item>@drawable/ic_motorcycle_black_24dp</item>
-        <item>@drawable/ic_directions_car_black_24dp</item>
-        <item>@drawable/ic_directions_transit_black_24dp</item>
-        <item>@drawable/ic_flight_black_24dp</item>
-        <item>@drawable/ic_terrain_black_24dp</item>
-        <item>@drawable/ic_beach_access_black_24dp</item>
-        <item>@drawable/ic_fitness_center_black_24dp</item>
-        <item>@drawable/ic_golf_course_black_24dp</item>
-        <item>@drawable/ic_baseline_elderly_24</item>
-        <item>@drawable/ic_baseline_emoji_people_24</item>
-        <item>@drawable/ic_baseline_follow_the_signs_24</item>
-        <item>@drawable/ic_baseline_hail_24</item>
-        <item>@drawable/ic_baseline_hiking_24</item>
-        <item>@drawable/ic_baseline_self_improvement_24</item>
-        <item>@drawable/ic_baseline_pedal_bike_24</item>
-        <item>@drawable/ic_baseline_boy_24</item>
-        <item>@drawable/ic_baseline_android_24</item>
-        <item>@drawable/ic_baseline_downhill_skiing_24</item>
-        <item>@drawable/ic_baseline_escalator_warning_24</item>
-        <item>@drawable/ic_baseline_wc_24</item>
-        <item>@drawable/ic_baseline_skateboarding_24</item>
-        <item>@drawable/ic_baseline_snowboarding_24</item>
-        <item>@drawable/ic_baseline_snowshoeing_24</item>
-        <item>@drawable/ic_baseline_sledding_24</item>
-        <item>@drawable/ic_baseline_snowmobile_24</item>
-        <item>@drawable/ic_baseline_sports_handball_24</item>
-        <item>@drawable/ic_baseline_surfing_24</item>
-        <item>@drawable/ic_baseline_cruelty_free_24</item>
-        <item>@drawable/ic_baseline_accessibility_24</item>
-        <item>@drawable/ic_baseline_accessibility_new_24</item>
-        <item>@drawable/ic_baseline_123_24</item>
-        <item>@drawable/ic_lightbulb_outline_black_24dp</item>
-        <item>@drawable/ic_bookmark_border_black_24dp</item>
-        <item>@drawable/ic_baseline_sick_24</item>
-    </array>
-    <string-array name="icon_selection_id">
-        <item>0</item>
-        <item>5</item>
-        <item>6</item>
-        <item>7</item>
-        <item>8</item>
-        <item>9</item>
-        <item>10</item>
-        <item>11</item>
-        <item>12</item>
-        <item>13</item>
-        <item>14</item>
-        <item>15</item>
-        <item>16</item>
-        <item>17</item>
-        <item>18</item>
-        <item>19</item>
-        <item>20</item>
-        <item>21</item>
-        <item>22</item>
-        <item>23</item>
-        <item>24</item>
-        <item>25</item>
-        <item>26</item>
-        <item>27</item>
-        <item>28</item>
-        <item>29</item>
-        <item>30</item>
-        <item>31</item>
-        <item>32</item>
-        <item>33</item>
-        <item>34</item>
-        <item>35</item>
-        <item>36</item>
-        <item>37</item>
-        <item>38</item>
-        <item>39</item>
-        <item>40</item>
-        <item>41</item>
-        <item>42</item>
-        <item>43</item>
-        <item>44</item>
-        <item>45</item>
-        <item>46</item>
-        <item>47</item>
-        <item>48</item>
-        <item>49</item>
-        <item>50</item>
-        <item>51</item>
-        <item>52</item>
-        <item>53</item>
-        <item>54</item>
-        <item>55</item>
-        <item>56</item>
-        <item>57</item>
-        <item>58</item>
-        <item>59</item>
-        <item>60</item>
-        <item>61</item>
-        <item>62</item>
-        <item>63</item>
-        <item>64</item>
-        <item>65</item>
-        <item>66</item>
-        <item>67</item>
-        <item>68</item>
-        <item>69</item>
-        <item>70</item>
-    </string-array>
-    <string-array name="reference_selection_array">
-        <item>A</item>
-        <item>B</item>
-        <item>C</item>
-    </string-array>
-    <string-array name="show_laptime_array">
-        <item>List</item>
-        <item>Graphic</item>
-    </string-array>
-</resources>
\ No newline at end of file
index ad5ba08..d0f1900 100644 (file)
@@ -12,4 +12,6 @@
     <dimen name="list_end_padding">6dp</dimen>
     <dimen name="list_top_padding">40dp</dimen>
     <dimen name="list_bottom_padding">40dp</dimen>
+
+    <dimen name="indicator_layout_margin">32dp</dimen>
 </resources>
diff --git a/wear/src/main/res/values-round/strings.xml b/wear/src/main/res/values-round/strings.xml
deleted file mode 100644 (file)
index 3ace3b9..0000000
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-    <string name="app_name">JoggingTimer</string>
-    <string name="app_title">Jogging Timer</string>
-    <string name="blank"> </string>
-    <string name="counter">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>
-    <string name="dialog_negative_cancel">Cancel</string>
-    <string name="dialog_title_hint">Set Title</string>
-    <string name="dialog_message_data_edit">Data Edit</string>
-    <string name="action_edit_title">Edit Title/Icon</string>
-    <string name="action_change_icon">Change Icon</string>
-    <string name="action_set_reference">Set Reference Data</string>
-    <string name="action_edited_data">Data Updated</string>
-    <string name="action_create_model">Create Model Data</string>
-    <string name="action_share_data">Share Data</string>
-    <string name="created_model_data">Created.</string>
-    <string name="time_picker_lap_start">[</string>
-    <string name="time_picker_lap_end">]</string>
-    <string name="time_picker_hour_separator">:</string>
-    <string name="time_picker_minute_separator">:</string>
-    <string name="time_picker_second_separator"> </string>
-    <string name="information_time_picker">Set LAP and total Time</string>
-    <string name="information_modify_time">Set Target LAP Time</string>
-    <string name="select_reference_title">Reference</string>
-</resources>
index 030098f..46f40e6 100644 (file)
@@ -3,4 +3,7 @@
     <color name="colorPrimary">#6200EE</color>
     <color name="colorPrimaryDark">#3700B3</color>
     <color name="colorAccent">#03DAC5</color>
+    <color name="background_color">#FF000000</color>
+    <color name="black">#FF000000</color>
+    <color name="white">#FFFFFFFF</color>
 </resources>
index cbcb635..dc91fc9 100644 (file)
@@ -22,4 +22,6 @@
     <dimen name="list_end_padding">0dp</dimen>
     <dimen name="list_top_padding">0dp</dimen>
     <dimen name="list_bottom_padding">0dp</dimen>
+
+    <dimen name="indicator_layout_margin">2dp</dimen>
 </resources>
index 7ecfd8c..65963d1 100644 (file)
@@ -5,7 +5,8 @@
     <string name="result_detail">Detail</string>
     <string name="app_title">Jogging Timer</string>
     <string name="blank"> </string>
-    <string name="counter">00\'00\"0</string>
+    <string name="clock_dummy">HH:MM</string>
+    <string name="counter">[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>
@@ -27,4 +28,5 @@
     <string name="information_time_picker">Set LAP and total Time</string>
     <string name="information_modify_time">Set Target LAP Time</string>
     <string name="select_reference_title">Reference</string>
+    <string name="description_control_button"> </string>
 </resources>