From bd93e878e450c80d180e6b52f16ae4dc56971a8e Mon Sep 17 00:00:00 2001 From: MRSa Date: Sat, 15 Apr 2023 01:43:46 +0900 Subject: [PATCH] =?utf8?q?=E3=83=AC=E3=82=A4=E3=82=A2=E3=82=A6=E3=83=88?= =?utf8?q?=E3=81=AE=E8=A6=8B=E7=9B=B4=E3=81=97=E3=80=82=EF=BC=88=E3=81=9D?= =?utf8?q?=E3=81=AE3=EF=BC=89?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- .idea/compiler.xml | 2 +- .idea/misc.xml | 4 ++-- .idea/modules.xml | 1 - build.gradle | 2 +- gradle.properties | 3 +++ gradle/wrapper/gradle-wrapper.properties | 2 +- mobile/build.gradle | 1 + mobile/src/main/AndroidManifest.xml | 3 +-- wear/build.gradle | 1 + wear/src/main/AndroidManifest.xml | 3 +-- .../net/osdn/gokigen/joggingtimer/stopwatch/MainActivity.java | 2 ++ .../gokigen/joggingtimer/utilities/CreateModelDataDialog.java | 2 +- wear/src/main/res/layout/activity_main.xml | 3 +++ wear/src/main/res/layout/time_model_picker.xml | 9 +++++---- 14 files changed, 23 insertions(+), 15 deletions(-) diff --git a/.idea/compiler.xml b/.idea/compiler.xml index fb7f4a8..b589d56 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml index dd5b4a6..cfde12e 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -151,7 +151,7 @@ - + @@ -160,7 +160,7 @@ diff --git a/.idea/modules.xml b/.idea/modules.xml index 22e61a3..d49caa5 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,7 +2,6 @@ - diff --git a/build.gradle b/build.gradle index fab064d..2736a7e 100644 --- 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 --- 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 --- 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 --- 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 --- a/mobile/src/main/AndroidManifest.xml +++ b/mobile/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + - + 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 --- 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 --- 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 --- 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" /> - + - + -- 2.11.0