diff --git a/.gitignore b/.gitignore index b1bf12551..f4832f6a9 100644 --- a/.gitignore +++ b/.gitignore @@ -1,12 +1,7 @@ *.iml .gradle /local.properties -/.idea/caches -/.idea/libraries -/.idea/modules.xml -/.idea/workspace.xml -/.idea/navEditor.xml -/.idea/assetWizardSettings.xml +/.idea .DS_Store /build /captures @@ -14,4 +9,6 @@ .cxx local.properties /keystore -/keystore.properties \ No newline at end of file +/keystore.properties +/hs_* +/replay_* diff --git a/README.md b/README.md index 66a0598f4..a0a8536f1 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,7 @@ # Oxygen Customizer
diff --git a/app/.gitignore b/app/.gitignore index 42afabfd2..2bdf0f6ae 100644 --- a/app/.gitignore +++ b/app/.gitignore @@ -1 +1,3 @@ -/build \ No newline at end of file +/build +/debug +/release \ No newline at end of file diff --git a/app/src/main/java/it/dhd/oxygencustomizer/services/RootProvider.java b/app/src/main/java/it/dhd/oxygencustomizer/services/RootProvider.java index 08b8f7fbe..62d9f7a03 100644 --- a/app/src/main/java/it/dhd/oxygencustomizer/services/RootProvider.java +++ b/app/src/main/java/it/dhd/oxygencustomizer/services/RootProvider.java @@ -1,6 +1,7 @@ package it.dhd.oxygencustomizer.services; + import android.content.Intent; import android.content.pm.PackageManager; import android.os.IBinder; @@ -25,7 +26,7 @@ public class RootProvider extends RootService { String TAG = getClass().getSimpleName(); static final String LSPD_DB_PATH = "/data/adb/lspd/config/modules_config.db"; - static final String SQLITE_BIN = "/data/adb/modules/PixelXpert/sqlite3"; + static final String SQLITE_BIN = "/data/adb/modules/OxygenCustomizer/sqlite3"; @Override public IBinder onBind(@NonNull Intent intent) { diff --git a/app/src/main/java/it/dhd/oxygencustomizer/xposed/hooks/systemui/aod/AOD.java b/app/src/main/java/it/dhd/oxygencustomizer/xposed/hooks/systemui/aod/AOD.java index 5772fa758..1f1cf1f41 100644 --- a/app/src/main/java/it/dhd/oxygencustomizer/xposed/hooks/systemui/aod/AOD.java +++ b/app/src/main/java/it/dhd/oxygencustomizer/xposed/hooks/systemui/aod/AOD.java @@ -21,34 +21,22 @@ import static it.dhd.oxygencustomizer.xposed.utils.ViewHelper.loadLottieAnimationView; import android.annotation.SuppressLint; -import android.app.ActivityManager; import android.content.Context; -import android.content.Intent; -import android.content.IntentFilter; import android.content.pm.PackageManager; -import android.content.res.ColorStateList; import android.graphics.Color; -import android.graphics.Paint; import android.graphics.Typeface; -import android.media.AudioManager; -import android.os.Build; import android.os.Environment; -import android.os.UserManager; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; -import android.widget.FrameLayout; -import android.widget.ImageView; import android.widget.LinearLayout; import android.widget.RelativeLayout; -import android.widget.TextView; import java.io.File; import de.robv.android.xposed.XC_MethodHook; import de.robv.android.xposed.callbacks.XC_LoadPackage; import it.dhd.oxygencustomizer.BuildConfig; -import it.dhd.oxygencustomizer.R; import it.dhd.oxygencustomizer.utils.Constants; import it.dhd.oxygencustomizer.xposed.XposedMods; import it.dhd.oxygencustomizer.xposed.utils.ViewHelper; diff --git a/app/src/main/java/it/dhd/oxygencustomizer/xposed/hooks/systemui/statusbar/HeaderClock.java b/app/src/main/java/it/dhd/oxygencustomizer/xposed/hooks/systemui/statusbar/HeaderClock.java index 7a057ddab..616c6b7fe 100644 --- a/app/src/main/java/it/dhd/oxygencustomizer/xposed/hooks/systemui/statusbar/HeaderClock.java +++ b/app/src/main/java/it/dhd/oxygencustomizer/xposed/hooks/systemui/statusbar/HeaderClock.java @@ -291,6 +291,8 @@ protected void afterHookedMethod(MethodHookParam param) { protected void afterHookedMethod(MethodHookParam param) { if (!showHeaderClock) return; + if (getObjectField(param.thisObject, "mQsFooterClock") == null) return; + float f = (float) param.args[0]; Interpolator mAlphaAnimInterpolator = (Interpolator) getObjectField(param.thisObject, "mAlphaAnimInterpolator"); Interpolator mQsCoveredInterpolator = (Interpolator) getObjectField(param.thisObject, "mQsCoveredInterpolator"); diff --git a/app/src/main/java/it/dhd/oxygencustomizer/xposed/views/pulse/PulseControllerImpl.java b/app/src/main/java/it/dhd/oxygencustomizer/xposed/views/pulse/PulseControllerImpl.java index 1d1bfb453..c793e588e 100644 --- a/app/src/main/java/it/dhd/oxygencustomizer/xposed/views/pulse/PulseControllerImpl.java +++ b/app/src/main/java/it/dhd/oxygencustomizer/xposed/views/pulse/PulseControllerImpl.java @@ -18,13 +18,14 @@ import java.util.concurrent.Executor; import de.robv.android.xposed.XposedBridge; +import it.dhd.oxygencustomizer.BuildConfig; import it.dhd.oxygencustomizer.xposed.utils.SystemUtils; import it.dhd.oxygencustomizer.xposed.views.PulseView; import it.dhd.oxygencustomizer.xposed.views.VisualizerView; public class PulseControllerImpl { - public static final boolean DEBUG = true; + public static final boolean DEBUG = BuildConfig.DEBUG; @SuppressLint("StaticFieldLeak") private static PulseControllerImpl instance = null; private final String STREAM_MUTE_CHANGED_ACTION = "android.media.STREAM_MUTE_CHANGED_ACTION";