From eb4d3fb7cfacb1303229175dd82f42e5423824f5 Mon Sep 17 00:00:00 2001 From: tom79 Date: Thu, 7 Nov 2019 18:57:05 +0100 Subject: [PATCH] Remove all custom styles --- app/build.gradle | 2 +- app/src/main/assets/themes/cyanea_themes.json | 5 + .../activities/AccountReportActivity.java | 2 +- .../android/activities/BaseActivity.java | 3 +- .../android/activities/MainApplication.java | 7 +- .../android/activities/TootActivity.java | 4 +- .../android/drawers/StatusListAdapter.java | 31 +- .../DisplayAdminReportsFragment.java | 2 +- .../fedilab/android/helper/ThemeHelper.java | 25 + .../main/res/drawable/translation_border.xml | 2 +- .../layout-sw600dp/activity_show_account.xml | 6 +- app/src/main/res/layout/activity_admin.xml | 2 +- .../res/layout/activity_custom_sharing.xml | 4 - .../main/res/layout/activity_edit_profile.xml | 3 - app/src/main/res/layout/activity_group.xml | 2 +- app/src/main/res/layout/activity_hashtag.xml | 2 +- .../res/layout/activity_instance_social.xml | 2 - app/src/main/res/layout/activity_list.xml | 2 +- app/src/main/res/layout/activity_main.xml | 13 +- .../main/res/layout/activity_ower_charts.xml | 5 +- .../layout/activity_ower_notifications.xml | 2 +- .../main/res/layout/activity_ower_status.xml | 2 +- .../main/res/layout/activity_playlists.xml | 2 +- app/src/main/res/layout/activity_privacy.xml | 5 - .../layout/activity_search_result_tabs.xml | 2 +- app/src/main/res/layout/activity_settings.xml | 2 +- .../main/res/layout/activity_show_account.xml | 6 +- .../res/layout/activity_show_conversation.xml | 2 +- .../main/res/layout/activity_toot_info.xml | 1 + .../res/layout/activity_who_to_follow.xml | 2 +- .../res/layout/conversation_action_bar.xml | 3 +- .../main/res/layout/drawer_notification.xml | 2 - .../main/res/layout/drawer_scheduled_toot.xml | 1 - app/src/main/res/layout/drawer_status.xml | 6 - .../main/res/layout/drawer_status_compact.xml | 5 - .../main/res/layout/drawer_status_console.xml | 4 - .../main/res/layout/drawer_status_focused.xml | 4 - .../res/layout/filter_owner_notifications.xml | 3 - .../main/res/layout/filter_owner_toots.xml | 3 - .../res/layout/fragment_settings_reveal.xml | 3 - app/src/main/res/layout/item_file_lister.xml | 2 +- .../res/layout/item_file_lister_light.xml | 2 +- app/src/main/res/layout/media_action_bar.xml | 1 - app/src/main/res/layout/nav_header_main.xml | 2 - .../res/layout/owner_status_action_bar.xml | 2 - app/src/main/res/layout/picture_actionbar.xml | 2 - .../main/res/layout/showaccount_actionbar.xml | 2 +- app/src/main/res/layout/simple_action_bar.xml | 2 - app/src/main/res/layout/simple_bar.xml | 2 - app/src/main/res/layout/simple_bar_add.xml | 2 - .../res/layout/simple_bar_muted_instance.xml | 2 - .../res/layout/tablayout_notifications.xml | 2 + .../main/res/layout/tablayout_settings.xml | 2 + app/src/main/res/layout/tablayout_toots.xml | 2 + app/src/main/res/layout/toot_action_bar.xml | 2 - app/src/main/res/layout/webview_actionbar.xml | 1 - app/src/main/res/values/colors.xml | 3 + app/src/main/res/values/styles.xml | 509 +----------------- 58 files changed, 119 insertions(+), 607 deletions(-) create mode 100644 app/src/main/assets/themes/cyanea_themes.json create mode 100644 app/src/main/java/app/fedilab/android/helper/ThemeHelper.java diff --git a/app/build.gradle b/app/build.gradle index 3bf479256..3a4a35aca 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -124,5 +124,5 @@ dependencies { implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0' implementation 'com.github.smarteist:autoimageslider:1.3.2' //debugImplementation 'com.squareup.leakcanary:leakcanary-android:2.0-beta-2' - implementation 'com.jaredrummler:colorpicker:1.1.0' + implementation 'com.jaredrummler:cyanea:1.0.2' } diff --git a/app/src/main/assets/themes/cyanea_themes.json b/app/src/main/assets/themes/cyanea_themes.json new file mode 100644 index 000000000..067613ece --- /dev/null +++ b/app/src/main/assets/themes/cyanea_themes.json @@ -0,0 +1,5 @@ +[ + {"theme_name":"Light","base_theme":"LIGHT","primary":"#FFFFFFFF","primary_dark":"#FF9baec8","primary_light":"#FFd9e1e8","accent":"#FF2b90d9","accent_dark":"#FF1b80c9","accent_light":"#FF772b90d9","background":"#FFFFFFFF","background_dark":"#FFFFFFFF","background_light":"#FFFFFFFF"}, + {"theme_name":"Dark","base_theme":"DARK","primary":"#FF282c37","primary_dark":"#FF282c37","primary_light":"#FFd9e1e8","accent":"#FF2b90d9","accent_dark":"#FF1b80c9","accent_light":"#FF772b90d9","background":"#FF282c37","background_dark":"#FF282c37","background_light":"#FF282c37"}, + {"theme_name":"Black","base_theme":"DARK","primary":"#FF000000","primary_dark":"#FF000000","primary_light":"#FF000000","accent":"#FF606984","accent_dark":"#FF606984","accent_light":"#FF606984","background":"#FFEBE5D9","background_dark":"#FFD4D4D4","background_light":"#FFEEE8DE"} +] \ No newline at end of file diff --git a/app/src/main/java/app/fedilab/android/activities/AccountReportActivity.java b/app/src/main/java/app/fedilab/android/activities/AccountReportActivity.java index b4d7ac5d1..5f9dd9338 100644 --- a/app/src/main/java/app/fedilab/android/activities/AccountReportActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/AccountReportActivity.java @@ -181,7 +181,7 @@ public class AccountReportActivity extends BaseActivity implements OnAdminAction if (apiResponse.getError() != null) { if (apiResponse.getError().getStatusCode() == 403) { AlertDialog.Builder builderInner; - builderInner = new AlertDialog.Builder(AccountReportActivity.this, R.style.AdminDialog); + builderInner = new AlertDialog.Builder(AccountReportActivity.this, R.style.AppThemeDark); builderInner.setTitle(R.string.reconnect_account); builderInner.setMessage(R.string.reconnect_account_message); builderInner.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() { diff --git a/app/src/main/java/app/fedilab/android/activities/BaseActivity.java b/app/src/main/java/app/fedilab/android/activities/BaseActivity.java index eee50b47e..fe1328874 100644 --- a/app/src/main/java/app/fedilab/android/activities/BaseActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/BaseActivity.java @@ -19,6 +19,7 @@ import android.view.View; import android.widget.Toast; import com.franmontiel.localechanger.LocaleChanger; +import com.jaredrummler.cyanea.app.CyaneaAppCompatActivity; import com.vanniktech.emoji.EmojiManager; import com.vanniktech.emoji.one.EmojiOneProvider; @@ -33,7 +34,7 @@ import es.dmoral.toasty.Toasty; */ @SuppressLint("Registered") -public class BaseActivity extends AppCompatActivity { +public class BaseActivity extends CyaneaAppCompatActivity { public static final int READ_WRITE_STORAGE = 52; diff --git a/app/src/main/java/app/fedilab/android/activities/MainApplication.java b/app/src/main/java/app/fedilab/android/activities/MainApplication.java index 3e84ddad6..3d40fed30 100644 --- a/app/src/main/java/app/fedilab/android/activities/MainApplication.java +++ b/app/src/main/java/app/fedilab/android/activities/MainApplication.java @@ -26,6 +26,8 @@ import androidx.core.content.ContextCompat; import com.evernote.android.job.JobManager; import com.franmontiel.localechanger.LocaleChanger; +import com.jaredrummler.cyanea.Cyanea; +import com.jaredrummler.cyanea.CyaneaApp; import net.gotev.uploadservice.UploadService; @@ -82,10 +84,13 @@ public class MainApplication extends MultiDexApplication { ApplicationJob.cancelAllJob(BackupNotificationsSyncJob.BACKUP_NOTIFICATIONS_SYNC); BackupNotificationsSyncJob.schedule(false); - + Cyanea.init(this, super.getResources()); StrictMode.VmPolicy.Builder builder = new StrictMode.VmPolicy.Builder(); StrictMode.setVmPolicy(builder.build()); + + + try { List SUPPORTED_LOCALES = new ArrayList<>(); diff --git a/app/src/main/java/app/fedilab/android/activities/TootActivity.java b/app/src/main/java/app/fedilab/android/activities/TootActivity.java index 7cce19979..d648faf32 100644 --- a/app/src/main/java/app/fedilab/android/activities/TootActivity.java +++ b/app/src/main/java/app/fedilab/android/activities/TootActivity.java @@ -1731,9 +1731,9 @@ public class TootActivity extends BaseActivity implements UploadStatusDelegate, case R.id.action_translate: final CountryPicker picker = CountryPicker.newInstance(getString(R.string.which_language)); // dialog title if (theme == Helper.THEME_LIGHT) { - picker.setStyle(R.style.AppTheme, R.style.AlertDialog); + picker.setStyle(R.style.AppTheme, R.style.Dialog); } else { - picker.setStyle(R.style.AppThemeDark, R.style.AlertDialogDark); + picker.setStyle(R.style.AppThemeDark, R.style.DialogDark); } if (toot_content.getText().length() == 0 && toot_cw_content.getText().length() == 0) return true; diff --git a/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java b/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java index 4b2a79690..13442eeb3 100644 --- a/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java +++ b/app/src/main/java/app/fedilab/android/drawers/StatusListAdapter.java @@ -1180,11 +1180,11 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct AlertDialog.Builder builderInner; int style; if (theme == Helper.THEME_DARK) { - style = R.style.DialogDark; + style = R.style.Cyanea_AlertDialog_Theme_Dark; } else if (theme == Helper.THEME_BLACK) { - style = R.style.DialogBlack; + style = R.style.Cyanea_AlertDialog_Theme_Dark; } else { - style = R.style.Dialog; + style = R.style.Cyanea_AlertDialog_Theme_Light; } builderInner = new AlertDialog.Builder(context, style); builderInner.setTitle(R.string.comment); @@ -2528,11 +2528,11 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct int style; if (theme == Helper.THEME_DARK) { - style = R.style.DialogDark; + style = R.style.Cyanea_AlertDialog_Theme_Dark; } else if (theme == Helper.THEME_BLACK) { - style = R.style.DialogBlack; + style = R.style.Cyanea_AlertDialog_Theme_Dark; } else { - style = R.style.Dialog; + style = R.style.Cyanea_AlertDialog_Theme_Light; } AlertDialog.Builder dialog = new AlertDialog.Builder(context, style); dialog.setTitle(R.string.toot_visibility_tilte); @@ -2950,13 +2950,12 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct }); int style; if (theme == Helper.THEME_DARK) { - style = R.style.DialogDark; + style = R.style.Cyanea_AlertDialog_Theme_Dark; } else if (theme == Helper.THEME_BLACK) { - style = R.style.DialogBlack; + style = R.style.Cyanea_AlertDialog_Theme_Dark; } else { - style = R.style.Dialog; + style = R.style.Cyanea_AlertDialog_Theme_Light; } - holder.status_remove.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { @@ -4013,11 +4012,11 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct int theme = sharedpreferences.getInt(Helper.SET_THEME, Helper.THEME_DARK); int style; if (theme == Helper.THEME_DARK) { - style = R.style.DialogDark; + style = R.style.Cyanea_AlertDialog_Theme_Dark; } else if (theme == Helper.THEME_BLACK) { - style = R.style.DialogBlack; + style = R.style.Cyanea_AlertDialog_Theme_Dark; } else { - style = R.style.Dialog; + style = R.style.Cyanea_AlertDialog_Theme_Light; } AlertDialog.Builder dialogBuilderBoost = new AlertDialog.Builder(context, style); @@ -4174,11 +4173,11 @@ public class StatusListAdapter extends RecyclerView.Adapter implements OnPostAct stepSpliToot = 1; int style; if (theme == Helper.THEME_DARK) { - style = R.style.DialogDark; + style = R.style.Cyanea_AlertDialog_Theme_Dark; } else if (theme == Helper.THEME_BLACK) { - style = R.style.DialogBlack; + style = R.style.Cyanea_AlertDialog_Theme_Dark; } else { - style = R.style.Dialog; + style = R.style.Cyanea_AlertDialog_Theme_Light; } AlertDialog.Builder builderInner = new AlertDialog.Builder(context, style); builderInner.setTitle(R.string.message_preview); diff --git a/app/src/main/java/app/fedilab/android/fragments/DisplayAdminReportsFragment.java b/app/src/main/java/app/fedilab/android/fragments/DisplayAdminReportsFragment.java index a57fa8748..8d7e07a39 100644 --- a/app/src/main/java/app/fedilab/android/fragments/DisplayAdminReportsFragment.java +++ b/app/src/main/java/app/fedilab/android/fragments/DisplayAdminReportsFragment.java @@ -212,7 +212,7 @@ public class DisplayAdminReportsFragment extends Fragment implements OnAdminActi //Admin right not granted through the API? if (apiResponse.getError().getStatusCode() == 403) { AlertDialog.Builder builderInner; - builderInner = new AlertDialog.Builder(context, R.style.AdminDialog); + builderInner = new AlertDialog.Builder(context, R.style.AppThemeDark); builderInner.setTitle(R.string.reconnect_account); builderInner.setMessage(R.string.reconnect_account_message); builderInner.setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() { diff --git a/app/src/main/java/app/fedilab/android/helper/ThemeHelper.java b/app/src/main/java/app/fedilab/android/helper/ThemeHelper.java new file mode 100644 index 000000000..b8a7209bf --- /dev/null +++ b/app/src/main/java/app/fedilab/android/helper/ThemeHelper.java @@ -0,0 +1,25 @@ +package app.fedilab.android.helper; + +import android.app.Activity; + +import com.jaredrummler.cyanea.Cyanea; + +import app.fedilab.android.R; + +public class ThemeHelper { + + + public static void changeTheme(Activity activity){ + + + Cyanea.Editor editor = Cyanea.getInstance().edit(); + editor.accent(R.color.colorAccent); + editor.background(R.color.black); + editor.backgroundDarkResource(R.color.black); + editor.apply(); + + if( activity != null){ + activity.recreate(); + } + } +} diff --git a/app/src/main/res/drawable/translation_border.xml b/app/src/main/res/drawable/translation_border.xml index bd65156cb..90d684404 100644 --- a/app/src/main/res/drawable/translation_border.xml +++ b/app/src/main/res/drawable/translation_border.xml @@ -2,6 +2,6 @@ + android:color="?attr/colorAccent" /> diff --git a/app/src/main/res/layout-sw600dp/activity_show_account.xml b/app/src/main/res/layout-sw600dp/activity_show_account.xml index c2f4303c6..88f91ad8e 100644 --- a/app/src/main/res/layout-sw600dp/activity_show_account.xml +++ b/app/src/main/res/layout-sw600dp/activity_show_account.xml @@ -179,7 +179,6 @@ android:textAppearance="@style/TextAppearance.AppCompat.Body1" /> @@ -511,7 +509,7 @@ android:layout_weight="1" android:layout_height="wrap_content" android:textSize="14sp" - android:textColor="?attr/actionBarTextColor" /> + /> diff --git a/app/src/main/res/layout/activity_admin.xml b/app/src/main/res/layout/activity_admin.xml index da352d2d3..119625183 100644 --- a/app/src/main/res/layout/activity_admin.xml +++ b/app/src/main/res/layout/activity_admin.xml @@ -32,8 +32,8 @@ android:id="@+id/admin_tablayout" android:layout_width="match_parent" android:layout_height="wrap_content" + android:background="?attr/colorPrimary" app:tabSelectedTextColor="?colorAccent" - app:tabTextColor="?attr/textColor" app:tabMode="fixed" app:tabGravity="fill" /> diff --git a/app/src/main/res/layout/activity_custom_sharing.xml b/app/src/main/res/layout/activity_custom_sharing.xml index 8de1fd64c..2c45c2f59 100644 --- a/app/src/main/res/layout/activity_custom_sharing.xml +++ b/app/src/main/res/layout/activity_custom_sharing.xml @@ -32,7 +32,6 @@ @@ -123,7 +121,6 @@ android:gravity="center" android:textAllCaps="false" android:text="@string/choose_picture" - style="?attr/borderlessColored" android:layout_width="wrap_content" android:layout_height="wrap_content" /> diff --git a/app/src/main/res/layout/activity_group.xml b/app/src/main/res/layout/activity_group.xml index 078641d54..1435f5018 100644 --- a/app/src/main/res/layout/activity_group.xml +++ b/app/src/main/res/layout/activity_group.xml @@ -38,7 +38,7 @@ android:layout_height="wrap_content" android:background="?attr/colorPrimary" app:layout_scrollFlags="scroll|enterAlways" - app:popupTheme="?attr/popupOverlay" /> + /> + /> diff --git a/app/src/main/res/layout/activity_list.xml b/app/src/main/res/layout/activity_list.xml index f69a88745..bfa85627a 100644 --- a/app/src/main/res/layout/activity_list.xml +++ b/app/src/main/res/layout/activity_list.xml @@ -40,7 +40,7 @@ android:layout_height="wrap_content" android:background="?attr/colorPrimary" app:layout_scrollFlags="scroll|enterAlways" - app:popupTheme="?attr/popupOverlay" /> + /> + > - + tools:context="app.fedilab.android.activities.MainActivity"/> - + tools:context="app.fedilab.android.activities.MainActivity"/> @@ -36,7 +36,6 @@