ラップタイム一覧が見えない不具合を修正。

diff --git a/wear/src/main/java/net/osdn/gokigen/joggingtimer/stopwatch/MainActivity.java b/wear/src/main/java/net/osdn/gokigen/joggingtimer/stopwatch/MainActivity.java
index e6e0602..b9925c0 100644 (file)
--- a/wear/src/main/java/net/osdn/gokigen/joggingtimer/stopwatch/MainActivity.java
+++ b/wear/src/main/java/net/osdn/gokigen/joggingtimer/stopwatch/MainActivity.java
@@ -8,7 +8,9 @@ import android.support.wearable.activity.WearableActivity;
 import android.util.Log;
 import android.view.KeyEvent;
 import android.view.View;
+import android.widget.ArrayAdapter;
 import android.widget.ImageButton;
+import android.widget.ListAdapter;
 import android.widget.ListView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
@@ -16,6 +18,7 @@ import android.widget.TextView;
 import net.osdn.gokigen.joggingtimer.R;
 import net.osdn.gokigen.joggingtimer.recordlist.ListActivity;
 import net.osdn.gokigen.joggingtimer.stopwatch.graphview.LapTimeGraphView;
+import net.osdn.gokigen.joggingtimer.stopwatch.listview.LapTimeItems;
 import net.osdn.gokigen.joggingtimer.utilities.TimeStringConvert;
 
 import java.text.SimpleDateFormat;

diff --git a/wear/src/main/java/net/osdn/gokigen/joggingtimer/stopwatch/listview/LapTimeArrayAdapter.java b/wear/src/main/java/net/osdn/gokigen/joggingtimer/stopwatch/listview/LapTimeArrayAdapter.java
index b1312df..4abb978 100644 (file)
--- a/wear/src/main/java/net/osdn/gokigen/joggingtimer/stopwatch/listview/LapTimeArrayAdapter.java
+++ b/wear/src/main/java/net/osdn/gokigen/joggingtimer/stopwatch/listview/LapTimeArrayAdapter.java
@@ -1,6 +1,7 @@
 package net.osdn.gokigen.joggingtimer.stopwatch.listview;
 
 import android.content.Context;
+import android.graphics.Color;
 import android.support.annotation.NonNull;
 import android.view.LayoutInflater;
 import android.view.View;
@@ -13,7 +14,7 @@ import android.widget.TextView;
  */
 public class LapTimeArrayAdapter  extends ArrayAdapter<LapTimeItems> implements ILapTimeHolder
 {
-    private LayoutInflater inflater = null;
+    private LayoutInflater inflater;
     private final int resourceId;
 
     /**
@@ -47,13 +48,17 @@ public class LapTimeArrayAdapter  extends ArrayAdapter<LapTimeItems> implements
             if (item != null)
             {
                 TextView lap1View = view.findViewWithTag("lap1");
+                lap1View.setTextColor(Color.WHITE);
                 lap1View.setText(item.getLapCount());
 
                 TextView lap2View = view.findViewWithTag("lap2");
+                lap2View.setTextColor(Color.WHITE);
                 lap2View.setText(item.getMainText());
 
                 TextView lap3View = view.findViewWithTag("lap3");
+                lap3View.setTextColor(Color.WHITE);
                 lap3View.setText(item.getSubText());
+                //Log.v("LAP TIME", "" + item.getLapCount() + " " + item.getMainText());
             }
         }
         catch (Exception e)

diff --git a/wear/src/main/res/layout-notround/activity_main.xml b/wear/src/main/res/layout-notround/activity_main.xml
index 39a70be..8177a8a 100644 (file)
--- a/wear/src/main/res/layout-notround/activity_main.xml
+++ b/wear/src/main/res/layout-notround/activity_main.xml
@@ -117,88 +117,5 @@
             android:transcriptMode="alwaysScroll"
             android:visibility="visible"
             />
-<!--
-        <ScrollView
-            android:id="@+id/scroll_area"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/sub_counter1"
-            android:layout_above="@id/btn1">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@color/black"
-                android:id="@+id/lap_time_area"
-                android:orientation="vertical"
-                android:scrollbarAlwaysDrawVerticalTrack="true">
-
-                <TextView
-                    android:id="@+id/sub_counter2"
-                    android:textColor="@color/white"
-                    android:background="@color/black"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:textAlignment="textStart"
-                    android:clickable="true"
-                    android:focusable="true"
-                    android:textSize="9pt"
-                    android:visibility="visible"
-                    android:text="@string/blank" />
-
-                <TextView
-                    android:id="@+id/sub_counter3"
-                    android:textColor="@color/white"
-                    android:background="@color/black"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:textAlignment="textStart"
-                    android:clickable="true"
-                    android:focusable="true"
-                    android:textSize="9pt"
-                    android:visibility="visible"
-                    android:text="@string/blank" />
-
-                <TextView
-                    android:id="@+id/sub_counter4"
-                    android:textColor="@color/white"
-                    android:background="@color/black"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:textAlignment="textStart"
-                    android:clickable="true"
-                    android:focusable="true"
-                    android:textSize="9pt"
-                    android:visibility="visible"
-                    android:text="@string/blank" />
-
-                <TextView
-                    android:id="@+id/sub_counter5"
-                    android:textColor="@color/white"
-                    android:background="@color/black"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:textAlignment="textStart"
-                    android:clickable="true"
-                    android:focusable="true"
-                    android:textSize="9pt"
-                    android:visibility="visible"
-                    android:text="@string/blank" />
-
-                <TextView
-                    android:id="@+id/sub_counter6"
-                    android:textColor="@color/white"
-                    android:background="@color/black"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:textAlignment="textStart"
-                    android:clickable="true"
-                    android:focusable="true"
-                    android:textSize="9pt"
-                    android:visibility="visible"
-                    android:text="@string/blank" />
-            </LinearLayout>
-        </ScrollView>
--->
     </RelativeLayout>
 </android.support.wear.widget.BoxInsetLayout>

diff --git a/wear/src/main/res/layout-round/activity_main.xml b/wear/src/main/res/layout-round/activity_main.xml
index 4532067..fb1ecfb 100644 (file)
--- a/wear/src/main/res/layout-round/activity_main.xml
+++ b/wear/src/main/res/layout-round/activity_main.xml
@@ -114,90 +114,6 @@
             android:transcriptMode="alwaysScroll"
             android:visibility="visible"
             />
-<!--
-        <ScrollView
-            android:id="@+id/scroll_area"
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_below="@id/sub_counter1"
-            android:layout_above="@id/btn1">
-
-            <LinearLayout
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@color/black"
-                android:id="@+id/lap_time_area"
-                android:orientation="vertical"
-                android:scrollbarAlwaysDrawVerticalTrack="true">
-
-                <TextView
-                    android:id="@+id/sub_counter2"
-                    android:background="@color/black"
-                    android:textColor="@color/white"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:textAlignment="textStart"
-                    android:textSize="7pt"
-                    android:clickable="true"
-                    android:focusable="true"
-                    android:visibility="visible"
-                    android:text="@string/blank" />
-
-                <TextView
-                    android:id="@+id/sub_counter3"
-                    android:background="@color/black"
-                    android:textColor="@color/white"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:textAlignment="textStart"
-                    android:textSize="7pt"
-                    android:clickable="true"
-                    android:focusable="true"
-                    android:visibility="visible"
-                    android:text="@string/blank" />
-
-                <TextView
-                    android:id="@+id/sub_counter4"
-                    android:background="@color/black"
-                    android:textColor="@color/white"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:textAlignment="textStart"
-                    android:textSize="7pt"
-                    android:clickable="true"
-                    android:focusable="true"
-                    android:visibility="visible"
-                    android:text="@string/blank" />
-
-                <TextView
-                    android:id="@+id/sub_counter5"
-                    android:background="@color/black"
-                    android:textColor="@color/white"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:textAlignment="textStart"
-                    android:textSize="7pt"
-                    android:clickable="true"
-                    android:focusable="true"
-                    android:visibility="visible"
-                    android:text="@string/blank" />
-
-                <TextView
-                    android:id="@+id/sub_counter6"
-                    android:background="@color/black"
-                    android:textColor="@color/white"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:textAlignment="textStart"
-                    android:textSize="7pt"
-                    android:clickable="true"
-                    android:focusable="true"
-                    android:visibility="visible"
-                    android:text="@string/blank" />
-
-            </LinearLayout>
-        </ScrollView>
--->
     </RelativeLayout>
 </android.support.wear.widget.BoxInsetLayout>
 

diff --git a/wear/src/main/res/layout-round/column_laptime.xml b/wear/src/main/res/layout-round/column_laptime.xml
index e0aeb66..1d87b91 100644 (file)
--- a/wear/src/main/res/layout-round/column_laptime.xml
+++ b/wear/src/main/res/layout-round/column_laptime.xml
@@ -9,7 +9,7 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:textStyle="normal"
-        android:textSize="9pt"
+        android:textSize="8pt"
         android:clickable="true"
         android:focusable="true"
         android:tag="lap1"
@@ -20,7 +20,7 @@
     <TextView xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textSize="9pt"
+        android:textSize="8pt"
         android:clickable="true"
         android:focusable="true"
         android:tag="lap2"
@@ -31,7 +31,7 @@
     <TextView xmlns:android="http://schemas.android.com/apk/res/android"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:textSize="9pt"
+        android:textSize="8pt"
         android:clickable="true"
         android:focusable="true"
         android:tag="lap3"