Merge pull request #294 from jahirfiquitiva/kuper-240

jahirfiquitiva · Jul 26, 2022 · be7bd3c · be7bd3c
2 parents c273fdf + 0b09381
commit be7bd3c
Show file tree

Hide file tree

Showing 12 changed files with 87 additions and 63 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -18,7 +18,7 @@ apply plugin: 'com.onesignal.androidsdk.onesignal-gradle-plugin'
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-parcelize'
-apply plugin: 'kotlin-kapt'
+apply plugin: 'com.google.devtools.ksp'
 
 android {
     signingConfigs {
@@ -34,7 +34,7 @@ android {
         }
     }
 
-    lintOptions {
+    lint {
         abortOnError false
         checkReleaseBuilds true
         disable 'MissingTranslation', 'GoogleAppIndexingWarning'
@@ -59,13 +59,10 @@ android {
         proguardFiles 'proguard-android-optimize.txt', 'proguard-rules.pro'
         consumerProguardFiles 'proguard-android-optimize.txt', 'proguard-rules.pro'
 
-        javaCompileOptions {
-            annotationProcessorOptions {
-                arguments = [
-                        "room.schemaLocation"  : "$projectDir/schemas".toString(),
-                        "room.incremental"     : "true",
-                        "room.expandProjection": "true"]
-            }
+        ksp {
+            arg("room.schemaLocation", "$projectDir/schemas")
+            arg("room.incremental", "true")
+            arg("room.expandProjection", "true")
         }
     }
 
@@ -89,10 +86,14 @@ android {
     }
 
     packagingOptions {
-        pickFirst 'META-INF/core_debug.kotlin_module'
-        pickFirst 'META-INF/core_release.kotlin_module'
-        pickFirst 'META-INF/library_debug.kotlin_module'
-        pickFirst 'META-INF/library_release.kotlin_module'
+        resources {
+            pickFirsts += [
+                    'META-INF/core_debug.kotlin_module',
+                    'META-INF/core_release.kotlin_module',
+                    'META-INF/library_debug.kotlin_module',
+                    'META-INF/library_release.kotlin_module'
+            ]
+        }
     }
 
     compileOptions {

diff --git a/build.gradle b/build.gradle
@@ -14,6 +14,7 @@ buildscript {
         classpath Plugins.android
         classpath Plugins.kotlin
         classpath Plugins.sonatype
+        classpath Plugins.ksp
     }
 }
 

diff --git a/buildSrc/src/main/java/Blueprint.kt b/buildSrc/src/main/java/Blueprint.kt
@@ -2,6 +2,6 @@
 
 object Blueprint {
     const val appId = "dev.jahir.blueprint.app"
-    const val version = 228
-    const val versionName = "2.2.8"
+    const val version = 230
+    const val versionName = "2.3.0"
 }
diff --git a/buildSrc/src/main/java/Plugins.kt b/buildSrc/src/main/java/Plugins.kt
@@ -14,4 +14,8 @@ object Plugins {
     // Sonatype
     const val sonatype =
         "io.github.gradle-nexus:publish-plugin:${Versions.sonatype}"
+
+    // KSP
+    const val ksp =
+        "com.google.devtools.ksp:com.google.devtools.ksp.gradle.plugin:${Versions.ksp}"
 }
diff --git a/buildSrc/src/main/java/Versions.kt b/buildSrc/src/main/java/Versions.kt
@@ -2,21 +2,22 @@
 
 object Versions {
     // Plugins
-    const val gradle = "7.1.1"
-    const val kotlin = "1.5.31"
+    const val gradle = "7.2.1"
+    const val kotlin = "1.7.0"
     const val sonatype = "1.1.0"
+    const val ksp = "$kotlin-1.0.6"
 
     // OneSignal
     const val oneSignalPlugin = "0.14.0"
-    const val oneSignal = "4.6.7"
+    const val oneSignal = "4.8.1"
 
     // App
     const val minSdk = 21
-    const val targetSdk = 31
-    const val buildTools = "30.0.3"
+    const val targetSdk = 32
+    const val buildTools = "32.0.0"
 
     // Kuper
-    const val kuper = "2.3.8"
+    const val kuper = "2.4.0"
 
     // Adaptive Icons
     const val adaptiveIcons = "1.0.0"

diff --git a/gradle.properties b/gradle.properties
@@ -19,4 +19,3 @@ android.useAndroidX=true
 android.enableJetifier=true
 # Kotlin code style for this project: "official" or "obsolete":
 kotlin.code.style=official
-kapt.incremental.apt=true
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
-#Tue Mar 17 11:37:25 COT 2020
+#Sun Jul 24 22:47:34 CEST 2022
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.5-bin.zip
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.2-bin.zip
+zipStoreBase=GRADLE_USER_HOME
diff --git a/library/build.gradle b/library/build.gradle
@@ -1,13 +1,13 @@
 apply plugin: 'com.android.library'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-parcelize'
-apply plugin: 'kotlin-kapt'
+apply plugin: 'com.google.devtools.ksp'
 
 android {
     compileSdkVersion Versions.targetSdk
     buildToolsVersion Versions.buildTools
 
-    lintOptions {
+    lint {
         abortOnError false
         checkReleaseBuilds true
         warningsAsErrors true
@@ -29,13 +29,10 @@ android {
         proguardFiles 'proguard-android-optimize.txt', 'proguard-rules.pro'
         consumerProguardFiles 'proguard-android-optimize.txt', 'proguard-rules.pro'
 
-        javaCompileOptions {
-            annotationProcessorOptions {
-                arguments = [
-                        "room.schemaLocation"  : "$projectDir/schemas".toString(),
-                        "room.incremental"     : "true",
-                        "room.expandProjection": "true"]
-            }
+        ksp {
+            arg("room.schemaLocation", "$projectDir/schemas")
+            arg("room.incremental", "true")
+            arg("room.expandProjection", "true")
         }
     }
 
@@ -56,10 +53,14 @@ android {
     }
 
     packagingOptions {
-        pickFirst 'META-INF/core_debug.kotlin_module'
-        pickFirst 'META-INF/core_release.kotlin_module'
-        pickFirst 'META-INF/library_debug.kotlin_module'
-        pickFirst 'META-INF/library_release.kotlin_module'
+        resources {
+            pickFirsts += [
+                    'META-INF/core_debug.kotlin_module',
+                    'META-INF/core_release.kotlin_module',
+                    'META-INF/library_debug.kotlin_module',
+                    'META-INF/library_release.kotlin_module'
+            ]
+        }
     }
 
     compileOptions {

diff --git a/library/src/main/AndroidManifest.xml b/library/src/main/AndroidManifest.xml
@@ -49,6 +49,11 @@
             </intent-filter>
         </activity>
 
+        <activity
+            android:name=".ui.activities.BlueprintAboutActivity"
+            android:exported="false"
+            android:label="@string/about" />
+
     </application>
 
     <queries>

diff --git a/library/src/main/kotlin/dev/jahir/blueprint/ui/activities/BlueprintAboutActivity.kt b/library/src/main/kotlin/dev/jahir/blueprint/ui/activities/BlueprintAboutActivity.kt
@@ -0,0 +1,8 @@
+package dev.jahir.blueprint.ui.activities
+
+import dev.jahir.frames.ui.activities.AboutActivity
+import dev.jahir.blueprint.BuildConfig
+
+class BlueprintAboutActivity : AboutActivity() {
+    override val dashboardName = BuildConfig.DASHBOARD_NAME
+}
diff --git a/library/src/main/kotlin/dev/jahir/blueprint/ui/activities/BlueprintActivity.kt b/library/src/main/kotlin/dev/jahir/blueprint/ui/activities/BlueprintActivity.kt
@@ -195,6 +195,10 @@ abstract class BlueprintActivity : FramesActivity(), RequestCallback {
                 shouldCallSuper = false
                 startActivity(Intent(this, BlueprintSettingsActivity::class.java))
             }
+            R.id.about -> {
+                shouldCallSuper = false
+                startActivity(Intent(this, BlueprintAboutActivity::class.java))
+            }
         }
         return if (shouldCallSuper) super.onOptionsItemSelected(item) else true
     }

diff --git a/library/src/main/res/values/translatable_strings.xml b/library/src/main/res/values/translatable_strings.xml
@@ -31,7 +31,7 @@
     <string name="send_using">Send With:</string>
     <string name="request_in_progress">Sending Request</string>
     <string name="request_in_progress_content">A request is already being sent.</string>
-    <string name="building_request_dialog">Preparing request...</string>
+    <string name="building_request_dialog">Preparing request…</string>
     <string name="request_upload_success_content">Request sent.</string>
     <string name="no_selected_apps">No Apps Selected</string>
     <string name="no_selected_apps_content">Select apps to send a request.</string>
@@ -58,36 +58,36 @@
 
     <!-- HELP SECTION -->
     <string-array name="questions">
-        <item>How to use the Icon Pack?</item>
-        <item>How to apply the Icon Pack?</item>
+        <item>How to use the icon pack?</item>
+        <item>How to apply the icon pack?</item>
         <item>How to see all the included icons?</item>
         <item>How to replace an icon with an alternative one?</item>
-        <item>How to request unthemed icons?</item>
-        <item>After restarting my device, icon pack is not applied anymore. Icons were restored to default.</item>
-        <item>Why do icons look pixelated on my device?</item>
-        <item>I can see an icon for X app in the included icons, but the icon does not apply.</item>
-        <item>Why does the app need permission to modify or delete content of my storage?</item>
-        <item>Why does the app need permission to full network access?</item>
+        <item>How to request new icons?</item>
+        <item>I’ve restarted my device and the icon pack isn’t applied anymore. The default icons have been restored.</item>
+        <item>Why do the icons look pixelated on my device?</item>
+        <item>I can see an icon for a specific app in the icon list, but it’s not being applied.</item>
+        <item>Why does the app need permission to modify or delete the files on my device?</item>
+        <item>Why does the app need full network access?</item>
         <item>Why does the app need permission to view connections?</item>
-        <item>Why does the app need permission to set wallpaper?</item>
+        <item>Why does the app need permission to set the wallpaper?</item>
         <item>Why does the app need permission to adjust the wallpaper size?</item>
-        <item>Why does the app need permission to prevent phone from sleeping?</item>
+        <item>Why does the app need permission to prevent the device from sleeping?</item>
     </string-array>
 
     <string-array name="answers">
-        <item>You need a launcher with icon packs support. The list of supported launchers might be found in the app in the \"Apply\" section, or Play Store description.</item>
-        <item>Depending on the app\'s navigation type, you need to either slide the navigation drawer from the left, and go to \"Apply\" section, or choose 4th icon from the bottom navigation bar. From there you can choose a launcher you want to apply the icons to. Some launchers doesn\'t support auto-applying and you have to do it manually through their settings.</item>
-        <item>Go back to main section of the app and tap the tile titled \"Icons\".</item>
-        <item>Depending on the launcher you\'re using, you either have to long tap the icon and select \"Edit\" from the pop-up menu, or long tap the icon and move it to a \"Edit\" box.</item>
-        <item>Depending on the app\'s navigation type, you need to either slide the navigation drawer from the left, and go to \"Requests\" section, or choose the icon from the bottom navigation bar.</item>
-        <item>It happened because the icon pack was moved to SD Card, you should install it in internal storage.</item>
-        <item>The problem might come with the launcher you are using, when handling big resolution. You can fix it by increasing icon size to 115 – 120%. Or try using another launcher.</item>
-        <item>Send an icon request.</item>
-        <item>It\'s needed to be able write icon requests data and files, as well as saving wallpapers, and being able to change Wallpapers\' download location.</item>
-        <item>It\'s needed to be able to load wallpapers from cloud and download them.</item>
-        <item>It\'s needed to be able to check if your device has internet connection.</item>
-        <item>It\'s needed to be able to apply wallpaper directly from the app.</item>
-        <item>It\'s needed to be able to adjust wallpapers dimensions based on your screen resolution.</item>
-        <item>It\'s needed by Muzei Live Wallpaper.</item>
+        <item>You need a launcher with icon pack support. You’ll find a list of supported launchers in the “Apply” section or in the app’s description on the Play Store.</item>
+        <item>Depending on the app’s navigation type, either slide out the navigation drawer from the left and go to the “Apply” section, or choose “Apply” in the bottom navigation bar. On the “Apply” page, select your launcher. If your launcher isn’t listed, apply the icon pack via the launcher’s settings.</item>
+        <item>On the main page of the app, tap the tile titled “Icons.”</item>
+        <item>Depending on the launcher you’re using, either tap and hold the icon and select “Edit” from the pop-up menu, or tap and hold the icon and drag it to the “Edit” box near the top of the screen.</item>
+        <item>Depending on the app’s navigation type, either slide out the navigation drawer from the left and go to the “Request” section, or choose “Request” in the bottom navigation bar.</item>
+        <item>This happened because the icon pack has been moved to the SD card. You should move it back to internal storage.</item>
+        <item>Your launcher may be incorrectly handling the resolution of the icons. You can fix this by increasing the icon size to 115%–120% or switching to another launcher.</item>
+        <item>Please send an icon request.</item>
+        <item>It’s needed to create icon request files, save wallpapers, and set the download location for wallpapers.</item>
+        <item>It’s needed to load wallpapers from the cloud and download them.</item>
+        <item>It’s needed to check if your device is connected to the internet.</item>
+        <item>It’s needed to let you apply wallpapers directly from the app.</item>
+        <item>It’s needed to adjust the dimensions of wallpapers based on the resolution of your device’s screen.</item>
+        <item>It’s needed by Muzei Live Wallpaper.</item>
     </string-array>
 </resources>