Skip to content

Commit

Permalink
Merge pull request #619 from Mahmud0808/beta
Browse files Browse the repository at this point in the history 
Merge beta into stable
  • Loading branch information
@Mahmud0808
Mahmud0808 authored Sep 18, 2024
2 parents 138fbf2 + 507f0b5 commit 1a4b2f2
Show file tree
Hide file tree
Showing 2,449 changed files with 84,055 additions and 31,137 deletions.
2 changes: 1 addition & 1 deletion README.md
View file
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<div align="center">
<img src="https://raw.githubusercontent.com/Mahmud0808/Iconify/beta/.github/resources/banner.png" width="100%" alt="Banner">

# v6.8.0 is out!
# v6.9.0 is out!
</div>
<p align="center">
<a href="https://github.com/Mahmud0808/Iconify/releases"><img src="https://img.shields.io/github/downloads/Mahmud0808/Iconify/total?color=%233DDC84&logo=android&logoColor=%23fff&style=for-the-badge" alt="Downloads"></a>
Expand Down
19 changes: 16 additions & 3 deletions app/build.gradle.kts
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,8 @@ android {
applicationId = "com.drdisagree.iconify"
minSdk = 31
targetSdk = 34
versionCode = 20
versionName = "6.8.0"
versionCode = 21
versionName = "6.9.0"
setProperty("archivesBaseName", "Iconify v$versionName")
buildConfigField("int", "MIN_SDK_VERSION", "$minSdk")
}
Expand Down Expand Up @@ -65,6 +65,7 @@ android {
viewBinding = true
dataBinding = true
buildConfig = true
aidl = true
}

compileOptions {
Expand Down Expand Up @@ -112,6 +113,7 @@ dependencies {

// Data Binding
implementation(libs.library)
implementation(libs.androidx.palette.ktx)

// Xposed API
compileOnly(files("libs/api-82.jar"))
Expand All @@ -128,7 +130,7 @@ dependencies {
implementation(libs.kotlinx.coroutines.android)

// Color Picker
implementation(libs.colorpicker)
implementation(libs.jaredrummler.colorpicker)

// Splash Screen
implementation(libs.androidx.core.splashscreen)
Expand All @@ -142,6 +144,9 @@ dependencies {
// Zip Util
implementation(libs.zip4j)

// Preference
implementation(libs.androidx.preference.ktx)

// Remote Preference
implementation(libs.remotepreferences)

Expand Down Expand Up @@ -190,12 +195,20 @@ dependencies {
// Fading Edge Layout
implementation(libs.fadingedgelayout)

// Google Subject Segmentation - MLKit
implementation(libs.com.google.android.gms.play.services.mlkit.subject.segmentation)
implementation(libs.play.services.base)

// Blur View
implementation(libs.blurview)

// Misc
implementation(libs.androidx.appcompat)
implementation(libs.androidx.constraintlayout)
implementation(libs.androidx.work.runtime)
implementation(libs.androidx.work.runtime.ktx)
implementation(libs.slf4j.api)
implementation(libs.commons.text)
}

tasks.register("printVersionName") {
Expand Down
21 changes: 19 additions & 2 deletions app/proguard-rules.pro
View file
Original file line number Diff line number Diff line change
Expand Up @@ -21,15 +21,23 @@
public static int d(...);
}

# Activity and Fragment names
-keep class com.drdisagree.iconify.ui.activities.**
-keep class com.drdisagree.iconify.ui.fragments.**

# Xposed
-keep class de.robv.android.xposed.**
-keep class com.drdisagree.iconify.xposed.InitHook
-keepnames class com.drdisagree.iconify.xposed.**
-keepnames class com.drdisagree.iconify.config.XPrefs
-keepnames class com.drdisagree.iconify.xposed.utils.XPrefs
-keep class com.drdisagree.iconify.xposed.** {
<init>(android.content.Context);
}

# Weather
-keepnames class com.drdisagree.iconify.utils.weather.**
-keep class com.drdisagree.iconify.utils.weather.** { *; }

# EventBus
-keepattributes *Annotation*
-keepclassmembers,allowoptimization,allowobfuscation class * {
Expand Down Expand Up @@ -59,4 +67,13 @@

# Obfuscation
-repackageclasses
-allowaccessmodification
-allowaccessmodification

# Root Service
-keep class com.drdisagree.iconify.services.RootProviderProxy { *; }
-keep class com.drdisagree.iconify.IRootProviderProxy { *; }

# AIDL Classes
-keep interface **.I* { *; }
-keep class **.I*$Stub { *; }
-keep class **.I*$Stub$Proxy { *; }
201 changes: 201 additions & 0 deletions app/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,17 @@
<package android:name="app.revanced.android.youtube" />
<package android:name="app.revanced.android.apps.youtube.music" />
</queries>
<uses-permission
android:name="android.permission.QUERY_ALL_PACKAGES"
tools:ignore="QueryAllPackagesPermission" />

<!-- Weather Updater -->
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <!-- Weather Updater -->
<uses-permission android:name="android.permission.INTERNET" /> <!-- Weather Updater -->
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> <!-- Get Location for Weather -->
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" /> <!-- Get Location for Weather -->
<uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" /> <!-- Get Location for Weather -->
<uses-permission android:name="com.drdisagree.iconify.READ_WEATHER" /> <!-- Permission for self Weather Provider -->

<application
android:name=".Iconify"
Expand All @@ -43,6 +54,9 @@
<activity
android:name=".ui.activities.MainActivity"
android:exported="false" />
<activity
android:name=".ui.activities.LocationBrowseActivity"
android:exported="false" />
<activity
android:name=".SplashActivity"
android:exported="true"
Expand Down Expand Up @@ -102,6 +116,10 @@
android:exported="true"
tools:ignore="ExportedService" />
-->
<service
android:name=".services.RootProviderProxy"
android:exported="true"
tools:ignore="ExportedService" />
<service
android:name=".services.TileNotchBarKiller"
android:exported="true"
Expand Down Expand Up @@ -158,6 +176,9 @@
android:name="android.service.quicksettings.TOGGLEABLE_TILE"
android:value="true" />
</service> <!-- Quick Settings Tile -->
<meta-data
android:name="com.google.mlkit.vision.DEPENDENCIES"
android:value="subject_segment" /> <!-- ML Kit download -->
<meta-data
android:name="xposedmodule"
android:value="true" /> <!-- xposed meta data -->
Expand All @@ -170,12 +191,192 @@
<meta-data
android:name="xposedscope"
android:resource="@array/module_scope" /> <!-- xposed meta data -->
<meta-data
android:name="com.google.mlkit.vision.DEPENDENCIES"
android:value="subject_segment" /> <!-- ML Kit download -->
<provider
android:name=".provider.RemotePrefProvider"
android:authorities="${applicationId}"
android:directBootAware="true"
android:exported="true"
tools:ignore="ExportedContentProvider" /> <!-- Remote Preferences Provider -->
<provider
android:name=".utils.weather.WeatherContentProvider"
android:authorities="com.drdisagree.iconify.weatherprovider"
android:exported="true"
tools:ignore="ExportedContentProvider" /> <!-- Weather Content Provider -->

<!-- name is used a prefix +"_" for images e.g. weather_<condition_id>
weather_foo_<condition_id> -->
<activity
android:name=".google"
android:exported="false"
android:label="Google">
<intent-filter>
<action android:name="${applicationId}.WeatherIconPack" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>

<activity
android:name=".google_new_dark"
android:exported="false"
android:label="Google Material Dark">
<intent-filter>
<action android:name="${applicationId}.WeatherIconPack" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>

<activity
android:name=".google_new_light"
android:exported="false"
android:label="Google Material Light">
<intent-filter>
<action android:name="${applicationId}.WeatherIconPack" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>

<activity
android:name=".outline"
android:exported="false"
android:label="Outline">
<intent-filter>
<action android:name="${applicationId}.WeatherIconPack" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>

<activity
android:name=".weather_color"
android:exported="false"
android:label="LockClock">
<intent-filter>
<action android:name="${applicationId}.WeatherIconPack" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>

<activity
android:name=".weatherclient"
android:exported="false"
android:label="Weather Client">
<intent-filter>
<action android:name="${applicationId}.WeatherIconPack" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>

<activity
android:name=".stickers"
android:exported="false"
android:label="Stickers">
<intent-filter>
<action android:name="${applicationId}.WeatherIconPack" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>

<activity
android:name=".marshmallow"
android:exported="false"
android:label="Marshmallow">
<intent-filter>
<action android:name="${applicationId}.WeatherIconPack" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>

<activity
android:name=".icons8_color_hand"
android:exported="false"
android:label="Color Hand">
<intent-filter>
<action android:name="${applicationId}.WeatherIconPack" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>
<activity
android:name=".weather_faded"
android:exported="false"
android:label="Faded">
<intent-filter>
<action android:name="${applicationId}.WeatherIconPack" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>

<activity
android:name=".weather_weezle"
android:exported="false"
android:label="Weezle">
<intent-filter>
<action android:name="${applicationId}.WeatherIconPack" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>

<activity
android:name=".weather_gs6"
android:exported="false"
android:label="Galaxy S6">
<intent-filter>
<action android:name="${applicationId}.WeatherIconPack" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>

<activity
android:name=".weather_miui"
android:exported="false"
android:label="MIUI">
<intent-filter>
<action android:name="${applicationId}.WeatherIconPack" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>

<activity
android:name=".weather_sthul"
android:exported="false"
android:label="Sthul">
<intent-filter>
<action android:name="${applicationId}.WeatherIconPack" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>

<activity
android:name=".weather_tapas"
android:exported="false"
android:label="Tapas">
<intent-filter>
<action android:name="${applicationId}.WeatherIconPack" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>

<activity
android:name=".weather_magical"
android:exported="false"
android:label="Magical">
<intent-filter>
<action android:name="${applicationId}.WeatherIconPack" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>

<activity
android:name=".weather_vclouds"
android:exported="false"
android:label="VClouds">
<intent-filter>
<action android:name="${applicationId}.WeatherIconPack" />
<category android:name="android.intent.category.DEFAULT" />
</intent-filter>
</activity>

</application>

</manifest>
6 changes: 6 additions & 0 deletions app/src/main/aidl/com/drdisagree/iconify/IExtractSubjectCallback.aidl
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
package com.drdisagree.iconify;

interface IExtractSubjectCallback {
void onStart(String message);
void onResult(boolean success, String message);
}
10 changes: 10 additions & 0 deletions app/src/main/aidl/com/drdisagree/iconify/IRootProviderProxy.aidl
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
package com.drdisagree.iconify;

import com.drdisagree.iconify.IExtractSubjectCallback;

interface IRootProviderProxy {
String[] runCommand(String command);
void extractSubject(in Bitmap input, String resultPath, IExtractSubjectCallback callback);
void enableOverlay(in String packageName);
void disableOverlay(in String packageName);
}
Loading

0 comments on commit 1a4b2f2

Please sign in to comment.