From 2a5d846799c030d8f18d060e549abe149b50f663 Mon Sep 17 00:00:00 2001
From: Hans-Peter Lehmann <ByteHamster@users.noreply.github.com>
Date: Sat, 1 Aug 2026 13:13:34 +0200
Subject: [PATCH] Move settings fragments to settings module (#8637)

### Description

Move settings fragments to settings module. Reduces the size of the main
:app module by ~2k lines of code.

### Checklist
<!--
To help us keep the issue tracker clean and work as efficient as
possible,
  please make sure that you have done all of the following.
You can tick the boxes below by placing an x inside the brackets like
this: [x]
-->
- [x] I have read the contribution guidelines:
https://github.com/AntennaPod/AntennaPod/blob/develop/CONTRIBUTING.md#submit-a-pull-request
- [x] I have performed a self-review of my code, going through my
changes line by line and carefully considering why this line change is
necessary
- [x] I have run the automated code checks using `./gradlew checkstyle
lint`
- [x] My code follows the style guidelines of the AntennaPod project:
https://antennapod.org/contribute/develop/app/code-style
- [x] I have mentioned the corresponding issue and the relevant keyword
(e.g., "Closes: #xy") in the description (see
https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue)
- [x] If it is a core feature, I have added automated tests
---
 .../de/danoeh/antennapod/activity/OpmlImportActivity.java | 2 +-
 .../de/danoeh/antennapod/ui/screen/AddFeedFragment.java   | 2 +-
 .../ui/screen/drawer/DrawerPreferencesDialog.java         | 4 ++--
 .../antennapod/ui/screen/feed/RenameFeedDialog.java       | 2 +-
 .../ui/screen/feed/preferences/EditUrlSettingsDialog.java | 2 +-
 .../home/settingsdialog/HomeSectionsSettingsDialog.java   | 4 ++--
 .../ui/screen/onlinefeedview/OnlineFeedViewActivity.java  | 4 ++--
 .../screen/preferences/DownloadsPreferencesFragment.java  | 1 +
 .../ui/screen/preferences/MainPreferencesFragment.java    | 1 +
 .../ui/screen/preferences/PreferenceActivity.java         | 1 +
 .../subscriptions/FeedMultiSelectActionHandler.java       | 4 ++--
 .../common}/src/main/res/layout/edit_text_dialog.xml      | 0
 ui/preferences/build.gradle                               | 6 ++++++
 .../screen}/AutomaticDeletionPreferencesFragment.java     | 8 ++++----
 .../ui/preferences/screen}/ParentalControlDialog.java     | 6 +++---
 .../ui/preferences/screen}/PreferenceListDialog.java      | 4 ++--
 .../ui/preferences/screen}/PreferenceSwitchDialog.java    | 4 ++--
 .../antennapod/ui/preferences/screen}/ProxyDialog.java    | 4 ++--
 .../antennapod/ui/preferences/screen}/ReorderDialog.java  | 6 +++---
 .../ui/preferences/screen}/ReorderDialogAdapter.java      | 6 +++---
 .../ui/preferences/screen}/ReorderDialogItem.java         | 2 +-
 .../ui/preferences/screen}/ReorderItemTouchCallback.java  | 2 +-
 .../preferences}/src/main/res/layout/reorder_dialog.xml   | 0
 .../src/main/res/layout/reorder_dialog_entry.xml          | 0
 .../src/main/res/layout/reorder_dialog_header.xml         | 0
 25 files changed, 42 insertions(+), 33 deletions(-)
 rename {app => ui/common}/src/main/res/layout/edit_text_dialog.xml (100%)
 rename {app/src/main/java/de/danoeh/antennapod/ui/screen/preferences => ui/preferences/src/main/java/de/danoeh/antennapod/ui/preferences/screen}/AutomaticDeletionPreferencesFragment.java (93%)
 rename {app/src/main/java/de/danoeh/antennapod/ui/screen/preferences => ui/preferences/src/main/java/de/danoeh/antennapod/ui/preferences/screen}/ParentalControlDialog.java (92%)
 rename {app/src/main/java/de/danoeh/antennapod/ui/screen/preferences => ui/preferences/src/main/java/de/danoeh/antennapod/ui/preferences/screen}/PreferenceListDialog.java (93%)
 rename {app/src/main/java/de/danoeh/antennapod/ui/screen/preferences => ui/preferences/src/main/java/de/danoeh/antennapod/ui/preferences/screen}/PreferenceSwitchDialog.java (94%)
 rename {app/src/main/java/de/danoeh/antennapod/ui/screen/preferences => ui/preferences/src/main/java/de/danoeh/antennapod/ui/preferences/screen}/ProxyDialog.java (99%)
 rename {app/src/main/java/de/danoeh/antennapod/ui/screen/preferences => ui/preferences/src/main/java/de/danoeh/antennapod/ui/preferences/screen}/ReorderDialog.java (95%)
 rename {app/src/main/java/de/danoeh/antennapod/ui/screen/preferences => ui/preferences/src/main/java/de/danoeh/antennapod/ui/preferences/screen}/ReorderDialogAdapter.java (94%)
 rename {app/src/main/java/de/danoeh/antennapod/ui/screen/preferences => ui/preferences/src/main/java/de/danoeh/antennapod/ui/preferences/screen}/ReorderDialogItem.java (91%)
 rename {app/src/main/java/de/danoeh/antennapod/ui/screen/preferences => ui/preferences/src/main/java/de/danoeh/antennapod/ui/preferences/screen}/ReorderItemTouchCallback.java (95%)
 rename {app => ui/preferences}/src/main/res/layout/reorder_dialog.xml (100%)
 rename {app => ui/preferences}/src/main/res/layout/reorder_dialog_entry.xml (100%)
 rename {app => ui/preferences}/src/main/res/layout/reorder_dialog_header.xml (100%)

diff --git a/app/src/main/java/de/danoeh/antennapod/activity/OpmlImportActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/OpmlImportActivity.java
index 15237e082..b75110438 100644
--- a/app/src/main/java/de/danoeh/antennapod/activity/OpmlImportActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/activity/OpmlImportActivity.java
@@ -33,7 +33,7 @@ import de.danoeh.antennapod.storage.importexport.OpmlElement;
 import de.danoeh.antennapod.storage.importexport.OpmlReader;
 import de.danoeh.antennapod.storage.preferences.UserPreferences;
 import de.danoeh.antennapod.ui.common.ToolbarActivity;
-import de.danoeh.antennapod.ui.screen.preferences.ParentalControlDialog;
+import de.danoeh.antennapod.ui.preferences.screen.ParentalControlDialog;
 import io.reactivex.rxjava3.core.Completable;
 import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
diff --git a/app/src/main/java/de/danoeh/antennapod/ui/screen/AddFeedFragment.java b/app/src/main/java/de/danoeh/antennapod/ui/screen/AddFeedFragment.java
index 5cfd5aa1a..6b961614e 100644
--- a/app/src/main/java/de/danoeh/antennapod/ui/screen/AddFeedFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/ui/screen/AddFeedFragment.java
@@ -36,7 +36,7 @@ import de.danoeh.antennapod.net.download.serviceinterface.FeedUpdateManager;
 import de.danoeh.antennapod.storage.database.FeedDatabaseWriter;
 import de.danoeh.antennapod.model.feed.SortOrder;
 import de.danoeh.antennapod.databinding.AddfeedBinding;
-import de.danoeh.antennapod.databinding.EditTextDialogBinding;
+import de.danoeh.antennapod.ui.common.databinding.EditTextDialogBinding;
 import de.danoeh.antennapod.net.discovery.CombinedSearcher;
 import de.danoeh.antennapod.net.discovery.FyydPodcastSearcher;
 import de.danoeh.antennapod.net.discovery.ItunesPodcastSearcher;
diff --git a/app/src/main/java/de/danoeh/antennapod/ui/screen/drawer/DrawerPreferencesDialog.java b/app/src/main/java/de/danoeh/antennapod/ui/screen/drawer/DrawerPreferencesDialog.java
index a9a6c7c66..fbc07230d 100644
--- a/app/src/main/java/de/danoeh/antennapod/ui/screen/drawer/DrawerPreferencesDialog.java
+++ b/app/src/main/java/de/danoeh/antennapod/ui/screen/drawer/DrawerPreferencesDialog.java
@@ -4,8 +4,8 @@ import android.content.Context;
 import androidx.annotation.NonNull;
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.storage.preferences.UserPreferences;
-import de.danoeh.antennapod.ui.screen.preferences.ReorderDialog;
-import de.danoeh.antennapod.ui.screen.preferences.ReorderDialogItem;
+import de.danoeh.antennapod.ui.preferences.screen.ReorderDialog;
+import de.danoeh.antennapod.ui.preferences.screen.ReorderDialogItem;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/app/src/main/java/de/danoeh/antennapod/ui/screen/feed/RenameFeedDialog.java b/app/src/main/java/de/danoeh/antennapod/ui/screen/feed/RenameFeedDialog.java
index 4339b63aa..29fa4fb51 100644
--- a/app/src/main/java/de/danoeh/antennapod/ui/screen/feed/RenameFeedDialog.java
+++ b/app/src/main/java/de/danoeh/antennapod/ui/screen/feed/RenameFeedDialog.java
@@ -11,7 +11,7 @@ import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.storage.database.NavDrawerData;
 import de.danoeh.antennapod.model.feed.Feed;
 import de.danoeh.antennapod.storage.database.DBWriter;
-import de.danoeh.antennapod.databinding.EditTextDialogBinding;
+import de.danoeh.antennapod.ui.common.databinding.EditTextDialogBinding;
 import de.danoeh.antennapod.model.feed.FeedPreferences;
 
 public class RenameFeedDialog {
diff --git a/app/src/main/java/de/danoeh/antennapod/ui/screen/feed/preferences/EditUrlSettingsDialog.java b/app/src/main/java/de/danoeh/antennapod/ui/screen/feed/preferences/EditUrlSettingsDialog.java
index 604405d86..6fa57f024 100644
--- a/app/src/main/java/de/danoeh/antennapod/ui/screen/feed/preferences/EditUrlSettingsDialog.java
+++ b/app/src/main/java/de/danoeh/antennapod/ui/screen/feed/preferences/EditUrlSettingsDialog.java
@@ -8,7 +8,7 @@ import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.net.download.serviceinterface.FeedUpdateManager;
 import de.danoeh.antennapod.storage.database.DBWriter;
-import de.danoeh.antennapod.databinding.EditTextDialogBinding;
+import de.danoeh.antennapod.ui.common.databinding.EditTextDialogBinding;
 import de.danoeh.antennapod.model.feed.Feed;
 
 import java.lang.ref.WeakReference;
diff --git a/app/src/main/java/de/danoeh/antennapod/ui/screen/home/settingsdialog/HomeSectionsSettingsDialog.java b/app/src/main/java/de/danoeh/antennapod/ui/screen/home/settingsdialog/HomeSectionsSettingsDialog.java
index 8d2f9670f..b6154b2d8 100644
--- a/app/src/main/java/de/danoeh/antennapod/ui/screen/home/settingsdialog/HomeSectionsSettingsDialog.java
+++ b/app/src/main/java/de/danoeh/antennapod/ui/screen/home/settingsdialog/HomeSectionsSettingsDialog.java
@@ -3,8 +3,8 @@ package de.danoeh.antennapod.ui.screen.home.settingsdialog;
 import android.content.Context;
 import androidx.annotation.NonNull;
 import de.danoeh.antennapod.R;
-import de.danoeh.antennapod.ui.screen.preferences.ReorderDialog;
-import de.danoeh.antennapod.ui.screen.preferences.ReorderDialogItem;
+import de.danoeh.antennapod.ui.preferences.screen.ReorderDialog;
+import de.danoeh.antennapod.ui.preferences.screen.ReorderDialogItem;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/app/src/main/java/de/danoeh/antennapod/ui/screen/onlinefeedview/OnlineFeedViewActivity.java b/app/src/main/java/de/danoeh/antennapod/ui/screen/onlinefeedview/OnlineFeedViewActivity.java
index b1c9170cd..8cf652886 100644
--- a/app/src/main/java/de/danoeh/antennapod/ui/screen/onlinefeedview/OnlineFeedViewActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/ui/screen/onlinefeedview/OnlineFeedViewActivity.java
@@ -22,7 +22,7 @@ import androidx.appcompat.app.AppCompatActivity;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.android.material.snackbar.Snackbar;
 import de.danoeh.antennapod.R;
-import de.danoeh.antennapod.databinding.EditTextDialogBinding;
+import de.danoeh.antennapod.ui.common.databinding.EditTextDialogBinding;
 import de.danoeh.antennapod.databinding.OnlinefeedviewActivityBinding;
 import de.danoeh.antennapod.event.MessageEvent;
 import de.danoeh.antennapod.model.download.DownloadError;
@@ -31,7 +31,7 @@ import de.danoeh.antennapod.model.download.DownloadResult;
 import de.danoeh.antennapod.model.feed.Feed;
 import de.danoeh.antennapod.net.common.UrlChecker;
 import de.danoeh.antennapod.storage.preferences.UserPreferences;
-import de.danoeh.antennapod.ui.screen.preferences.ParentalControlDialog;
+import de.danoeh.antennapod.ui.preferences.screen.ParentalControlDialog;
 import de.danoeh.antennapod.net.discovery.CombinedSearcher;
 import de.danoeh.antennapod.net.discovery.FeedUrlNotFoundException;
 import de.danoeh.antennapod.net.discovery.PodcastSearchResult;
diff --git a/app/src/main/java/de/danoeh/antennapod/ui/screen/preferences/DownloadsPreferencesFragment.java b/app/src/main/java/de/danoeh/antennapod/ui/screen/preferences/DownloadsPreferencesFragment.java
index e65a2437c..77065672c 100644
--- a/app/src/main/java/de/danoeh/antennapod/ui/screen/preferences/DownloadsPreferencesFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/ui/screen/preferences/DownloadsPreferencesFragment.java
@@ -7,6 +7,7 @@ import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.net.download.serviceinterface.FeedUpdateManager;
 import de.danoeh.antennapod.storage.preferences.UserPreferences;
 import de.danoeh.antennapod.ui.preferences.screen.AnimatedPreferenceFragment;
+import de.danoeh.antennapod.ui.preferences.screen.ProxyDialog;
 import de.danoeh.antennapod.ui.preferences.screen.downloads.ChooseDataFolderDialog;
 
 import java.io.File;
diff --git a/app/src/main/java/de/danoeh/antennapod/ui/screen/preferences/MainPreferencesFragment.java b/app/src/main/java/de/danoeh/antennapod/ui/screen/preferences/MainPreferencesFragment.java
index ed62fd7b0..c87ef9f74 100644
--- a/app/src/main/java/de/danoeh/antennapod/ui/screen/preferences/MainPreferencesFragment.java
+++ b/app/src/main/java/de/danoeh/antennapod/ui/screen/preferences/MainPreferencesFragment.java
@@ -15,6 +15,7 @@ import de.danoeh.antennapod.R;
 import de.danoeh.antennapod.storage.preferences.UserPreferences;
 import de.danoeh.antennapod.ui.common.IntentUtils;
 import de.danoeh.antennapod.ui.preferences.screen.AnimatedPreferenceFragment;
+import de.danoeh.antennapod.ui.preferences.screen.ParentalControlDialog;
 import de.danoeh.antennapod.ui.preferences.screen.about.AboutFragment;
 import de.danoeh.antennapod.ui.preferences.screen.bugreport.BugReportFragment;
 
diff --git a/app/src/main/java/de/danoeh/antennapod/ui/screen/preferences/PreferenceActivity.java b/app/src/main/java/de/danoeh/antennapod/ui/screen/preferences/PreferenceActivity.java
index 1138bb564..62bfdb07d 100644
--- a/app/src/main/java/de/danoeh/antennapod/ui/screen/preferences/PreferenceActivity.java
+++ b/app/src/main/java/de/danoeh/antennapod/ui/screen/preferences/PreferenceActivity.java
@@ -18,6 +18,7 @@ import de.danoeh.antennapod.ui.common.Keyboard;
 import de.danoeh.antennapod.ui.common.ToolbarActivity;
 import de.danoeh.antennapod.ui.preferences.databinding.SettingsActivityBinding;
 import de.danoeh.antennapod.ui.preferences.screen.AutoDownloadPreferencesFragment;
+import de.danoeh.antennapod.ui.preferences.screen.AutomaticDeletionPreferencesFragment;
 import de.danoeh.antennapod.ui.preferences.screen.NotificationPreferencesFragment;
 import de.danoeh.antennapod.ui.preferences.screen.synchronization.SynchronizationPreferencesFragment;
 import org.greenrobot.eventbus.EventBus;
diff --git a/app/src/main/java/de/danoeh/antennapod/ui/screen/subscriptions/FeedMultiSelectActionHandler.java b/app/src/main/java/de/danoeh/antennapod/ui/screen/subscriptions/FeedMultiSelectActionHandler.java
index fe07f3307..4cbc509f1 100644
--- a/app/src/main/java/de/danoeh/antennapod/ui/screen/subscriptions/FeedMultiSelectActionHandler.java
+++ b/app/src/main/java/de/danoeh/antennapod/ui/screen/subscriptions/FeedMultiSelectActionHandler.java
@@ -21,8 +21,8 @@ import de.danoeh.antennapod.ui.screen.feed.RemoveFeedDialog;
 import de.danoeh.antennapod.ui.screen.feed.preferences.TagSettingsDialog;
 import de.danoeh.antennapod.model.feed.Feed;
 import de.danoeh.antennapod.model.feed.FeedPreferences;
-import de.danoeh.antennapod.ui.screen.preferences.PreferenceListDialog;
-import de.danoeh.antennapod.ui.screen.preferences.PreferenceSwitchDialog;
+import de.danoeh.antennapod.ui.preferences.screen.PreferenceListDialog;
+import de.danoeh.antennapod.ui.preferences.screen.PreferenceSwitchDialog;
 import io.reactivex.rxjava3.android.schedulers.AndroidSchedulers;
 import io.reactivex.rxjava3.core.Observable;
 import io.reactivex.rxjava3.schedulers.Schedulers;
diff --git a/app/src/main/res/layout/edit_text_dialog.xml b/ui/common/src/main/res/layout/edit_text_dialog.xml
similarity index 100%
rename from app/src/main/res/layout/edit_text_dialog.xml
rename to ui/common/src/main/res/layout/edit_text_dialog.xml
diff --git a/ui/preferences/build.gradle b/ui/preferences/build.gradle
index 637b7ac33..252275583 100644
--- a/ui/preferences/build.gradle
+++ b/ui/preferences/build.gradle
@@ -20,10 +20,15 @@ android {
         }
         buildConfigField "String", "COMMIT_HASH", ('"' + (commit.isEmpty() ? "Unknown commit" : commit) + '"')
     }
+
+    lint {
+        disable 'UseCompoundDrawables', 'ClickableViewAccessibility'
+    }
 }
 
 dependencies {
     implementation project(":event")
+    implementation project(":model")
     implementation project(":net:common")
     implementation project(":net:sync:gpoddernet")
     implementation project(":storage:preferences")
@@ -39,6 +44,7 @@ dependencies {
     implementation libs.androidx.fragment
     implementation libs.google.material
     implementation libs.androidx.preference
+    implementation libs.androidx.recyclerview
     implementation libs.androidx.work.runtime
 
     implementation libs.rxandroid
diff --git a/app/src/main/java/de/danoeh/antennapod/ui/screen/preferences/AutomaticDeletionPreferencesFragment.java b/ui/preferences/src/main/java/de/danoeh/antennapod/ui/preferences/screen/AutomaticDeletionPreferencesFragment.java
similarity index 93%
rename from app/src/main/java/de/danoeh/antennapod/ui/screen/preferences/AutomaticDeletionPreferencesFragment.java
rename to ui/preferences/src/main/java/de/danoeh/antennapod/ui/preferences/screen/AutomaticDeletionPreferencesFragment.java
index b6cc351f5..eb8998b22 100644
--- a/app/src/main/java/de/danoeh/antennapod/ui/screen/preferences/AutomaticDeletionPreferencesFragment.java
+++ b/ui/preferences/src/main/java/de/danoeh/antennapod/ui/preferences/screen/AutomaticDeletionPreferencesFragment.java
@@ -1,13 +1,13 @@
-package de.danoeh.antennapod.ui.screen.preferences;
+package de.danoeh.antennapod.ui.preferences.screen;
 
 import android.content.res.Resources;
 import android.os.Bundle;
+import androidx.appcompat.app.AppCompatActivity;
 import androidx.preference.ListPreference;
 import androidx.preference.TwoStatePreference;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
-import de.danoeh.antennapod.R;
+import de.danoeh.antennapod.ui.preferences.R;
 import de.danoeh.antennapod.storage.preferences.UserPreferences;
-import de.danoeh.antennapod.ui.preferences.screen.AnimatedPreferenceFragment;
 
 
 public class AutomaticDeletionPreferencesFragment extends AnimatedPreferenceFragment {
@@ -25,7 +25,7 @@ public class AutomaticDeletionPreferencesFragment extends AnimatedPreferenceFrag
     @Override
     public void onStart() {
         super.onStart();
-        ((PreferenceActivity) getActivity()).getSupportActionBar().setTitle(R.string.pref_auto_delete_title);
+        ((AppCompatActivity) getActivity()).getSupportActionBar().setTitle(R.string.pref_auto_delete_title);
     }
 
     private void checkItemVisibility(boolean autoDeleteEnabled) {
diff --git a/app/src/main/java/de/danoeh/antennapod/ui/screen/preferences/ParentalControlDialog.java b/ui/preferences/src/main/java/de/danoeh/antennapod/ui/preferences/screen/ParentalControlDialog.java
similarity index 92%
rename from app/src/main/java/de/danoeh/antennapod/ui/screen/preferences/ParentalControlDialog.java
rename to ui/preferences/src/main/java/de/danoeh/antennapod/ui/preferences/screen/ParentalControlDialog.java
index aa0b06caa..b1c9b0e72 100644
--- a/app/src/main/java/de/danoeh/antennapod/ui/screen/preferences/ParentalControlDialog.java
+++ b/ui/preferences/src/main/java/de/danoeh/antennapod/ui/preferences/screen/ParentalControlDialog.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.ui.screen.preferences;
+package de.danoeh.antennapod.ui.preferences.screen;
 
 import android.content.Context;
 import android.text.InputType;
@@ -8,9 +8,9 @@ import androidx.appcompat.app.AlertDialog;
 
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 
-import de.danoeh.antennapod.R;
+import de.danoeh.antennapod.ui.preferences.R;
 import de.danoeh.antennapod.ui.common.Keyboard;
-import de.danoeh.antennapod.databinding.EditTextDialogBinding;
+import de.danoeh.antennapod.ui.common.databinding.EditTextDialogBinding;
 import de.danoeh.antennapod.storage.preferences.UserPreferences;
 
 public class ParentalControlDialog {
diff --git a/app/src/main/java/de/danoeh/antennapod/ui/screen/preferences/PreferenceListDialog.java b/ui/preferences/src/main/java/de/danoeh/antennapod/ui/preferences/screen/PreferenceListDialog.java
similarity index 93%
rename from app/src/main/java/de/danoeh/antennapod/ui/screen/preferences/PreferenceListDialog.java
rename to ui/preferences/src/main/java/de/danoeh/antennapod/ui/preferences/screen/PreferenceListDialog.java
index 26ed7eada..ae0fa0ece 100644
--- a/app/src/main/java/de/danoeh/antennapod/ui/screen/preferences/PreferenceListDialog.java
+++ b/ui/preferences/src/main/java/de/danoeh/antennapod/ui/preferences/screen/PreferenceListDialog.java
@@ -1,10 +1,10 @@
-package de.danoeh.antennapod.ui.screen.preferences;
+package de.danoeh.antennapod.ui.preferences.screen;
 
 import android.content.Context;
 
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 
-import de.danoeh.antennapod.R;
+import de.danoeh.antennapod.ui.preferences.R;
 
 public class PreferenceListDialog {
     protected Context context;
diff --git a/app/src/main/java/de/danoeh/antennapod/ui/screen/preferences/PreferenceSwitchDialog.java b/ui/preferences/src/main/java/de/danoeh/antennapod/ui/preferences/screen/PreferenceSwitchDialog.java
similarity index 94%
rename from app/src/main/java/de/danoeh/antennapod/ui/screen/preferences/PreferenceSwitchDialog.java
rename to ui/preferences/src/main/java/de/danoeh/antennapod/ui/preferences/screen/PreferenceSwitchDialog.java
index 217785f90..0592708e7 100644
--- a/app/src/main/java/de/danoeh/antennapod/ui/screen/preferences/PreferenceSwitchDialog.java
+++ b/ui/preferences/src/main/java/de/danoeh/antennapod/ui/preferences/screen/PreferenceSwitchDialog.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.ui.screen.preferences;
+package de.danoeh.antennapod.ui.preferences.screen;
 
 import android.content.Context;
 import android.view.LayoutInflater;
@@ -7,7 +7,7 @@ import android.view.View;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
 import com.google.android.material.materialswitch.MaterialSwitch;
 
-import de.danoeh.antennapod.R;
+import de.danoeh.antennapod.ui.preferences.R;
 
 public class PreferenceSwitchDialog {
     protected Context context;
diff --git a/app/src/main/java/de/danoeh/antennapod/ui/screen/preferences/ProxyDialog.java b/ui/preferences/src/main/java/de/danoeh/antennapod/ui/preferences/screen/ProxyDialog.java
similarity index 99%
rename from app/src/main/java/de/danoeh/antennapod/ui/screen/preferences/ProxyDialog.java
rename to ui/preferences/src/main/java/de/danoeh/antennapod/ui/preferences/screen/ProxyDialog.java
index a9e40c342..83dd41962 100644
--- a/app/src/main/java/de/danoeh/antennapod/ui/screen/preferences/ProxyDialog.java
+++ b/ui/preferences/src/main/java/de/danoeh/antennapod/ui/preferences/screen/ProxyDialog.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.ui.screen.preferences;
+package de.danoeh.antennapod.ui.preferences.screen;
 
 import android.app.Dialog;
 import android.content.Context;
@@ -22,7 +22,7 @@ import java.util.List;
 import java.util.Locale;
 import java.util.concurrent.TimeUnit;
 
-import de.danoeh.antennapod.R;
+import de.danoeh.antennapod.ui.preferences.R;
 import de.danoeh.antennapod.storage.preferences.UserPreferences;
 import de.danoeh.antennapod.net.common.AntennapodHttpClient;
 import de.danoeh.antennapod.model.download.ProxyConfig;
diff --git a/app/src/main/java/de/danoeh/antennapod/ui/screen/preferences/ReorderDialog.java b/ui/preferences/src/main/java/de/danoeh/antennapod/ui/preferences/screen/ReorderDialog.java
similarity index 95%
rename from app/src/main/java/de/danoeh/antennapod/ui/screen/preferences/ReorderDialog.java
rename to ui/preferences/src/main/java/de/danoeh/antennapod/ui/preferences/screen/ReorderDialog.java
index 83095d6f9..a2a8ae4c5 100644
--- a/app/src/main/java/de/danoeh/antennapod/ui/screen/preferences/ReorderDialog.java
+++ b/ui/preferences/src/main/java/de/danoeh/antennapod/ui/preferences/screen/ReorderDialog.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.ui.screen.preferences;
+package de.danoeh.antennapod.ui.preferences.screen;
 
 import android.content.Context;
 import android.view.LayoutInflater;
@@ -9,8 +9,8 @@ import androidx.recyclerview.widget.ItemTouchHelper;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import androidx.recyclerview.widget.RecyclerView;
 import com.google.android.material.dialog.MaterialAlertDialogBuilder;
-import de.danoeh.antennapod.R;
-import de.danoeh.antennapod.databinding.ReorderDialogBinding;
+import de.danoeh.antennapod.ui.preferences.R;
+import de.danoeh.antennapod.ui.preferences.databinding.ReorderDialogBinding;
 
 import java.util.ArrayList;
 import java.util.Collections;
diff --git a/app/src/main/java/de/danoeh/antennapod/ui/screen/preferences/ReorderDialogAdapter.java b/ui/preferences/src/main/java/de/danoeh/antennapod/ui/preferences/screen/ReorderDialogAdapter.java
similarity index 94%
rename from app/src/main/java/de/danoeh/antennapod/ui/screen/preferences/ReorderDialogAdapter.java
rename to ui/preferences/src/main/java/de/danoeh/antennapod/ui/preferences/screen/ReorderDialogAdapter.java
index e2d69209e..8953159e1 100644
--- a/app/src/main/java/de/danoeh/antennapod/ui/screen/preferences/ReorderDialogAdapter.java
+++ b/ui/preferences/src/main/java/de/danoeh/antennapod/ui/preferences/screen/ReorderDialogAdapter.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.ui.screen.preferences;
+package de.danoeh.antennapod.ui.preferences.screen;
 
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
@@ -10,8 +10,8 @@ import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
 import androidx.core.util.Consumer;
 import androidx.recyclerview.widget.RecyclerView;
-import de.danoeh.antennapod.databinding.ReorderDialogEntryBinding;
-import de.danoeh.antennapod.databinding.ReorderDialogHeaderBinding;
+import de.danoeh.antennapod.ui.preferences.databinding.ReorderDialogEntryBinding;
+import de.danoeh.antennapod.ui.preferences.databinding.ReorderDialogHeaderBinding;
 
 import java.util.List;
 
diff --git a/app/src/main/java/de/danoeh/antennapod/ui/screen/preferences/ReorderDialogItem.java b/ui/preferences/src/main/java/de/danoeh/antennapod/ui/preferences/screen/ReorderDialogItem.java
similarity index 91%
rename from app/src/main/java/de/danoeh/antennapod/ui/screen/preferences/ReorderDialogItem.java
rename to ui/preferences/src/main/java/de/danoeh/antennapod/ui/preferences/screen/ReorderDialogItem.java
index 79e90431d..e17965097 100644
--- a/app/src/main/java/de/danoeh/antennapod/ui/screen/preferences/ReorderDialogItem.java
+++ b/ui/preferences/src/main/java/de/danoeh/antennapod/ui/preferences/screen/ReorderDialogItem.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.ui.screen.preferences;
+package de.danoeh.antennapod.ui.preferences.screen;
 
 public final class ReorderDialogItem {
     public enum ViewType {
diff --git a/app/src/main/java/de/danoeh/antennapod/ui/screen/preferences/ReorderItemTouchCallback.java b/ui/preferences/src/main/java/de/danoeh/antennapod/ui/preferences/screen/ReorderItemTouchCallback.java
similarity index 95%
rename from app/src/main/java/de/danoeh/antennapod/ui/screen/preferences/ReorderItemTouchCallback.java
rename to ui/preferences/src/main/java/de/danoeh/antennapod/ui/preferences/screen/ReorderItemTouchCallback.java
index 7cd7834e2..bc4d1a225 100644
--- a/app/src/main/java/de/danoeh/antennapod/ui/screen/preferences/ReorderItemTouchCallback.java
+++ b/ui/preferences/src/main/java/de/danoeh/antennapod/ui/preferences/screen/ReorderItemTouchCallback.java
@@ -1,4 +1,4 @@
-package de.danoeh.antennapod.ui.screen.preferences;
+package de.danoeh.antennapod.ui.preferences.screen;
 
 import androidx.annotation.NonNull;
 import androidx.recyclerview.widget.ItemTouchHelper;
diff --git a/app/src/main/res/layout/reorder_dialog.xml b/ui/preferences/src/main/res/layout/reorder_dialog.xml
similarity index 100%
rename from app/src/main/res/layout/reorder_dialog.xml
rename to ui/preferences/src/main/res/layout/reorder_dialog.xml
diff --git a/app/src/main/res/layout/reorder_dialog_entry.xml b/ui/preferences/src/main/res/layout/reorder_dialog_entry.xml
similarity index 100%
rename from app/src/main/res/layout/reorder_dialog_entry.xml
rename to ui/preferences/src/main/res/layout/reorder_dialog_entry.xml
diff --git a/app/src/main/res/layout/reorder_dialog_header.xml b/ui/preferences/src/main/res/layout/reorder_dialog_header.xml
similarity index 100%
rename from app/src/main/res/layout/reorder_dialog_header.xml
rename to ui/preferences/src/main/res/layout/reorder_dialog_header.xml