diff --git a/app/src/main/java/com/git/amarradi/leafpad/MainActivity.java b/app/src/main/java/com/git/amarradi/leafpad/MainActivity.java
index ceed272..a008551 100755
--- a/app/src/main/java/com/git/amarradi/leafpad/MainActivity.java
+++ b/app/src/main/java/com/git/amarradi/leafpad/MainActivity.java
@@ -29,6 +29,7 @@
public class MainActivity extends AppCompatActivity implements SharedPreferences.OnSharedPreferenceChangeListener {
+
public final static String EXTRA_NOTE_ID = "com.git.amarradi.leafpad";
public static final String SHARED_PREFS = "sharedPrefs";
public static final String DESIGN_MODE = "system";
@@ -100,40 +101,28 @@ public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, Strin
loadThemeFromPreference(sharedPreferences);
}
}
+
private void loadThemeFromPreference(SharedPreferences sharedPreferences) {
changeTheme(sharedPreferences.getString(getString(R.string.theme_key), getString(R.string.system_preference_option_value)));
}
- private void changeTheme(String theme_value) {
- switch (theme_value) {
- case "lightmode": {
- Log.d("theme", "changeTheme: "+theme_value);
- AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO);
- SharedPreferences sharedPreferences = getSharedPreferences(SHARED_PREFS, MODE_PRIVATE);
- SharedPreferences.Editor editor = sharedPreferences.edit();
- editor.putString(DESIGN_MODE, theme_value);
- editor.apply();
- break;
- }
- case "darkmode": {
- Log.d("theme", "changeTheme: "+theme_value);
- AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES);
- SharedPreferences sharedPreferences = getSharedPreferences(SHARED_PREFS, MODE_PRIVATE);
- SharedPreferences.Editor editor = sharedPreferences.edit();
- editor.putString(DESIGN_MODE, theme_value);
- editor.apply();
- break;
- }
- case "system": {
- Log.d("theme", "changeTheme: "+theme_value);
- AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM);
- SharedPreferences sharedPreferences = getSharedPreferences(SHARED_PREFS, MODE_PRIVATE);
- SharedPreferences.Editor editor = sharedPreferences.edit();
- editor.putString(DESIGN_MODE, theme_value);
- editor.apply();
- break;
- }
+ private void changeTheme(String themeValue) {
+ Log.d("theme", "changeTheme: " + themeValue);
+ AppCompatDelegate.setDefaultNightMode(toNightMode(themeValue));
+ SharedPreferences sharedPreferences = getSharedPreferences(SHARED_PREFS, MODE_PRIVATE);
+ SharedPreferences.Editor editor = sharedPreferences.edit();
+ editor.putString(DESIGN_MODE, themeValue);
+ editor.apply();
+ }
+
+ private int toNightMode(String themeValue) {
+ if("lightmode".equals(themeValue)) {
+ return AppCompatDelegate.MODE_NIGHT_NO;
+ }
+ if("darkmode".equals(themeValue)) {
+ return AppCompatDelegate.MODE_NIGHT_YES;
}
+ return AppCompatDelegate.MODE_NIGHT_FOLLOW_SYSTEM;
}
@@ -164,6 +153,8 @@ public boolean onOptionsItemSelected(@NonNull MenuItem item) {
Intent settingsIntent = new Intent(this, SettingsActivity.class);
startActivity(settingsIntent);
break;
+ case R.id.item_search:
+
}
return super.onOptionsItemSelected(item);
}
diff --git a/app/src/main/res/drawable/action_search.xml b/app/src/main/res/drawable/action_search.xml
new file mode 100644
index 0000000..f4e055b
--- /dev/null
+++ b/app/src/main/res/drawable/action_search.xml
@@ -0,0 +1,5 @@
+
+
+
+
+
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 64c8a97..cf6fb9f 100755
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -12,6 +12,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content">
+
+
diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
index ce2079e..f517182 100755
--- a/app/src/main/res/menu/menu_main.xml
+++ b/app/src/main/res/menu/menu_main.xml
@@ -8,9 +8,17 @@
android:icon="@drawable/action_remove_all"
android:title="@string/action_remove_all"
app:showAsAction="ifRoom" /> -->
+