From d728e1f17f7f41a493440845b883cfa8f8c54ebe Mon Sep 17 00:00:00 2001
From: Charles Madere <scootrnova@gmail.com>
Date: Mon, 11 Nov 2013 22:11:15 -0800
Subject: [PATCH] more Settings / Preference refactoring

---
 projects/android/classygames/res/xml/settings_headers.xml   | 6 +++---
 .../android/classygames/res/xml/settings_headers_legacy.xml | 6 +++---
 ...utSettingsFragment.java => AboutPreferenceFragment.java} | 2 +-
 ...ameSettingsFragment.java => GamePreferenceFragment.java} | 2 +-
 ...ngsFragment.java => NotificationPreferenceFragment.java} | 2 +-
 .../android/classygames/settings/PreferenceActivity.java    | 2 +-
 6 files changed, 10 insertions(+), 10 deletions(-)
 rename projects/android/classygames/src/com/charlesmadere/android/classygames/settings/{AboutSettingsFragment.java => AboutPreferenceFragment.java} (80%)
 rename projects/android/classygames/src/com/charlesmadere/android/classygames/settings/{GameSettingsFragment.java => GamePreferenceFragment.java} (98%)
 rename projects/android/classygames/src/com/charlesmadere/android/classygames/settings/{NotificationSettingsFragment.java => NotificationPreferenceFragment.java} (80%)

diff --git a/projects/android/classygames/res/xml/settings_headers.xml b/projects/android/classygames/res/xml/settings_headers.xml
index a7fd991..f32ff86 100644
--- a/projects/android/classygames/res/xml/settings_headers.xml
+++ b/projects/android/classygames/res/xml/settings_headers.xml
@@ -2,15 +2,15 @@
 <preference-headers xmlns:android="http://schemas.android.com/apk/res/android"
 	android:title="@string/settings">
 	<header
-		android:fragment="com.charlesmadere.android.classygames.settings.GameSettingsFragment"
+		android:fragment="com.charlesmadere.android.classygames.settings.GamePreferenceFragment"
 		android:summary="@string/settings_game_summary"
 		android:title="@string/game_settings" />
 	<header
-		android:fragment="com.charlesmadere.android.classygames.settings.NotificationSettingsFragment"
+		android:fragment="com.charlesmadere.android.classygames.settings.NotificationPreferenceFragment"
 		android:summary="@string/settings_notifications_summary"
 		android:title="@string/notification_settings" />
 	<header
-		android:fragment="com.charlesmadere.android.classygames.settings.AboutSettingsFragment"
+		android:fragment="com.charlesmadere.android.classygames.settings.AboutPreferenceFragment"
 		android:summary="@string/classy_games_information_and_details"
 		android:title="@string/about" />
 </preference-headers>
\ No newline at end of file
diff --git a/projects/android/classygames/res/xml/settings_headers_legacy.xml b/projects/android/classygames/res/xml/settings_headers_legacy.xml
index de1e9a2..f1fcdd2 100644
--- a/projects/android/classygames/res/xml/settings_headers_legacy.xml
+++ b/projects/android/classygames/res/xml/settings_headers_legacy.xml
@@ -6,7 +6,7 @@
 		android:title="@string/game_settings">
 		<intent
 			android:action="@string/com_charlesmadere_android_classygames_settings_game"
-			android:targetClass="com.charlesmadere.android.classygames.settings.SettingsPreferenceActivity"
+			android:targetClass="com.charlesmadere.android.classygames.settings.PreferenceActivity"
 			android:targetPackage="com.charlesmadere.android.classygames" />
 	</Preference>
 	<Preference
@@ -14,7 +14,7 @@
 		android:title="@string/notification_settings">
 		<intent
 			android:action="@string/com_charlesmadere_android_classygames_settings_notifications"
-			android:targetClass="com.charlesmadere.android.classygames.settings.SettingsPreferenceActivity"
+			android:targetClass="com.charlesmadere.android.classygames.settings.PreferenceActivity"
 			android:targetPackage="com.charlesmadere.android.classygames" />
 	</Preference>
 	<Preference
@@ -22,7 +22,7 @@
 		android:title="@string/about">
 		<intent
 			android:action="@string/com_charlesmadere_android_classygames_settings_about"
-			android:targetClass="com.charlesmadere.android.classygames.settings.SettingsPreferenceActivity"
+			android:targetClass="com.charlesmadere.android.classygames.settings.PreferenceActivity"
 			android:targetPackage="com.charlesmadere.android.classygames" />
 	</Preference>
 </PreferenceScreen>
\ No newline at end of file
diff --git a/projects/android/classygames/src/com/charlesmadere/android/classygames/settings/AboutSettingsFragment.java b/projects/android/classygames/src/com/charlesmadere/android/classygames/settings/AboutPreferenceFragment.java
similarity index 80%
rename from projects/android/classygames/src/com/charlesmadere/android/classygames/settings/AboutSettingsFragment.java
rename to projects/android/classygames/src/com/charlesmadere/android/classygames/settings/AboutPreferenceFragment.java
index 1a32451..ffbc701 100644
--- a/projects/android/classygames/src/com/charlesmadere/android/classygames/settings/AboutSettingsFragment.java
+++ b/projects/android/classygames/src/com/charlesmadere/android/classygames/settings/AboutPreferenceFragment.java
@@ -4,7 +4,7 @@
 import com.charlesmadere.android.classygames.R;
 
 
-public final class AboutSettingsFragment extends BasePreferenceFragment
+public final class AboutPreferenceFragment extends BasePreferenceFragment
 {
 
 
diff --git a/projects/android/classygames/src/com/charlesmadere/android/classygames/settings/GameSettingsFragment.java b/projects/android/classygames/src/com/charlesmadere/android/classygames/settings/GamePreferenceFragment.java
similarity index 98%
rename from projects/android/classygames/src/com/charlesmadere/android/classygames/settings/GameSettingsFragment.java
rename to projects/android/classygames/src/com/charlesmadere/android/classygames/settings/GamePreferenceFragment.java
index 01d5f64..89846ea 100644
--- a/projects/android/classygames/src/com/charlesmadere/android/classygames/settings/GameSettingsFragment.java
+++ b/projects/android/classygames/src/com/charlesmadere/android/classygames/settings/GamePreferenceFragment.java
@@ -9,7 +9,7 @@
 import com.charlesmadere.android.classygames.R;
 
 
-public final class GameSettingsFragment extends BasePreferenceFragment
+public final class GamePreferenceFragment extends BasePreferenceFragment
 {
 
 
diff --git a/projects/android/classygames/src/com/charlesmadere/android/classygames/settings/NotificationSettingsFragment.java b/projects/android/classygames/src/com/charlesmadere/android/classygames/settings/NotificationPreferenceFragment.java
similarity index 80%
rename from projects/android/classygames/src/com/charlesmadere/android/classygames/settings/NotificationSettingsFragment.java
rename to projects/android/classygames/src/com/charlesmadere/android/classygames/settings/NotificationPreferenceFragment.java
index 3556bf3..85d5de0 100644
--- a/projects/android/classygames/src/com/charlesmadere/android/classygames/settings/NotificationSettingsFragment.java
+++ b/projects/android/classygames/src/com/charlesmadere/android/classygames/settings/NotificationPreferenceFragment.java
@@ -4,7 +4,7 @@
 import com.charlesmadere.android.classygames.R;
 
 
-public final class NotificationSettingsFragment extends BasePreferenceFragment
+public final class NotificationPreferenceFragment extends BasePreferenceFragment
 {
 
 
diff --git a/projects/android/classygames/src/com/charlesmadere/android/classygames/settings/PreferenceActivity.java b/projects/android/classygames/src/com/charlesmadere/android/classygames/settings/PreferenceActivity.java
index 1bb82ac..9d2f01a 100644
--- a/projects/android/classygames/src/com/charlesmadere/android/classygames/settings/PreferenceActivity.java
+++ b/projects/android/classygames/src/com/charlesmadere/android/classygames/settings/PreferenceActivity.java
@@ -23,7 +23,7 @@
  * https://developer.android.com/guide/topics/ui/settings.html
  */
 public final class PreferenceActivity extends BasePreferenceActivity implements
-	GameSettingsFragment.GameSettingsFragmentListeners,
+	GamePreferenceFragment.GameSettingsFragmentListeners,
 	PreferenceFragmentListeners
 {