Prepare for releasing 1.0.10-beta3

oupson · Sep 19, 2020 · bae347b · bae347b
1 parent 4ffdb8a
commit bae347b
Show file tree

Hide file tree

Showing 17 changed files with 15 additions and 17 deletions.
diff --git a/apng_library/build.gradle b/apng_library/build.gradle
@@ -9,7 +9,7 @@ android {
         minSdkVersion 19
         targetSdkVersion 29
         versionCode 1
-        versionName "1.0.10-beta2"
+        versionName "1.0.10-beta3"
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }

diff --git a/apng_library/src/main/java/oupson/apng/encoder/ApngEncoder.kt b/apng_library/src/main/java/oupson/apng/encoder/ApngEncoder.kt
@@ -41,7 +41,7 @@ class ApngEncoder(
         yOffsets: Int = 0,
         blendOp: Utils.Companion.BlendOp = Utils.Companion.BlendOp.APNG_BLEND_OP_SOURCE,
         disposeOp: Utils.Companion.DisposeOp = Utils.Companion.DisposeOp.APNG_DISPOSE_OP_NONE,
-        usePngEncoder: Boolean = false
+        usePngEncoder: Boolean = true
     ) {
         val btm = BitmapFactory.decodeStream(inputStream).let {
             if (it.config != Bitmap.Config.ARGB_8888)

diff --git a/apng_library/src/main/java/oupson/apng/encoder/ExperimentalApngEncoder.kt b/apng_library/src/main/java/oupson/apng/encoder/ExperimentalApngEncoder.kt
@@ -1,3 +1,5 @@
+@file:Suppress("CascadeIf")
+
 package oupson.apng.encoder
 
 import android.graphics.Bitmap
@@ -44,7 +46,7 @@ class ExperimentalApngEncoder(
         yOffsets: Int = 0,
         blendOp: Utils.Companion.BlendOp = Utils.Companion.BlendOp.APNG_BLEND_OP_SOURCE,
         disposeOp: Utils.Companion.DisposeOp = Utils.Companion.DisposeOp.APNG_DISPOSE_OP_NONE,
-        usePngEncoder: Boolean = false
+        usePngEncoder: Boolean = true
     ) {
         val btm = BitmapFactory.decodeStream(inputStream, null, BitmapFactory.Options().also { conf -> if (Build.VERSION.SDK_INT >=
             Build.VERSION_CODES.O) {

diff --git a/app-test/build.gradle b/app-test/build.gradle
@@ -10,7 +10,7 @@ android {
         minSdkVersion 19
         targetSdkVersion 29
         versionCode 1
-        versionName "1.0.10-beta2"
+        versionName "1.0.10-beta3"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
 

diff --git a/app-test/src/main/AndroidManifest.xml b/app-test/src/main/AndroidManifest.xml
@@ -13,7 +13,7 @@
             android:icon="@mipmap/ic_launcher"
             android:label="@string/app_name"
             android:largeHeap="true"
-            android:roundIcon="@mipmap/ic_launcher_round"
+            android:roundIcon="@mipmap/ic_launcher"
             android:supportsRtl="true"
             android:theme="@style/AppTheme">
         <activity android:name=".activities.MainActivity">

diff --git a/app-test/src/main/java/oupson/apngcreator/activities/MainActivity.kt b/app-test/src/main/java/oupson/apngcreator/activities/MainActivity.kt
@@ -30,6 +30,7 @@ class MainActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
+
         if (BuildConfig.DEBUG)
             Log.v(TAG, "supportFragmentManager.fragments.size : ${supportFragmentManager.fragments.size}")
 

diff --git a/app-test/src/main/res/layout/activity_creator.xml b/app-test/src/main/res/layout/activity_creator.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
         xmlns:app="http://schemas.android.com/apk/res-auto"
+        xmlns:tools="http://schemas.android.com/tools"
         android:orientation="vertical" android:layout_width="match_parent"
         android:layout_height="match_parent">
 
@@ -20,7 +21,8 @@
             app:backgroundTint="@color/secondary"
             app:layout_anchor="@id/creatorBottomAppBar"
             app:layout_anchorGravity="bottom|right|end"
-            app:srcCompat="@drawable/ic_add_black_24dp" />
+            app:srcCompat="@drawable/ic_add_black_24dp"
+            tools:ignore="VectorDrawableCompat" />
 
     <com.google.android.material.bottomappbar.BottomAppBar
             android:id="@+id/creatorBottomAppBar"

diff --git a/app-test/src/main/res/layout/fragment_kotlin.xml b/app-test/src/main/res/layout/fragment_kotlin.xml
@@ -52,7 +52,7 @@
         <androidx.appcompat.widget.AppCompatButton
                 android:id="@+id/PlayButton"
                 android:theme="@style/Widget.AppCompat.Button.Borderless.Colored"
-                android:backgroundTint="@color/colorPrimary"
+                app:backgroundTint="@color/colorPrimary"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="8dp"
@@ -64,7 +64,7 @@
         <androidx.appcompat.widget.AppCompatButton
                 android:id="@+id/PauseButton"
                 android:theme="@style/Widget.AppCompat.Button.Borderless.Colored"
-                android:backgroundTint="@color/colorPrimary"
+                app:backgroundTint="@color/colorPrimary"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginEnd="8dp"

diff --git a/app-test/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app-test/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml
diff --git a/app-test/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app-test/src/main/res/mipmap-hdpi/ic_launcher_round.png
diff --git a/app-test/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app-test/src/main/res/mipmap-mdpi/ic_launcher_round.png
diff --git a/app-test/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app-test/src/main/res/mipmap-xhdpi/ic_launcher_round.png
diff --git a/app-test/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app-test/src/main/res/mipmap-xxhdpi/ic_launcher_round.png
diff --git a/app-test/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app-test/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png
diff --git a/app-test/src/main/res/values-night/colors.xml b/app-test/src/main/res/values-night/colors.xml
@@ -2,8 +2,6 @@
 <resources>
     <color name="text">#fff</color>
 
-    <color name="gray">#999999</color>
-
     <color name="background">#000</color>
 
     <color name="control">#000</color>

diff --git a/app-test/src/main/res/values/styles.xml b/app-test/src/main/res/values/styles.xml
@@ -12,7 +12,7 @@
         <item name="android:windowBackground">@color/background</item>
 
         <item name="android:windowLightStatusBar" tools:targetApi="m">@bool/is_theme_light</item>
-        <item name="android:navigationBarColor">@color/colorPrimary</item>
+        <item name="android:navigationBarColor" tools:targetApi="lollipop">@color/colorPrimary</item>
         <item name="android:windowLightNavigationBar" tools:targetApi="o_mr1">@bool/nav_bar_light</item>
         <item name="colorControlHighlight">@color/colorPrimary</item>
     </style>

diff --git 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.
 
 buildscript {
-    ext.kotlin_version = '1.4.0'
+    ext.kotlin_version = '1.4.10'
     ext.anko_version = '0.10.8'
     repositories {
         google()