Skip to content

Commit

Permalink
Update for v3.14.0
Browse files Browse the repository at this point in the history
  • Loading branch information
sarsamurmu committed May 7, 2022
1 parent 089bb3f commit 838932c
Show file tree
Hide file tree
Showing 7 changed files with 44 additions and 56 deletions.
4 changes: 2 additions & 2 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ buildscript {
maven { url 'https://plugins.gradle.org/m2/' }
}
dependencies {
classpath 'gradle.plugin.com.onesignal:onesignal-gradle-plugin:0.13.4'
classpath 'gradle.plugin.com.onesignal:onesignal-gradle-plugin:0.14.0'
}
}
apply plugin: 'com.onesignal.androidsdk.onesignal-gradle-plugin'
Expand Down Expand Up @@ -57,7 +57,7 @@ dependencies {
* If you've missed some versions you've to also follow update guide for those versions
*/

implementation 'com.github.zixpo:candybar:3.13.3'
implementation 'com.github.zixpo:candybar:3.14.0'

// TODO: Remove `//` below to enable OneSignal
//implementation 'com.onesignal:OneSignal:[4.0.0, 4.99.99]'
Expand Down
36 changes: 6 additions & 30 deletions app/proguard-rules.pro
Original file line number Diff line number Diff line change
Expand Up @@ -16,36 +16,12 @@
# public *;
#}

# Android Support Library
-keep class !android.support.v7.internal.view.menu.**,android.support.** {*;}
-keep class android.support.v7.graphics.** { *; }
-dontwarn android.support.v7.graphics.**

-keep class android.support.design.widget.** { *; }
-keep interface android.support.design.widget.** { *; }
-dontwarn android.support.design.**
-optimizationpasses 5
-overloadaggressively
-dontpreverify
-repackageclasses 'o'
-allowaccessmodification

# Keep the source line when using ProGuard
-renamesourcefileattribute SourceFile
-keepattributes SourceFile,LineNumberTable

# LoganSquare JSON parser
-keep class com.bluelinelabs.logansquare.** { *; }
-keep @com.bluelinelabs.logansquare.annotation.JsonObject class *
-keep class **$$JsonObjectMapper { *; }

# Java 8
-dontwarn java.lang.invoke.*
-dontwarn **$$Lambda$*

# OkHttp
-dontwarn okhttp3.**
-dontwarn okio.**
-dontwarn javax.annotation.**
-keepnames class okhttp3.internal.publicsuffix.PublicSuffixDatabase
-dontwarn okhttp3.internal.platform.ConscryptPlatform
-dontwarn org.conscrypt.ConscryptHostnameVerifier

# Glide
-keep public class * extends com.bumptech.glide.module.AppGlideModule
-keep class com.bumptech.glide.GeneratedAppGlideModuleImpl
-renamesourcefileattribute SourceFile
12 changes: 8 additions & 4 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,15 +25,15 @@
android:label="@string/app_name"
android:supportsRtl="true"
android:theme="@style/CandyBar.Theme.App"
tools:replace="android:icon"
tools:targetApi="n">

<activity
android:name=".activities.SplashActivity"
android:launchMode="singleTop"
android:noHistory="true"
android:screenOrientation="portrait"
android:theme="@style/CandyBar.Theme.Splash">
android:theme="@style/CandyBar.Theme.Splash"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<category android:name="android.intent.category.LAUNCHER" />
Expand All @@ -47,7 +47,8 @@
android:name=".activities.MainActivity"
android:launchMode="singleTop"
android:theme="@style/CandyBar.Theme.App"
android:configChanges="uiMode|orientation|keyboardHidden|screenSize">
android:configChanges="uiMode|orientation|keyboardHidden|screenSize"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
</intent-filter>
Expand Down Expand Up @@ -198,7 +199,10 @@
android:value="@color/muzei_color" />
</provider>

<receiver android:name=".services.ClockWidget" android:label="Clock Widget">
<receiver
android:name=".services.ClockWidget"
android:label="Clock Widget"
android:exported="false">
<intent-filter>
<action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
</intent-filter>
Expand Down
19 changes: 13 additions & 6 deletions app/src/main/res/values/dashboard_configurations.xml
Original file line number Diff line number Diff line change
Expand Up @@ -177,6 +177,13 @@
It needs the option "config_json" to be configured in order to work -->
<bool name="json_check_before_request">false</bool>

<!-- Adds signature that the icon pack is installed from Play Store.
When enabled adds a PNG image (__r_icon.png) to icon request ZIP if the app is installed from Play Store.
Also the color of the signature icon would be different for every versionCode, it's there so that any user
won't be able to add the icon to the ZIP manually to fake that they installed the app from Play Store.
So, don't forget to check what color is the signature icon before releasing update of your icon pack. -->
<bool name="enable_ps_signature">false</bool>

<!-- Enable or disable premium icon request
In premium request, your users will purchase a premium request product (which you specify in the "License.java" file)
Later they can use the premium request product to do premium icon request.
Expand All @@ -195,9 +202,9 @@
If you want to hide the information then you should enable this -->
<bool name="hide_missing_app_count">false</bool>

<!-- Method to use for icon request. Value can be "email" or "arctic".
<!-- Method to use for icon request. Value can be "email" or "pacific".
`email` -> Sends icon requests using email
`arctic` -> Sends icon requests using Arctic Manager
`pacific` -> Sends icon requests using Pacific 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>
Expand All @@ -213,10 +220,10 @@
<string name="regular_request_email_subject"></string>
<string name="premium_request_email_subject"></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>
<!-- API keys for Pacific Manager.
You can leave "premium_request_pacific_api_key" empty to use the regular request's pacific api key to send premium icon requests. -->
<string name="regular_request_pacific_api_key"></string>
<string name="premium_request_pacific_api_key"></string>


<!--
Expand Down
21 changes: 11 additions & 10 deletions app/src/main/res/values/launchers.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,15 +4,15 @@
<!-- Remove the Launcher that you don't want to show in apply section -->

<string-array name="dashboard_launchers">
<item>abc</item>
<!--<item>abc</item>-->
<item>action</item>
<item>adw</item>
<item>apex</item>
<item>atom</item>
<item>aviate</item>
<!--<item>atom</item>-->
<!--<item>aviate</item>-->
<item>blackberry</item>
<item>cm_theme</item>
<item>evie</item>
<!--<item>evie</item>-->
<item>flick</item>
<item>go_ex</item>
<item>holo</item>
Expand All @@ -21,22 +21,23 @@
<item>lawnchair</item>
<item>lg_home</item>
<item>lucid</item>
<item>m</item>
<!--<item>m</item>-->
<item>microsoft</item>
<item>mini</item>
<!--<item>mini</item>-->
<item>niagara</item>
<item>next</item>
<!--<item>next</item>-->
<item>nougat</item>
<item>nova</item>
<item>omega</item>
<item>pixel</item>
<item>poco</item>
<item>posidon</item>
<item>smart</item>
<item>solo</item>
<item>square</item>
<item>v</item>
<item>zenui</item>
<item>zero</item>
<!--<item>v</item>-->
<!--<item>zenui</item>-->
<!--<item>zero</item>-->
</string-array>

</resources>
6 changes: 3 additions & 3 deletions build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ buildscript {
}

dependencies {
classpath 'com.android.tools.build:gradle:7.0.3'
classpath 'com.android.tools.build:gradle:7.1.3'
}
}

Expand All @@ -19,8 +19,8 @@ allprojects {

rootProject.ext {
MinSdk = 16
TargetSdk = 30
CompileSdk = 30
TargetSdk = 32
CompileSdk = 32
}
}

Expand Down
2 changes: 1 addition & 1 deletion gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
Expand Up @@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-7.4.2-all.zip

0 comments on commit 838932c

Please sign in to comment.