Merge pull request #14 from Donnnno/master

Upgrading Candybar + making it fully FOSS
PapirusDevelopmentTeam · Jul 10, 2022 · 6bbbd59 · 6bbbd59
2 parents b76069a + 5c32e83
commit 6bbbd59
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 128 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -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.Donnnno:candybar-foss:3.14.2'
 
     // TODO: Remove `//` below to enable OneSignal
     //implementation 'com.onesignal:OneSignal:[4.0.0, 4.99.99]'

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -5,14 +5,10 @@
     package="io.github.PapirusDevelopmentTeam.papirus_icons">
 
     <!-- If you are not using donation and premium request, you need to remove BILLING permission -->
-    <uses-permission android:name="com.android.vending.BILLING" />
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
-    <!-- If you are not using license checker, you need to remove CHECK_LICENSE permission -->
-    <uses-permission android:name="com.android.vending.CHECK_LICENSE" />
-
     <supports-screens
         android:smallScreens="true"
         android:normalScreens="true"
@@ -36,7 +32,8 @@
             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" />
@@ -50,7 +47,8 @@
             android:name="io.github.PapirusDevelopmentTeam.papirus_icons.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>
@@ -201,7 +199,8 @@
                 android:value="@color/muzei_color" />
         </provider>
 
-        <receiver android:name="io.github.PapirusDevelopmentTeam.papirus_icons.services.ClockWidget" android:label="Clock Widget">
+        <receiver android:name="io.github.PapirusDevelopmentTeam.papirus_icons.services.ClockWidget" android:label="Clock Widget"
+            android:exported="false">
 
             <intent-filter>
                 <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />

diff --git a/...src/main/java/io/github/PapirusDevelopmentTeam/papirus_icons/activities/MainActivity.java b/...src/main/java/io/github/PapirusDevelopmentTeam/papirus_icons/activities/MainActivity.java
@@ -4,18 +4,11 @@
 
 import candybar.lib.activities.CandyBarMainActivity;
 
-import io.github.PapirusDevelopmentTeam.papirus_icons.licenses.License;
-
 public class MainActivity extends CandyBarMainActivity {
 
     @NonNull
     @Override
     public ActivityConfiguration onInit() {
-        return new ActivityConfiguration()
-                .setLicenseCheckerEnabled(License.isLicenseCheckerEnabled())
-                .setLicenseKey(License.getLicenseKey())
-                .setRandomString(License.getRandomString())
-                .setDonationProductsId(License.getDonationProductsId())
-                .setPremiumRequestProducts(License.getPremiumRequestProductsId(), License.getPremiumRequestProductsCount());
+        return new ActivityConfiguration();
     }
 }
diff --git a/app/src/main/java/io/github/PapirusDevelopmentTeam/papirus_icons/licenses/License.java b/app/src/main/java/io/github/PapirusDevelopmentTeam/papirus_icons/licenses/License.java
diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:7.0.3'
+        classpath 'com.android.tools.build:gradle:7.0.4'
     }
 }
 
@@ -19,8 +19,8 @@ allprojects {
 
     rootProject.ext {
         MinSdk = 16
-        TargetSdk = 30
-        CompileSdk = 30
+        TargetSdk = 31
+        CompileSdk = 31
     }
 }