ラップタイムリストをスクロールできるようにする。

diff --git a/wear/src/main/java/net/osdn/gokigen/joggingtimer/stopwatch/ButtonClickListener.java b/wear/src/main/java/net/osdn/gokigen/joggingtimer/stopwatch/ButtonClickListener.java
index 93f7bcb..40ce50c 100644 (file)
--- a/wear/src/main/java/net/osdn/gokigen/joggingtimer/stopwatch/ButtonClickListener.java
+++ b/wear/src/main/java/net/osdn/gokigen/joggingtimer/stopwatch/ButtonClickListener.java
@@ -6,6 +6,8 @@ import android.util.Log;
 import android.view.MotionEvent;
 import android.view.View;
 
+import androidx.annotation.NonNull;
+
 import net.osdn.gokigen.joggingtimer.R;
 
 /**
@@ -30,6 +32,7 @@ public class  ButtonClickListener implements View.OnClickListener, View.OnLongCl
     @Override
     public void onClick(View v)
     {
+        //Log.v(TAG, "onClick()");
         int id = v.getId();
         if (callback != null)
         {
@@ -96,19 +99,16 @@ public class  ButtonClickListener implements View.OnClickListener, View.OnLongCl
     }
 
     @Override
-    public void writeToParcel(Parcel dest, int flags)
+    public void writeToParcel(@NonNull Parcel dest, int flags)
     {
         Log.v(TAG, "writeToParcel() ");
     }
-    public static final Parcelable.Creator<ButtonClickListener> CREATOR = new Parcelable.Creator<ButtonClickListener>()
-    {
-        public ButtonClickListener createFromParcel(Parcel in)
-        {
+    public static final Parcelable.Creator<ButtonClickListener> CREATOR = new Parcelable.Creator<>() {
+        public ButtonClickListener createFromParcel(Parcel in) {
             return (new ButtonClickListener(in));
         }
 
-        public ButtonClickListener[] newArray(int size)
-        {
+        public ButtonClickListener[] newArray(int size) {
             return (new ButtonClickListener[size]);
         }
     };
@@ -134,6 +134,12 @@ public class  ButtonClickListener implements View.OnClickListener, View.OnLongCl
             Log.v(TAG, "onTouch()");
             return (v.performClick());
         }
+        if (id == R.id.laptime_list_area)
+        {
+            Log.v(TAG, "onTouch() : List Area");
+            return (v.performClick());
+        }
+
         return (false);
     }
 }

diff --git a/wear/src/main/java/net/osdn/gokigen/joggingtimer/stopwatch/MainActivity.kt b/wear/src/main/java/net/osdn/gokigen/joggingtimer/stopwatch/MainActivity.kt
index 054acca..dc0e35d 100644 (file)
--- a/wear/src/main/java/net/osdn/gokigen/joggingtimer/stopwatch/MainActivity.kt
+++ b/wear/src/main/java/net/osdn/gokigen/joggingtimer/stopwatch/MainActivity.kt
@@ -82,15 +82,6 @@ class MainActivity : AppCompatActivity(), IClickCallback, ITimeoutReceiver, ICou
 
     }
 
-    override fun onNewIntent(intent: Intent?)
-    {
-        super.onNewIntent(intent)
-        Log.v(TAG, "onNewIntent")
-        runOnUiThread {
-            Toast.makeText(this, "onNewIntent" + title, Toast.LENGTH_SHORT).show()
-        }
-    }
-
     private fun importReceivedIntent()
     {
         try

diff --git a/wear/src/main/java/net/osdn/gokigen/joggingtimer/stopwatch/WearableActivityController.java b/wear/src/main/java/net/osdn/gokigen/joggingtimer/stopwatch/WearableActivityController.java
index a918566..a986bad 100644 (file)
--- a/wear/src/main/java/net/osdn/gokigen/joggingtimer/stopwatch/WearableActivityController.java
+++ b/wear/src/main/java/net/osdn/gokigen/joggingtimer/stopwatch/WearableActivityController.java
@@ -6,7 +6,6 @@ import android.content.SharedPreferences;
 import android.content.pm.PackageManager;
 import android.database.Cursor;
 import android.os.Vibrator;
-import android.preference.PreferenceManager;
 import android.util.Log;
 import android.widget.ImageButton;
 import android.widget.ListView;
@@ -32,6 +31,7 @@ import static net.osdn.gokigen.joggingtimer.utilities.SelectReferenceViewModeDia
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.core.app.ActivityCompat;
 import androidx.core.content.ContextCompat;
+import androidx.preference.PreferenceManager;
 
 /**
  *
@@ -99,7 +99,7 @@ class WearableActivityController implements IWearableActivityControl, ITimeEntry
         // バイブレータをつかまえる
         vibrator = (Vibrator) activity.getSystemService(VIBRATOR_SERVICE);
 
-        //// パワーマネージャをつかまえる
+        // パワーマネージャをつかまえる
         //powerManager = (PowerManager) activity.getSystemService(POWER_SERVICE);
     }
 
@@ -178,11 +178,13 @@ class WearableActivityController implements IWearableActivityControl, ITimeEntry
             ListView lap = activity.findViewById(R.id.laptime_list_area);
             //lap.setOnClickListener(clickListener);
             lap.setOnLongClickListener(clickListener);
+            //lap.setOnTouchListener(clickListener);
 
             LapTimeGraphView graphView = activity.findViewById(R.id.graph_area);
             graphView.setOnTouchListener(clickListener);
             graphView.setOnClickListener(clickListener);
             graphView.setOnLongClickListener(clickListener);
+
         }
         catch (Exception e)
         {
@@ -295,7 +297,6 @@ class WearableActivityController implements IWearableActivityControl, ITimeEntry
         }
     }
 
-
     @Override
     public void addTimeStamp(long count, long lapTime, long diffTime)
     {
@@ -476,7 +477,6 @@ class WearableActivityController implements IWearableActivityControl, ITimeEntry
         }
     }
 
-
     @Override
     public void createIndex(final String title, final long startTime)
     {

diff --git a/wear/src/main/res/layout/activity_main.xml b/wear/src/main/res/layout/activity_main.xml
index 80f237b..9696a09 100644 (file)
--- a/wear/src/main/res/layout/activity_main.xml
+++ b/wear/src/main/res/layout/activity_main.xml
@@ -81,6 +81,7 @@
             android:layout_marginStart="@dimen/indicator_layout_margin"
             android:layout_marginEnd="@dimen/indicator_layout_margin"
             app:layout_constraintDimensionRatio="h,10:3"
+            android:nestedScrollingEnabled = "true"
             android:background="@color/background_color"
             app:layout_constraintTop_toBottomOf="@id/sub_counter1"
             android:transcriptMode="alwaysScroll"

diff --git a/wear/src/main/res/layout/column_laptime.xml b/wear/src/main/res/layout/column_laptime.xml
index 3dd302b..65a9ccb 100644 (file)
--- a/wear/src/main/res/layout/column_laptime.xml
+++ b/wear/src/main/res/layout/column_laptime.xml
@@ -6,14 +6,14 @@
     android:id="@+id/laptime_item"
     android:clipChildren="true"
     android:clipToPadding="true"
-    android:paddingTop="@dimen/header_top_padding"
-    android:paddingBottom="@dimen/header_bottom_padding"
+    android:paddingTop="@dimen/lap_top_padding"
+    android:paddingBottom="@dimen/lap_bottom_padding"
     >
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textStyle="normal"
-        android:textSize="9pt"
+        android:textSize="15sp"
         android:clickable="true"
         android:focusable="true"
         android:tag="lap1"
@@ -24,22 +24,22 @@
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textSize="9pt"
+        android:textSize="15sp"
         android:clickable="true"
         android:focusable="true"
         android:tag="lap2"
-        android:id="@+id/labal_lap2"
+        android:id="@+id/label_lap2"
         android:gravity="center_horizontal|center_vertical"
         android:layout_weight="5"
         />
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textSize="9pt"
+        android:textSize="15sp"
         android:clickable="true"
         android:focusable="true"
         android:tag="lap3"
-        android:id="@+id/labal_lap3"
+        android:id="@+id/label_lap3"
         android:layout_weight="4"
         android:gravity="center_horizontal|center_vertical"
         />

diff --git a/wear/src/main/res/values-round-xhdpi/dimens.xml b/wear/src/main/res/values-round-xhdpi/dimens.xml
index 4282f48..f1cf390 100644 (file)
--- a/wear/src/main/res/values-round-xhdpi/dimens.xml
+++ b/wear/src/main/res/values-round-xhdpi/dimens.xml
@@ -6,6 +6,8 @@
     <dimen name="icon_list_padding">12dp</dimen>
     <dimen name="header_top_padding">8dp</dimen>
     <dimen name="header_bottom_padding">6dp</dimen>
+    <dimen name="lap_top_padding">0dp</dimen>
+    <dimen name="lap_bottom_padding">0dp</dimen>
     <dimen name="header_start_padding">8dp</dimen>
     <dimen name="header_end_padding">6dp</dimen>
     <dimen name="detail_top_padding">8dp</dimen>

diff --git a/wear/src/main/res/values-round/dimens.xml b/wear/src/main/res/values-round/dimens.xml
index 5c37deb..c4c22b3 100644 (file)
--- a/wear/src/main/res/values-round/dimens.xml
+++ b/wear/src/main/res/values-round/dimens.xml
@@ -6,6 +6,8 @@
     <dimen name="icon_list_padding">12dp</dimen>
     <dimen name="header_top_padding">8dp</dimen>
     <dimen name="header_bottom_padding">6dp</dimen>
+    <dimen name="lap_top_padding">0dp</dimen>
+    <dimen name="lap_bottom_padding">0dp</dimen>
     <dimen name="header_start_padding">6dp</dimen>
     <dimen name="header_end_padding">6dp</dimen>
     <dimen name="detail_top_padding">8dp</dimen>

diff --git a/wear/src/main/res/values/dimens.xml b/wear/src/main/res/values/dimens.xml
index df8dd39..c352de0 100644 (file)
--- a/wear/src/main/res/values/dimens.xml
+++ b/wear/src/main/res/values/dimens.xml
@@ -18,6 +18,9 @@
     <dimen name="header_top_padding">0dp</dimen>
     <dimen name="header_bottom_padding">0dp</dimen>
 
+    <dimen name="lap_top_padding">0dp</dimen>
+    <dimen name="lap_bottom_padding">0dp</dimen>
+
     <dimen name="detail_top_padding">0dp</dimen>
     <dimen name="detail_bottom_padding">0dp</dimen>
     <dimen name="recordlist_top_padding">0dp</dimen>