<PersistentState>
<option name="values">
<map>
- <entry key="url" value="file:/$PROJECT_DIR$/../../../../APL/Android/sdk/icons/material/materialicons/self_improvement/baseline_self_improvement_24.xml" />
+ <entry key="url" value="file:/$PROJECT_DIR$/../../../../APL/Android/sdk/icons/material/materialicons/123/baseline_123_24.xml" />
</map>
</option>
</PersistentState>
</option>
<option name="values">
<map>
- <entry key="outputName" value="ic_baseline_self_improvement_24" />
+ <entry key="outputName" value="ic_baseline_123_24" />
<entry key="sourceFile" value="C:\Users\MRSa" />
</map>
</option>
--- /dev/null
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+ <component name="deploymentTargetDropDown">
+ <runningDeviceTargetSelectedWithDropDown>
+ <Target>
+ <type value="RUNNING_DEVICE_TARGET" />
+ <deviceKey>
+ <Key>
+ <type value="VIRTUAL_DEVICE_PATH" />
+ <value value="C:\Users\MRSa\.android\avd\Android_Wear_Round_Chin_API_26.avd" />
+ </Key>
+ </deviceKey>
+ </Target>
+ </runningDeviceTargetSelectedWithDropDown>
+ <targetSelectedWithDropDown>
+ <Target>
+ <type value="QUICK_BOOT_TARGET" />
+ <deviceKey>
+ <Key>
+ <type value="VIRTUAL_DEVICE_PATH" />
+ <value value="C:\Users\MRSa\.android\avd\Android_Wear_Round_Chin_API_26.avd" />
+ </Key>
+ </deviceKey>
+ </Target>
+ </targetSelectedWithDropDown>
+ <timeTargetWasSelectedWithDropDown value="2022-07-04T03:43:32.085812600Z" />
+ </component>
+</project>
\ No newline at end of file
<option name="filePathToZoomLevelMap">
<map>
<entry key="..\:/Users/MRSa/AndroidStudioProjects/JoggingTimer/wear/src/main/res/drawable/ic_assignment_turned_in_black_24dp.xml" value="0.1" />
+ <entry key="..\:/Users/MRSa/AndroidStudioProjects/JoggingTimer/wear/src/main/res/drawable/ic_baseline_cruelty_free_24.xml" value="0.309" />
<entry key="..\:/Users/MRSa/AndroidStudioProjects/JoggingTimer/wear/src/main/res/drawable/ic_baseline_elderly_24.xml" value="0.1055" />
<entry key="..\:/Users/MRSa/AndroidStudioProjects/JoggingTimer/wear/src/main/res/drawable/ic_baseline_emoji_people_24.xml" value="0.1055" />
<entry key="..\:/Users/MRSa/AndroidStudioProjects/JoggingTimer/wear/src/main/res/drawable/ic_baseline_follow_the_signs_24.xml" value="0.1055" />
<entry key="..\:/Users/MRSa/AndroidStudioProjects/JoggingTimer/wear/src/main/res/drawable/ic_baseline_pedal_bike_24.xml" value="0.1055" />
<entry key="..\:/Users/MRSa/AndroidStudioProjects/JoggingTimer/wear/src/main/res/drawable/ic_baseline_self_improvement_24.xml" value="0.1055" />
<entry key="..\:/Users/MRSa/AndroidStudioProjects/JoggingTimer/wear/src/main/res/drawable/ic_battery_alert_black_24dp.xml" value="0.1055" />
+ <entry key="..\:/Users/MRSa/AndroidStudioProjects/JoggingTimer/wear/src/main/res/drawable/ic_board_1_black_24dp.xml" value="0.434" />
+ <entry key="..\:/Users/MRSa/AndroidStudioProjects/JoggingTimer/wear/src/main/res/drawable/ic_board_2_black_24dp.xml" value="0.434" />
+ <entry key="..\:/Users/MRSa/AndroidStudioProjects/JoggingTimer/wear/src/main/res/drawable/ic_board_3_black_24dp.xml" value="0.434" />
<entry key="..\:/Users/MRSa/AndroidStudioProjects/JoggingTimer/wear/src/main/res/layout-notround/activity_detail.xml" value="1.0904605263157894" />
<entry key="..\:/Users/MRSa/AndroidStudioProjects/JoggingTimer/wear/src/main/res/layout-notround/activity_list.xml" value="1.0904605263157894" />
+ <entry key="..\:/Users/MRSa/AndroidStudioProjects/JoggingTimer/wear/src/main/res/layout-notround/activity_main.xml" value="1.1208920187793427" />
<entry key="..\:/Users/MRSa/AndroidStudioProjects/JoggingTimer/wear/src/main/res/layout-notround/column_detail.xml" value="1.0904605263157894" />
<entry key="..\:/Users/MRSa/AndroidStudioProjects/JoggingTimer/wear/src/main/res/layout-notround/column_laptime.xml" value="1.0904605263157894" />
<entry key="..\:/Users/MRSa/AndroidStudioProjects/JoggingTimer/wear/src/main/res/layout-notround/column_list.xml" value="1.0904605263157894" />
<entry key="..\:/Users/MRSa/AndroidStudioProjects/JoggingTimer/wear/src/main/res/layout-notround/icon_list.xml" value="1.0904605263157894" />
<entry key="..\:/Users/MRSa/AndroidStudioProjects/JoggingTimer/wear/src/main/res/layout-notround/information_dialog.xml" value="1.0904605263157894" />
+ <entry key="..\:/Users/MRSa/AndroidStudioProjects/JoggingTimer/wear/src/main/res/layout-notround/select_set_reference_dialog.xml" value="1.7570422535211268" />
<entry key="..\:/Users/MRSa/AndroidStudioProjects/JoggingTimer/wear/src/main/res/layout-notround/time_model_picker.xml" value="1.0904605263157894" />
<entry key="..\:/Users/MRSa/AndroidStudioProjects/JoggingTimer/wear/src/main/res/layout-round/activity_list.xml" value="0.9636627906976745" />
+ <entry key="..\:/Users/MRSa/AndroidStudioProjects/JoggingTimer/wear/src/main/res/layout-round/activity_main.xml" value="0.8171806167400881" />
<entry key="..\:/Users/MRSa/AndroidStudioProjects/JoggingTimer/wear/src/main/res/layout-round/column_detail.xml" value="0.9636627906976745" />
<entry key="..\:/Users/MRSa/AndroidStudioProjects/JoggingTimer/wear/src/main/res/layout-round/column_laptime.xml" value="0.9636627906976745" />
<entry key="..\:/Users/MRSa/AndroidStudioProjects/JoggingTimer/wear/src/main/res/layout-round/column_list.xml" value="0.9636627906976745" />
<entry key="..\:/Users/MRSa/AndroidStudioProjects/JoggingTimer/wear/src/main/res/layout-round/icon_list.xml" value="0.9636627906976745" />
<entry key="..\:/Users/MRSa/AndroidStudioProjects/JoggingTimer/wear/src/main/res/layout-round/information_dialog.xml" value="0.9636627906976745" />
+ <entry key="..\:/Users/MRSa/AndroidStudioProjects/JoggingTimer/wear/src/main/res/layout-round/select_set_reference_dialog.xml" value="1.5658995815899581" />
<entry key="..\:/Users/MRSa/AndroidStudioProjects/JoggingTimer/wear/src/main/res/layout-round/time_model_picker.xml" value="0.9636627906976745" />
<entry key="..\:/Users/MRSa/AndroidStudioProjects/JoggingTimer/wear/src/main/res/menu/selector_detail.xml" value="2.1392857142857142" />
</map>
mavenCentral()
}
dependencies {
- classpath 'com.android.tools.build:gradle:7.2.0'
+ classpath 'com.android.tools.build:gradle:7.2.1'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
applicationId "net.osdn.gokigen.joggingtimer"
minSdkVersion 14 // 14
targetSdkVersion 32
- versionCode 100044
- versionName "1.0.5"
+ versionCode 100046
+ versionName "1.0.6"
}
buildTypes {
release {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
- implementation 'androidx.appcompat:appcompat:1.4.1'
+ implementation 'androidx.appcompat:appcompat:1.4.2'
wearApp project(':wear')
}
applicationId "net.osdn.gokigen.joggingtimer"
minSdkVersion 23
targetSdkVersion 32
- versionCode 100043
- versionName "1.0.5"
+ versionCode 100045
+ versionName "1.0.6"
}
buildTypes {
release {
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.VIBRATE" />
+ <!-- android:theme="@android:style/Theme.DeviceDefault" -->
<application
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:supportsRtl="true"
android:fullBackupContent="true"
- android:theme="@android:style/Theme.DeviceDefault">
+ android:theme="@style/AppTheme">
<uses-library
android:name="com.google.android.wearable"
android:required="true" />
package net.osdn.gokigen.joggingtimer.recorddetail;
-import android.app.FragmentManager;
import android.os.Bundle;
import android.util.Log;
import android.view.MenuItem;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatActivity;
+import androidx.fragment.app.FragmentManager;
import androidx.recyclerview.widget.DividerItemDecoration;
import androidx.wear.ambient.AmbientModeSupport;
import androidx.wear.widget.WearableLinearLayoutManager;
import net.osdn.gokigen.joggingtimer.R;
import net.osdn.gokigen.joggingtimer.utilities.CreateModelData;
import net.osdn.gokigen.joggingtimer.utilities.DataEditDialog;
+import net.osdn.gokigen.joggingtimer.utilities.SetReferenceDialog;
/**
*
*
*/
-public class DetailActivity extends AppCompatActivity implements RecordDetailSetup.IDatabaseReadyNotify, MenuItem.OnMenuItemClickListener, DataEditDialog.Callback, CreateModelData.IEditedModelDataCallback, DetailSelectionMenuAdapter.ISelectedMenu, AmbientModeSupport.AmbientCallbackProvider
+public class DetailActivity extends AppCompatActivity implements RecordDetailSetup.IDatabaseReadyNotify, MenuItem.OnMenuItemClickListener, DataEditDialog.Callback, CreateModelData.IEditedModelDataCallback, DetailSelectionMenuAdapter.ISelectedMenu, AmbientModeSupport.AmbientCallbackProvider, SetReferenceDialog.SetReferenceCallback
{
private final String TAG = toString();
public static final String INTENT_EXTRA_DATA_ID = "Detail.dataId";
title = data.getTitle();
}
DataEditDialog dialog = DataEditDialog.newInstance(iconId, title, this);
- FragmentManager manager = getFragmentManager();
- String tag = "dialog";
- if (manager != null) {
- dialog.show(manager, tag);
- }
+ FragmentManager manager = getSupportFragmentManager();
+ dialog.show(manager, "dialog");
ret = true;
}
else if (itemId == R.id.menu_set_reference)
{
- // 現在のデータを基準値として設定する
- setupper.setReferenceData();
+ // 基準値の設定ダイアログを表示する
+ final SetReferenceDialog.SetReferenceCallback callback = this;
+ this.runOnUiThread(new Runnable() {
+ @Override
+ public void run() {
+ try
+ {
+ // 基準値設定ダイアログを表示する
+ SetReferenceDialog dialog = SetReferenceDialog.newInstance("Set Reference", "Please Select Reference Type", callback);
+ FragmentManager manager = getSupportFragmentManager();
+ dialog.show(manager, "dialog");
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();
+ }
+ }
+ });
+
ret = true;
}
else if (itemId == R.id.menu_share_data)
return (ret);
}
-
/**
*
*/
}
@Override
- public void onPointerCaptureChanged(boolean hasCapture) {
+ public void onPointerCaptureChanged(boolean hasCapture)
+ {
super.onPointerCaptureChanged(hasCapture);
}
+
+ @Override
+ public void confirmed(int id)
+ {
+ // 現在のデータを基準値として設定する
+ Log.v(TAG, " SET REFERENCE DATA ID: " + id);
+ setupper.setReferenceData(id);
+ }
}
*
*
*/
- void setReferenceData()
+ void setReferenceData(final int id)
{
Thread thread = new Thread(() -> {
- database.setReferenceIndexData(indexId);
+ database.setReferenceIndexData(id, indexId);
callback.updatedIndexData(true);
});
thread.start();
public interface IDatabaseReloadCallback
{
void dataIsReloaded(ArrayList<Long> list);
- void referenceDataIsReloaded(ArrayList<Long> list);
+ void referenceDataIsReloaded(int id, ArrayList<Long> list);
}
List<Long> getLapTimeList();
List<Long> getReferenceLapTimeList();
long getReferenceLapTime(int position);
+ void selectReferenceLapTime(int id);
void setCallback(MyTimerCounter.ICounterStatusNotify callback);
}
void addTimeStamp(long count, long lapTime, long diffTime);
void clearTimeStamp();
int getLapTimeCount();
+ int getReferenceTimerSelection();
+ void setReferenceTimerSelection(int id);
void setupReferenceData();
}
private long startTime = 0;
private long stopTime = 0;
private List<Long> elapsedTime;
- private List<Long> referenceTime = null;
+ private List<Long> referenceTimeA = null;
+ private List<Long> referenceTimeB = null;
+ private List<Long> referenceTimeC = null;
+ private int referenceTimeId = 0;
MyTimerCounter()
{
@Override
public List<Long> getReferenceLapTimeList()
{
- return (referenceTime);
+ if (referenceTimeId == 0)
+ {
+ return (referenceTimeA);
+ }
+ else if (referenceTimeId == 1)
+ {
+ return (referenceTimeB);
+ }
+ return (referenceTimeC);
}
@Override
}
@Override
- public void referenceDataIsReloaded(ArrayList<Long> timelist)
+ public void referenceDataIsReloaded(int id, ArrayList<Long> timelist)
{
try
{
- referenceTime = null;
+ int size;
if (timelist != null)
{
- referenceTime = new ArrayList<>(timelist);
+ selectReferenceLapTime(id);
+ if (referenceTimeId == 0)
+ {
+ referenceTimeA = null;
+ referenceTimeA = new ArrayList<>(timelist);
+ size = referenceTimeA.size();
+ }
+ if (referenceTimeId == 1)
+ {
+ referenceTimeB = null;
+ referenceTimeB = new ArrayList<>(timelist);
+ size = referenceTimeB.size();
+ }
+ else
+ {
+ referenceTimeC = null;
+ referenceTimeC = new ArrayList<>(timelist);
+ size = referenceTimeC.size();
+ }
if (callback != null)
{
callback.counterStatusChanged(false);
}
- Log.v(TAG, "reference lap time : " + referenceTime.size());
+ Log.v(TAG, "reference lap time : " + size);
}
}
catch (Exception e)
{
try
{
+ List<Long> referenceTime;
+ if (referenceTimeId == 0)
+ {
+ referenceTime = referenceTimeA;
+ }
+ else if (referenceTimeId == 1)
+ {
+ referenceTime = referenceTimeB;
+ }
+ else
+ {
+ referenceTime = referenceTimeC;
+ }
int location = position + 1;
if ((referenceTime == null)||(location < 1)||(referenceTime.size() < location))
{
return (0);
}
+ @Override
+ public void selectReferenceLapTime(int id)
+ {
+ referenceTimeId = id;
+ }
+
public interface ICounterStatusNotify
{
void counterStatusChanged(boolean forceStartTimer);
private final String PREF_KEY_TIMER_STARTED = "TMR_START";
private final String PREF_KEY_TIMER_INDEXID = "TMR_INDEX";
private final String PREF_KEY_DISPLAY_LAPGRAPHIC = "DISP_LAPGRPH";
+ private final String PREF_KEY_REFERENCE_TIME_SELECTION = "REF_TIME_SEL";
private SharedPreferences preferences = null;
private final ButtonClickListener clickListener = new ButtonClickListener();
}
@Override
+ public int getReferenceTimerSelection()
+ {
+ try
+ {
+ return (preferences.getInt(PREF_KEY_REFERENCE_TIME_SELECTION, 0));
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();
+ }
+ return (0);
+ }
+
+ @Override
+ public void setReferenceTimerSelection(int id)
+ {
+ try
+ {
+ SharedPreferences.Editor editor = preferences.edit();
+ editor.putInt(PREF_KEY_REFERENCE_TIME_SELECTION, id);
+ editor.apply();
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();
+ }
+ }
+
+ @Override
public void setupReferenceData()
{
try
// load reference data
try
{
+ int id = getReferenceTimerSelection();
ArrayList<Long> refList = null;
- Cursor cursor = database.getAllReferenceDetailData();
+ Cursor cursor = database.getAllReferenceDetailData(id);
if (cursor != null)
{
refList = new ArrayList<>();
refList.add(cursor.getLong(cursor.getColumnIndex(TimeEntryData.EntryData.COLUMN_NAME_TIME_ENTRY)));
}
}
- dbCallback.referenceDataIsReloaded(refList);
+ dbCallback.referenceDataIsReloaded(id, refList);
}
catch (Exception e)
{
Cursor getAllIndexData();
Cursor getAllDetailData(long indexId);
- Cursor getAllReferenceDetailData();
+ Cursor getAllReferenceDetailData(int id);
Cursor getIndexdata(long indexId);
void deleteTimeEntryData(long indexId);
- void setReferenceIndexData(long indexId);
+ void setReferenceIndexData(int id, long indexId);
void updateIndexData(long indexId, String title, int icon);
void createIndexData(String title, String memo, int icon, long startTime);
void appendTimeData(long indexId, long lapTime);
private final String TAG = toString();
private final TimeEntryDataOpenHelper dbHelper;
private final ITimeEntryDatabaseCallback callback;
- private static final int REFERENCE_ICON_ID = 2;
+ private static final int REFERENCE_ICON_ID_A = 2;
+ private static final int REFERENCE_ICON_ID_B = 1;
+ private static final int REFERENCE_ICON_ID_C = 3;
private static final int MODEL_DATA_ICON_ID = 4;
private static final int DEFAULT_ICON_ID = 0;
}
@Override
- public Cursor getAllReferenceDetailData()
+ public Cursor getAllReferenceDetailData(int id)
{
if (db == null)
{
return (null);
}
+ int iconId = getReferenceIconId(id);
String queryString = "SELECT * FROM " + TimeEntryIndex.EntryIndex.TABLE_NAME + " INNER JOIN " + TimeEntryData.EntryData.TABLE_NAME +
" ON " + TimeEntryIndex.EntryIndex.TABLE_NAME + "." + TimeEntryIndex.EntryIndex._ID + " = " + TimeEntryData.EntryData.TABLE_NAME+ "." + TimeEntryData.EntryData.COLUMN_NAME_INDEX_ID +
- " WHERE " + TimeEntryIndex.EntryIndex.TABLE_NAME+ "." + TimeEntryIndex.EntryIndex.COLUMN_NAME_ICON_ID + " = " + REFERENCE_ICON_ID +
+ " WHERE " + TimeEntryIndex.EntryIndex.TABLE_NAME+ "." + TimeEntryIndex.EntryIndex.COLUMN_NAME_ICON_ID + " = " + iconId +
" ORDER BY " + TimeEntryData.EntryData.TABLE_NAME+ "." + TimeEntryData.EntryData.COLUMN_NAME_TIME_ENTRY;
//Log.v(TAG, "Query : " + queryString);
return (db.rawQuery(queryString, null));
*
*/
@Override
- public void setReferenceIndexData(long indexId)
+ public void setReferenceIndexData(int id, long indexId)
{
try
{
+ int iconId = getReferenceIconId(id);
ContentValues clearValues = new ContentValues();
clearValues.put(TimeEntryIndex.EntryIndex.COLUMN_NAME_ICON_ID, DEFAULT_ICON_ID);
- db.update(TimeEntryIndex.EntryIndex.TABLE_NAME, clearValues, TimeEntryIndex.EntryIndex.COLUMN_NAME_ICON_ID + " = " + REFERENCE_ICON_ID, null);
+ db.update(TimeEntryIndex.EntryIndex.TABLE_NAME, clearValues, TimeEntryIndex.EntryIndex.COLUMN_NAME_ICON_ID + " = " + iconId, null);
ContentValues referenceValues = new ContentValues();
- referenceValues.put(TimeEntryIndex.EntryIndex.COLUMN_NAME_ICON_ID, REFERENCE_ICON_ID);
+ referenceValues.put(TimeEntryIndex.EntryIndex.COLUMN_NAME_ICON_ID, iconId);
db.update(TimeEntryIndex.EntryIndex.TABLE_NAME, referenceValues, _ID + " = " + indexId, null);
}
catch (Exception e)
return (rows);
}
+ private int getReferenceIconId(int id)
+ {
+ if (id == 0)
+ {
+ return (REFERENCE_ICON_ID_A);
+ } else if (id == 1)
+ {
+ return (REFERENCE_ICON_ID_B);
+ }
+ return (REFERENCE_ICON_ID_C);
+ }
/*
public boolean prepareToRead()
{
import android.app.Activity;
import android.app.AlertDialog;
import android.app.Dialog;
-//import androidx.fragment.app.DialogFragment;
-import android.app.DialogFragment;
+import androidx.fragment.app.DialogFragment;
+//import android.app.DialogFragment;
import android.content.Context;
import android.content.res.TypedArray;
import android.graphics.Color;
{
private static final int[] iconIds = {
R.drawable.ic_label_outline_black_24dp ,
- R.drawable.ic_bookmark_border_black_24dp,
- R.drawable.ic_content_paste_black_24dp,
- R.drawable.ic_lightbulb_outline_black_24dp,
+ R.drawable.ic_board_1_black_24dp,
+ R.drawable.ic_board_2_black_24dp,
+ R.drawable.ic_board_3_black_24dp,
R.drawable.ic_done_black_24dp,
R.drawable.ic_bookmark_black_24dp,
R.drawable.ic_book_black_24dp,
R.drawable.ic_baseline_hiking_24,
R.drawable.ic_baseline_self_improvement_24,
R.drawable.ic_baseline_pedal_bike_24,
+ R.drawable.ic_baseline_boy_24,
+ R.drawable.ic_baseline_android_24,
+ R.drawable.ic_baseline_downhill_skiing_24,
+ R.drawable.ic_baseline_escalator_warning_24,
+ R.drawable.ic_baseline_wc_24,
+ R.drawable.ic_baseline_skateboarding_24,
+ R.drawable.ic_baseline_snowboarding_24,
+ R.drawable.ic_baseline_snowshoeing_24,
+ R.drawable.ic_baseline_sledding_24,
+ R.drawable.ic_baseline_snowmobile_24,
+ R.drawable.ic_baseline_sports_handball_24,
+ R.drawable.ic_baseline_surfing_24,
+ R.drawable.ic_baseline_cruelty_free_24,
+ R.drawable.ic_baseline_accessibility_24,
+ R.drawable.ic_baseline_accessibility_new_24,
+ R.drawable.ic_baseline_123_24,
+ R.drawable.ic_lightbulb_outline_black_24dp,
+ R.drawable.ic_bookmark_border_black_24dp,
+ R.drawable.ic_baseline_sick_24,
};
public static int getIconResourceId(int id)
{
e.printStackTrace();
}
- return (iconIds[0]);
+ return (R.drawable.ic_label_outline_black_24dp);
}
}
--- /dev/null
+package net.osdn.gokigen.joggingtimer.utilities;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.AdapterView;
+import android.widget.ArrayAdapter;
+import android.widget.Spinner;
+import androidx.annotation.NonNull;
+import androidx.fragment.app.DialogFragment;
+
+import net.osdn.gokigen.joggingtimer.R;
+
+public class SetReferenceDialog extends DialogFragment
+{
+ private final String TAG = toString();
+ int selectedId = 0;
+ String title = "";
+ String message = "";
+ SetReferenceDialog.SetReferenceCallback callback = null;
+ Dialog myDialog = null;
+
+ public static SetReferenceDialog newInstance(String title, String message, @NonNull SetReferenceDialog.SetReferenceCallback callback)
+ {
+ SetReferenceDialog instance = new SetReferenceDialog();
+ instance.prepare(callback, title, message);
+
+ // パラメータはBundleにまとめておく
+ Bundle arguments = new Bundle();
+ arguments.putString("title", title);
+ arguments.putString("message", message);
+ instance.setArguments(arguments);
+
+ return (instance);
+ }
+
+ /**
+ *
+ *
+ */
+ private void prepare(SetReferenceDialog.SetReferenceCallback callback, String title, String message)
+ {
+ this.callback = callback;
+ this.title = title;
+ this.message = message;
+ }
+
+ /**
+ *
+ *
+ */
+ @Override
+ public @NonNull Dialog onCreateDialog(Bundle savedInstanceState)
+ {
+ String title = this.title;
+ String message = this.message;
+ if (savedInstanceState != null)
+ {
+ title = savedInstanceState.getString("title");
+ message = savedInstanceState.getString("message");
+ }
+ Activity activity = getActivity();
+ final AlertDialog.Builder alertDialog = new AlertDialog.Builder(activity);
+ LayoutInflater inflater = activity.getLayoutInflater();
+ final View alertView = inflater.inflate(R.layout.select_set_reference_dialog, null, false);
+ alertDialog.setView(alertView);
+
+ final String[] objects = activity.getResources().getStringArray(R.array.reference_selection_array);
+ final Spinner spinner = alertView.findViewById(R.id.spinner_reference_selection);
+ ArrayAdapter<String> arrayAdapter = new ArrayAdapter<>(activity, android.R.layout.simple_list_item_1, objects);
+ selectedId = 0;
+ try
+ {
+ spinner.setAdapter(arrayAdapter);
+ spinner.setOnItemSelectedListener(new AdapterView.OnItemSelectedListener() {
+ @Override
+ public void onItemSelected(AdapterView<?> parent, View view, int position, long id) {
+ Log.v(TAG, "onItemSelected : " + position + " (" + id + ")");
+ selectedId = position;
+ }
+
+ @Override
+ public void onNothingSelected(AdapterView<?> parent) {
+ Log.v(TAG, "onNothingSelected");
+ }
+ });
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();
+ }
+
+ alertDialog.setTitle(title);
+ alertDialog.setIcon(android.R.drawable.ic_dialog_alert);
+ alertDialog.setCancelable(true);
+
+ String positiveLabel = activity.getString(R.string.dialog_positive_execute);
+ String negativeLabel = activity.getString(R.string.dialog_negative_cancel);
+
+ // ボタンを設定する（実行ボタン）
+ alertDialog.setPositiveButton(positiveLabel,
+ (dialog, which) -> {
+ Log.v(TAG, "ConfirmationDialog::OK");
+ if (callback != null)
+ {
+ callback.confirmed(selectedId);
+ }
+ dialog.dismiss();
+ });
+
+ // ボタンを設定する (キャンセルボタン）
+ alertDialog.setNegativeButton(negativeLabel,
+ (dialog, which) -> dialog.cancel());
+
+ myDialog = alertDialog.create();
+ return (myDialog);
+ }
+
+ @Override
+ public void onPause()
+ {
+ super.onPause();
+ Log.v(TAG, "AlertDialog::onPause()");
+ if (myDialog != null)
+ {
+ myDialog.cancel();
+ }
+ }
+
+ // コールバックインタフェース
+ public interface SetReferenceCallback
+ {
+ void confirmed(int id); // OKを選択したとき
+ }
+}
--- /dev/null
+<vector android:height="24dp" android:tint="#000000"
+ 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="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"/>
+</vector>
--- /dev/null
+<vector android:height="24dp" android:tint="#000000"
+ 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="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"/>
+</vector>
--- /dev/null
+<vector android:height="24dp" android:tint="#000000"
+ 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="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"/>
+</vector>
--- /dev/null
+<vector android:height="24dp" android:tint="#000000"
+ 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="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"/>
+</vector>
--- /dev/null
+<vector android:height="24dp" android:tint="#000000"
+ 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="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"/>
+</vector>
--- /dev/null
+<vector android:height="24dp" android:tint="#000000"
+ 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="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"/>
+</vector>
--- /dev/null
+<vector android:height="24dp" android:tint="#000000"
+ 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="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"/>
+</vector>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="24dp"
- android:height="24dp"
- android:viewportWidth="24"
- android:viewportHeight="24"
- android:tint="?attr/colorControlNormal">
- <path
- android:fillColor="@android:color/white"
- android:pathData="M12,4m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"/>
- <path
- android:fillColor="#FF000000"
- 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"/>
+<vector android:height="24dp" android:tint="#000000"
+ 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="M12,4m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"/>
+ <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"/>
</vector>
--- /dev/null
+<vector android:height="24dp" android:tint="#000000"
+ 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.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"/>
+</vector>
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
- android:width="24dp"
- android:height="24dp"
- android:viewportWidth="24"
- android:viewportHeight="24"
- android:tint="?attr/colorControlNormal">
- <path
- android:fillColor="#FF000000"
- 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"/>
+<vector android:height="24dp" android:tint="#000000"
+ 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="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"/>
</vector>
--- /dev/null
+<vector android:height="24dp" android:tint="#000000"
+ 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="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"/>
+</vector>
--- /dev/null
+<vector android:height="24dp" android:tint="#000000"
+ 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="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"/>
+</vector>
--- /dev/null
+<vector android:height="24dp" android:tint="#000000"
+ 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.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"/>
+</vector>
--- /dev/null
+<vector android:height="24dp" android:tint="#000000"
+ 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,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"/>
+</vector>
--- /dev/null
+<vector android:height="24dp" android:tint="#000000"
+ 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="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"/>
+</vector>
--- /dev/null
+<vector android:height="24dp" android:tint="#000000"
+ 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="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"/>
+</vector>
--- /dev/null
+<vector android:height="24dp" android:tint="#000000"
+ 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.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"/>
+ <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"/>
+ <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"/>
+</vector>
--- /dev/null
+<vector android:height="24dp" android:tint="#000000"
+ 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="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"/>
+</vector>
--- /dev/null
+<vector android:height="24dp" android:tint="#000000"
+ 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="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"/>
+</vector>
--- /dev/null
+<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,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" />
+</vector>
--- /dev/null
+<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,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"/>
+</vector>
--- /dev/null
+<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,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"/>
+</vector>
--- /dev/null
+<?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>
--- /dev/null
+<?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>
<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>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>
</resources>
<string name="dialog_message_data_edit">記録情報の編集</string>
<string name="action_edit_title">記録情報の編集</string>
<string name="action_change_icon">アイコンの変更</string>
- <string name="action_set_reference">å\9fºæº\96å\80¤ã\81«設定</string>
+ <string name="action_set_reference">å\9fºæº\96å\80¤ã\82\92設定</string>
<string name="action_edited_data">更新しました</string>
<string name="action_create_model">モデルデータの作成</string>
<string name="action_share_data">データの共有</string>
<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>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>
</resources>
\ No newline at end of file
<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>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>
-</resources>
\ No newline at end of file
+ <string-array name="reference_selection_array">
+ <item>A</item>
+ <item>B</item>
+ <item>C</item>
+ </string-array>
+</resources>
--- /dev/null
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+ <color name="colorPrimary">#6200EE</color>
+ <color name="colorPrimaryDark">#3700B3</color>
+ <color name="colorAccent">#03DAC5</color>
+</resources>
<?xml version="1.0" encoding="utf-8"?>
<resources>
+ <!-- Base application theme. -->
+ <!-- parent="Theme.AppCompat.Light.NoActionBar" -->
+ <!-- parent="Theme.AppCompat.DayNight.NoActionBar" -->
+ <style name="AppTheme" parent="Theme.AppCompat.NoActionBar">
+ <item name="colorPrimary">@color/colorPrimary</item>
+ <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+ <item name="colorAccent">@color/colorAccent</item>
+ </style>
<style name="wear2_dialog_theme" parent="android:Theme.Holo.Dialog" />
</resources>
OSDN Git Service
