From b5b3d81f007bbbf67b93c91145d791192797269e Mon Sep 17 00:00:00 2001 From: TacoTheDank Date: Sun, 5 Jun 2022 22:40:26 -0400 Subject: [PATCH] Clean up flavors by using buildConfigField --- app/build.gradle | 6 ++++++ app/src/debug/res/values/strings.xml | 7 ------- .../binding/input/capture/InputCaptureManager.java | 4 ++-- .../binding/input/evdev/EvdevCaptureProviderShim.java | 4 ++-- app/src/main/res/values/strings.xml | 3 --- .../nonRoot/java/com.limelight/LimelightBuildProps.java | 5 ----- app/src/root/java/com.limelight/LimelightBuildProps.java | 5 ----- 7 files changed, 10 insertions(+), 24 deletions(-) delete mode 100644 app/src/debug/res/values/strings.xml delete mode 100644 app/src/nonRoot/java/com.limelight/LimelightBuildProps.java delete mode 100644 app/src/root/java/com.limelight/LimelightBuildProps.java diff --git a/app/build.gradle b/app/build.gradle index 508ca36c..f607ff52 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -32,6 +32,7 @@ android { applicationId "com.limelight.root" dimension "root" + buildConfigField "boolean", "ROOT_BUILD", "true" } nonRoot { @@ -43,6 +44,7 @@ android { applicationId "com.limelight" dimension "root" + buildConfigField "boolean", "ROOT_BUILD", "false" } } @@ -68,6 +70,8 @@ android { buildTypes { debug { applicationIdSuffix ".debug" + resValue "string", "app_label", "Moonlight (Debug)" + resValue "string", "app_label_root", "Moonlight (Root Debug)" minifyEnabled true proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' @@ -104,6 +108,8 @@ android { // // TL;DR: Leave the following line alone! applicationIdSuffix ".unofficial" + resValue "string", "app_label", "Moonlight" + resValue "string", "app_label_root", "Moonlight (Root)" minifyEnabled true proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' diff --git a/app/src/debug/res/values/strings.xml b/app/src/debug/res/values/strings.xml deleted file mode 100644 index f21feccd..00000000 --- a/app/src/debug/res/values/strings.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - Moonlight (Debug) - Moonlight (Root Debug) - - diff --git a/app/src/main/java/com/limelight/binding/input/capture/InputCaptureManager.java b/app/src/main/java/com/limelight/binding/input/capture/InputCaptureManager.java index 266b6b2f..9067b1c7 100644 --- a/app/src/main/java/com/limelight/binding/input/capture/InputCaptureManager.java +++ b/app/src/main/java/com/limelight/binding/input/capture/InputCaptureManager.java @@ -2,8 +2,8 @@ package com.limelight.binding.input.capture; import android.app.Activity; +import com.limelight.BuildConfig; import com.limelight.LimeLog; -import com.limelight.LimelightBuildProps; import com.limelight.R; import com.limelight.binding.input.evdev.EvdevCaptureProviderShim; import com.limelight.binding.input.evdev.EvdevListener; @@ -16,7 +16,7 @@ public class InputCaptureManager { } // LineageOS implemented broken NVIDIA capture extensions, so avoid using them on root builds. // See https://github.com/LineageOS/android_frameworks_base/commit/d304f478a023430f4712dbdc3ee69d9ad02cebd3 - else if (!LimelightBuildProps.ROOT_BUILD && ShieldCaptureProvider.isCaptureProviderSupported()) { + else if (!BuildConfig.ROOT_BUILD && ShieldCaptureProvider.isCaptureProviderSupported()) { LimeLog.info("Using NVIDIA mouse capture extension"); return new ShieldCaptureProvider(activity); } diff --git a/app/src/main/java/com/limelight/binding/input/evdev/EvdevCaptureProviderShim.java b/app/src/main/java/com/limelight/binding/input/evdev/EvdevCaptureProviderShim.java index 62fd5e48..5268cf99 100644 --- a/app/src/main/java/com/limelight/binding/input/evdev/EvdevCaptureProviderShim.java +++ b/app/src/main/java/com/limelight/binding/input/evdev/EvdevCaptureProviderShim.java @@ -3,12 +3,12 @@ package com.limelight.binding.input.evdev; import android.app.Activity; -import com.limelight.LimelightBuildProps; +import com.limelight.BuildConfig; import com.limelight.binding.input.capture.InputCaptureProvider; public class EvdevCaptureProviderShim { public static boolean isCaptureProviderSupported() { - return LimelightBuildProps.ROOT_BUILD; + return BuildConfig.ROOT_BUILD; } // We need to construct our capture provider using reflection because it isn't included in non-root builds diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d06073ab..4b672c16 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,8 +1,5 @@ - Moonlight - Moonlight (Root) - PC deleted PC not paired diff --git a/app/src/nonRoot/java/com.limelight/LimelightBuildProps.java b/app/src/nonRoot/java/com.limelight/LimelightBuildProps.java deleted file mode 100644 index fec35c5c..00000000 --- a/app/src/nonRoot/java/com.limelight/LimelightBuildProps.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.limelight; - -public class LimelightBuildProps { - public static final boolean ROOT_BUILD = false; -} diff --git a/app/src/root/java/com.limelight/LimelightBuildProps.java b/app/src/root/java/com.limelight/LimelightBuildProps.java deleted file mode 100644 index e5c792df..00000000 --- a/app/src/root/java/com.limelight/LimelightBuildProps.java +++ /dev/null @@ -1,5 +0,0 @@ -package com.limelight; - -public class LimelightBuildProps { - public static final boolean ROOT_BUILD = true; -}