From: MRSa Date: Sun, 22 Apr 2018 12:50:20 +0000 (+0900) Subject: roundおよびchinの表示レイアウトを見直した。 X-Git-Url: http://git.osdn.net/view?p=gokigen%2FJoggingTimer.git;a=commitdiff_plain;h=04110a3f45f6b07779e915c8221921aeb84445e0 roundおよびchinの表示レイアウトを見直した。 --- diff --git a/mobile/build.gradle b/mobile/build.gradle index bb0e444..582fb83 100644 --- a/mobile/build.gradle +++ b/mobile/build.gradle @@ -7,8 +7,8 @@ android { applicationId "net.osdn.gokigen.joggingtimer" minSdkVersion 14 // 14 targetSdkVersion 27 - versionCode 100002 - versionName "1.0.0" + versionCode 100012 + versionName "1.0.1" } buildTypes { release { diff --git a/wear/build.gradle b/wear/build.gradle index cb786c0..2a30286 100644 --- a/wear/build.gradle +++ b/wear/build.gradle @@ -7,8 +7,8 @@ android { applicationId "net.osdn.gokigen.joggingtimer" minSdkVersion 23 targetSdkVersion 27 - versionCode 100001 - versionName "1.0.0" + versionCode 100011 + versionName "1.0.1" } buildTypes { release { diff --git a/wear/src/main/java/net/osdn/gokigen/joggingtimer/recorddetail/DetailActivity.java b/wear/src/main/java/net/osdn/gokigen/joggingtimer/recorddetail/DetailActivity.java index e732a59..c5adcec 100644 --- a/wear/src/main/java/net/osdn/gokigen/joggingtimer/recorddetail/DetailActivity.java +++ b/wear/src/main/java/net/osdn/gokigen/joggingtimer/recorddetail/DetailActivity.java @@ -56,7 +56,8 @@ public class DetailActivity extends WearableActivity implements RecordDetailSetu detailAdapter = new RecordDetailAdapter(); WearableLinearLayoutManager layoutManager = new WearableLinearLayoutManager(this); - view.setCircularScrollingGestureEnabled(getResources().getConfiguration().isScreenRound()); + //view.setCircularScrollingGestureEnabled(getResources().getConfiguration().isScreenRound()); + view.setCircularScrollingGestureEnabled(false); DividerItemDecoration dividerDecoration = new DividerItemDecoration(view.getContext(), layoutManager.getOrientation()); diff --git a/wear/src/main/java/net/osdn/gokigen/joggingtimer/recordlist/ListActivity.java b/wear/src/main/java/net/osdn/gokigen/joggingtimer/recordlist/ListActivity.java index 0b9fdc8..ace7404 100644 --- a/wear/src/main/java/net/osdn/gokigen/joggingtimer/recordlist/ListActivity.java +++ b/wear/src/main/java/net/osdn/gokigen/joggingtimer/recordlist/ListActivity.java @@ -55,7 +55,8 @@ public class ListActivity extends WearableActivity implements IDetailLauncher, R summaryAdapter = new RecordSummaryAdapter(); WearableLinearLayoutManager layoutManager = new WearableLinearLayoutManager(this); - view.setCircularScrollingGestureEnabled(getResources().getConfiguration().isScreenRound()); + //view.setCircularScrollingGestureEnabled(getResources().getConfiguration().isScreenRound()); + view.setCircularScrollingGestureEnabled(false); DividerItemDecoration dividerDecoration = new DividerItemDecoration(view.getContext(), layoutManager.getOrientation()); diff --git a/wear/src/main/java/net/osdn/gokigen/joggingtimer/utilities/ConfirmationDialog.java b/wear/src/main/java/net/osdn/gokigen/joggingtimer/utilities/ConfirmationDialog.java index d4a2a03..4bb2012 100644 --- a/wear/src/main/java/net/osdn/gokigen/joggingtimer/utilities/ConfirmationDialog.java +++ b/wear/src/main/java/net/osdn/gokigen/joggingtimer/utilities/ConfirmationDialog.java @@ -8,6 +8,7 @@ import android.content.DialogInterface; import android.os.Bundle; import android.support.annotation.NonNull; import android.util.Log; +import android.view.ContextThemeWrapper; import net.osdn.gokigen.joggingtimer.R; @@ -64,7 +65,9 @@ public class ConfirmationDialog extends DialogFragment message = savedInstanceState.getString("message"); } Context context = getContext(); + //AlertDialog.Builder alertDialog = new AlertDialog.Builder(new ContextThemeWrapper(context, R.style.wear2_dialog_theme)); AlertDialog.Builder alertDialog = new AlertDialog.Builder(context); + alertDialog.setTitle(title); alertDialog.setIcon(android.R.drawable.ic_dialog_alert); alertDialog.setMessage(message); diff --git a/wear/src/main/java/net/osdn/gokigen/joggingtimer/utilities/CreateModelDataDialog.java b/wear/src/main/java/net/osdn/gokigen/joggingtimer/utilities/CreateModelDataDialog.java index 7703a10..76efbaf 100644 --- a/wear/src/main/java/net/osdn/gokigen/joggingtimer/utilities/CreateModelDataDialog.java +++ b/wear/src/main/java/net/osdn/gokigen/joggingtimer/utilities/CreateModelDataDialog.java @@ -75,7 +75,8 @@ public class CreateModelDataDialog extends DialogFragment Activity activity = getActivity(); // 確認ダイアログの生成 - final AlertDialog.Builder alertDialog = new AlertDialog.Builder(new ContextThemeWrapper(activity, R.style.wear2_dialog_theme)); + //final AlertDialog.Builder alertDialog = new AlertDialog.Builder(new ContextThemeWrapper(activity, R.style.wear2_dialog_theme)); + final AlertDialog.Builder alertDialog = new AlertDialog.Builder(activity); // Get the layout inflater LayoutInflater inflater = activity.getLayoutInflater(); diff --git a/wear/src/main/java/net/osdn/gokigen/joggingtimer/utilities/DataEditDialog.java b/wear/src/main/java/net/osdn/gokigen/joggingtimer/utilities/DataEditDialog.java index 8f84baf..abc8165 100644 --- a/wear/src/main/java/net/osdn/gokigen/joggingtimer/utilities/DataEditDialog.java +++ b/wear/src/main/java/net/osdn/gokigen/joggingtimer/utilities/DataEditDialog.java @@ -7,15 +7,20 @@ import android.app.DialogFragment; import android.content.Context; import android.content.DialogInterface; import android.content.res.TypedArray; +import android.graphics.Color; +import android.graphics.drawable.Drawable; +import android.os.Build; import android.os.Bundle; import android.support.annotation.NonNull; import android.util.Log; +import android.view.ContextThemeWrapper; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; import android.widget.AdapterView; import android.widget.ArrayAdapter; import android.widget.EditText; +import android.widget.LinearLayout; import android.widget.Spinner; import android.widget.TextView; @@ -73,8 +78,10 @@ public class DataEditDialog extends DialogFragment Activity activity = getActivity(); // 確認ダイアログの生成 + //final AlertDialog.Builder alertDialog = new AlertDialog.Builder(new ContextThemeWrapper(activity, R.style.wear2_dialog_theme)); final AlertDialog.Builder alertDialog = new AlertDialog.Builder(activity); + // Get the layout inflater LayoutInflater inflater = activity.getLayoutInflater(); final View alertView = inflater.inflate(R.layout.information_dialog, null, false); @@ -83,6 +90,13 @@ public class DataEditDialog extends DialogFragment final String[] objects = activity.getResources().getStringArray(R.array.icon_selection_id); final Spinner spinner = alertView.findViewById(R.id.spinner_selection); final EditText titleText = alertView.findViewById(R.id.edit_title); + + // もー苦肉の策だ。。。 + if (Build.VERSION.SDK_INT <= android.os.Build.VERSION_CODES.M) + { + titleText.setTextColor(Color.BLACK); + } + try { titleText.setText(title); diff --git a/wear/src/main/res/layout-round/activity_detail.xml b/wear/src/main/res/layout-round/activity_detail.xml index ddeae9b..2a26b31 100644 --- a/wear/src/main/res/layout-round/activity_detail.xml +++ b/wear/src/main/res/layout-round/activity_detail.xml @@ -32,6 +32,12 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:scrollbars="vertical" + android:clipChildren="true" + android:clipToPadding="true" + android:paddingTop="@dimen/list_top_padding" + android:paddingBottom="@dimen/list_bottom_padding" + android:paddingStart="@dimen/list_start_padding" + android:paddingEnd="@dimen/list_end_padding" > diff --git a/wear/src/main/res/layout-round/activity_list.xml b/wear/src/main/res/layout-round/activity_list.xml index c170c2d..d8dc136 100644 --- a/wear/src/main/res/layout-round/activity_list.xml +++ b/wear/src/main/res/layout-round/activity_list.xml @@ -7,10 +7,12 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:background="@color/black" + android:layoutMode="clipBounds" tools:context="net.osdn.gokigen.joggingtimer.recordlist.ListActivity"> - - + diff --git a/wear/src/main/res/layout-round/information_dialog.xml b/wear/src/main/res/layout-round/information_dialog.xml index 7b8532d..6276a48 100644 --- a/wear/src/main/res/layout-round/information_dialog.xml +++ b/wear/src/main/res/layout-round/information_dialog.xml @@ -1,23 +1,27 @@ - + android:paddingStart="@dimen/list_start_padding" + android:paddingEnd="@dimen/list_end_padding" + android:background="@color/white" +> + android:layout_height="wrap_content" + > - - + diff --git a/wear/src/main/res/layout-round/time_model_picker.xml b/wear/src/main/res/layout-round/time_model_picker.xml index bb0d8bb..fa98f8c 100644 --- a/wear/src/main/res/layout-round/time_model_picker.xml +++ b/wear/src/main/res/layout-round/time_model_picker.xml @@ -43,7 +43,7 @@ android:id="@+id/number_picker_lap_count" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_weight="4" + android:layout_weight="2" /> - - 0dp - + 0dp 1dp + 12dp + 8dp + 6dp + 6dp + 6dp + 6dp + 6dp + 40dp + 40dp diff --git a/wear/src/main/res/values/dimens.xml b/wear/src/main/res/values/dimens.xml index 5145574..cbcb635 100644 --- a/wear/src/main/res/values/dimens.xml +++ b/wear/src/main/res/values/dimens.xml @@ -12,4 +12,14 @@ inner_frame_layout_padding (below variable) on round screens. --> 0dp + 0dp + 0dp + 0dp + 0dp + 0dp + + 0dp + 0dp + 0dp + 0dp