アイコンを調整する。

diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png
new file mode 100644 (file)
index 0000000..305cea2
Binary files /dev/null and b/app/src/main/ic_launcher-playstore.png differ

diff --git a/app/src/main/java/net/osdn/gokigen/pkremote/playback/MyContentDownloader.kt b/app/src/main/java/net/osdn/gokigen/pkremote/playback/MyContentDownloader.kt
index 6facf9f..979b7b5 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/pkremote/playback/MyContentDownloader.kt
+++ b/app/src/main/java/net/osdn/gokigen/pkremote/playback/MyContentDownloader.kt
@@ -157,7 +157,7 @@ class MyContentDownloader(private val activity : Activity, private val playbackC
                 downloadDialog.show()
             }
             val resolver = activity.contentResolver
                 downloadDialog.show()
             }
             val resolver = activity.contentResolver

-            val directoryPath = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DCIM).path + File.separator + activity.getString(R.string.app_name2) + File.separator
+            val directoryPath = Environment.getExternalStoragePublicDirectory(Environment.DIRECTORY_DCIM).path + File.separator + activity.getString(R.string.app_name2)

             val calendar = Calendar.getInstance()
             val extendName = SimpleDateFormat("yyyyMMdd-HHmmss", Locale.getDefault()).format(calendar.time)
             val periodPosition = targetFileName.indexOf(".")
             val calendar = Calendar.getInstance()
             val extendName = SimpleDateFormat("yyyyMMdd-HHmmss", Locale.getDefault()).format(calendar.time)
             val periodPosition = targetFileName.indexOf(".")

diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
deleted file mode 100644 (file)
index cf80321..0000000
--- a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:aapt="http://schemas.android.com/aapt"
-    android:width="108dp"
-    android:height="108dp"
-    android:viewportHeight="108"
-    android:viewportWidth="108">
-    <path
-        android:fillType="evenOdd"
-        android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z"
-        android:strokeColor="#FFFCFCFC"
-        android:strokeWidth="1">
-        <aapt:attr name="android:fillColor">
-            <gradient
-                android:endX="78.5885"
-                android:endY="90.9159"
-                android:startX="48.7653"
-                android:startY="61.0927"
-                android:type="linear">
-                <item
-                    android:color="#44000000"
-                    android:offset="0.0" />
-                <item
-                    android:color="#00000000"
-                    android:offset="1.0" />
-            </gradient>
-        </aapt:attr>
-    </path>
-    <path
-        android:fillColor="#FFFFFF"
-        android:fillType="nonZero"
-        android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z"
-        android:strokeColor="#00000000"
-        android:strokeWidth="1" />
-</vector>

diff --git a/app/src/main/res/drawable/ic_launcher_background.xml b/app/src/main/res/drawable/ic_launcher_background.xml
index ac500b9..04b23d1 100644 (file)
--- a/app/src/main/res/drawable/ic_launcher_background.xml
+++ b/app/src/main/res/drawable/ic_launcher_background.xml
@@ -2,75 +2,77 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="108dp"
     android:height="108dp"
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
     android:width="108dp"
     android:height="108dp"

-    android:viewportWidth="91.52542"
-    android:viewportHeight="91.52542">
-  <group android:translateX="-8.237288"
-      android:translateY="-8.237288">
+    android:viewportWidth="108"
+    android:viewportHeight="108">
+  <group android:scaleX="1.18"
+      android:scaleY="1.18"
+      android:translateX="-9.72"
+      android:translateY="-9.72">

       <path android:fillColor="#26A69A"
       <path android:fillColor="#26A69A"

-          android:pathData="M0,0h108v108h-108z"/>
+            android:pathData="M0,0h108v108h-108z"/>

       <path android:fillColor="#00000000" android:pathData="M9,0L9,108"
       <path android:fillColor="#00000000" android:pathData="M9,0L9,108"

-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>

       <path android:fillColor="#00000000" android:pathData="M19,0L19,108"
       <path android:fillColor="#00000000" android:pathData="M19,0L19,108"

-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>

       <path android:fillColor="#00000000" android:pathData="M29,0L29,108"
       <path android:fillColor="#00000000" android:pathData="M29,0L29,108"

-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>

       <path android:fillColor="#00000000" android:pathData="M39,0L39,108"
       <path android:fillColor="#00000000" android:pathData="M39,0L39,108"

-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>

       <path android:fillColor="#00000000" android:pathData="M49,0L49,108"
       <path android:fillColor="#00000000" android:pathData="M49,0L49,108"

-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>

       <path android:fillColor="#00000000" android:pathData="M59,0L59,108"
       <path android:fillColor="#00000000" android:pathData="M59,0L59,108"

-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>

       <path android:fillColor="#00000000" android:pathData="M69,0L69,108"
       <path android:fillColor="#00000000" android:pathData="M69,0L69,108"

-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>

       <path android:fillColor="#00000000" android:pathData="M79,0L79,108"
       <path android:fillColor="#00000000" android:pathData="M79,0L79,108"

-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>

       <path android:fillColor="#00000000" android:pathData="M89,0L89,108"
       <path android:fillColor="#00000000" android:pathData="M89,0L89,108"

-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>

       <path android:fillColor="#00000000" android:pathData="M99,0L99,108"
       <path android:fillColor="#00000000" android:pathData="M99,0L99,108"

-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>

       <path android:fillColor="#00000000" android:pathData="M0,9L108,9"
       <path android:fillColor="#00000000" android:pathData="M0,9L108,9"

-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>

       <path android:fillColor="#00000000" android:pathData="M0,19L108,19"
       <path android:fillColor="#00000000" android:pathData="M0,19L108,19"

-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>

       <path android:fillColor="#00000000" android:pathData="M0,29L108,29"
       <path android:fillColor="#00000000" android:pathData="M0,29L108,29"

-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>

       <path android:fillColor="#00000000" android:pathData="M0,39L108,39"
       <path android:fillColor="#00000000" android:pathData="M0,39L108,39"

-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>

       <path android:fillColor="#00000000" android:pathData="M0,49L108,49"
       <path android:fillColor="#00000000" android:pathData="M0,49L108,49"

-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>

       <path android:fillColor="#00000000" android:pathData="M0,59L108,59"
       <path android:fillColor="#00000000" android:pathData="M0,59L108,59"

-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>

       <path android:fillColor="#00000000" android:pathData="M0,69L108,69"
       <path android:fillColor="#00000000" android:pathData="M0,69L108,69"

-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>

       <path android:fillColor="#00000000" android:pathData="M0,79L108,79"
       <path android:fillColor="#00000000" android:pathData="M0,79L108,79"

-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>

       <path android:fillColor="#00000000" android:pathData="M0,89L108,89"
       <path android:fillColor="#00000000" android:pathData="M0,89L108,89"

-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>

       <path android:fillColor="#00000000" android:pathData="M0,99L108,99"
       <path android:fillColor="#00000000" android:pathData="M0,99L108,99"

-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>

       <path android:fillColor="#00000000" android:pathData="M19,29L89,29"
       <path android:fillColor="#00000000" android:pathData="M19,29L89,29"

-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>

       <path android:fillColor="#00000000" android:pathData="M19,39L89,39"
       <path android:fillColor="#00000000" android:pathData="M19,39L89,39"

-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>

       <path android:fillColor="#00000000" android:pathData="M19,49L89,49"
       <path android:fillColor="#00000000" android:pathData="M19,49L89,49"

-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>

       <path android:fillColor="#00000000" android:pathData="M19,59L89,59"
       <path android:fillColor="#00000000" android:pathData="M19,59L89,59"

-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>

       <path android:fillColor="#00000000" android:pathData="M19,69L89,69"
       <path android:fillColor="#00000000" android:pathData="M19,69L89,69"

-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>

       <path android:fillColor="#00000000" android:pathData="M19,79L89,79"
       <path android:fillColor="#00000000" android:pathData="M19,79L89,79"

-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>

       <path android:fillColor="#00000000" android:pathData="M29,19L29,89"
       <path android:fillColor="#00000000" android:pathData="M29,19L29,89"

-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>

       <path android:fillColor="#00000000" android:pathData="M39,19L39,89"
       <path android:fillColor="#00000000" android:pathData="M39,19L39,89"

-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>

       <path android:fillColor="#00000000" android:pathData="M49,19L49,89"
       <path android:fillColor="#00000000" android:pathData="M49,19L49,89"

-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>

       <path android:fillColor="#00000000" android:pathData="M59,19L59,89"
       <path android:fillColor="#00000000" android:pathData="M59,19L59,89"

-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>

       <path android:fillColor="#00000000" android:pathData="M69,19L69,89"
       <path android:fillColor="#00000000" android:pathData="M69,19L69,89"

-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>

       <path android:fillColor="#00000000" android:pathData="M79,19L79,89"
       <path android:fillColor="#00000000" android:pathData="M79,19L79,89"

-          android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>
+            android:strokeColor="#33FFFFFF" android:strokeWidth="0.8"/>

   </group>
 </vector>
   </group>
 </vector>

diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml
index 171502f..36310b6 100644 (file)
--- a/app/src/main/res/drawable/ic_launcher_foreground.xml
+++ b/app/src/main/res/drawable/ic_launcher_foreground.xml
@@ -1,11 +1,13 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
 <vector xmlns:android="http://schemas.android.com/apk/res/android"

-    android:tint="#FCFCFC"

     android:width="108dp"
     android:height="108dp"
     android:width="108dp"
     android:height="108dp"

-    android:viewportWidth="47.33045"
-    android:viewportHeight="47.33045">
-  <group android:translateX="11.665224"
-      android:translateY="11.665224">
+    android:viewportWidth="108"
+    android:viewportHeight="108"
+    android:tint="#EDEDED">
+  <group android:scaleX="2.1656635"
+      android:scaleY="2.1656635"
+      android:translateX="28.01204"
+      android:translateY="28.01204">

       <path
           android:fillColor="#FF000000"
           android:pathData="M19,3L5,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM5,4.99h3C8,6.65 6.66,8 5,8L5,4.99zM5,12v-2c2.76,0 5,-2.25 5,-5.01h2C12,8.86 8.87,12 5,12zM5,18l3.5,-4.5 2.5,3.01L14.5,12l4.5,6L5,18z"/>
       <path
           android:fillColor="#FF000000"
           android:pathData="M19,3L5,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2L21,5c0,-1.1 -0.9,-2 -2,-2zM5,4.99h3C8,6.65 6.66,8 5,8L5,4.99zM5,12v-2c2.76,0 5,-2.25 5,-5.01h2C12,8.86 8.87,12 5,12zM5,18l3.5,-4.5 2.5,3.01L14.5,12l4.5,6L5,18z"/>

diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
index bbd3e02..7353dbd 100644 (file)
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher.xml
+++ b/app/src/main/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">
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">

-    <background android:drawable="@drawable/ic_launcher_background"/>
+    <background android:drawable="@color/ic_launcher_background"/>

     <foreground android:drawable="@drawable/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
     <foreground android:drawable="@drawable/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file

diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
index bbd3e02..7353dbd 100644 (file)
--- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
+++ b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">

-    <background android:drawable="@drawable/ic_launcher_background"/>
+    <background android:drawable="@color/ic_launcher_background"/>

     <foreground android:drawable="@drawable/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file
     <foreground android:drawable="@drawable/ic_launcher_foreground"/>
 </adaptive-icon>
\ No newline at end of file

diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
index 0c721b9..618c38f 100644 (file)
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ

diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png
index 35f64b1..25ea4e8 100644 (file)
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ

diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png
index fa66f6f..b021d31 100644 (file)
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher.png and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ

diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png
index a3d006b..a27278c 100644 (file)
Binary files a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ

diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png
index 45d067f..1254ad5 100644 (file)
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ

diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png
index 8f5dc33..f57d6b2 100644 (file)
Binary files a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ

diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
index b7a3ff0..6af72fc 100644 (file)
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ

diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
index c45fba6..fce2678 100644 (file)
Binary files a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ

diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
index 6b8d736..850464c 100644 (file)
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ

diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
index b5ef0f6..86565fc 100644 (file)
Binary files a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ

diff --git a/app/src/main/res/values/ic_launcher_background.xml b/app/src/main/res/values/ic_launcher_background.xml
new file mode 100644 (file)
index 0000000..09a756b
--- /dev/null
+++ b/app/src/main/res/values/ic_launcher_background.xml
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <color name="ic_launcher_background">#26A69A</color>
+</resources>
\ No newline at end of file