レイアウトの見直し。（その3）

diff --git a/.idea/compiler.xml b/.idea/compiler.xml
index fb7f4a8..b589d56 100644 (file)
--- a/.idea/compiler.xml
+++ b/.idea/compiler.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
   <component name="CompilerConfiguration">
-    <bytecodeTargetLevel target="11" />
+    <bytecodeTargetLevel target="17" />
   </component>
 </project>
\ No newline at end of file

diff --git a/.idea/misc.xml b/.idea/misc.xml
index dd5b4a6..cfde12e 100644 (file)
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -151,7 +151,7 @@
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="true" project-jdk-name="11" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
@@ -160,7 +160,7 @@
   <component name="VisualizationToolProject">
     <option name="state">
       <ProjectState>
-        <option name="scale" value="0.24294670846394983" />
+        <option name="scale" value="0.42105263157894735" />
       </ProjectState>
     </option>
   </component>

diff --git a/.idea/modules.xml b/.idea/modules.xml
index 22e61a3..d49caa5 100644 (file)
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -2,7 +2,6 @@
 <project version="4">
   <component name="ProjectModuleManager">
     <modules>
-      <module fileurl="file://$PROJECT_DIR$/JoggingTimer.iml" filepath="$PROJECT_DIR$/JoggingTimer.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/mobile/JoggingTimer.mobile.iml" filepath="$PROJECT_DIR$/.idea/modules/mobile/JoggingTimer.mobile.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/mobile/JoggingTimer.mobile.androidTest.iml" filepath="$PROJECT_DIR$/.idea/modules/mobile/JoggingTimer.mobile.androidTest.iml" />
       <module fileurl="file://$PROJECT_DIR$/.idea/modules/mobile/JoggingTimer.mobile.main.iml" filepath="$PROJECT_DIR$/.idea/modules/mobile/JoggingTimer.mobile.main.iml" />

diff --git a/build.gradle b/build.gradle
index fab064d..2736a7e 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -7,7 +7,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.4.2'
+        classpath 'com.android.tools.build:gradle:8.0.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

diff --git a/gradle.properties b/gradle.properties
index 234065f..41ca941 100644 (file)
--- a/gradle.properties
+++ b/gradle.properties
@@ -26,3 +26,6 @@ android.enableJetifier=true
 
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
+android.defaults.buildfeatures.buildconfig=true
+android.nonTransitiveRClass=false
+android.nonFinalResIds=false

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
index daaf59b..c151ab5 100644 (file)
--- a/gradle/wrapper/gradle-wrapper.properties
+++ b/gradle/wrapper/gradle-wrapper.properties
@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.0-all.zip

diff --git a/mobile/build.gradle b/mobile/build.gradle
index b3d910d..617957d 100644 (file)
--- a/mobile/build.gradle
+++ b/mobile/build.gradle
@@ -15,6 +15,7 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    namespace 'net.osdn.gokigen.joggingtimer'
 }
 
 dependencies {

diff --git a/mobile/src/main/AndroidManifest.xml b/mobile/src/main/AndroidManifest.xml
index 7a9ee9e..44e657a 100644 (file)
--- a/mobile/src/main/AndroidManifest.xml
+++ b/mobile/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="net.osdn.gokigen.joggingtimer">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <application
         android:allowBackup="true"

diff --git a/wear/build.gradle b/wear/build.gradle
index ae03d4d..a3b9962 100644 (file)
--- a/wear/build.gradle
+++ b/wear/build.gradle
@@ -15,6 +15,7 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+    namespace 'net.osdn.gokigen.joggingtimer'
 }
 
 dependencies {

diff --git a/wear/src/main/AndroidManifest.xml b/wear/src/main/AndroidManifest.xml
index a721498..848e0e2 100644 (file)
--- a/wear/src/main/AndroidManifest.xml
+++ b/wear/src/main/AndroidManifest.xml
@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="net.osdn.gokigen.joggingtimer">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
 
     <uses-feature android:name="android.hardware.type.watch" />
 

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 f2b2e91..a41cfda 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
@@ -12,12 +12,14 @@ import android.util.Log;
 import android.view.KeyEvent;
 import android.view.View;
 import android.widget.ImageButton;
+import android.widget.LinearLayout;
 import android.widget.ListView;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.constraintlayout.widget.ConstraintLayout;
+import androidx.constraintlayout.widget.ConstraintSet;
 import androidx.core.widget.NestedScrollView;
 import androidx.fragment.app.FragmentManager;
 import androidx.wear.ambient.AmbientModeSupport;

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 4c3fb38..b6cb829 100644 (file)
--- a/wear/src/main/java/net/osdn/gokigen/joggingtimer/utilities/CreateModelDataDialog.java
+++ b/wear/src/main/java/net/osdn/gokigen/joggingtimer/utilities/CreateModelDataDialog.java
@@ -77,7 +77,7 @@ 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(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/res/layout/activity_main.xml b/wear/src/main/res/layout/activity_main.xml
index 8fca19e..5f57611 100644 (file)
--- a/wear/src/main/res/layout/activity_main.xml
+++ b/wear/src/main/res/layout/activity_main.xml
@@ -99,6 +99,8 @@
             app:layout_constraintTop_toBottomOf="@id/sub_counter1"
             android:transcriptMode="alwaysScroll"
             android:visibility="visible"
+            android:layout_below="@id/sub_counter1"
+            android:layout_above="@id/button_area1"
             />
 
         <LinearLayout
@@ -161,6 +163,7 @@
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/button_area1"
             android:gravity="center"
+            android:visibility="gone"
             android:orientation="horizontal">
 
             <ImageButton

diff --git a/wear/src/main/res/layout/time_model_picker.xml b/wear/src/main/res/layout/time_model_picker.xml
index 1027932..7bb2ca6 100644 (file)
--- a/wear/src/main/res/layout/time_model_picker.xml
+++ b/wear/src/main/res/layout/time_model_picker.xml
@@ -1,13 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
-<androidx.wear.widget.BoxInsetLayout
+<androidx.core.widget.NestedScrollView
     xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/picker_box_inset_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    android:background="@color/black"
     android:padding="@dimen/box_inset_layout_padding"
-    tools:context="net.osdn.gokigen.joggingtimer.stopwatch.MainActivity"
     tools:deviceIds="wear">
 
     <LinearLayout
@@ -22,8 +20,11 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
+            android:textSize="12sp"
+            android:textColor="@color/white"
             android:text="@string/information_time_picker"
             />
+
         <LinearLayout
             android:id="@+id/info_laptime_layout"
             android:layout_width="fill_parent"
@@ -100,4 +101,4 @@
                 />
         </LinearLayout>
     </LinearLayout>
-</androidx.wear.widget.BoxInsetLayout>
+</androidx.core.widget.NestedScrollView>