case R.id.menu_edit_title:
// タイトルの編集
DataEditDialog dialog = new DataEditDialog(this);
- dialog.show(R.drawable.ic_android_black_24dp, "", this);
+ String title = "";
+ int iconId = R.drawable.ic_android_black_24dp;
+ RecordDetailSetup.EditIndexData data = setupper.getEditIndexData();
+ if (data != null)
+ {
+ iconId = data.getIcon();
+ title = data.getTitle();
+ }
+ dialog.show(iconId, title, this);
ret = true;
break;
{
Log.v(TAG, "iconId : " + iconId + " title : '"+ title +"'");
try {
- setupper.setIndexData(title, iconId);
+ setupper.setEditIndexData(title, iconId);
WearableRecyclerView view = findViewById(R.id.recycler_detail_view);
view.postInvalidate();
}
package net.osdn.gokigen.joggingtimer.recorddetail;
-import net.osdn.gokigen.joggingtimer.utilities.CreateModelData;
-
public interface IDetailEditor
{
void editDetailData(long indexId, long dataId, int count, long defaultMillis);
import net.osdn.gokigen.joggingtimer.storage.ITimeEntryDatabaseCallback;
import net.osdn.gokigen.joggingtimer.storage.TimeEntryDatabaseFactory;
import net.osdn.gokigen.joggingtimer.storage.contract.TimeEntryData;
+import net.osdn.gokigen.joggingtimer.storage.contract.TimeEntryIndex;
import net.osdn.gokigen.joggingtimer.utilities.CreateModelData;
import net.osdn.gokigen.joggingtimer.utilities.CreateModelDataDialog;
import net.osdn.gokigen.joggingtimer.utilities.TimeStringConvert;
*
*
*/
- void setIndexData(final String title, final int icon)
+ void setEditIndexData(@NonNull final String title, final int icon)
{
+ final EditIndexData data = new EditIndexData(title, icon);
Thread thread = new Thread(new Runnable() {
@Override
public void run() {
- database.updateIndexData(indexId, title, icon);
+ database.updateIndexData(indexId, data.getTitle(), data.getIcon());
callback.updatedIndexData(false);
}
});
*
*
*/
+ EditIndexData getEditIndexData()
+ {
+ String title = "";
+ int iconId = R.drawable.ic_android_black_24dp;
+ try
+ {
+ Cursor cursor = database.getIndexdata(indexId);
+ while (cursor.moveToNext())
+ {
+ title = cursor.getString(cursor.getColumnIndex(TimeEntryIndex.EntryIndex.COLUMN_NAME_TITLE));
+ iconId = cursor.getInt(cursor.getColumnIndex(TimeEntryIndex.EntryIndex.COLUMN_NAME_ICON_ID));
+ }
+ return (new EditIndexData(title, iconId));
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();
+ }
+ return (null);
+ }
+
+ /**
+ *
+ *
+ */
void setReferenceData()
{
Thread thread = new Thread(new Runnable() {
}
}
+ class EditIndexData
+ {
+ final String title;
+ final int icon;
+
+ EditIndexData(String title, int icon)
+ {
+ this.title = title;
+ this.icon = icon;
+ }
+
+ String getTitle()
+ {
+ return (title);
+ }
+
+ int getIcon()
+ {
+ return (icon);
+ }
+ }
+
+
/**
*
*/
private final long dataId;
private final IDetailLauncher launcher;
private int positionId = -1;
- private int iconId = 0;
- private String title = "";
- private String detail = "";
+ private int iconId;
+ private String title;
+ private String detail;
/**
*
class RecordHolder extends RecyclerView.ViewHolder
{
private final View itemView;
- private ImageView iconView = null;
- private TextView mainText = null;
- private TextView subText = null;
+ private ImageView iconView;
+ private TextView mainText;
+ private TextView subText;
RecordHolder(View itemView)
{
*/
public class LapTimeItems
{
- private String lapCount = "";
- private String mainText = "";
- private String subText = "";
+ private String lapCount;
+ private String mainText;
+ private String subText;
public LapTimeItems(long lapCount, long mainText, long subText)
{
this.lapCount = String.format(Locale.US,"%02d", lapCount);
this.mainText = TimeStringConvert.getTimeString(mainText).toString();
- if (subText != 0)
- {
- this.subText = TimeStringConvert.getDiffTimeString(subText).toString();
- }
+ this.subText = (subText != 0) ? this.subText = TimeStringConvert.getDiffTimeString(subText).toString() : "";
}
String getLapCount()
import android.content.Context;
import android.content.DialogInterface;
import android.content.res.TypedArray;
+import android.graphics.Color;
import android.support.annotation.NonNull;
import android.support.wearable.activity.WearableActivity;
import android.util.Log;
android:orientation="horizontal"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
- android:padding="18dp"
+ android:padding="8dp"
android:background="@color/white"
>
<TextView android:id="@+id/selection_icon"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:contentDescription="@string/blank"
+ android:drawableTint="@color/black"
+ android:foregroundTint="@color/black"
android:drawableEnd="@drawable/ic_build_black_24dp"
android:layout_marginEnd="4dp"
/>
<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/info_edit_data"
- android:orientation="horizontal"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- android:padding="5dp"
- >
- <Spinner
- android:id="@+id/spinner_selection"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:text="@string/blank"
- android:visibility="visible" />
+<android.support.wear.widget.drawer.WearableDrawerLayout
+ 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:background="@color/white">
+ <ScrollView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
- <EditText android:id="@+id/edit_title"
- android:layout_width="wrap_content"
- android:layout_height="fill_parent"
- android:autoLink="all"
- android:linksClickable="true"
- android:inputType="text"
- android:hint="@string/dialog_title_hint"
- android:textColor="#FFF"
- android:layout_weight="5"
- />
+ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/info_edit_data"
+ android:orientation="vertical"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:padding="6dp"
+ >
- <TextView android:id="@+id/info_message"
- android:layout_width="wrap_content"
- android:layout_height="fill_parent"
- android:autoLink="all"
- android:linksClickable="false"
- android:textColor="#FFF"
- android:visibility="gone"
- />
- <ImageView android:id="@+id/current_icon"
- android:layout_width="wrap_content"
- android:layout_height="fill_parent"
- android:contentDescription="@string/blank"
- android:layout_marginEnd="10dp"
- android:visibility="gone"
- />
-</LinearLayout>
+ <Spinner
+ android:id="@+id/spinner_selection"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/blank"
+ android:background="@color/white"
+ android:foregroundTint="@color/black"
+ android:visibility="visible" />
+
+ <EditText android:id="@+id/edit_title"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:autoLink="all"
+ android:linksClickable="true"
+ android:inputType="text"
+ android:hint="@string/dialog_title_hint"
+ android:textColor="#000"
+ />
+ </LinearLayout>
+ </ScrollView>
+</android.support.wear.widget.drawer.WearableDrawerLayout>
android:orientation="horizontal"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
- android:padding="18dp"
+ android:padding="12dp"
android:background="@color/white"
>
<TextView android:id="@+id/selection_icon"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:contentDescription="@string/blank"
+ android:drawableTint="@color/black"
+ android:foregroundTint="@color/black"
android:drawableEnd="@drawable/ic_build_black_24dp"
- android:layout_marginEnd="4dp"
+ android:layout_marginEnd="12dp"
/>
</LinearLayout>
<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:id="@+id/info_edit_data"
- android:orientation="horizontal"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- android:padding="5dp"
- >
+<android.support.wear.widget.drawer.WearableDrawerLayout
+ 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:background="@color/white">
+ <ScrollView
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content">
- <Spinner
- android:id="@+id/spinner_selection"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:text="@string/blank"
- android:visibility="visible" />
+ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:id="@+id/info_edit_data"
+ android:orientation="vertical"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:padding="6dp"
+ >
- <EditText
- android:id="@+id/edit_title"
- android:layout_width="wrap_content"
- android:layout_height="fill_parent"
- android:layout_weight="5"
- android:autoLink="all"
- android:hint="@string/dialog_title_hint"
- android:inputType="text"
- android:linksClickable="true"
- android:textColor="#FFF" />
+ <Spinner
+ android:id="@+id/spinner_selection"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/blank"
+ android:background="@color/white"
+ android:foregroundTint="@color/black"
+ android:visibility="visible" />
- <TextView android:id="@+id/info_message"
- android:layout_width="wrap_content"
- android:layout_height="fill_parent"
- android:autoLink="all"
- android:linksClickable="false"
- android:textColor="#FFF"
- android:visibility="gone"
- />
-
- <ImageView android:id="@+id/current_icon"
- android:layout_width="wrap_content"
- android:layout_height="fill_parent"
- android:contentDescription="@string/blank"
- android:layout_marginEnd="10dp"
- android:visibility="gone"
- />
-</LinearLayout>
+ <EditText android:id="@+id/edit_title"
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:autoLink="all"
+ android:linksClickable="true"
+ android:inputType="text"
+ android:hint="@string/dialog_title_hint"
+ android:textColor="#000"
+ />
+ </LinearLayout>
+ </ScrollView>
+</android.support.wear.widget.drawer.WearableDrawerLayout>