more Settings / Preference refactoring

charlesmadere · Nov 12, 2013 · d728e1f · d728e1f
1 parent 6e65162
commit d728e1f
Show file tree

Hide file tree

Showing 6 changed files with 10 additions and 10 deletions.
diff --git 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>
diff --git a/projects/android/classygames/res/xml/settings_headers_legacy.xml b/projects/android/classygames/res/xml/settings_headers_legacy.xml
@@ -6,23 +6,23 @@
 		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
 		android:summary="@string/settings_notifications_summary"
 		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
 		android:summary="@string/classy_games_information_and_details"
 		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>
diff --git a/...games/settings/AboutSettingsFragment.java → ...mes/settings/AboutPreferenceFragment.java b/...games/settings/AboutSettingsFragment.java → ...mes/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/...ygames/settings/GameSettingsFragment.java → ...ames/settings/GamePreferenceFragment.java b/...ygames/settings/GameSettingsFragment.java → ...ames/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/...ettings/NotificationSettingsFragment.java → ...tings/NotificationPreferenceFragment.java b/...ettings/NotificationSettingsFragment.java → ...tings/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/...id/classygames/src/com/charlesmadere/android/classygames/settings/PreferenceActivity.java b/...id/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
 {