OSDN > Finden Software > GOKIGEN > SCM > git > JoggingTimer > Commit

GOKIGEN
Fork
LegacyGpsAdapter
A01c
BondImage
A01d
GokigenClock
GokigenAlignmentChecker
JoggingTimer
PKRemote
GokigenDiary
TheWarikan
MeMoMa
Gr2Control
FujiCam
GokigenCameraControlLibrary
BLEControl
mangle
ThetaThoughtShutter
ThetaView
A01f
prpr1

R/O
HTTP
SSH
HTTPS

JoggingTimer: Commit

A jogging timer for Android wear.

Commit MetaInfo

Revision	1feb33a56e45c8ff51c68d1b26d542c8c0d101b5 (tree)
Zeit	2022-07-04 23:05:49
Autor	MRSa <mrsa@myad...>
Commiter	MRSa

Log Message

Referenceモデルの設定を３つ設定できるようにした。（利用部分はまだ）

Ändern Zusammenfassung

modified: .idea/assetWizardSettings.xml (diff)
add: .idea/deploymentTargetDropDown.xml (diff)
modified: .idea/misc.xml (diff)
modified: build.gradle (diff)
modified: mobile/build.gradle (diff)
modified: wear/build.gradle (diff)
modified: wear/src/main/AndroidManifest.xml (diff)
modified: wear/src/main/java/net/osdn/gokigen/joggingtimer/recorddetail/DetailActivity.java (diff)
modified: wear/src/main/java/net/osdn/gokigen/joggingtimer/recorddetail/RecordDetailSetup.java (diff)
modified: wear/src/main/java/net/osdn/gokigen/joggingtimer/stopwatch/IDatabaseReloadCallback.java (diff)
modified: wear/src/main/java/net/osdn/gokigen/joggingtimer/stopwatch/ITimerCounter.java (diff)
modified: wear/src/main/java/net/osdn/gokigen/joggingtimer/stopwatch/IWearableActivityControl.java (diff)
modified: wear/src/main/java/net/osdn/gokigen/joggingtimer/stopwatch/MyTimerCounter.java (diff)
modified: wear/src/main/java/net/osdn/gokigen/joggingtimer/stopwatch/WearableActivityController.java (diff)
modified: wear/src/main/java/net/osdn/gokigen/joggingtimer/storage/ITimeEntryDatabase.java (diff)
modified: wear/src/main/java/net/osdn/gokigen/joggingtimer/storage/TimeEntryDatabase.java (diff)
modified: wear/src/main/java/net/osdn/gokigen/joggingtimer/utilities/DataEditDialog.java (diff)
modified: wear/src/main/java/net/osdn/gokigen/joggingtimer/utilities/IconIdProvider.java (diff)
add: wear/src/main/java/net/osdn/gokigen/joggingtimer/utilities/SetReferenceDialog.java (diff)
add: wear/src/main/res/drawable/ic_baseline_123_24.xml (diff)
add: wear/src/main/res/drawable/ic_baseline_accessibility_24.xml (diff)
add: wear/src/main/res/drawable/ic_baseline_accessibility_new_24.xml (diff)
add: wear/src/main/res/drawable/ic_baseline_android_24.xml (diff)
add: wear/src/main/res/drawable/ic_baseline_boy_24.xml (diff)
add: wear/src/main/res/drawable/ic_baseline_cruelty_free_24.xml (diff)
add: wear/src/main/res/drawable/ic_baseline_downhill_skiing_24.xml (diff)
modified: wear/src/main/res/drawable/ic_baseline_emoji_people_24.xml (diff)
add: wear/src/main/res/drawable/ic_baseline_escalator_warning_24.xml (diff)
modified: wear/src/main/res/drawable/ic_baseline_hiking_24.xml (diff)
add: wear/src/main/res/drawable/ic_baseline_sick_24.xml (diff)
add: wear/src/main/res/drawable/ic_baseline_skateboarding_24.xml (diff)
add: wear/src/main/res/drawable/ic_baseline_sledding_24.xml (diff)
add: wear/src/main/res/drawable/ic_baseline_snowboarding_24.xml (diff)
add: wear/src/main/res/drawable/ic_baseline_snowmobile_24.xml (diff)
add: wear/src/main/res/drawable/ic_baseline_snowshoeing_24.xml (diff)
add: wear/src/main/res/drawable/ic_baseline_sports_handball_24.xml (diff)
add: wear/src/main/res/drawable/ic_baseline_surfing_24.xml (diff)
add: wear/src/main/res/drawable/ic_baseline_wc_24.xml (diff)
add: wear/src/main/res/drawable/ic_board_1_black_24dp.xml (diff)
add: wear/src/main/res/drawable/ic_board_2_black_24dp.xml (diff)
add: wear/src/main/res/drawable/ic_board_3_black_24dp.xml (diff)
add: wear/src/main/res/layout-notround/select_set_reference_dialog.xml (diff)
add: wear/src/main/res/layout-round/select_set_reference_dialog.xml (diff)
modified: wear/src/main/res/values-ja/arrays.xml (diff)
modified: wear/src/main/res/values-ja/strings.xml (diff)
modified: wear/src/main/res/values-round/arrays.xml (diff)
modified: wear/src/main/res/values/arrays.xml (diff)
add: wear/src/main/res/values/colors.xml (diff)
modified: wear/src/main/res/values/styles.xml (diff)

Diff

--- a/.idea/assetWizardSettings.xml

+++ b/.idea/assetWizardSettings.xml

		@@ -18,7 +18,7 @@
18	18	<PersistentState>
19	19	<option name="values">
20	20	<map>
21		- <entry key="url" value="file:/$PROJECT_DIR$/../../../../APL/Android/sdk/icons/material/materialicons/self_improvement/baseline_self_improvement_24.xml" />
	21	+ <entry key="url" value="file:/$PROJECT_DIR$/../../../../APL/Android/sdk/icons/material/materialicons/123/baseline_123_24.xml" />
22	22	</map>
23	23	</option>
24	24	</PersistentState>

		@@ -28,7 +28,7 @@
28	28	</option>
29	29	<option name="values">
30	30	<map>
31		- <entry key="outputName" value="ic_baseline_self_improvement_24" />
	31	+ <entry key="outputName" value="ic_baseline_123_24" />
32	32	<entry key="sourceFile" value="C:\Users\MRSa" />
33	33	</map>
34	34	</option>

--- /dev/null

+++ b/.idea/deploymentTargetDropDown.xml

		@@ -0,0 +1,28 @@
	1	+<?xml version="1.0" encoding="UTF-8"?>
	2	+<project version="4">
	3	+ <component name="deploymentTargetDropDown">
	4	+ <runningDeviceTargetSelectedWithDropDown>
	5	+ <Target>
	6	+ <type value="RUNNING_DEVICE_TARGET" />
	7	+ <deviceKey>
	8	+ <Key>
	9	+ <type value="VIRTUAL_DEVICE_PATH" />
	10	+ <value value="C:\Users\MRSa\.android\avd\Android_Wear_Round_Chin_API_26.avd" />
	11	+ </Key>
	12	+ </deviceKey>
	13	+ </Target>
	14	+ </runningDeviceTargetSelectedWithDropDown>
	15	+ <targetSelectedWithDropDown>
	16	+ <Target>
	17	+ <type value="QUICK_BOOT_TARGET" />
	18	+ <deviceKey>
	19	+ <Key>
	20	+ <type value="VIRTUAL_DEVICE_PATH" />
	21	+ <value value="C:\Users\MRSa\.android\avd\Android_Wear_Round_Chin_API_26.avd" />
	22	+ </Key>
	23	+ </deviceKey>
	24	+ </Target>
	25	+ </targetSelectedWithDropDown>
	26	+ <timeTargetWasSelectedWithDropDown value="2022-07-04T03:43:32.085812600Z" />
	27	+ </component>
	28	+</project>
		\ No newline at end of file

--- a/.idea/misc.xml

+++ b/.idea/misc.xml

		@@ -4,6 +4,7 @@
4	4	<option name="filePathToZoomLevelMap">
5	5	<map>
6	6	<entry key="..\:/Users/MRSa/AndroidStudioProjects/JoggingTimer/wear/src/main/res/drawable/ic_assignment_turned_in_black_24dp.xml" value="0.1" />
	7	+ <entry key="..\:/Users/MRSa/AndroidStudioProjects/JoggingTimer/wear/src/main/res/drawable/ic_baseline_cruelty_free_24.xml" value="0.309" />
7	8	<entry key="..\:/Users/MRSa/AndroidStudioProjects/JoggingTimer/wear/src/main/res/drawable/ic_baseline_elderly_24.xml" value="0.1055" />
8	9	<entry key="..\:/Users/MRSa/AndroidStudioProjects/JoggingTimer/wear/src/main/res/drawable/ic_baseline_emoji_people_24.xml" value="0.1055" />
9	10	<entry key="..\:/Users/MRSa/AndroidStudioProjects/JoggingTimer/wear/src/main/res/drawable/ic_baseline_follow_the_signs_24.xml" value="0.1055" />

		@@ -12,20 +13,27 @@
12	13	<entry key="..\:/Users/MRSa/AndroidStudioProjects/JoggingTimer/wear/src/main/res/drawable/ic_baseline_pedal_bike_24.xml" value="0.1055" />
13	14	<entry key="..\:/Users/MRSa/AndroidStudioProjects/JoggingTimer/wear/src/main/res/drawable/ic_baseline_self_improvement_24.xml" value="0.1055" />
14	15	<entry key="..\:/Users/MRSa/AndroidStudioProjects/JoggingTimer/wear/src/main/res/drawable/ic_battery_alert_black_24dp.xml" value="0.1055" />
	16	+ <entry key="..\:/Users/MRSa/AndroidStudioProjects/JoggingTimer/wear/src/main/res/drawable/ic_board_1_black_24dp.xml" value="0.434" />
	17	+ <entry key="..\:/Users/MRSa/AndroidStudioProjects/JoggingTimer/wear/src/main/res/drawable/ic_board_2_black_24dp.xml" value="0.434" />
	18	+ <entry key="..\:/Users/MRSa/AndroidStudioProjects/JoggingTimer/wear/src/main/res/drawable/ic_board_3_black_24dp.xml" value="0.434" />
15	19	<entry key="..\:/Users/MRSa/AndroidStudioProjects/JoggingTimer/wear/src/main/res/layout-notround/activity_detail.xml" value="1.0904605263157894" />
16	20	<entry key="..\:/Users/MRSa/AndroidStudioProjects/JoggingTimer/wear/src/main/res/layout-notround/activity_list.xml" value="1.0904605263157894" />
	21	+ <entry key="..\:/Users/MRSa/AndroidStudioProjects/JoggingTimer/wear/src/main/res/layout-notround/activity_main.xml" value="1.1208920187793427" />
17	22	<entry key="..\:/Users/MRSa/AndroidStudioProjects/JoggingTimer/wear/src/main/res/layout-notround/column_detail.xml" value="1.0904605263157894" />
18	23	<entry key="..\:/Users/MRSa/AndroidStudioProjects/JoggingTimer/wear/src/main/res/layout-notround/column_laptime.xml" value="1.0904605263157894" />
19	24	<entry key="..\:/Users/MRSa/AndroidStudioProjects/JoggingTimer/wear/src/main/res/layout-notround/column_list.xml" value="1.0904605263157894" />
20	25	<entry key="..\:/Users/MRSa/AndroidStudioProjects/JoggingTimer/wear/src/main/res/layout-notround/icon_list.xml" value="1.0904605263157894" />
21	26	<entry key="..\:/Users/MRSa/AndroidStudioProjects/JoggingTimer/wear/src/main/res/layout-notround/information_dialog.xml" value="1.0904605263157894" />
	27	+ <entry key="..\:/Users/MRSa/AndroidStudioProjects/JoggingTimer/wear/src/main/res/layout-notround/select_set_reference_dialog.xml" value="1.7570422535211268" />
22	28	<entry key="..\:/Users/MRSa/AndroidStudioProjects/JoggingTimer/wear/src/main/res/layout-notround/time_model_picker.xml" value="1.0904605263157894" />
23	29	<entry key="..\:/Users/MRSa/AndroidStudioProjects/JoggingTimer/wear/src/main/res/layout-round/activity_list.xml" value="0.9636627906976745" />
	30	+ <entry key="..\:/Users/MRSa/AndroidStudioProjects/JoggingTimer/wear/src/main/res/layout-round/activity_main.xml" value="0.8171806167400881" />
24	31	<entry key="..\:/Users/MRSa/AndroidStudioProjects/JoggingTimer/wear/src/main/res/layout-round/column_detail.xml" value="0.9636627906976745" />
25	32	<entry key="..\:/Users/MRSa/AndroidStudioProjects/JoggingTimer/wear/src/main/res/layout-round/column_laptime.xml" value="0.9636627906976745" />
26	33	<entry key="..\:/Users/MRSa/AndroidStudioProjects/JoggingTimer/wear/src/main/res/layout-round/column_list.xml" value="0.9636627906976745" />
27	34	<entry key="..\:/Users/MRSa/AndroidStudioProjects/JoggingTimer/wear/src/main/res/layout-round/icon_list.xml" value="0.9636627906976745" />
28	35	<entry key="..\:/Users/MRSa/AndroidStudioProjects/JoggingTimer/wear/src/main/res/layout-round/information_dialog.xml" value="0.9636627906976745" />
	36	+ <entry key="..\:/Users/MRSa/AndroidStudioProjects/JoggingTimer/wear/src/main/res/layout-round/select_set_reference_dialog.xml" value="1.5658995815899581" />
29	37	<entry key="..\:/Users/MRSa/AndroidStudioProjects/JoggingTimer/wear/src/main/res/layout-round/time_model_picker.xml" value="0.9636627906976745" />
30	38	<entry key="..\:/Users/MRSa/AndroidStudioProjects/JoggingTimer/wear/src/main/res/menu/selector_detail.xml" value="2.1392857142857142" />
31	39	</map>

--- a/build.gradle

+++ b/build.gradle

		@@ -7,7 +7,7 @@ buildscript {
7	7	mavenCentral()
8	8	}
9	9	dependencies {
10		- classpath 'com.android.tools.build:gradle:7.2.0'
	10	+ classpath 'com.android.tools.build:gradle:7.2.1'
11	11
12	12	// NOTE: Do not place your application dependencies here; they belong
13	13	// in the individual module build.gradle files

--- a/mobile/build.gradle

+++ b/mobile/build.gradle

		@@ -6,8 +6,8 @@ android {
6	6	applicationId "net.osdn.gokigen.joggingtimer"
7	7	minSdkVersion 14 // 14
8	8	targetSdkVersion 32
9		- versionCode 100044
10		- versionName "1.0.5"
	9	+ versionCode 100046
	10	+ versionName "1.0.6"
11	11	}
12	12	buildTypes {
13	13	release {

		@@ -19,6 +19,6 @@ android {
19	19
20	20	dependencies {
21	21	implementation fileTree(dir: 'libs', include: ['*.jar'])
22		- implementation 'androidx.appcompat:appcompat:1.4.1'
	22	+ implementation 'androidx.appcompat:appcompat:1.4.2'
23	23	wearApp project(':wear')
24	24	}

--- a/wear/build.gradle

+++ b/wear/build.gradle

		@@ -6,8 +6,8 @@ android {
6	6	applicationId "net.osdn.gokigen.joggingtimer"
7	7	minSdkVersion 23
8	8	targetSdkVersion 32
9		- versionCode 100043
10		- versionName "1.0.5"
	9	+ versionCode 100045
	10	+ versionName "1.0.6"
11	11	}
12	12	buildTypes {
13	13	release {

--- a/wear/src/main/AndroidManifest.xml

+++ b/wear/src/main/AndroidManifest.xml

		@@ -7,13 +7,14 @@
7	7	<uses-permission android:name="android.permission.WAKE_LOCK" />
8	8	<uses-permission android:name="android.permission.VIBRATE" />
9	9
	10	+ <!-- android:theme="@android:style/Theme.DeviceDefault" -->
10	11	<application
11	12	android:allowBackup="true"
12	13	android:icon="@mipmap/ic_launcher"
13	14	android:label="@string/app_name"
14	15	android:supportsRtl="true"
15	16	android:fullBackupContent="true"
16		- android:theme="@android:style/Theme.DeviceDefault">
	17	+ android:theme="@style/AppTheme">
17	18	<uses-library
18	19	android:name="com.google.android.wearable"
19	20	android:required="true" />

--- a/wear/src/main/java/net/osdn/gokigen/joggingtimer/recorddetail/DetailActivity.java

+++ b/wear/src/main/java/net/osdn/gokigen/joggingtimer/recorddetail/DetailActivity.java

		@@ -1,6 +1,5 @@
1	1	package net.osdn.gokigen.joggingtimer.recorddetail;
2	2
3		-import android.app.FragmentManager;
4	3	import android.os.Bundle;
5	4	import android.util.Log;
6	5	import android.view.MenuItem;

		@@ -8,6 +7,7 @@ import android.widget.Toast;
8	7
9	8	import androidx.annotation.NonNull;
10	9	import androidx.appcompat.app.AppCompatActivity;
	10	+import androidx.fragment.app.FragmentManager;
11	11	import androidx.recyclerview.widget.DividerItemDecoration;
12	12	import androidx.wear.ambient.AmbientModeSupport;
13	13	import androidx.wear.widget.WearableLinearLayoutManager;

		@@ -18,13 +18,14 @@ import androidx.wear.widget.drawer.WearableNavigationDrawerView;
18	18	import net.osdn.gokigen.joggingtimer.R;
19	19	import net.osdn.gokigen.joggingtimer.utilities.CreateModelData;
20	20	import net.osdn.gokigen.joggingtimer.utilities.DataEditDialog;
	21	+import net.osdn.gokigen.joggingtimer.utilities.SetReferenceDialog;
21	22
22	23
23	24	/**
24	25	*
25	26	*
26	27	*/
27		-public class DetailActivity extends AppCompatActivity implements RecordDetailSetup.IDatabaseReadyNotify, MenuItem.OnMenuItemClickListener, DataEditDialog.Callback, CreateModelData.IEditedModelDataCallback, DetailSelectionMenuAdapter.ISelectedMenu, AmbientModeSupport.AmbientCallbackProvider
	28	+public class DetailActivity extends AppCompatActivity implements RecordDetailSetup.IDatabaseReadyNotify, MenuItem.OnMenuItemClickListener, DataEditDialog.Callback, CreateModelData.IEditedModelDataCallback, DetailSelectionMenuAdapter.ISelectedMenu, AmbientModeSupport.AmbientCallbackProvider, SetReferenceDialog.SetReferenceCallback
28	29	{
29	30	private final String TAG = toString();
30	31	public static final String INTENT_EXTRA_DATA_ID = "Detail.dataId";

		@@ -275,17 +276,31 @@ public class DetailActivity extends AppCompatActivity implements RecordDetailSet
275	276	title = data.getTitle();
276	277	}
277	278	DataEditDialog dialog = DataEditDialog.newInstance(iconId, title, this);
278		- FragmentManager manager = getFragmentManager();
279		- String tag = "dialog";
280		- if (manager != null) {
281		- dialog.show(manager, tag);
282		- }
	279	+ FragmentManager manager = getSupportFragmentManager();
	280	+ dialog.show(manager, "dialog");
283	281	ret = true;
284	282	}
285	283	else if (itemId == R.id.menu_set_reference)
286	284	{
287		- // 現在のデータを基準値として設定する
288		- setupper.setReferenceData();
	285	+ // 基準値の設定ダイアログを表示する
	286	+ final SetReferenceDialog.SetReferenceCallback callback = this;
	287	+ this.runOnUiThread(new Runnable() {
	288	+ @Override
	289	+ public void run() {
	290	+ try
	291	+ {
	292	+ // 基準値設定ダイアログを表示する
	293	+ SetReferenceDialog dialog = SetReferenceDialog.newInstance("Set Reference", "Please Select Reference Type", callback);
	294	+ FragmentManager manager = getSupportFragmentManager();
	295	+ dialog.show(manager, "dialog");
	296	+ }
	297	+ catch (Exception e)
	298	+ {
	299	+ e.printStackTrace();
	300	+ }
	301	+ }
	302	+ });
	303	+
289	304	ret = true;
290	305	}
291	306	else if (itemId == R.id.menu_share_data)

		@@ -311,7 +326,6 @@ public class DetailActivity extends AppCompatActivity implements RecordDetailSet
311	326	return (ret);
312	327	}
313	328
314		-
315	329	/**
316	330	*
317	331	*/

		@@ -433,7 +447,16 @@ public class DetailActivity extends AppCompatActivity implements RecordDetailSet
433	447	}
434	448
435	449	@Override
436		- public void onPointerCaptureChanged(boolean hasCapture) {
	450	+ public void onPointerCaptureChanged(boolean hasCapture)
	451	+ {
437	452	super.onPointerCaptureChanged(hasCapture);
438	453	}
	454	+
	455	+ @Override
	456	+ public void confirmed(int id)
	457	+ {
	458	+ // 現在のデータを基準値として設定する
	459	+ Log.v(TAG, " SET REFERENCE DATA ID: " + id);
	460	+ setupper.setReferenceData(id);
	461	+ }
439	462	}

--- a/wear/src/main/java/net/osdn/gokigen/joggingtimer/recorddetail/RecordDetailSetup.java

+++ b/wear/src/main/java/net/osdn/gokigen/joggingtimer/recorddetail/RecordDetailSetup.java

		@@ -176,10 +176,10 @@ public class RecordDetailSetup implements ITimeEntryDatabaseCallback, IDetailEd
176	176	*
177	177	*
178	178	*/
179		- void setReferenceData()
	179	+ void setReferenceData(final int id)
180	180	{
181	181	Thread thread = new Thread(() -> {
182		- database.setReferenceIndexData(indexId);
	182	+ database.setReferenceIndexData(id, indexId);
183	183	callback.updatedIndexData(true);
184	184	});
185	185	thread.start();

--- a/wear/src/main/java/net/osdn/gokigen/joggingtimer/stopwatch/IDatabaseReloadCallback.java

+++ b/wear/src/main/java/net/osdn/gokigen/joggingtimer/stopwatch/IDatabaseReloadCallback.java

		@@ -9,5 +9,5 @@ import java.util.ArrayList;
9	9	public interface IDatabaseReloadCallback
10	10	{
11	11	void dataIsReloaded(ArrayList<Long> list);
12		- void referenceDataIsReloaded(ArrayList<Long> list);
	12	+ void referenceDataIsReloaded(int id, ArrayList<Long> list);
13	13	}

--- a/wear/src/main/java/net/osdn/gokigen/joggingtimer/stopwatch/ITimerCounter.java

+++ b/wear/src/main/java/net/osdn/gokigen/joggingtimer/stopwatch/ITimerCounter.java

		@@ -23,6 +23,7 @@ public interface ITimerCounter
23	23	List<Long> getLapTimeList();
24	24	List<Long> getReferenceLapTimeList();
25	25	long getReferenceLapTime(int position);
	26	+ void selectReferenceLapTime(int id);
26	27
27	28	void setCallback(MyTimerCounter.ICounterStatusNotify callback);
28	29	}

--- a/wear/src/main/java/net/osdn/gokigen/joggingtimer/stopwatch/IWearableActivityControl.java

+++ b/wear/src/main/java/net/osdn/gokigen/joggingtimer/stopwatch/IWearableActivityControl.java

		@@ -23,6 +23,8 @@ public interface IWearableActivityControl
23	23	void addTimeStamp(long count, long lapTime, long diffTime);
24	24	void clearTimeStamp();
25	25	int getLapTimeCount();
	26	+ int getReferenceTimerSelection();
	27	+ void setReferenceTimerSelection(int id);
26	28
27	29	void setupReferenceData();
28	30	}

--- a/wear/src/main/java/net/osdn/gokigen/joggingtimer/stopwatch/MyTimerCounter.java

+++ b/wear/src/main/java/net/osdn/gokigen/joggingtimer/stopwatch/MyTimerCounter.java

		@@ -20,7 +20,10 @@ public class MyTimerCounter implements ITimerCounter, IDatabaseReloadCallback
20	20	private long startTime = 0;
21	21	private long stopTime = 0;
22	22	private List<Long> elapsedTime;
23		- private List<Long> referenceTime = null;
	23	+ private List<Long> referenceTimeA = null;
	24	+ private List<Long> referenceTimeB = null;
	25	+ private List<Long> referenceTimeC = null;
	26	+ private int referenceTimeId = 0;
24	27
25	28	MyTimerCounter()
26	29	{

		@@ -177,7 +180,15 @@ public class MyTimerCounter implements ITimerCounter, IDatabaseReloadCallback
177	180	@Override
178	181	public List<Long> getReferenceLapTimeList()
179	182	{
180		- return (referenceTime);
	183	+ if (referenceTimeId == 0)
	184	+ {
	185	+ return (referenceTimeA);
	186	+ }
	187	+ else if (referenceTimeId == 1)
	188	+ {
	189	+ return (referenceTimeB);
	190	+ }
	191	+ return (referenceTimeC);
181	192	}
182	193
183	194	@Override

		@@ -217,19 +228,37 @@ public class MyTimerCounter implements ITimerCounter, IDatabaseReloadCallback
217	228	}
218	229
219	230	@Override
220		- public void referenceDataIsReloaded(ArrayList<Long> timelist)
	231	+ public void referenceDataIsReloaded(int id, ArrayList<Long> timelist)
221	232	{
222	233	try
223	234	{
224		- referenceTime = null;
	235	+ int size;
225	236	if (timelist != null)
226	237	{
227		- referenceTime = new ArrayList<>(timelist);
	238	+ selectReferenceLapTime(id);
	239	+ if (referenceTimeId == 0)
	240	+ {
	241	+ referenceTimeA = null;
	242	+ referenceTimeA = new ArrayList<>(timelist);
	243	+ size = referenceTimeA.size();
	244	+ }
	245	+ if (referenceTimeId == 1)
	246	+ {
	247	+ referenceTimeB = null;
	248	+ referenceTimeB = new ArrayList<>(timelist);
	249	+ size = referenceTimeB.size();
	250	+ }
	251	+ else
	252	+ {
	253	+ referenceTimeC = null;
	254	+ referenceTimeC = new ArrayList<>(timelist);
	255	+ size = referenceTimeC.size();
	256	+ }
228	257	if (callback != null)
229	258	{
230	259	callback.counterStatusChanged(false);
231	260	}
232		- Log.v(TAG, "reference lap time : " + referenceTime.size());
	261	+ Log.v(TAG, "reference lap time : " + size);
233	262	}
234	263	}
235	264	catch (Exception e)

		@@ -243,6 +272,19 @@ public class MyTimerCounter implements ITimerCounter, IDatabaseReloadCallback
243	272	{
244	273	try
245	274	{
	275	+ List<Long> referenceTime;
	276	+ if (referenceTimeId == 0)
	277	+ {
	278	+ referenceTime = referenceTimeA;
	279	+ }
	280	+ else if (referenceTimeId == 1)
	281	+ {
	282	+ referenceTime = referenceTimeB;
	283	+ }
	284	+ else
	285	+ {
	286	+ referenceTime = referenceTimeC;
	287	+ }
246	288	int location = position + 1;
247	289	if ((referenceTime == null)\|\|(location < 1)\|\|(referenceTime.size() < location))
248	290	{

		@@ -261,6 +303,12 @@ public class MyTimerCounter implements ITimerCounter, IDatabaseReloadCallback
261	303	return (0);
262	304	}
263	305
	306	+ @Override
	307	+ public void selectReferenceLapTime(int id)
	308	+ {
	309	+ referenceTimeId = id;
	310	+ }
	311	+
264	312	public interface ICounterStatusNotify
265	313	{
266	314	void counterStatusChanged(boolean forceStartTimer);

--- a/wear/src/main/java/net/osdn/gokigen/joggingtimer/stopwatch/WearableActivityController.java

+++ b/wear/src/main/java/net/osdn/gokigen/joggingtimer/stopwatch/WearableActivityController.java

		@@ -41,6 +41,7 @@ class WearableActivityController implements IWearableActivityControl, ITimeEntry
41	41	private final String PREF_KEY_TIMER_STARTED = "TMR_START";
42	42	private final String PREF_KEY_TIMER_INDEXID = "TMR_INDEX";
43	43	private final String PREF_KEY_DISPLAY_LAPGRAPHIC = "DISP_LAPGRPH";
	44	+ private final String PREF_KEY_REFERENCE_TIME_SELECTION = "REF_TIME_SEL";
44	45
45	46	private SharedPreferences preferences = null;
46	47	private final ButtonClickListener clickListener = new ButtonClickListener();

		@@ -324,6 +325,35 @@ class WearableActivityController implements IWearableActivityControl, ITimeEntry
324	325	}
325	326
326	327	@Override
	328	+ public int getReferenceTimerSelection()
	329	+ {
	330	+ try
	331	+ {
	332	+ return (preferences.getInt(PREF_KEY_REFERENCE_TIME_SELECTION, 0));
	333	+ }
	334	+ catch (Exception e)
	335	+ {
	336	+ e.printStackTrace();
	337	+ }
	338	+ return (0);
	339	+ }
	340	+
	341	+ @Override
	342	+ public void setReferenceTimerSelection(int id)
	343	+ {
	344	+ try
	345	+ {
	346	+ SharedPreferences.Editor editor = preferences.edit();
	347	+ editor.putInt(PREF_KEY_REFERENCE_TIME_SELECTION, id);
	348	+ editor.apply();
	349	+ }
	350	+ catch (Exception e)
	351	+ {
	352	+ e.printStackTrace();
	353	+ }
	354	+ }
	355	+
	356	+ @Override
327	357	public void setupReferenceData()
328	358	{
329	359	try

		@@ -389,8 +419,9 @@ class WearableActivityController implements IWearableActivityControl, ITimeEntry
389	419	// load reference data
390	420	try
391	421	{
	422	+ int id = getReferenceTimerSelection();
392	423	ArrayList<Long> refList = null;
393		- Cursor cursor = database.getAllReferenceDetailData();
	424	+ Cursor cursor = database.getAllReferenceDetailData(id);
394	425	if (cursor != null)
395	426	{
396	427	refList = new ArrayList<>();

		@@ -399,7 +430,7 @@ class WearableActivityController implements IWearableActivityControl, ITimeEntry
399	430	refList.add(cursor.getLong(cursor.getColumnIndex(TimeEntryData.EntryData.COLUMN_NAME_TIME_ENTRY)));
400	431	}
401	432	}
402		- dbCallback.referenceDataIsReloaded(refList);
	433	+ dbCallback.referenceDataIsReloaded(id, refList);
403	434	}
404	435	catch (Exception e)
405	436	{

--- a/wear/src/main/java/net/osdn/gokigen/joggingtimer/storage/ITimeEntryDatabase.java

+++ b/wear/src/main/java/net/osdn/gokigen/joggingtimer/storage/ITimeEntryDatabase.java

		@@ -17,13 +17,13 @@ public interface ITimeEntryDatabase
17	17
18	18	Cursor getAllIndexData();
19	19	Cursor getAllDetailData(long indexId);
20		- Cursor getAllReferenceDetailData();
	20	+ Cursor getAllReferenceDetailData(int id);
21	21
22	22	Cursor getIndexdata(long indexId);
23	23
24	24	void deleteTimeEntryData(long indexId);
25	25
26		- void setReferenceIndexData(long indexId);
	26	+ void setReferenceIndexData(int id, long indexId);
27	27	void updateIndexData(long indexId, String title, int icon);
28	28	void createIndexData(String title, String memo, int icon, long startTime);
29	29	void appendTimeData(long indexId, long lapTime);

--- a/wear/src/main/java/net/osdn/gokigen/joggingtimer/storage/TimeEntryDatabase.java

+++ b/wear/src/main/java/net/osdn/gokigen/joggingtimer/storage/TimeEntryDatabase.java

		@@ -23,7 +23,9 @@ class TimeEntryDatabase implements ITimeEntryDatabase
23	23	private final String TAG = toString();
24	24	private final TimeEntryDataOpenHelper dbHelper;
25	25	private final ITimeEntryDatabaseCallback callback;
26		- private static final int REFERENCE_ICON_ID = 2;
	26	+ private static final int REFERENCE_ICON_ID_A = 2;
	27	+ private static final int REFERENCE_ICON_ID_B = 1;
	28	+ private static final int REFERENCE_ICON_ID_C = 3;
27	29	private static final int MODEL_DATA_ICON_ID = 4;
28	30	private static final int DEFAULT_ICON_ID = 0;
29	31

		@@ -85,15 +87,16 @@ class TimeEntryDatabase implements ITimeEntryDatabase
85	87	}
86	88
87	89	@Override
88		- public Cursor getAllReferenceDetailData()
	90	+ public Cursor getAllReferenceDetailData(int id)
89	91	{
90	92	if (db == null)
91	93	{
92	94	return (null);
93	95	}
	96	+ int iconId = getReferenceIconId(id);
94	97	String queryString = "SELECT * FROM " + TimeEntryIndex.EntryIndex.TABLE_NAME + " INNER JOIN " + TimeEntryData.EntryData.TABLE_NAME +
95	98	" ON " + TimeEntryIndex.EntryIndex.TABLE_NAME + "." + TimeEntryIndex.EntryIndex._ID + " = " + TimeEntryData.EntryData.TABLE_NAME+ "." + TimeEntryData.EntryData.COLUMN_NAME_INDEX_ID +
96		- " WHERE " + TimeEntryIndex.EntryIndex.TABLE_NAME+ "." + TimeEntryIndex.EntryIndex.COLUMN_NAME_ICON_ID + " = " + REFERENCE_ICON_ID +
	99	+ " WHERE " + TimeEntryIndex.EntryIndex.TABLE_NAME+ "." + TimeEntryIndex.EntryIndex.COLUMN_NAME_ICON_ID + " = " + iconId +
97	100	" ORDER BY " + TimeEntryData.EntryData.TABLE_NAME+ "." + TimeEntryData.EntryData.COLUMN_NAME_TIME_ENTRY;
98	101	//Log.v(TAG, "Query : " + queryString);
99	102	return (db.rawQuery(queryString, null));

		@@ -145,16 +148,17 @@ class TimeEntryDatabase implements ITimeEntryDatabase
145	148	*
146	149	*/
147	150	@Override
148		- public void setReferenceIndexData(long indexId)
	151	+ public void setReferenceIndexData(int id, long indexId)
149	152	{
150	153	try
151	154	{
	155	+ int iconId = getReferenceIconId(id);
152	156	ContentValues clearValues = new ContentValues();
153	157	clearValues.put(TimeEntryIndex.EntryIndex.COLUMN_NAME_ICON_ID, DEFAULT_ICON_ID);
154		- db.update(TimeEntryIndex.EntryIndex.TABLE_NAME, clearValues, TimeEntryIndex.EntryIndex.COLUMN_NAME_ICON_ID + " = " + REFERENCE_ICON_ID, null);
	158	+ db.update(TimeEntryIndex.EntryIndex.TABLE_NAME, clearValues, TimeEntryIndex.EntryIndex.COLUMN_NAME_ICON_ID + " = " + iconId, null);
155	159
156	160	ContentValues referenceValues = new ContentValues();
157		- referenceValues.put(TimeEntryIndex.EntryIndex.COLUMN_NAME_ICON_ID, REFERENCE_ICON_ID);
	161	+ referenceValues.put(TimeEntryIndex.EntryIndex.COLUMN_NAME_ICON_ID, iconId);
158	162	db.update(TimeEntryIndex.EntryIndex.TABLE_NAME, referenceValues, _ID + " = " + indexId, null);
159	163	}
160	164	catch (Exception e)

		@@ -326,6 +330,17 @@ class TimeEntryDatabase implements ITimeEntryDatabase
326	330	return (rows);
327	331	}
328	332
	333	+ private int getReferenceIconId(int id)
	334	+ {
	335	+ if (id == 0)
	336	+ {
	337	+ return (REFERENCE_ICON_ID_A);
	338	+ } else if (id == 1)
	339	+ {
	340	+ return (REFERENCE_ICON_ID_B);
	341	+ }
	342	+ return (REFERENCE_ICON_ID_C);
	343	+ }
329	344	/*
330	345	public boolean prepareToRead()
331	346	{

--- a/wear/src/main/java/net/osdn/gokigen/joggingtimer/utilities/DataEditDialog.java

+++ b/wear/src/main/java/net/osdn/gokigen/joggingtimer/utilities/DataEditDialog.java

		@@ -3,8 +3,8 @@ package net.osdn.gokigen.joggingtimer.utilities;
3	3	import android.app.Activity;
4	4	import android.app.AlertDialog;
5	5	import android.app.Dialog;
6		-//import androidx.fragment.app.DialogFragment;
7		-import android.app.DialogFragment;
	6	+import androidx.fragment.app.DialogFragment;
	7	+//import android.app.DialogFragment;
8	8	import android.content.Context;
9	9	import android.content.res.TypedArray;
10	10	import android.graphics.Color;

--- a/wear/src/main/java/net/osdn/gokigen/joggingtimer/utilities/IconIdProvider.java

+++ b/wear/src/main/java/net/osdn/gokigen/joggingtimer/utilities/IconIdProvider.java

		@@ -10,9 +10,9 @@ public class IconIdProvider
10	10	{
11	11	private static final int[] iconIds = {
12	12	R.drawable.ic_label_outline_black_24dp ,
13		- R.drawable.ic_bookmark_border_black_24dp,
14		- R.drawable.ic_content_paste_black_24dp,
15		- R.drawable.ic_lightbulb_outline_black_24dp,
	13	+ R.drawable.ic_board_1_black_24dp,
	14	+ R.drawable.ic_board_2_black_24dp,
	15	+ R.drawable.ic_board_3_black_24dp,
16	16	R.drawable.ic_done_black_24dp,
17	17	R.drawable.ic_bookmark_black_24dp,
18	18	R.drawable.ic_book_black_24dp,

		@@ -61,6 +61,25 @@ public class IconIdProvider
61	61	R.drawable.ic_baseline_hiking_24,
62	62	R.drawable.ic_baseline_self_improvement_24,
63	63	R.drawable.ic_baseline_pedal_bike_24,
	64	+ R.drawable.ic_baseline_boy_24,
	65	+ R.drawable.ic_baseline_android_24,
	66	+ R.drawable.ic_baseline_downhill_skiing_24,
	67	+ R.drawable.ic_baseline_escalator_warning_24,
	68	+ R.drawable.ic_baseline_wc_24,
	69	+ R.drawable.ic_baseline_skateboarding_24,
	70	+ R.drawable.ic_baseline_snowboarding_24,
	71	+ R.drawable.ic_baseline_snowshoeing_24,
	72	+ R.drawable.ic_baseline_sledding_24,
	73	+ R.drawable.ic_baseline_snowmobile_24,
	74	+ R.drawable.ic_baseline_sports_handball_24,
	75	+ R.drawable.ic_baseline_surfing_24,
	76	+ R.drawable.ic_baseline_cruelty_free_24,
	77	+ R.drawable.ic_baseline_accessibility_24,
	78	+ R.drawable.ic_baseline_accessibility_new_24,
	79	+ R.drawable.ic_baseline_123_24,
	80	+ R.drawable.ic_lightbulb_outline_black_24dp,
	81	+ R.drawable.ic_bookmark_border_black_24dp,
	82	+ R.drawable.ic_baseline_sick_24,
64	83	};
65	84
66	85	public static int getIconResourceId(int id)

		@@ -73,6 +92,6 @@ public class IconIdProvider
73	92	{
74	93	e.printStackTrace();
75	94	}
76		- return (iconIds[0]);
	95	+ return (R.drawable.ic_label_outline_black_24dp);
77	96	}
78	97	}

--- /dev/null

+++ b/wear/src/main/java/net/osdn/gokigen/joggingtimer/utilities/SetReferenceDialog.java

		@@ -0,0 +1,139 @@
	1	+package net.osdn.gokigen.joggingtimer.utilities;
	2	+
	3	+import android.app.Activity;
	4	+import android.app.AlertDialog;
	5	+import android.app.Dialog;
	6	+import android.os.Bundle;
	7	+import android.util.Log;
	8	+import android.view.LayoutInflater;
	9	+import android.view.View;
	10	+import android.widget.AdapterView;
	11	+import android.widget.ArrayAdapter;
	12	+import android.widget.Spinner;
	13	+import androidx.annotation.NonNull;
	14	+import androidx.fragment.app.DialogFragment;
	15	+
	16	+import net.osdn.gokigen.joggingtimer.R;
	17	+
	18	+public class SetReferenceDialog extends DialogFragment
	19	+{
	20	+ private final String TAG = toString();
	21	+ int selectedId = 0;
	22	+ String title = "";
	23	+ String message = "";
	24	+ SetReferenceDialog.SetReferenceCallback callback = null;
	25	+ Dialog myDialog = null;
	26	+
	27	+ public static SetReferenceDialog newInstance(String title, String message, @NonNull SetReferenceDialog.SetReferenceCallback callback)
	28	+ {
	29	+ SetReferenceDialog instance = new SetReferenceDialog();
	30	+ instance.prepare(callback, title, message);
	31	+
	32	+ // パラメータはBundleにまとめておく
	33	+ Bundle arguments = new Bundle();
	34	+ arguments.putString("title", title);
	35	+ arguments.putString("message", message);
	36	+ instance.setArguments(arguments);
	37	+
	38	+ return (instance);
	39	+ }
	40	+
	41	+ /**
	42	+ *
	43	+ *
	44	+ */
	45	+ private void prepare(SetReferenceDialog.SetReferenceCallback callback, String title, String message)
	46	+ {
	47	+ this.callback = callback;
	48	+ this.title = title;
	49	+ this.message = message;
	50	+ }
	51	+
	52	+ /**
	53	+ *
	54	+ *
	55	+ */
	56	+ @Override
	57	+ public @NonNull Dialog onCreateDialog(Bundle savedInstanceState)
	58	+ {
	59	+ String title = this.title;
	60	+ String message = this.message;
	61	+ if (savedInstanceState != null)
	62	+ {
	63	+ title = savedInstanceState.getString("title");
	64	+ message = savedInstanceState.getString("message");
	65	+ }
	66	+ Activity activity = getActivity();
	67	+ final AlertDialog.Builder alertDialog = new AlertDialog.Builder(activity);
	68	+ LayoutInflater inflater = activity.getLayoutInflater();
	69	+ final View alertView = inflater.inflate(R.layout.select_set_reference_dialog, null, false);
	70	+ alertDialog.setView(alertView);
	71	+
	72	+ final String[] objects = activity.getResources().getStringArray(R.array.reference_selection_array);
	73	+ final Spinner spinner = alertView.findViewById(R.id.spinner_reference_selection);
	74	+ ArrayAdapter<String> arrayAdapter = new ArrayAdapter<>(activity, android.R.layout.simple_list_item_1, objects);
	75	+ selectedId = 0;
	76	+ try
	77	+ {
	78	+ spinner.setAdapter(arrayAdapter);
	79	+ spinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
	80	+ @Override
	81	+ public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
	82	+ Log.v(TAG, "onItemSelected : " + position + " (" + id + ")");
	83	+ selectedId = position;
	84	+ }
	85	+
	86	+ @Override
	87	+ public void onNothingSelected(AdapterView<?> parent) {
	88	+ Log.v(TAG, "onNothingSelected");
	89	+ }
	90	+ });
	91	+ }
	92	+ catch (Exception e)
	93	+ {
	94	+ e.printStackTrace();
	95	+ }
	96	+
	97	+ alertDialog.setTitle(title);
	98	+ alertDialog.setIcon(android.R.drawable.ic_dialog_alert);
	99	+ alertDialog.setCancelable(true);
	100	+
	101	+ String positiveLabel = activity.getString(R.string.dialog_positive_execute);
	102	+ String negativeLabel = activity.getString(R.string.dialog_negative_cancel);
	103	+
	104	+ // ボタンを設定する（実行ボタン）
	105	+ alertDialog.setPositiveButton(positiveLabel,
	106	+ (dialog, which) -> {
	107	+ Log.v(TAG, "ConfirmationDialog::OK");
	108	+ if (callback != null)
	109	+ {
	110	+ callback.confirmed(selectedId);
	111	+ }
	112	+ dialog.dismiss();
	113	+ });
	114	+
	115	+ // ボタンを設定する (キャンセルボタン）
	116	+ alertDialog.setNegativeButton(negativeLabel,
	117	+ (dialog, which) -> dialog.cancel());
	118	+
	119	+ myDialog = alertDialog.create();
	120	+ return (myDialog);
	121	+ }
	122	+
	123	+ @Override
	124	+ public void onPause()
	125	+ {
	126	+ super.onPause();
	127	+ Log.v(TAG, "AlertDialog::onPause()");
	128	+ if (myDialog != null)
	129	+ {
	130	+ myDialog.cancel();
	131	+ }
	132	+ }
	133	+
	134	+ // コールバックインタフェース
	135	+ public interface SetReferenceCallback
	136	+ {
	137	+ void confirmed(int id); // OKを選択したとき
	138	+ }
	139	+}

--- /dev/null

+++ b/wear/src/main/res/drawable/ic_baseline_123_24.xml

		@@ -0,0 +1,7 @@
	1	+<vector android:height="24dp" android:tint="#000000"
	2	+ android:viewportHeight="24" android:viewportWidth="24"
	3	+ android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
	4	+ <path
	5	+ android:fillColor="@android:color/white"
	6	+ android:pathData="M7,15H5.5v-4.5H4V9h3V15zM13.5,13.5h-3v-1h2c0.55,0 1,-0.45 1,-1V10c0,-0.55 -0.45,-1 -1,-1H9v1.5h3v1h-2c-0.55,0 -1,0.45 -1,1V15h4.5V13.5zM19.5,14v-4c0,-0.55 -0.45,-1 -1,-1H15v1.5h3v1h-2v1h2v1h-3V15h3.5C19.05,15 19.5,14.55 19.5,14z"/>
	7	+</vector>

--- /dev/null

+++ b/wear/src/main/res/drawable/ic_baseline_accessibility_24.xml

		@@ -0,0 +1,5 @@
	1	+<vector android:height="24dp" android:tint="#000000"
	2	+ android:viewportHeight="24" android:viewportWidth="24"
	3	+ android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
	4	+ <path android:fillColor="@android:color/white" android:pathData="M12,2c1.1,0 2,0.9 2,2s-0.9,2 -2,2 -2,-0.9 -2,-2 0.9,-2 2,-2zM21,9h-6v13h-2v-6h-2v6L9,22L9,9L3,9L3,7h18v2z"/>
	5	+</vector>

--- /dev/null

+++ b/wear/src/main/res/drawable/ic_baseline_accessibility_new_24.xml

		@@ -0,0 +1,5 @@
	1	+<vector android:height="24dp" android:tint="#000000"
	2	+ android:viewportHeight="24" android:viewportWidth="24"
	3	+ android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
	4	+ <path android:fillColor="@android:color/white" android:pathData="M20.5,6c-2.61,0.7 -5.67,1 -8.5,1s-5.89,-0.3 -8.5,-1L3,8c1.86,0.5 4,0.83 6,1v13h2v-6h2v6h2V9c2,-0.17 4.14,-0.5 6,-1l-0.5,-2zM12,6c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2 -2,0.9 -2,2 0.9,2 2,2z"/>
	5	+</vector>

--- /dev/null

+++ b/wear/src/main/res/drawable/ic_baseline_android_24.xml

		@@ -0,0 +1,5 @@
	1	+<vector android:height="24dp" android:tint="#000000"
	2	+ android:viewportHeight="24" android:viewportWidth="24"
	3	+ android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
	4	+ <path android:fillColor="@android:color/white" android:pathData="M17.6,9.48l1.84,-3.18c0.16,-0.31 0.04,-0.69 -0.26,-0.85c-0.29,-0.15 -0.65,-0.06 -0.83,0.22l-1.88,3.24c-2.86,-1.21 -6.08,-1.21 -8.94,0L5.65,5.67c-0.19,-0.29 -0.58,-0.38 -0.87,-0.2C4.5,5.65 4.41,6.01 4.56,6.3L6.4,9.48C3.3,11.25 1.28,14.44 1,18h22C22.72,14.44 20.7,11.25 17.6,9.48zM7,15.25c-0.69,0 -1.25,-0.56 -1.25,-1.25c0,-0.69 0.56,-1.25 1.25,-1.25S8.25,13.31 8.25,14C8.25,14.69 7.69,15.25 7,15.25zM17,15.25c-0.69,0 -1.25,-0.56 -1.25,-1.25c0,-0.69 0.56,-1.25 1.25,-1.25s1.25,0.56 1.25,1.25C18.25,14.69 17.69,15.25 17,15.25z"/>
	5	+</vector>

--- /dev/null

+++ b/wear/src/main/res/drawable/ic_baseline_boy_24.xml

		@@ -0,0 +1,5 @@
	1	+<vector android:height="24dp" android:tint="#000000"
	2	+ android:viewportHeight="24" android:viewportWidth="24"
	3	+ android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
	4	+ <path android:fillColor="@android:color/white" android:pathData="M12,7.5c0.97,0 1.75,-0.78 1.75,-1.75S12.97,4 12,4s-1.75,0.78 -1.75,1.75S11.03,7.5 12,7.5zM14,20v-5h1v-4.5c0,-1.1 -0.9,-2 -2,-2h-2c-1.1,0 -2,0.9 -2,2V15h1v5H14z"/>
	5	+</vector>

--- /dev/null

+++ b/wear/src/main/res/drawable/ic_baseline_cruelty_free_24.xml

		@@ -0,0 +1,5 @@
	1	+<vector android:height="24dp" android:tint="#000000"
	2	+ android:viewportHeight="24" android:viewportWidth="24"
	3	+ android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
	4	+ <path android:fillColor="@android:color/white" android:pathData="M16.84,14.52c-0.26,-0.19 -0.62,-0.63 -0.79,-0.84C17.24,12.01 19,8.87 19,5c0,-1.95 -0.74,-3 -2,-3c-1.54,0 -3.96,2.06 -5,5.97C10.96,4.06 8.54,2 7,2C5.74,2 5,3.05 5,5c0,3.87 1.76,7.01 2.95,8.68c-0.17,0.21 -0.53,0.65 -0.79,0.84c-0.5,0.41 -1.66,1.37 -1.66,2.98c0,2.21 1.79,4 4,4c1.55,0 2.5,-0.56 2.5,-0.56s0.95,0.56 2.5,0.56c2.21,0 4,-1.79 4,-4C18.5,15.89 17.34,14.93 16.84,14.52zM9.35,12.2C8.34,10.7 7,8.12 7,5c0,-0.49 0.06,-0.8 0.12,-0.97c0.94,0.31 3.24,2.71 3.38,7.64C10.03,11.79 9.66,11.97 9.35,12.2zM10.5,16.75c-0.28,0 -0.5,-0.34 -0.5,-0.75c0,-0.41 0.22,-0.75 0.5,-0.75S11,15.59 11,16C11,16.41 10.78,16.75 10.5,16.75zM12,19.5c-0.55,0 -1,-0.72 -1,-1c0,-0.28 0.45,-0.5 1,-0.5s1,0.22 1,0.5C13,18.78 12.55,19.5 12,19.5zM13.5,16.75c-0.28,0 -0.5,-0.34 -0.5,-0.75c0,-0.41 0.22,-0.75 0.5,-0.75S14,15.59 14,16C14,16.41 13.78,16.75 13.5,16.75zM13.5,11.67c0.14,-4.93 2.44,-7.33 3.38,-7.64C16.94,4.2 17,4.51 17,5c0,3.12 -1.34,5.7 -2.35,7.2C14.34,11.97 13.97,11.79 13.5,11.67z"/>
	5	+</vector>

--- /dev/null

+++ b/wear/src/main/res/drawable/ic_baseline_downhill_skiing_24.xml

		@@ -0,0 +1,5 @@
	1	+<vector android:height="24dp" android:tint="#000000"
	2	+ android:viewportHeight="24" android:viewportWidth="24"
	3	+ android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
	4	+ <path android:fillColor="@android:color/white" android:pathData="M18.5,4.5c0,1.1 -0.9,2 -2,2s-2,-0.9 -2,-2s0.9,-2 2,-2S18.5,3.4 18.5,4.5zM15.78,20.9l0.76,0.27c0.62,0.21 1.27,0.33 1.96,0.33c0.84,0 1.65,-0.18 2.38,-0.5L22,22.13C20.95,22.68 19.76,23 18.5,23c-0.86,0 -1.68,-0.14 -2.45,-0.41L2,17.47l0.5,-1.41l6.9,2.51l1.72,-4.44L7.55,10.4C6.66,9.46 6.88,7.93 8,7.28l3.48,-2.01c1.1,-0.64 2.52,-0.1 2.91,1.11l0.33,1.08c0.44,1.42 1.48,2.57 2.83,3.14L18.07,9l1.43,0.46l-1.12,3.45c-2.45,-0.4 -4.48,-2.07 -5.38,-4.32l-2.53,1.45l3.03,3.46l-2.22,5.76l3.09,1.12l2.1,-6.44h0l0,0c0.46,0.18 0.94,0.31 1.44,0.41L15.78,20.9z"/>
	5	+</vector>

--- a/wear/src/main/res/drawable/ic_baseline_emoji_people_24.xml

+++ b/wear/src/main/res/drawable/ic_baseline_emoji_people_24.xml

		@@ -1,13 +1,6 @@
1		-<vector xmlns:android="http://schemas.android.com/apk/res/android"
2		- android:width="24dp"
3		- android:height="24dp"
4		- android:viewportWidth="24"
5		- android:viewportHeight="24"
6		- android:tint="?attr/colorControlNormal">
7		- <path
8		- android:fillColor="@android:color/white"
9		- android:pathData="M12,4m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"/>
10		- <path
11		- android:fillColor="#FF000000"
12		- android:pathData="M15.89,8.11C15.5,7.72 14.83,7 13.53,7c-0.21,0 -1.42,0 -2.54,0C8.24,6.99 6,4.75 6,2H4c0,3.16 2.11,5.84 5,6.71V22h2v-6h2v6h2V10.05L18.95,14l1.41,-1.41L15.89,8.11z"/>
	1	+<vector android:height="24dp" android:tint="#000000"
	2	+ android:viewportHeight="24" android:viewportWidth="24"
	3	+ android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
	4	+ <path android:fillColor="@android:color/white" android:pathData="M12,4m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"/>
	5	+ <path android:fillColor="@android:color/white" android:pathData="M15.89,8.11C15.5,7.72 14.83,7 13.53,7c-0.21,0 -1.42,0 -2.54,0C8.24,6.99 6,4.75 6,2H4c0,3.16 2.11,5.84 5,6.71V22h2v-6h2v6h2V10.05L18.95,14l1.41,-1.41L15.89,8.11z"/>
13	6	</vector>

--- /dev/null

+++ b/wear/src/main/res/drawable/ic_baseline_escalator_warning_24.xml

		@@ -0,0 +1,5 @@
	1	+<vector android:height="24dp" android:tint="#000000"
	2	+ android:viewportHeight="24" android:viewportWidth="24"
	3	+ android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
	4	+ <path android:fillColor="@android:color/white" android:pathData="M6.5,2c1.1,0 2,0.9 2,2s-0.9,2 -2,2s-2,-0.9 -2,-2S5.4,2 6.5,2zM15.5,9.5c0,0.83 0.67,1.5 1.5,1.5s1.5,-0.67 1.5,-1.5S17.83,8 17,8S15.5,8.67 15.5,9.5zM18.5,12h-2.84c-0.58,0.01 -1.14,0.32 -1.45,0.86l-0.92,1.32L9.72,8C9.35,7.37 8.69,7.01 8.01,7H5C3.9,7 3,7.9 3,9v6h1.5v7h5V11.61L12.03,16h2.2L15,14.9V22h4v-5h1v-3.5C20,12.68 19.33,12 18.5,12z"/>
	5	+</vector>

--- a/wear/src/main/res/drawable/ic_baseline_hiking_24.xml

+++ b/wear/src/main/res/drawable/ic_baseline_hiking_24.xml

		@@ -1,10 +1,5 @@
1		-<vector xmlns:android="http://schemas.android.com/apk/res/android"
2		- android:width="24dp"
3		- android:height="24dp"
4		- android:viewportWidth="24"
5		- android:viewportHeight="24"
6		- android:tint="?attr/colorControlNormal">
7		- <path
8		- android:fillColor="#FF000000"
9		- android:pathData="M13.5,5.5c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2s-2,0.9 -2,2S12.4,5.5 13.5,5.5zM17.5,10.78c-1.23,-0.37 -2.22,-1.17 -2.8,-2.18l-1,-1.6c-0.41,-0.65 -1.11,-1 -1.84,-1c-0.78,0 -1.59,0.5 -1.78,1.44S7,23 7,23h2.1l1.8,-8l2.1,2v6h2v-7.5l-2.1,-2l0.6,-3c1,1.15 2.41,2.01 4,2.34V23H19V9h-1.5L17.5,10.78zM7.43,13.13l-2.12,-0.41c-0.54,-0.11 -0.9,-0.63 -0.79,-1.17l0.76,-3.93c0.21,-1.08 1.26,-1.79 2.34,-1.58l1.16,0.23L7.43,13.13z"/>
	1	+<vector android:height="24dp" android:tint="#000000"
	2	+ android:viewportHeight="24" android:viewportWidth="24"
	3	+ android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
	4	+ <path android:fillColor="@android:color/white" android:pathData="M13.5,5.5c1.1,0 2,-0.9 2,-2s-0.9,-2 -2,-2s-2,0.9 -2,2S12.4,5.5 13.5,5.5zM17.5,10.78c-1.23,-0.37 -2.22,-1.17 -2.8,-2.18l-1,-1.6c-0.41,-0.65 -1.11,-1 -1.84,-1c-0.78,0 -1.59,0.5 -1.78,1.44S7,23 7,23h2.1l1.8,-8l2.1,2v6h2v-7.5l-2.1,-2l0.6,-3c1,1.15 2.41,2.01 4,2.34V23H19V9h-1.5L17.5,10.78zM7.43,13.13l-2.12,-0.41c-0.54,-0.11 -0.9,-0.63 -0.79,-1.17l0.76,-3.93c0.21,-1.08 1.26,-1.79 2.34,-1.58l1.16,0.23L7.43,13.13z"/>
10	5	</vector>

--- /dev/null

+++ b/wear/src/main/res/drawable/ic_baseline_sick_24.xml

		@@ -0,0 +1,5 @@
	1	+<vector android:height="24dp" android:tint="#000000"
	2	+ android:viewportHeight="24" android:viewportWidth="24"
	3	+ android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
	4	+ <path android:fillColor="@android:color/white" android:pathData="M21,9c-1.1,0 -2,-0.9 -2,-2c0,-1.1 2,-4 2,-4s2,2.9 2,4C23,8.1 22.1,9 21,9zM17.5,7c0,-0.73 0.41,-1.71 0.92,-2.66C16.68,2.88 14.44,2 11.99,2C6.47,2 2,6.48 2,12c0,5.52 4.47,10 9.99,10C17.52,22 22,17.52 22,12c0,-0.55 -0.06,-1.09 -0.14,-1.62C21.58,10.45 21.3,10.5 21,10.5C19.07,10.5 17.5,8.93 17.5,7zM15.62,7.38l1.06,1.06L15.62,9.5l1.06,1.06l-1.06,1.06L13.5,9.5L15.62,7.38zM7.32,8.44l1.06,-1.06L10.5,9.5l-2.12,2.12l-1.06,-1.06L8.38,9.5L7.32,8.44zM15.44,17c-0.69,-1.19 -1.97,-2 -3.44,-2s-2.75,0.81 -3.44,2H6.88c0.3,-0.76 0.76,-1.43 1.34,-1.99L5.24,13.3c-0.45,0.26 -1.01,0.28 -1.49,0c-0.72,-0.41 -0.96,-1.33 -0.55,-2.05c0.41,-0.72 1.33,-0.96 2.05,-0.55c0.48,0.28 0.74,0.78 0.74,1.29l3.58,2.07c0.73,-0.36 1.55,-0.56 2.43,-0.56c2.33,0 4.32,1.45 5.12,3.5H15.44z"/>
	5	+</vector>

--- /dev/null

+++ b/wear/src/main/res/drawable/ic_baseline_skateboarding_24.xml

		@@ -0,0 +1,5 @@
	1	+<vector android:height="24dp" android:tint="#000000"
	2	+ android:viewportHeight="24" android:viewportWidth="24"
	3	+ android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
	4	+ <path android:fillColor="@android:color/white" android:pathData="M13,3c0,-1.1 0.9,-2 2,-2s2,0.9 2,2c0,1.1 -0.9,2 -2,2S13,4.1 13,3zM7.25,22.5c-0.41,0 -0.75,0.34 -0.75,0.75S6.84,24 7.25,24S8,23.66 8,23.25S7.66,22.5 7.25,22.5zM15.75,22.5c-0.41,0 -0.75,0.34 -0.75,0.75S15.34,24 15.75,24s0.75,-0.34 0.75,-0.75S16.16,22.5 15.75,22.5zM19.24,19c-0.24,0 -0.45,0.11 -0.59,0.3c-0.55,0.73 -1.42,1.2 -2.4,1.2H16v-6l-4.32,-2.67l1.8,-2.89C14.63,10.78 16.68,12 19,12v-2c-1.85,0 -3.44,-1.12 -4.13,-2.72l-0.52,-1.21C14.16,5.64 13.61,5 12.7,5H7L4.5,9l1.7,1.06L8.1,7h2.35l-2.4,3.84c-0.31,0.5 -0.39,1.11 -0.21,1.67l1.34,4.15l-3.12,3.76c-0.7,-0.16 -1.3,-0.57 -1.71,-1.12C4.21,19.11 3.99,19 3.75,19C3.31,19 3,19.36 3,19.75c0,0.15 0.05,0.31 0.15,0.45c0.82,1.1 2.13,1.8 3.6,1.8h9.5c1.47,0 2.78,-0.7 3.6,-1.8c0.1,-0.14 0.15,-0.3 0.15,-0.45C20,19.36 19.68,19 19.24,19zM14,20.5H8.6l2.9,-3.5l-1,-3.3l3.5,2.2V20.5z"/>
	5	+</vector>

--- /dev/null

+++ b/wear/src/main/res/drawable/ic_baseline_sledding_24.xml

		@@ -0,0 +1,5 @@
	1	+<vector android:height="24dp" android:tint="#000000"
	2	+ android:viewportHeight="24" android:viewportWidth="24"
	3	+ android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
	4	+ <path android:fillColor="@android:color/white" android:pathData="M14,4.5c0,1.1 -0.9,2 -2,2s-2,-0.9 -2,-2s0.9,-2 2,-2S14,3.4 14,4.5zM22.8,20.24c-0.68,2.1 -2.94,3.25 -5.04,2.57h0L1,17.36l0.46,-1.43l3.93,1.28l0.46,-1.43L1.93,14.5l0.46,-1.43L4,13.6V9.5l5.47,-2.35c0.39,-0.17 0.84,-0.21 1.28,-0.07c0.95,0.31 1.46,1.32 1.16,2.27l-1.05,3.24L13,12.25c0.89,-0.15 1.76,0.32 2.14,1.14l2.08,4.51l1.93,0.63l-0.46,1.43l-3.32,-1.08L14.9,20.3l3.32,1.08l0,0c1.31,0.43 2.72,-0.29 3.15,-1.61c0.43,-1.31 -0.29,-2.72 -1.61,-3.15l0.46,-1.43C22.33,15.88 23.49,18.14 22.8,20.24zM6,14.25l1.01,0.33c-0.22,-0.42 -0.28,-0.92 -0.12,-1.4L7.92,10L6,10.82V14.25zM13.94,18.41l-6.66,-2.16l-0.46,1.43l6.66,2.16L13.94,18.41zM14.63,17.05l-1.18,-2.56l-3.97,0.89L14.63,17.05z"/>
	5	+</vector>

--- /dev/null

+++ b/wear/src/main/res/drawable/ic_baseline_snowboarding_24.xml

		@@ -0,0 +1,5 @@
	1	+<vector android:height="24dp" android:tint="#000000"
	2	+ android:viewportHeight="24" android:viewportWidth="24"
	3	+ android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
	4	+ <path android:fillColor="@android:color/white" android:pathData="M14,3c0,-1.1 0.9,-2 2,-2s2,0.9 2,2c0,1.1 -0.9,2 -2,2S14,4.1 14,3zM21.4,20.09c-0.23,-0.05 -0.46,0.02 -0.64,0.17c-0.69,0.6 -1.64,0.88 -2.6,0.67L17,20.69l-1,-6.19l-3.32,-2.67l1.8,-2.89C15.63,10.78 17.68,12 20,12v-2c-1.85,0 -3.44,-1.12 -4.13,-2.72l-0.52,-1.21C15.16,5.64 14.61,5 13.7,5H8L5.5,9l1.7,1.06L9.1,7h2.35l-2.51,3.99c-0.28,0.45 -0.37,1 -0.25,1.52L9.5,16L6,18.35l-0.47,-0.1c-0.96,-0.2 -1.71,-0.85 -2.1,-1.67c-0.1,-0.21 -0.28,-0.37 -0.51,-0.42c-0.43,-0.09 -0.82,0.2 -0.9,0.58C1.98,16.88 2,17.05 2.07,17.2c0.58,1.24 1.71,2.2 3.15,2.51l12.63,2.69c1.44,0.31 2.86,-0.11 3.9,-1.01c0.13,-0.11 0.21,-0.26 0.24,-0.41C22.06,20.6 21.83,20.18 21.4,20.09zM8.73,18.93l3.02,-2.03l-0.44,-3.32l2.84,2.02l0.75,4.64L8.73,18.93z"/>
	5	+</vector>

--- /dev/null

+++ b/wear/src/main/res/drawable/ic_baseline_snowmobile_24.xml

		@@ -0,0 +1,5 @@
	1	+<vector android:height="24dp" android:tint="#000000"
	2	+ android:viewportHeight="24" android:viewportWidth="24"
	3	+ android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
	4	+ <path android:fillColor="@android:color/white" android:pathData="M22,17c0,0.55 -0.45,1 -1,1h-0.17l-2.2,-2.2C20.58,15.37 22,14.4 22,13c0,-1 -8,-8 -8,-8h-3v2h2.25l1.45,1.3L11,11l-9.5,-1L0,13l4.54,1.36l-3.49,1.88C-0.77,17.22 -0.07,20 2,20h6c2.21,0 4,-1.79 4,-4h4l2,2h-3v2h6c1.66,0 3,-1.34 3,-3H22zM8,18H2l5.25,-2.83L10,16C10,17.1 9.11,18 8,18z"/>
	5	+</vector>

--- /dev/null

+++ b/wear/src/main/res/drawable/ic_baseline_snowshoeing_24.xml

		@@ -0,0 +1,5 @@
	1	+<vector android:height="24dp" android:tint="#000000"
	2	+ android:viewportHeight="24" android:viewportWidth="24"
	3	+ android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
	4	+ <path android:fillColor="@android:color/white" android:pathData="M12.5,3.5c0,-1.1 0.9,-2 2,-2s2,0.9 2,2c0,1.1 -0.9,2 -2,2S12.5,4.6 12.5,3.5zM6.32,19.03l-1.14,-1.47L4,18.5l2.38,3.04c0.51,0.65 1.16,1.15 1.88,1.41c0.28,0.1 0.53,0.04 0.72,-0.11c0.3,-0.23 0.42,-0.7 0.12,-1.07c-0.08,-0.1 -0.2,-0.17 -0.31,-0.22c-0.43,-0.18 -0.82,-0.45 -1.14,-0.83l-0.08,-0.1L11,18.2l0.89,-3.22l2.11,2v4.52h-2V23h3.87c0.82,0 1.61,-0.21 2.26,-0.61c0.26,-0.16 0.37,-0.39 0.37,-0.64c0,-0.38 -0.3,-0.75 -0.77,-0.75c-0.13,0 -0.26,0.04 -0.37,0.1c-0.4,0.23 -0.87,0.37 -1.36,0.4l0,-6.02l-2.11,-2l0.6,-3C15.79,11.98 17.8,13 20,13v-2c-1.9,0 -3.51,-1.02 -4.31,-2.42l-1,-1.58c-0.4,-0.6 -1,-1 -1.7,-1C12.24,6 11.58,6.34 7,8.28V13h2V9.58l1.79,-0.7L9.2,17L6.32,19.03z"/>
	5	+</vector>

--- /dev/null

+++ b/wear/src/main/res/drawable/ic_baseline_sports_handball_24.xml

		@@ -0,0 +1,7 @@
	1	+<vector android:height="24dp" android:tint="#000000"
	2	+ android:viewportHeight="24" android:viewportWidth="24"
	3	+ android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
	4	+ <path android:fillColor="@android:color/white" android:pathData="M14.27,6C13.72,6.95 14.05,8.18 15,8.73c0.95,0.55 2.18,0.22 2.73,-0.73c0.55,-0.95 0.22,-2.18 -0.73,-2.73C16.05,4.72 14.82,5.05 14.27,6z"/>
	5	+ <path android:fillColor="@android:color/white" android:pathData="M15.84,10.41c0,0 -1.63,-0.94 -2.6,-1.5c-2.38,-1.38 -3.2,-4.44 -1.82,-6.82l-1.73,-1C8.1,3.83 8.6,7.21 10.66,9.4l-5.15,8.92l1.73,1l1.5,-2.6l1.73,1l-3,5.2l1.73,1l6.29,-10.89c1.14,1.55 1.33,3.69 0.31,5.46l1.73,1C19.13,16.74 18.81,12.91 15.84,10.41z"/>
	6	+ <path android:fillColor="@android:color/white" android:pathData="M12.75,3.8c0.72,0.41 1.63,0.17 2.05,-0.55c0.41,-0.72 0.17,-1.63 -0.55,-2.05c-0.72,-0.41 -1.63,-0.17 -2.05,0.55C11.79,2.47 12.03,3.39 12.75,3.8z"/>
	7	+</vector>

--- /dev/null

+++ b/wear/src/main/res/drawable/ic_baseline_surfing_24.xml

		@@ -0,0 +1,5 @@
	1	+<vector android:height="24dp" android:tint="#000000"
	2	+ android:viewportHeight="24" android:viewportWidth="24"
	3	+ android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
	4	+ <path android:fillColor="@android:color/white" android:pathData="M21,23c-1.03,0 -2.06,-0.25 -3,-0.75h0c-1.89,1 -4.11,1 -6,0c-1.89,1 -4.11,1 -6,0C5.05,22.75 4.03,23 3,23H2l0,-2h1c1.04,0 2.08,-0.35 3,-1c1.83,1.3 4.17,1.3 6,0c1.83,1.3 4.17,1.3 6,0c0.91,0.65 1.96,1 3,1h1v2H21zM17,1.5c-1.1,0 -2,0.9 -2,2s0.9,2 2,2s2,-0.9 2,-2S18.1,1.5 17,1.5zM14.43,8.48L12.18,10L16,13v3.84c0.53,0.38 1.03,0.78 1.49,1.17C16.81,18.59 15.94,19 15,19c-1.2,0 -2.27,-0.66 -3,-1.5c-0.73,0.84 -1.8,1.5 -3,1.5c-0.33,0 -0.65,-0.05 -0.96,-0.14C5.19,16.9 3,14.72 3,13.28C3,12.25 4.01,12 4.85,12c0.98,0 2.28,0.31 3.7,0.83l-0.53,-3.1C7.91,9.06 8.2,8.35 8.8,7.94l2.15,-1.45l-2,-0.37L6.13,8.05L5,6.4L8.5,4l5.55,1.03c0.45,0.09 0.93,0.37 1.22,0.89l0.88,1.55C17.01,8.98 18.64,10 20.5,10v2C17.91,12 15.64,10.58 14.43,8.48zM10.3,11.1l0.44,2.65c0.92,0.42 2.48,1.27 3.26,1.75V14L10.3,11.1z"/>
	5	+</vector>

--- /dev/null

+++ b/wear/src/main/res/drawable/ic_baseline_wc_24.xml

		@@ -0,0 +1,5 @@
	1	+<vector android:height="24dp" android:tint="#000000"
	2	+ android:viewportHeight="24" android:viewportWidth="24"
	3	+ android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
	4	+ <path android:fillColor="@android:color/white" android:pathData="M5.5,22v-7.5L4,14.5L4,9c0,-1.1 0.9,-2 2,-2h3c1.1,0 2,0.9 2,2v5.5L9.5,14.5L9.5,22h-4zM18,22v-6h3l-2.54,-7.63C18.18,7.55 17.42,7 16.56,7h-0.12c-0.86,0 -1.63,0.55 -1.9,1.37L12,16h3v6h3zM7.5,6c1.11,0 2,-0.89 2,-2s-0.89,-2 -2,-2 -2,0.89 -2,2 0.89,2 2,2zM16.5,6c1.11,0 2,-0.89 2,-2s-0.89,-2 -2,-2 -2,0.89 -2,2 0.89,2 2,2z"/>
	5	+</vector>

--- /dev/null

+++ b/wear/src/main/res/drawable/ic_board_1_black_24dp.xml

		@@ -0,0 +1,9 @@
	1	+<vector xmlns:android="http://schemas.android.com/apk/res/android"
	2	+ android:width="24dp"
	3	+ android:height="24dp"
	4	+ android:viewportWidth="24.0"
	5	+ android:viewportHeight="24.0">
	6	+ <path
	7	+ android:fillColor="#FF000000"
	8	+ android:pathData="M19,3H14.82C14.25,1.44 12.53,0.64 11,1.2C10.14,1.5 9.5,2.16 9.18,3H5A2,2 0 0,0 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V5A2,2 0 0,0 19,3M12,3A1,1 0 0,1 13,4A1,1 0 0,1 12,5A1,1 0 0,1 11,4A1,1 0 0,1 12,3M7,7H17V5H19V19H5V5H7V7M17,11H7V9H17V11M15,15H7V13H15V15Z" />
	9	+</vector>

--- /dev/null

+++ b/wear/src/main/res/drawable/ic_board_2_black_24dp.xml

		@@ -0,0 +1,9 @@
	1	+<vector xmlns:android="http://schemas.android.com/apk/res/android"
	2	+ android:width="24dp"
	3	+ android:height="24dp"
	4	+ android:viewportWidth="24.0"
	5	+ android:viewportHeight="24.0">
	6	+ <path
	7	+ android:fillColor="#FF000000"
	8	+ android:pathData="M19,2h-4.18C14.4,0.84 13.3,0 12,0c-1.3,0 -2.4,0.84 -2.82,2L5,2c-1.1,0 -2,0.9 -2,2v16c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,4c0,-1.1 -0.9,-2 -2,-2zM12,2c0.55,0 1,0.45 1,1s-0.45,1 -1,1 -1,-0.45 -1,-1 0.45,-1 1,-1zM19,20L5,20L5,4h2v3h10L17,4h2v16z"/>
	9	+</vector>

--- /dev/null

+++ b/wear/src/main/res/drawable/ic_board_3_black_24dp.xml

		@@ -0,0 +1,9 @@
	1	+<vector xmlns:android="http://schemas.android.com/apk/res/android"
	2	+ android:width="24dp"
	3	+ android:height="24dp"
	4	+ android:viewportWidth="24.0"
	5	+ android:viewportHeight="24.0">
	6	+ <path
	7	+ android:fillColor="#FF000000"
	8	+ android:pathData="M19,3H14.82C14.4,1.84 13.3,1 12,1C10.7,1 9.6,1.84 9.18,3H5A2,2 0 0,0 3,5V19A2,2 0 0,0 5,21H19A2,2 0 0,0 21,19V5A2,2 0 0,0 19,3M12,3A1,1 0 0,1 13,4A1,1 0 0,1 12,5A1,1 0 0,1 11,4A1,1 0 0,1 12,3M5,15H8.11L9.62,12.15L10.38,17.92L14.07,13.21L15.89,15H19V19H5V15M19,13.46H16.53L13.93,10.86L11.44,14.05L10.5,7.08L7.17,13.46H5V5H7V6H17V5H19V6L19,13.46Z"/>
	9	+</vector>

--- /dev/null

+++ b/wear/src/main/res/layout-notround/select_set_reference_dialog.xml

		@@ -0,0 +1,30 @@
	1	+<?xml version="1.0" encoding="utf-8"?>
	2	+<androidx.wear.widget.BoxInsetLayout
	3	+ xmlns:android="http://schemas.android.com/apk/res/android"
	4	+ android:id="@+id/list_drawer_layout"
	5	+ android:layout_width="match_parent"
	6	+ android:layout_height="match_parent"
	7	+ android:nestedScrollingEnabled="true"
	8	+ android:paddingStart="@dimen/list_start_padding"
	9	+ android:paddingEnd="@dimen/list_end_padding"
	10	+ >
	11	+ <ScrollView
	12	+ android:layout_width="match_parent"
	13	+ android:layout_height="wrap_content"
	14	+ >
	15	+ <LinearLayout
	16	+ android:id="@+id/select_set_reference"
	17	+ android:orientation="vertical"
	18	+ android:layout_width="fill_parent"
	19	+ android:layout_height="wrap_content"
	20	+ android:padding="2dp"
	21	+ >
	22	+ <Spinner
	23	+ android:id="@+id/spinner_reference_selection"
	24	+ android:layout_width="fill_parent"
	25	+ android:layout_height="wrap_content"
	26	+ android:text="@string/blank"
	27	+ android:visibility="visible" />
	28	+ </LinearLayout>
	29	+ </ScrollView>
	30	+</androidx.wear.widget.BoxInsetLayout>

--- /dev/null

+++ b/wear/src/main/res/layout-round/select_set_reference_dialog.xml

		@@ -0,0 +1,30 @@
	1	+<?xml version="1.0" encoding="utf-8"?>
	2	+<androidx.wear.widget.BoxInsetLayout
	3	+ xmlns:android="http://schemas.android.com/apk/res/android"
	4	+ android:id="@+id/list_drawer_layout"
	5	+ android:layout_width="match_parent"
	6	+ android:layout_height="match_parent"
	7	+ android:nestedScrollingEnabled="true"
	8	+ android:paddingStart="@dimen/list_start_padding"
	9	+ android:paddingEnd="@dimen/list_end_padding"
	10	+ >
	11	+ <ScrollView
	12	+ android:layout_width="match_parent"
	13	+ android:layout_height="wrap_content"
	14	+ >
	15	+ <LinearLayout
	16	+ android:id="@+id/select_set_reference"
	17	+ android:orientation="vertical"
	18	+ android:layout_width="fill_parent"
	19	+ android:layout_height="wrap_content"
	20	+ android:padding="2dp"
	21	+ >
	22	+ <Spinner
	23	+ android:id="@+id/spinner_reference_selection"
	24	+ android:layout_width="fill_parent"
	25	+ android:layout_height="wrap_content"
	26	+ android:text="@string/blank"
	27	+ android:visibility="visible" />
	28	+ </LinearLayout>
	29	+ </ScrollView>
	30	+</androidx.wear.widget.BoxInsetLayout>

--- a/wear/src/main/res/values-ja/arrays.xml

+++ b/wear/src/main/res/values-ja/arrays.xml

		@@ -49,6 +49,25 @@
49	49	<item>@drawable/ic_baseline_hiking_24</item>
50	50	<item>@drawable/ic_baseline_self_improvement_24</item>
51	51	<item>@drawable/ic_baseline_pedal_bike_24</item>
	52	+ <item>@drawable/ic_baseline_boy_24</item>
	53	+ <item>@drawable/ic_baseline_android_24</item>
	54	+ <item>@drawable/ic_baseline_downhill_skiing_24</item>
	55	+ <item>@drawable/ic_baseline_escalator_warning_24</item>
	56	+ <item>@drawable/ic_baseline_wc_24</item>
	57	+ <item>@drawable/ic_baseline_skateboarding_24</item>
	58	+ <item>@drawable/ic_baseline_snowboarding_24</item>
	59	+ <item>@drawable/ic_baseline_snowshoeing_24</item>
	60	+ <item>@drawable/ic_baseline_sledding_24</item>
	61	+ <item>@drawable/ic_baseline_snowmobile_24</item>
	62	+ <item>@drawable/ic_baseline_sports_handball_24</item>
	63	+ <item>@drawable/ic_baseline_surfing_24</item>
	64	+ <item>@drawable/ic_baseline_cruelty_free_24</item>
	65	+ <item>@drawable/ic_baseline_accessibility_24</item>
	66	+ <item>@drawable/ic_baseline_accessibility_new_24</item>
	67	+ <item>@drawable/ic_baseline_123_24</item>
	68	+ <item>@drawable/ic_lightbulb_outline_black_24dp</item>
	69	+ <item>@drawable/ic_bookmark_border_black_24dp</item>
	70	+ <item>@drawable/ic_baseline_sick_24</item>
52	71	</array>
53	72	<string-array name="icon_selection_id">
54	73	<item>0</item>

		@@ -99,5 +118,29 @@
99	118	<item>49</item>
100	119	<item>50</item>
101	120	<item>51</item>
	121	+ <item>52</item>
	122	+ <item>53</item>
	123	+ <item>54</item>
	124	+ <item>55</item>
	125	+ <item>56</item>
	126	+ <item>57</item>
	127	+ <item>58</item>
	128	+ <item>59</item>
	129	+ <item>60</item>
	130	+ <item>61</item>
	131	+ <item>62</item>
	132	+ <item>63</item>
	133	+ <item>64</item>
	134	+ <item>65</item>
	135	+ <item>66</item>
	136	+ <item>67</item>
	137	+ <item>68</item>
	138	+ <item>69</item>
	139	+ <item>70</item>
	140	+ </string-array>
	141	+ <string-array name="reference_selection_array">
	142	+ <item>A</item>
	143	+ <item>B</item>
	144	+ <item>C</item>
102	145	</string-array>
103	146	</resources>

--- a/wear/src/main/res/values-ja/strings.xml

+++ b/wear/src/main/res/values-ja/strings.xml

		@@ -14,7 +14,7 @@
14	14	<string name="dialog_message_data_edit">記録情報の編集</string>
15	15	<string name="action_edit_title">記録情報の編集</string>
16	16	<string name="action_change_icon">アイコンの変更</string>
17		- <string name="action_set_reference">基準値に設定</string>
	17	+ <string name="action_set_reference">基準値を設定</string>
18	18	<string name="action_edited_data">更新しました</string>
19	19	<string name="action_create_model">モデルデータの作成</string>
20	20	<string name="action_share_data">データの共有</string>

--- a/wear/src/main/res/values-round/arrays.xml

+++ b/wear/src/main/res/values-round/arrays.xml

		@@ -49,6 +49,25 @@
49	49	<item>@drawable/ic_baseline_hiking_24</item>
50	50	<item>@drawable/ic_baseline_self_improvement_24</item>
51	51	<item>@drawable/ic_baseline_pedal_bike_24</item>
	52	+ <item>@drawable/ic_baseline_boy_24</item>
	53	+ <item>@drawable/ic_baseline_android_24</item>
	54	+ <item>@drawable/ic_baseline_downhill_skiing_24</item>
	55	+ <item>@drawable/ic_baseline_escalator_warning_24</item>
	56	+ <item>@drawable/ic_baseline_wc_24</item>
	57	+ <item>@drawable/ic_baseline_skateboarding_24</item>
	58	+ <item>@drawable/ic_baseline_snowboarding_24</item>
	59	+ <item>@drawable/ic_baseline_snowshoeing_24</item>
	60	+ <item>@drawable/ic_baseline_sledding_24</item>
	61	+ <item>@drawable/ic_baseline_snowmobile_24</item>
	62	+ <item>@drawable/ic_baseline_sports_handball_24</item>
	63	+ <item>@drawable/ic_baseline_surfing_24</item>
	64	+ <item>@drawable/ic_baseline_cruelty_free_24</item>
	65	+ <item>@drawable/ic_baseline_accessibility_24</item>
	66	+ <item>@drawable/ic_baseline_accessibility_new_24</item>
	67	+ <item>@drawable/ic_baseline_123_24</item>
	68	+ <item>@drawable/ic_lightbulb_outline_black_24dp</item>
	69	+ <item>@drawable/ic_bookmark_border_black_24dp</item>
	70	+ <item>@drawable/ic_baseline_sick_24</item>
52	71	</array>
53	72	<string-array name="icon_selection_id">
54	73	<item>0</item>

		@@ -99,5 +118,29 @@
99	118	<item>49</item>
100	119	<item>50</item>
101	120	<item>51</item>
	121	+ <item>52</item>
	122	+ <item>53</item>
	123	+ <item>54</item>
	124	+ <item>55</item>
	125	+ <item>56</item>
	126	+ <item>57</item>
	127	+ <item>58</item>
	128	+ <item>59</item>
	129	+ <item>60</item>
	130	+ <item>61</item>
	131	+ <item>62</item>
	132	+ <item>63</item>
	133	+ <item>64</item>
	134	+ <item>65</item>
	135	+ <item>66</item>
	136	+ <item>67</item>
	137	+ <item>68</item>
	138	+ <item>69</item>
	139	+ <item>70</item>
	140	+ </string-array>
	141	+ <string-array name="reference_selection_array">
	142	+ <item>A</item>
	143	+ <item>B</item>
	144	+ <item>C</item>
102	145	</string-array>
103	146	</resources>
		\ No newline at end of file

--- a/wear/src/main/res/values/arrays.xml

+++ b/wear/src/main/res/values/arrays.xml

		@@ -49,6 +49,25 @@
49	49	<item>@drawable/ic_baseline_hiking_24</item>
50	50	<item>@drawable/ic_baseline_self_improvement_24</item>
51	51	<item>@drawable/ic_baseline_pedal_bike_24</item>
	52	+ <item>@drawable/ic_baseline_boy_24</item>
	53	+ <item>@drawable/ic_baseline_android_24</item>
	54	+ <item>@drawable/ic_baseline_downhill_skiing_24</item>
	55	+ <item>@drawable/ic_baseline_escalator_warning_24</item>
	56	+ <item>@drawable/ic_baseline_wc_24</item>
	57	+ <item>@drawable/ic_baseline_skateboarding_24</item>
	58	+ <item>@drawable/ic_baseline_snowboarding_24</item>
	59	+ <item>@drawable/ic_baseline_snowshoeing_24</item>
	60	+ <item>@drawable/ic_baseline_sledding_24</item>
	61	+ <item>@drawable/ic_baseline_snowmobile_24</item>
	62	+ <item>@drawable/ic_baseline_sports_handball_24</item>
	63	+ <item>@drawable/ic_baseline_surfing_24</item>
	64	+ <item>@drawable/ic_baseline_cruelty_free_24</item>
	65	+ <item>@drawable/ic_baseline_accessibility_24</item>
	66	+ <item>@drawable/ic_baseline_accessibility_new_24</item>
	67	+ <item>@drawable/ic_baseline_123_24</item>
	68	+ <item>@drawable/ic_lightbulb_outline_black_24dp</item>
	69	+ <item>@drawable/ic_bookmark_border_black_24dp</item>
	70	+ <item>@drawable/ic_baseline_sick_24</item>
52	71	</array>
53	72	<string-array name="icon_selection_id">
54	73	<item>0</item>

		@@ -99,5 +118,29 @@
99	118	<item>49</item>
100	119	<item>50</item>
101	120	<item>51</item>
	121	+ <item>52</item>
	122	+ <item>53</item>
	123	+ <item>54</item>
	124	+ <item>55</item>
	125	+ <item>56</item>
	126	+ <item>57</item>
	127	+ <item>58</item>
	128	+ <item>59</item>
	129	+ <item>60</item>
	130	+ <item>61</item>
	131	+ <item>62</item>
	132	+ <item>63</item>
	133	+ <item>64</item>
	134	+ <item>65</item>
	135	+ <item>66</item>
	136	+ <item>67</item>
	137	+ <item>68</item>
	138	+ <item>69</item>
	139	+ <item>70</item>
102	140	</string-array>
103		-</resources>
		\ No newline at end of file
	141	+ <string-array name="reference_selection_array">
	142	+ <item>A</item>
	143	+ <item>B</item>
	144	+ <item>C</item>
	145	+ </string-array>
	146	+</resources>

--- /dev/null

+++ b/wear/src/main/res/values/colors.xml

		@@ -0,0 +1,6 @@
	1	+<?xml version="1.0" encoding="utf-8"?>
	2	+<resources>
	3	+ <color name="colorPrimary">#6200EE</color>
	4	+ <color name="colorPrimaryDark">#3700B3</color>
	5	+ <color name="colorAccent">#03DAC5</color>
	6	+</resources>

--- a/wear/src/main/res/values/styles.xml

+++ b/wear/src/main/res/values/styles.xml

		@@ -1,4 +1,12 @@
1	1	<?xml version="1.0" encoding="utf-8"?>
2	2	<resources>
	3	+ <!-- Base application theme. -->
	4	+ <!-- parent="Theme.AppCompat.Light.NoActionBar" -->
	5	+ <!-- parent="Theme.AppCompat.DayNight.NoActionBar" -->
	6	+ <style name="AppTheme" parent="Theme.AppCompat.NoActionBar">
	7	+ <item name="colorPrimary">@color/colorPrimary</item>
	8	+ <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
	9	+ <item name="colorAccent">@color/colorAccent</item>
	10	+ </style>
3	11	<style name="wear2_dialog_theme" parent="android:Theme.Holo.Dialog" />
4	12	</resources>

Show on old repository browser

GOKIGEN ForkLegacyGpsAdapterA01cBondImageA01dGokigenClockGokigenAlignmentCheckerJoggingTimerPKRemoteGokigenDiaryTheWarikanMeMoMaGr2ControlFujiCamGokigenCameraControlLibraryBLEControlmangleThetaThoughtShutterThetaViewA01fprpr1

JoggingTimer: Commit

Commit MetaInfo

Log Message

Ändern Zusammenfassung

Diff

GOKIGEN
Fork
LegacyGpsAdapter
A01c
BondImage
A01d
GokigenClock
GokigenAlignmentChecker
JoggingTimer
PKRemote
GokigenDiary
TheWarikan
MeMoMa
Gr2Control
FujiCam
GokigenCameraControlLibrary
BLEControl
mangle
ThetaThoughtShutter
ThetaView
A01f
prpr1