すこし画像追加。

diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index a0de2a1..ae388c2 100644 (file)
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -7,7 +7,7 @@
         <option name="testRunner" value="GRADLE" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
-        <option name="gradleJvm" value="Embedded JDK" />
+        <option name="gradleJvm" value="jbr-17" />
         <option name="modules">
           <set>
             <option value="$PROJECT_DIR$" />

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 43ae24e..0f86676 100644 (file)
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -1,5 +1,5 @@
 <project version="4">
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_17" default="true" project-jdk-name="jbr-17" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">

diff --git a/app/build.gradle b/app/build.gradle
index d80ce58..7e03e12 100644 (file)
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -33,16 +33,16 @@ dependencies {
     implementation 'com.google.android.gms:play-services-wearable:18.0.0'
     implementation 'androidx.percentlayout:percentlayout:1.0.0'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'androidx.recyclerview:recyclerview:1.3.0'
+    implementation 'androidx.recyclerview:recyclerview:1.3.1'
     //implementation 'com.google.android.support:wearable:2.9.0'
     implementation 'com.google.android.gms:play-services-base:18.2.0'
     implementation 'androidx.palette:palette-ktx:1.0.0'
     compileOnly 'com.google.android.wearable:wearable:2.9.0'
 
     // Use to implement wear watchfaces
-    implementation "androidx.wear.watchface:watchface:1.2.0-alpha09"
-    implementation "androidx.wear.watchface:watchface-complications-data-source:1.2.0-alpha09"
-    implementation "androidx.wear.watchface:watchface-complications-data-source-ktx:1.2.0-alpha09"
-    implementation "androidx.wear.watchface:watchface-editor:1.2.0-alpha09"
-    implementation "androidx.wear.watchface:watchface-complications-rendering:1.2.0-alpha09"
+    implementation "androidx.wear.watchface:watchface:1.2.0-beta01"
+    implementation "androidx.wear.watchface:watchface-complications-data-source:1.2.0-beta01"
+    implementation "androidx.wear.watchface:watchface-complications-data-source-ktx:1.2.0-beta01"
+    implementation "androidx.wear.watchface:watchface-editor:1.2.0-beta01"
+    implementation "androidx.wear.watchface:watchface-complications-rendering:1.2.0-beta01"
 }

diff --git a/app/src/main/java/net/osdn/gokigen/watchface/prpr1/MyWatchFaceHolder.kt b/app/src/main/java/net/osdn/gokigen/watchface/prpr1/MyWatchFaceHolder.kt
index 821d2ae..7cbc36f 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/watchface/prpr1/MyWatchFaceHolder.kt
+++ b/app/src/main/java/net/osdn/gokigen/watchface/prpr1/MyWatchFaceHolder.kt
@@ -632,6 +632,29 @@ class MyWatchFaceHolder(private val context: Context)
         setupBackgroundBitmapFromResId(R.drawable.aoi509)
         setupBackgroundBitmapFromResId(R.drawable.aoi510)
         setupBackgroundBitmapFromResId(R.drawable.aoi511)
+        setupBackgroundBitmapFromResId(R.drawable.aoi512)
+        setupBackgroundBitmapFromResId(R.drawable.aoi513)
+        setupBackgroundBitmapFromResId(R.drawable.aoi514)
+        setupBackgroundBitmapFromResId(R.drawable.aoi515)
+        setupBackgroundBitmapFromResId(R.drawable.aoi516)
+        setupBackgroundBitmapFromResId(R.drawable.aoi517)
+        setupBackgroundBitmapFromResId(R.drawable.aoi518)
+        setupBackgroundBitmapFromResId(R.drawable.aoi519)
+        setupBackgroundBitmapFromResId(R.drawable.aoi520)
+        setupBackgroundBitmapFromResId(R.drawable.aoi521)
+        setupBackgroundBitmapFromResId(R.drawable.aoi522)
+        setupBackgroundBitmapFromResId(R.drawable.aoi523)
+        setupBackgroundBitmapFromResId(R.drawable.aoi524)
+        setupBackgroundBitmapFromResId(R.drawable.aoi525)
+        setupBackgroundBitmapFromResId(R.drawable.aoi526)
+        setupBackgroundBitmapFromResId(R.drawable.aoi527)
+        setupBackgroundBitmapFromResId(R.drawable.aoi528)
+        setupBackgroundBitmapFromResId(R.drawable.aoi529)
+        setupBackgroundBitmapFromResId(R.drawable.aoi530)
+        setupBackgroundBitmapFromResId(R.drawable.aoi531)
+        setupBackgroundBitmapFromResId(R.drawable.aoi532)
+        setupBackgroundBitmapFromResId(R.drawable.aoi533)
+        setupBackgroundBitmapFromResId(R.drawable.aoi534)
         setupBackgroundBitmapFromResId(R.drawable.aohina01)
         setupBackgroundBitmapFromResId(R.drawable.aohina02)
         setupBackgroundBitmapFromResId(R.drawable.aohina03)
@@ -895,6 +918,11 @@ class MyWatchFaceHolder(private val context: Context)
         setupBackgroundBitmapFromResId(R.drawable.yuuka09)
         setupBackgroundBitmapFromResId(R.drawable.yuuka10)
         setupBackgroundBitmapFromResId(R.drawable.yuuka11)
+        setupBackgroundBitmapFromResId(R.drawable.yuuka12)
+        setupBackgroundBitmapFromResId(R.drawable.yuuka13)
+        setupBackgroundBitmapFromResId(R.drawable.yuuka14)
+        setupBackgroundBitmapFromResId(R.drawable.yuuka15)
+        setupBackgroundBitmapFromResId(R.drawable.yuuka16)
         setupBackgroundBitmapFromResId(R.drawable.aohono01)
         setupBackgroundBitmapFromResId(R.drawable.aohono02)
         setupBackgroundBitmapFromResId(R.drawable.aohono03)
@@ -1038,6 +1066,10 @@ class MyWatchFaceHolder(private val context: Context)
         setupBackgroundBitmapFromResId(R.drawable.kaede76)
         setupBackgroundBitmapFromResId(R.drawable.kaede77)
         setupBackgroundBitmapFromResId(R.drawable.kaede78)
+        setupBackgroundBitmapFromResId(R.drawable.kaede79)
+        setupBackgroundBitmapFromResId(R.drawable.kaede80)
+        setupBackgroundBitmapFromResId(R.drawable.kaede81)
+        setupBackgroundBitmapFromResId(R.drawable.kaede82)
         setupBackgroundBitmapFromResId(R.drawable.kaehina01)
         setupBackgroundBitmapFromResId(R.drawable.kaehina02)
         setupBackgroundBitmapFromResId(R.drawable.kaehina03)
@@ -1052,9 +1084,15 @@ class MyWatchFaceHolder(private val context: Context)
         setupBackgroundBitmapFromResId(R.drawable.kaeyuu02)
         setupBackgroundBitmapFromResId(R.drawable.kaeyuu03)
         setupBackgroundBitmapFromResId(R.drawable.kaeyuu04)
+        setupBackgroundBitmapFromResId(R.drawable.kaeyuu05)
         setupBackgroundBitmapFromResId(R.drawable.aokae01)
         setupBackgroundBitmapFromResId(R.drawable.aokae02)
         setupBackgroundBitmapFromResId(R.drawable.aokae03)
+        setupBackgroundBitmapFromResId(R.drawable.aokae04)
+        setupBackgroundBitmapFromResId(R.drawable.aokae05)
+        setupBackgroundBitmapFromResId(R.drawable.aokae06)
+        setupBackgroundBitmapFromResId(R.drawable.aokae07)
+        setupBackgroundBitmapFromResId(R.drawable.aokae08)
         setupBackgroundBitmapFromResId(R.drawable.kaeao01)
         setupBackgroundBitmapFromResId(R.drawable.kaeao02)
         setupBackgroundBitmapFromResId(R.drawable.kaeao03)
@@ -1535,6 +1573,15 @@ class MyWatchFaceHolder(private val context: Context)
         setupBackgroundBitmapFromResId(R.drawable.hinata400)
         setupBackgroundBitmapFromResId(R.drawable.hinata401)
         setupBackgroundBitmapFromResId(R.drawable.hinata402)
+        setupBackgroundBitmapFromResId(R.drawable.hinata403)
+        setupBackgroundBitmapFromResId(R.drawable.hinata404)
+        setupBackgroundBitmapFromResId(R.drawable.hinata405)
+        setupBackgroundBitmapFromResId(R.drawable.hinata406)
+        setupBackgroundBitmapFromResId(R.drawable.hinata407)
+        setupBackgroundBitmapFromResId(R.drawable.hinata408)
+        setupBackgroundBitmapFromResId(R.drawable.hinata409)
+        setupBackgroundBitmapFromResId(R.drawable.hinata410)
+        setupBackgroundBitmapFromResId(R.drawable.hinata411)
         setupBackgroundBitmapFromResId(R.drawable.lets1)
         setupBackgroundBitmapFromResId(R.drawable.lets2)
         setupBackgroundBitmapFromResId(R.drawable.kokona01)

diff --git a/build.gradle b/build.gradle
index 7360b8a..643dae4 100644 (file)
--- a/build.gradle
+++ b/build.gradle
@@ -1,7 +1,7 @@
 // Top-level build file where you can add configuration options common to all sub-projects/modules.
 plugins {
-    id 'com.android.application' version '8.0.2' apply false
-    id 'com.android.library' version '8.0.2' apply false
+    id 'com.android.application' version '8.1.1' apply false
+    id 'com.android.library' version '8.1.1' apply false
     id 'org.jetbrains.kotlin.android' version '1.8.20' apply false
 }