diff --git a/News-Android-App/build.gradle b/News-Android-App/build.gradle index 71341e8db..2200d0756 100644 --- a/News-Android-App/build.gradle +++ b/News-Android-App/build.gradle @@ -8,11 +8,10 @@ plugins { } android { - compileSdkVersion Integer.parseInt(project.ANDROID_BUILD_SDK_VERSION) - testOptions.unitTests.includeAndroidResources = true defaultConfig { + compileSdk Integer.parseInt(project.ANDROID_BUILD_SDK_VERSION) minSdkVersion Integer.parseInt(project.ANDROID_BUILD_MIN_SDK_VERSION) targetSdkVersion Integer.parseInt(project.ANDROID_BUILD_TARGET_SDK_VERSION) @@ -63,7 +62,7 @@ android { } } - flavorDimensions "default" + flavorDimensions = ["default"] productFlavors { // 100% Open-Source Edition @@ -113,14 +112,15 @@ repositories { includeGroup "com.github.nextcloud" } } - maven { url 'https://guardian.github.io/maven/repo-releases' } //needed for com.gu:option:1.3 in Android-DirectoryChooser + maven { url 'https://guardian.github.io/maven/repo-releases' } + //needed for com.gu:option:1.3 in Android-DirectoryChooser } -final DAGGER_VERSION = '2.46.1' -final GLIDE_VERSION = '4.15.1' +final DAGGER_VERSION = '2.48' +final GLIDE_VERSION = '4.16.0' final ESPRESSO_VERSION = '3.5.1' final OKHTTP_VERSION = '4.11.0' -final MOCKITO_VERSION = '5.4.0' +final MOCKITO_VERSION = '5.5.0' final RETROFIT_VERSION = '2.9.0' dependencies { @@ -136,13 +136,14 @@ dependencies { implementation 'androidx.annotation:annotation:1.6.0' implementation "androidx.appcompat:appcompat:1.6.1" implementation "androidx.preference:preference:1.2.1" + implementation 'androidx.core:core-splashscreen:1.0.0' implementation "androidx.media:media:1.6.0" // https://mvnrepository.com/artifact/com.google.android.material/material implementation "com.google.android.material:material:1.9.0" implementation "androidx.palette:palette:1.0.0" implementation "androidx.recyclerview:recyclerview:1.3.1" - implementation "androidx.browser:browser:1.5.0" + implementation "androidx.browser:browser:1.6.0" implementation "androidx.cardview:cardview:1.0.0" implementation 'com.google.code.gson:gson:2.10.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' @@ -176,7 +177,7 @@ dependencies { implementation 'io.reactivex.rxjava3:rxandroid:3.0.2' // Because RxAndroid releases are few and far between, it is recommended you also // explicitly depend on RxJava's latest version for bug fixes and new features. - implementation 'io.reactivex.rxjava3:rxjava:3.1.6' + implementation 'io.reactivex.rxjava3:rxjava:3.1.7' implementation "com.squareup.retrofit2:adapter-rxjava3:$RETROFIT_VERSION" implementation "com.squareup.retrofit2:retrofit:$RETROFIT_VERSION" diff --git a/News-Android-App/src/main/AndroidManifest.xml b/News-Android-App/src/main/AndroidManifest.xml index 5b90c62d7..4fcf3b743 100644 --- a/News-Android-App/src/main/AndroidManifest.xml +++ b/News-Android-App/src/main/AndroidManifest.xml @@ -24,7 +24,7 @@ android:label="@string/app_name" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" - android:theme="@style/SplashTheme" + android:theme="@style/AppTheme" android:usesCleartextTraffic="true" tools:replace="android:icon, android:label, android:theme, android:name"> @@ -36,6 +36,7 @@ diff --git a/News-Android-App/src/main/assets/web.css b/News-Android-App/src/main/assets/web.css index 277d69c8a..67469b159 100644 --- a/News-Android-App/src/main/assets/web.css +++ b/News-Android-App/src/main/assets/web.css @@ -30,7 +30,7 @@ body.darkThemeOLED a:visited { } body.darkTheme { - background-color: #212121; + background-color: #121212; color: #ffffff; } diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/DirectoryChooserActivity.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/DirectoryChooserActivity.java index 06831ec04..35efdcc6c 100644 --- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/DirectoryChooserActivity.java +++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/DirectoryChooserActivity.java @@ -11,7 +11,7 @@ public class DirectoryChooserActivity extends net.rdrei.android.dirchooser.Direc @Override public void onCreate(@Nullable Bundle savedInstanceState) { super.onCreate(savedInstanceState); - int theme = R.style.DirectoryChooserTheme; + int theme = R.style.AppTheme; setTheme(theme); } } diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/ListView/SubscriptionExpandableListAdapter.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/ListView/SubscriptionExpandableListAdapter.java index 4abb6704b..afceee739 100644 --- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/ListView/SubscriptionExpandableListAdapter.java +++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/ListView/SubscriptionExpandableListAdapter.java @@ -76,7 +76,6 @@ public class SubscriptionExpandableListAdapter extends BaseExpandableListAdapter private ArrayList mCategoriesArrayList; private SparseArray> mItemsArrayList; private boolean showOnlyUnread = false; - private Integer btn_rating_star_off_normal_holo_light; private SparseArray starredCountFeeds; private SparseArray unreadCountFolders; @@ -306,14 +305,14 @@ public View getGroupView(final int groupPosition, final boolean isExpanded, View viewHolder.binding.imgViewExpandableIndicator.setVisibility(View.GONE); viewHolder.binding.imgViewFavicon.setVisibility(View.VISIBLE); rotation = 0; - viewHolder.binding.imgViewFavicon.setImageResource(getBtn_rating_star_off_normal_holo_light()); + viewHolder.binding.imgViewFavicon.setImageResource(R.drawable.ic_star_border_24dp_theme_aware); } else if (getChildrenCount( groupPosition ) == 0 ) { viewHolder.binding.imgViewExpandableIndicator.setVisibility(View.GONE); viewHolder.binding.imgViewFavicon.setVisibility(View.INVISIBLE); } else { viewHolder.binding.imgViewExpandableIndicator.setVisibility(View.VISIBLE); viewHolder.binding.imgViewFavicon.setVisibility(View.INVISIBLE); - viewHolder.binding.imgViewExpandableIndicator.setImageResource(R.drawable.ic_action_expand_less); + viewHolder.binding.imgViewExpandableIndicator.setImageResource(R.drawable.ic_action_expand_less_24); if(isExpanded) { rotation = 180; @@ -343,17 +342,6 @@ public View getGroupView(final int groupPosition, final boolean isExpanded, View } - private int getBtn_rating_star_off_normal_holo_light() { - if(btn_rating_star_off_normal_holo_light == null) { - if(ThemeChooser.getSelectedTheme().equals(ThemeChooser.THEME.LIGHT)) { - btn_rating_star_off_normal_holo_light = R.drawable.ic_action_star_border_light; - } else { - btn_rating_star_off_normal_holo_light = R.drawable.ic_action_star_border_dark; - } - } - return btn_rating_star_off_normal_holo_light; - } - static class GroupHolder { @NonNull final SubscriptionListItemBinding binding; diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/LoginDialogActivity.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/LoginDialogActivity.java index f7fb3b805..8aebb3d72 100644 --- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/LoginDialogActivity.java +++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/LoginDialogActivity.java @@ -1,23 +1,23 @@ /* -* Android ownCloud News -* -* @author David Luhmer -* @copyright 2013 David Luhmer david-dev@live.de -* -* This library is free software; you can redistribute it and/or -* modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE -* License as published by the Free Software Foundation; either -* version 3 of the License, or any later version. -* -* This library is distributed in the hope that it will be useful, -* but WITHOUT ANY WARRANTY; without even the implied warranty of -* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -* GNU AFFERO GENERAL PUBLIC LICENSE for more details. -* -* You should have received a copy of the GNU Affero General Public -* License along with this library. If not, see . -* -*/ + * Android ownCloud News + * + * @author David Luhmer + * @copyright 2013 David Luhmer david-dev@live.de + * + * This library is free software; you can redistribute it and/or + * modify it under the terms of the GNU AFFERO GENERAL PUBLIC LICENSE + * License as published by the Free Software Foundation; either + * version 3 of the License, or any later version. + * + * This library is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU AFFERO GENERAL PUBLIC LICENSE for more details. + * + * You should have received a copy of the GNU Affero General Public + * License along with this library. If not, see . + * + */ package de.luhmer.owncloudnewsreader; @@ -85,13 +85,25 @@ public class LoginDialogActivity extends AppCompatActivity { public static final int RESULT_LOGIN = 16000; - /** - * Keep track of the login task to ensure we can cancel it if requested. - */ - protected @Inject ApiProvider mApi; + private final TextWatcher PasswordTextChangedListener = new TextWatcher() { + @Override + public void beforeTextChanged(CharSequence s, int start, int count, int after) { + + } + + @Override + public void onTextChanged(CharSequence s, int start, int before, int count) { + + } + + @Override + public void afterTextChanged(Editable s) { + + } + }; protected @Inject SharedPreferences mPrefs; protected @Inject MemorizingTrustManager mMemorizingTrustManager; - //private UserLoginTask mAuthTask = null; + //private UserLoginTask mAuthTask = null; // Values for email and password at the time of the login attempt. private String mUsername; @@ -103,54 +115,25 @@ public class LoginDialogActivity extends AppCompatActivity { private SingleSignOnAccount importedAccount = null; private boolean mPasswordVisible = false; + private final View.OnClickListener TogglePasswordVisibilityListener = new View.OnClickListener() { + @Override + public void onClick(View v) { + int lastSelection = binding.password.getSelectionEnd(); + mPasswordVisible = !mPasswordVisible; + if (mPasswordVisible) { + binding.password.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD); + } else { + binding.password.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD); + } - @Override - public void onCreate(Bundle savedInstance) { - super.onCreate(savedInstance); - ((NewsReaderApplication) getApplication()).getAppComponent().injectActivity(this); - - binding = ActivityLoginDialogBinding.inflate(getLayoutInflater()); - setContentView(binding.getRoot()); - - binding.btnSingleSignOn.setOnClickListener((v) -> startSingleSignOn()); - binding.btnLogin.setOnClickListener((v) -> startManualLogin()); - binding.tvManualLogin.setOnClickListener((v) -> manualLogin()); - - // Manual Login - binding.imgViewShowPassword.setOnClickListener(ImgViewShowPasswordListener); - binding.password.addTextChangedListener(PasswordTextChangedListener); - - mUsername = mPrefs.getString(SettingsActivity.EDT_USERNAME_STRING, ""); - mPassword = mPrefs.getString(SettingsActivity.EDT_PASSWORD_STRING, ""); - mOc_root_path = mPrefs.getString(SettingsActivity.EDT_OWNCLOUDROOTPATH_STRING, ""); - boolean mCbDisableHostnameVerification = mPrefs.getBoolean(SettingsActivity.CB_DISABLE_HOSTNAME_VERIFICATION_STRING, false); - - if(!mPassword.isEmpty()) { - binding.imgViewShowPassword.setVisibility(View.GONE); - } - - // Set up the login form. - binding.username.setText(mUsername); - binding.password.setText(mPassword); - binding.edtOwncloudRootPath.setText(mOc_root_path); - - binding.cbAllowAllSSLCertificates.setChecked(mCbDisableHostnameVerification); - binding.cbAllowAllSSLCertificates.setOnCheckedChangeListener((buttonView, isChecked) -> mPrefs.edit() - .putBoolean(SettingsActivity.CB_DISABLE_HOSTNAME_VERIFICATION_STRING, isChecked) - .commit()); - } - - @Override - public void onBackPressed() { - if (mPrefs.getString(SettingsActivity.EDT_OWNCLOUDROOTPATH_STRING, null) == null) { - // exit application if no account is set uo - finishAffinity(); - } else { - // go back to previous activity - super.onBackPressed(); + binding.password.setSelection(lastSelection); } - } + }; + /** + * Keep track of the login task to ensure we can cancel it if requested. + */ + protected @Inject ApiProvider mApi; @Override protected void onStart() { @@ -189,40 +172,48 @@ public void manualLogin() { binding.oldLoginWrapper.setVisibility(View.VISIBLE); } - private final TextWatcher PasswordTextChangedListener = new TextWatcher() { - @Override - public void beforeTextChanged(CharSequence s, int start, int count, int after) { + @Override + public void onCreate(Bundle savedInstance) { + super.onCreate(savedInstance); + ((NewsReaderApplication) getApplication()).getAppComponent().injectActivity(this); - } + binding = ActivityLoginDialogBinding.inflate(getLayoutInflater()); + setContentView(binding.getRoot()); - @Override - public void onTextChanged(CharSequence s, int start, int before, int count) { + binding.btnSingleSignOn.setOnClickListener((v) -> startSingleSignOn()); + binding.btnLogin.setOnClickListener((v) -> startManualLogin()); + binding.tvManualLogin.setOnClickListener((v) -> manualLogin()); - } + // Manual Login + binding.passwordContainer.setEndIconOnClickListener(TogglePasswordVisibilityListener); + binding.password.addTextChangedListener(PasswordTextChangedListener); - @Override - public void afterTextChanged(Editable s) { - if(s.toString().isEmpty()) { - binding.imgViewShowPassword.setVisibility(View.VISIBLE); - } - } - }; + mUsername = mPrefs.getString(SettingsActivity.EDT_USERNAME_STRING, ""); + mPassword = mPrefs.getString(SettingsActivity.EDT_PASSWORD_STRING, ""); + mOc_root_path = mPrefs.getString(SettingsActivity.EDT_OWNCLOUDROOTPATH_STRING, ""); + boolean mCbDisableHostnameVerification = mPrefs.getBoolean(SettingsActivity.CB_DISABLE_HOSTNAME_VERIFICATION_STRING, false); - private final View.OnClickListener ImgViewShowPasswordListener = new View.OnClickListener() { - @Override - public void onClick(View v) { - int lastSelection = binding.password.getSelectionEnd(); - mPasswordVisible = !mPasswordVisible; + // Set up the login form. + binding.username.setText(mUsername); + binding.password.setText(mPassword); + binding.edtOwncloudRootPath.setText(mOc_root_path); - if(mPasswordVisible) { - binding.password.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_VISIBLE_PASSWORD); - } else { - binding.password.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_VARIATION_PASSWORD); - } + binding.cbAllowAllSSLCertificates.setChecked(mCbDisableHostnameVerification); + binding.cbAllowAllSSLCertificates.setOnCheckedChangeListener((buttonView, isChecked) -> mPrefs.edit() + .putBoolean(SettingsActivity.CB_DISABLE_HOSTNAME_VERIFICATION_STRING, isChecked) + .commit()); + } - binding.password.setSelection(lastSelection); + @Override + public void onBackPressed() { + if (mPrefs.getString(SettingsActivity.EDT_OWNCLOUDROOTPATH_STRING, null) == null) { + // exit application if no account is set uo + finishAffinity(); + } else { + // go back to previous activity + super.onBackPressed(); } - }; + } private ProgressDialog buildPendingDialogWhileLoggingIn() { ProgressDialog pDialog = new ProgressDialog(this); @@ -261,31 +252,31 @@ public void onError(Exception ex) { }); } - /** - * Attempts to sign in or register the account specified by the login form. - * If there are form errors (invalid email, missing fields, etc.), the - * errors are presented and no actual login attempt is made. - */ - @SuppressLint({"SetTextI18n"}) + /** + * Attempts to sign in or register the account specified by the login form. + * If there are form errors (invalid email, missing fields, etc.), the + * errors are presented and no actual login attempt is made. + */ + @SuppressLint({"SetTextI18n"}) public void attemptLogin() { - // Reset errors. - binding.username.setError(null); - binding.password.setError(null); - binding.edtOwncloudRootPath.setError(null); + // Reset errors. + binding.username.setError(null); + binding.password.setError(null); + binding.edtOwncloudRootPath.setError(null); - // Append "https://" is url doesn't contain it already + // Append "https://" is url doesn't contain it already mOc_root_path = requireNonNull(binding.edtOwncloudRootPath.getText()).toString().trim(); - if(!mOc_root_path.startsWith("http")) { + if (!mOc_root_path.startsWith("http")) { binding.edtOwncloudRootPath.setText("https://" + mOc_root_path); } - // Store values at the time of the login attempt. - mUsername = requireNonNull(binding.username.getText()).toString().trim(); - mPassword = requireNonNull(binding.password.getText()).toString(); - mOc_root_path = binding.edtOwncloudRootPath.getText().toString().trim(); + // Store values at the time of the login attempt. + mUsername = requireNonNull(binding.username.getText()).toString().trim(); + mPassword = requireNonNull(binding.password.getText()).toString(); + mOc_root_path = binding.edtOwncloudRootPath.getText().toString().trim(); - boolean cancel = false; - View focusView = null; + boolean cancel = false; + View focusView = null; // Check for a valid password. if (TextUtils.isEmpty(mPassword)) { @@ -307,7 +298,7 @@ public void attemptLogin() { } else { try { URL url = new URL(mOc_root_path); - if(!Patterns.WEB_URL.matcher(mOc_root_path).matches()) { + if (!Patterns.WEB_URL.matcher(mOc_root_path).matches()) { throw new MalformedURLException(); } if (!url.getProtocol().equals("https")) { @@ -321,11 +312,11 @@ public void attemptLogin() { } } - if (cancel) { - // There was an error; don't attempt login and focus the first - // form field with an error. - focusView.requestFocus(); - } else { + if (cancel) { + // There was an error; don't attempt login and focus the first + // form field with an error. + focusView.requestFocus(); + } else { Editor editor = mPrefs.edit(); editor.putString(SettingsActivity.EDT_OWNCLOUDROOTPATH_STRING, mOc_root_path); editor.putString(SettingsActivity.EDT_PASSWORD_STRING, mPassword); @@ -352,10 +343,10 @@ public void onError(Exception ex) { ShowAlertDialog(getString(R.string.login_dialog_title_error), ex.getMessage(), LoginDialogActivity.this); } }); - } - } + } + } - private void resetDatabase() { + private void resetDatabase() { //Reset Database DatabaseConnectionOrm dbConn = new DatabaseConnectionOrm(LoginDialogActivity.this); dbConn.resetDatabase(); diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailActivity.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailActivity.java index 5933ccabb..310b3023f 100644 --- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailActivity.java +++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailActivity.java @@ -401,29 +401,17 @@ public void updateActionBarIcons() { menuItem_PlayPodcast.setVisible(podcastAvailable); } - boolean isDark = ThemeChooser.isDarkTheme(this); - boolean darkIcons = !isDark && !mShowFastActions; - if (menuItem_Starred != null) { - if (isStarred) { - menuItem_Starred.setIcon(darkIcons ? R.drawable.ic_action_star_light : R.drawable.ic_action_star_dark); - binding.faDetailBar.faStar.setImageResource(darkIcons ? R.drawable.ic_action_star_light : R.drawable.ic_action_star_dark); - } else { - menuItem_Starred.setIcon(darkIcons ? R.drawable.ic_action_star_border_light : R.drawable.ic_action_star_border_dark); - binding.faDetailBar.faStar.setImageResource(darkIcons ? R.drawable.ic_action_star_border_light : R.drawable.ic_action_star_border_dark); - } + int res = isStarred ? R.drawable.ic_star_24_theme_aware : R.drawable.ic_star_border_24dp_theme_aware; + menuItem_Starred.setIcon(res); + binding.faDetailBar.faStar.setImageResource(res); } if (menuItem_Read != null) { - if (isRead) { - menuItem_Read.setIcon(darkIcons ? R.drawable.ic_checkbox_black : R.drawable.ic_checkbox_white); - menuItem_Read.setChecked(true); - binding.faDetailBar.faMarkAsRead.setImageResource(darkIcons ? R.drawable.ic_checkbox_black : R.drawable.ic_checkbox_white); - } else { - menuItem_Read.setIcon(darkIcons ? R.drawable.ic_checkbox_outline_black : R.drawable.ic_checkbox_outline_white); - menuItem_Read.setChecked(false); - binding.faDetailBar.faMarkAsRead.setImageResource(darkIcons ? R.drawable.ic_checkbox_outline_black : R.drawable.ic_checkbox_outline_white); - } + int res = isRead ? R.drawable.ic_checkbox_theme_aware : R.drawable.ic_checkbox_outline_theme_aware; + menuItem_Read.setIcon(res); + menuItem_Read.setChecked(isRead); + binding.faDetailBar.faMarkAsRead.setImageResource(res); } if (menuItem_Incognito != null) { @@ -469,20 +457,19 @@ public boolean onCreateOptionsMenu(Menu menu) { switch (selection) { case "open_in_browser": menuItem_OpenInBrowser.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS); + // TODO!! this is not working.. break; case "share": menuItem_ShareItem.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS); + // TODO!! this is not working.. break; case "podcast": menuItem_PlayPodcast.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS); + // TODO!! this is not working.. break; - //case "tts": - // menu.findItem(R.id.action_tts).setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS); - // break; } } - initIncognitoMode(); updateActionBarIcons(); @@ -642,24 +629,20 @@ public void setIncognitoEnabled(boolean enabled) { } public void initIncognitoMode() { - boolean isLightTheme = !ThemeChooser.isDarkTheme(this); - - int color = getResources().getColor(isIncognitoEnabled() ? R.color.material_grey_900 : R.color.colorPrimary); - ThemeUtils.colorizeToolbar(binding.toolbarLayout.toolbar, color); - if (isLightTheme) { - // the first three menu items are from the fast actions (if enabled) - int skipItems = mShowFastActions ? 3 : 0; - if (isIncognitoEnabled()) { - int white = getResources().getColor(android.R.color.white); - ThemeUtils.colorizeToolbarForeground(binding.toolbarLayout.toolbar, white, skipItems); - clearLightStatusBar(getWindow().getDecorView()); - } else { - int primaryTextColor = getResources().getColor(R.color.primaryTextColor); - ThemeUtils.colorizeToolbarForeground(binding.toolbarLayout.toolbar, primaryTextColor, skipItems); - setLightStatusBar(getWindow().getDecorView()); - } - } - getWindow().setStatusBarColor(color); + if (isIncognitoEnabled()) { + boolean isLightTheme = !ThemeChooser.isDarkTheme(this); + if (isLightTheme) { + + int color = getResources().getColor(isIncognitoEnabled() ? R.color.material_grey_900 : R.color.colorPrimary); + ThemeUtils.colorizeToolbar(binding.toolbarLayout.toolbar, color); + // the first three menu items are from the fast actions (if enabled) + int skipItems = mShowFastActions ? 3 : 0; + int white = getResources().getColor(android.R.color.white); + ThemeUtils.colorizeToolbarForeground(binding.toolbarLayout.toolbar, white, skipItems); + clearLightStatusBar(getWindow().getDecorView()); + getWindow().setStatusBarColor(color); + } + } //ThemeUtils.colorizeToolbar(bottomAppBar, color); diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailFragment.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailFragment.java index 94c0b4f3e..eba214966 100644 --- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailFragment.java +++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsDetailFragment.java @@ -404,7 +404,6 @@ public void loadURL(String url) { case 0: // Custom Tabs final FragmentActivity activity = requireActivity(); CustomTabsIntent.Builder builder = new CustomTabsIntent.Builder() - .setToolbarColor(ContextCompat.getColor(activity, R.color.colorPrimary)) .setShowTitle(true) .setStartAnimations(activity, R.anim.slide_in_right, R.anim.slide_out_left) .setExitAnimations(activity, R.anim.slide_in_left, R.anim.slide_out_right) diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderDetailFragment.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderDetailFragment.java index 7a9582a23..3932d2bd6 100644 --- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderDetailFragment.java +++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderDetailFragment.java @@ -102,7 +102,6 @@ public class NewsReaderDetailFragment extends Fragment { private Drawable rightSwipeDrawable; private String prevLeftAction = ""; private String prevRightAction = ""; - private int accentColor; private Parcelable layoutManagerSavedState; // Variables related to mark as read when scrolling @@ -342,7 +341,6 @@ public boolean onTouch(View v, MotionEvent event) { }); */ - binding.swipeRefresh.setColorSchemeColors(accentColor); binding.swipeRefresh.setOnRefreshListener((SwipeRefreshLayout.OnRefreshListener) mActivity); binding.list.addOnScrollListener(new RecyclerView.OnScrollListener() { @@ -437,11 +435,7 @@ public void onInflate(@NonNull Context context, @NonNull AttributeSet attrs, Bun ((NewsReaderApplication) requireActivity().getApplication()).getAppComponent().injectFragment(this); - TypedArray styledAttributes = context.obtainStyledAttributes(attrs, new int[]{androidx.appcompat.R.attr.colorAccent}); updateSwipeDrawables(true); - int color = Constants.isNextCloud(mPrefs) ? R.color.nextcloudBlue : R.color.owncloudBlue; - accentColor = styledAttributes.getColor(2, ContextCompat.getColor(context, color)); - styledAttributes.recycle(); } /** diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderListActivity.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderListActivity.java index 1cbf120e6..ab5b5524c 100644 --- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderListActivity.java +++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/NewsReaderListActivity.java @@ -53,7 +53,6 @@ import androidx.appcompat.app.ActionBarDrawerToggle; import androidx.appcompat.app.AlertDialog; import androidx.browser.customtabs.CustomTabsIntent; -import androidx.core.content.ContextCompat; import androidx.core.view.GravityCompat; import androidx.customview.widget.ViewDragHelper; import androidx.fragment.app.DialogFragment; @@ -1119,7 +1118,6 @@ public void onClick(RssItemViewHolder vh, int position) { int selectedBrowser = Integer.parseInt(mPrefs.getString(SettingsActivity.SP_DISPLAY_BROWSER, "0")); if (selectedBrowser == 0) { // Custom Tabs CustomTabsIntent.Builder builder = new CustomTabsIntent.Builder() - .setToolbarColor(ContextCompat.getColor(this, R.color.colorPrimary)) .setShowTitle(true) .setStartAnimations(this, R.anim.slide_in_right, R.anim.slide_out_left) .setExitAnimations(this, R.anim.slide_in_left, R.anim.slide_out_right) diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/PodcastFragment.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/PodcastFragment.java index eeaa4267f..9e65cd168 100644 --- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/PodcastFragment.java +++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/PodcastFragment.java @@ -437,7 +437,7 @@ private void displayPlaybackState(PlaybackStateCompat stateCompat) { } } - int drawableId = showPlayingButton ? R.drawable.ic_action_pause : R.drawable.ic_baseline_play_arrow_24; + int drawableId = showPlayingButton ? R.drawable.ic_action_pause_24 : R.drawable.ic_baseline_play_arrow_24; int contentDescriptionId = showPlayingButton ? R.string.content_desc_pause : R.string.content_desc_play; // If attached to context.. diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/adapter/RssItemViewHolder.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/adapter/RssItemViewHolder.java index 951a8f484..1484e7217 100644 --- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/adapter/RssItemViewHolder.java +++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/adapter/RssItemViewHolder.java @@ -341,7 +341,7 @@ public boolean isPlaying() { public void setPlaying(boolean playing) { this.playing = playing; - int imageId = playing ? R.drawable.ic_action_pause : R.drawable.ic_baseline_play_arrow_24; + int imageId = playing ? R.drawable.ic_action_pause_24 : R.drawable.ic_baseline_play_arrow_24; int contentDescriptionId = playing ? R.string.content_desc_pause : R.string.content_desc_play; ImageView playPause = getPlayPausePodcastButton(); diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/database/DatabaseConnectionOrm.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/database/DatabaseConnectionOrm.java index 3711411ce..7d2eec13e 100644 --- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/database/DatabaseConnectionOrm.java +++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/database/DatabaseConnectionOrm.java @@ -574,10 +574,6 @@ public Long getLowestItemIdByFolder(Long id_folder) { public String getAllItemsIdsForFolderSQL(long ID_FOLDER, boolean onlyUnread, SORT_DIRECTION sortDirection) { - //If all starred items are requested always return them in desc. order - if(ID_FOLDER == ALL_STARRED_ITEMS.getValue()) - sortDirection = SORT_DIRECTION.desc; - String buildSQL = "SELECT " + RssItemDao.Properties.Id.columnName + " FROM " + RssItemDao.TABLENAME; diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/helper/ThemeChooser.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/helper/ThemeChooser.java index cf16c6f92..2ff751499 100644 --- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/helper/ThemeChooser.java +++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/helper/ThemeChooser.java @@ -92,7 +92,7 @@ public static void afterOnCreate(Activity act) { mSelectedTheme = THEME.DARK; // this is required for auto mode at night if (isOledMode(false) && isDarkTheme(act)) { - act.setTheme(R.style.AppThemeOLED); + act.setTheme(R.style.AppTheme_OLED); Log.v(TAG, "activate OLED mode"); //uiNightMode = Configuration.UI_MODE_NIGHT_YES; AppCompatDelegate.setDefaultNightMode(AppCompatDelegate.MODE_NIGHT_YES); diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/notification/NextcloudNotificationManager.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/notification/NextcloudNotificationManager.java index 2266ba3cf..5ae906d40 100644 --- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/notification/NextcloudNotificationManager.java +++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/notification/NextcloudNotificationManager.java @@ -233,7 +233,7 @@ public static NotificationCompat.Builder buildPodcastNotification(Context contex } private static NotificationCompat.Action getPlayPauseAction(Context context, boolean isPlaying) { - int drawableId = isPlaying ? R.drawable.ic_action_pause : R.drawable.ic_baseline_play_arrow_24; + int drawableId = isPlaying ? R.drawable.ic_action_pause_24 : R.drawable.ic_baseline_play_arrow_24; String actionText = isPlaying ? "Pause" : "Play"; // TODO extract as string resource PendingIntent pendingIntent = MediaButtonReceiver.buildMediaButtonPendingIntent(context, diff --git a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/services/DownloadWebPageService.java b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/services/DownloadWebPageService.java index 2e3a6f7b0..56c35ce83 100644 --- a/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/services/DownloadWebPageService.java +++ b/News-Android-App/src/main/java/de/luhmer/owncloudnewsreader/services/DownloadWebPageService.java @@ -104,7 +104,7 @@ private void initNotification() { Intent stopIntent = new Intent(this, NotificationActionReceiver.class); stopIntent.setAction(NOTIFICATION_ACTION_STOP_STRING); PendingIntent stopPendingIntent = PendingIntent.getBroadcast(this, 0, stopIntent, PendingIntent.FLAG_IMMUTABLE | PendingIntent.FLAG_ONE_SHOT); - mNotificationWebPages.addAction(R.drawable.ic_action_pause, "Stop", stopPendingIntent); + mNotificationWebPages.addAction(R.drawable.ic_action_pause_24, "Stop", stopPendingIntent); } @Subscribe diff --git a/News-Android-App/src/main/res/color/material_button_text_color.xml b/News-Android-App/src/main/res/color/material_button_text_color.xml deleted file mode 100644 index f9cb77549..000000000 --- a/News-Android-App/src/main/res/color/material_button_text_color.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/News-Android-App/src/main/res/drawable-hdpi/fa_bg.9.png b/News-Android-App/src/main/res/drawable-hdpi/fa_bg.9.png deleted file mode 100644 index a5e16a571..000000000 Binary files a/News-Android-App/src/main/res/drawable-hdpi/fa_bg.9.png and /dev/null differ diff --git a/News-Android-App/src/main/res/drawable-hdpi/ic_action_delete.png b/News-Android-App/src/main/res/drawable-hdpi/ic_action_delete.png deleted file mode 100644 index eec14f009..000000000 Binary files a/News-Android-App/src/main/res/drawable-hdpi/ic_action_delete.png and /dev/null differ diff --git a/News-Android-App/src/main/res/drawable-hdpi/ic_action_expand_less.png b/News-Android-App/src/main/res/drawable-hdpi/ic_action_expand_less.png deleted file mode 100644 index d452f2528..000000000 Binary files a/News-Android-App/src/main/res/drawable-hdpi/ic_action_expand_less.png and /dev/null differ diff --git a/News-Android-App/src/main/res/drawable-hdpi/ic_action_file_download.png b/News-Android-App/src/main/res/drawable-hdpi/ic_action_file_download.png deleted file mode 100644 index bdf434535..000000000 Binary files a/News-Android-App/src/main/res/drawable-hdpi/ic_action_file_download.png and /dev/null differ diff --git a/News-Android-App/src/main/res/drawable-hdpi/ic_action_forward_30.png b/News-Android-App/src/main/res/drawable-hdpi/ic_action_forward_30.png deleted file mode 100644 index 086b3534b..000000000 Binary files a/News-Android-App/src/main/res/drawable-hdpi/ic_action_forward_30.png and /dev/null differ diff --git a/News-Android-App/src/main/res/drawable-hdpi/ic_action_open_in_browser.png b/News-Android-App/src/main/res/drawable-hdpi/ic_action_open_in_browser.png deleted file mode 100644 index 5e9318639..000000000 Binary files a/News-Android-App/src/main/res/drawable-hdpi/ic_action_open_in_browser.png and /dev/null differ diff --git a/News-Android-App/src/main/res/drawable-hdpi/ic_action_pause.png b/News-Android-App/src/main/res/drawable-hdpi/ic_action_pause.png deleted file mode 100644 index 1a35601e7..000000000 Binary files a/News-Android-App/src/main/res/drawable-hdpi/ic_action_pause.png and /dev/null differ diff --git a/News-Android-App/src/main/res/drawable-hdpi/ic_action_refresh.png b/News-Android-App/src/main/res/drawable-hdpi/ic_action_refresh.png deleted file mode 100644 index 6d4481ff7..000000000 Binary files a/News-Android-App/src/main/res/drawable-hdpi/ic_action_refresh.png and /dev/null differ diff --git a/News-Android-App/src/main/res/drawable-hdpi/ic_action_replay_10.png b/News-Android-App/src/main/res/drawable-hdpi/ic_action_replay_10.png deleted file mode 100644 index b31cb9aca..000000000 Binary files a/News-Android-App/src/main/res/drawable-hdpi/ic_action_replay_10.png and /dev/null differ diff --git a/News-Android-App/src/main/res/drawable-hdpi/ic_action_star_border_dark.png b/News-Android-App/src/main/res/drawable-hdpi/ic_action_star_border_dark.png deleted file mode 100644 index 695f04eda..000000000 Binary files a/News-Android-App/src/main/res/drawable-hdpi/ic_action_star_border_dark.png and /dev/null differ diff --git a/News-Android-App/src/main/res/drawable-hdpi/ic_action_star_border_light.png b/News-Android-App/src/main/res/drawable-hdpi/ic_action_star_border_light.png deleted file mode 100644 index 1f53e3391..000000000 Binary files a/News-Android-App/src/main/res/drawable-hdpi/ic_action_star_border_light.png and /dev/null differ diff --git a/News-Android-App/src/main/res/drawable-hdpi/ic_action_star_dark.png b/News-Android-App/src/main/res/drawable-hdpi/ic_action_star_dark.png deleted file mode 100644 index bfcdff5c5..000000000 Binary files a/News-Android-App/src/main/res/drawable-hdpi/ic_action_star_dark.png and /dev/null differ diff --git a/News-Android-App/src/main/res/drawable-hdpi/ic_action_star_light.png b/News-Android-App/src/main/res/drawable-hdpi/ic_action_star_light.png deleted file mode 100644 index d76866575..000000000 Binary files a/News-Android-App/src/main/res/drawable-hdpi/ic_action_star_light.png and /dev/null differ diff --git a/News-Android-App/src/main/res/drawable-hdpi/ic_action_visibility.png b/News-Android-App/src/main/res/drawable-hdpi/ic_action_visibility.png deleted file mode 100644 index 9ada15c1d..000000000 Binary files a/News-Android-App/src/main/res/drawable-hdpi/ic_action_visibility.png and /dev/null differ diff --git a/News-Android-App/src/main/res/drawable-hdpi/ic_check_box_white.png b/News-Android-App/src/main/res/drawable-hdpi/ic_check_box_white.png deleted file mode 100644 index 9f3bc735a..000000000 Binary files a/News-Android-App/src/main/res/drawable-hdpi/ic_check_box_white.png and /dev/null differ diff --git a/News-Android-App/src/main/res/drawable-hdpi/ic_slow_motion_video.png b/News-Android-App/src/main/res/drawable-hdpi/ic_slow_motion_video.png deleted file mode 100644 index 9fda0a8c6..000000000 Binary files a/News-Android-App/src/main/res/drawable-hdpi/ic_slow_motion_video.png and /dev/null differ diff --git a/News-Android-App/src/main/res/drawable-hdpi/ic_splash_screen.png b/News-Android-App/src/main/res/drawable-hdpi/ic_splash_screen.png deleted file mode 100644 index 1f4adcc2f..000000000 Binary files a/News-Android-App/src/main/res/drawable-hdpi/ic_splash_screen.png and /dev/null differ diff --git a/News-Android-App/src/main/res/drawable-ldpi/owncloud.png b/News-Android-App/src/main/res/drawable-ldpi/owncloud.png deleted file mode 100644 index cee95461e..000000000 Binary files a/News-Android-App/src/main/res/drawable-ldpi/owncloud.png and /dev/null differ diff --git a/News-Android-App/src/main/res/drawable-mdpi/fa_bg.9.png b/News-Android-App/src/main/res/drawable-mdpi/fa_bg.9.png deleted file mode 100644 index f549222b4..000000000 Binary files a/News-Android-App/src/main/res/drawable-mdpi/fa_bg.9.png and /dev/null differ diff --git a/News-Android-App/src/main/res/drawable-mdpi/ic_action_delete.png b/News-Android-App/src/main/res/drawable-mdpi/ic_action_delete.png deleted file mode 100644 index f5f473fd1..000000000 Binary files a/News-Android-App/src/main/res/drawable-mdpi/ic_action_delete.png and /dev/null differ diff --git a/News-Android-App/src/main/res/drawable-mdpi/ic_action_expand_less.png b/News-Android-App/src/main/res/drawable-mdpi/ic_action_expand_less.png deleted file mode 100644 index b6e239da9..000000000 Binary files a/News-Android-App/src/main/res/drawable-mdpi/ic_action_expand_less.png and /dev/null differ diff --git a/News-Android-App/src/main/res/drawable-mdpi/ic_action_file_download.png b/News-Android-App/src/main/res/drawable-mdpi/ic_action_file_download.png deleted file mode 100644 index d7e3b3b75..000000000 Binary files a/News-Android-App/src/main/res/drawable-mdpi/ic_action_file_download.png and /dev/null differ diff --git a/News-Android-App/src/main/res/drawable-mdpi/ic_action_forward_30.png b/News-Android-App/src/main/res/drawable-mdpi/ic_action_forward_30.png deleted file mode 100644 index 69e91c35a..000000000 Binary files a/News-Android-App/src/main/res/drawable-mdpi/ic_action_forward_30.png and /dev/null differ diff --git a/News-Android-App/src/main/res/drawable-mdpi/ic_action_open_in_browser.png b/News-Android-App/src/main/res/drawable-mdpi/ic_action_open_in_browser.png deleted file mode 100644 index 312f7afca..000000000 Binary files a/News-Android-App/src/main/res/drawable-mdpi/ic_action_open_in_browser.png and /dev/null differ diff --git a/News-Android-App/src/main/res/drawable-mdpi/ic_action_pause.png b/News-Android-App/src/main/res/drawable-mdpi/ic_action_pause.png deleted file mode 100644 index 6249e846f..000000000 Binary files a/News-Android-App/src/main/res/drawable-mdpi/ic_action_pause.png and /dev/null differ diff --git a/News-Android-App/src/main/res/drawable-mdpi/ic_action_refresh.png b/News-Android-App/src/main/res/drawable-mdpi/ic_action_refresh.png deleted file mode 100644 index ccca0127f..000000000 Binary files a/News-Android-App/src/main/res/drawable-mdpi/ic_action_refresh.png and /dev/null differ diff --git a/News-Android-App/src/main/res/drawable-mdpi/ic_action_replay_10.png b/News-Android-App/src/main/res/drawable-mdpi/ic_action_replay_10.png deleted file mode 100644 index 9a638bee8..000000000 Binary files a/News-Android-App/src/main/res/drawable-mdpi/ic_action_replay_10.png and /dev/null differ diff --git a/News-Android-App/src/main/res/drawable-mdpi/ic_action_star_border_dark.png b/News-Android-App/src/main/res/drawable-mdpi/ic_action_star_border_dark.png deleted file mode 100644 index 6d8163a69..000000000 Binary files a/News-Android-App/src/main/res/drawable-mdpi/ic_action_star_border_dark.png and /dev/null differ diff --git a/News-Android-App/src/main/res/drawable-mdpi/ic_action_star_border_light.png b/News-Android-App/src/main/res/drawable-mdpi/ic_action_star_border_light.png deleted file mode 100644 index fcc7f1e23..000000000 Binary files a/News-Android-App/src/main/res/drawable-mdpi/ic_action_star_border_light.png and /dev/null differ diff --git a/News-Android-App/src/main/res/drawable-mdpi/ic_action_star_dark.png b/News-Android-App/src/main/res/drawable-mdpi/ic_action_star_dark.png deleted file mode 100644 index 1d58d94c3..000000000 Binary files a/News-Android-App/src/main/res/drawable-mdpi/ic_action_star_dark.png and /dev/null differ diff --git a/News-Android-App/src/main/res/drawable-mdpi/ic_action_star_light.png b/News-Android-App/src/main/res/drawable-mdpi/ic_action_star_light.png deleted file mode 100644 index 2d384c9ae..000000000 Binary files a/News-Android-App/src/main/res/drawable-mdpi/ic_action_star_light.png and /dev/null differ diff --git a/News-Android-App/src/main/res/drawable-mdpi/ic_action_visibility.png b/News-Android-App/src/main/res/drawable-mdpi/ic_action_visibility.png deleted file mode 100644 index ac5c85107..000000000 Binary files a/News-Android-App/src/main/res/drawable-mdpi/ic_action_visibility.png and /dev/null differ diff --git a/News-Android-App/src/main/res/drawable-mdpi/ic_check_box_white.png b/News-Android-App/src/main/res/drawable-mdpi/ic_check_box_white.png deleted file mode 100644 index fa2290786..000000000 Binary files a/News-Android-App/src/main/res/drawable-mdpi/ic_check_box_white.png and /dev/null differ diff --git a/News-Android-App/src/main/res/drawable-mdpi/ic_slow_motion_video.png b/News-Android-App/src/main/res/drawable-mdpi/ic_slow_motion_video.png deleted file mode 100644 index 0edc705cd..000000000 Binary files a/News-Android-App/src/main/res/drawable-mdpi/ic_slow_motion_video.png and /dev/null differ diff --git a/News-Android-App/src/main/res/drawable-mdpi/ic_splash_screen.png b/News-Android-App/src/main/res/drawable-mdpi/ic_splash_screen.png deleted file mode 100644 index 5df2c728c..000000000 Binary files a/News-Android-App/src/main/res/drawable-mdpi/ic_splash_screen.png and /dev/null differ diff --git a/News-Android-App/src/main/res/drawable-v21/fa_button.xml b/News-Android-App/src/main/res/drawable-v21/fa_button.xml deleted file mode 100644 index c23e2b7fe..000000000 --- a/News-Android-App/src/main/res/drawable-v21/fa_button.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - \ No newline at end of file diff --git a/News-Android-App/src/main/res/drawable-xhdpi/fa_bg.9.png b/News-Android-App/src/main/res/drawable-xhdpi/fa_bg.9.png deleted file mode 100644 index b1f79f435..000000000 Binary files a/News-Android-App/src/main/res/drawable-xhdpi/fa_bg.9.png and /dev/null differ diff --git a/News-Android-App/src/main/res/drawable-xhdpi/ic_action_delete.png b/News-Android-App/src/main/res/drawable-xhdpi/ic_action_delete.png deleted file mode 100644 index 1e207672c..000000000 Binary files a/News-Android-App/src/main/res/drawable-xhdpi/ic_action_delete.png and /dev/null differ diff --git a/News-Android-App/src/main/res/drawable-xhdpi/ic_action_expand_less.png b/News-Android-App/src/main/res/drawable-xhdpi/ic_action_expand_less.png deleted file mode 100644 index 82c612172..000000000 Binary files a/News-Android-App/src/main/res/drawable-xhdpi/ic_action_expand_less.png and /dev/null differ diff --git a/News-Android-App/src/main/res/drawable-xhdpi/ic_action_file_download.png b/News-Android-App/src/main/res/drawable-xhdpi/ic_action_file_download.png deleted file mode 100644 index 5107d3746..000000000 Binary files a/News-Android-App/src/main/res/drawable-xhdpi/ic_action_file_download.png and /dev/null differ diff --git a/News-Android-App/src/main/res/drawable-xhdpi/ic_action_forward_30.png b/News-Android-App/src/main/res/drawable-xhdpi/ic_action_forward_30.png deleted file mode 100644 index dd26cc4aa..000000000 Binary files a/News-Android-App/src/main/res/drawable-xhdpi/ic_action_forward_30.png and /dev/null differ diff --git a/News-Android-App/src/main/res/drawable-xhdpi/ic_action_open_in_browser.png b/News-Android-App/src/main/res/drawable-xhdpi/ic_action_open_in_browser.png deleted file mode 100644 index 4ecaa05f7..000000000 Binary files a/News-Android-App/src/main/res/drawable-xhdpi/ic_action_open_in_browser.png and /dev/null differ diff --git a/News-Android-App/src/main/res/drawable-xhdpi/ic_action_pause.png b/News-Android-App/src/main/res/drawable-xhdpi/ic_action_pause.png deleted file mode 100644 index be989642a..000000000 Binary files a/News-Android-App/src/main/res/drawable-xhdpi/ic_action_pause.png and /dev/null differ diff --git a/News-Android-App/src/main/res/drawable-xhdpi/ic_action_refresh.png b/News-Android-App/src/main/res/drawable-xhdpi/ic_action_refresh.png deleted file mode 100644 index 765ed43fc..000000000 Binary files a/News-Android-App/src/main/res/drawable-xhdpi/ic_action_refresh.png and /dev/null differ diff --git a/News-Android-App/src/main/res/drawable-xhdpi/ic_action_replay_10.png b/News-Android-App/src/main/res/drawable-xhdpi/ic_action_replay_10.png deleted file mode 100644 index 8b2849770..000000000 Binary files a/News-Android-App/src/main/res/drawable-xhdpi/ic_action_replay_10.png and /dev/null differ diff --git a/News-Android-App/src/main/res/drawable-xhdpi/ic_action_star_border_dark.png b/News-Android-App/src/main/res/drawable-xhdpi/ic_action_star_border_dark.png deleted file mode 100644 index 571570ffa..000000000 Binary files a/News-Android-App/src/main/res/drawable-xhdpi/ic_action_star_border_dark.png and /dev/null differ diff --git a/News-Android-App/src/main/res/drawable-xhdpi/ic_action_star_border_light.png b/News-Android-App/src/main/res/drawable-xhdpi/ic_action_star_border_light.png deleted file mode 100644 index f349792c2..000000000 Binary files a/News-Android-App/src/main/res/drawable-xhdpi/ic_action_star_border_light.png and /dev/null differ diff --git a/News-Android-App/src/main/res/drawable-xhdpi/ic_action_star_dark.png b/News-Android-App/src/main/res/drawable-xhdpi/ic_action_star_dark.png deleted file mode 100644 index 8d2d4b6aa..000000000 Binary files a/News-Android-App/src/main/res/drawable-xhdpi/ic_action_star_dark.png and /dev/null differ diff --git a/News-Android-App/src/main/res/drawable-xhdpi/ic_action_star_light.png b/News-Android-App/src/main/res/drawable-xhdpi/ic_action_star_light.png deleted file mode 100644 index a93d1284b..000000000 Binary files a/News-Android-App/src/main/res/drawable-xhdpi/ic_action_star_light.png and /dev/null differ diff --git a/News-Android-App/src/main/res/drawable-xhdpi/ic_action_visibility.png b/News-Android-App/src/main/res/drawable-xhdpi/ic_action_visibility.png deleted file mode 100644 index 3d249ac35..000000000 Binary files a/News-Android-App/src/main/res/drawable-xhdpi/ic_action_visibility.png and /dev/null differ diff --git a/News-Android-App/src/main/res/drawable-xhdpi/ic_check_box_white.png b/News-Android-App/src/main/res/drawable-xhdpi/ic_check_box_white.png deleted file mode 100644 index d15985579..000000000 Binary files a/News-Android-App/src/main/res/drawable-xhdpi/ic_check_box_white.png and /dev/null differ diff --git a/News-Android-App/src/main/res/drawable-xhdpi/ic_slow_motion_video.png b/News-Android-App/src/main/res/drawable-xhdpi/ic_slow_motion_video.png deleted file mode 100644 index 2753e19b0..000000000 Binary files a/News-Android-App/src/main/res/drawable-xhdpi/ic_slow_motion_video.png and /dev/null differ diff --git a/News-Android-App/src/main/res/drawable-xhdpi/ic_splash_screen.png b/News-Android-App/src/main/res/drawable-xhdpi/ic_splash_screen.png deleted file mode 100644 index 6fb658355..000000000 Binary files a/News-Android-App/src/main/res/drawable-xhdpi/ic_splash_screen.png and /dev/null differ diff --git a/News-Android-App/src/main/res/drawable-xxhdpi/fa_bg.9.png b/News-Android-App/src/main/res/drawable-xxhdpi/fa_bg.9.png deleted file mode 100644 index 3659e007f..000000000 Binary files a/News-Android-App/src/main/res/drawable-xxhdpi/fa_bg.9.png and /dev/null differ diff --git a/News-Android-App/src/main/res/drawable-xxhdpi/ic_action_delete.png b/News-Android-App/src/main/res/drawable-xxhdpi/ic_action_delete.png deleted file mode 100644 index 3a25d9b62..000000000 Binary files a/News-Android-App/src/main/res/drawable-xxhdpi/ic_action_delete.png and /dev/null differ diff --git a/News-Android-App/src/main/res/drawable-xxhdpi/ic_action_expand_less.png b/News-Android-App/src/main/res/drawable-xxhdpi/ic_action_expand_less.png deleted file mode 100644 index d6dbceb96..000000000 Binary files a/News-Android-App/src/main/res/drawable-xxhdpi/ic_action_expand_less.png and /dev/null differ diff --git a/News-Android-App/src/main/res/drawable-xxhdpi/ic_action_file_download.png b/News-Android-App/src/main/res/drawable-xxhdpi/ic_action_file_download.png deleted file mode 100644 index 46a95731c..000000000 Binary files a/News-Android-App/src/main/res/drawable-xxhdpi/ic_action_file_download.png and /dev/null differ diff --git a/News-Android-App/src/main/res/drawable-xxhdpi/ic_action_forward_30.png b/News-Android-App/src/main/res/drawable-xxhdpi/ic_action_forward_30.png deleted file mode 100644 index be18b228a..000000000 Binary files a/News-Android-App/src/main/res/drawable-xxhdpi/ic_action_forward_30.png and /dev/null differ diff --git a/News-Android-App/src/main/res/drawable-xxhdpi/ic_action_open_in_browser.png b/News-Android-App/src/main/res/drawable-xxhdpi/ic_action_open_in_browser.png deleted file mode 100644 index 72f373f55..000000000 Binary files a/News-Android-App/src/main/res/drawable-xxhdpi/ic_action_open_in_browser.png and /dev/null differ diff --git a/News-Android-App/src/main/res/drawable-xxhdpi/ic_action_pause.png b/News-Android-App/src/main/res/drawable-xxhdpi/ic_action_pause.png deleted file mode 100644 index 3013f22a6..000000000 Binary files a/News-Android-App/src/main/res/drawable-xxhdpi/ic_action_pause.png and /dev/null differ diff --git a/News-Android-App/src/main/res/drawable-xxhdpi/ic_action_refresh.png b/News-Android-App/src/main/res/drawable-xxhdpi/ic_action_refresh.png deleted file mode 100644 index 455000ed5..000000000 Binary files a/News-Android-App/src/main/res/drawable-xxhdpi/ic_action_refresh.png and /dev/null differ diff --git a/News-Android-App/src/main/res/drawable-xxhdpi/ic_action_replay_10.png b/News-Android-App/src/main/res/drawable-xxhdpi/ic_action_replay_10.png deleted file mode 100644 index 951a2427d..000000000 Binary files a/News-Android-App/src/main/res/drawable-xxhdpi/ic_action_replay_10.png and /dev/null differ diff --git a/News-Android-App/src/main/res/drawable-xxhdpi/ic_action_star_border_dark.png b/News-Android-App/src/main/res/drawable-xxhdpi/ic_action_star_border_dark.png deleted file mode 100644 index 44df821d8..000000000 Binary files a/News-Android-App/src/main/res/drawable-xxhdpi/ic_action_star_border_dark.png and /dev/null differ diff --git a/News-Android-App/src/main/res/drawable-xxhdpi/ic_action_star_border_light.png b/News-Android-App/src/main/res/drawable-xxhdpi/ic_action_star_border_light.png deleted file mode 100644 index f8b658911..000000000 Binary files a/News-Android-App/src/main/res/drawable-xxhdpi/ic_action_star_border_light.png and /dev/null differ diff --git a/News-Android-App/src/main/res/drawable-xxhdpi/ic_action_star_dark.png b/News-Android-App/src/main/res/drawable-xxhdpi/ic_action_star_dark.png deleted file mode 100644 index 9db9cafb1..000000000 Binary files a/News-Android-App/src/main/res/drawable-xxhdpi/ic_action_star_dark.png and /dev/null differ diff --git a/News-Android-App/src/main/res/drawable-xxhdpi/ic_action_star_light.png b/News-Android-App/src/main/res/drawable-xxhdpi/ic_action_star_light.png deleted file mode 100644 index f8b1e4176..000000000 Binary files a/News-Android-App/src/main/res/drawable-xxhdpi/ic_action_star_light.png and /dev/null differ diff --git a/News-Android-App/src/main/res/drawable-xxhdpi/ic_action_visibility.png b/News-Android-App/src/main/res/drawable-xxhdpi/ic_action_visibility.png deleted file mode 100644 index 5b83a2806..000000000 Binary files a/News-Android-App/src/main/res/drawable-xxhdpi/ic_action_visibility.png and /dev/null differ diff --git a/News-Android-App/src/main/res/drawable-xxhdpi/ic_check_box_white.png b/News-Android-App/src/main/res/drawable-xxhdpi/ic_check_box_white.png deleted file mode 100644 index 3287ddfd3..000000000 Binary files a/News-Android-App/src/main/res/drawable-xxhdpi/ic_check_box_white.png and /dev/null differ diff --git a/News-Android-App/src/main/res/drawable-xxhdpi/ic_slow_motion_video.png b/News-Android-App/src/main/res/drawable-xxhdpi/ic_slow_motion_video.png deleted file mode 100644 index 1c40dfc29..000000000 Binary files a/News-Android-App/src/main/res/drawable-xxhdpi/ic_slow_motion_video.png and /dev/null differ diff --git a/News-Android-App/src/main/res/drawable-xxhdpi/ic_splash_screen.png b/News-Android-App/src/main/res/drawable-xxhdpi/ic_splash_screen.png deleted file mode 100644 index 37fd71b98..000000000 Binary files a/News-Android-App/src/main/res/drawable-xxhdpi/ic_splash_screen.png and /dev/null differ diff --git a/News-Android-App/src/main/res/drawable-xxxhdpi/fa_bg.9.png b/News-Android-App/src/main/res/drawable-xxxhdpi/fa_bg.9.png deleted file mode 100644 index ad9fa4f3c..000000000 Binary files a/News-Android-App/src/main/res/drawable-xxxhdpi/fa_bg.9.png and /dev/null differ diff --git a/News-Android-App/src/main/res/drawable-xxxhdpi/ic_splash_screen.png b/News-Android-App/src/main/res/drawable-xxxhdpi/ic_splash_screen.png deleted file mode 100644 index 6b1ffcefe..000000000 Binary files a/News-Android-App/src/main/res/drawable-xxxhdpi/ic_splash_screen.png and /dev/null differ diff --git a/News-Android-App/src/main/res/drawable/checkbox_background_holo_dark.xml b/News-Android-App/src/main/res/drawable/checkbox_background_holo_dark.xml index fd8bad89e..b4e8aabba 100644 --- a/News-Android-App/src/main/res/drawable/checkbox_background_holo_dark.xml +++ b/News-Android-App/src/main/res/drawable/checkbox_background_holo_dark.xml @@ -2,10 +2,7 @@ - - - - + + \ No newline at end of file diff --git a/News-Android-App/src/main/res/drawable/fa_all_read_target.xml b/News-Android-App/src/main/res/drawable/fa_all_read_target.xml index ef95af5d1..a94f909c0 100644 --- a/News-Android-App/src/main/res/drawable/fa_all_read_target.xml +++ b/News-Android-App/src/main/res/drawable/fa_all_read_target.xml @@ -20,15 +20,15 @@ android:pathData="M64.001,64m-60,0a60,60 0,1 1,119.999 0a60,60 0,1 1,-119.999 0" android:strokeWidth="6" android:fillColor="#00000000" - android:strokeColor="#68BDEC"/> + android:strokeColor="?attr/colorPrimaryContainer"/> diff --git a/News-Android-App/src/main/res/drawable/fa_bg.xml b/News-Android-App/src/main/res/drawable/fa_bg.xml new file mode 100644 index 000000000..6e0075ead --- /dev/null +++ b/News-Android-App/src/main/res/drawable/fa_bg.xml @@ -0,0 +1,7 @@ + + + + + \ No newline at end of file diff --git a/News-Android-App/src/main/res/drawable/fa_button.xml b/News-Android-App/src/main/res/drawable/fa_button.xml deleted file mode 100644 index bf3c2d7df..000000000 --- a/News-Android-App/src/main/res/drawable/fa_button.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/News-Android-App/src/main/res/drawable/ic_action_delete_24.xml b/News-Android-App/src/main/res/drawable/ic_action_delete_24.xml new file mode 100644 index 000000000..de011dd99 --- /dev/null +++ b/News-Android-App/src/main/res/drawable/ic_action_delete_24.xml @@ -0,0 +1,5 @@ + + + diff --git a/News-Android-App/src/main/res/drawable/ic_action_download_24.xml b/News-Android-App/src/main/res/drawable/ic_action_download_24.xml new file mode 100644 index 000000000..1fc810652 --- /dev/null +++ b/News-Android-App/src/main/res/drawable/ic_action_download_24.xml @@ -0,0 +1,5 @@ + + + diff --git a/News-Android-App/src/main/res/drawable/ic_action_expand_less_24.xml b/News-Android-App/src/main/res/drawable/ic_action_expand_less_24.xml new file mode 100644 index 000000000..a31d83024 --- /dev/null +++ b/News-Android-App/src/main/res/drawable/ic_action_expand_less_24.xml @@ -0,0 +1,5 @@ + + + diff --git a/News-Android-App/src/main/res/drawable/ic_action_open_in_browser_24.xml b/News-Android-App/src/main/res/drawable/ic_action_open_in_browser_24.xml new file mode 100644 index 000000000..a04210540 --- /dev/null +++ b/News-Android-App/src/main/res/drawable/ic_action_open_in_browser_24.xml @@ -0,0 +1,8 @@ + + + diff --git a/News-Android-App/src/main/res/drawable/ic_action_open_in_browser_24_theme_aware.xml b/News-Android-App/src/main/res/drawable/ic_action_open_in_browser_24_theme_aware.xml new file mode 100644 index 000000000..151f7e3fd --- /dev/null +++ b/News-Android-App/src/main/res/drawable/ic_action_open_in_browser_24_theme_aware.xml @@ -0,0 +1,9 @@ + + + diff --git a/News-Android-App/src/main/res/drawable/ic_action_pause_24.xml b/News-Android-App/src/main/res/drawable/ic_action_pause_24.xml new file mode 100644 index 000000000..67a80c0eb --- /dev/null +++ b/News-Android-App/src/main/res/drawable/ic_action_pause_24.xml @@ -0,0 +1,5 @@ + + + diff --git a/News-Android-App/src/main/res/drawable/ic_baseline_account_circle_24.xml b/News-Android-App/src/main/res/drawable/ic_baseline_account_circle_24.xml index 190ab42ea..839101bde 100644 --- a/News-Android-App/src/main/res/drawable/ic_baseline_account_circle_24.xml +++ b/News-Android-App/src/main/res/drawable/ic_baseline_account_circle_24.xml @@ -1,4 +1,4 @@ - diff --git a/News-Android-App/src/main/res/drawable/ic_baseline_play_arrow_24_theme_aware.xml b/News-Android-App/src/main/res/drawable/ic_baseline_play_arrow_24_theme_aware.xml index 538a4c215..eac1b64e7 100644 --- a/News-Android-App/src/main/res/drawable/ic_baseline_play_arrow_24_theme_aware.xml +++ b/News-Android-App/src/main/res/drawable/ic_baseline_play_arrow_24_theme_aware.xml @@ -1,5 +1,9 @@ - + diff --git a/News-Android-App/src/main/res/drawable/ic_checkbox_outline_theme_aware.xml b/News-Android-App/src/main/res/drawable/ic_checkbox_outline_theme_aware.xml new file mode 100644 index 000000000..d283076cf --- /dev/null +++ b/News-Android-App/src/main/res/drawable/ic_checkbox_outline_theme_aware.xml @@ -0,0 +1,10 @@ + + + diff --git a/News-Android-App/src/main/res/drawable/ic_checkbox_theme_aware.xml b/News-Android-App/src/main/res/drawable/ic_checkbox_theme_aware.xml new file mode 100644 index 000000000..6b39b24b8 --- /dev/null +++ b/News-Android-App/src/main/res/drawable/ic_checkbox_theme_aware.xml @@ -0,0 +1,10 @@ + + + diff --git a/News-Android-App/src/main/res/drawable/ic_fa_expand.xml b/News-Android-App/src/main/res/drawable/ic_fa_expand.xml deleted file mode 100644 index 9757714e7..000000000 --- a/News-Android-App/src/main/res/drawable/ic_fa_expand.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - \ No newline at end of file diff --git a/News-Android-App/src/main/res/drawable/ic_fa_expand_animated.xml b/News-Android-App/src/main/res/drawable/ic_fa_expand_animated.xml deleted file mode 100644 index 4b4bb23bc..000000000 --- a/News-Android-App/src/main/res/drawable/ic_fa_expand_animated.xml +++ /dev/null @@ -1,36 +0,0 @@ - - - - - - - - - - - - - \ No newline at end of file diff --git a/News-Android-App/src/main/res/drawable/ic_fa_main_bg.xml b/News-Android-App/src/main/res/drawable/ic_fa_main_bg.xml deleted file mode 100644 index 3f162317f..000000000 --- a/News-Android-App/src/main/res/drawable/ic_fa_main_bg.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/News-Android-App/src/main/res/drawable/ic_fa_shrink.xml b/News-Android-App/src/main/res/drawable/ic_fa_shrink.xml deleted file mode 100644 index 3c68bc581..000000000 --- a/News-Android-App/src/main/res/drawable/ic_fa_shrink.xml +++ /dev/null @@ -1,37 +0,0 @@ - - - - - - - - - - - - - - diff --git a/News-Android-App/src/main/res/drawable/ic_forward_30_24.xml b/News-Android-App/src/main/res/drawable/ic_forward_30_24.xml new file mode 100644 index 000000000..f2f3216be --- /dev/null +++ b/News-Android-App/src/main/res/drawable/ic_forward_30_24.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/News-Android-App/src/main/res/drawable/ic_replay_10_24.xml b/News-Android-App/src/main/res/drawable/ic_replay_10_24.xml new file mode 100644 index 000000000..fad085f6f --- /dev/null +++ b/News-Android-App/src/main/res/drawable/ic_replay_10_24.xml @@ -0,0 +1,7 @@ + + + + + diff --git a/News-Android-App/src/main/res/drawable-mdpi/ic_search_white_24dp.xml b/News-Android-App/src/main/res/drawable/ic_search_24dp_theme_aware.xml similarity index 77% rename from News-Android-App/src/main/res/drawable-mdpi/ic_search_white_24dp.xml rename to News-Android-App/src/main/res/drawable/ic_search_24dp_theme_aware.xml index cf5212dba..083d63644 100644 --- a/News-Android-App/src/main/res/drawable-mdpi/ic_search_white_24dp.xml +++ b/News-Android-App/src/main/res/drawable/ic_search_24dp_theme_aware.xml @@ -2,8 +2,9 @@ android:width="24dp" android:height="24dp" android:viewportWidth="24.0" - android:viewportHeight="24.0"> + android:viewportHeight="24.0" + android:tint="?attr/colorControlNormal"> diff --git a/News-Android-App/src/main/res/drawable/ic_share_white.xml b/News-Android-App/src/main/res/drawable/ic_share_theme_aware.xml similarity index 68% rename from News-Android-App/src/main/res/drawable/ic_share_white.xml rename to News-Android-App/src/main/res/drawable/ic_share_theme_aware.xml index e138a9afd..3fb36c971 100644 --- a/News-Android-App/src/main/res/drawable/ic_share_white.xml +++ b/News-Android-App/src/main/res/drawable/ic_share_theme_aware.xml @@ -1,5 +1,9 @@ - + diff --git a/News-Android-App/src/main/res/drawable/ic_slow_motion_video_24.xml b/News-Android-App/src/main/res/drawable/ic_slow_motion_video_24.xml new file mode 100644 index 000000000..b942510db --- /dev/null +++ b/News-Android-App/src/main/res/drawable/ic_slow_motion_video_24.xml @@ -0,0 +1,5 @@ + + + diff --git a/News-Android-App/src/main/res/drawable/ic_star_24_theme_aware.xml b/News-Android-App/src/main/res/drawable/ic_star_24_theme_aware.xml new file mode 100644 index 000000000..b1fc198bf --- /dev/null +++ b/News-Android-App/src/main/res/drawable/ic_star_24_theme_aware.xml @@ -0,0 +1,9 @@ + + + diff --git a/News-Android-App/src/main/res/drawable/ic_star_border_black_24dp.xml b/News-Android-App/src/main/res/drawable/ic_star_border_24dp_theme_aware.xml similarity index 70% rename from News-Android-App/src/main/res/drawable/ic_star_border_black_24dp.xml rename to News-Android-App/src/main/res/drawable/ic_star_border_24dp_theme_aware.xml index b36536b99..7213f4421 100644 --- a/News-Android-App/src/main/res/drawable/ic_star_border_black_24dp.xml +++ b/News-Android-App/src/main/res/drawable/ic_star_border_24dp_theme_aware.xml @@ -1,9 +1,10 @@ + android:viewportWidth="24" + android:viewportHeight="24" + android:tint="?attr/colorControlNormal"> diff --git a/News-Android-App/src/main/res/drawable/ic_star_white_24.xml b/News-Android-App/src/main/res/drawable/ic_star_white_24.xml new file mode 100644 index 000000000..954e7723b --- /dev/null +++ b/News-Android-App/src/main/res/drawable/ic_star_white_24.xml @@ -0,0 +1,5 @@ + + + diff --git a/News-Android-App/src/main/res/drawable/ic_visibility_24.xml b/News-Android-App/src/main/res/drawable/ic_visibility_24.xml new file mode 100644 index 000000000..ef5078900 --- /dev/null +++ b/News-Android-App/src/main/res/drawable/ic_visibility_24.xml @@ -0,0 +1,9 @@ + + + diff --git a/News-Android-App/src/main/res/drawable/incognito.xml b/News-Android-App/src/main/res/drawable/incognito.xml index 423fea291..cfcc7feb5 100755 --- a/News-Android-App/src/main/res/drawable/incognito.xml +++ b/News-Android-App/src/main/res/drawable/incognito.xml @@ -3,6 +3,7 @@ android:height="24dp" android:width="24dp" android:viewportWidth="24" - android:viewportHeight="24"> - + android:viewportHeight="24" + android:tint="?attr/colorControlNormal"> + \ No newline at end of file diff --git a/News-Android-App/src/main/res/drawable/navigationview_bg.xml b/News-Android-App/src/main/res/drawable/navigationview_bg.xml deleted file mode 100644 index b751c946c..000000000 --- a/News-Android-App/src/main/res/drawable/navigationview_bg.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/News-Android-App/src/main/res/drawable/splash_screen.xml b/News-Android-App/src/main/res/drawable/splash_screen.xml deleted file mode 100644 index 2a16682cb..000000000 --- a/News-Android-App/src/main/res/drawable/splash_screen.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - - - - - \ No newline at end of file diff --git a/News-Android-App/src/main/res/drawable/swipe_markasread.xml b/News-Android-App/src/main/res/drawable/swipe_markasread.xml index 616e094fd..6efdcd082 100644 --- a/News-Android-App/src/main/res/drawable/swipe_markasread.xml +++ b/News-Android-App/src/main/res/drawable/swipe_markasread.xml @@ -6,7 +6,10 @@ - - + \ No newline at end of file diff --git a/News-Android-App/src/main/res/drawable/swipe_markasread_light.xml b/News-Android-App/src/main/res/drawable/swipe_markasread_light.xml deleted file mode 100644 index 6294be56d..000000000 --- a/News-Android-App/src/main/res/drawable/swipe_markasread_light.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - \ No newline at end of file diff --git a/News-Android-App/src/main/res/drawable/swipe_openinbrowser.xml b/News-Android-App/src/main/res/drawable/swipe_openinbrowser.xml index 5fa6456f1..76fcb2e72 100644 --- a/News-Android-App/src/main/res/drawable/swipe_openinbrowser.xml +++ b/News-Android-App/src/main/res/drawable/swipe_openinbrowser.xml @@ -3,10 +3,13 @@ - + - - + \ No newline at end of file diff --git a/News-Android-App/src/main/res/drawable/swipe_setstarred.xml b/News-Android-App/src/main/res/drawable/swipe_setstarred.xml index 5f6a16b4e..482b5c376 100644 --- a/News-Android-App/src/main/res/drawable/swipe_setstarred.xml +++ b/News-Android-App/src/main/res/drawable/swipe_setstarred.xml @@ -6,7 +6,10 @@ - - + diff --git a/News-Android-App/src/main/res/drawable/swipe_setstarred_light.xml b/News-Android-App/src/main/res/drawable/swipe_setstarred_light.xml deleted file mode 100644 index 248c86b48..000000000 --- a/News-Android-App/src/main/res/drawable/swipe_setstarred_light.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - - - - - - - diff --git a/News-Android-App/src/main/res/layout/activity_login_dialog.xml b/News-Android-App/src/main/res/layout/activity_login_dialog.xml index c5d879945..798d8d9cc 100644 --- a/News-Android-App/src/main/res/layout/activity_login_dialog.xml +++ b/News-Android-App/src/main/res/layout/activity_login_dialog.xml @@ -5,7 +5,6 @@ android:layout_height="match_parent" android:background="@color/nextcloudBlue"> - + app:counterOverflowTextColor="@android:color/white"> + android:textAlignment="viewStart" /> + app:counterOverflowTextColor="@android:color/white" + app:endIconDrawable="@drawable/ic_visibility_24" + app:endIconMode="custom" + app:endIconTint="#fff"> + android:textAlignment="viewStart" /> + app:counterOverflowTextColor="@android:color/white"> - - + app:cornerRadius="24dp" /> diff --git a/News-Android-App/src/main/res/layout/activity_new_feed.xml b/News-Android-App/src/main/res/layout/activity_new_feed.xml index c1189475e..0f17d599d 100644 --- a/News-Android-App/src/main/res/layout/activity_new_feed.xml +++ b/News-Android-App/src/main/res/layout/activity_new_feed.xml @@ -37,16 +37,20 @@ android:layout_height="wrap_content" android:orientation="vertical"> - + android:hint="@string/hint_feed_url"> + + + android:layout_width="match_parent"> @@ -84,8 +83,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_gravity="bottom" - android:theme="@style/ToolbarTheme" - app:popupTheme="@style/ToolbarOptionMenuBackgroundTheme"> + android:theme="@style/ToolbarTheme"> --> diff --git a/News-Android-App/src/main/res/layout/empty_content_view.xml b/News-Android-App/src/main/res/layout/empty_content_view.xml index 1206c02db..6f83bedb7 100644 --- a/News-Android-App/src/main/res/layout/empty_content_view.xml +++ b/News-Android-App/src/main/res/layout/empty_content_view.xml @@ -7,7 +7,6 @@ android:orientation="vertical" android:padding="@dimen/spacer_2x" android:visibility="gone" - tools:background="?attr/colorPrimary" tools:visibility="visible"> + app:tint="?attr/colorSecondaryContainer" /> - - + android:hint="@string/hint_folder_name"> + + - + + + - - - diff --git a/News-Android-App/src/main/res/layout/fragment_dialog_folderoptions.xml b/News-Android-App/src/main/res/layout/fragment_dialog_folderoptions.xml index 6f3bf9667..400221e2d 100644 --- a/News-Android-App/src/main/res/layout/fragment_dialog_folderoptions.xml +++ b/News-Android-App/src/main/res/layout/fragment_dialog_folderoptions.xml @@ -89,7 +89,7 @@ - + + + \ No newline at end of file diff --git a/News-Android-App/src/main/res/layout/fragment_newsreader_detail.xml b/News-Android-App/src/main/res/layout/fragment_newsreader_detail.xml index e77b9cde0..43cd060d7 100644 --- a/News-Android-App/src/main/res/layout/fragment_newsreader_detail.xml +++ b/News-Android-App/src/main/res/layout/fragment_newsreader_detail.xml @@ -48,9 +48,7 @@ android:visibility="visible" android:translationX="-16dp" android:translationY="-16dp" - app:tint="@android:color/white" app:fabSize="normal" - app:backgroundTint="@color/nextcloudBlue" app:srcCompat="@drawable/ic_done_all" /> diff --git a/News-Android-App/src/main/res/layout/fragment_newsreader_list.xml b/News-Android-App/src/main/res/layout/fragment_newsreader_list.xml index 7ffff3f69..cf4a3ec19 100644 --- a/News-Android-App/src/main/res/layout/fragment_newsreader_list.xml +++ b/News-Android-App/src/main/res/layout/fragment_newsreader_list.xml @@ -2,7 +2,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/app_drawer_feed_list_background_color"> + android:background="?attr/colorSurface"> \ No newline at end of file diff --git a/News-Android-App/src/main/res/layout/fragment_podcast.xml b/News-Android-App/src/main/res/layout/fragment_podcast.xml index e69f26f69..c20aa6182 100644 --- a/News-Android-App/src/main/res/layout/fragment_podcast.xml +++ b/News-Android-App/src/main/res/layout/fragment_podcast.xml @@ -24,7 +24,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="horizontal" - android:background="@color/slide_up_panel_background_color"> + android:background="?attr/colorSecondaryContainer"> @@ -106,7 +105,7 @@ android:focusable="false" android:layout_gravity="center_vertical" app:srcCompat="@drawable/ic_baseline_play_arrow_24" - app:tint="@color/tintColor" + app:tint="?attr/colorOnSecondaryContainer" android:background="?attr/selectableItemBackgroundBorderless" android:scaleType="fitXY" android:contentDescription="@string/content_desc_none"/> @@ -120,7 +119,7 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" - android:background="@color/slide_up_panel_background_color"> + android:background="?attr/colorSecondaryContainer"> @@ -255,7 +252,7 @@ android:layout_height="@dimen/podcast_media_control_height" android:paddingStart="@dimen/podcast_horizontal_margin" android:paddingEnd="@dimen/podcast_horizontal_margin" - android:background="@color/slide_up_panel_background_color" + android:background="?attr/colorSecondaryContainer" android:orientation="vertical" android:layoutDirection="ltr"> @@ -287,14 +284,11 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:progress="0" - android:progressTint="@color/colorAccent" - android:thumbTint="@color/colorAccent" android:max="100" /> @@ -353,8 +347,8 @@ android:layout_width="40dp" android:layout_height="40dp" android:layout_gravity="center" - android:src="@drawable/ic_action_forward_30" - app:tint="@color/tintColor" + android:src="@drawable/ic_forward_30_24" + app:tint="?attr/colorOnSecondaryContainer" android:background="?attr/selectableItemBackgroundBorderless" android:scaleType="fitXY" android:contentDescription="@string/content_desc_forward"/> @@ -364,8 +358,8 @@ android:layout_width="40dp" android:layout_height="40dp" android:layout_gravity="center" - android:src="@drawable/ic_slow_motion_video" - app:tint="@color/tintColor" + android:src="@drawable/ic_slow_motion_video_24" + app:tint="?attr/colorOnSecondaryContainer" android:background="?attr/selectableItemBackgroundBorderless" android:scaleType="fitXY" android:layout_marginStart="36dp" diff --git a/News-Android-App/src/main/res/layout/podcast_row.xml b/News-Android-App/src/main/res/layout/podcast_row.xml index e576110eb..7e8e26c77 100644 --- a/News-Android-App/src/main/res/layout/podcast_row.xml +++ b/News-Android-App/src/main/res/layout/podcast_row.xml @@ -82,7 +82,7 @@ android:clickable="false" android:focusable="false" android:layout_gravity="center" - android:background="@drawable/ic_action_delete" + android:background="@drawable/ic_action_delete_24" android:contentDescription="@string/content_desc_delete"/> @@ -102,7 +102,7 @@ android:clickable="false" android:focusable="false" android:layout_gravity="center" - android:background="@drawable/ic_action_file_download" + android:background="@drawable/ic_action_download_24" android:contentDescription="@string/content_desc_download"/> diff --git a/News-Android-App/src/main/res/layout/subscription_detail_list_item_card_view.xml b/News-Android-App/src/main/res/layout/subscription_detail_list_item_card_view.xml index 858bd827b..e71f188dc 100644 --- a/News-Android-App/src/main/res/layout/subscription_detail_list_item_card_view.xml +++ b/News-Android-App/src/main/res/layout/subscription_detail_list_item_card_view.xml @@ -122,7 +122,7 @@ android:paddingBottom="20dp" android:paddingStart="8dp" android:layout_gravity="center_vertical" - android:src="@drawable/ic_action_star_light" + android:src="@drawable/ic_star_black_24dp" app:tint="?attr/starredColor" android:layout_alignParentEnd="true" android:paddingEnd="@dimen/listview_row_margin_left" diff --git a/News-Android-App/src/main/res/layout/subscription_detail_list_item_headline.xml b/News-Android-App/src/main/res/layout/subscription_detail_list_item_headline.xml index e15301ddd..cdeb746bf 100644 --- a/News-Android-App/src/main/res/layout/subscription_detail_list_item_headline.xml +++ b/News-Android-App/src/main/res/layout/subscription_detail_list_item_headline.xml @@ -90,7 +90,7 @@ android:paddingStart="8dp" android:paddingEnd="@dimen/listview_row_margin_right" android:layout_gravity="center_vertical" - android:src="@drawable/ic_action_star_dark" + android:src="@drawable/ic_star_white_24" app:tint="?attr/starredColor" android:layout_alignParentEnd="true" android:contentDescription="@string/content_desc_add_to_favorites"/> diff --git a/News-Android-App/src/main/res/layout/subscription_detail_list_item_headline_thumbnail.xml b/News-Android-App/src/main/res/layout/subscription_detail_list_item_headline_thumbnail.xml index 352903c27..9d3d4415c 100644 --- a/News-Android-App/src/main/res/layout/subscription_detail_list_item_headline_thumbnail.xml +++ b/News-Android-App/src/main/res/layout/subscription_detail_list_item_headline_thumbnail.xml @@ -57,7 +57,7 @@ android:layout_marginStart="8dp" android:layout_marginTop="8dp" android:contentDescription="@string/content_desc_add_to_favorites" - android:src="@drawable/ic_action_star_dark" + android:src="@drawable/ic_star_white_24" app:layout_constraintStart_toEndOf="@id/imgViewFavIcon" app:layout_constraintTop_toBottomOf="@id/summary" app:tint="?attr/starredColor" /> diff --git a/News-Android-App/src/main/res/layout/subscription_detail_list_item_podcast_wrapper.xml b/News-Android-App/src/main/res/layout/subscription_detail_list_item_podcast_wrapper.xml index d377343c3..9a19abf06 100644 --- a/News-Android-App/src/main/res/layout/subscription_detail_list_item_podcast_wrapper.xml +++ b/News-Android-App/src/main/res/layout/subscription_detail_list_item_podcast_wrapper.xml @@ -14,9 +14,9 @@ android:layout_width="40dp" android:layout_height="40dp" android:layout_gravity="center" - app:tint="?attr/tintColor" + app:tint="?attr/colorOnSecondaryContainer" android:contentDescription="@string/content_desc_pause" - android:src="@drawable/ic_action_pause" /> + android:src="@drawable/ic_action_pause_24" /> + android:layout_weight="1" /> + android:layout_height="match_parent"> + android:background="@android:color/transparent" + android:src="@drawable/ic_star_border_24dp_theme_aware" + android:tint="?attr/colorControlActivated"/> + android:background="@android:color/transparent" + android:src="@drawable/ic_checkbox_outline_theme_aware" + android:tint="?attr/colorControlActivated"/> + #121212 + + + #1A1C1E + #FFB4AB + #93000A + #2F3033 + #00639A + #E2E2E5 + #E2E2E5 + #690005 + #FFB4AB + #003353 + #CEE5FF + #233240 + #D5E4F7 + #E2E2E5 + #C2C7CF + #382A49 + #EEDBFF + #8C9198 + #42474E + #96CCFF + #004A76 + #000000 + #B9C8DA + #3A4857 + #000000 + #1A1C1E + #42474E + #D3BFE6 + #4F4061 @android:color/white #292929 @color/options_menu_item_night - #666 - - - #ff343434 + #29486F - @color/material_grey_900 + #121212 @android:color/black #a0ffffff - @android:color/black - @android:color/white - @color/material_grey_900 - - @android:color/white - - @color/material_grey_800 + #121212 #dd000000 #d8d8d8 diff --git a/News-Android-App/src/main/res/values-v21/themes.xml b/News-Android-App/src/main/res/values-v21/themes.xml deleted file mode 100644 index 91ce1ccea..000000000 --- a/News-Android-App/src/main/res/values-v21/themes.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/News-Android-App/src/main/res/values-v23/themes.xml b/News-Android-App/src/main/res/values-v23/themes.xml index 9916287b7..5984427d3 100644 --- a/News-Android-App/src/main/res/values-v23/themes.xml +++ b/News-Android-App/src/main/res/values-v23/themes.xml @@ -1,22 +1,12 @@ - - \ No newline at end of file diff --git a/News-Android-App/src/main/res/values-v27/themes.xml b/News-Android-App/src/main/res/values-v27/themes.xml index 81cb7973e..66851c1ca 100644 --- a/News-Android-App/src/main/res/values-v27/themes.xml +++ b/News-Android-App/src/main/res/values-v27/themes.xml @@ -1,26 +1,14 @@ - - \ No newline at end of file diff --git a/News-Android-App/src/main/res/values/attrs.xml b/News-Android-App/src/main/res/values/attrs.xml index b9235c084..4f9a1ad5b 100644 --- a/News-Android-App/src/main/res/values/attrs.xml +++ b/News-Android-App/src/main/res/values/attrs.xml @@ -9,8 +9,6 @@ - - diff --git a/News-Android-App/src/main/res/values/colors.xml b/News-Android-App/src/main/res/values/colors.xml index abfa99e47..a6ea60351 100644 --- a/News-Android-App/src/main/res/values/colors.xml +++ b/News-Android-App/src/main/res/values/colors.xml @@ -1,28 +1,59 @@ - @color/colorPrimary + #0082C9 + + + @android:color/white + + + #FCFCFF + #BA1A1A + #FFDAD6 + #F0F0F4 + #96CCFF + #2F3033 + #1A1C1E + #FFFFFF + #410002 + #FFFFFF + #001D32 + #FFFFFF + #0E1D2A + #1A1C1E + #42474E + #FFFFFF + #231533 + #72777F + #C2C7CF + #00639A + #CEE5FF + #000000 + #51606F + #D5E4F7 + #000000 + #FCFCFF + #DEE3EB + #68587A + #EEDBFF + @android:color/black #292929 - - #e6e6e6 - @color/options_menu_item #a0000000 + @color/nextcloudBlue + - #eeeeee - #eeeeee + @color/bg_default + @color/bg_default - #35537A - #0082C9 @android:color/white - @android:color/black - @android:color/white + @color/bg_default @android:color/holo_orange_light @@ -30,15 +61,10 @@ @android:color/holo_green_light #aaa #aaa - #999 - - @android:color/black #00000000 - @color/material_grey_300 - #ddffffff #222222 @@ -52,6 +78,4 @@ #424242 #212121 - #e53935 - diff --git a/News-Android-App/src/main/res/values/styles.xml b/News-Android-App/src/main/res/values/styles.xml index a289deb33..9cc012d1e 100644 --- a/News-Android-App/src/main/res/values/styles.xml +++ b/News-Android-App/src/main/res/values/styles.xml @@ -56,11 +56,7 @@ --> - - - diff --git a/News-Android-App/src/main/res/values/themes.xml b/News-Android-App/src/main/res/values/themes.xml index 7b88e39e2..61dc0aaad 100644 --- a/News-Android-App/src/main/res/values/themes.xml +++ b/News-Android-App/src/main/res/values/themes.xml @@ -1,36 +1,38 @@ - - - - - - - - - - + - - @@ -105,15 +110,4 @@ 14sp - - - - - - - diff --git a/gradle.properties b/gradle.properties index 0ba8016b3..4c79ef027 100644 --- a/gradle.properties +++ b/gradle.properties @@ -18,8 +18,8 @@ # org.gradle.parallel=true ANDROID_BUILD_MIN_SDK_VERSION=21 -ANDROID_BUILD_TARGET_SDK_VERSION=33 -ANDROID_BUILD_SDK_VERSION=33 +ANDROID_BUILD_TARGET_SDK_VERSION=34 +ANDROID_BUILD_SDK_VERSION=34 android.useAndroidX=true android.enableJetifier=true org.gradle.jvmargs=-Xmx4096m