From beb8645387342f4a037b755e93c96ee989ec3bc0 Mon Sep 17 00:00:00 2001
From: Sarsa Murmu <sarsamurmu05@gmail.com>
Date: Wed, 16 Sep 2020 19:02:37 +0530
Subject: [PATCH] Updated for v3.8.0

---
 app/build.gradle                              |  6 +--
 app/src/main/AndroidManifest.xml              |  2 +-
 .../sample/activities/MainActivity.java       |  2 +-
 .../sample/activities/SplashActivity.java     |  8 +---
 .../res/values/dashboard_configurations.xml   | 39 +++++++++++++------
 5 files changed, 35 insertions(+), 22 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 8c2aa76..001e6f4 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -5,7 +5,7 @@ buildscript {
         maven { url 'https://plugins.gradle.org/m2/' }
     }
     dependencies {
-        classpath 'gradle.plugin.com.onesignal:onesignal-gradle-plugin:0.12.6'
+        classpath 'gradle.plugin.com.onesignal:onesignal-gradle-plugin:0.12.8'
     }
 }
 apply plugin: 'com.onesignal.androidsdk.onesignal-gradle-plugin'
@@ -62,8 +62,8 @@ dependencies {
      * 6. Done
      */
 
-    implementation 'com.github.zixpo:candybar:3.7.4'
+    implementation 'com.github.zixpo:candybar:3.8.0'
 
     // Remove '//' below to Enable OneSignal
-    //implementation 'com.onesignal:OneSignal:3.12.4'
+    // implementation 'com.onesignal:OneSignal:3.15.0'
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d30b505..7aae91a 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -47,7 +47,7 @@
             android:name=".activities.MainActivity"
             android:launchMode="singleTop"
             android:theme="@style/AppTheme"
-            android:configChanges="orientation|keyboardHidden|screenSize">
+            android:configChanges="uiMode|orientation|keyboardHidden|screenSize">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
             </intent-filter>
diff --git a/app/src/main/java/com/candybar/sample/activities/MainActivity.java b/app/src/main/java/com/candybar/sample/activities/MainActivity.java
index 68a185b..8e869f6 100644
--- a/app/src/main/java/com/candybar/sample/activities/MainActivity.java
+++ b/app/src/main/java/com/candybar/sample/activities/MainActivity.java
@@ -3,7 +3,7 @@
 import androidx.annotation.NonNull;
 
 import candybar.lib.activities.CandyBarMainActivity;
-import candybar.lib.activities.configurations.ActivityConfiguration;
+
 import com.candybar.sample.licenses.License;
 
 public class MainActivity extends CandyBarMainActivity {
diff --git a/app/src/main/java/com/candybar/sample/activities/SplashActivity.java b/app/src/main/java/com/candybar/sample/activities/SplashActivity.java
index 44a5f36..6ca06e6 100644
--- a/app/src/main/java/com/candybar/sample/activities/SplashActivity.java
+++ b/app/src/main/java/com/candybar/sample/activities/SplashActivity.java
@@ -3,15 +3,11 @@
 import androidx.annotation.NonNull;
 
 import candybar.lib.activities.CandyBarSplashActivity;
-import candybar.lib.activities.configurations.SplashScreenConfiguration;
-import com.candybar.sample.R;
 
 public class SplashActivity extends CandyBarSplashActivity {
-
     @NonNull
     @Override
-    public SplashScreenConfiguration onInit() {
-        return new SplashScreenConfiguration(MainActivity.class)
-                .setBottomText(getString(R.string.splash_screen_title));
+    public Class<?> getMainActivity() {
+        return MainActivity.class;
     }
 }
diff --git a/app/src/main/res/values/dashboard_configurations.xml b/app/src/main/res/values/dashboard_configurations.xml
index 28d21f5..1123125 100644
--- a/app/src/main/res/values/dashboard_configurations.xml
+++ b/app/src/main/res/values/dashboard_configurations.xml
@@ -68,13 +68,13 @@
 
     <!-- Link to your app's Rate and Review page.
         Leave this empty to disable the "Rate and Review" button.
-        You can use special keyword `thisPackage`, `thisPackage` will be replaced with your app's package name -->
-    <string name="rate_and_review_link">https://play.google.com/store/apps/details?id=thisPackage</string>
+        You can use special keyword `{{packageName}}`, `{{packageName}}` will be replaced with your app's package name -->
+    <string name="rate_and_review_link">https://play.google.com/store/apps/details?id={{packageName}}</string>
 
     <!-- Link to your app's main page. It will be used when your user shares your app using "Share" button.
         Leave this empty to disable the "Share" button.
-        You can use special keyword `thisPackage`, `thisPackage` will be replaced with your app's package name -->
-    <string name="share_link">https://play.google.com/store/apps/details?id=thisPackage</string>
+        You can use special keyword `{{packageName}}`, `{{packageName}}` will be replaced with your app's package name -->
+    <string name="share_link">https://play.google.com/store/apps/details?id={{packageName}}</string>
 
     <!-- Enable "Check for update" button.
         It needs the option "config_json" to be configured in order to work -->
@@ -125,6 +125,10 @@
     <!-- Shows icon's name below the icon, in "Icons" section -->
     <bool name="show_icon_name">true</bool>
 
+    <!-- Enable if your icon pack includes adaptive icons.
+        When enabled, the dashboard shows an Icon Shape changer button -->
+    <bool name="includes_adaptive_icons">false</bool>
+
     <!-- Icons section will read icons from drawable.xml same as Nova Launcher
         Put drawable.xml inside the "xml" folder -->
 
@@ -176,15 +180,28 @@
         If you want to hide the information then you should enable this -->
     <bool name="hide_missing_app_count">false</bool>
 
-    <!-- Email that will be used to send icon request and report bugs -->
-    <string name="dev_email">yourmail@example.com</string>
+    <!-- Method to use for icon request. Value can be "email" or "arctic".
+        `email` -> Sends icon requests using email
+        `arctic` -> Sends icon requests using Arctic Manager
+
+        You can leave "premium_request_method" empty to use the regular request's method to send premium icon requests. -->
+    <string name="regular_request_method">email</string>
+    <string name="premium_request_method"></string>
+
+    <!-- Email to use when sending icon requests.
+        Regular request email address will be used to send bug reports.
+        You can leave "premium_request_email" empty to use the regular request's email to send premium icon requests. -->
+    <string name="regular_request_email">youremail@example.com</string>
+    <string name="premium_request_email"></string>
 
-    <!-- Icon Request Email Subject. Leave Empty to Use Default Subject. -->
-    <string name="request_email_subject"></string>
+    <!-- Icon request email subjects. Leave empty to use default Subject. -->
+    <string name="regular_request_email_subject"></string>
     <string name="premium_request_email_subject"></string>
 
-    <!-- Icon Request with Arctic Manager. Leave empty to disable Arctic Manager. -->
-    <string name="arctic_manager_api_key"></string>
+    <!-- API keys for Arctic Manager.
+        You can leave "premium_request_arctic_api_key" empty to use the regular request's arctic api key to send premium icon requests. -->
+    <string name="regular_request_arctic_api_key"></string>
+    <string name="premium_request_arctic_api_key"></string>
 
 
     <!--
@@ -308,7 +325,7 @@
 
     <!-- Link to CandyBar config JSON
         You can use this to control your dashboard remotely.
-        Learn more at https://github.com/zixpo/candybar-sample/wiki/Setting-up-Config-JSON -->
+        Learn more at https://github.com/zixpo/candybar-sample/wiki/Setting-up-the-config-json -->
     <string name="config_json"></string>
 
     <!-- Show intro guides on first run -->