update to 3.18.3

Donnnno · Jul 9, 2023 · 1a8ee66 · 1a8ee66
1 parent 9e61090
commit 1a8ee66
Show file tree

Hide file tree

Showing 7 changed files with 72 additions and 167 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -47,6 +47,23 @@ dependencies {
      * If you've missed some versions you've to also follow update guide for those versions
      */
 
-    implementation 'com.github.Donnnno:candybar-foss:3.17.4'
+    implementation 'com.github.Donnnno:candybar-foss:3.18.3'
 
 }
+
+// Code for automatically copying appfilter.xml and drawable.xml
+// from `res/xml` directory to `assets` directory
+task copyXMLs {
+    ['appfilter.xml', 'drawable.xml'].each {file ->
+        copy {
+            from "$projectDir/src/main/res/xml/$file"
+            into "$projectDir/src/main/assets/"
+        }
+    }
+}
+
+tasks.whenTaskAdded { task ->
+    if (task.name == 'assembleDebug' || task.name == 'assembleRelease') {
+        task.dependsOn copyXMLs
+    }
+}
diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro
@@ -1,24 +1,14 @@
-# Add project specific ProGuard rules here.
-# By default, the flags in this file are appended to flags specified
-# in D:\AndroidSDK/tools/proguard/proguard-android.txt
-# You can edit the include path and order by changing the proguardFiles
-# directive in build.gradle.
-#
-# For more details, see
-#   http://developer.android.com/guide/developing/tools/proguard.html
+-optimizationpasses 5
+-overloadaggressively
+-dontpreverify
+-repackageclasses 'o'
+-allowaccessmodification
 
-# Add any project specific keep options here:
+-keep class **.R
+-keep class **.R$* {
+    <fields>;
+}
 
-# If your project uses WebView with JS, uncomment the following
-# and specify the fully qualified class name to the JavaScript interface
-# class:
-#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
-#   public *;
-#}
-
--dontwarn org.conscrypt.Conscrypt$Version
--dontwarn org.conscrypt.Conscrypt
--dontwarn org.conscrypt.ConscryptHostnameVerifier
--dontwarn org.openjsse.javax.net.ssl.SSLParameters
--dontwarn org.openjsse.javax.net.ssl.SSLSocket
--dontwarn org.openjsse.net.ssl.OpenJSSE
+# Keep the source line when using ProGuard
+-keepattributes SourceFile,LineNumberTable
+-renamesourcefileattribute SourceFile
diff --git a/app/src/main/assets/appfilter.xml b/app/src/main/assets/appfilter.xml
@@ -1,125 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <resources>
 
-    <!-- THIS IS JUST AN EXAMPLE -->
-
-    <!-- Nova Launcher Default App Drawer -->
-    <item component=":LAUNCHER_ACTION_APP_DRAWER" drawable="home_home2apps_button" />
-
-    <!-- Google Calendar -->
-    <item component="ComponentInfo{com.google.android.calendar/com.android.calendar.LaunchActivity}"
-        drawable="calendar_12" />
-    <item
-        component="ComponentInfo{com.google.android.calendar/com.android.calendar.AllInOneActivity}"
-        drawable="calendar_12" />
-
-    <!-- Calendar -->
-    <item component="ComponentInfo{com.android.calendar/com.android.calendar.LaunchActivity}"
-        drawable="calendar2_12" />
-    <item component="ComponentInfo{com.htc.calendar/com.htc.calendar.LaunchActivity}"
-        drawable="calendar2_12" />
-    <item component="ComponentInfo{com.htc.calendar/com.htc.calendar.CalendarActivityMain}"
-        drawable="calendar2_12" />
-    <item component="ComponentInfo{com.htc.calendar/com.htc.calendar.CalendarCarouselActivity}"
-        drawable="calendar2_12" />
-    <item component="ComponentInfo{com.android.calendar/com.android.calendar.AllInOneActivity}"
-        drawable="calendar2_12" />
-    <item component="ComponentInfo{com.android.calendar/com.android.calendar.CalendarTabActivity}"
-        drawable="calendar2_12" />
-    <item
-        component="ComponentInfo{com.asus.calendar.watchcalendar/com.asus.calendar.watchcalendar.WatchCalendarActivity}"
-        drawable="calendar2_12" />
-    <item
-        component="ComponentInfo{com.asus.calendar.watchcalendar/com.asus.calendar.watchcalendar.LaunchActivity}"
-        drawable="calendar2_12" />
-    <item
-        component="ComponentInfo{com.sonyericsson.androidapp.lunarcalendar/com.sonyericsson.androidapp.lunarcalendar.CalendarActivity}"
-        drawable="calendar2_12" />
-    <item
-        component="ComponentInfo{com.sonyericsson.calendar/com.sonyericsson.calendar.monthview.MonthViewActivity}"
-        drawable="calendar2_12" />
-    <item component="ComponentInfo{com.motorola.calendar/com.motorola.calendar.LaunchActivity}"
-        drawable="calendar2_12" />
-    <item component="ComponentInfo{com.oppo.calendar/com.oppo.calendar.activity.CalendarActivity}"
-        drawable="calendar2_12" />
-    <item component="ComponentInfo{com.lge.calendar/com.lge.calendar.LaunchActivity}"
-        drawable="calendar2_12" />
-    <item component="ComponentInfo{com.lenovo.app.Calendar/com.lenovo.app.Calendar.MonthUI}"
-        drawable="calendar2_12" />
-    <item
-        component="ComponentInfo{com.sec.android.app.latin.launcher.calendar/com.sec.android.app.latin.launcher.calendar.Launcher}"
-        drawable="calendar2_12" />
-    <item
-        component="ComponentInfo{com.lenovo.app.Calendar/com.lenovo.app.Calendar.MonthActivityNew}"
-        drawable="calendar2_12" />
-    <item component="ComponentInfo{com.android.calendar/com.android.calendar.MonthActivity}"
-        drawable="calendar2_12" />
-
-    <!-- Today Calendar -->
-    <item
-        component="ComponentInfo{com.underwood.calendar_beta/com.android.calendar.AllInOneActivity}"
-        drawable="today_calendar2_12" />
-    <item component="ComponentInfo{com.underwood.calendar/com.android.calendar.AllInOneActivity}"
-        drawable="today_calendar2_12" />
-
-    <!-- Dynamic Calendar - Today Calendar -->
-    <calendar
-        component="ComponentInfo{com.underwood.calendar_beta/com.android.calendar.AllInOneActivity}"
-        prefix="today_calendar2_" />
-    <calendar
-        component="ComponentInfo{com.underwood.calendar/com.android.calendar.AllInOneActivity}"
-        prefix="today_calendar2_" />
-
-    <!-- Dynamic Calendar - Google Calendar -->
-    <calendar
-        component="ComponentInfo{com.google.android.calendar/com.android.calendar.LaunchActivity}"
-        prefix="calendar_" />
-    <calendar
-        component="ComponentInfo{com.google.android.calendar/com.android.calendar.AllInOneActivity}"
-        prefix="calendar_" />
-
-    <!-- Dynamic Calendar - Calendar -->
-    <calendar component="ComponentInfo{com.android.calendar/com.android.calendar.LaunchActivity}"
-        prefix="calendar2_" />
-    <calendar component="ComponentInfo{com.htc.calendar/com.htc.calendar.LaunchActivity}"
-        prefix="calendar2_" />
-    <calendar component="ComponentInfo{com.htc.calendar/com.htc.calendar.CalendarActivityMain}"
-        prefix="calendar2_" />
-    <calendar component="ComponentInfo{com.htc.calendar/com.htc.calendar.CalendarCarouselActivity}"
-        prefix="calendar2_" />
-    <calendar component="ComponentInfo{com.android.calendar/com.android.calendar.AllInOneActivity}"
-        prefix="calendar2_" />
-    <calendar
-        component="ComponentInfo{com.android.calendar/com.android.calendar.CalendarTabActivity}"
-        prefix="calendar2_" />
-    <calendar
-        component="ComponentInfo{com.asus.calendar.watchcalendar/com.asus.calendar.watchcalendar.WatchCalendarActivity}"
-        prefix="calendar2_" />
-    <calendar
-        component="ComponentInfo{com.asus.calendar.watchcalendar/com.asus.calendar.watchcalendar.LaunchActivity}"
-        prefix="calendar2_" />
-    <calendar
-        component="ComponentInfo{com.sonyericsson.androidapp.lunarcalendar/com.sonyericsson.androidapp.lunarcalendar.CalendarActivity}"
-        prefix="calendar2_" />
-    <calendar
-        component="ComponentInfo{com.sonyericsson.calendar/com.sonyericsson.calendar.monthview.MonthViewActivity}"
-        prefix="calendar2_" />
-    <calendar component="ComponentInfo{com.motorola.calendar/com.motorola.calendar.LaunchActivity}"
-        prefix="calendar2_" />
-    <calendar
-        component="ComponentInfo{com.oppo.calendar/com.oppo.calendar.activity.CalendarActivity}"
-        prefix="calendar2_" />
-    <calendar component="ComponentInfo{com.lge.calendar/com.lge.calendar.LaunchActivity}"
-        prefix="calendar2_" />
-    <calendar component="ComponentInfo{com.lenovo.app.Calendar/com.lenovo.app.Calendar.MonthUI}"
-        prefix="calendar2_" />
-    <calendar
-        component="ComponentInfo{com.sec.android.app.latin.launcher.calendar/com.sec.android.app.latin.launcher.calendar.Launcher}"
-        prefix="calendar2_" />
-    <calendar
-        component="ComponentInfo{com.lenovo.app.Calendar/com.lenovo.app.Calendar.MonthActivityNew}"
-        prefix="calendar2_" />
-    <calendar component="ComponentInfo{com.android.calendar/com.android.calendar.MonthActivity}"
-        prefix="calendar2_" />
+    <iconback img1="iconback" />
+    <iconmask img1="iconmask" />
+    <scale factor="0.64" />
+
+    <!-- Nova Launcher Stuff -->
+    <item component=":BROWSER" drawable="browser" />
+    <item component=":CALCULATOR" drawable="calculator" />
+    <item component=":CALENDAR" drawable="calendar" />
+    <item component=":CAMERA" drawable="camera" />
+    <item component=":CLOCK" drawable="clock" />
+    <item component=":CONTACTS" drawable="contacts" />
+    <item component=":EMAIL" drawable="email" />
+    <item component=":GALLERY" drawable="gallery" />
+    <item component=":PHONE" drawable="phone" />
+    <item component=":SMS" drawable="messaging" />
+    <item component=":LAUNCHER_ACTION_APP_DRAWER" drawable="app_drawer" />
+
+    <item component="ComponentInfo{some.app.sample/some.app.sample.MainActivity}" drawable="some_app" />
 
 </resources>
diff --git a/app/src/main/assets/drawable.xml b/app/src/main/assets/drawable.xml
@@ -2,27 +2,18 @@
 <resources>
     <version>1</version>
 
-    <category title="Newly Added" />
-    <item drawable="email" />
-    <item drawable="app_camera" />
-    <item drawable="keyboard" />
+    <category title="Group 1" />
+    <item drawable="icon_1" />
+    <item drawable="icon_2" />
+    <item drawable="icon_3" />
+    <item drawable="icon_4" />
+    <item drawable="icon_5" />
 
-    <category title="Apps" />
-    <item drawable="email" />
-    <item drawable="app_camera" />
-    <item drawable="keyboard" />
-    <item drawable="email" />
-    <item drawable="app_camera" />
-    <item drawable="keyboard" />
+    <category title="Group 2" />
+    <item drawable="icon_6" />
+    <item drawable="icon_7" />
+    <item drawable="icon_8" />
+    <item drawable="icon_9" />
+    <item drawable="icon_10" />
 
-    <category title="Games" />
-    <item drawable="email" />
-    <item drawable="app_camera" />
-    <item drawable="keyboard" />
-    <item drawable="email" />
-    <item drawable="app_camera" />
-    <item drawable="keyboard" />
-    <item drawable="email" />
-    <item drawable="app_camera" />
-    <item drawable="keyboard" />
 </resources>
diff --git a/app/src/main/java/com/candybar/sample/applications/CandyBar.java b/app/src/main/java/com/candybar/sample/applications/CandyBar.java
@@ -1,5 +1,7 @@
 package com.candybar.sample.applications;
 
+import com.candybar.sample.R;
+
 import androidx.annotation.NonNull;
 
 // TODO: Remove `//` below to enable OneSignal
@@ -21,6 +23,12 @@ public void onCreate() {
     }
     */
 
+    @NonNull
+    @Override
+    public Class<?> getDrawableClass() {
+        return R.drawable.class;
+    }
+
     @NonNull
     @Override
     public Configuration onInit() {

diff --git a/app/src/main/res/values/launchers.xml b/app/src/main/res/values/launchers.xml
@@ -14,6 +14,8 @@
         <item>holo</item>
         <item>holo_hd</item>
         <item>hyperion</item>
+        <item>kiss</item>
+        <item>kvaesitso</item>
         <item>lawnchair</item>
         <item>lg_home</item>
         <item>lucid</item>
@@ -22,10 +24,9 @@
         <item>nougat</item>
         <item>nova</item>
         <item>omega</item>
-        <item>one_ui</item>
         <item>pixel</item>
         <item>poco</item>
-        <item>posidon</item>
+        <item>samsung_one_ui</item>
         <item>smart</item>
         <item>solo</item>
         <item>square</item>

diff --git a/build.gradle b/build.gradle
@@ -5,7 +5,7 @@ buildscript {
     }
 
     dependencies {
-        classpath 'com.android.tools.build:gradle:8.0.1'
+        classpath 'com.android.tools.build:gradle:8.0.2'
     }
 }