Change circle swaps preference from bool to int

So there can be more options.
2026-03-13 09:01:30 +08:00 · 2026-03-01 22:33:21 +01:00
parent 51e2a8222d
commit 919bbffecb
12 changed files with 32 additions and 23 deletions
--- a/app/src/main/java/de/markusfisch/android/pielauncher/activity/PreferencesActivity.java
+++ b/app/src/main/java/de/markusfisch/android/pielauncher/activity/PreferencesActivity.java
@@ -494,10 +494,12 @@ public class PreferencesActivity extends Activity {
 		return map;
 	}

-	private static Map<Boolean, Integer> getCircleSwapsMenusOptions() {
-		Map<Boolean, Integer> map = new LinkedHashMap<>();
-		map.put(Boolean.TRUE, R.string.circle_swaps_menus_yes);
-		map.put(Boolean.FALSE, R.string.circle_swaps_menus_no);
+	private static Map<Integer, Integer> getCircleSwapsMenusOptions() {
+		Map<Integer, Integer> map = new LinkedHashMap<>();
+		map.put(Preferences.CIRCLE_SWAPS_SECONDARY_MENU,
+				R.string.circle_swaps_menus_yes);
+		map.put(Preferences.CIRCLE_SWAPS_NO,
+				R.string.circle_swaps_menus_no);
 		return map;
 	}

--- a/app/src/main/java/de/markusfisch/android/pielauncher/preference/Preferences.java
+++ b/app/src/main/java/de/markusfisch/android/pielauncher/preference/Preferences.java
@@ -46,6 +46,8 @@ public class Preferences {
 	public static final int HAPTIC_FEEDBACK_FOLLOW_SYSTEM = 0;
 	public static final int HAPTIC_FEEDBACK_DISABLE_LAUNCH = 1;
 	public static final int HAPTIC_FEEDBACK_DISABLE_ALL = 2;
+	public static final int CIRCLE_SWAPS_NO = 0;
+	public static final int CIRCLE_SWAPS_SECONDARY_MENU = 1;

 	private static final String SKIP_SETUP = "skip_setup";
 	private static final String RADIUS = "radius";
@@ -74,7 +76,7 @@ public class Preferences {
 	private static final String FORCE_RELAUNCH = "force_relaunch";
 	private static final String SHOW_DRAWER_ON_HOME = "show_drawer_on_home";
 	private static final String SPLIT_PIE_ENABLED = "split_pie_enabled";
-	private static final String CIRCLE_SWAPS_MENUS = "circle_swaps_menus";
+	private static final String CIRCLE_SWAPS_MENUS = "circle_swaps";

 	private final SharedPreferences preferences;
 	private final SystemSettings systemSettings;
@@ -105,7 +107,7 @@ public class Preferences {
 	private boolean forceRelaunch = false;
 	private boolean showDrawerOnHome = true;
 	private boolean splitPieEnabled = false;
-	private boolean circleSwapsMenus = false;
+	private int circleSwapsMenus = CIRCLE_SWAPS_NO;

 	public Preferences(Context context) {
 		preferences = PreferenceManager.getDefaultSharedPreferences(context);
@@ -158,7 +160,7 @@ public class Preferences {
 				showDrawerOnHome);
 		splitPieEnabled = preferences.getBoolean(SPLIT_PIE_ENABLED,
 				splitPieEnabled);
-		circleSwapsMenus = preferences.getBoolean(CIRCLE_SWAPS_MENUS,
+		circleSwapsMenus = preferences.getInt(CIRCLE_SWAPS_MENUS,
 				circleSwapsMenus);
 	}

@@ -404,11 +406,11 @@ public class Preferences {
 		put(SPLIT_PIE_ENABLED, splitPieEnabled).apply();
 	}

-	public boolean circleSwapsMenus() {
+	public int circleSwapsMenus() {
 		return circleSwapsMenus;
 	}

-	public void setCircleSwapsMenus(boolean circleSwapsMenus) {
+	public void setCircleSwapsMenus(int circleSwapsMenus) {
 		this.circleSwapsMenus = circleSwapsMenus;
 		put(CIRCLE_SWAPS_MENUS, circleSwapsMenus).apply();
 	}
@@ -440,6 +442,12 @@ public class Preferences {
 			put(oldDarkenBackground, false).apply();
 			setDarkenBackground(DARKEN_BACKGROUND_HEAVY);
 		}
+
+		// Migrate old circle swaps setting.
+		String circleSwapsMenus = "circle_swaps_menus";
+		if (preferences.getBoolean(circleSwapsMenus, false)) {
+			put(circleSwapsMenus, false);
+			setCircleSwapsMenus(CIRCLE_SWAPS_SECONDARY_MENU);
 	}

 	private int getOpenListWith() {
--- a/app/src/main/java/de/markusfisch/android/pielauncher/widget/AppPieView.java
+++ b/app/src/main/java/de/markusfisch/android/pielauncher/widget/AppPieView.java
@@ -618,7 +618,8 @@ public class AppPieView extends View {
 					selectMenu(touch.x, touch.y);
 					setCenter(touch.x, touch.y);
 				} else {
-					if (prefs.circleSwapsMenus()) {
+					if (prefs.circleSwapsMenus() !=
+							Preferences.CIRCLE_SWAPS_NO) {
 						pieMenu.icons = menuPrimary;
 					}
 					// Keep center for interrupted touches.
@@ -1434,10 +1435,8 @@ public class AppPieView extends View {
 	}

 	private void onCircle() {
-		if (!prefs.circleSwapsMenus()) {
-			return;
-		}
-		if (menuSecondary.isEmpty()) {
+		if (prefs.circleSwapsMenus() == Preferences.CIRCLE_SWAPS_NO ||
+				menuSecondary.isEmpty()) {
 			return;
 		}
 		swapMenus();
--- a/app/src/main/res/values-de/strings.xml
+++ b/app/src/main/res/values-de/strings.xml
@@ -84,7 +84,7 @@
 	<string name="split_pie_yes">Ja</string>
 	<string name="split_pie_no">Nein (Standard)</string>
 	<string name="circle_swaps_menus">Umkreisen wechselt Menüs</string>
-	<string name="circle_swaps_menus_yes">Ja</string>
+	<string name="circle_swaps_menus_yes">Sekundäres Menü</string>
 	<string name="circle_swaps_menus_no">Nein (Standard)</string>
 	<string name="icon_press">Langes Drücken</string>
 	<string name="icon_press_default">Fügt App zum Menu hinzu (Standard)</string>
--- a/app/src/main/res/values-fr/strings.xml
+++ b/app/src/main/res/values-fr/strings.xml
@@ -84,7 +84,7 @@
 	<string name="split_pie_yes">Oui</string>
 	<string name="split_pie_no">Non (par défaut)</string>
 	<string name="circle_swaps_menus">Entourer permute les menus</string>
-	<string name="circle_swaps_menus_yes">Oui</string>
+	<string name="circle_swaps_menus_yes">Menu secondaire</string>
 	<string name="circle_swaps_menus_no">Non (par défaut)</string>
 	<string name="icon_press">Appui long</string>
 	<string name="icon_press_default">Lancer l\'app dans le menu (par défaut)</string>
--- a/app/src/main/res/values-nl/strings.xml
+++ b/app/src/main/res/values-nl/strings.xml
@@ -84,7 +84,7 @@
 	<string name="split_pie_yes">Ja</string>
 	<string name="split_pie_no">Nee (standaard)</string>
 	<string name="circle_swaps_menus">Omcirkelen wisselt menu\'s</string>
-	<string name="circle_swaps_menus_yes">Ja</string>
+	<string name="circle_swaps_menus_yes">Secundair menu</string>
 	<string name="circle_swaps_menus_no">Nee (standaard)</string>
 	<string name="icon_press">Lang drukken</string>
 	<string name="icon_press_default">Voegt app toe aan het Pie menu (standaard)</string>
--- a/app/src/main/res/values-pt-rBR/strings.xml
+++ b/app/src/main/res/values-pt-rBR/strings.xml
@@ -88,7 +88,7 @@
 	<string name="split_pie_yes">Sim</string>
 	<string name="split_pie_no">Não (Padrão)</string>
 	<string name="circle_swaps_menus">Circular alterna menus</string>
-	<string name="circle_swaps_menus_yes">Sim</string>
+	<string name="circle_swaps_menus_yes">Menu secundário</string>
 	<string name="circle_swaps_menus_no">Não (Padrão)</string>
 	<string name="icon_press">Toque longo</string>
 	<string name="icon_press_default">Adiciona aplicativo ao menu Pie (Padrão)</string>
--- a/app/src/main/res/values-ru/strings.xml
+++ b/app/src/main/res/values-ru/strings.xml
@@ -84,7 +84,7 @@
 	<string name="split_pie_yes">Да</string>
 	<string name="split_pie_no">Нет (Стандартно)</string>
 	<string name="circle_swaps_menus">Обведение по кругу переключает меню</string>
-	<string name="circle_swaps_menus_yes">Да</string>
+	<string name="circle_swaps_menus_yes">Вторичное меню</string>
 	<string name="circle_swaps_menus_no">Нет (Стандартно)</string>
 	<string name="icon_press">Длительное нажатие</string>
 	<string name="icon_press_default">Добавляет приложение в меню (Стандартно)</string>
--- a/app/src/main/res/values-sv/strings.xml
+++ b/app/src/main/res/values-sv/strings.xml
@@ -84,7 +84,7 @@
 	<string name="split_pie_yes">Ja</string>
 	<string name="split_pie_no">Nej (standard)</string>
 	<string name="circle_swaps_menus">Att cirkla växlar menyer</string>
-	<string name="circle_swaps_menus_yes">Ja</string>
+	<string name="circle_swaps_menus_yes">Sekundärmeny</string>
 	<string name="circle_swaps_menus_no">Nej (standard)</string>
 	<string name="icon_press">Långtryckning</string>
 	<string name="icon_press_default">Lägg till app i cirkelmenyn (standard)</string>
--- a/app/src/main/res/values-uk/strings.xml
+++ b/app/src/main/res/values-uk/strings.xml
@@ -84,7 +84,7 @@
 	<string name="split_pie_yes">Так</string>
 	<string name="split_pie_no">Ні (за замовчуванням)</string>
 	<string name="circle_swaps_menus">Обведення колом перемикає меню</string>
-	<string name="circle_swaps_menus_yes">Так</string>
+	<string name="circle_swaps_menus_yes">Вторинне меню</string>
 	<string name="circle_swaps_menus_no">Ні (за замовчуванням)</string>
 	<string name="icon_press">Тривале натискання</string>
 	<string name="icon_press_default">Додає додаток до меню (за замовчуванням)</string>
--- a/app/src/main/res/values-zh-rCN/strings.xml
+++ b/app/src/main/res/values-zh-rCN/strings.xml
@@ -84,7 +84,7 @@
 	<string name="split_pie_yes">是</string>
 	<string name="split_pie_no">没有 (默认)</string>
 	<string name="circle_swaps_menus">画圈会切换菜单</string>
-	<string name="circle_swaps_menus_yes">是</string>
+	<string name="circle_swaps_menus_yes">次级菜单</string>
 	<string name="circle_swaps_menus_no">没有 (默认)</string>
 	<string name="icon_press">长按</string>
 	<string name="icon_press_default">在菜单中添加应用程序 (默认)</string>
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -88,7 +88,7 @@
 	<string name="split_pie_yes">Yes</string>
 	<string name="split_pie_no">No (Default)</string>
 	<string name="circle_swaps_menus">Circling swaps menus</string>
-	<string name="circle_swaps_menus_yes">Yes</string>
+	<string name="circle_swaps_menus_yes">Secondary menu</string>
 	<string name="circle_swaps_menus_no">No (Default)</string>
 	<string name="icon_press">Long press</string>
 	<string name="icon_press_default">Adds app to the pie menu (Default)</string>