diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowAccountActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowAccountActivity.java index 949dbf9f7..a59fe4253 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowAccountActivity.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/ShowAccountActivity.java @@ -125,8 +125,8 @@ public class ShowAccountActivity extends AppCompatActivity implements OnPostActi }else { setTheme(R.style.AppThemeDark); } - setTitle(""); setContentView(R.layout.activity_show_account); + setTitle(""); instanceValue += 1; Bundle b = getIntent().getExtras(); account_follow = (FloatingActionButton) findViewById(R.id.account_follow); diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java b/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java index dd8d91f63..7e5f5d389 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/activities/TootActivity.java @@ -146,6 +146,7 @@ public class TootActivity extends AppCompatActivity implements OnRetrieveSearcAc private HorizontalScrollView picture_scrollview; private int currentCursorPosition, searchLength; private boolean canDisplayMessage; + private int style; @Override protected void onCreate(Bundle savedInstanceState) { @@ -154,8 +155,10 @@ public class TootActivity extends AppCompatActivity implements OnRetrieveSearcAc final int theme = sharedpreferences.getInt(Helper.SET_THEME, Helper.THEME_DARK); if( theme == Helper.THEME_LIGHT){ setTheme(R.style.AppTheme); + style = R.style.AlertDialog; }else { setTheme(R.style.AppThemeDark); + style = R.style.AlertDialogDark; } setContentView(R.layout.activity_toot); @@ -594,7 +597,7 @@ public class TootActivity extends AppCompatActivity implements OnRetrieveSearcAc Toast.makeText(getApplicationContext(), R.string.no_draft, Toast.LENGTH_LONG).show(); return true; } - AlertDialog.Builder builderSingle = new AlertDialog.Builder(TootActivity.this); + AlertDialog.Builder builderSingle = new AlertDialog.Builder(TootActivity.this, style); builderSingle.setTitle(getString(R.string.choose_toot)); final DraftsListAdapter draftsListAdapter = new DraftsListAdapter(TootActivity.this, drafts); final int[] ids = new int[drafts.size()]; @@ -612,7 +615,7 @@ public class TootActivity extends AppCompatActivity implements OnRetrieveSearcAc builderSingle.setPositiveButton(R.string.delete_all, new DialogInterface.OnClickListener() { @Override public void onClick(final DialogInterface dialog, int which) { - AlertDialog.Builder builder = new AlertDialog.Builder(TootActivity.this); + AlertDialog.Builder builder = new AlertDialog.Builder(TootActivity.this, style); builder.setTitle(R.string.delete_all); builder.setIcon(android.R.drawable.ic_dialog_alert) .setPositiveButton(R.string.yes, new DialogInterface.OnClickListener() { @@ -652,7 +655,7 @@ public class TootActivity extends AppCompatActivity implements OnRetrieveSearcAc Toast.makeText(getApplicationContext(),R.string.toot_error_no_content, Toast.LENGTH_LONG).show(); return true; } - AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(TootActivity.this); + AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(TootActivity.this, style); LayoutInflater inflater = this.getLayoutInflater(); View dialogView = inflater.inflate(R.layout.datetime_picker, null); dialogBuilder.setView(dialogView); @@ -810,7 +813,7 @@ public class TootActivity extends AppCompatActivity implements OnRetrieveSearcAc */ private void showRemove(final int viewId){ - AlertDialog.Builder dialog = new AlertDialog.Builder(TootActivity.this); + AlertDialog.Builder dialog = new AlertDialog.Builder(TootActivity.this, style); dialog.setMessage(R.string.toot_delete_media); dialog.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() { @@ -847,7 +850,7 @@ public class TootActivity extends AppCompatActivity implements OnRetrieveSearcAc private void tootVisibilityDialog(){ - AlertDialog.Builder dialog = new AlertDialog.Builder(TootActivity.this); + AlertDialog.Builder dialog = new AlertDialog.Builder(TootActivity.this, style); dialog.setTitle(R.string.toot_visibility_tilte); final String[] stringArray = getResources().getStringArray(R.array.toot_visibility); final ArrayAdapter arrayAdapter = new ArrayAdapter<>(TootActivity.this, android.R.layout.simple_list_item_1, stringArray); @@ -1110,7 +1113,7 @@ public class TootActivity extends AppCompatActivity implements OnRetrieveSearcAc ic_show.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - AlertDialog.Builder alert = new AlertDialog.Builder(TootActivity.this); + AlertDialog.Builder alert = new AlertDialog.Builder(TootActivity.this, style); alert.setTitle(R.string.toot_reply_content_title); final TextView input = new TextView(TootActivity.this); //Set the padding diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/AccountsListAdapter.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/AccountsListAdapter.java index b406d962a..18d4ecded 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/AccountsListAdapter.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/AccountsListAdapter.java @@ -69,6 +69,7 @@ public class AccountsListAdapter extends BaseAdapter implements OnPostActionInte private Context context; private AccountsListAdapter accountsListAdapter; private String targetedId; + private int style; public AccountsListAdapter(Context context, RetrieveAccountsAsyncTask.Type action, String targetedId, List accounts){ this.context = context; @@ -115,6 +116,7 @@ public class AccountsListAdapter extends BaseAdapter implements OnPostActionInte .cacheOnDisk(true).resetViewBeforeLoading(true).build(); final Account account = accounts.get(position); final ViewHolder holder; + if (convertView == null) { convertView = layoutInflater.inflate(R.layout.drawer_account, parent, false); holder = new ViewHolder(); @@ -249,8 +251,14 @@ public class AccountsListAdapter extends BaseAdapter implements OnPostActionInte String[] stringArrayConf = context.getResources().getStringArray(R.array.more_action_confirm_account); final API.StatusAction doAction; - - AlertDialog.Builder dialog = new AlertDialog.Builder(context); + final SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE); + int theme = sharedpreferences.getInt(Helper.SET_THEME, Helper.THEME_DARK); + if( theme == Helper.THEME_DARK){ + style = R.style.DialogDark; + }else { + style = R.style.Dialog; + } + AlertDialog.Builder dialog = new AlertDialog.Builder(context, style); if( action == RetrieveAccountsAsyncTask.Type.BLOCKED) { dialog.setMessage(stringArrayConf[1]); diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/DraftsListAdapter.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/DraftsListAdapter.java index 924954701..b7ee793f0 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/DraftsListAdapter.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/DraftsListAdapter.java @@ -48,6 +48,7 @@ public class DraftsListAdapter extends BaseAdapter { private LayoutInflater layoutInflater; private Context context; private DraftsListAdapter draftsListAdapter; + private int style; public DraftsListAdapter(Context context, List storedStatuses){ this.storedStatuses = storedStatuses; @@ -88,7 +89,7 @@ public class DraftsListAdapter extends BaseAdapter { holder = (ViewHolder) convertView.getTag(); } final SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE); - int theme = sharedpreferences.getInt(Helper.SET_THEME, Helper.THEME_DARK); + final int theme = sharedpreferences.getInt(Helper.SET_THEME, Helper.THEME_DARK); if( theme == Helper.THEME_DARK){ changeDrawableColor(context, R.drawable.ic_cancel,R.color.dark_text); }else { @@ -105,7 +106,12 @@ public class DraftsListAdapter extends BaseAdapter { holder.draft_delete.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - AlertDialog.Builder builder = new AlertDialog.Builder(context); + if( theme == Helper.THEME_DARK){ + style = R.style.DialogDark; + }else { + style = R.style.Dialog; + } + AlertDialog.Builder builder = new AlertDialog.Builder(context, style); builder.setMessage(draft.getStatus().getContent() + '\n' + Helper.dateToString(context, draft.getCreation_date())); builder.setIcon(android.R.drawable.ic_dialog_alert) .setTitle(R.string.remove_draft) diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/NotificationsListAdapter.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/NotificationsListAdapter.java index 9679c6527..5b214f70d 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/NotificationsListAdapter.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/NotificationsListAdapter.java @@ -82,7 +82,7 @@ public class NotificationsListAdapter extends BaseAdapter implements OnPostActio private NotificationsListAdapter notificationsListAdapter; private int behaviorWithAttachments; private boolean isOnWifi; - + private int style; public NotificationsListAdapter(Context context, boolean isOnWifi, int behaviorWithAttachments, List notifications){ this.context = context; @@ -446,7 +446,14 @@ public class NotificationsListAdapter extends BaseAdapter implements OnPostActio else title = context.getString(R.string.reblog_add); } - AlertDialog.Builder builder = new AlertDialog.Builder(context); + final SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE); + int theme = sharedpreferences.getInt(Helper.SET_THEME, Helper.THEME_DARK); + if( theme == Helper.THEME_DARK){ + style = R.style.DialogDark; + }else { + style = R.style.Dialog; + } + AlertDialog.Builder builder = new AlertDialog.Builder(context, style); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) builder.setMessage(Html.fromHtml(status.getContent(), Html.FROM_HTML_MODE_LEGACY)); @@ -481,7 +488,15 @@ public class NotificationsListAdapter extends BaseAdapter implements OnPostActio */ private void displayConfirmationNotificationDialog(final Notification notification){ final ArrayList seletedItems = new ArrayList(); - AlertDialog dialog = new AlertDialog.Builder(context) + final SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE); + + int theme = sharedpreferences.getInt(Helper.SET_THEME, Helper.THEME_DARK); + if( theme == Helper.THEME_DARK){ + style = R.style.DialogDark; + }else { + style = R.style.Dialog; + } + AlertDialog dialog = new AlertDialog.Builder(context, style) .setTitle(R.string.delete_notification_ask) .setMultiChoiceItems(new String[]{context.getString(R.string.delete_notification_ask_all)}, null, new DialogInterface.OnMultiChoiceClickListener() { @Override diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/ScheduledTootsListAdapter.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/ScheduledTootsListAdapter.java index 96b32d15f..864362407 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/ScheduledTootsListAdapter.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/ScheduledTootsListAdapter.java @@ -67,6 +67,7 @@ public class ScheduledTootsListAdapter extends BaseAdapter { private LayoutInflater layoutInflater; private ScheduledTootsListAdapter scheduledTootsListAdapter; private RelativeLayout textviewNoAction; + private int style; public ScheduledTootsListAdapter(Context context, List storedStatuses, RelativeLayout textviewNoAction){ this.context = context; @@ -117,7 +118,7 @@ public class ScheduledTootsListAdapter extends BaseAdapter { final SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE); - int theme = sharedpreferences.getInt(Helper.SET_THEME, Helper.THEME_DARK); + final int theme = sharedpreferences.getInt(Helper.SET_THEME, Helper.THEME_DARK); if( theme == Helper.THEME_DARK){ changeDrawableColor(context, R.drawable.ic_cancel,R.color.dark_text); changeDrawableColor(context, R.drawable.ic_action_globe,R.color.dark_text); @@ -154,7 +155,12 @@ public class ScheduledTootsListAdapter extends BaseAdapter { holder.scheduled_toot_delete.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - AlertDialog.Builder builder = new AlertDialog.Builder(context); + if( theme == Helper.THEME_DARK){ + style = R.style.DialogDark; + }else { + style = R.style.Dialog; + } + AlertDialog.Builder builder = new AlertDialog.Builder(context, style); builder.setMessage(status.getContent() + '\n' + Helper.dateToString(context, storedStatus.getCreation_date())); builder.setIcon(android.R.drawable.ic_dialog_alert) .setTitle(R.string.remove_scheduled) @@ -195,8 +201,12 @@ public class ScheduledTootsListAdapter extends BaseAdapter { holder.scheduled_toot_date.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - - AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(context); + if( theme == Helper.THEME_DARK){ + style = R.style.DialogDark; + }else { + style = R.style.Dialog; + } + AlertDialog.Builder dialogBuilder = new AlertDialog.Builder(context, style); LayoutInflater inflater = ((MainActivity)context).getLayoutInflater(); View dialogView = inflater.inflate(R.layout.datetime_picker, null); SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, android.content.Context.MODE_PRIVATE); diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java index 9a294af3c..00ca90a90 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/drawers/StatusListAdapter.java @@ -348,9 +348,9 @@ public class StatusListAdapter extends BaseAdapter implements OnPostActionInterf } }else { if( position == ShowConversationActivity.position){ - holder.main_container.setBackgroundResource(R.color.header2D); + holder.main_container.setBackgroundResource(R.color.mastodonC1_); }else { - holder.main_container.setBackgroundResource(R.color.cardview_dark_background); + holder.main_container.setBackgroundResource(R.color.mastodonC1); } } } diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayAccountsFragment.java b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayAccountsFragment.java index 1feaa1cda..1b64a4dce 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayAccountsFragment.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayAccountsFragment.java @@ -190,16 +190,9 @@ public class DisplayAccountsFragment extends Fragment implements OnRetrieveAccou } }); int theme = sharedpreferences.getInt(Helper.SET_THEME, Helper.THEME_DARK); - if( theme == Helper.THEME_LIGHT) { - swipeRefreshLayout.setColorSchemeResources(R.color.colorAccent, - R.color.colorPrimary, - R.color.colorPrimaryDark); - }else { - swipeRefreshLayout.setColorSchemeResources(R.color.colorAccentD, - R.color.colorPrimaryD, - R.color.colorPrimaryDarkD); - } - + swipeRefreshLayout.setColorSchemeResources(R.color.mastodonC4, + R.color.mastodonC2, + R.color.mastodonC3); if (type != RetrieveAccountsAsyncTask.Type.FOLLOWERS && type != RetrieveAccountsAsyncTask.Type.FOLLOWING) asyncTask = new RetrieveAccountsAsyncTask(context, type, max_id, DisplayAccountsFragment.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayFollowRequestSentFragment.java b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayFollowRequestSentFragment.java index f11ce861b..415e21f9d 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayFollowRequestSentFragment.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayFollowRequestSentFragment.java @@ -117,15 +117,9 @@ public class DisplayFollowRequestSentFragment extends Fragment implements OnRetr } }); int theme = sharedpreferences.getInt(Helper.SET_THEME, Helper.THEME_DARK); - if( theme == Helper.THEME_LIGHT) { - swipeRefreshLayout.setColorSchemeResources(R.color.colorAccent, - R.color.colorPrimary, - R.color.colorPrimaryDark); - }else { - swipeRefreshLayout.setColorSchemeResources(R.color.colorAccentD, - R.color.colorPrimaryD, - R.color.colorPrimaryDarkD); - } + swipeRefreshLayout.setColorSchemeResources(R.color.mastodonC4, + R.color.mastodonC2, + R.color.mastodonC3); asyncTask = new RetrieveFollowRequestSentAsyncTask(context, max_id, DisplayFollowRequestSentFragment.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayNotificationsFragment.java b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayNotificationsFragment.java index 736b62053..582b5a3cb 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayNotificationsFragment.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayNotificationsFragment.java @@ -120,15 +120,9 @@ public class DisplayNotificationsFragment extends Fragment implements OnRetrieve } }); int theme = sharedpreferences.getInt(Helper.SET_THEME, Helper.THEME_DARK); - if( theme == Helper.THEME_LIGHT) { - swipeRefreshLayout.setColorSchemeResources(R.color.colorAccent, - R.color.colorPrimary, - R.color.colorPrimaryDark); - }else { - swipeRefreshLayout.setColorSchemeResources(R.color.colorAccentD, - R.color.colorPrimaryD, - R.color.colorPrimaryDarkD); - } + swipeRefreshLayout.setColorSchemeResources(R.color.mastodonC4, + R.color.mastodonC2, + R.color.mastodonC3); asyncTask = new RetrieveNotificationsAsyncTask(context, null, null, max_id, null, null, DisplayNotificationsFragment.this).executeOnExecutor(AsyncTask.THREAD_POOL_EXECUTOR); return rootView; diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayStatusFragment.java b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayStatusFragment.java index a7c9da639..8f65b956a 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayStatusFragment.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/DisplayStatusFragment.java @@ -208,15 +208,9 @@ public class DisplayStatusFragment extends Fragment implements OnRetrieveFeedsIn } }); int theme = sharedpreferences.getInt(Helper.SET_THEME, Helper.THEME_DARK); - if( theme == Helper.THEME_LIGHT) { - swipeRefreshLayout.setColorSchemeResources(R.color.colorAccent, - R.color.colorPrimary, - R.color.colorPrimaryDark); - }else { - swipeRefreshLayout.setColorSchemeResources(R.color.colorAccentD, - R.color.colorPrimaryD, - R.color.colorPrimaryDarkD); - } + swipeRefreshLayout.setColorSchemeResources(R.color.mastodonC4, + R.color.mastodonC2, + R.color.mastodonC3); if( type == RetrieveFeedsAsyncTask.Type.USER) diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsFragment.java b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsFragment.java index 1a6a81ac8..6eaa01bc5 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsFragment.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsFragment.java @@ -69,6 +69,7 @@ public class SettingsFragment extends Fragment { private Context context; private static final int ACTIVITY_CHOOSE_FILE = 411; private TextView set_folder; + private int style; @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { @@ -77,7 +78,12 @@ public class SettingsFragment extends Fragment { context = getContext(); final SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE); - + int theme = sharedpreferences.getInt(Helper.SET_THEME, Helper.THEME_DARK); + if( theme == Helper.THEME_DARK){ + style = R.style.DialogDark; + }else { + style = R.style.Dialog; + } boolean auto_store = sharedpreferences.getBoolean(Helper.SET_AUTO_STORE, true); @@ -191,7 +197,6 @@ public class SettingsFragment extends Fragment { file_chooser.setVisibility(View.GONE); } - int theme = sharedpreferences.getInt(Helper.SET_THEME, Helper.THEME_DARK); final SwitchCompat set_night_mode = (SwitchCompat) rootView.findViewById(R.id.set_night_mode); set_night_mode.setChecked(theme == Helper.THEME_DARK); set_night_mode.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { @@ -272,7 +277,7 @@ public class SettingsFragment extends Fragment { set_toot_visibility.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - AlertDialog.Builder dialog = new AlertDialog.Builder(context); + AlertDialog.Builder dialog = new AlertDialog.Builder(context, style); dialog.setTitle(R.string.toot_visibility_tilte); final String[] stringArray = getResources().getStringArray(R.array.toot_visibility); final ArrayAdapter arrayAdapter = new ArrayAdapter<>(context, android.R.layout.simple_list_item_1, stringArray); diff --git a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsNotificationsFragment.java b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsNotificationsFragment.java index 82b43ba32..ee3650d07 100644 --- a/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsNotificationsFragment.java +++ b/app/src/main/java/fr/gouv/etalab/mastodon/fragments/SettingsNotificationsFragment.java @@ -47,7 +47,7 @@ public class SettingsNotificationsFragment extends Fragment { private Context context; - + private int style; @Override public View onCreateView(LayoutInflater inflater, final ViewGroup container, Bundle savedInstanceState) { @@ -55,6 +55,12 @@ public class SettingsNotificationsFragment extends Fragment { context = getContext(); final SharedPreferences sharedpreferences = context.getSharedPreferences(Helper.APP_PREFS, Context.MODE_PRIVATE); + int theme = sharedpreferences.getInt(Helper.SET_THEME, Helper.THEME_DARK); + if( theme == Helper.THEME_DARK){ + style = R.style.DialogDark; + }else { + style = R.style.Dialog; + } boolean notif_follow = sharedpreferences.getBoolean(Helper.SET_NOTIF_FOLLOW, true); boolean notif_add = sharedpreferences.getBoolean(Helper.SET_NOTIF_ADD, true); boolean notif_ask = sharedpreferences.getBoolean(Helper.SET_NOTIF_ASK, true); @@ -92,7 +98,7 @@ public class SettingsNotificationsFragment extends Fragment { @Override public void onClick(View v) { String[] datetime = time_from.split(":"); - TimePickerDialog timePickerDialog = new TimePickerDialog(getActivity(), new TimePickerDialog.OnTimeSetListener() { + TimePickerDialog timePickerDialog = new TimePickerDialog(getActivity(), style, new TimePickerDialog.OnTimeSetListener() { @Override public void onTimeSet(TimePicker view, int hourOfDay, int minute) { SharedPreferences.Editor editor = sharedpreferences.edit(); @@ -118,7 +124,7 @@ public class SettingsNotificationsFragment extends Fragment { @Override public void onClick(View v) { String[] datetime = time_to.split(":"); - TimePickerDialog timePickerDialog = new TimePickerDialog(getActivity(), new TimePickerDialog.OnTimeSetListener() { + TimePickerDialog timePickerDialog = new TimePickerDialog(getActivity(),style, new TimePickerDialog.OnTimeSetListener() { @Override public void onTimeSet(TimePicker view, int hourOfDay, int minute) { SharedPreferences.Editor editor = sharedpreferences.edit(); diff --git a/app/src/main/res/drawable/menu_selector_dark.xml b/app/src/main/res/drawable/menu_selector_dark.xml new file mode 100644 index 000000000..a89799b2e --- /dev/null +++ b/app/src/main/res/drawable/menu_selector_dark.xml @@ -0,0 +1,7 @@ + + + + + + + \ 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 e3b270d03..f5841b11f 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -15,7 +15,8 @@ You should have received a copy of the GNU General Public License along with Mastalab; if not, see --> - #455A64 #607D8B - #BDBDBD + #efefef #00000000 @@ -40,6 +40,7 @@ #282c37 + #313543 #9baec8 #d9e1e8 #2b90d9 diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 1c5dea836..4fb7aa6c2 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -34,20 +34,34 @@ + + + - - + + + + + + + + + +