Merge pull request #841 from bannzai/replace/asset/app_icon

Icon変更

android/app/build.gradle

@@ -54,7 +54,7 @@ android {
     defaultConfig {
         // TODO: Specify your own unique Application ID (https://developer.android.com/studio/build/application-id.html).
         applicationId ANDROID_APPLICATION_ID
-        minSdkVersion 23
+        minSdkVersion 26
         targetSdkVersion 33
         versionCode flutterVersionCode.toInteger()
         versionName flutterVersionName

android/app/src/dev/res/drawable/check_icon_on.xml

@@ -0,0 +1,13 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="42dp"
+    android:height="42dp"
+    android:viewportWidth="42"
+    android:viewportHeight="42">
+  <path
+      android:pathData="M21,19m-16,0a16,16 0,1 1,32 0a16,16 0,1 1,-32 0"
+      android:fillColor="#4E6287"/>
+  <path
+      android:pathData="M27.972,12L17.871,21.85L13.999,18.145L12,20.185L17.811,25.874H17.836L30,13.998L27.972,12Z"
+      android:fillColor="#ffffff"
+      android:fillType="evenOdd"/>
+</vector>

android/app/src/dev/res/drawable/ic_launcher_background.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path
+        android:fillColor="#DEECF6"
+        android:pathData="M0,0,H108V108H0z" />
+</vector>

android/app/src/dev/res/drawable/ic_launcher_foreground.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+
+    <path
+        android:fillColor="#E56A45"
+        android:fillType="evenOdd"
+        android:pathData="M40.5332 37.9237C43.3177 37.9237 45.4984 38.6301 47.0751 40.0428C47.3781 40.3263 47.6514 40.6322 47.8949 40.9605C50.2675 39.0665 53.3416 37.9237 56.7 37.9237C64.2111 37.9237 70.3 43.6399 70.3 50.6911C70.3 57.7423 64.2111 63.4584 56.7 63.4584C54.0093 63.4584 51.5011 62.7249 49.39 61.4592V72.0763H43.0997V46.5414C43.0997 44.1577 41.9664 42.9052 39.7 42.7838V37.9506C39.974 37.9327 40.2518 37.9237 40.5332 37.9237ZM64.18 50.8507C64.18 54.6407 60.9072 57.7131 56.87 57.7131C52.8328 57.7131 49.56 54.6407 49.56 50.8507C49.56 47.0606 52.8328 43.9882 56.87 43.9882C60.9072 43.9882 64.18 47.0606 64.18 50.8507Z" />
+    <path
+        android:fillColor="#4E6287"
+        android:pathData="M38.1023 62.6875C37.1364 62.6875 36.2585 62.4375 35.4688 61.9375C34.679 61.4375 34.0483 60.6875 33.5767 59.6875C33.1051 58.6875 32.8693 57.446 32.8693 55.9631C32.8693 54.4233 33.1136 53.1562 33.6023 52.1619C34.0909 51.1676 34.7301 50.4318 35.5199 49.9545C36.3153 49.4773 37.1705 49.2386 38.0852 49.2386C38.7727 49.2386 39.3608 49.358 39.8494 49.5966C40.3381 49.8295 40.7415 50.1307 41.0597 50.5C41.3778 50.8693 41.6193 51.2528 41.7841 51.6506H41.8693V45.0455H46.0369V62.5H41.9119V60.3778H41.7841C41.608 60.7812 41.358 61.1591 41.0341 61.5114C40.7102 61.8636 40.304 62.1477 39.8153 62.3636C39.3324 62.5795 38.7614 62.6875 38.1023 62.6875ZM39.5511 59.4403C40.0568 59.4403 40.4886 59.2983 40.8466 59.0142C41.2045 58.7244 41.4801 58.3182 41.6733 57.7955C41.8665 57.2727 41.9631 56.6591 41.9631 55.9545C41.9631 55.2386 41.8665 54.6222 41.6733 54.1051C41.4858 53.5881 41.2102 53.1903 40.8466 52.9119C40.4886 52.6335 40.0568 52.4943 39.5511 52.4943C39.0341 52.4943 38.5966 52.6364 38.2386 52.9205C37.8807 53.2045 37.608 53.6051 37.4205 54.1222C37.2386 54.6392 37.1477 55.25 37.1477 55.9545C37.1477 56.6591 37.2415 57.2727 37.429 57.7955C37.6165 58.3182 37.8864 58.7244 38.2386 59.0142C38.5966 59.2983 39.0341 59.4403 39.5511 59.4403ZM54.7919 62.7472C53.4226 62.7472 52.2408 62.4773 51.2464 61.9375C50.2578 61.392 49.4964 60.6165 48.9624 59.6108C48.4339 58.5994 48.1697 57.3977 48.1697 56.0057C48.1697 54.6534 48.4368 53.4716 48.9709 52.4602C49.505 51.4432 50.2578 50.6534 51.2294 50.0909C52.201 49.5227 53.3459 49.2386 54.6641 49.2386C55.5959 49.2386 56.4482 49.3835 57.2209 49.6733C57.9936 49.9631 58.6612 50.392 59.2237 50.9602C59.7862 51.5284 60.2237 52.2301 60.5362 53.0653C60.8487 53.8949 61.005 54.8466 61.005 55.9205V56.9602H49.6271V54.5398H57.1271C57.1214 54.0966 57.0163 53.7017 56.8118 53.3551C56.6072 53.0085 56.326 52.7386 55.968 52.5455C55.6158 52.3466 55.2095 52.2472 54.7493 52.2472C54.2834 52.2472 53.8658 52.3523 53.4964 52.5625C53.1271 52.767 52.8345 53.0483 52.6186 53.4062C52.4027 53.7585 52.2891 54.1591 52.2777 54.608V57.071C52.2777 57.6051 52.3828 58.0739 52.593 58.4773C52.8033 58.875 53.1016 59.1847 53.4879 59.4062C53.8743 59.6278 54.3345 59.7386 54.8686 59.7386C55.2379 59.7386 55.5732 59.6875 55.8743 59.5852C56.1754 59.483 56.4339 59.3324 56.6499 59.1335C56.8658 58.9347 57.0277 58.6903 57.1357 58.4006L60.9624 58.5114C60.8033 59.3693 60.4538 60.1165 59.9141 60.7528C59.38 61.3835 58.6783 61.875 57.8089 62.2273C56.9396 62.5739 55.9339 62.7472 54.7919 62.7472ZM75.4808 49.4091L70.9893 62.5H66.2166L61.7337 49.4091H66.1229L68.5348 58.4261H68.6712L71.0916 49.4091H75.4808Z" />
+</vector>

android/app/src/dev/res/drawable/launch_background.xml

@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Modify this file to customize your launch splash screen -->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@android:color/white" />
+
+    <!-- You can insert your own image assets here -->
+    <!-- <item>
+        <bitmap
+            android:gravity="center"
+            android:src="@mipmap/launch_image" />
+    </item> -->
+
+    <item
+        android:drawable="@color/background"/>
+
+    <item
+        android:width="32dp"
+        android:height="51dp"
+        android:drawable="@drawable/launch_splash"
+        android:gravity="center" />
+</layer-list>
+

android/app/src/dev/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
-</adaptive-icon>
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>

android/app/src/main/kotlin/com/example/Pilll/PilllFirebaseMessagingService.kt

@@ -27,8 +27,6 @@ public class PilllFirebaseMessagingService: FirebaseMessagingService() {
         val body = remoteMessage.data["body"]
         val builder = NotificationCompat.Builder(this, getString(R.string.reminder_channel_id))
             .setSmallIcon(R.mipmap.ic_notification)
-            .setLargeIcon(BitmapFactory.decodeResource(resources,
-                R.mipmap.ic_notification))
             .setContentTitle(title)
             .setContentText(body)
             .setPriority(NotificationCompat.PRIORITY_DEFAULT)

android/app/src/main/res/drawable/ic_launcher_background.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path
+        android:fillColor="#DEECF6"
+        android:pathData="M0,0,H108V108H0z" />
+</vector>

android/app/src/main/res/drawable/ic_launcher_foreground.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+
+    <path
+        android:fillColor="#E56A45"
+        android:fillType="evenOdd"
+        android:pathData="M40.5332 37.9237C43.3177 37.9237 45.4984 38.6301 47.0751 40.0428C47.3781 40.3263 47.6514 40.6322 47.8949 40.9605C50.2675 39.0665 53.3416 37.9237 56.7 37.9237C64.2111 37.9237 70.3 43.6399 70.3 50.6911C70.3 57.7423 64.2111 63.4584 56.7 63.4584C54.0093 63.4584 51.5011 62.7249 49.39 61.4592V72.0763H43.0997V46.5414C43.0997 44.1577 41.9664 42.9052 39.7 42.7838V37.9506C39.974 37.9327 40.2518 37.9237 40.5332 37.9237ZM64.18 50.8507C64.18 54.6407 60.9072 57.7131 56.87 57.7131C52.8328 57.7131 49.56 54.6407 49.56 50.8507C49.56 47.0606 52.8328 43.9882 56.87 43.9882C60.9072 43.9882 64.18 47.0606 64.18 50.8507Z" />
+    <path
+        android:fillColor="#4E6287"
+        android:pathData="M38.1023 62.6875C37.1364 62.6875 36.2585 62.4375 35.4688 61.9375C34.679 61.4375 34.0483 60.6875 33.5767 59.6875C33.1051 58.6875 32.8693 57.446 32.8693 55.9631C32.8693 54.4233 33.1136 53.1562 33.6023 52.1619C34.0909 51.1676 34.7301 50.4318 35.5199 49.9545C36.3153 49.4773 37.1705 49.2386 38.0852 49.2386C38.7727 49.2386 39.3608 49.358 39.8494 49.5966C40.3381 49.8295 40.7415 50.1307 41.0597 50.5C41.3778 50.8693 41.6193 51.2528 41.7841 51.6506H41.8693V45.0455H46.0369V62.5H41.9119V60.3778H41.7841C41.608 60.7812 41.358 61.1591 41.0341 61.5114C40.7102 61.8636 40.304 62.1477 39.8153 62.3636C39.3324 62.5795 38.7614 62.6875 38.1023 62.6875ZM39.5511 59.4403C40.0568 59.4403 40.4886 59.2983 40.8466 59.0142C41.2045 58.7244 41.4801 58.3182 41.6733 57.7955C41.8665 57.2727 41.9631 56.6591 41.9631 55.9545C41.9631 55.2386 41.8665 54.6222 41.6733 54.1051C41.4858 53.5881 41.2102 53.1903 40.8466 52.9119C40.4886 52.6335 40.0568 52.4943 39.5511 52.4943C39.0341 52.4943 38.5966 52.6364 38.2386 52.9205C37.8807 53.2045 37.608 53.6051 37.4205 54.1222C37.2386 54.6392 37.1477 55.25 37.1477 55.9545C37.1477 56.6591 37.2415 57.2727 37.429 57.7955C37.6165 58.3182 37.8864 58.7244 38.2386 59.0142C38.5966 59.2983 39.0341 59.4403 39.5511 59.4403ZM54.7919 62.7472C53.4226 62.7472 52.2408 62.4773 51.2464 61.9375C50.2578 61.392 49.4964 60.6165 48.9624 59.6108C48.4339 58.5994 48.1697 57.3977 48.1697 56.0057C48.1697 54.6534 48.4368 53.4716 48.9709 52.4602C49.505 51.4432 50.2578 50.6534 51.2294 50.0909C52.201 49.5227 53.3459 49.2386 54.6641 49.2386C55.5959 49.2386 56.4482 49.3835 57.2209 49.6733C57.9936 49.9631 58.6612 50.392 59.2237 50.9602C59.7862 51.5284 60.2237 52.2301 60.5362 53.0653C60.8487 53.8949 61.005 54.8466 61.005 55.9205V56.9602H49.6271V54.5398H57.1271C57.1214 54.0966 57.0163 53.7017 56.8118 53.3551C56.6072 53.0085 56.326 52.7386 55.968 52.5455C55.6158 52.3466 55.2095 52.2472 54.7493 52.2472C54.2834 52.2472 53.8658 52.3523 53.4964 52.5625C53.1271 52.767 52.8345 53.0483 52.6186 53.4062C52.4027 53.7585 52.2891 54.1591 52.2777 54.608V57.071C52.2777 57.6051 52.3828 58.0739 52.593 58.4773C52.8033 58.875 53.1016 59.1847 53.4879 59.4062C53.8743 59.6278 54.3345 59.7386 54.8686 59.7386C55.2379 59.7386 55.5732 59.6875 55.8743 59.5852C56.1754 59.483 56.4339 59.3324 56.6499 59.1335C56.8658 58.9347 57.0277 58.6903 57.1357 58.4006L60.9624 58.5114C60.8033 59.3693 60.4538 60.1165 59.9141 60.7528C59.38 61.3835 58.6783 61.875 57.8089 62.2273C56.9396 62.5739 55.9339 62.7472 54.7919 62.7472ZM75.4808 49.4091L70.9893 62.5H66.2166L61.7337 49.4091H66.1229L68.5348 58.4261H68.6712L71.0916 49.4091H75.4808Z" />
+</vector>

android/app/src/main/res/drawable/launch_background.xml

@@ -16,6 +16,7 @@
     <item
         android:width="32dp"
         android:height="51dp"
-        android:drawable="@mipmap/launch_splash"
+        android:drawable="@drawable/launch_splash"
         android:gravity="center" />
 </layer-list>
+

android/app/src/main/res/layout/pilll_app_invalid_widget.xml

@@ -40,6 +40,6 @@
         android:layout_alignParentTop="true"
         android:paddingTop="10dp"
         android:paddingRight="10dp"
-        android:src="@drawable/pilll_widget_icon" />
+        android:src="@drawable/launch_splash" />
 
-</RelativeLayout>
+</RelativeLayout>

android/app/src/main/res/layout/pilll_app_widget.xml

@@ -14,7 +14,7 @@
             android:layout_width="48dp"
             android:layout_height="48dp"
             android:layout_alignParentRight="true"
-            android:src="@drawable/pilll_widget_icon" />
+            android:src="@drawable/launch_splash" />
 
         <ImageView
             android:id="@+id/widget_check_on"
@@ -105,4 +105,4 @@
         >
     </Button>
 
-</FrameLayout>
+</FrameLayout>

android/app/src/main/res/values/styles.xml

@@ -15,7 +15,7 @@
     <style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
         <item name="android:windowBackground">@android:color/white</item>
     </style>
-    <color name="background">#434962</color>
+    <color name="background">#DEECF6</color>
     <style name="Widget.Android.AppWidget.Container" parent="android:Widget">
         <item name="android:id">@android:id/background</item>
         <item name="android:background">?android:attr/colorBackground</item>

android/app/src/main/res/xml/pilll_app_widget_info.xml

@@ -3,7 +3,6 @@
     android:minWidth="40dp"
     android:minHeight="40dp"
     android:updatePeriodMillis="86400000"
-    android:previewImage="@drawable/example_appwidget_preview"
     android:initialLayout="@layout/pilll_app_widget"
     android:description="@string/app_widget_description"
     android:resizeMode="horizontal|vertical"

android/app/src/prod/res/drawable/ic_launcher_background.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+    <path
+        android:fillColor="#DEECF6"
+        android:pathData="M0,0,H108V108H0z" />
+</vector>

android/app/src/prod/res/drawable/ic_launcher_foreground.xml

@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="108dp"
+    android:height="108dp"
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+
+    <path
+        android:fillColor="#4E6287"
+        android:fillType="evenOdd"
+        android:pathData="M40.5332 37.9237C43.3177 37.9237 45.4984 38.6301 47.0751 40.0428C47.3781 40.3263 47.6514 40.6322 47.8949 40.9605C50.2675 39.0665 53.3416 37.9237 56.7 37.9237C64.2111 37.9237 70.3 43.6399 70.3 50.6911C70.3 57.7423 64.2111 63.4584 56.7 63.4584C54.0093 63.4584 51.5011 62.7249 49.39 61.4592V72.0763H43.0997V46.5414C43.0997 44.1577 41.9664 42.9052 39.7 42.7838V37.9506C39.974 37.9327 40.2518 37.9237 40.5332 37.9237ZM64.18 50.8507C64.18 54.6407 60.9072 57.7131 56.87 57.7131C52.8328 57.7131 49.56 54.6407 49.56 50.8507C49.56 47.0606 52.8328 43.9882 56.87 43.9882C60.9072 43.9882 64.18 47.0606 64.18 50.8507Z" />
+</vector>

android/app/src/prod/res/drawable/launch_background.xml

@@ -16,6 +16,7 @@
     <item
         android:width="32dp"
         android:height="51dp"
-        android:drawable="@mipmap/launch_splash"
+        android:drawable="@drawable/ic_launcher_foreground"
         android:gravity="center" />
 </layer-list>
+

android/app/src/prod/res/layout/pilll_app_invalid_widget.xml

@@ -40,6 +40,6 @@
         android:layout_alignParentTop="true"
         android:paddingTop="10dp"
         android:paddingRight="10dp"
-        android:src="@drawable/pilll_widget_icon" />
+        android:src="@drawable/launch_splash" />
 
-</RelativeLayout>
+</RelativeLayout>

android/app/src/prod/res/layout/pilll_app_widget.xml

@@ -14,7 +14,7 @@
             android:layout_width="48dp"
             android:layout_height="48dp"
             android:layout_alignParentRight="true"
-            android:src="@drawable/pilll_widget_icon" />
+            android:src="@drawable/launch_splash" />
 
         <ImageView
             android:id="@+id/widget_check_on"
@@ -105,4 +105,4 @@
         >
     </Button>
 
-</FrameLayout>
+</FrameLayout>

android/app/src/prod/res/mipmap-anydpi-v26/ic_launcher.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
-    <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
-</adaptive-icon>
+    <background android:drawable="@drawable/ic_launcher_background" />
+    <foreground android:drawable="@drawable/ic_launcher_foreground" />
+</adaptive-icon>

android/app/src/prod/res/values/styles.xml

@@ -15,7 +15,7 @@
     <style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
         <item name="android:windowBackground">@android:color/white</item>
     </style>
-    <color name="background">#434962</color>
+    <color name="background">#DEECF6</color>
     <style name="Widget.Android.AppWidget.Container" parent="android:Widget">
         <item name="android:id">@android:id/background</item>
         <item name="android:background">?android:attr/colorBackground</item>

android/app/src/prod/res/xml/pilll_app_widget_info.xml

@@ -3,7 +3,6 @@
     android:minWidth="40dp"
     android:minHeight="40dp"
     android:updatePeriodMillis="86400000"
-    android:previewImage="@drawable/example_appwidget_preview"
     android:initialLayout="@layout/pilll_app_widget"
     android:description="@string/app_widget_description"
     android:resizeMode="horizontal|vertical"