Fix android build

NYRDS · Jan 4, 2025 · 4081792 · 4081792
1 parent 13778e5
commit 4081792
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 5 deletions.
diff --git a/RemixedDungeon/src/android/java/com/nyrds/platform/audio/MusicManager.java b/RemixedDungeon/src/android/java/com/nyrds/platform/audio/MusicManager.java
@@ -21,6 +21,7 @@
 import android.media.AudioManager;
 import android.media.MediaPlayer;
 
+import com.nyrds.pixeldungeon.game.GamePreferences;
 import com.nyrds.platform.EventCollector;
 import com.nyrds.platform.game.Game;
 import com.nyrds.util.ModdingMode;

diff --git a/RemixedDungeon/src/android/java/com/nyrds/platform/audio/Sample.java b/RemixedDungeon/src/android/java/com/nyrds/platform/audio/Sample.java
@@ -22,9 +22,8 @@
 import android.media.AudioManager;
 import android.media.SoundPool;
 
-
-
 import com.nyrds.pixeldungeon.game.GameLoop;
+import com.nyrds.pixeldungeon.game.GamePreferences;
 import com.nyrds.platform.EventCollector;
 import com.nyrds.platform.game.Game;
 import com.nyrds.util.ModdingMode;

diff --git a/RemixedDungeon/src/android/java/com/nyrds/platform/storage/Preferences.java b/RemixedDungeon/src/android/java/com/nyrds/platform/storage/Preferences.java
@@ -17,6 +17,10 @@ public enum Preferences {
 
 	INSTANCE;
 
+	public static final String KEY_LANDSCAPE        = "landscape";
+	public static final String KEY_USE_PLAY_GAMES   = "use_play_games";
+	public static final String KEY_EU_CONSENT_LEVEL = "eu_consent_level";
+
     private SharedPreferences prefs;
 
 	private final Map<String, Integer> intCache    = new HashMap<>();

diff --git a/RemixedDungeon/src/fdroid/java/com/nyrds/platform/EventCollector.java b/RemixedDungeon/src/fdroid/java/com/nyrds/platform/EventCollector.java
@@ -1,5 +1,6 @@
 package com.nyrds.platform;
 
+import com.nyrds.platform.storage.CommonPrefs;
 import com.nyrds.platform.storage.Preferences;
 import com.nyrds.util.Util;
 import com.watabou.pixeldungeon.utils.GLog;
@@ -13,7 +14,7 @@
 public class EventCollector {
 
     private static boolean analyticsUsable() {
-        return Preferences.INSTANCE.getInt(Preferences.KEY_COLLECT_STATS, 1) > 0;
+        return Preferences.INSTANCE.getInt(CommonPrefs.KEY_COLLECT_STATS, 1) > 0;
     }
 
     static public void init() {

diff --git a/settings.gradle b/settings.gradle
@@ -13,5 +13,5 @@ dependencyResolutionManagement {
         maven { url 'https://developer.huawei.com/repo/' }
     }
 }
-//include ':RemixedDungeon'
-include ':RemixedDungeonDesktop'
+include ':RemixedDungeon'
+//include ':RemixedDungeonDesktop'