From 44099c0792baec944150f9c06252bbea6c2b6f73 Mon Sep 17 00:00:00 2001 From: Daniel Date: Mon, 3 Sep 2018 20:15:21 +0100 Subject: [PATCH 01/75] Dark theme v1 Fixing migration to androidx Dark theme styling File details fragment tab text colour File list overflow menu background colour Signed-off-by: Daniel Bailey Signed-off-by: Andy Scherzinger --- build.gradle | 2 +- .../client/preferences/AppPreferences.java | 2 + .../preferences/AppPreferencesImpl.java | 7 ++ .../java/com/owncloud/android/MainApp.java | 10 +++ .../android/ui/activity/DrawerActivity.java | 7 +- .../android/ui/activity/SettingsActivity.java | 15 +++- .../activity/SsoGrantPermissionActivity.java | 3 +- .../ui/adapter/ActivityListAdapter.java | 3 +- .../ui/adapter/LocalFileListAdapter.java | 2 +- .../ui/adapter/NotificationListAdapter.java | 3 +- .../android/ui/adapter/OCFileListAdapter.java | 2 +- .../ui/fragment/FileDetailFragment.java | 2 +- .../ui/preview/PreviewImageFragment.java | 10 +-- .../res/drawable/indicator_dot_selected.xml | 2 +- .../drawable/process_dialog_background.xml | 2 +- src/main/res/layout-land/account_setup.xml | 4 +- src/main/res/layout/account_setup.xml | 3 +- src/main/res/layout/activity_list_item.xml | 3 +- src/main/res/layout/activity_list_layout.xml | 3 +- src/main/res/layout/community_layout.xml | 8 +- src/main/res/layout/contactlist_fragment.xml | 2 +- .../res/layout/contacts_backup_fragment.xml | 5 +- src/main/res/layout/drawer.xml | 14 ++-- src/main/res/layout/drawer_header.xml | 8 +- .../file_details_activities_fragment.xml | 3 +- src/main/res/layout/file_details_fragment.xml | 11 ++- .../layout/file_details_share_user_item.xml | 2 +- .../res/layout/file_download_fragment.xml | 2 +- ...ile_list_actions_bottom_sheet_fragment.xml | 24 +++--- src/main/res/layout/file_preview.xml | 2 +- src/main/res/layout/list_item.xml | 2 +- src/main/res/layout/media_control.xml | 4 +- src/main/res/layout/passcodelock.xml | 3 +- src/main/res/layout/richdocuments_webview.xml | 2 +- src/main/res/layout/send_button.xml | 2 +- src/main/res/layout/send_share_fragment.xml | 6 +- src/main/res/layout/share_file_layout.xml | 10 +-- .../res/layout/sorting_order_fragment.xml | 15 ++-- .../res/layout/ssl_untrusted_cert_layout.xml | 2 +- src/main/res/layout/ssl_validator_layout.xml | 2 +- src/main/res/layout/template_button.xml | 2 +- .../res/layout/toolbar_user_information.xml | 8 +- src/main/res/layout/upload_files_layout.xml | 2 +- src/main/res/layout/whats_new_element.xml | 2 +- src/main/res/values-night/colors.xml | 80 +++++++++++++++++++ src/main/res/values-v21/styles.xml | 1 + src/main/res/values/colors.xml | 41 +++++++++- src/main/res/values/setup.xml | 20 ----- src/main/res/values/strings.xml | 5 ++ src/main/res/values/styles.xml | 66 ++++++++++----- src/main/res/xml/preferences.xml | 8 +- 51 files changed, 313 insertions(+), 136 deletions(-) create mode 100644 src/main/res/values-night/colors.xml diff --git a/build.gradle b/build.gradle index a0f2a4da31fb..4139388704bc 100644 --- a/build.gradle +++ b/build.gradle @@ -266,7 +266,7 @@ dependencies { qaImplementation "com.github.nextcloud:android-library:$androidLibraryVersion" implementation 'androidx.constraintlayout:constraintlayout:1.1.3' implementation 'androidx.legacy:legacy-support-v4:1.0.0' - implementation 'com.google.android.material:material:1.0.0' + implementation 'com.google.android.material:material:1.1.0-alpha02' implementation 'com.jakewharton:disklrucache:2.0.2' implementation 'androidx.appcompat:appcompat:1.1.0' implementation 'androidx.cardview:cardview:1.0.0' diff --git a/src/main/java/com/nextcloud/client/preferences/AppPreferences.java b/src/main/java/com/nextcloud/client/preferences/AppPreferences.java index d1b46c12bf8a..22a45b2bdba2 100644 --- a/src/main/java/com/nextcloud/client/preferences/AppPreferences.java +++ b/src/main/java/com/nextcloud/client/preferences/AppPreferences.java @@ -300,4 +300,6 @@ public interface AppPreferences { boolean isPowerCheckDisabled(); void setPowerCheckDisabled(boolean value); + + boolean getTheme(); } diff --git a/src/main/java/com/nextcloud/client/preferences/AppPreferencesImpl.java b/src/main/java/com/nextcloud/client/preferences/AppPreferencesImpl.java index 9e292adfa1a5..11e689dc56fb 100644 --- a/src/main/java/com/nextcloud/client/preferences/AppPreferencesImpl.java +++ b/src/main/java/com/nextcloud/client/preferences/AppPreferencesImpl.java @@ -67,6 +67,8 @@ public final class AppPreferencesImpl implements AppPreferences { private static final String PREF__AUTO_UPLOAD_INIT = "autoUploadInit"; private static final String PREF__FOLDER_SORT_ORDER = "folder_sort_order"; private static final String PREF__FOLDER_LAYOUT = "folder_layout"; + + private static final String PREF__DARK_THEME = "darkTheme"; private static final String PREF__LOCK_TIMESTAMP = "lock_timestamp"; private static final String PREF__SHOW_MEDIA_SCAN_NOTIFICATIONS = "show_media_scan_notifications"; private static final String PREF__LOCK = SettingsActivity.PREFERENCE_LOCK; @@ -339,6 +341,11 @@ public int getUploaderBehaviour() { return preferences.getInt(AUTO_PREF__UPLOADER_BEHAVIOR, 1); } + @Override + public boolean getTheme() { + return preferences.getBoolean(PREF__DARK_THEME, false); + } + @Override public void setUploaderBehaviour(int uploaderBehaviour) { preferences.edit().putInt(AUTO_PREF__UPLOADER_BEHAVIOR, uploaderBehaviour).apply(); diff --git a/src/main/java/com/owncloud/android/MainApp.java b/src/main/java/com/owncloud/android/MainApp.java index 2e10e459d31b..e0484f213962 100644 --- a/src/main/java/com/owncloud/android/MainApp.java +++ b/src/main/java/com/owncloud/android/MainApp.java @@ -99,6 +99,7 @@ import androidx.annotation.RequiresApi; import androidx.annotation.StringRes; import androidx.appcompat.app.AlertDialog; +import androidx.appcompat.app.AppCompatDelegate; import androidx.core.util.Pair; import androidx.multidex.MultiDexApplication; import dagger.android.AndroidInjector; @@ -230,6 +231,7 @@ protected void attachBaseContext(Context base) { @SuppressFBWarnings("ST") @Override public void onCreate() { + setAppTheme(preferences.getTheme()); super.onCreate(); insertConscrypt(); @@ -795,4 +797,12 @@ public AndroidInjector androidInjector() { return dispatchingAndroidInjector; } + + public static void setAppTheme(Boolean darkTheme) { + if (darkTheme) { + AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES); + } else { + AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_NO); + } + } } diff --git a/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java b/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java index 20a35ddb66a0..3b85c4ba1e7c 100644 --- a/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java +++ b/src/main/java/com/owncloud/android/ui/activity/DrawerActivity.java @@ -109,7 +109,9 @@ import androidx.annotation.NonNull; import androidx.appcompat.app.ActionBarDrawerToggle; +import androidx.appcompat.app.AppCompatDelegate; import androidx.appcompat.graphics.drawable.DrawerArrowDrawable; +import androidx.core.content.ContextCompat; import androidx.core.view.GravityCompat; import androidx.drawerlayout.widget.DrawerLayout; @@ -990,7 +992,7 @@ protected void setDrawerMenuItemChecked(int menuItemId) { MenuItem menuItem = mNavigationView.getMenu().getItem(i); if (menuItem.getIcon() != null) { menuItem.getIcon().clearColorFilter(); - menuItem.setTitle(Html.fromHtml("" + menuItem.getTitle() + "")); + menuItem.setTitle(Html.fromHtml("" + menuItem.getTitle() + "")); } } @@ -1264,6 +1266,9 @@ public void onBackPressed() { @Override protected void onResume() { super.onResume(); + getDelegate().setLocalNightMode(preferences.getTheme() ? + AppCompatDelegate.MODE_NIGHT_YES : AppCompatDelegate.MODE_NIGHT_NO); + getDelegate().applyDayNight(); setDrawerMenuItemChecked(mCheckedMenuItem); } diff --git a/src/main/java/com/owncloud/android/ui/activity/SettingsActivity.java b/src/main/java/com/owncloud/android/ui/activity/SettingsActivity.java index aa9e0b38512c..97ae0bdeec0b 100644 --- a/src/main/java/com/owncloud/android/ui/activity/SettingsActivity.java +++ b/src/main/java/com/owncloud/android/ui/activity/SettingsActivity.java @@ -690,6 +690,20 @@ private void setupGeneralCategory(int accentColor) { } loadStoragePath(); + + SwitchPreference themePref = (SwitchPreference) findPreference(getString(R.string.prefs_key_theme)); + SharedPreferences appPrefs = PreferenceManager.getDefaultSharedPreferences(getApplicationContext()); + + themePref.setSummary((appPrefs.getBoolean(com.owncloud.android.db.PreferenceManager.PREF__DARK_THEME, + false) ? + getString(R.string.prefs_value_theme_dark) : getString(R.string.prefs_value_theme_light))); + themePref.setOnPreferenceChangeListener((preference, newValue) -> { + MainApp.setAppTheme((Boolean) newValue); + getDelegate().applyDayNight(); + recreate(); + + return true; + }); } private String getAppVersion() { @@ -1001,5 +1015,4 @@ public void onCancelMigration() { public void returnVersion(Integer latestVersion) { FileActivity.showDevSnackbar(this, latestVersion, true); } - } diff --git a/src/main/java/com/owncloud/android/ui/activity/SsoGrantPermissionActivity.java b/src/main/java/com/owncloud/android/ui/activity/SsoGrantPermissionActivity.java index bb8972a6ce53..1aa3f96e1c44 100644 --- a/src/main/java/com/owncloud/android/ui/activity/SsoGrantPermissionActivity.java +++ b/src/main/java/com/owncloud/android/ui/activity/SsoGrantPermissionActivity.java @@ -144,7 +144,8 @@ private SpannableStringBuilder makeSpecialPartsBold(String text, String... toBeS int start = text.indexOf(textBlock); int end = start + textBlock.length(); ssb.setSpan(new StyleSpan(Typeface.BOLD), start, end, 0); - ssb.setSpan(new ForegroundColorSpan(Color.BLACK), start, end, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); + ssb.setSpan(new ForegroundColorSpan(getResources().getColor(R.color.textColor)), start, end, + Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); } return ssb; diff --git a/src/main/java/com/owncloud/android/ui/adapter/ActivityListAdapter.java b/src/main/java/com/owncloud/android/ui/adapter/ActivityListAdapter.java index 60423fd630a7..7096db731c1c 100644 --- a/src/main/java/com/owncloud/android/ui/adapter/ActivityListAdapter.java +++ b/src/main/java/com/owncloud/android/ui/adapter/ActivityListAdapter.java @@ -369,7 +369,8 @@ public void updateDrawState(@NonNull TextPaint ds) { } }, idx1, idx2, 0); ssb.setSpan(new StyleSpan(android.graphics.Typeface.BOLD), idx1, idx2, 0); - ssb.setSpan(new ForegroundColorSpan(Color.BLACK), idx1, idx2, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); + ssb.setSpan(new ForegroundColorSpan(context.getResources().getColor(R.color.textColor)), + idx1, idx2, Spannable.SPAN_EXCLUSIVE_EXCLUSIVE); } idx1 = text.indexOf('{', idx2); } diff --git a/src/main/java/com/owncloud/android/ui/adapter/LocalFileListAdapter.java b/src/main/java/com/owncloud/android/ui/adapter/LocalFileListAdapter.java index 18be2ae4f925..f025ce0c7ad4 100644 --- a/src/main/java/com/owncloud/android/ui/adapter/LocalFileListAdapter.java +++ b/src/main/java/com/owncloud/android/ui/adapter/LocalFileListAdapter.java @@ -156,7 +156,7 @@ public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int positi gridViewHolder.checkbox.setImageDrawable(ThemeUtils.tintDrawable(R.drawable.ic_checkbox_marked, ThemeUtils.primaryColor(mContext))); } else { - gridViewHolder.itemLayout.setBackgroundColor(Color.WHITE); + gridViewHolder.itemLayout.setBackgroundColor(mContext.getResources().getColor(R.color.background_color)); gridViewHolder.checkbox.setImageResource(R.drawable.ic_checkbox_blank_outline); } diff --git a/src/main/java/com/owncloud/android/ui/adapter/NotificationListAdapter.java b/src/main/java/com/owncloud/android/ui/adapter/NotificationListAdapter.java index 065eda0048e6..3d89d9e8e633 100644 --- a/src/main/java/com/owncloud/android/ui/adapter/NotificationListAdapter.java +++ b/src/main/java/com/owncloud/android/ui/adapter/NotificationListAdapter.java @@ -77,7 +77,7 @@ public class NotificationListAdapter extends RecyclerView.Adapter { private static final String FILE = "file"; private StyleSpan styleSpanBold = new StyleSpan(Typeface.BOLD); - private ForegroundColorSpan foregroundColorSpanBlack = new ForegroundColorSpan(Color.BLACK); + private ForegroundColorSpan foregroundColorSpanBlack; private List notificationsList; private OwnCloudClient client; @@ -87,6 +87,7 @@ public NotificationListAdapter(OwnCloudClient client, NotificationsActivity noti this.notificationsList = new ArrayList<>(); this.client = client; this.notificationsActivity = notificationsActivity; + foregroundColorSpanBlack = new ForegroundColorSpan(notificationsActivity.getResources().getColor(R.color.textColor)); } public void setNotificationItems(List notificationItems) { diff --git a/src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java b/src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java index 3545da9819c5..c79d92129655 100644 --- a/src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java +++ b/src/main/java/com/owncloud/android/ui/adapter/OCFileListAdapter.java @@ -330,7 +330,7 @@ public void onBindViewHolder(@NonNull RecyclerView.ViewHolder holder, int positi gridViewHolder.checkbox.setImageDrawable(ThemeUtils.tintDrawable(R.drawable.ic_checkbox_marked, ThemeUtils.primaryColor(mContext))); } else { - gridViewHolder.itemLayout.setBackgroundColor(Color.WHITE); + gridViewHolder.itemLayout.setBackgroundColor(mContext.getResources().getColor(R.color.background_color)); gridViewHolder.checkbox.setImageResource(R.drawable.ic_checkbox_blank_outline); } diff --git a/src/main/java/com/owncloud/android/ui/fragment/FileDetailFragment.java b/src/main/java/com/owncloud/android/ui/fragment/FileDetailFragment.java index 8af9a3e47028..c9391fb2fed4 100644 --- a/src/main/java/com/owncloud/android/ui/fragment/FileDetailFragment.java +++ b/src/main/java/com/owncloud/android/ui/fragment/FileDetailFragment.java @@ -240,7 +240,7 @@ private void activatePreviewImage() { if (activity != null) { activity.setPreviewImageVisibility(View.VISIBLE); activity.setProgressBarVisibility(View.GONE); - ThemeUtils.setStatusBarColor(activity, activity.getResources().getColor(R.color.black)); + ThemeUtils.setStatusBarColor(activity, activity.getResources().getColor(R.color.background_color_inverse)); if (activity.getSupportActionBar() != null) { activity.getSupportActionBar().setTitle(null); activity.getSupportActionBar().setBackgroundDrawable(null); diff --git a/src/main/java/com/owncloud/android/ui/preview/PreviewImageFragment.java b/src/main/java/com/owncloud/android/ui/preview/PreviewImageFragment.java index a3c2ff6eb8ba..75fdd5520526 100644 --- a/src/main/java/com/owncloud/android/ui/preview/PreviewImageFragment.java +++ b/src/main/java/com/owncloud/android/ui/preview/PreviewImageFragment.java @@ -287,7 +287,7 @@ public void onStart() { } } mMultiView.setVisibility(View.GONE); - mImageView.setBackgroundColor(getResources().getColor(R.color.black)); + mImageView.setBackgroundColor(getResources().getColor(R.color.background_color_inverse)); mImageView.setVisibility(View.VISIBLE); } else { @@ -607,7 +607,7 @@ && getResources() != null) { mMultiView.setVisibility(View.GONE); if (getResources() != null) { - mImageView.setBackgroundColor(getResources().getColor(R.color.black)); + mImageView.setBackgroundColor(getResources().getColor(R.color.background_color_inverse)); } mImageView.setVisibility(View.VISIBLE); @@ -617,7 +617,7 @@ && getResources() != null) { private LayerDrawable generateCheckerboardLayeredDrawable(LoadImage result, Bitmap bitmap) { Resources r = getResources(); Drawable[] layers = new Drawable[2]; - layers[0] = r.getDrawable(R.color.white); + layers[0] = r.getDrawable(R.color.background_color); Drawable bitmapDrawable; if (MIME_TYPE_PNG.equalsIgnoreCase(result.ocFile.getMimeType())) { @@ -681,7 +681,7 @@ private void setMessageForMultiList(@StringRes int headline, @StringRes int mess mMultiListMessage.setText(message); mMultiListIcon.setImageResource(icon); - mMultiView.setBackgroundColor(Color.BLACK); + mMultiView.setBackgroundColor(getResources().getColor(R.color.background_color_inverse)); mMultiListHeadline.setTextColor(getResources().getColor(R.color.standard_grey)); mMultiListMessage.setTextColor(getResources().getColor(R.color.standard_grey)); @@ -766,7 +766,7 @@ && getActivity() instanceof PreviewImageActivity) { Drawable layerOne; if (previewImageActivity.isSystemUIVisible()) { - layerOne = getResources().getDrawable(R.color.white); + layerOne = getResources().getDrawable(R.color.background_color); } else { layerOne = getResources().getDrawable(R.drawable.backrepeat); } diff --git a/src/main/res/drawable/indicator_dot_selected.xml b/src/main/res/drawable/indicator_dot_selected.xml index 301ed3d2ba2b..26b301aa7ae2 100644 --- a/src/main/res/drawable/indicator_dot_selected.xml +++ b/src/main/res/drawable/indicator_dot_selected.xml @@ -23,7 +23,7 @@ - + diff --git a/src/main/res/drawable/process_dialog_background.xml b/src/main/res/drawable/process_dialog_background.xml index 9ba0b1e9ab8a..d20aa2f26b50 100644 --- a/src/main/res/drawable/process_dialog_background.xml +++ b/src/main/res/drawable/process_dialog_background.xml @@ -1,6 +1,6 @@ - + + app:passwordToggleTint="@color/login_btn_tint"> + app:cornerRadius="@dimen/button_corner_radius" + style="@style/Button.Primary" /> + android:paddingLeft="@dimen/standard_padding" + android:background="@color/background_color"> + android:visibility="visible" + android:background="@color/background_color" /> diff --git a/src/main/res/layout/community_layout.xml b/src/main/res/layout/community_layout.xml index 74cdd671d506..a0a38f2caddd 100755 --- a/src/main/res/layout/community_layout.xml +++ b/src/main/res/layout/community_layout.xml @@ -140,7 +140,7 @@ android:id="@+id/community_release_candidate_fdroid" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:background="@color/white" + android:background="@color/background_color" android:onClick="onGetRCFDroidClick" android:padding="@dimen/zero" android:src="@drawable/fdroid" @@ -150,7 +150,7 @@ android:id="@+id/community_release_candidate_playstore" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:background="@color/white" + android:background="@color/background_color" android:onClick="onGetRCPlayStoreClick" android:padding="@dimen/zero" android:src="@drawable/playstore" @@ -181,7 +181,7 @@ android:id="@+id/community_beta_fdroid" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:background="@color/white" + android:background="@color/background_color" android:onClick="onGetBetaFDroidClick" android:padding="@dimen/zero" android:src="@drawable/fdroid" @@ -191,7 +191,7 @@ android:id="@+id/community_beta_apk" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:background="@color/white" + android:background="@color/background_color" android:onClick="onGetBetaApkClick" android:padding="@dimen/zero" android:src="@drawable/apk" diff --git a/src/main/res/layout/contactlist_fragment.xml b/src/main/res/layout/contactlist_fragment.xml index a3c5a057feea..1d75e1e04aaf 100644 --- a/src/main/res/layout/contactlist_fragment.xml +++ b/src/main/res/layout/contactlist_fragment.xml @@ -39,7 +39,7 @@ android:id="@+id/contactlist_restore_selected_container" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/white" + android:background="@color/background_color" android:orientation="vertical" android:visibility="gone"> diff --git a/src/main/res/layout/contacts_backup_fragment.xml b/src/main/res/layout/contacts_backup_fragment.xml index b21942fe47b5..02d5a1fa1121 100644 --- a/src/main/res/layout/contacts_backup_fragment.xml +++ b/src/main/res/layout/contacts_backup_fragment.xml @@ -35,7 +35,8 @@ android:layout_height="wrap_content" android:layout_margin="@dimen/standard_margin" android:text="@string/contacts_automatic_backup" - android:textAppearance="?android:attr/textAppearanceMedium"/> + android:textAppearance="?android:attr/textAppearanceMedium" + android:textColor="@color/textColor" /> + android:textColor="@color/textColor"/> + android:drawablePadding="@dimen/alternate_half_padding" /> + android:text="@string/drawer_quota" /> + android:text="@string/drawer_quota" /> diff --git a/src/main/res/layout/drawer_header.xml b/src/main/res/layout/drawer_header.xml index bae2e402b6b7..0e396c675d7c 100644 --- a/src/main/res/layout/drawer_header.xml +++ b/src/main/res/layout/drawer_header.xml @@ -100,13 +100,13 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:ellipsize="end" - android:shadowColor="@color/black" + android:shadowColor="@color/drawer_shadow" android:shadowDx="0.5" android:shadowDy="0" android:shadowRadius="2" android:maxLines="1" android:text="@string/app_name" - android:textColor="@android:color/white" + android:textColor="@color/textColor" android:textSize="@dimen/drawer_header_text" android:textStyle="bold"/> @@ -117,12 +117,12 @@ android:ellipsize="end" android:lines="1" android:maxLines="1" - android:shadowColor="@color/black" + android:shadowColor="@color/drawer_shadow" android:shadowDx="0.5" android:shadowDy="0" android:shadowRadius="2" android:text="@string/app_name" - android:textColor="@android:color/white" + android:textColor="@color/textColor" android:textSize="@dimen/drawer_header_subtext"/> diff --git a/src/main/res/layout/file_details_activities_fragment.xml b/src/main/res/layout/file_details_activities_fragment.xml index 48949e34ae1e..a3751db4f3e5 100644 --- a/src/main/res/layout/file_details_activities_fragment.xml +++ b/src/main/res/layout/file_details_activities_fragment.xml @@ -38,7 +38,8 @@ android:layout_height="wrap_content" android:layout_weight="1" android:hint="@string/new_comment" - android:paddingTop="@dimen/standard_padding" /> + android:paddingTop="@dimen/standard_padding" + android:textColorHint="@color/secondaryTextColor" /> + android:fillViewport="true" + android:background="@color/background_color"> @@ -133,7 +135,7 @@ android:id="@+id/overflow_menu" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:background="@color/white" + android:background="@color/background_color" android:contentDescription="@string/overflow_menu" android:src="@drawable/ic_dots_vertical" /> @@ -192,9 +194,10 @@ android:id="@+id/tab_layout" android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="@color/white" + android:background="@color/background_color" app:tabGravity="center" app:tabMode="fixed" + app:tabTextColor="@color/textColor" app:tabTextAppearance="@style/AppTabTextAppearance" /> + android:orientation="vertical" + android:background="@color/background_color"> + android:textSize="@dimen/bottom_sheet_text_size" + android:textColor="@color/textColor"/> + android:textColor="@color/textColor" + android:textSize="@dimen/bottom_sheet_text_size" /> @@ -87,8 +89,8 @@ android:layout_marginStart="@dimen/standard_margin" android:layout_marginLeft="@dimen/standard_margin" android:text="@string/upload_content_from_other_apps" - android:textColor="@color/black" - android:textSize="@dimen/bottom_sheet_text_size"/> + android:textColor="@color/textColor" + android:textSize="@dimen/bottom_sheet_text_size" /> @@ -169,8 +171,8 @@ android:layout_marginStart="@dimen/standard_margin" android:layout_marginLeft="@dimen/standard_margin" android:text="@string/create_new_folder" - android:textColor="@color/black" - android:textSize="@dimen/bottom_sheet_text_size"/> + android:textColor="@color/textColor" + android:textSize="@dimen/bottom_sheet_text_size" /> @@ -216,7 +218,7 @@ android:layout_marginLeft="@dimen/standard_margin" android:layout_marginStart="@dimen/standard_margin" android:text="@string/create_new_document" - android:textColor="@color/black" + android:textColor="@color/textColor" android:textSize="@dimen/bottom_sheet_text_size"/> @@ -245,7 +247,7 @@ android:layout_marginLeft="@dimen/standard_margin" android:layout_marginStart="@dimen/standard_margin" android:text="@string/create_new_spreadsheet" - android:textColor="@color/black" + android:textColor="@color/textColor" android:textSize="@dimen/bottom_sheet_text_size"/> @@ -274,7 +276,7 @@ android:layout_marginLeft="@dimen/standard_margin" android:layout_marginStart="@dimen/standard_margin" android:text="@string/create_new_presentation" - android:textColor="@color/black" + android:textColor="@color/textColor" android:textSize="@dimen/bottom_sheet_text_size"/> diff --git a/src/main/res/layout/file_preview.xml b/src/main/res/layout/file_preview.xml index aa63c5234a3f..0f1bd40bf053 100644 --- a/src/main/res/layout/file_preview.xml +++ b/src/main/res/layout/file_preview.xml @@ -31,7 +31,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:visibility="invisible" - android:background="@color/black"> + android:background="@color/background_color_inverse"> + android:src="@drawable/ic_synced" /> diff --git a/src/main/res/layout/media_control.xml b/src/main/res/layout/media_control.xml index 087fcb802250..ef563ce559e6 100644 --- a/src/main/res/layout/media_control.xml +++ b/src/main/res/layout/media_control.xml @@ -65,7 +65,7 @@ android:layout_height="wrap_content" android:paddingEnd="@dimen/standard_quarter_padding" android:text="@string/placeholder_media_time" - android:textColor="@color/white" + android:textColor="@color/textColor_inverse" /> diff --git a/src/main/res/layout/passcodelock.xml b/src/main/res/layout/passcodelock.xml index a35c05dd3c69..f2f4808ad39c 100644 --- a/src/main/res/layout/passcodelock.xml +++ b/src/main/res/layout/passcodelock.xml @@ -31,7 +31,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/pass_code_enter_pass_code" - android:textColor="@android:color/black" + android:textColor="@color/textColor" android:gravity="center_horizontal" android:textSize="@dimen/two_line_primary_text_size" /> @@ -56,6 +56,7 @@ android:focusable="true" style="@style/PassCodeStyle" android:cursorVisible="true" + android:textCursorDrawable="@color/primary" android:imeOptions="flagNoExtractUi" android:importantForAutofill="no" android:hint="@string/hidden_character"> diff --git a/src/main/res/layout/richdocuments_webview.xml b/src/main/res/layout/richdocuments_webview.xml index c5edc35749c4..afb3c098c2ef 100644 --- a/src/main/res/layout/richdocuments_webview.xml +++ b/src/main/res/layout/richdocuments_webview.xml @@ -47,7 +47,7 @@ android:layout_height="wrap_content" android:ellipsize="middle" android:text="@string/placeholder_filename" - android:textColor="@color/black" + android:textColor="@color/textColor" android:textSize="20sp" android:textStyle="bold"/> diff --git a/src/main/res/layout/send_button.xml b/src/main/res/layout/send_button.xml index 50c27961adf3..b0c54fe58bbc 100644 --- a/src/main/res/layout/send_button.xml +++ b/src/main/res/layout/send_button.xml @@ -41,5 +41,5 @@ android:layout_gravity="center" android:gravity="center_horizontal" android:paddingTop="@dimen/standard_half_padding" - android:textColor="@color/black" /> + android:textColor="@color/textColor" /> diff --git a/src/main/res/layout/send_share_fragment.xml b/src/main/res/layout/send_share_fragment.xml index ed586f759811..841d2d071f4c 100644 --- a/src/main/res/layout/send_share_fragment.xml +++ b/src/main/res/layout/send_share_fragment.xml @@ -70,7 +70,7 @@ android:drawable="@drawable/ic_share" android:text="@string/share" android:paddingTop="@dimen/standard_half_padding" - android:textColor="@color/black"/> + android:textColor="@color/textColor"/> + android:textColor="@color/textColor"/> @@ -109,7 +109,7 @@ android:layout_height="1dp" android:layout_below="@id/send_share_buttons" android:alpha="0.3" - android:background="@color/black"/> + android:background="@color/background_color_inverse"/> @@ -227,7 +227,7 @@ android:layout_toStartOf="@id/shareViaLinkFileListingPermissionSwitch" android:padding="@dimen/standard_half_padding" android:text="@string/share_via_link_hide_file_listing_permission_label" - android:textColor="@color/black" + android:textColor="@color/textColor" android:textSize="@dimen/two_line_secondary_text_size" /> @@ -261,7 +261,7 @@ android:paddingRight="@dimen/standard_half_padding" android:paddingTop="@dimen/standard_half_padding" android:text="@string/share_via_link_password_label" - android:textColor="@color/black" + android:textColor="@color/textColor" android:textSize="@dimen/two_line_secondary_text_size" /> @@ -312,7 +312,7 @@ android:paddingRight="@dimen/standard_half_padding" android:paddingTop="@dimen/standard_half_padding" android:text="@string/share_via_link_expiration_date_label" - android:textColor="@color/black" + android:textColor="@color/textColor" android:textSize="@dimen/two_line_secondary_text_size" /> diff --git a/src/main/res/layout/sorting_order_fragment.xml b/src/main/res/layout/sorting_order_fragment.xml index 0583d7955afa..2cb44ab6909b 100644 --- a/src/main/res/layout/sorting_order_fragment.xml +++ b/src/main/res/layout/sorting_order_fragment.xml @@ -24,7 +24,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:minWidth="300dp" - android:orientation="vertical"> + android:orientation="vertical" + android:background="@color/background_color"> + android:textColor="@color/textColor"/> diff --git a/src/main/res/layout/toolbar_user_information.xml b/src/main/res/layout/toolbar_user_information.xml index 50b8a1974c71..51f99a0eec95 100644 --- a/src/main/res/layout/toolbar_user_information.xml +++ b/src/main/res/layout/toolbar_user_information.xml @@ -91,11 +91,11 @@ android:layout_height="wrap_content" android:ellipsize="end" android:maxLines="1" - android:shadowColor="@color/black" + android:shadowColor="@color/drawer_shadow" android:shadowDx="0.5" android:shadowDy="0" android:shadowRadius="2" - android:textColor="@android:color/white" + android:textColor="@color/textColor" android:textSize="@dimen/drawer_header_text" android:textStyle="bold" tools:text="Max Mustermann"/> @@ -107,11 +107,11 @@ android:ellipsize="end" android:lines="1" android:maxLines="1" - android:shadowColor="@color/black" + android:shadowColor="@color/drawer_shadow" android:shadowDx="0.5" android:shadowDy="0" android:shadowRadius="2" - android:textColor="@android:color/white" + android:textColor="@color/textColor" android:textSize="@dimen/drawer_header_subtext" tools:text="max@127.0.0.1/nextcloud"/> diff --git a/src/main/res/layout/upload_files_layout.xml b/src/main/res/layout/upload_files_layout.xml index 80abb5ef9de7..bc6a9a3d4a38 100644 --- a/src/main/res/layout/upload_files_layout.xml +++ b/src/main/res/layout/upload_files_layout.xml @@ -61,7 +61,7 @@ android:layout_height="wrap_content" android:text="@string/uploader_upload_files_behaviour" android:id="@+id/upload_files_upload_files_behaviour_text" - android:textColor="@color/black" + android:textColor="@color/textColor" android:textStyle="bold" android:paddingBottom="@dimen/standard_half_padding"/> diff --git a/src/main/res/layout/whats_new_element.xml b/src/main/res/layout/whats_new_element.xml index 502343bc8c2d..bab2f7a46db0 100644 --- a/src/main/res/layout/whats_new_element.xml +++ b/src/main/res/layout/whats_new_element.xml @@ -49,7 +49,7 @@ android:gravity="center" android:text="" android:textAppearance="@style/NextcloudTextAppearanceHeadline" - android:textColor="@color/white" + android:textColor="@color/textColor_inverse" android:textStyle="bold"/> + + + + #00ddff + + @color/secondaryTextColor + + + #ffffff + #ffffff + #ff888888 + #eee + #DDDDDD + #EEEEEE + #00000000 + #a0a0a0 + #e53935 + + + #757575 + + #EEEEEE + + + + + #e9322d + + + + #0082c9 + #006AA3 + #007cc2 + #ffffff + #7fC0E3 + #ffffff + #ffffff + #222222 + #000000 + @color/color_accent + #000000 + #D6D7D7 + #000000 + + #ffffff + #ffffff + #000000 + + #888888 + + + #201D2D44 + #40162233 + + + #D6D7D7 + #ECECEC + #616161 + + + + diff --git a/src/main/res/values-v21/styles.xml b/src/main/res/values-v21/styles.xml index 78a391a8a719..e46290d7e318 100644 --- a/src/main/res/values-v21/styles.xml +++ b/src/main/res/values-v21/styles.xml @@ -32,5 +32,6 @@ diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml index 0ec8772b38f0..f9f924172893 100644 --- a/src/main/res/values/colors.xml +++ b/src/main/res/values/colors.xml @@ -22,9 +22,10 @@ #00ddff @color/secondaryTextColor - #000000 - #FFFFFF - @color/black + + + #000000 + #ffffff #ff888888 #eee #000000 @@ -41,12 +42,46 @@ #555555 #EEEEEE #dbdbdb + #222222 #e9322d + + + #0082c9 + #006AA3 + #007cc2 + #ffffff + #7fC0E3 + #ffffff + #ffffff + #FFFFFF + #000000 + @color/color_accent + #ffffff + #D6D7D7 + #000000 + + #ffffff + #ffffff + #000000 + + #888888 + + + #201D2D44 + #40162233 + + + #757575 + #616161 + #ECECEC + + + #FFFFFF #000000 diff --git a/src/main/res/values/setup.xml b/src/main/res/values/setup.xml index 02a8fce18eb6..959fb61ecc16 100644 --- a/src/main/res/values/setup.xml +++ b/src/main/res/values/setup.xml @@ -45,26 +45,6 @@ - - #0082c9 - #006AA3 - #007cc2 - @color/white - #7fC0E3 - #FFFFFF - @color/color_accent - @color/white - #D6D7D7 - @color/black - - - #201D2D44 - #40162233 - - - #757575 - #616161 - #ECECEC true diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 15d43ffff3fd..b94a942632df 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -56,6 +56,11 @@ Help Recommend to friend Imprint + Light + Dark + darkTheme + Theme + Try %1$s on your device! I want to invite you to use %1$s on your device.\nDownload here: %2$s diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml index c88ccb96dfd2..3495ce183083 100644 --- a/src/main/res/values/styles.xml +++ b/src/main/res/values/styles.xml @@ -20,11 +20,13 @@ --> - - - - - - - @@ -155,7 +163,7 @@ @@ -189,7 +197,7 @@ @drawable/actionbar_progress_indeterminate_horizontal - @@ -198,15 +206,15 @@ parent="@style/Theme.MaterialComponents.Light.DarkActionBar.Bridge"> @color/primary @color/primary - #ffffff - #222222 + @color/textColor + @color/actionbar_shadow 1 1 @drawable/split_action_bg - - @@ -226,6 +234,8 @@ + + @color/textColor + + + + @style/FallbackDatePickerDialogTheme + + @style/FallbackDatePickerDialogTheme + + @color/background_color + @color/textColor + @style/DatePickerStyle + + @color/date_picker_header_bg + @color/textColor + - + + - + + @color/background_color + + @color/background_color + diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml index 623912d0bb5d..33154e4c3ffa 100644 --- a/src/main/res/values/colors.xml +++ b/src/main/res/values/colors.xml @@ -57,8 +57,9 @@ #ffffff #7fC0E3 #ffffff + #ffffff #ffffff - #FFFFFF + #FFFFFF #000000 @color/color_accent #ffffff @@ -83,10 +84,13 @@ #757575 #ffffff - #757575 + #616161 + #4D000000 #FFFFFF #000000 + #737373 + diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml index c6582c32c35b..7cf61fe64d1c 100644 --- a/src/main/res/values/styles.xml +++ b/src/main/res/values/styles.xml @@ -23,21 +23,15 @@ - - - @@ -88,7 +79,7 @@ @color/color_accent @style/Theme.ownCloud.Dialog @style/ownCloud.AlertDialog - @color/background_color + @color/bg_default @style/ownCloud.SearchView true @@ -111,7 +102,7 @@ @color/primary @style/ownCloud.SearchView false - @color/background_color + @color/bg_default @@ -275,6 +266,7 @@ false + @color/bg_default - + + - From 55d5f2f41a9e41e090b1ffa19ead246c4ae5bac5 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Tue, 26 Mar 2019 09:09:44 +0100 Subject: [PATCH 11/75] remove unused theme getter from interface Signed-off-by: Andy Scherzinger --- .../java/com/nextcloud/client/preferences/AppPreferences.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/com/nextcloud/client/preferences/AppPreferences.java b/src/main/java/com/nextcloud/client/preferences/AppPreferences.java index 31a7ec88750c..aad701982c7a 100644 --- a/src/main/java/com/nextcloud/client/preferences/AppPreferences.java +++ b/src/main/java/com/nextcloud/client/preferences/AppPreferences.java @@ -302,6 +302,4 @@ public interface AppPreferences { boolean isPowerCheckDisabled(); void setPowerCheckDisabled(boolean value); - - boolean getTheme(); } From f459cd2c9843845702b5ebafd773a5e3ffc08de9 Mon Sep 17 00:00:00 2001 From: Daniel Date: Sat, 6 Apr 2019 16:35:54 +0100 Subject: [PATCH 12/75] "Activities" drawer selection background colour. Signed-off-by: Daniel --- src/main/res/values-v21/styles.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/res/values-v21/styles.xml b/src/main/res/values-v21/styles.xml index 9e0c0f5ef724..b915cd1d3207 100644 --- a/src/main/res/values-v21/styles.xml +++ b/src/main/res/values-v21/styles.xml @@ -28,6 +28,7 @@ @style/ownCloud.AlertDialog @style/ownCloud.SearchView true + @color/bg_default + + + + + + + - - - - - - - + + diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml index d58d6df0e82f..67fd6657aafa 100644 --- a/src/main/res/values/colors.xml +++ b/src/main/res/values/colors.xml @@ -82,9 +82,10 @@ #757575 #616161 + #4D000000 #FFFFFF #000000 - + #222222 diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml index 99ff0d55c793..023fb20b3ef0 100644 --- a/src/main/res/values/styles.xml +++ b/src/main/res/values/styles.xml @@ -31,7 +31,9 @@ @style/ownCloud.AlertDialog @style/ownCloud.SearchView @color/textColor - @color/textColor + @color/secondaryTextColor + @color/secondaryTextColor + @color/secondaryTextColor @@ -150,8 +153,8 @@ @@ -166,7 +169,7 @@ @@ -192,6 +195,7 @@ @@ -238,8 +242,8 @@ @color/transparent - @color/textColor - @color/textColor + + - - + - + diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml index cf604035454f..b2588535c43d 100644 --- a/src/main/res/xml/preferences.xml +++ b/src/main/res/xml/preferences.xml @@ -29,7 +29,8 @@ android:defaultValue="@string/prefs_value_theme_light" android:key="@string/prefs_key_theme" android:summary="%s" - android:title="@string/prefs_theme_title" /> + android:title="@string/prefs_theme_title" + android:theme="@style/SwitchPreference"/> Date: Mon, 7 Oct 2019 16:54:13 +0200 Subject: [PATCH 33/75] bump material to 1.1.0-beta01 Signed-off-by: Andy Scherzinger --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 419d396a2426..f5822220bb55 100644 --- a/build.gradle +++ b/build.gradle @@ -266,7 +266,7 @@ dependencies { qaImplementation "com.github.nextcloud:android-library:$androidLibraryVersion" implementation 'androidx.constraintlayout:constraintlayout:1.1.3' implementation 'androidx.legacy:legacy-support-v4:1.0.0' - implementation 'com.google.android.material:material:1.1.0-alpha10' + implementation 'com.google.android.material:material:1.1.0-beta01' implementation 'com.jakewharton:disklrucache:2.0.2' implementation 'androidx.appcompat:appcompat:1.1.0' implementation 'androidx.cardview:cardview:1.0.0' From bf0779a3edf7e895e9a7ff418adc6c0a894268ad Mon Sep 17 00:00:00 2001 From: Daniel Bailey Date: Sun, 27 Oct 2019 20:51:01 +0000 Subject: [PATCH 34/75] Update to Alert Dialogs in api 21 and upwards. Signed-off-by: Daniel Bailey --- src/main/res/values-v21/styles.xml | 9 +++++++++ src/main/res/values/styles.xml | 1 + 2 files changed, 10 insertions(+) diff --git a/src/main/res/values-v21/styles.xml b/src/main/res/values-v21/styles.xml index 8a932e1ba7db..84221524576f 100644 --- a/src/main/res/values-v21/styles.xml +++ b/src/main/res/values-v21/styles.xml @@ -29,6 +29,7 @@ @color/textColor @color/secondaryTextColor @color/secondaryTextColor + @style/FallbackTheming.Dialog + + diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml index 0ec8772b38f0..f9f924172893 100644 --- a/src/main/res/values/colors.xml +++ b/src/main/res/values/colors.xml @@ -22,9 +22,10 @@ #00ddff @color/secondaryTextColor - #000000 - #FFFFFF - @color/black + + + #000000 + #ffffff #ff888888 #eee #000000 @@ -41,12 +42,46 @@ #555555 #EEEEEE #dbdbdb + #222222 #e9322d + + + #0082c9 + #006AA3 + #007cc2 + #ffffff + #7fC0E3 + #ffffff + #ffffff + #FFFFFF + #000000 + @color/color_accent + #ffffff + #D6D7D7 + #000000 + + #ffffff + #ffffff + #000000 + + #888888 + + + #201D2D44 + #40162233 + + + #757575 + #616161 + #ECECEC + + + #FFFFFF #000000 diff --git a/src/main/res/values/setup.xml b/src/main/res/values/setup.xml index 5acd70e8a7b0..0b224f4c7037 100644 --- a/src/main/res/values/setup.xml +++ b/src/main/res/values/setup.xml @@ -42,26 +42,6 @@ - - #0082c9 - #006AA3 - #007cc2 - @color/white - #7fC0E3 - #FFFFFF - @color/color_accent - @color/white - #D6D7D7 - @color/black - - - #201D2D44 - #40162233 - - - #757575 - #616161 - #ECECEC true diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 5c5eaacb809a..52967a7b7360 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -56,6 +56,11 @@ Help Recommend to friend Imprint + Light + Dark + darkTheme + Theme + Try %1$s on your device! I want to invite you to use %1$s on your device.\nDownload here: %2$s diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml index c88ccb96dfd2..3495ce183083 100644 --- a/src/main/res/values/styles.xml +++ b/src/main/res/values/styles.xml @@ -20,11 +20,13 @@ --> - - - - - - - @@ -155,7 +163,7 @@ @@ -189,7 +197,7 @@ @drawable/actionbar_progress_indeterminate_horizontal - @@ -198,15 +206,15 @@ parent="@style/Theme.MaterialComponents.Light.DarkActionBar.Bridge"> @color/primary @color/primary - #ffffff - #222222 + @color/textColor + @color/actionbar_shadow 1 1 @drawable/split_action_bg - - @@ -226,6 +234,8 @@ + + @color/textColor + + + + @style/FallbackDatePickerDialogTheme + + @style/FallbackDatePickerDialogTheme + + @color/background_color + @color/textColor + @style/DatePickerStyle + + @color/date_picker_header_bg + @color/textColor + - + + - + + @color/background_color + + @color/background_color + diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml index 623912d0bb5d..33154e4c3ffa 100644 --- a/src/main/res/values/colors.xml +++ b/src/main/res/values/colors.xml @@ -57,8 +57,9 @@ #ffffff #7fC0E3 #ffffff + #ffffff #ffffff - #FFFFFF + #FFFFFF #000000 @color/color_accent #ffffff @@ -83,10 +84,13 @@ #757575 #ffffff - #757575 + #616161 + #4D000000 #FFFFFF #000000 + #737373 + diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml index c6582c32c35b..7cf61fe64d1c 100644 --- a/src/main/res/values/styles.xml +++ b/src/main/res/values/styles.xml @@ -23,21 +23,15 @@ - - - @@ -88,7 +79,7 @@ @color/color_accent @style/Theme.ownCloud.Dialog @style/ownCloud.AlertDialog - @color/background_color + @color/bg_default @style/ownCloud.SearchView true @@ -111,7 +102,7 @@ @color/primary @style/ownCloud.SearchView false - @color/background_color + @color/bg_default @@ -275,6 +266,7 @@ false + @color/bg_default - + + - From b7e9d3f9546d2f34015b3d57460d67d5b35932f6 Mon Sep 17 00:00:00 2001 From: Andy Scherzinger Date: Tue, 26 Mar 2019 09:09:44 +0100 Subject: [PATCH 45/75] remove unused theme getter from interface Signed-off-by: Andy Scherzinger --- .../java/com/nextcloud/client/preferences/AppPreferences.java | 2 -- 1 file changed, 2 deletions(-) diff --git a/src/main/java/com/nextcloud/client/preferences/AppPreferences.java b/src/main/java/com/nextcloud/client/preferences/AppPreferences.java index 31a7ec88750c..aad701982c7a 100644 --- a/src/main/java/com/nextcloud/client/preferences/AppPreferences.java +++ b/src/main/java/com/nextcloud/client/preferences/AppPreferences.java @@ -302,6 +302,4 @@ public interface AppPreferences { boolean isPowerCheckDisabled(); void setPowerCheckDisabled(boolean value); - - boolean getTheme(); } From 689a0a216b47d1bde0a8b065dd0646a95d1541d3 Mon Sep 17 00:00:00 2001 From: Daniel Date: Sat, 6 Apr 2019 16:35:54 +0100 Subject: [PATCH 46/75] "Activities" drawer selection background colour. Signed-off-by: Daniel --- src/main/res/values-v21/styles.xml | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/res/values-v21/styles.xml b/src/main/res/values-v21/styles.xml index 9e0c0f5ef724..b915cd1d3207 100644 --- a/src/main/res/values-v21/styles.xml +++ b/src/main/res/values-v21/styles.xml @@ -28,6 +28,7 @@ @style/ownCloud.AlertDialog @style/ownCloud.SearchView true + @color/bg_default + + + + + + + - - - - - - - + + diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml index d58d6df0e82f..67fd6657aafa 100644 --- a/src/main/res/values/colors.xml +++ b/src/main/res/values/colors.xml @@ -82,9 +82,10 @@ #757575 #616161 + #4D000000 #FFFFFF #000000 - + #222222 diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml index 99ff0d55c793..023fb20b3ef0 100644 --- a/src/main/res/values/styles.xml +++ b/src/main/res/values/styles.xml @@ -31,7 +31,9 @@ @style/ownCloud.AlertDialog @style/ownCloud.SearchView @color/textColor - @color/textColor + @color/secondaryTextColor + @color/secondaryTextColor + @color/secondaryTextColor @@ -150,8 +153,8 @@ @@ -166,7 +169,7 @@ @@ -192,6 +195,7 @@ @@ -238,8 +242,8 @@ @color/transparent - @color/textColor - @color/textColor + + - - + - + diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml index cf604035454f..b2588535c43d 100644 --- a/src/main/res/xml/preferences.xml +++ b/src/main/res/xml/preferences.xml @@ -29,7 +29,8 @@ android:defaultValue="@string/prefs_value_theme_light" android:key="@string/prefs_key_theme" android:summary="%s" - android:title="@string/prefs_theme_title" /> + android:title="@string/prefs_theme_title" + android:theme="@style/SwitchPreference"/> Date: Mon, 7 Oct 2019 16:54:13 +0200 Subject: [PATCH 67/75] bump material to 1.1.0-beta01 Signed-off-by: Andy Scherzinger --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 7eb2a5b4f49e..d548e9758ac1 100644 --- a/build.gradle +++ b/build.gradle @@ -269,7 +269,7 @@ dependencies { qaImplementation "com.github.nextcloud:android-library:$androidLibraryVersion" implementation 'androidx.constraintlayout:constraintlayout:1.1.3' implementation 'androidx.legacy:legacy-support-v4:1.0.0' - implementation 'com.google.android.material:material:1.1.0-alpha10' + implementation 'com.google.android.material:material:1.1.0-beta01' implementation 'com.jakewharton:disklrucache:2.0.2' implementation 'androidx.appcompat:appcompat:1.1.0' implementation 'androidx.cardview:cardview:1.0.0' From 4ce40272505867ee0b524883c3bb33b2dced9e1d Mon Sep 17 00:00:00 2001 From: Daniel Bailey Date: Sun, 27 Oct 2019 20:51:01 +0000 Subject: [PATCH 68/75] Update to Alert Dialogs in api 21 and upwards. Signed-off-by: Daniel Bailey --- src/main/res/values-v21/styles.xml | 9 +++++++++ src/main/res/values/styles.xml | 1 + 2 files changed, 10 insertions(+) diff --git a/src/main/res/values-v21/styles.xml b/src/main/res/values-v21/styles.xml index 8a932e1ba7db..84221524576f 100644 --- a/src/main/res/values-v21/styles.xml +++ b/src/main/res/values-v21/styles.xml @@ -29,6 +29,7 @@ @color/textColor @color/secondaryTextColor @color/secondaryTextColor + @style/FallbackTheming.Dialog + + + + diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml index bc5fd92aa9ea..5c790fb99875 100644 --- a/src/main/res/values/styles.xml +++ b/src/main/res/values/styles.xml @@ -235,7 +235,9 @@ diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml index 67fd6657aafa..a216ef863f8c 100644 --- a/src/main/res/values/colors.xml +++ b/src/main/res/values/colors.xml @@ -1,8 +1,8 @@ @@ -23,7 +23,7 @@ @color/secondaryTextColor #000000 - + #ffffff #000000 #ffffff #ff888888 @@ -49,7 +49,6 @@ #e9322d - #0082c9 #006AA3 @@ -70,6 +69,8 @@ #ffffff #000000 + #FFFFFF + #201D2D44 #40162233 diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 52967a7b7360..b86a1aea32c3 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -58,7 +58,6 @@ Imprint Light Dark - darkTheme Theme diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml index b2588535c43d..4dae1b4f4be8 100644 --- a/src/main/res/xml/preferences.xml +++ b/src/main/res/xml/preferences.xml @@ -1,4 +1,5 @@ -