From 0ae21f293fe4cdc85f5d0e2e6af65035c2621293 Mon Sep 17 00:00:00 2001 From: Aviortheking <2bazert@gmail.com> Date: Tue, 13 Feb 2018 01:06:15 +0100 Subject: [PATCH] Updating time --- .idea/modules.xml | 2 +- app/src/main/AndroidManifest.xml | 20 +- .../Android/Hangman/AboutActivity.java | 27 +- .../Hangman/AppCompatPreferenceActivity.java | 109 -------- .../Android/Hangman/GameActivity.java | 2 +- .../Android/Hangman/MainActivity.java | 48 +++- .../Android/Hangman/SettingsActivity.java | 254 ------------------ .../Android/Hangman/Util/GameUtil.java | 25 ++ .../Hangman/settings/SettingActivity.java | 75 ++++++ .../Hangman/settings/generalOptions.java | 25 ++ .../Hangman/settings/multiOptions.java | 21 ++ .../Hangman/settings/singleOptions.java | 21 ++ .../res/drawable/ic_dashboard_black_24dp.xml | 9 - .../main/res/drawable/ic_home_black_24dp.xml | 9 - .../main/res/drawable/ic_info_black_24dp.xml | 9 - .../drawable/ic_notifications_black_24dp.xml | 9 - .../res/drawable/ic_search_black_24dp.xml | 9 - .../main/res/drawable/ic_sync_black_24dp.xml | 9 - app/src/main/res/drawable/people_black.xml | 9 + app/src/main/res/drawable/people_white.xml | 9 + app/src/main/res/drawable/person_black.xml | 9 + app/src/main/res/drawable/person_white.xml | 9 + app/src/main/res/drawable/shape_outline.xml | 9 + app/src/main/res/layout/activity_main.xml | 4 +- .../main/res/layout/preferences_toolbar.xml | 11 + app/src/main/res/menu/home.xml | 4 +- app/src/main/res/values-v21/styles.xml | 15 -- app/src/main/res/values/arrays.xml | 20 ++ app/src/main/res/values/colors.xml | 8 + app/src/main/res/values/strings.xml | 82 ++---- app/src/main/res/values/styles.xml | 36 ++- app/src/main/res/xml/pref_data_sync.xml | 21 -- app/src/main/res/xml/pref_general.xml | 33 --- app/src/main/res/xml/pref_headers.xml | 20 -- app/src/main/res/xml/pref_notification.xml | 27 -- app/src/main/res/xml/settings_general.xml | 9 + app/src/main/res/xml/settings_headers.xml | 18 ++ app/src/main/res/xml/settings_multiplayer.xml | 15 ++ .../main/res/xml/settings_singleplayer.xml | 9 + 39 files changed, 435 insertions(+), 625 deletions(-) delete mode 100644 app/src/main/java/net/DeltaWings/Android/Hangman/AppCompatPreferenceActivity.java delete mode 100644 app/src/main/java/net/DeltaWings/Android/Hangman/SettingsActivity.java create mode 100644 app/src/main/java/net/DeltaWings/Android/Hangman/Util/GameUtil.java create mode 100644 app/src/main/java/net/DeltaWings/Android/Hangman/settings/SettingActivity.java create mode 100644 app/src/main/java/net/DeltaWings/Android/Hangman/settings/generalOptions.java create mode 100644 app/src/main/java/net/DeltaWings/Android/Hangman/settings/multiOptions.java create mode 100644 app/src/main/java/net/DeltaWings/Android/Hangman/settings/singleOptions.java delete mode 100644 app/src/main/res/drawable/ic_dashboard_black_24dp.xml delete mode 100644 app/src/main/res/drawable/ic_home_black_24dp.xml delete mode 100644 app/src/main/res/drawable/ic_info_black_24dp.xml delete mode 100644 app/src/main/res/drawable/ic_notifications_black_24dp.xml delete mode 100644 app/src/main/res/drawable/ic_search_black_24dp.xml delete mode 100644 app/src/main/res/drawable/ic_sync_black_24dp.xml create mode 100644 app/src/main/res/drawable/people_black.xml create mode 100644 app/src/main/res/drawable/people_white.xml create mode 100644 app/src/main/res/drawable/person_black.xml create mode 100644 app/src/main/res/drawable/person_white.xml create mode 100644 app/src/main/res/drawable/shape_outline.xml create mode 100644 app/src/main/res/layout/preferences_toolbar.xml delete mode 100644 app/src/main/res/values-v21/styles.xml create mode 100644 app/src/main/res/values/arrays.xml delete mode 100644 app/src/main/res/xml/pref_data_sync.xml delete mode 100644 app/src/main/res/xml/pref_general.xml delete mode 100644 app/src/main/res/xml/pref_headers.xml delete mode 100644 app/src/main/res/xml/pref_notification.xml create mode 100644 app/src/main/res/xml/settings_general.xml create mode 100644 app/src/main/res/xml/settings_headers.xml create mode 100644 app/src/main/res/xml/settings_multiplayer.xml create mode 100644 app/src/main/res/xml/settings_singleplayer.xml diff --git a/.idea/modules.xml b/.idea/modules.xml index 5d35779..7d95eba 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,8 +2,8 @@ - + \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index a6d4e93..e34f89c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -2,18 +2,21 @@ + + + android:supportsRtl="false" + android:theme="@style/DeltaWings.Color"> + android:screenOrientation="portrait" + android:theme="@style/DeltaWings.Color"> @@ -22,15 +25,18 @@ + android:name=".settings.SettingActivity" + android:screenOrientation="portrait" + android:theme="@style/DeltaWings.Dark"> + android:screenOrientation="portrait" + android:theme="@style/DeltaWings.Color"> diff --git a/app/src/main/java/net/DeltaWings/Android/Hangman/AboutActivity.java b/app/src/main/java/net/DeltaWings/Android/Hangman/AboutActivity.java index e9b48db..6eb63b1 100644 --- a/app/src/main/java/net/DeltaWings/Android/Hangman/AboutActivity.java +++ b/app/src/main/java/net/DeltaWings/Android/Hangman/AboutActivity.java @@ -1,13 +1,38 @@ package net.DeltaWings.Android.Hangman; -import android.support.v7.app.AppCompatActivity; import android.os.Bundle; +import android.support.v7.app.ActionBar; +import android.support.v7.app.AppCompatActivity; +import android.widget.Toast; public class AboutActivity extends AppCompatActivity { @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + MainActivity.setTheme(this); setContentView(R.layout.activity_about); + + ActionBar actionBar = getSupportActionBar(); + if (actionBar != null) { + actionBar.setHomeButtonEnabled(true); + actionBar.setDisplayHomeAsUpEnabled(true); + actionBar.setDisplayShowHomeEnabled(true); + } else { + Toast.makeText(MainActivity.getInstance(), "A problem occurred Please restart the application", Toast.LENGTH_SHORT).show(); + } + } + + @Override + public void onBackPressed() { + finish(); + overridePendingTransition(R.anim.fade_in, R.anim.fade_out); + } + + @Override + public boolean onSupportNavigateUp(){ + finish(); + overridePendingTransition(R.anim.fade_in, R.anim.fade_out); + return true; } } diff --git a/app/src/main/java/net/DeltaWings/Android/Hangman/AppCompatPreferenceActivity.java b/app/src/main/java/net/DeltaWings/Android/Hangman/AppCompatPreferenceActivity.java deleted file mode 100644 index e13dff1..0000000 --- a/app/src/main/java/net/DeltaWings/Android/Hangman/AppCompatPreferenceActivity.java +++ /dev/null @@ -1,109 +0,0 @@ -package net.DeltaWings.Android.Hangman; - -import android.content.res.Configuration; -import android.os.Bundle; -import android.preference.PreferenceActivity; -import android.support.annotation.LayoutRes; -import android.support.annotation.Nullable; -import android.support.v7.app.ActionBar; -import android.support.v7.app.AppCompatDelegate; -import android.support.v7.widget.Toolbar; -import android.view.MenuInflater; -import android.view.View; -import android.view.ViewGroup; - -/** - * A {@link android.preference.PreferenceActivity} which implements and proxies the necessary calls - * to be used with AppCompat. - */ -public abstract class AppCompatPreferenceActivity extends PreferenceActivity { - - private AppCompatDelegate mDelegate; - - @Override - protected void onCreate(Bundle savedInstanceState) { - getDelegate().installViewFactory(); - getDelegate().onCreate(savedInstanceState); - super.onCreate(savedInstanceState); - } - - @Override - protected void onPostCreate(Bundle savedInstanceState) { - super.onPostCreate(savedInstanceState); - getDelegate().onPostCreate(savedInstanceState); - } - - public ActionBar getSupportActionBar() { - return getDelegate().getSupportActionBar(); - } - - public void setSupportActionBar(@Nullable Toolbar toolbar) { - getDelegate().setSupportActionBar(toolbar); - } - - @Override - public MenuInflater getMenuInflater() { - return getDelegate().getMenuInflater(); - } - - @Override - public void setContentView(@LayoutRes int layoutResID) { - getDelegate().setContentView(layoutResID); - } - - @Override - public void setContentView(View view) { - getDelegate().setContentView(view); - } - - @Override - public void setContentView(View view, ViewGroup.LayoutParams params) { - getDelegate().setContentView(view, params); - } - - @Override - public void addContentView(View view, ViewGroup.LayoutParams params) { - getDelegate().addContentView(view, params); - } - - @Override - protected void onPostResume() { - super.onPostResume(); - getDelegate().onPostResume(); - } - - @Override - protected void onTitleChanged(CharSequence title, int color) { - super.onTitleChanged(title, color); - getDelegate().setTitle(title); - } - - @Override - public void onConfigurationChanged(Configuration newConfig) { - super.onConfigurationChanged(newConfig); - getDelegate().onConfigurationChanged(newConfig); - } - - @Override - protected void onStop() { - super.onStop(); - getDelegate().onStop(); - } - - @Override - protected void onDestroy() { - super.onDestroy(); - getDelegate().onDestroy(); - } - - public void invalidateOptionsMenu() { - getDelegate().invalidateOptionsMenu(); - } - - private AppCompatDelegate getDelegate() { - if (mDelegate == null) { - mDelegate = AppCompatDelegate.create(this, null); - } - return mDelegate; - } -} diff --git a/app/src/main/java/net/DeltaWings/Android/Hangman/GameActivity.java b/app/src/main/java/net/DeltaWings/Android/Hangman/GameActivity.java index 035f8ad..ad35f18 100644 --- a/app/src/main/java/net/DeltaWings/Android/Hangman/GameActivity.java +++ b/app/src/main/java/net/DeltaWings/Android/Hangman/GameActivity.java @@ -1,7 +1,6 @@ package net.DeltaWings.Android.Hangman; import android.animation.ObjectAnimator; -import android.app.Activity; import android.content.DialogInterface; import android.os.Bundle; import android.support.v7.app.ActionBar; @@ -39,6 +38,7 @@ public class GameActivity extends AppCompatActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + MainActivity.setTheme(this); setContentView(R.layout.game_activity); ProgressBar progressBar = findViewById(R.id.progressBar); diff --git a/app/src/main/java/net/DeltaWings/Android/Hangman/MainActivity.java b/app/src/main/java/net/DeltaWings/Android/Hangman/MainActivity.java index 74d9ecd..be5918a 100644 --- a/app/src/main/java/net/DeltaWings/Android/Hangman/MainActivity.java +++ b/app/src/main/java/net/DeltaWings/Android/Hangman/MainActivity.java @@ -1,7 +1,11 @@ package net.DeltaWings.Android.Hangman; +import android.app.Activity; +import android.content.Context; import android.content.Intent; +import android.content.SharedPreferences; import android.os.Bundle; +import android.preference.PreferenceManager; import android.support.v7.app.AppCompatActivity; import android.view.Menu; import android.view.MenuInflater; @@ -9,6 +13,8 @@ import android.view.MenuItem; import android.view.View; import android.widget.Toast; +import net.DeltaWings.Android.Hangman.settings.SettingActivity; + public class MainActivity extends AppCompatActivity { public static MainActivity instance; @@ -17,12 +23,29 @@ public class MainActivity extends AppCompatActivity { return instance; } public boolean single = true; + public static boolean themeChanged = false; + + @Override + protected void onResume() { + super.onResume(); + if(themeChanged) { + themeChanged = false; + Intent intent = getIntent(); + overridePendingTransition(0, 0); + intent.addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION); + finish(); + + overridePendingTransition(0, 0); + startActivity(intent); + } + } @Override protected void onCreate(Bundle savedInstanceState) { instance = this; super.onCreate(savedInstanceState); + setTheme(this); setContentView(R.layout.activity_main); @@ -38,7 +61,7 @@ public class MainActivity extends AppCompatActivity { findViewById(R.id.singleplayerButton).setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - Toast.makeText(instance, "WIP", Toast.LENGTH_LONG).show(); + Toast.makeText(instance, getPref("setting_theme", getApplicationContext()), Toast.LENGTH_LONG).show(); } }); @@ -56,14 +79,33 @@ public class MainActivity extends AppCompatActivity { public boolean onOptionsItemSelected(MenuItem item) { switch (item.getItemId()) { case R.id.navigation_options: - // EITHER CALL THE METHOD HERE OR DO THE FUNCTION DIRECTLY - startActivity(new Intent(instance, SettingsActivity.class)); + startActivity(new Intent(instance, SettingActivity.class)); overridePendingTransition(R.anim.fade_in, R.anim.fade_out); return true; + case R.id.navigation_about: + startActivity(new Intent(instance, AboutActivity.class)); + overridePendingTransition(R.anim.fade_in, R.anim.fade_out); + return true; default: return super.onOptionsItemSelected(item); } } + + public static void putPref(String key, String value, Context context) { + SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(context); + SharedPreferences.Editor editor = prefs.edit(); + editor.putString(key, value); + editor.apply(); + } + + public static String getPref(String key, Context context) { + SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(context); + return preferences.getString(key, null); + } + + public static void setTheme(Activity activity) { + activity.setTheme(activity.getResources().getIdentifier("DeltaWings."+getPref("setting_theme", activity.getApplicationContext()), "style", activity.getPackageName())); + } } diff --git a/app/src/main/java/net/DeltaWings/Android/Hangman/SettingsActivity.java b/app/src/main/java/net/DeltaWings/Android/Hangman/SettingsActivity.java deleted file mode 100644 index 85e996e..0000000 --- a/app/src/main/java/net/DeltaWings/Android/Hangman/SettingsActivity.java +++ /dev/null @@ -1,254 +0,0 @@ -package net.DeltaWings.Android.Hangman; - -import android.annotation.TargetApi; -import android.content.Context; -import android.content.Intent; -import android.content.res.Configuration; -import android.media.Ringtone; -import android.media.RingtoneManager; -import android.net.Uri; -import android.os.Build; -import android.os.Bundle; -import android.preference.ListPreference; -import android.preference.Preference; -import android.preference.PreferenceActivity; -import android.support.v7.app.ActionBar; -import android.preference.PreferenceFragment; -import android.preference.PreferenceManager; -import android.preference.RingtonePreference; -import android.text.TextUtils; -import android.view.MenuItem; - -import java.util.List; - -/** - * A {@link PreferenceActivity} that presents a set of application settings. On - * handset devices, settings are presented as a single list. On tablets, - * settings are split by category, with category headers shown to the left of - * the list of settings. - *

- * See - * Android Design: Settings for design guidelines and the Settings - * API Guide for more information on developing a Settings UI. - */ -public class SettingsActivity extends AppCompatPreferenceActivity { - - /** - * A preference value change listener that updates the preference's summary - * to reflect its new value. - */ - private static Preference.OnPreferenceChangeListener sBindPreferenceSummaryToValueListener = new Preference.OnPreferenceChangeListener() { - @Override - public boolean onPreferenceChange(Preference preference, Object value) { - String stringValue = value.toString(); - - if (preference instanceof ListPreference) { - // For list preferences, look up the correct display value in - // the preference's 'entries' list. - ListPreference listPreference = (ListPreference) preference; - int index = listPreference.findIndexOfValue(stringValue); - - // Set the summary to reflect the new value. - preference.setSummary( - index >= 0 - ? listPreference.getEntries()[index] - : null); - - } else if (preference instanceof RingtonePreference) { - // For ringtone preferences, look up the correct display value - // using RingtoneManager. - if (TextUtils.isEmpty(stringValue)) { - // Empty values correspond to 'silent' (no ringtone). - preference.setSummary(R.string.pref_ringtone_silent); - - } else { - Ringtone ringtone = RingtoneManager.getRingtone( - preference.getContext(), Uri.parse(stringValue)); - - if (ringtone == null) { - // Clear the summary if there was a lookup error. - preference.setSummary(null); - } else { - // Set the summary to reflect the new ringtone display - // name. - String name = ringtone.getTitle(preference.getContext()); - preference.setSummary(name); - } - } - - } else { - // For all other preferences, set the summary to the value's - // simple string representation. - preference.setSummary(stringValue); - } - return true; - } - }; - - /** - * Helper method to determine if the device has an extra-large screen. For - * example, 10" tablets are extra-large. - */ - private static boolean isXLargeTablet(Context context) { - return (context.getResources().getConfiguration().screenLayout - & Configuration.SCREENLAYOUT_SIZE_MASK) >= Configuration.SCREENLAYOUT_SIZE_XLARGE; - } - - /** - * Binds a preference's summary to its value. More specifically, when the - * preference's value is changed, its summary (line of text below the - * preference title) is updated to reflect the value. The summary is also - * immediately updated upon calling this method. The exact display format is - * dependent on the type of preference. - * - * @see #sBindPreferenceSummaryToValueListener - */ - private static void bindPreferenceSummaryToValue(Preference preference) { - // Set the listener to watch for value changes. - preference.setOnPreferenceChangeListener(sBindPreferenceSummaryToValueListener); - - // Trigger the listener immediately with the preference's - // current value. - sBindPreferenceSummaryToValueListener.onPreferenceChange(preference, - PreferenceManager - .getDefaultSharedPreferences(preference.getContext()) - .getString(preference.getKey(), "")); - } - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setupActionBar(); - } - - /** - * Set up the {@link android.app.ActionBar}, if the API is available. - */ - private void setupActionBar() { - ActionBar actionBar = getSupportActionBar(); - if (actionBar != null) { - // Show the Up button in the action bar. - actionBar.setDisplayHomeAsUpEnabled(true); - } - } - - /** - * {@inheritDoc} - */ - @Override - public boolean onIsMultiPane() { - return isXLargeTablet(this); - } - - /** - * {@inheritDoc} - */ - @Override - @TargetApi(Build.VERSION_CODES.HONEYCOMB) - public void onBuildHeaders(List

target) { - loadHeadersFromResource(R.xml.pref_headers, target); - } - - /** - * This method stops fragment injection in malicious applications. - * Make sure to deny any unknown fragments here. - */ - protected boolean isValidFragment(String fragmentName) { - return PreferenceFragment.class.getName().equals(fragmentName) - || GeneralPreferenceFragment.class.getName().equals(fragmentName) - || DataSyncPreferenceFragment.class.getName().equals(fragmentName) - || NotificationPreferenceFragment.class.getName().equals(fragmentName); - } - - /** - * This fragment shows general preferences only. It is used when the - * activity is showing a two-pane settings UI. - */ - @TargetApi(Build.VERSION_CODES.HONEYCOMB) - public static class GeneralPreferenceFragment extends PreferenceFragment { - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - addPreferencesFromResource(R.xml.pref_general); - setHasOptionsMenu(true); - - // Bind the summaries of EditText/List/Dialog/Ringtone preferences - // to their values. When their values change, their summaries are - // updated to reflect the new value, per the Android Design - // guidelines. - bindPreferenceSummaryToValue(findPreference("example_text")); - bindPreferenceSummaryToValue(findPreference("example_list")); - } - - @Override - public boolean onOptionsItemSelected(MenuItem item) { - int id = item.getItemId(); - if (id == android.R.id.home) { - startActivity(new Intent(getActivity(), SettingsActivity.class)); - return true; - } - return super.onOptionsItemSelected(item); - } - } - - /** - * This fragment shows notification preferences only. It is used when the - * activity is showing a two-pane settings UI. - */ - @TargetApi(Build.VERSION_CODES.HONEYCOMB) - public static class NotificationPreferenceFragment extends PreferenceFragment { - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - addPreferencesFromResource(R.xml.pref_notification); - setHasOptionsMenu(true); - - // Bind the summaries of EditText/List/Dialog/Ringtone preferences - // to their values. When their values change, their summaries are - // updated to reflect the new value, per the Android Design - // guidelines. - bindPreferenceSummaryToValue(findPreference("notifications_new_message_ringtone")); - } - - @Override - public boolean onOptionsItemSelected(MenuItem item) { - int id = item.getItemId(); - if (id == android.R.id.home) { - startActivity(new Intent(getActivity(), SettingsActivity.class)); - return true; - } - return super.onOptionsItemSelected(item); - } - } - - /** - * This fragment shows data and sync preferences only. It is used when the - * activity is showing a two-pane settings UI. - */ - @TargetApi(Build.VERSION_CODES.HONEYCOMB) - public static class DataSyncPreferenceFragment extends PreferenceFragment { - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - addPreferencesFromResource(R.xml.pref_data_sync); - setHasOptionsMenu(true); - - // Bind the summaries of EditText/List/Dialog/Ringtone preferences - // to their values. When their values change, their summaries are - // updated to reflect the new value, per the Android Design - // guidelines. - bindPreferenceSummaryToValue(findPreference("sync_frequency")); - } - - @Override - public boolean onOptionsItemSelected(MenuItem item) { - int id = item.getItemId(); - if (id == android.R.id.home) { - startActivity(new Intent(getActivity(), SettingsActivity.class)); - return true; - } - return super.onOptionsItemSelected(item); - } - } -} diff --git a/app/src/main/java/net/DeltaWings/Android/Hangman/Util/GameUtil.java b/app/src/main/java/net/DeltaWings/Android/Hangman/Util/GameUtil.java new file mode 100644 index 0000000..f502397 --- /dev/null +++ b/app/src/main/java/net/DeltaWings/Android/Hangman/Util/GameUtil.java @@ -0,0 +1,25 @@ +package net.DeltaWings.Android.Hangman.Util; + +import java.util.ArrayList; +import java.util.List; + +public class GameUtil { + + private String word = null; + private List letters = new ArrayList<>(); + private List datas = new ArrayList<>(); + + public GameUtil() { + + } + + public boolean datasReader(List datas) { + + return true; + } + + public List datasSender() { + + return null; + } +} \ No newline at end of file diff --git a/app/src/main/java/net/DeltaWings/Android/Hangman/settings/SettingActivity.java b/app/src/main/java/net/DeltaWings/Android/Hangman/settings/SettingActivity.java new file mode 100644 index 0000000..3d88ff6 --- /dev/null +++ b/app/src/main/java/net/DeltaWings/Android/Hangman/settings/SettingActivity.java @@ -0,0 +1,75 @@ +package net.DeltaWings.Android.Hangman.settings; + +import android.content.Intent; +import android.os.Bundle; +import android.preference.PreferenceActivity; +import android.support.v7.widget.Toolbar; +import android.view.LayoutInflater; +import android.view.View; +import android.widget.LinearLayout; + +import net.DeltaWings.Android.Hangman.MainActivity; +import net.DeltaWings.Android.Hangman.R; + +import java.util.List; + +public class SettingActivity extends PreferenceActivity { + + public static boolean themeChanged = false; + + @Override + protected void onResume() { + super.onResume(); + if(themeChanged) { + themeChanged = false; + Intent intent = getIntent(); + overridePendingTransition(0, 0); + intent.addFlags(Intent.FLAG_ACTIVITY_NO_ANIMATION); + finish(); + + overridePendingTransition(0, 0); + startActivity(intent); + } + } + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + MainActivity.setTheme(this); + + LinearLayout root = (LinearLayout)findViewById(android.R.id.list).getParent().getParent().getParent(); + Toolbar bar = (Toolbar) LayoutInflater.from(this).inflate(R.layout.preferences_toolbar, root, false); + root.addView(bar, 0); // insert at top + bar.setNavigationOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + MainActivity.setTheme(MainActivity.getInstance()); + finish(); + overridePendingTransition(R.anim.fade_in, R.anim.fade_out); + } + }); + + } + + @Override + public boolean isValidFragment(String str) { + overridePendingTransition(R.anim.fade_in, R.anim.fade_out); + return true; + } + + @Override + public void onBuildHeaders(List
target) { + MainActivity.setTheme(this); + loadHeadersFromResource(R.xml.settings_headers, target); + //getListView().setBackgroundColor(getResources().getColor(R.attr.per)); + + } + + @Override + public void onBackPressed() { + finish(); + overridePendingTransition(R.anim.fade_in, R.anim.fade_out); + } + +} diff --git a/app/src/main/java/net/DeltaWings/Android/Hangman/settings/generalOptions.java b/app/src/main/java/net/DeltaWings/Android/Hangman/settings/generalOptions.java new file mode 100644 index 0000000..1e39a11 --- /dev/null +++ b/app/src/main/java/net/DeltaWings/Android/Hangman/settings/generalOptions.java @@ -0,0 +1,25 @@ +package net.DeltaWings.Android.Hangman.settings; + +import android.os.Bundle; +import android.preference.PreferenceFragment; + +import net.DeltaWings.Android.Hangman.MainActivity; +import net.DeltaWings.Android.Hangman.R; + +public class generalOptions extends PreferenceFragment { + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + addPreferencesFromResource(R.xml.settings_general); + + } + + @Override + public void onPause() { + super.onPause(); + MainActivity.themeChanged = true; + SettingActivity.themeChanged = true; + } + +} \ No newline at end of file diff --git a/app/src/main/java/net/DeltaWings/Android/Hangman/settings/multiOptions.java b/app/src/main/java/net/DeltaWings/Android/Hangman/settings/multiOptions.java new file mode 100644 index 0000000..000cb52 --- /dev/null +++ b/app/src/main/java/net/DeltaWings/Android/Hangman/settings/multiOptions.java @@ -0,0 +1,21 @@ +package net.DeltaWings.Android.Hangman.settings; + +import android.os.Bundle; +import android.preference.PreferenceFragment; + +import net.DeltaWings.Android.Hangman.R; + +/** + * Created by 2baze on 12/02/2018. + */ + +public class multiOptions extends PreferenceFragment { + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + addPreferencesFromResource(R.xml.settings_multiplayer); + + } + +} diff --git a/app/src/main/java/net/DeltaWings/Android/Hangman/settings/singleOptions.java b/app/src/main/java/net/DeltaWings/Android/Hangman/settings/singleOptions.java new file mode 100644 index 0000000..bc09db5 --- /dev/null +++ b/app/src/main/java/net/DeltaWings/Android/Hangman/settings/singleOptions.java @@ -0,0 +1,21 @@ +package net.DeltaWings.Android.Hangman.settings; + +import android.os.Bundle; +import android.preference.PreferenceFragment; + +import net.DeltaWings.Android.Hangman.R; + +/** + * Created by 2baze on 12/02/2018. + */ + +public class singleOptions extends PreferenceFragment { + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + addPreferencesFromResource(R.xml.settings_singleplayer); + + } + +} diff --git a/app/src/main/res/drawable/ic_dashboard_black_24dp.xml b/app/src/main/res/drawable/ic_dashboard_black_24dp.xml deleted file mode 100644 index ae6a446..0000000 --- a/app/src/main/res/drawable/ic_dashboard_black_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_home_black_24dp.xml b/app/src/main/res/drawable/ic_home_black_24dp.xml deleted file mode 100644 index 0c36320..0000000 --- a/app/src/main/res/drawable/ic_home_black_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_info_black_24dp.xml b/app/src/main/res/drawable/ic_info_black_24dp.xml deleted file mode 100644 index d9c3703..0000000 --- a/app/src/main/res/drawable/ic_info_black_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_notifications_black_24dp.xml b/app/src/main/res/drawable/ic_notifications_black_24dp.xml deleted file mode 100644 index 0262382..0000000 --- a/app/src/main/res/drawable/ic_notifications_black_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_search_black_24dp.xml b/app/src/main/res/drawable/ic_search_black_24dp.xml deleted file mode 100644 index affc7ba..0000000 --- a/app/src/main/res/drawable/ic_search_black_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_sync_black_24dp.xml b/app/src/main/res/drawable/ic_sync_black_24dp.xml deleted file mode 100644 index a3c73b9..0000000 --- a/app/src/main/res/drawable/ic_sync_black_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/people_black.xml b/app/src/main/res/drawable/people_black.xml new file mode 100644 index 0000000..ae79dd6 --- /dev/null +++ b/app/src/main/res/drawable/people_black.xml @@ -0,0 +1,9 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/people_white.xml b/app/src/main/res/drawable/people_white.xml new file mode 100644 index 0000000..25d5892 --- /dev/null +++ b/app/src/main/res/drawable/people_white.xml @@ -0,0 +1,9 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/person_black.xml b/app/src/main/res/drawable/person_black.xml new file mode 100644 index 0000000..480a3bf --- /dev/null +++ b/app/src/main/res/drawable/person_black.xml @@ -0,0 +1,9 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/person_white.xml b/app/src/main/res/drawable/person_white.xml new file mode 100644 index 0000000..725c83f --- /dev/null +++ b/app/src/main/res/drawable/person_white.xml @@ -0,0 +1,9 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/shape_outline.xml b/app/src/main/res/drawable/shape_outline.xml new file mode 100644 index 0000000..8a891ec --- /dev/null +++ b/app/src/main/res/drawable/shape_outline.xml @@ -0,0 +1,9 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 55eee98..50aa582 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -12,11 +12,9 @@ + \ No newline at end of file diff --git a/app/src/main/res/menu/home.xml b/app/src/main/res/menu/home.xml index e69c03d..a00c1ec 100644 --- a/app/src/main/res/menu/home.xml +++ b/app/src/main/res/menu/home.xml @@ -3,11 +3,9 @@ diff --git a/app/src/main/res/values-v21/styles.xml b/app/src/main/res/values-v21/styles.xml deleted file mode 100644 index 876f924..0000000 --- a/app/src/main/res/values-v21/styles.xml +++ /dev/null @@ -1,15 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml new file mode 100644 index 0000000..558b4d6 --- /dev/null +++ b/app/src/main/res/values/arrays.xml @@ -0,0 +1,20 @@ + + + + + + easy + normal + hard + + + Light + Dark + Color + + + \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index dd9285e..6437e0b 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -3,4 +3,12 @@ #062988 #303F9F #111984 + #2196f3 + #0d47a1 + #3f51b5 + #fafafa + #212121 + #ffffff + + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 1edda46..2df1dbd 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -9,77 +9,29 @@ Notifications Loading… About - Settings - - - General + + example - Enable social recommendations - Recommendations for people to contact - based on your message history - + General + General Configuration - Display name - John Smith + Theme - Add friends to messages - - Always - When possible - Never - - - 1 - 0 - -1 - + Singleplayer + Singleplayer Configuration - - Data & sync + Difficulty - Sync frequency - - 15 minutes - 30 minutes - 1 hour - 3 hours - 6 hours - Never - - - 15 - 30 - 60 - 180 - 360 - -1 - + Multiplayer + Multiplayer Configuration - - Entry 1 - Entry 2 - Entry 3 - - - - 1 - 2 - 3 - - - - - System sync settings - - - Notifications - - New message notifications - - Ringtone - Silent - - Vibrate + Manually enter IP Address + Username + diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 6e31bf2..2c992af 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -1,13 +1,33 @@ - - - + + + + + + + + + diff --git a/app/src/main/res/xml/pref_data_sync.xml b/app/src/main/res/xml/pref_data_sync.xml deleted file mode 100644 index 18cad67..0000000 --- a/app/src/main/res/xml/pref_data_sync.xml +++ /dev/null @@ -1,21 +0,0 @@ - - - - - - - - - - - - diff --git a/app/src/main/res/xml/pref_general.xml b/app/src/main/res/xml/pref_general.xml deleted file mode 100644 index 51a5878..0000000 --- a/app/src/main/res/xml/pref_general.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - - - - - diff --git a/app/src/main/res/xml/pref_headers.xml b/app/src/main/res/xml/pref_headers.xml deleted file mode 100644 index 2a6da06..0000000 --- a/app/src/main/res/xml/pref_headers.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - -
- -
- -
- - diff --git a/app/src/main/res/xml/pref_notification.xml b/app/src/main/res/xml/pref_notification.xml deleted file mode 100644 index 6f7789b..0000000 --- a/app/src/main/res/xml/pref_notification.xml +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - diff --git a/app/src/main/res/xml/settings_general.xml b/app/src/main/res/xml/settings_general.xml new file mode 100644 index 0000000..d6411f2 --- /dev/null +++ b/app/src/main/res/xml/settings_general.xml @@ -0,0 +1,9 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/xml/settings_headers.xml b/app/src/main/res/xml/settings_headers.xml new file mode 100644 index 0000000..e6d5700 --- /dev/null +++ b/app/src/main/res/xml/settings_headers.xml @@ -0,0 +1,18 @@ + + +
+ +
+ +
+ + \ No newline at end of file diff --git a/app/src/main/res/xml/settings_multiplayer.xml b/app/src/main/res/xml/settings_multiplayer.xml new file mode 100644 index 0000000..d594e32 --- /dev/null +++ b/app/src/main/res/xml/settings_multiplayer.xml @@ -0,0 +1,15 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/xml/settings_singleplayer.xml b/app/src/main/res/xml/settings_singleplayer.xml new file mode 100644 index 0000000..9a3cce1 --- /dev/null +++ b/app/src/main/res/xml/settings_singleplayer.xml @@ -0,0 +1,9 @@ + + + + \ No newline at end of file