From 62d1f4052d40105e798e9e1c3391573d483ec60f Mon Sep 17 00:00:00 2001 From: Floens Date: Thu, 12 Mar 2015 15:24:14 +0100 Subject: [PATCH] rename ui.preferences package to ui.settings --- .../ui/controller/AdvancedSettingsController.java | 8 ++++---- .../chan/ui/controller/MainSettingsController.java | 14 +++++++------- .../ui/controller/WatchSettingsController.java | 10 +++++----- .../BooleanSettingView.java | 2 +- .../{preferences => settings}/LinkSettingView.java | 2 +- .../{preferences => settings}/ListSettingView.java | 2 +- .../ui/{preferences => settings}/SettingView.java | 2 +- .../SettingsController.java | 2 +- .../{preferences => settings}/SettingsGroup.java | 2 +- .../StringSettingView.java | 2 +- 10 files changed, 23 insertions(+), 23 deletions(-) rename Clover/app/src/main/java/org/floens/chan/ui/{preferences => settings}/BooleanSettingView.java (97%) rename Clover/app/src/main/java/org/floens/chan/ui/{preferences => settings}/LinkSettingView.java (96%) rename Clover/app/src/main/java/org/floens/chan/ui/{preferences => settings}/ListSettingView.java (98%) rename Clover/app/src/main/java/org/floens/chan/ui/{preferences => settings}/SettingView.java (93%) rename Clover/app/src/main/java/org/floens/chan/ui/{preferences => settings}/SettingsController.java (99%) rename Clover/app/src/main/java/org/floens/chan/ui/{preferences => settings}/SettingsGroup.java (90%) rename Clover/app/src/main/java/org/floens/chan/ui/{preferences => settings}/StringSettingView.java (98%) diff --git a/Clover/app/src/main/java/org/floens/chan/ui/controller/AdvancedSettingsController.java b/Clover/app/src/main/java/org/floens/chan/ui/controller/AdvancedSettingsController.java index 84cb0369..2c16df4e 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/controller/AdvancedSettingsController.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/controller/AdvancedSettingsController.java @@ -9,10 +9,10 @@ import android.widget.LinearLayout; import org.floens.chan.R; import org.floens.chan.core.settings.ChanSettings; import org.floens.chan.ui.fragment.FolderPickFragment; -import org.floens.chan.ui.preferences.BooleanSettingView; -import org.floens.chan.ui.preferences.LinkSettingView; -import org.floens.chan.ui.preferences.SettingsController; -import org.floens.chan.ui.preferences.SettingsGroup; +import org.floens.chan.ui.settings.BooleanSettingView; +import org.floens.chan.ui.settings.LinkSettingView; +import org.floens.chan.ui.settings.SettingsController; +import org.floens.chan.ui.settings.SettingsGroup; import java.io.File; diff --git a/Clover/app/src/main/java/org/floens/chan/ui/controller/MainSettingsController.java b/Clover/app/src/main/java/org/floens/chan/ui/controller/MainSettingsController.java index 36597be6..b6939d2f 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/controller/MainSettingsController.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/controller/MainSettingsController.java @@ -25,13 +25,13 @@ import android.widget.Toast; import org.floens.chan.R; import org.floens.chan.core.settings.ChanSettings; -import org.floens.chan.ui.preferences.BooleanSettingView; -import org.floens.chan.ui.preferences.LinkSettingView; -import org.floens.chan.ui.preferences.ListSettingView; -import org.floens.chan.ui.preferences.SettingView; -import org.floens.chan.ui.preferences.SettingsController; -import org.floens.chan.ui.preferences.SettingsGroup; -import org.floens.chan.ui.preferences.StringSettingView; +import org.floens.chan.ui.settings.BooleanSettingView; +import org.floens.chan.ui.settings.LinkSettingView; +import org.floens.chan.ui.settings.ListSettingView; +import org.floens.chan.ui.settings.SettingView; +import org.floens.chan.ui.settings.SettingsController; +import org.floens.chan.ui.settings.SettingsGroup; +import org.floens.chan.ui.settings.StringSettingView; import org.floens.chan.ui.toolbar.ToolbarMenu; import org.floens.chan.ui.toolbar.ToolbarMenuItem; import org.floens.chan.ui.view.FloatingMenuItem; diff --git a/Clover/app/src/main/java/org/floens/chan/ui/controller/WatchSettingsController.java b/Clover/app/src/main/java/org/floens/chan/ui/controller/WatchSettingsController.java index 1fd36e74..f8884c0f 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/controller/WatchSettingsController.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/controller/WatchSettingsController.java @@ -7,11 +7,11 @@ import android.widget.LinearLayout; import org.floens.chan.R; import org.floens.chan.core.settings.ChanSettings; -import org.floens.chan.ui.preferences.BooleanSettingView; -import org.floens.chan.ui.preferences.ListSettingView; -import org.floens.chan.ui.preferences.SettingView; -import org.floens.chan.ui.preferences.SettingsController; -import org.floens.chan.ui.preferences.SettingsGroup; +import org.floens.chan.ui.settings.BooleanSettingView; +import org.floens.chan.ui.settings.ListSettingView; +import org.floens.chan.ui.settings.SettingView; +import org.floens.chan.ui.settings.SettingsController; +import org.floens.chan.ui.settings.SettingsGroup; import org.floens.chan.ui.view.CrossfadeView; public class WatchSettingsController extends SettingsController implements CompoundButton.OnCheckedChangeListener { diff --git a/Clover/app/src/main/java/org/floens/chan/ui/preferences/BooleanSettingView.java b/Clover/app/src/main/java/org/floens/chan/ui/settings/BooleanSettingView.java similarity index 97% rename from Clover/app/src/main/java/org/floens/chan/ui/preferences/BooleanSettingView.java rename to Clover/app/src/main/java/org/floens/chan/ui/settings/BooleanSettingView.java index 0b6ca737..bf9b180e 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/preferences/BooleanSettingView.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/settings/BooleanSettingView.java @@ -1,4 +1,4 @@ -package org.floens.chan.ui.preferences; +package org.floens.chan.ui.settings; import android.support.v7.widget.SwitchCompat; import android.view.View; diff --git a/Clover/app/src/main/java/org/floens/chan/ui/preferences/LinkSettingView.java b/Clover/app/src/main/java/org/floens/chan/ui/settings/LinkSettingView.java similarity index 96% rename from Clover/app/src/main/java/org/floens/chan/ui/preferences/LinkSettingView.java rename to Clover/app/src/main/java/org/floens/chan/ui/settings/LinkSettingView.java index 60a4079e..b0a4e1d6 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/preferences/LinkSettingView.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/settings/LinkSettingView.java @@ -1,4 +1,4 @@ -package org.floens.chan.ui.preferences; +package org.floens.chan.ui.settings; import android.view.View; diff --git a/Clover/app/src/main/java/org/floens/chan/ui/preferences/ListSettingView.java b/Clover/app/src/main/java/org/floens/chan/ui/settings/ListSettingView.java similarity index 98% rename from Clover/app/src/main/java/org/floens/chan/ui/preferences/ListSettingView.java rename to Clover/app/src/main/java/org/floens/chan/ui/settings/ListSettingView.java index 0b9c7eb6..2d0ab391 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/preferences/ListSettingView.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/settings/ListSettingView.java @@ -1,4 +1,4 @@ -package org.floens.chan.ui.preferences; +package org.floens.chan.ui.settings; import android.view.Gravity; import android.view.View; diff --git a/Clover/app/src/main/java/org/floens/chan/ui/preferences/SettingView.java b/Clover/app/src/main/java/org/floens/chan/ui/settings/SettingView.java similarity index 93% rename from Clover/app/src/main/java/org/floens/chan/ui/preferences/SettingView.java rename to Clover/app/src/main/java/org/floens/chan/ui/settings/SettingView.java index 785c27b4..5bb66e7f 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/preferences/SettingView.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/settings/SettingView.java @@ -1,4 +1,4 @@ -package org.floens.chan.ui.preferences; +package org.floens.chan.ui.settings; import android.view.View; diff --git a/Clover/app/src/main/java/org/floens/chan/ui/preferences/SettingsController.java b/Clover/app/src/main/java/org/floens/chan/ui/settings/SettingsController.java similarity index 99% rename from Clover/app/src/main/java/org/floens/chan/ui/preferences/SettingsController.java rename to Clover/app/src/main/java/org/floens/chan/ui/settings/SettingsController.java index ae64b686..9d2a1306 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/preferences/SettingsController.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/settings/SettingsController.java @@ -1,4 +1,4 @@ -package org.floens.chan.ui.preferences; +package org.floens.chan.ui.settings; import android.content.Context; import android.content.res.Configuration; diff --git a/Clover/app/src/main/java/org/floens/chan/ui/preferences/SettingsGroup.java b/Clover/app/src/main/java/org/floens/chan/ui/settings/SettingsGroup.java similarity index 90% rename from Clover/app/src/main/java/org/floens/chan/ui/preferences/SettingsGroup.java rename to Clover/app/src/main/java/org/floens/chan/ui/settings/SettingsGroup.java index fb13d04f..10352e81 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/preferences/SettingsGroup.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/settings/SettingsGroup.java @@ -1,4 +1,4 @@ -package org.floens.chan.ui.preferences; +package org.floens.chan.ui.settings; import java.util.ArrayList; import java.util.List; diff --git a/Clover/app/src/main/java/org/floens/chan/ui/preferences/StringSettingView.java b/Clover/app/src/main/java/org/floens/chan/ui/settings/StringSettingView.java similarity index 98% rename from Clover/app/src/main/java/org/floens/chan/ui/preferences/StringSettingView.java rename to Clover/app/src/main/java/org/floens/chan/ui/settings/StringSettingView.java index 40a65980..5edbb1b6 100644 --- a/Clover/app/src/main/java/org/floens/chan/ui/preferences/StringSettingView.java +++ b/Clover/app/src/main/java/org/floens/chan/ui/settings/StringSettingView.java @@ -1,4 +1,4 @@ -package org.floens.chan.ui.preferences; +package org.floens.chan.ui.settings; import android.app.AlertDialog; import android.content.DialogInterface;