Update for v3.5.0-beta.6.6

zixpo · Oct 18, 2019 · 0f17bd7 · 0f17bd7
1 parent f52f8ee
commit 0f17bd7
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 14 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -1,19 +1,19 @@
-// Remove '/*' and '*/' below to enable OneSignal
+// Remove '/*' and '*/' to Enable OneSignal
 /*
 buildscript {
-  repositories {
-    maven { url 'https://plugins.gradle.org/m2/' }
-  }
-  dependencies {
-    classpath 'gradle.plugin.com.onesignal:onesignal-gradle-plugin:0.12.3'
-  }
+    repositories {
+        maven { url 'https://plugins.gradle.org/m2/' }
+    }
+    dependencies {
+        classpath 'gradle.plugin.com.onesignal:onesignal-gradle-plugin:0.12.6'
+    }
 }
 apply plugin: 'com.onesignal.androidsdk.onesignal-gradle-plugin'
 */
 apply plugin: 'com.android.application'
 
 repositories {
-    maven { url 'https://maven.google.com' }
+    maven { url 'https://jitpack.io' }
 }
 
 android {
@@ -25,7 +25,7 @@ android {
         variant.outputs.all { output ->
             def appName = parent.name
             def fileName = appName.replace(" ", "_")
-            outputFileName = "$fileName-v${variant.versionName}.apk"
+            outputFileName = "$fileName-v${variant.versionCode}.apk"
         }
     }
 
@@ -73,8 +73,8 @@ dependencies {
      * 6. Done
      */
 
-    implementation 'com.github.zixpo:candybar:v3.5.0-beta.6.5'
+    implementation 'com.github.zixpo:candybar:v3.5.0-beta.6.6'
 
     // Remove '//' below to Enable OneSignal
-    //implementation 'com.onesignal:OneSignal:3.10.7'
+    //implementation 'com.onesignal:OneSignal:3.11.3'
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -21,10 +21,11 @@
         android:name=".applications.CandyBar"
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
+        android:networkSecurityConfig="@xml/network_config"
+        android:requestLegacyExternalStorage="true"
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
-        android:networkSecurityConfig="@xml/network_config"
         tools:replace="android:icon">
 
         <activity
@@ -58,6 +59,11 @@
             </intent-filter>
         </activity>
 
+        <!--
+          Set `android:enabled="false"` to `android:enabled="true"` below if you don't want
+          your app to be locked until opened.
+        -->
+
         <activity-alias
             android:name=".alias.Intent"
             android:targetActivity=".activities.MainActivity"

diff --git a/app/src/main/java/com/candybar/sample/applications/CandyBar.java b/app/src/main/java/com/candybar/sample/applications/CandyBar.java
@@ -2,7 +2,7 @@
 
 import androidx.annotation.NonNull;
 
-// Remove '//' below to Enable OneSignal
+// Remove `//` below to Enable OneSignal
 //import com.onesignal.OneSignal;
 
 import candybar.lib.applications.CandyBarApplication;

diff --git a/app/src/main/java/com/candybar/sample/services/ClockWidget.java b/app/src/main/java/com/candybar/sample/services/ClockWidget.java
@@ -2,4 +2,4 @@
 
 import candybar.lib.services.CandyBarWidgetService;
 
-public class ClockWidget extends CandyBarWidgetService{}
+public class ClockWidget extends CandyBarWidgetService {}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -2,4 +2,4 @@

		import candybar.lib.services.CandyBarWidgetService;

		public class ClockWidget extends CandyBarWidgetService{}
		public class ClockWidget extends CandyBarWidgetService {}