アイコンを増やして並び順を変えた。

diff --git a/wear/src/main/java/net/osdn/gokigen/joggingtimer/utilities/IconIdProvider.java b/wear/src/main/java/net/osdn/gokigen/joggingtimer/utilities/IconIdProvider.java
index db65189..a13ba46 100644 (file)
--- a/wear/src/main/java/net/osdn/gokigen/joggingtimer/utilities/IconIdProvider.java
+++ b/wear/src/main/java/net/osdn/gokigen/joggingtimer/utilities/IconIdProvider.java
@@ -12,6 +12,15 @@ public class IconIdProvider
             R.drawable.ic_label_outline_black_24dp     ,
             R.drawable.ic_info_outline_black_24dp      ,
             R.drawable.ic_warning_black_24dp   ,
+            R.drawable.ic_thumb_down_black_24dp        ,
+            R.drawable.ic_thumb_up_black_24dp  ,
+            R.drawable.ic_star_border_black_24dp       ,
+            R.drawable.ic_star_half_black_24dp ,
+            R.drawable.ic_star_black_24dp      ,
+            R.drawable.ic_timer_black_24dp     ,
+            R.drawable.ic_history_black_24dp   ,
+            R.drawable.ic_update_black_24dp    ,
+            R.drawable.ic_timer_off_black_24dp ,
             R.drawable.ic_block_black_24dp     ,
             R.drawable.ic_do_not_disturb_black_24dp    ,
             R.drawable.ic_sentiment_very_dissatisfied_black_24dp       ,
@@ -26,19 +35,17 @@ public class IconIdProvider
             R.drawable.ic_directions_walk_black_24dp   ,
             R.drawable.ic_directions_run_black_24dp    ,
             R.drawable.ic_directions_bike_black_24dp   ,
+            R.drawable.ic_rowing_black_24dp,
             R.drawable.ic_directions_boat_black_24dp   ,
+            R.drawable.ic_motorcycle_black_24dp,
             R.drawable.ic_directions_car_black_24dp    ,
             R.drawable.ic_directions_transit_black_24dp        ,
             R.drawable.ic_flight_black_24dp    ,
-            R.drawable.ic_thumb_down_black_24dp        ,
-            R.drawable.ic_thumb_up_black_24dp  ,
-            R.drawable.ic_star_border_black_24dp       ,
-            R.drawable.ic_star_half_black_24dp ,
-            R.drawable.ic_star_black_24dp      ,
-            R.drawable.ic_timer_black_24dp     ,
-            R.drawable.ic_history_black_24dp   ,
-            R.drawable.ic_update_black_24dp    ,
-            R.drawable.ic_timer_off_black_24dp ,
+            R.drawable.ic_terrain_black_24dp,
+            R.drawable.ic_beach_access_black_24dp,
+            R.drawable.ic_fitness_center_black_24dp,
+            R.drawable.ic_golf_course_black_24dp,
+            R.drawable.ic_android_black_24dp,
     };
 
     public static int getIconResourceId(int id)

diff --git a/wear/src/main/res/drawable/ic_android_black_24dp.xml b/wear/src/main/res/drawable/ic_android_black_24dp.xml
new file mode 100644 (file)
index 0000000..401cbf6
--- /dev/null
+++ b/wear/src/main/res/drawable/ic_android_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M6,18c0,0.55 0.45,1 1,1h1v3.5c0,0.83 0.67,1.5 1.5,1.5s1.5,-0.67 1.5,-1.5L11,19h2v3.5c0,0.83 0.67,1.5 1.5,1.5s1.5,-0.67 1.5,-1.5L16,19h1c0.55,0 1,-0.45 1,-1L18,8L6,8v10zM3.5,8C2.67,8 2,8.67 2,9.5v7c0,0.83 0.67,1.5 1.5,1.5S5,17.33 5,16.5v-7C5,8.67 4.33,8 3.5,8zM20.5,8c-0.83,0 -1.5,0.67 -1.5,1.5v7c0,0.83 0.67,1.5 1.5,1.5s1.5,-0.67 1.5,-1.5v-7c0,-0.83 -0.67,-1.5 -1.5,-1.5zM15.53,2.16l1.3,-1.3c0.2,-0.2 0.2,-0.51 0,-0.71 -0.2,-0.2 -0.51,-0.2 -0.71,0l-1.48,1.48C13.85,1.23 12.95,1 12,1c-0.96,0 -1.86,0.23 -2.66,0.63L7.85,0.15c-0.2,-0.2 -0.51,-0.2 -0.71,0 -0.2,0.2 -0.2,0.51 0,0.71l1.31,1.31C6.97,3.26 6,5.01 6,7h12c0,-1.99 -0.97,-3.75 -2.47,-4.84zM10,5L9,5L9,4h1v1zM15,5h-1L14,4h1v1z"/>
+</vector>

diff --git a/wear/src/main/res/drawable/ic_beach_access_black_24dp.xml b/wear/src/main/res/drawable/ic_beach_access_black_24dp.xml
new file mode 100644 (file)
index 0000000..f2fd5e7
--- /dev/null
+++ b/wear/src/main/res/drawable/ic_beach_access_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M13.127,14.56l1.43,-1.43 6.44,6.443L19.57,21zM17.42,8.83l2.86,-2.86c-3.95,-3.95 -10.35,-3.96 -14.3,-0.02 3.93,-1.3 8.31,-0.25 11.44,2.88zM5.95,5.98c-3.94,3.95 -3.93,10.35 0.02,14.3l2.86,-2.86C5.7,14.29 4.65,9.91 5.95,5.98zM5.97,5.96l-0.01,0.01c-0.38,3.01 1.17,6.88 4.3,10.02l5.73,-5.73c-3.13,-3.13 -7.01,-4.68 -10.02,-4.3z"/>
+</vector>

diff --git a/wear/src/main/res/drawable/ic_fitness_center_black_24dp.xml b/wear/src/main/res/drawable/ic_fitness_center_black_24dp.xml
new file mode 100644 (file)
index 0000000..846deb4
--- /dev/null
+++ b/wear/src/main/res/drawable/ic_fitness_center_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M20.57,14.86L22,13.43 20.57,12 17,15.57 8.43,7 12,3.43 10.57,2 9.14,3.43 7.71,2 5.57,4.14 4.14,2.71 2.71,4.14l1.43,1.43L2,7.71l1.43,1.43L2,10.57 3.43,12 7,8.43 15.57,17 12,20.57 13.43,22l1.43,-1.43L16.29,22l2.14,-2.14 1.43,1.43 1.43,-1.43 -1.43,-1.43L22,16.29z"/>
+</vector>

diff --git a/wear/src/main/res/drawable/ic_golf_course_black_24dp.xml b/wear/src/main/res/drawable/ic_golf_course_black_24dp.xml
new file mode 100644 (file)
index 0000000..4e24744
--- /dev/null
+++ b/wear/src/main/res/drawable/ic_golf_course_black_24dp.xml
@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M19.5,19.5m-1.5,0a1.5,1.5 0,1 1,3 0a1.5,1.5 0,1 1,-3 0"/>
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M17,5.92L9,2v18H7v-1.73c-1.79,0.35 -3,0.99 -3,1.73 0,1.1 2.69,2 6,2s6,-0.9 6,-2c0,-0.99 -2.16,-1.81 -5,-1.97V8.98l6,-3.06z"/>
+</vector>

diff --git a/wear/src/main/res/drawable/ic_motorcycle_black_24dp.xml b/wear/src/main/res/drawable/ic_motorcycle_black_24dp.xml
new file mode 100644 (file)
index 0000000..539182f
--- /dev/null
+++ b/wear/src/main/res/drawable/ic_motorcycle_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M19.44,9.03L15.41,5H11v2h3.59l2,2H5c-2.8,0 -5,2.2 -5,5s2.2,5 5,5c2.46,0 4.45,-1.69 4.9,-4h1.65l2.77,-2.77c-0.21,0.54 -0.32,1.14 -0.32,1.77 0,2.8 2.2,5 5,5s5,-2.2 5,-5c0,-2.65 -1.97,-4.77 -4.56,-4.97zM7.82,15C7.4,16.15 6.28,17 5,17c-1.63,0 -3,-1.37 -3,-3s1.37,-3 3,-3c1.28,0 2.4,0.85 2.82,2H5v2h2.82zM19,17c-1.66,0 -3,-1.34 -3,-3s1.34,-3 3,-3 3,1.34 3,3 -1.34,3 -3,3z"/>
+</vector>

diff --git a/wear/src/main/res/drawable/ic_rowing_black_24dp.xml b/wear/src/main/res/drawable/ic_rowing_black_24dp.xml
new file mode 100644 (file)
index 0000000..a81e4b1
--- /dev/null
+++ b/wear/src/main/res/drawable/ic_rowing_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M8.5,14.5L4,19l1.5,1.5L9,17h2l-2.5,-2.5zM15,1c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM21,21.01L18,24l-2.99,-3.01L15.01,19.5l-7.1,-7.09c-0.31,0.05 -0.61,0.07 -0.91,0.07v-2.16c1.66,0.03 3.61,-0.87 4.67,-2.04l1.4,-1.55c0.19,-0.21 0.43,-0.38 0.69,-0.5 0.29,-0.14 0.62,-0.23 0.96,-0.23h0.03C15.99,6.01 17,7.02 17,8.26v5.75c0,0.84 -0.35,1.61 -0.92,2.16l-3.58,-3.58v-2.27c-0.63,0.52 -1.43,1.02 -2.29,1.39L16.5,18L18,18l3,3.01z"/>
+</vector>

diff --git a/wear/src/main/res/drawable/ic_terrain_black_24dp.xml b/wear/src/main/res/drawable/ic_terrain_black_24dp.xml
new file mode 100644 (file)
index 0000000..0350ef5
--- /dev/null
+++ b/wear/src/main/res/drawable/ic_terrain_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M14,6l-3.75,5 2.85,3.8 -1.6,1.2C9.81,13.75 7,10 7,10l-6,8h22L14,6z"/>
+</vector>