From 7a5abef16e95e238460ecd817aaf2e372e35502b Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Mon, 5 May 2025 14:11:32 +0300 Subject: replace unmaintained icepick with unmaintained Android-State :( --- org.fox.ttrss/src/main/java/org/fox/ttrss/Application.java | 7 +++---- org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java | 7 ++++--- org.fox.ttrss/src/main/java/org/fox/ttrss/ArticlePager.java | 2 +- org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java | 6 +++--- org.fox.ttrss/src/main/java/org/fox/ttrss/DetailActivity.java | 5 +++-- .../src/main/java/org/fox/ttrss/FeedCategoriesFragment.java | 2 +- org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java | 2 +- org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryActivity.java | 2 +- .../src/main/java/org/fox/ttrss/GalleryImageFragment.java | 2 +- .../src/main/java/org/fox/ttrss/GalleryVideoFragment.java | 2 +- org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java | 6 ++++-- org.fox.ttrss/src/main/java/org/fox/ttrss/LogcatActivity.java | 2 +- org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java | 2 +- .../src/main/java/org/fox/ttrss/YoutubePlayerActivity.java | 2 +- .../src/main/java/org/fox/ttrss/share/CommonShareActivity.java | 2 +- 15 files changed, 27 insertions(+), 24 deletions(-) (limited to 'org.fox.ttrss/src/main/java/org') diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/Application.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/Application.java index 94857855..a8c4ab00 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/Application.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/Application.java @@ -2,6 +2,7 @@ package org.fox.ttrss; import android.os.Bundle; +import com.evernote.android.state.StateSaver; import com.livefront.bridge.Bridge; import com.livefront.bridge.SavedStateHandler; @@ -13,8 +14,6 @@ import androidx.annotation.Nullable; import java.util.LinkedHashMap; -import icepick.Icepick; - public class Application extends android.app.Application { private static Application m_singleton; @@ -37,12 +36,12 @@ public class Application extends android.app.Application { Bridge.initialize(getApplicationContext(), new SavedStateHandler() { @Override public void saveInstanceState(@NonNull Object target, @NonNull Bundle state) { - Icepick.saveInstanceState(target, state); + StateSaver.saveInstanceState(target, state); } @Override public void restoreInstanceState(@NonNull Object target, @Nullable Bundle state) { - Icepick.restoreInstanceState(target, state); + StateSaver.restoreInstanceState(target, state); } }); diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java index 995e0074..0523c144 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java @@ -34,6 +34,8 @@ import android.widget.TextView; import androidx.core.text.HtmlCompat; +import com.evernote.android.state.State; + import org.fox.ttrss.types.Article; import org.fox.ttrss.types.Attachment; @@ -43,13 +45,12 @@ import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Date; -import icepick.State; - public class ArticleFragment extends StateSavedFragment { private final String TAG = this.getClass().getSimpleName(); private SharedPreferences m_prefs; - @State protected Article m_article; + @State + protected Article m_article; private DetailActivity m_activity; private WebView m_web; protected View m_customView; diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticlePager.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticlePager.java index 86feeaed..9f90df84 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticlePager.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticlePager.java @@ -28,7 +28,7 @@ import org.fox.ttrss.util.HeadlinesRequest; import java.util.HashMap; -import icepick.State; +import com.evernote.android.state.State; public class ArticlePager extends StateSavedFragment { diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java index 1933fe6a..13c4490a 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java @@ -47,6 +47,7 @@ import com.bumptech.glide.Glide; import com.bumptech.glide.load.engine.DiskCacheStrategy; import com.bumptech.glide.request.animation.GlideAnimation; import com.bumptech.glide.request.target.SimpleTarget; +import com.evernote.android.state.State; import com.google.android.material.snackbar.Snackbar; import com.livefront.bridge.Bridge; @@ -63,8 +64,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.List; -import icepick.State; - public class CommonActivity extends AppCompatActivity implements SharedPreferences.OnSharedPreferenceChangeListener { private final String TAG = this.getClass().getSimpleName(); @@ -91,7 +90,8 @@ public class CommonActivity extends AppCompatActivity implements SharedPreferenc //private SQLiteDatabase m_writableDb; private boolean m_smallScreenMode = true; - @State protected String m_theme; + @State + protected String m_theme; private boolean m_needRestart; private static String s_customTabPackageName; diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/DetailActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/DetailActivity.java index 97819411..8ef07abf 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/DetailActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/DetailActivity.java @@ -13,6 +13,7 @@ import android.util.Log; import android.view.MenuItem; import android.view.View; +import com.evernote.android.state.State; import com.google.android.material.floatingactionbutton.FloatingActionButton; import org.fox.ttrss.types.Article; @@ -21,11 +22,11 @@ import org.fox.ttrss.types.Feed; import androidx.appcompat.widget.Toolbar; import androidx.fragment.app.FragmentTransaction; -import icepick.State; public class DetailActivity extends OnlineActivity implements HeadlinesEventListener { private final String TAG = this.getClass().getSimpleName(); - @State protected ArticleList m_articles = new ArticleList(); + @State + protected ArticleList m_articles = new ArticleList(); protected SharedPreferences m_prefs; private Article m_activeArticle; diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java index 0feda5d9..3ef4fdd5 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java @@ -43,7 +43,7 @@ import java.util.List; import androidx.loader.app.LoaderManager; import androidx.loader.content.Loader; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import icepick.State; +import com.evernote.android.state.State; public class FeedCategoriesFragment extends BaseFeedlistFragment implements OnItemClickListener, OnSharedPreferenceChangeListener, LoaderManager.LoaderCallbacks { diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java index 60020086..5199d299 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java @@ -48,7 +48,7 @@ import java.util.List; import androidx.loader.app.LoaderManager; import androidx.loader.content.Loader; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import icepick.State; +import com.evernote.android.state.State; public class FeedsFragment extends BaseFeedlistFragment implements OnItemClickListener, OnSharedPreferenceChangeListener, LoaderManager.LoaderCallbacks { diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryActivity.java index 9645ad80..570a586c 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryActivity.java @@ -34,7 +34,7 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.ExecutionException; -import icepick.State; +import com.evernote.android.state.State; import me.relex.circleindicator.CircleIndicator; public class GalleryActivity extends CommonActivity { diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryImageFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryImageFragment.java index e058ca7b..44dbea12 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryImageFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryImageFragment.java @@ -19,7 +19,7 @@ import com.bumptech.glide.request.RequestListener; import com.bumptech.glide.request.target.GlideDrawableImageViewTarget; import com.bumptech.glide.request.target.Target; -import icepick.State; +import com.evernote.android.state.State; public class GalleryImageFragment extends GalleryBaseFragment { private final String TAG = this.getClass().getSimpleName(); diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryVideoFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryVideoFragment.java index c2f8841d..751975d3 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryVideoFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryVideoFragment.java @@ -19,7 +19,7 @@ import java.io.IOException; import androidx.core.app.ActivityCompat; import androidx.core.view.ViewCompat; -import icepick.State; +import com.evernote.android.state.State; public class GalleryVideoFragment extends GalleryBaseFragment { private final String TAG = this.getClass().getSimpleName(); diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java index fb43f7ca..f6990207 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java @@ -69,6 +69,7 @@ import com.bumptech.glide.load.resource.drawable.GlideDrawable; import com.bumptech.glide.request.RequestListener; import com.bumptech.glide.request.target.GlideDrawableImageViewTarget; import com.bumptech.glide.request.target.Target; +import com.evernote.android.state.State; import com.google.android.material.snackbar.Snackbar; import com.google.gson.JsonElement; @@ -91,7 +92,7 @@ import java.util.List; import java.util.TimeZone; import java.util.concurrent.TimeUnit; -import icepick.State; +import com.evernote.android.state.State; import jp.wasabeef.glide.transformations.CropCircleTransformation; public class HeadlinesFragment extends StateSavedFragment { @@ -105,7 +106,8 @@ public class HeadlinesFragment extends StateSavedFragment { private final String TAG = this.getClass().getSimpleName(); - @State Feed m_feed; + @State + Feed m_feed; @State Article m_activeArticle; @State String m_searchQuery = ""; private boolean m_refreshInProgress = false; diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/LogcatActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/LogcatActivity.java index c9cbcbf9..037e4d7c 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/LogcatActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/LogcatActivity.java @@ -14,7 +14,7 @@ import java.util.ArrayList; import androidx.appcompat.app.AppCompatDelegate; import androidx.appcompat.widget.Toolbar; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import icepick.State; +import com.evernote.android.state.State; public class LogcatActivity extends CommonActivity { private static final int MAX_LOG_ENTRIES = 500; diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java index 50a0e7f2..520fdded 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java @@ -34,7 +34,7 @@ import java.util.Date; import java.util.HashMap; import java.util.LinkedHashMap; -import icepick.State; +import com.evernote.android.state.State; public class MasterActivity extends OnlineActivity implements HeadlinesEventListener { private final String TAG = this.getClass().getSimpleName(); diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/YoutubePlayerActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/YoutubePlayerActivity.java index 81afbf0e..4147ab91 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/YoutubePlayerActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/YoutubePlayerActivity.java @@ -15,7 +15,7 @@ import com.google.android.youtube.player.YouTubePlayerSupportFragment; import androidx.appcompat.app.AppCompatDelegate; import androidx.appcompat.widget.Toolbar; -import icepick.State; +import com.evernote.android.state.State; public class YoutubePlayerActivity extends CommonActivity implements YouTubePlayer.OnInitializedListener { diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/share/CommonShareActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/share/CommonShareActivity.java index b6a989b1..a1044988 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/share/CommonShareActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/share/CommonShareActivity.java @@ -16,7 +16,7 @@ import org.fox.ttrss.PreferencesActivity; import org.fox.ttrss.R; import org.fox.ttrss.util.SimpleLoginManager; -import icepick.State; +import com.evernote.android.state.State; public abstract class CommonShareActivity extends CommonActivity { -- cgit v1.2.3-54-g00ecf From 504427a0463044353e1690c897db2a90892df6c6 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Mon, 5 May 2025 14:38:53 +0300 Subject: drop youtube & dashclock jar files and everything related to them --- org.fox.ttrss/build.gradle | 2 - org.fox.ttrss/libs/YouTubeAndroidPlayerApi.jar | Bin 106412 -> 0 bytes org.fox.ttrss/libs/dashclock-api-r1.1.jar | Bin 16279 -> 0 bytes org.fox.ttrss/src/main/AndroidManifest.xml | 6 - .../main/java/org/fox/ttrss/HeadlinesFragment.java | 24 +--- .../java/org/fox/ttrss/YoutubePlayerActivity.java | 144 --------------------- .../src/main/res/drawable-hdpi/dashclock.png | Bin 3054 -> 0 bytes .../src/main/res/drawable-xhdpi/dashclock.png | Bin 3482 -> 0 bytes .../main/res/layout/activity_youtube_player.xml | 29 ----- 9 files changed, 1 insertion(+), 204 deletions(-) delete mode 100644 org.fox.ttrss/libs/YouTubeAndroidPlayerApi.jar delete mode 100644 org.fox.ttrss/libs/dashclock-api-r1.1.jar delete mode 100755 org.fox.ttrss/src/main/java/org/fox/ttrss/YoutubePlayerActivity.java delete mode 100644 org.fox.ttrss/src/main/res/drawable-hdpi/dashclock.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xhdpi/dashclock.png delete mode 100644 org.fox.ttrss/src/main/res/layout/activity_youtube_player.xml (limited to 'org.fox.ttrss/src/main/java/org') diff --git a/org.fox.ttrss/build.gradle b/org.fox.ttrss/build.gradle index 2cad0765..387de61d 100755 --- a/org.fox.ttrss/build.gradle +++ b/org.fox.ttrss/build.gradle @@ -54,7 +54,6 @@ android { } dependencies { - implementation files('libs/dashclock-api-r1.1.jar') implementation 'com.squareup.okhttp3:okhttp:3.12.5' implementation('com.github.bumptech.glide:okhttp3-integration:1.5.0') { exclude group: 'glide-parent' @@ -79,6 +78,5 @@ dependencies { compileOnly 'com.evernote:android-state:1.4.1' annotationProcessor 'com.evernote:android-state:1.4.1' implementation 'com.github.livefront:bridge:v1.1.1' - implementation files('libs/YouTubeAndroidPlayerApi.jar') implementation 'com.github.javiersantos:AppUpdater:2.7' } diff --git a/org.fox.ttrss/libs/YouTubeAndroidPlayerApi.jar b/org.fox.ttrss/libs/YouTubeAndroidPlayerApi.jar deleted file mode 100644 index 1dc2b822..00000000 Binary files a/org.fox.ttrss/libs/YouTubeAndroidPlayerApi.jar and /dev/null differ diff --git a/org.fox.ttrss/libs/dashclock-api-r1.1.jar b/org.fox.ttrss/libs/dashclock-api-r1.1.jar deleted file mode 100644 index 3a4e00d0..00000000 Binary files a/org.fox.ttrss/libs/dashclock-api-r1.1.jar and /dev/null differ diff --git a/org.fox.ttrss/src/main/AndroidManifest.xml b/org.fox.ttrss/src/main/AndroidManifest.xml index c9217d86..b5da6cd3 100755 --- a/org.fox.ttrss/src/main/AndroidManifest.xml +++ b/org.fox.ttrss/src/main/AndroidManifest.xml @@ -250,12 +250,6 @@ android:label="Article Images" > - - - packages = m_activity.getPackageManager().getInstalledApplications(0); - for (ApplicationInfo pi : packages) { - if (pi.packageName.equals("com.google.android.youtube")) { - m_youtubeInstalled = true; - break; - } - } } @Override @@ -1609,20 +1600,7 @@ public class HeadlinesFragment extends StateSavedFragment { //Log.d(TAG, "openGalleryForType: " + article + " " + holder + " " + transitionView); if ("iframe".equals(article.flavorImage.tagName().toLowerCase())) { - - if (m_youtubeInstalled) { - Intent intent = new Intent(m_activity, YoutubePlayerActivity.class); - intent.putExtra("streamUri", article.flavorStreamUri); - intent.putExtra("vid", article.youtubeVid); - intent.putExtra("title", article.title); - - startActivity(intent); - m_activity.overridePendingTransition(R.anim.slide_in_right, R.anim.slide_out_left); - - } else { - m_activity.openUri(Uri.parse(article.flavorStreamUri)); - } - + m_activity.openUri(Uri.parse(article.flavorStreamUri)); } else { Intent intent = new Intent(m_activity, GalleryActivity.class); diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/YoutubePlayerActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/YoutubePlayerActivity.java deleted file mode 100755 index 4147ab91..00000000 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/YoutubePlayerActivity.java +++ /dev/null @@ -1,144 +0,0 @@ -package org.fox.ttrss; - -import android.content.res.Configuration; -import android.net.Uri; -import android.os.Bundle; -import android.util.Log; -import android.view.ContextMenu; -import android.view.Menu; -import android.view.MenuItem; -import android.view.View; - -import com.google.android.youtube.player.YouTubeInitializationResult; -import com.google.android.youtube.player.YouTubePlayer; -import com.google.android.youtube.player.YouTubePlayerSupportFragment; - -import androidx.appcompat.app.AppCompatDelegate; -import androidx.appcompat.widget.Toolbar; -import com.evernote.android.state.State; - - -public class YoutubePlayerActivity extends CommonActivity implements YouTubePlayer.OnInitializedListener { - - private final String TAG = this.getClass().getSimpleName(); - private static final String DEVELOPER_KEY = "AIzaSyD8BS4Uj21jg_gHZfP4v0VXrAWiwqd05nk"; - - @State protected String m_streamUri; - @State protected String m_videoId; - - @Override - public void onCreate(Bundle savedInstanceState) { - - getDelegate().setLocalNightMode(AppCompatDelegate.MODE_NIGHT_YES); - setTheme(R.style.AppTheme); - - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_youtube_player); - - Toolbar toolbar = findViewById(R.id.toolbar); - setSupportActionBar(toolbar); - - getSupportActionBar().setDisplayHomeAsUpEnabled(true); - - if (!isPortrait()) - getSupportActionBar().hide(); - - setTitle(getIntent().getStringExtra("title")); - - if (savedInstanceState == null) { - m_streamUri = getIntent().getStringExtra("streamUri"); - m_videoId = getIntent().getStringExtra("vid"); - } - - YouTubePlayerSupportFragment frag = (YouTubePlayerSupportFragment) getSupportFragmentManager().findFragmentById(R.id.fragment_youtube_player); - frag.initialize(DEVELOPER_KEY, this); - } - - public void onConfigurationChanged(Configuration newConfig) { - super.onConfigurationChanged(newConfig); - - if (!isPortrait()) - getSupportActionBar().hide(); - else - getSupportActionBar().show(); - } - - @Override - public boolean onCreateOptionsMenu(Menu menu) { - getMenuInflater().inflate(R.menu.activity_youtube_player, menu); - return true; - } - - - @Override - public void onCreateContextMenu(ContextMenu menu, View v, - ContextMenu.ContextMenuInfo menuInfo) { - - getMenuInflater().inflate(R.menu.activity_youtube_player, menu); - - super.onCreateContextMenu(menu, v, menuInfo); - } - - - @Override - public boolean onOptionsItemSelected(MenuItem item) { - return onContextItemSelected(item); // this is really bad :() - } - - @Override - public boolean onContextItemSelected(android.view.MenuItem item) { - switch (item.getItemId()) { - case android.R.id.home: - onBackPressed(); - return true; - case R.id.article_vid_open: - if (m_streamUri != null) { - try { - openUri(Uri.parse(m_streamUri)); - } catch (Exception e) { - e.printStackTrace(); - toast(R.string.error_other_error); - } - } - return true; - case R.id.article_vid_share: - if (m_streamUri != null) { - shareText(m_streamUri); - } - return true; - default: - Log.d(TAG, "onContextItemSelected, unhandled id=" + item.getItemId()); - return super.onContextItemSelected(item); - } - } - - @Override - public void onInitializationSuccess(YouTubePlayer.Provider provider, YouTubePlayer player, boolean wasRestored) { - Log.d(TAG, "youtube: init success"); - - findViewById(R.id.video_loading).setVisibility(View.GONE); - - if (!wasRestored) { - player.cueVideo(m_videoId); - } - } - - @Override - public void onInitializationFailure(YouTubePlayer.Provider provider, YouTubeInitializationResult result) { - Log.d(TAG, "youtube: init failure"); - - findViewById(R.id.video_loading).setVisibility(View.GONE); - - toast(result.toString()); - } - - @Override - public void onPause() { - super.onPause(); - - if (isFinishing()) { - overridePendingTransition(R.anim.slide_in_left, R.anim.slide_out_right); - } - - } -} diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/dashclock.png b/org.fox.ttrss/src/main/res/drawable-hdpi/dashclock.png deleted file mode 100644 index 99ffa932..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-hdpi/dashclock.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/dashclock.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/dashclock.png deleted file mode 100644 index 65ebe3c1..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xhdpi/dashclock.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/layout/activity_youtube_player.xml b/org.fox.ttrss/src/main/res/layout/activity_youtube_player.xml deleted file mode 100644 index 0b423edc..00000000 --- a/org.fox.ttrss/src/main/res/layout/activity_youtube_player.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - -- cgit v1.2.3-54-g00ecf From 312e29bcc722a559685c721efa1969d2a1b0fd1d Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Mon, 5 May 2025 15:04:05 +0300 Subject: replace switch statement with ifs because resource identifiers are not final in gradle 8 --- .../main/java/org/fox/ttrss/DetailActivity.java | 14 +- .../java/org/fox/ttrss/FeedCategoriesFragment.java | 84 ++- .../src/main/java/org/fox/ttrss/FeedsFragment.java | 136 +++-- .../main/java/org/fox/ttrss/GalleryActivity.java | 69 ++- .../main/java/org/fox/ttrss/HeadlinesFragment.java | 162 +++--- .../main/java/org/fox/ttrss/MasterActivity.java | 48 +- .../main/java/org/fox/ttrss/OnlineActivity.java | 646 ++++++++++----------- .../java/org/fox/ttrss/PreferencesActivity.java | 10 +- .../org/fox/ttrss/offline/OfflineActivity.java | 629 ++++++++++---------- .../org/fox/ttrss/share/CommonShareActivity.java | 22 +- 10 files changed, 899 insertions(+), 921 deletions(-) (limited to 'org.fox.ttrss/src/main/java/org') diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/DetailActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/DetailActivity.java index 8ef07abf..cd263d87 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/DetailActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/DetailActivity.java @@ -172,15 +172,13 @@ public class DetailActivity extends OnlineActivity implements HeadlinesEventList @Override public boolean onOptionsItemSelected(MenuItem item) { - switch (item.getItemId()) { - case android.R.id.home: + if (item.getItemId() == android.R.id.home) { onBackPressed(); - return true; - default: - Log.d(TAG, "onOptionsItemSelected, unhandled id=" + item.getItemId()); - return super.onOptionsItemSelected(item); - } - } + return true; + } + Log.d(TAG, "onOptionsItemSelected, unhandled id=" + item.getItemId()); + return super.onOptionsItemSelected(item); + } @Override public void onResume() { diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java index 3ef4fdd5..876b3894 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java @@ -216,50 +216,48 @@ public class FeedCategoriesFragment extends BaseFeedlistFragment implements OnIt public boolean onContextItemSelected(MenuItem item) { AdapterContextMenuInfo info = (AdapterContextMenuInfo) item .getMenuInfo(); - - switch (item.getItemId()) { - case R.id.browse_headlines: - if (true) { - FeedCategory cat = getCategoryAtPosition(info.position); - if (cat != null) { - m_activity.onCatSelected(cat, true); - //setSelectedCategory(cat); - } - } - return true; - case R.id.browse_feeds: - if (true) { - FeedCategory cat = getCategoryAtPosition(info.position); - if (cat != null) { - m_activity.onCatSelected(cat, false); - //cf.setSelectedCategory(cat); - } - } - return true; - case R.id.create_shortcut: - if (true) { - FeedCategory cat = getCategoryAtPosition(info.position); - if (cat != null) { - m_activity.createCategoryShortcut(cat); - //cf.setSelectedCategory(cat); - } - } - return true; - case R.id.catchup_category: - if (true) { - final FeedCategory cat = getCategoryAtPosition(info.position); - if (cat != null) { - m_activity.catchupDialog(new Feed(cat.id, cat.title, true)); - } - } - return true; - - default: - Log.d(TAG, "onContextItemSelected, unhandled id=" + item.getItemId()); - return super.onContextItemSelected(item); - } - } + int itemId = item.getItemId(); + if (itemId == R.id.browse_headlines) { + if (true) { + FeedCategory cat = getCategoryAtPosition(info.position); + if (cat != null) { + m_activity.onCatSelected(cat, true); + //setSelectedCategory(cat); + } + } + return true; + } else if (itemId == R.id.browse_feeds) { + if (true) { + FeedCategory cat = getCategoryAtPosition(info.position); + if (cat != null) { + m_activity.onCatSelected(cat, false); + //cf.setSelectedCategory(cat); + } + } + return true; + } else if (itemId == R.id.create_shortcut) { + if (true) { + FeedCategory cat = getCategoryAtPosition(info.position); + if (cat != null) { + m_activity.createCategoryShortcut(cat); + //cf.setSelectedCategory(cat); + } + } + return true; + } else if (itemId == R.id.catchup_category) { + if (true) { + final FeedCategory cat = getCategoryAtPosition(info.position); + + if (cat != null) { + m_activity.catchupDialog(new Feed(cat.id, cat.title, true)); + } + } + return true; + } + Log.d(TAG, "onContextItemSelected, unhandled id=" + item.getItemId()); + return super.onContextItemSelected(item); + } @Override public void onCreateContextMenu(ContextMenu menu, View v, diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java index 5199d299..c415eee9 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java @@ -237,75 +237,73 @@ public class FeedsFragment extends BaseFeedlistFragment implements OnItemClickLi public boolean onContextItemSelected(MenuItem item) { AdapterContextMenuInfo info = (AdapterContextMenuInfo) item .getMenuInfo(); - switch (item.getItemId()) { - case R.id.browse_headlines: - if (true) { - Feed feed = getFeedAtPosition(info.position); - if (feed != null) { - m_activity.onFeedSelected(feed); - } - } - return true; - case R.id.browse_feeds: - if (true) { - Feed feed = getFeedAtPosition(info.position); - if (feed != null) { - m_activity.onCatSelected(new FeedCategory(feed.id, feed.title, feed.unread), false); - } - } - return true; - case R.id.unsubscribe_feed: - if (true) { - final Feed feed = getFeedAtPosition(info.position); - - AlertDialog.Builder builder = new AlertDialog.Builder( - m_activity) - .setMessage(getString(R.string.unsubscribe_from_prompt, feed.title)) - .setPositiveButton(R.string.unsubscribe, - new Dialog.OnClickListener() { - public void onClick(DialogInterface dialog, - int which) { - - m_activity.unsubscribeFeed(feed); - - } - }) - .setNegativeButton(R.string.dialog_cancel, - new Dialog.OnClickListener() { - public void onClick(DialogInterface dialog, - int which) { - - } - }); - - AlertDialog dlg = builder.create(); - dlg.show(); - } - - return true; - case R.id.create_shortcut: - if (true) { - Feed feed = getFeedAtPosition(info.position); - if (feed != null) { - m_activity.createFeedShortcut(feed); - } - } - return true; - case R.id.catchup_feed: - if (true) { - Feed feed = getFeedAtPosition(info.position); - - if (feed != null) { - m_activity.catchupDialog(feed); - } - } - return true; - - default: - Log.d(TAG, "onContextItemSelected, unhandled id=" + item.getItemId()); - return super.onContextItemSelected(item); - } - } + int itemId = item.getItemId(); + if (itemId == R.id.browse_headlines) { + if (true) { + Feed feed = getFeedAtPosition(info.position); + if (feed != null) { + m_activity.onFeedSelected(feed); + } + } + return true; + } else if (itemId == R.id.browse_feeds) { + if (true) { + Feed feed = getFeedAtPosition(info.position); + if (feed != null) { + m_activity.onCatSelected(new FeedCategory(feed.id, feed.title, feed.unread), false); + } + } + return true; + } else if (itemId == R.id.unsubscribe_feed) { + if (true) { + final Feed feed = getFeedAtPosition(info.position); + + AlertDialog.Builder builder = new AlertDialog.Builder( + m_activity) + .setMessage(getString(R.string.unsubscribe_from_prompt, feed.title)) + .setPositiveButton(R.string.unsubscribe, + new Dialog.OnClickListener() { + public void onClick(DialogInterface dialog, + int which) { + + m_activity.unsubscribeFeed(feed); + + } + }) + .setNegativeButton(R.string.dialog_cancel, + new Dialog.OnClickListener() { + public void onClick(DialogInterface dialog, + int which) { + + } + }); + + AlertDialog dlg = builder.create(); + dlg.show(); + } + + return true; + } else if (itemId == R.id.create_shortcut) { + if (true) { + Feed feed = getFeedAtPosition(info.position); + if (feed != null) { + m_activity.createFeedShortcut(feed); + } + } + return true; + } else if (itemId == R.id.catchup_feed) { + if (true) { + Feed feed = getFeedAtPosition(info.position); + + if (feed != null) { + m_activity.catchupDialog(feed); + } + } + return true; + } + Log.d(TAG, "onContextItemSelected, unhandled id=" + item.getItemId()); + return super.onContextItemSelected(item); + } @Override public void onCreateContextMenu(ContextMenu menu, View v, diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryActivity.java index 570a586c..e0cb2cea 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryActivity.java @@ -361,44 +361,43 @@ public class GalleryActivity extends CommonActivity { public boolean onImageMenuItemSelected(MenuItem item, GalleryEntry entry) { String url = entry.url; - switch (item.getItemId()) { - case R.id.article_img_open: - if (url != null) { - try { - openUri(Uri.parse(url)); - } catch (Exception e) { - e.printStackTrace(); - toast(R.string.error_other_error); - } - } - return true; - case R.id.article_img_copy: - if (url != null) { - copyToClipboard(url); + int itemId = item.getItemId(); + if (itemId == R.id.article_img_open) { + if (url != null) { + try { + openUri(Uri.parse(url)); + } catch (Exception e) { + e.printStackTrace(); + toast(R.string.error_other_error); } - return true; - case R.id.article_img_share: - if (url != null) { - if (entry.type == GalleryEntry.GalleryEntryType.TYPE_IMAGE) { - Log.d(TAG, "image sharing image from URL=" + url); + } + return true; + } else if (itemId == R.id.article_img_copy) { + if (url != null) { + copyToClipboard(url); + } + return true; + } else if (itemId == R.id.article_img_share) { + if (url != null) { + if (entry.type == GalleryEntry.GalleryEntryType.TYPE_IMAGE) { + Log.d(TAG, "image sharing image from URL=" + url); - shareImageFromUri(url); - } - } - return true; - case R.id.article_img_share_url: - if (url != null) { - shareText(url); - } - return true; - case R.id.article_img_view_caption: - if (url != null) { - displayImageCaption(url, m_content); + shareImageFromUri(url); } - return true; - default: - Log.d(TAG, "onImageMenuItemSelected, unhandled id=" + item.getItemId()); - return false; + } + return true; + } else if (itemId == R.id.article_img_share_url) { + if (url != null) { + shareText(url); + } + return true; + } else if (itemId == R.id.article_img_view_caption) { + if (url != null) { + displayImageCaption(url, m_content); + } + return true; } + Log.d(TAG, "onImageMenuItemSelected, unhandled id=" + item.getItemId()); + return false; } } diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java index e1fa2b4c..d45ff934 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java @@ -161,68 +161,67 @@ public class HeadlinesFragment extends StateSavedFragment { if (article == null) return false; - switch (item.getItemId()) { - case R.id.set_labels: - m_activity.editArticleLabels(article); - return true; - case R.id.article_set_note: - m_activity.editArticleNote(article); - return true; - case R.id.headlines_article_unread: - article.unread = !article.unread; - m_activity.saveArticleUnread(article); - m_adapter.notifyItemChanged(position); - return true; - case R.id.headlines_article_link_copy: - m_activity.copyToClipboard(article.link); - return true; - case R.id.headlines_article_link_open: - m_activity.openUri(Uri.parse(article.link)); - - if (article.unread) { - article.unread = false; - m_activity.saveArticleUnread(article); - - m_adapter.notifyItemChanged(position); - } - return true; - case R.id.headlines_share_article: - m_activity.shareArticle(article); - return true; - case R.id.catchup_above: - if (true) { - - final Article fa = article; - - AlertDialog.Builder builder = new AlertDialog.Builder( - m_activity) - .setMessage(R.string.confirm_catchup_above) - .setPositiveButton(R.string.dialog_ok, - new Dialog.OnClickListener() { - public void onClick(DialogInterface dialog, - int which) { - - catchupAbove(fa); - - } - }) - .setNegativeButton(R.string.dialog_cancel, - new Dialog.OnClickListener() { - public void onClick(DialogInterface dialog, - int which) { - - } - }); - - AlertDialog dialog = builder.create(); - dialog.show(); - } - return true; - default: - Log.d(TAG, "onArticleMenuItemSelected, unhandled id=" + item.getItemId()); - return false; - } - } + int itemId = item.getItemId(); + if (itemId == R.id.set_labels) { + m_activity.editArticleLabels(article); + return true; + } else if (itemId == R.id.article_set_note) { + m_activity.editArticleNote(article); + return true; + } else if (itemId == R.id.headlines_article_unread) { + article.unread = !article.unread; + m_activity.saveArticleUnread(article); + m_adapter.notifyItemChanged(position); + return true; + } else if (itemId == R.id.headlines_article_link_copy) { + m_activity.copyToClipboard(article.link); + return true; + } else if (itemId == R.id.headlines_article_link_open) { + m_activity.openUri(Uri.parse(article.link)); + + if (article.unread) { + article.unread = false; + m_activity.saveArticleUnread(article); + + m_adapter.notifyItemChanged(position); + } + return true; + } else if (itemId == R.id.headlines_share_article) { + m_activity.shareArticle(article); + return true; + } else if (itemId == R.id.catchup_above) { + if (true) { + + final Article fa = article; + + AlertDialog.Builder builder = new AlertDialog.Builder( + m_activity) + .setMessage(R.string.confirm_catchup_above) + .setPositiveButton(R.string.dialog_ok, + new Dialog.OnClickListener() { + public void onClick(DialogInterface dialog, + int which) { + + catchupAbove(fa); + + } + }) + .setNegativeButton(R.string.dialog_cancel, + new Dialog.OnClickListener() { + public void onClick(DialogInterface dialog, + int which) { + + } + }); + + AlertDialog dialog = builder.create(); + dialog.show(); + } + return true; + } + Log.d(TAG, "onArticleMenuItemSelected, unhandled id=" + item.getItemId()); + return false; + } private void catchupAbove(Article article) { ArticleList articles = getAllArticles(); @@ -1217,26 +1216,25 @@ public class HeadlinesFragment extends StateSavedFragment { Uri mediaUri = Uri.parse(article.flavorStreamUri != null ? article.flavorStreamUri : article.flavorImageUri); - switch (item.getItemId()) { - case R.id.article_img_open: - m_activity.openUri(mediaUri); - return true; - case R.id.article_img_copy: - m_activity.copyToClipboard(mediaUri.toString()); - return true; - case R.id.article_img_share: - m_activity.shareImageFromUri(mediaUri.toString()); - return true; - case R.id.article_img_share_url: - m_activity.shareText(mediaUri.toString()); - return true; - case R.id.article_img_view_caption: - m_activity.displayImageCaption(article.flavorImageUri, article.content); - return true; - default: - return false; - } - } + int itemId = item.getItemId(); + if (itemId == R.id.article_img_open) { + m_activity.openUri(mediaUri); + return true; + } else if (itemId == R.id.article_img_copy) { + m_activity.copyToClipboard(mediaUri.toString()); + return true; + } else if (itemId == R.id.article_img_share) { + m_activity.shareImageFromUri(mediaUri.toString()); + return true; + } else if (itemId == R.id.article_img_share_url) { + m_activity.shareText(mediaUri.toString()); + return true; + } else if (itemId == R.id.article_img_view_caption) { + m_activity.displayImageCaption(article.flavorImageUri, article.content); + return true; + } + return false; + } }); popup.show(); diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java index 520fdded..7591774d 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java @@ -331,44 +331,43 @@ public class MasterActivity extends OnlineActivity implements HeadlinesEventList return true; } - switch (item.getItemId()) { - case R.id.headlines_toggle_sort_order: + if (item.getItemId() == R.id.headlines_toggle_sort_order) { LinkedHashMap sortModes = getSortModes(); - CharSequence[] sortTitles = sortModes.values().toArray(new CharSequence[0]); - final CharSequence[] sortNames = sortModes.keySet().toArray(new CharSequence[0]); + CharSequence[] sortTitles = sortModes.values().toArray(new CharSequence[0]); + final CharSequence[] sortNames = sortModes.keySet().toArray(new CharSequence[0]); - String currentMode = getSortMode(); + String currentMode = getSortMode(); - int i = 0; - int selectedIndex = 0; + int i = 0; + int selectedIndex = 0; - for (CharSequence tmp : sortNames) { - if (tmp.equals(currentMode)) { - selectedIndex = i; - break; - } + for (CharSequence tmp : sortNames) { + if (tmp.equals(currentMode)) { + selectedIndex = i; + break; + } - ++i; - } + ++i; + } AlertDialog.Builder builder = new AlertDialog.Builder(this) .setTitle(getString(R.string.headlines_sort_articles_title)) .setSingleChoiceItems( - sortTitles, + sortTitles, selectedIndex, new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { - try { + try { // Log.d(TAG, "sort selected index:" + which + ": " + sortNames[which]); - setSortMode((String)sortNames[which]); + setSortMode((String) sortNames[which]); - } catch (IndexOutOfBoundsException e) { - e.printStackTrace(); - } + } catch (IndexOutOfBoundsException e) { + e.printStackTrace(); + } dialog.cancel(); @@ -380,11 +379,10 @@ public class MasterActivity extends OnlineActivity implements HeadlinesEventList dialog.show(); return true; - default: - Log.d(TAG, "onOptionsItemSelected, unhandled id=" + item.getItemId()); - return super.onOptionsItemSelected(item); - } - } + } + Log.d(TAG, "onOptionsItemSelected, unhandled id=" + item.getItemId()); + return super.onOptionsItemSelected(item); + } @Override public void onBackPressed() { diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java index 2350187e..69fc8141 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java @@ -439,53 +439,52 @@ public class OnlineActivity extends CommonActivity { .getMenuInfo(); */ final ArticlePager ap = (ArticlePager)getSupportFragmentManager().findFragmentByTag(FRAG_ARTICLE); - - switch (item.getItemId()) { - case R.id.article_img_open: - if (getLastContentImageHitTestUrl() != null) { - try { - openUri(Uri.parse(getLastContentImageHitTestUrl())); - } catch (Exception e) { - e.printStackTrace(); - toast(R.string.error_other_error); - } - } - return true; - case R.id.article_img_copy: - if (getLastContentImageHitTestUrl() != null) { - copyToClipboard(getLastContentImageHitTestUrl()); - } - return true; - case R.id.article_img_share: - if (getLastContentImageHitTestUrl() != null) { - shareImageFromUri(getLastContentImageHitTestUrl()); - } - return true; - case R.id.article_img_share_url: - if (getLastContentImageHitTestUrl() != null) { - shareText(getLastContentImageHitTestUrl()); - } - return true; - case R.id.article_img_view_caption: - if (getLastContentImageHitTestUrl() != null) { - displayImageCaption(getLastContentImageHitTestUrl(), ap.getSelectedArticle().content); + + int itemId = item.getItemId(); + if (itemId == R.id.article_img_open) { + if (getLastContentImageHitTestUrl() != null) { + try { + openUri(Uri.parse(getLastContentImageHitTestUrl())); + } catch (Exception e) { + e.printStackTrace(); + toast(R.string.error_other_error); + } } return true; - case R.id.article_link_share: - if (ap != null && ap.getSelectedArticle() != null) { - shareArticle(ap.getSelectedArticle()); - } - return true; - case R.id.article_link_copy: - if (ap != null && ap.getSelectedArticle() != null) { - copyToClipboard(ap.getSelectedArticle().link); - } - return true; - default: - Log.d(TAG, "onContextItemSelected, unhandled id=" + item.getItemId()); - return super.onContextItemSelected(item); - } - } + } else if (itemId == R.id.article_img_copy) { + if (getLastContentImageHitTestUrl() != null) { + copyToClipboard(getLastContentImageHitTestUrl()); + } + return true; + } else if (itemId == R.id.article_img_share) { + if (getLastContentImageHitTestUrl() != null) { + shareImageFromUri(getLastContentImageHitTestUrl()); + } + return true; + } else if (itemId == R.id.article_img_share_url) { + if (getLastContentImageHitTestUrl() != null) { + shareText(getLastContentImageHitTestUrl()); + } + return true; + } else if (itemId == R.id.article_img_view_caption) { + if (getLastContentImageHitTestUrl() != null) { + displayImageCaption(getLastContentImageHitTestUrl(), ap.getSelectedArticle().content); + } + return true; + } else if (itemId == R.id.article_link_share) { + if (ap != null && ap.getSelectedArticle() != null) { + shareArticle(ap.getSelectedArticle()); + } + return true; + } else if (itemId == R.id.article_link_copy) { + if (ap != null && ap.getSelectedArticle() != null) { + copyToClipboard(ap.getSelectedArticle().link); + } + return true; + } + Log.d(TAG, "onContextItemSelected, unhandled id=" + item.getItemId()); + return super.onContextItemSelected(item); + } public void displayAttachments(Article article) { if (article != null && article.attachments != null && article.attachments.size() > 0) { @@ -543,11 +542,11 @@ public class OnlineActivity extends CommonActivity { final HeadlinesFragment hf = (HeadlinesFragment) getSupportFragmentManager().findFragmentByTag(FRAG_HEADLINES); final ArticlePager ap = (ArticlePager)getSupportFragmentManager().findFragmentByTag(FRAG_ARTICLE); - switch (item.getItemId()) { - case R.id.subscribe_to_feed: - Intent subscribe = new Intent(OnlineActivity.this, SubscribeActivity.class); - startActivityForResult(subscribe, 0); - return true; + int itemId = item.getItemId(); + if (itemId == R.id.subscribe_to_feed) { + Intent subscribe = new Intent(OnlineActivity.this, SubscribeActivity.class); + startActivityForResult(subscribe, 0); + return true; /*case R.id.toggle_attachments: if (true) { Article article = ap.getSelectedArticle(); @@ -560,230 +559,230 @@ public class OnlineActivity extends CommonActivity { /*case R.id.logout: logout(); return true;*/ - case R.id.login: - login(); - return true; + } else if (itemId == R.id.login) { + login(); + return true; /*case R.id.go_offline: switchOffline(); return true;*/ - case R.id.article_set_note: - if (ap != null && ap.getSelectedArticle() != null) { - editArticleNote(ap.getSelectedArticle()); - } - return true; - case R.id.preferences: - Intent intent = new Intent(OnlineActivity.this, - PreferencesActivity.class); - startActivityForResult(intent, 0); - return true; - case R.id.search: - if (hf != null) { - Dialog dialog = new Dialog(this); + } else if (itemId == R.id.article_set_note) { + if (ap != null && ap.getSelectedArticle() != null) { + editArticleNote(ap.getSelectedArticle()); + } + return true; + } else if (itemId == R.id.preferences) { + Intent intent = new Intent(OnlineActivity.this, + PreferencesActivity.class); + startActivityForResult(intent, 0); + return true; + } else if (itemId == R.id.search) { + if (hf != null) { + Dialog dialog = new Dialog(this); - final EditText edit = new EditText(this); + final EditText edit = new EditText(this); - AlertDialog.Builder builder = new AlertDialog.Builder(this) - .setTitle(R.string.search) - .setPositiveButton(getString(R.string.search), - new OnClickListener() { + AlertDialog.Builder builder = new AlertDialog.Builder(this) + .setTitle(R.string.search) + .setPositiveButton(getString(R.string.search), + new OnClickListener() { - @Override - public void onClick(DialogInterface dialog, - int which) { - - String query = edit.getText().toString().trim(); - - hf.setSearchQuery(query); + @Override + public void onClick(DialogInterface dialog, + int which) { - } - }) - .setNegativeButton(getString(R.string.cancel), - new OnClickListener() { + String query = edit.getText().toString().trim(); - @Override - public void onClick(DialogInterface dialog, - int which) { - - // + hf.setSearchQuery(query); - } - }).setView(edit); - - dialog = builder.create(); - dialog.show(); - } - return true; - case R.id.headlines_mark_as_read: - if (hf != null) { + } + }) + .setNegativeButton(getString(R.string.cancel), + new OnClickListener() { - Feed feed = hf.getFeed(); + @Override + public void onClick(DialogInterface dialog, + int which) { - if (feed != null) { - catchupDialog(hf.getFeed()); - } - } - return true; - case R.id.headlines_display_mode: - if (hf != null) { - Dialog dialog = new Dialog(this); + // - String headlineMode = m_prefs.getString("headline_mode", "HL_DEFAULT"); - String[] headlineModeNames = getResources().getStringArray(R.array.headline_mode_names); - final String[] headlineModeValues = getResources().getStringArray(R.array.headline_mode_values); + } + }).setView(edit); - int selectedIndex = Arrays.asList(headlineModeValues).indexOf(headlineMode); + dialog = builder.create(); + dialog.show(); + } + return true; + } else if (itemId == R.id.headlines_mark_as_read) { + if (hf != null) { - AlertDialog.Builder builder = new AlertDialog.Builder(this) - .setTitle(R.string.headlines_set_view_mode) - .setSingleChoiceItems(headlineModeNames, - selectedIndex, new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, - int which) { - dialog.cancel(); + Feed feed = hf.getFeed(); - SharedPreferences.Editor editor = m_prefs.edit(); - editor.putString("headline_mode", headlineModeValues[which]); - editor.apply(); + if (feed != null) { + catchupDialog(hf.getFeed()); + } + } + return true; + } else if (itemId == R.id.headlines_display_mode) { + if (hf != null) { + Dialog dialog = new Dialog(this); - Intent intent = getIntent(); + String headlineMode = m_prefs.getString("headline_mode", "HL_DEFAULT"); + String[] headlineModeNames = getResources().getStringArray(R.array.headline_mode_names); + final String[] headlineModeValues = getResources().getStringArray(R.array.headline_mode_values); - Feed feed = hf.getFeed(); + int selectedIndex = Arrays.asList(headlineModeValues).indexOf(headlineMode); - if (feed != null) { - intent.putExtra("feed_id", feed.id); - intent.putExtra("feed_is_cat", feed.is_cat); - intent.putExtra("feed_title", feed.title); - } + AlertDialog.Builder builder = new AlertDialog.Builder(this) + .setTitle(R.string.headlines_set_view_mode) + .setSingleChoiceItems(headlineModeNames, + selectedIndex, new OnClickListener() { + @Override + public void onClick(DialogInterface dialog, + int which) { + dialog.cancel(); - finish(); + SharedPreferences.Editor editor = m_prefs.edit(); + editor.putString("headline_mode", headlineModeValues[which]); + editor.apply(); - startActivity(intent); - overridePendingTransition(0, 0); - } - }); + Intent intent = getIntent(); - dialog = builder.create(); - dialog.show(); + Feed feed = hf.getFeed(); - } - return true; - case R.id.headlines_view_mode: - if (hf != null) { - Dialog dialog = new Dialog(this); - - String viewMode = getViewMode(); - - //Log.d(TAG, "viewMode:" + getViewMode()); - - int selectedIndex = 0; - - if (viewMode.equals("all_articles")) { - selectedIndex = 1; - } else if (viewMode.equals("marked")) { - selectedIndex = 2; - } else if (viewMode.equals("published")) { - selectedIndex = 3; - } else if (viewMode.equals("unread")) { - selectedIndex = 4; - } - - AlertDialog.Builder builder = new AlertDialog.Builder(this) - .setTitle(R.string.headlines_set_view_mode) - .setSingleChoiceItems( - new String[] { - getString(R.string.headlines_adaptive), - getString(R.string.headlines_all_articles), - getString(R.string.headlines_starred), - getString(R.string.headlines_published), - getString(R.string.headlines_unread) }, - selectedIndex, new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, - int which) { - switch (which) { - case 0: - setViewMode("adaptive"); - break; - case 1: - setViewMode("all_articles"); - break; - case 2: - setViewMode("marked"); - break; - case 3: - setViewMode("published"); - break; - case 4: - setViewMode("unread"); - break; - } - dialog.cancel(); + if (feed != null) { + intent.putExtra("feed_id", feed.id); + intent.putExtra("feed_is_cat", feed.is_cat); + intent.putExtra("feed_title", feed.title); + } - refresh(); - } - }); + finish(); - dialog = builder.create(); - dialog.show(); + startActivity(intent); + overridePendingTransition(0, 0); + } + }); - } - return true; - case R.id.headlines_select: - if (hf != null) { - Dialog dialog = new Dialog(this); - AlertDialog.Builder builder = new AlertDialog.Builder(this) - .setTitle(R.string.headlines_select_dialog) - .setSingleChoiceItems( - new String[] { - getString(R.string.headlines_select_all), - getString(R.string.headlines_select_unread), - getString(R.string.headlines_select_none) }, - 0, new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, - int which) { - switch (which) { - case 0: - hf.setSelection(HeadlinesFragment.ArticlesSelection.ALL); - break; - case 1: - hf.setSelection(HeadlinesFragment.ArticlesSelection.UNREAD); - break; - case 2: - hf.setSelection(HeadlinesFragment.ArticlesSelection.NONE); - break; - } - dialog.cancel(); - invalidateOptionsMenu(); - } - }); + dialog = builder.create(); + dialog.show(); - dialog = builder.create(); - dialog.show(); - } - return true; + } + return true; + } else if (itemId == R.id.headlines_view_mode) { + if (hf != null) { + Dialog dialog = new Dialog(this); + + String viewMode = getViewMode(); + + //Log.d(TAG, "viewMode:" + getViewMode()); + + int selectedIndex = 0; + + if (viewMode.equals("all_articles")) { + selectedIndex = 1; + } else if (viewMode.equals("marked")) { + selectedIndex = 2; + } else if (viewMode.equals("published")) { + selectedIndex = 3; + } else if (viewMode.equals("unread")) { + selectedIndex = 4; + } + + AlertDialog.Builder builder = new AlertDialog.Builder(this) + .setTitle(R.string.headlines_set_view_mode) + .setSingleChoiceItems( + new String[]{ + getString(R.string.headlines_adaptive), + getString(R.string.headlines_all_articles), + getString(R.string.headlines_starred), + getString(R.string.headlines_published), + getString(R.string.headlines_unread)}, + selectedIndex, new OnClickListener() { + @Override + public void onClick(DialogInterface dialog, + int which) { + switch (which) { + case 0: + setViewMode("adaptive"); + break; + case 1: + setViewMode("all_articles"); + break; + case 2: + setViewMode("marked"); + break; + case 3: + setViewMode("published"); + break; + case 4: + setViewMode("unread"); + break; + } + dialog.cancel(); + + refresh(); + } + }); + + dialog = builder.create(); + dialog.show(); + + } + return true; + } else if (itemId == R.id.headlines_select) { + if (hf != null) { + Dialog dialog = new Dialog(this); + AlertDialog.Builder builder = new AlertDialog.Builder(this) + .setTitle(R.string.headlines_select_dialog) + .setSingleChoiceItems( + new String[]{ + getString(R.string.headlines_select_all), + getString(R.string.headlines_select_unread), + getString(R.string.headlines_select_none)}, + 0, new OnClickListener() { + @Override + public void onClick(DialogInterface dialog, + int which) { + switch (which) { + case 0: + hf.setSelection(HeadlinesFragment.ArticlesSelection.ALL); + break; + case 1: + hf.setSelection(HeadlinesFragment.ArticlesSelection.UNREAD); + break; + case 2: + hf.setSelection(HeadlinesFragment.ArticlesSelection.NONE); + break; + } + dialog.cancel(); + invalidateOptionsMenu(); + } + }); + + dialog = builder.create(); + dialog.show(); + } + return true; /* case R.id.share_article: if (ap != null) { shareArticle(ap.getSelectedArticle()); } return true; */ - case R.id.toggle_marked: - if (ap != null && ap.getSelectedArticle() != null) { - Article a = ap.getSelectedArticle(); - a.marked = !a.marked; - saveArticleMarked(a); - if (hf != null) hf.notifyUpdated(); - } - return true; - case R.id.toggle_unread: - if (ap != null && ap.getSelectedArticle() != null) { - Article a = ap.getSelectedArticle(); - a.unread = !a.unread; - saveArticleUnread(a); - if (hf != null) hf.notifyUpdated(); - } - return true; + } else if (itemId == R.id.toggle_marked) { + if (ap != null && ap.getSelectedArticle() != null) { + Article a = ap.getSelectedArticle(); + a.marked = !a.marked; + saveArticleMarked(a); + if (hf != null) hf.notifyUpdated(); + } + return true; + } else if (itemId == R.id.toggle_unread) { + if (ap != null && ap.getSelectedArticle() != null) { + Article a = ap.getSelectedArticle(); + a.unread = !a.unread; + saveArticleUnread(a); + if (hf != null) hf.notifyUpdated(); + } + return true; /* case R.id.selection_select_none: if (hf != null) { ArticleList selected = hf.getSelectedArticles(); @@ -794,105 +793,104 @@ public class OnlineActivity extends CommonActivity { } } return true; */ - case R.id.selection_toggle_unread: - if (hf != null) { - ArticleList selected = hf.getSelectedArticles(); + } else if (itemId == R.id.selection_toggle_unread) { + if (hf != null) { + ArticleList selected = hf.getSelectedArticles(); - if (selected.size() > 0) { - for (Article a : selected) - a.unread = !a.unread; + if (selected.size() > 0) { + for (Article a : selected) + a.unread = !a.unread; - toggleArticlesUnread(selected); - hf.notifyUpdated(); - invalidateOptionsMenu(); - } - } - return true; - case R.id.selection_toggle_marked: - if (hf != null) { - ArticleList selected = hf.getSelectedArticles(); + toggleArticlesUnread(selected); + hf.notifyUpdated(); + invalidateOptionsMenu(); + } + } + return true; + } else if (itemId == R.id.selection_toggle_marked) { + if (hf != null) { + ArticleList selected = hf.getSelectedArticles(); - if (selected.size() > 0) { - for (Article a : selected) - a.marked = !a.marked; + if (selected.size() > 0) { + for (Article a : selected) + a.marked = !a.marked; - toggleArticlesMarked(selected); - hf.notifyUpdated(); - invalidateOptionsMenu(); - } - } - return true; - case R.id.selection_toggle_published: - if (hf != null) { - ArticleList selected = hf.getSelectedArticles(); + toggleArticlesMarked(selected); + hf.notifyUpdated(); + invalidateOptionsMenu(); + } + } + return true; + } else if (itemId == R.id.selection_toggle_published) { + if (hf != null) { + ArticleList selected = hf.getSelectedArticles(); - if (selected.size() > 0) { - for (Article a : selected) - a.published = !a.published; + if (selected.size() > 0) { + for (Article a : selected) + a.published = !a.published; - toggleArticlesPublished(selected); - hf.notifyUpdated(); - invalidateOptionsMenu(); - } - } - return true; - case R.id.toggle_published: - if (ap != null && ap.getSelectedArticle() != null) { - Article a = ap.getSelectedArticle(); - a.published = !a.published; - saveArticlePublished(a); - if (hf != null) hf.notifyUpdated(); - } - return true; - case R.id.catchup_above: - if (hf != null) { + toggleArticlesPublished(selected); + hf.notifyUpdated(); + invalidateOptionsMenu(); + } + } + return true; + } else if (itemId == R.id.toggle_published) { + if (ap != null && ap.getSelectedArticle() != null) { + Article a = ap.getSelectedArticle(); + a.published = !a.published; + saveArticlePublished(a); + if (hf != null) hf.notifyUpdated(); + } + return true; + } else if (itemId == R.id.catchup_above) { + if (hf != null) { - AlertDialog.Builder builder = new AlertDialog.Builder( - OnlineActivity.this) - .setMessage(R.string.confirm_catchup_above) - .setPositiveButton(R.string.dialog_ok, - new Dialog.OnClickListener() { - public void onClick(DialogInterface dialog, - int which) { + AlertDialog.Builder builder = new AlertDialog.Builder( + OnlineActivity.this) + .setMessage(R.string.confirm_catchup_above) + .setPositiveButton(R.string.dialog_ok, + new OnClickListener() { + public void onClick(DialogInterface dialog, + int which) { - catchupAbove(hf, ap); + catchupAbove(hf, ap); - } - }) - .setNegativeButton(R.string.dialog_cancel, - new Dialog.OnClickListener() { - public void onClick(DialogInterface dialog, - int which) { + } + }) + .setNegativeButton(R.string.dialog_cancel, + new OnClickListener() { + public void onClick(DialogInterface dialog, + int which) { - } - }); + } + }); - AlertDialog dialog = builder.create(); - dialog.show(); + AlertDialog dialog = builder.create(); + dialog.show(); - } - return true; - case R.id.set_labels: - if (ap != null && ap.getSelectedArticle() != null) { - if (getApiLevel() != 7) { - editArticleLabels(ap.getSelectedArticle()); - } else { - toast(R.string.server_function_not_available); - } - - } - return true; + } + return true; + } else if (itemId == R.id.set_labels) { + if (ap != null && ap.getSelectedArticle() != null) { + if (getApiLevel() != 7) { + editArticleLabels(ap.getSelectedArticle()); + } else { + toast(R.string.server_function_not_available); + } + + } + return true; /*case R.id.update_headlines: if (hf != null) { //m_pullToRefreshAttacher.setRefreshing(true); hf.refresh(false, true); } return true;*/ - default: - Log.d(TAG, "onOptionsItemSelected, unhandled id=" + item.getItemId()); - return super.onOptionsItemSelected(item); - } - } + } + Log.d(TAG, "onOptionsItemSelected, unhandled id=" + item.getItemId()); + return super.onOptionsItemSelected(item); + } private void catchupAbove(HeadlinesFragment hf, ArticlePager ap) { if (ap != null && ap.getSelectedArticle() != null) { diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/PreferencesActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/PreferencesActivity.java index af321a5a..2f8237bd 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/PreferencesActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/PreferencesActivity.java @@ -36,13 +36,11 @@ public class PreferencesActivity extends CommonActivity { @Override public boolean onOptionsItemSelected(MenuItem item) { - switch (item.getItemId()) { - case android.R.id.home: - onBackPressed(); - return true; - default: - return super.onOptionsItemSelected(item); + if (item.getItemId() == android.R.id.home) { + onBackPressed(); + return true; } + return super.onOptionsItemSelected(item); } } diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineActivity.java index 5b63356d..4c2e92a7 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineActivity.java @@ -100,54 +100,53 @@ public class OfflineActivity extends CommonActivity { .getMenuInfo(); */ final OfflineArticlePager ap = (OfflineArticlePager)getSupportFragmentManager().findFragmentByTag(FRAG_ARTICLE); - - switch (item.getItemId()) { - case R.id.article_img_open: - if (getLastContentImageHitTestUrl() != null) { - try { - openUri(Uri.parse(getLastContentImageHitTestUrl())); - } catch (Exception e) { - e.printStackTrace(); - toast(R.string.error_other_error); - } - } - return true; - case R.id.article_img_copy: - if (getLastContentImageHitTestUrl() != null) { - copyToClipboard(getLastContentImageHitTestUrl()); - } - return true; - case R.id.article_img_share: - if (getLastContentImageHitTestUrl() != null) { - shareImageFromUri(getLastContentImageHitTestUrl()); - } - return true; - case R.id.article_img_share_url: - if (getLastContentImageHitTestUrl() != null) { - shareText(getLastContentImageHitTestUrl()); - } - return true; - case R.id.article_img_view_caption: - if (getLastContentImageHitTestUrl() != null) { - String content = ""; - - Cursor article = getArticleById(ap.getSelectedArticleId()); - - if (article != null) { - content = article.getString(article.getColumnIndex("content")); - article.close(); - } + int itemId = item.getItemId(); + if (itemId == R.id.article_img_open) { + if (getLastContentImageHitTestUrl() != null) { + try { + openUri(Uri.parse(getLastContentImageHitTestUrl())); + } catch (Exception e) { + e.printStackTrace(); + toast(R.string.error_other_error); + } + } + return true; + } else if (itemId == R.id.article_img_copy) { + if (getLastContentImageHitTestUrl() != null) { + copyToClipboard(getLastContentImageHitTestUrl()); + } + return true; + } else if (itemId == R.id.article_img_share) { + if (getLastContentImageHitTestUrl() != null) { + shareImageFromUri(getLastContentImageHitTestUrl()); + } + return true; + } else if (itemId == R.id.article_img_share_url) { + if (getLastContentImageHitTestUrl() != null) { + shareText(getLastContentImageHitTestUrl()); + } + return true; + } else if (itemId == R.id.article_img_view_caption) { + if (getLastContentImageHitTestUrl() != null) { + + String content = ""; + + Cursor article = getArticleById(ap.getSelectedArticleId()); - displayImageCaption(getLastContentImageHitTestUrl(), content); + if (article != null) { + content = article.getString(article.getColumnIndex("content")); + article.close(); + } + + displayImageCaption(getLastContentImageHitTestUrl(), content); } return true; - default: - Log.d(TAG, "onContextItemSelected, unhandled id=" + item.getItemId()); - return super.onContextItemSelected(item); - } - - } + } + Log.d(TAG, "onContextItemSelected, unhandled id=" + item.getItemId()); + return super.onContextItemSelected(item); + + } @Override public void onCreate(Bundle savedInstanceState) { @@ -244,303 +243,299 @@ public class OfflineActivity extends CommonActivity { final OfflineArticlePager oap = (OfflineArticlePager) getSupportFragmentManager() .findFragmentByTag(FRAG_ARTICLE); - switch (item.getItemId()) { - /* case android.R.id.home: + int itemId = item.getItemId();/* case android.R.id.home: finish(); - return true; */ - /* case R.id.headlines_toggle_sidebar: + return true; *//* case R.id.headlines_toggle_sidebar: if (true && !isSmallScreen()) { SharedPreferences.Editor editor = m_prefs.edit(); editor.putBoolean("headlines_hide_sidebar", !m_prefs.getBoolean("headlines_hide_sidebar", false)); editor.commit(); - + if (ohf != null && ohf.isAdded()) { ohf.getView().setVisibility(m_prefs.getBoolean("headlines_hide_sidebar", false) ? View.GONE : View.VISIBLE); } } - return true; */ - /*case R.id.go_online: + return true; *//*case R.id.go_online: switchOnline(); return true;*/ - case R.id.search: - if (ohf != null) { - Dialog dialog = new Dialog(this); - - final EditText edit = new EditText(this); - - AlertDialog.Builder builder = new AlertDialog.Builder(this) - .setTitle(R.string.search) - .setPositiveButton(getString(R.string.search), - new OnClickListener() { - - @Override - public void onClick(DialogInterface dialog, - int which) { - - String query = edit.getText().toString().trim(); - - ohf.setSearchQuery(query); - - } - }) - .setNegativeButton(getString(R.string.cancel), - new OnClickListener() { - - @Override - public void onClick(DialogInterface dialog, - int which) { - - // - - } - }).setView(edit); - - dialog = builder.create(); - dialog.show(); - } - - return true; - case R.id.preferences: - Intent intent = new Intent(this, PreferencesActivity.class); - startActivityForResult(intent, 0); - return true; - case R.id.headlines_view_mode: - if (ohf != null) { - Dialog dialog = new Dialog(this); - - String viewMode = getViewMode(); - - //Log.d(TAG, "viewMode:" + getViewMode()); + if (itemId == R.id.search) { + if (ohf != null) { + Dialog dialog = new Dialog(this); - int selectedIndex = 0; - - if (viewMode.equals("all_articles")) { - selectedIndex = 0; - } else if (viewMode.equals("marked")) { - selectedIndex = 1; - } else if (viewMode.equals("published")) { - selectedIndex = 2; - } else if (viewMode.equals("unread")) { - selectedIndex = 3; - } - - AlertDialog.Builder builder = new AlertDialog.Builder(this) - .setTitle(R.string.headlines_set_view_mode) - .setSingleChoiceItems( - new String[] { - /* getString(R.string.headlines_adaptive), */ - getString(R.string.headlines_all_articles), - getString(R.string.headlines_starred), - getString(R.string.headlines_published), - getString(R.string.headlines_unread) }, - selectedIndex, new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, - int which) { - switch (which) { + final EditText edit = new EditText(this); + + AlertDialog.Builder builder = new AlertDialog.Builder(this) + .setTitle(R.string.search) + .setPositiveButton(getString(R.string.search), + new OnClickListener() { + + @Override + public void onClick(DialogInterface dialog, + int which) { + + String query = edit.getText().toString().trim(); + + ohf.setSearchQuery(query); + + } + }) + .setNegativeButton(getString(R.string.cancel), + new OnClickListener() { + + @Override + public void onClick(DialogInterface dialog, + int which) { + + // + + } + }).setView(edit); + + dialog = builder.create(); + dialog.show(); + } + + return true; + } else if (itemId == R.id.preferences) { + Intent intent = new Intent(this, PreferencesActivity.class); + startActivityForResult(intent, 0); + return true; + } else if (itemId == R.id.headlines_view_mode) { + if (ohf != null) { + Dialog dialog = new Dialog(this); + + String viewMode = getViewMode(); + + //Log.d(TAG, "viewMode:" + getViewMode()); + + int selectedIndex = 0; + + if (viewMode.equals("all_articles")) { + selectedIndex = 0; + } else if (viewMode.equals("marked")) { + selectedIndex = 1; + } else if (viewMode.equals("published")) { + selectedIndex = 2; + } else if (viewMode.equals("unread")) { + selectedIndex = 3; + } + + AlertDialog.Builder builder = new AlertDialog.Builder(this) + .setTitle(R.string.headlines_set_view_mode) + .setSingleChoiceItems( + new String[]{ + /* getString(R.string.headlines_adaptive), */ + getString(R.string.headlines_all_articles), + getString(R.string.headlines_starred), + getString(R.string.headlines_published), + getString(R.string.headlines_unread)}, + selectedIndex, new OnClickListener() { + @Override + public void onClick(DialogInterface dialog, + int which) { + switch (which) { /* case 0: setViewMode("adaptive"); break; */ - case 0: - setViewMode("all_articles"); - break; - case 1: - setViewMode("marked"); - break; - case 2: - setViewMode("published"); - break; - case 3: - setViewMode("unread"); - break; - } - dialog.cancel(); - - refresh(); - } - }); - - dialog = builder.create(); - dialog.show(); + case 0: + setViewMode("all_articles"); + break; + case 1: + setViewMode("marked"); + break; + case 2: + setViewMode("published"); + break; + case 3: + setViewMode("unread"); + break; + } + dialog.cancel(); + + refresh(); + } + }); + + dialog = builder.create(); + dialog.show(); - } - return true; - case R.id.headlines_select: - if (ohf != null) { - Dialog dialog = new Dialog(this); - AlertDialog.Builder builder = new AlertDialog.Builder(this); - builder.setTitle(R.string.headlines_select_dialog); - - builder.setSingleChoiceItems(new String[] { - getString(R.string.headlines_select_all), - getString(R.string.headlines_select_unread), - getString(R.string.headlines_select_none) }, 0, - new DialogInterface.OnClickListener() { - @Override - public void onClick(DialogInterface dialog, - int which) { - - selectArticles(ohf.getFeedId(), ohf.getFeedIsCat(), which); - invalidateOptionsMenu(); - refresh(); - - dialog.cancel(); - } - }); - - dialog = builder.create(); - dialog.show(); - } - return true; - case R.id.headlines_mark_as_read: - if (ohf != null) { - final int feedId = ohf.getFeedId(); - final boolean isCat = ohf.getFeedIsCat(); - - int count = getUnreadArticleCount(feedId, isCat); - - if (count > 0) { - AlertDialog.Builder builder = new AlertDialog.Builder( - OfflineActivity.this) - .setMessage(getResources().getQuantityString(R.plurals.mark_num_headlines_as_read, count, count)) - .setPositiveButton(R.string.catchup, - new Dialog.OnClickListener() { - public void onClick(DialogInterface dialog, - int which) { - - catchupFeed(feedId, isCat); - - } - }) - .setNegativeButton(R.string.dialog_cancel, - new Dialog.OnClickListener() { - public void onClick(DialogInterface dialog, - int which) { - - } - }); - - AlertDialog dlg = builder.create(); - dlg.show(); - } - } - return true; + } + return true; + } else if (itemId == R.id.headlines_select) { + if (ohf != null) { + Dialog dialog = new Dialog(this); + AlertDialog.Builder builder = new AlertDialog.Builder(this); + builder.setTitle(R.string.headlines_select_dialog); + + builder.setSingleChoiceItems(new String[]{ + getString(R.string.headlines_select_all), + getString(R.string.headlines_select_unread), + getString(R.string.headlines_select_none)}, 0, + new OnClickListener() { + @Override + public void onClick(DialogInterface dialog, + int which) { + + selectArticles(ohf.getFeedId(), ohf.getFeedIsCat(), which); + invalidateOptionsMenu(); + refresh(); + + dialog.cancel(); + } + }); + + dialog = builder.create(); + dialog.show(); + } + return true; + } else if (itemId == R.id.headlines_mark_as_read) { + if (ohf != null) { + final int feedId = ohf.getFeedId(); + final boolean isCat = ohf.getFeedIsCat(); + + int count = getUnreadArticleCount(feedId, isCat); + + if (count > 0) { + AlertDialog.Builder builder = new AlertDialog.Builder( + OfflineActivity.this) + .setMessage(getResources().getQuantityString(R.plurals.mark_num_headlines_as_read, count, count)) + .setPositiveButton(R.string.catchup, + new OnClickListener() { + public void onClick(DialogInterface dialog, + int which) { + + catchupFeed(feedId, isCat); + + } + }) + .setNegativeButton(R.string.dialog_cancel, + new OnClickListener() { + public void onClick(DialogInterface dialog, + int which) { + + } + }); + + AlertDialog dlg = builder.create(); + dlg.show(); + } + } + return true; /* case R.id.share_article: if (true) { int articleId = oap.getSelectedArticleId(); - + shareArticle(articleId); } return true; */ - case R.id.toggle_marked: - if (oap != null) { - int articleId = oap.getSelectedArticleId(); - - SQLiteStatement stmt = getDatabase().compileStatement( - "UPDATE articles SET modified = 1, modified_marked = 1, marked = NOT marked WHERE " - + BaseColumns._ID + " = ?"); - stmt.bindLong(1, articleId); - stmt.execute(); - stmt.close(); - - refresh(); - } - return true; - case R.id.toggle_unread: - if (oap != null) { - int articleId = oap.getSelectedArticleId(); - - SQLiteStatement stmt = getDatabase().compileStatement( - "UPDATE articles SET modified = 1, unread = NOT unread WHERE " - + BaseColumns._ID + " = ?"); - stmt.bindLong(1, articleId); - stmt.execute(); - stmt.close(); - - refresh(); - } - return true; + } else if (itemId == R.id.toggle_marked) { + if (oap != null) { + int articleId = oap.getSelectedArticleId(); + + SQLiteStatement stmt = getDatabase().compileStatement( + "UPDATE articles SET modified = 1, modified_marked = 1, marked = NOT marked WHERE " + + BaseColumns._ID + " = ?"); + stmt.bindLong(1, articleId); + stmt.execute(); + stmt.close(); + + refresh(); + } + return true; + } else if (itemId == R.id.toggle_unread) { + if (oap != null) { + int articleId = oap.getSelectedArticleId(); + + SQLiteStatement stmt = getDatabase().compileStatement( + "UPDATE articles SET modified = 1, unread = NOT unread WHERE " + + BaseColumns._ID + " = ?"); + stmt.bindLong(1, articleId); + stmt.execute(); + stmt.close(); + + refresh(); + } + return true; /* case R.id.selection_select_none: - deselectAllArticles(); + deselectAllArticles(); return true; */ - case R.id.selection_toggle_unread: - if (getSelectedArticleCount() > 0) { - SQLiteStatement stmt = getDatabase() - .compileStatement( - "UPDATE articles SET modified = 1, unread = NOT unread WHERE selected = 1"); - stmt.execute(); - stmt.close(); - - refresh(); - } - return true; - case R.id.selection_toggle_marked: - if (getSelectedArticleCount() > 0) { - SQLiteStatement stmt = getDatabase() - .compileStatement( - "UPDATE articles SET modified = 1, modified_marked = 1, marked = NOT marked WHERE selected = 1"); - stmt.execute(); - stmt.close(); - - refresh(); - } - return true; - case R.id.selection_toggle_published: - if (getSelectedArticleCount() > 0) { - SQLiteStatement stmt = getDatabase() - .compileStatement( - "UPDATE articles SET modified = 1, modified_published = 1, published = NOT published WHERE selected = 1"); - stmt.execute(); - stmt.close(); - - refresh(); - } - return true; - case R.id.toggle_published: - if (oap != null) { - int articleId = oap.getSelectedArticleId(); - - SQLiteStatement stmt = getDatabase().compileStatement( - "UPDATE articles SET modified = 1, modified_published = 1, published = NOT published WHERE " - + BaseColumns._ID + " = ?"); - stmt.bindLong(1, articleId); - stmt.execute(); - stmt.close(); - - refresh(); - } - return true; - case R.id.catchup_above: - if (oap != null) { - AlertDialog.Builder builder = new AlertDialog.Builder( - OfflineActivity.this) - .setMessage(R.string.confirm_catchup_above) - .setPositiveButton(R.string.dialog_ok, - new Dialog.OnClickListener() { - public void onClick(DialogInterface dialog, - int which) { - - catchupAbove(oap); - - } - }) - .setNegativeButton(R.string.dialog_cancel, - new Dialog.OnClickListener() { - public void onClick(DialogInterface dialog, - int which) { - - } - }); - - AlertDialog dlg = builder.create(); - dlg.show(); - } - return true; - default: - Log.d(TAG, "onOptionsItemSelected, unhandled id=" + item.getItemId()); - return super.onOptionsItemSelected(item); - } - } + } else if (itemId == R.id.selection_toggle_unread) { + if (getSelectedArticleCount() > 0) { + SQLiteStatement stmt = getDatabase() + .compileStatement( + "UPDATE articles SET modified = 1, unread = NOT unread WHERE selected = 1"); + stmt.execute(); + stmt.close(); + + refresh(); + } + return true; + } else if (itemId == R.id.selection_toggle_marked) { + if (getSelectedArticleCount() > 0) { + SQLiteStatement stmt = getDatabase() + .compileStatement( + "UPDATE articles SET modified = 1, modified_marked = 1, marked = NOT marked WHERE selected = 1"); + stmt.execute(); + stmt.close(); + + refresh(); + } + return true; + } else if (itemId == R.id.selection_toggle_published) { + if (getSelectedArticleCount() > 0) { + SQLiteStatement stmt = getDatabase() + .compileStatement( + "UPDATE articles SET modified = 1, modified_published = 1, published = NOT published WHERE selected = 1"); + stmt.execute(); + stmt.close(); + + refresh(); + } + return true; + } else if (itemId == R.id.toggle_published) { + if (oap != null) { + int articleId = oap.getSelectedArticleId(); + + SQLiteStatement stmt = getDatabase().compileStatement( + "UPDATE articles SET modified = 1, modified_published = 1, published = NOT published WHERE " + + BaseColumns._ID + " = ?"); + stmt.bindLong(1, articleId); + stmt.execute(); + stmt.close(); + + refresh(); + } + return true; + } else if (itemId == R.id.catchup_above) { + if (oap != null) { + AlertDialog.Builder builder = new AlertDialog.Builder( + OfflineActivity.this) + .setMessage(R.string.confirm_catchup_above) + .setPositiveButton(R.string.dialog_ok, + new OnClickListener() { + public void onClick(DialogInterface dialog, + int which) { + + catchupAbove(oap); + + } + }) + .setNegativeButton(R.string.dialog_cancel, + new OnClickListener() { + public void onClick(DialogInterface dialog, + int which) { + + } + }); + + AlertDialog dlg = builder.create(); + dlg.show(); + } + return true; + } + Log.d(TAG, "onOptionsItemSelected, unhandled id=" + item.getItemId()); + return super.onOptionsItemSelected(item); + } private void catchupAbove(OfflineArticlePager oap) { int articleId = oap.getSelectedArticleId(); diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/share/CommonShareActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/share/CommonShareActivity.java index a1044988..e810f49f 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/share/CommonShareActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/share/CommonShareActivity.java @@ -94,18 +94,16 @@ public abstract class CommonShareActivity extends CommonActivity { } public boolean onOptionsItemSelected(MenuItem item) { - switch (item.getItemId()) { - case R.id.preferences: - Intent intent = new Intent(CommonShareActivity.this, - PreferencesActivity.class); - startActivityForResult(intent, 0); - return true; - default: - Log.d(TAG, - "onOptionsItemSelected, unhandled id=" + item.getItemId()); - return super.onOptionsItemSelected(item); - } - } + if (item.getItemId() == R.id.preferences) { + Intent intent = new Intent(CommonShareActivity.this, + PreferencesActivity.class); + startActivityForResult(intent, 0); + return true; + } + Log.d(TAG, + "onOptionsItemSelected, unhandled id=" + item.getItemId()); + return super.onOptionsItemSelected(item); + } @Override public boolean onCreateOptionsMenu(Menu menu) { -- cgit v1.2.3-54-g00ecf From a3851a525e81eeff11bcd3cc17741e3f9c54bbb3 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Mon, 5 May 2025 15:10:29 +0300 Subject: replace more usages of switch() on resource identifier with if-else --- .../fox/ttrss/offline/OfflineArticleFragment.java | 39 +++--- .../fox/ttrss/offline/OfflineDetailActivity.java | 16 ++- .../offline/OfflineFeedCategoriesFragment.java | 61 +++++----- .../fox/ttrss/offline/OfflineFeedsFragment.java | 39 +++--- .../ttrss/offline/OfflineHeadlinesFragment.java | 131 ++++++++++----------- .../fox/ttrss/offline/OfflineMasterActivity.java | 17 ++- 6 files changed, 147 insertions(+), 156 deletions(-) (limited to 'org.fox.ttrss/src/main/java/org') diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java index a3b152a7..3f452a63 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java @@ -127,26 +127,25 @@ public class OfflineArticleFragment extends Fragment { public boolean onContextItemSelected(MenuItem item) { /* AdapterContextMenuInfo info = (AdapterContextMenuInfo) item .getMenuInfo(); */ - - switch (item.getItemId()) { - case R.id.article_link_share: - m_activity.shareArticle(m_articleId); - return true; - case R.id.article_link_copy: - if (true) { - Cursor article = m_activity.getArticleById(m_articleId); - - if (article != null) { - m_activity.copyToClipboard(article.getString(article.getColumnIndex("link"))); - article.close(); - } - } - return true; - default: - Log.d(TAG, "onContextItemSelected, unhandled id=" + item.getItemId()); - return super.onContextItemSelected(item); - } - } + + int itemId = item.getItemId(); + if (itemId == R.id.article_link_share) { + m_activity.shareArticle(m_articleId); + return true; + } else if (itemId == R.id.article_link_copy) { + if (true) { + Cursor article = m_activity.getArticleById(m_articleId); + + if (article != null) { + m_activity.copyToClipboard(article.getString(article.getColumnIndex("link"))); + article.close(); + } + } + return true; + } + Log.d(TAG, "onContextItemSelected, unhandled id=" + item.getItemId()); + return super.onContextItemSelected(item); + } @Override public void onCreateContextMenu(ContextMenu menu, View v, diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineDetailActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineDetailActivity.java index 50335966..1f8f3dc6 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineDetailActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineDetailActivity.java @@ -169,15 +169,13 @@ public class OfflineDetailActivity extends OfflineActivity implements OfflineHea return true; } - switch (item.getItemId()) { - case android.R.id.home: - finish(); - return true; - default: - Log.d(TAG, "onOptionsItemSelected, unhandled id=" + item.getItemId()); - return super.onOptionsItemSelected(item); - } - } + if (item.getItemId() == android.R.id.home) { + finish(); + return true; + } + Log.d(TAG, "onOptionsItemSelected, unhandled id=" + item.getItemId()); + return super.onOptionsItemSelected(item); + } @Override public void onArticleSelected(int articleId, boolean open) { diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedCategoriesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedCategoriesFragment.java index 40674bb8..372728e4 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedCategoriesFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedCategoriesFragment.java @@ -92,37 +92,36 @@ public class OfflineFeedCategoriesFragment extends BaseFeedlistFragment implemen public boolean onContextItemSelected(MenuItem item) { AdapterContextMenuInfo info = (AdapterContextMenuInfo) item .getMenuInfo(); - - switch (item.getItemId()) { - case R.id.browse_headlines: - if (true) { - int catId = getCatIdAtPosition(info.position); - if (catId != -10000) { - m_activity.onCatSelected(catId, true); - } - } - return true; - case R.id.browse_feeds: - if (true) { - int catId = getCatIdAtPosition(info.position); - if (catId != -10000) { - m_activity.onCatSelected(catId, false); - } - } - return true; - case R.id.catchup_category: - if (true) { - int catId = getCatIdAtPosition(info.position); - if (catId != -10000) { - m_activity.catchupFeed(catId, true); - } - } - return true; - default: - Log.d(TAG, "onContextItemSelected, unhandled id=" + item.getItemId()); - return super.onContextItemSelected(item); - } - } + + int itemId = item.getItemId(); + if (itemId == R.id.browse_headlines) { + if (true) { + int catId = getCatIdAtPosition(info.position); + if (catId != -10000) { + m_activity.onCatSelected(catId, true); + } + } + return true; + } else if (itemId == R.id.browse_feeds) { + if (true) { + int catId = getCatIdAtPosition(info.position); + if (catId != -10000) { + m_activity.onCatSelected(catId, false); + } + } + return true; + } else if (itemId == R.id.catchup_category) { + if (true) { + int catId = getCatIdAtPosition(info.position); + if (catId != -10000) { + m_activity.catchupFeed(catId, true); + } + } + return true; + } + Log.d(TAG, "onContextItemSelected, unhandled id=" + item.getItemId()); + return super.onContextItemSelected(item); + } @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedsFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedsFragment.java index 6dd85a87..c0b63330 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedsFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineFeedsFragment.java @@ -56,26 +56,25 @@ public class OfflineFeedsFragment extends BaseFeedlistFragment implements OnItem public boolean onContextItemSelected(MenuItem item) { AdapterContextMenuInfo info = (AdapterContextMenuInfo) item .getMenuInfo(); - switch (item.getItemId()) { - case R.id.browse_headlines: - if (true) { - int feedId = getFeedIdAtPosition(info.position); - if (feedId != -10000) { - m_activity.onFeedSelected(feedId); - } - } - return true; - case R.id.catchup_feed: - int feedId = getFeedIdAtPosition(info.position); - if (feedId != -10000) { - m_activity.catchupFeed(feedId, false); - } - return true; - default: - Log.d(TAG, "onContextItemSelected, unhandled id=" + item.getItemId()); - return super.onContextItemSelected(item); - } - } + int itemId = item.getItemId(); + if (itemId == R.id.browse_headlines) { + if (true) { + int feedId = getFeedIdAtPosition(info.position); + if (feedId != -10000) { + m_activity.onFeedSelected(feedId); + } + } + return true; + } else if (itemId == R.id.catchup_feed) { + int feedId = getFeedIdAtPosition(info.position); + if (feedId != -10000) { + m_activity.catchupFeed(feedId, false); + } + return true; + } + Log.d(TAG, "onContextItemSelected, unhandled id=" + item.getItemId()); + return super.onContextItemSelected(item); + } @Override public void onCreateContextMenu(ContextMenu menu, View v, diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java index d448117c..669e4115 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java @@ -158,79 +158,78 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis } private boolean onArticleMenuItemSelected(MenuItem item, final int articleId) { - switch (item.getItemId()) { - case R.id.headlines_article_unread: - if (true) { + int itemId = item.getItemId(); + if (itemId == R.id.headlines_article_unread) { + if (true) { - SQLiteStatement stmt = m_activity.getDatabase().compileStatement( - "UPDATE articles SET modified = 1, unread = not unread " + "WHERE " + BaseColumns._ID - + " = ?"); - - stmt.bindLong(1, articleId); - stmt.execute(); - stmt.close(); - - refresh(); - } - return true; - case R.id.headlines_article_link_copy: - if (true) { - Cursor article = m_activity.getArticleById(articleId); - - if (article != null) { - m_activity.copyToClipboard(article.getString(article.getColumnIndex("link"))); - article.close(); - } - } - return true; - case R.id.headlines_article_link_open: - if (true) { - Cursor article = m_activity.getArticleById(articleId); - - if (article != null) { - m_activity.openUri(Uri.parse(article.getString(article.getColumnIndex("link")))); + SQLiteStatement stmt = m_activity.getDatabase().compileStatement( + "UPDATE articles SET modified = 1, unread = not unread " + "WHERE " + BaseColumns._ID + + " = ?"); - // TODO: mark article as read, set modified = 1, refresh + stmt.bindLong(1, articleId); + stmt.execute(); + stmt.close(); - article.close(); - } - } - return true; - case R.id.headlines_share_article: - m_activity.shareArticle(articleId); - return true; - case R.id.catchup_above: - if (true) { - AlertDialog.Builder builder = new AlertDialog.Builder( - m_activity) - .setMessage(R.string.confirm_catchup_above) - .setPositiveButton(R.string.dialog_ok, - new Dialog.OnClickListener() { - public void onClick(DialogInterface dialog, - int which) { - - catchupAbove(articleId); + refresh(); + } + return true; + } else if (itemId == R.id.headlines_article_link_copy) { + if (true) { + Cursor article = m_activity.getArticleById(articleId); + + if (article != null) { + m_activity.copyToClipboard(article.getString(article.getColumnIndex("link"))); + article.close(); + } + } + return true; + } else if (itemId == R.id.headlines_article_link_open) { + if (true) { + Cursor article = m_activity.getArticleById(articleId); - } - }) - .setNegativeButton(R.string.dialog_cancel, - new Dialog.OnClickListener() { - public void onClick(DialogInterface dialog, - int which) { + if (article != null) { + m_activity.openUri(Uri.parse(article.getString(article.getColumnIndex("link")))); - } - }); + // TODO: mark article as read, set modified = 1, refresh - AlertDialog dialog = builder.create(); - dialog.show(); - } - return true; - default: - Log.d(TAG, "onArticleMenuItemSelected, unhandled id=" + item.getItemId()); - return false; - } + article.close(); + } + } + return true; + } else if (itemId == R.id.headlines_share_article) { + m_activity.shareArticle(articleId); + return true; + } else if (itemId == R.id.catchup_above) { + if (true) { + AlertDialog.Builder builder = new AlertDialog.Builder( + m_activity) + .setMessage(R.string.confirm_catchup_above) + .setPositiveButton(R.string.dialog_ok, + new Dialog.OnClickListener() { + public void onClick(DialogInterface dialog, + int which) { + + catchupAbove(articleId); + + } + }) + .setNegativeButton(R.string.dialog_cancel, + new Dialog.OnClickListener() { + public void onClick(DialogInterface dialog, + int which) { + + } + }); + + AlertDialog dialog = builder.create(); + dialog.show(); + } + return true; + } + Log.d(TAG, "onArticleMenuItemSelected, unhandled id=" + item.getItemId()); + return false; - } + } private void catchupAbove(int articleId) { SQLiteStatement stmt = null; diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineMasterActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineMasterActivity.java index efd1ed97..78dad8f3 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineMasterActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineMasterActivity.java @@ -141,9 +141,7 @@ public class OfflineMasterActivity extends OfflineActivity implements OfflineHea return true; } - switch (item.getItemId()) { - case R.id.headlines_toggle_sort_order: - /* SharedPreferences.Editor editor = m_prefs.edit(); + if (item.getItemId() == R.id.headlines_toggle_sort_order) {/* SharedPreferences.Editor editor = m_prefs.edit(); editor.putBoolean("offline_oldest_first", !m_prefs.getBoolean("offline_oldest_first", false)); editor.commit(); refresh(); */ @@ -155,7 +153,7 @@ public class OfflineMasterActivity extends OfflineActivity implements OfflineHea AlertDialog.Builder builder = new AlertDialog.Builder(this) .setTitle(getString(R.string.headlines_sort_articles_title)) .setSingleChoiceItems( - new String[] { + new String[]{ getString(R.string.headlines_sort_default), getString(R.string.headlines_sort_oldest_first) }, @@ -175,7 +173,7 @@ public class OfflineMasterActivity extends OfflineActivity implements OfflineHea if (true) { SharedPreferences.Editor editor = m_prefs.edit(); editor.putBoolean("offline_oldest_first", true); - editor.apply(); + editor.apply(); } break; } @@ -194,11 +192,10 @@ public class OfflineMasterActivity extends OfflineActivity implements OfflineHea invalidateOptionsMenu(); refresh(); return true; */ - default: - Log.d(TAG, "onOptionsItemSelected, unhandled id=" + item.getItemId()); - return super.onOptionsItemSelected(item); - } - } + } + Log.d(TAG, "onOptionsItemSelected, unhandled id=" + item.getItemId()); + return super.onOptionsItemSelected(item); + } @Override public void onSaveInstanceState(Bundle out) { -- cgit v1.2.3-54-g00ecf From 526c3d9897b585f2ee020b1eb67a84aa8cf4e235 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 6 May 2025 08:53:41 +0300 Subject: replace one more switch with if --- .../main/java/org/fox/ttrss/LogcatActivity.java | 22 ++++++++++------------ 1 file changed, 10 insertions(+), 12 deletions(-) (limited to 'org.fox.ttrss/src/main/java/org') diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/LogcatActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/LogcatActivity.java index 037e4d7c..75a9c268 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/LogcatActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/LogcatActivity.java @@ -92,19 +92,17 @@ public class LogcatActivity extends CommonActivity { public boolean onOptionsItemSelected(MenuItem item) { int id = item.getItemId(); - switch (id) { - case android.R.id.home: - onBackPressed(); - return true; - case R.id.logcat_copy: - shareLogcat(); - return true; - case R.id.logcat_refresh: - refresh(); - return true; - default: - return super.onOptionsItemSelected(item); + if (id == android.R.id.home) { + onBackPressed(); + return true; + } else if (id == R.id.logcat_copy) { + shareLogcat(); + return true; + } else if (id == R.id.logcat_refresh) { + refresh(); + return true; } + return super.onOptionsItemSelected(item); } private void shareLogcat() { -- cgit v1.2.3-54-g00ecf From e3f504940d98377de3d7eab5e938c806d67fe8e2 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 6 May 2025 10:42:07 +0300 Subject: drop AppUpdater in favor of Obtainium --- org.fox.ttrss/build.gradle | 3 --- .../src/main/java/org/fox/ttrss/OnlineActivity.java | 13 ------------- .../src/main/java/org/fox/ttrss/PreferencesFragment.java | 2 -- org.fox.ttrss/src/main/res/xml/preferences.xml | 6 ------ 4 files changed, 24 deletions(-) (limited to 'org.fox.ttrss/src/main/java/org') diff --git a/org.fox.ttrss/build.gradle b/org.fox.ttrss/build.gradle index 1d9c0306..1b5cf135 100755 --- a/org.fox.ttrss/build.gradle +++ b/org.fox.ttrss/build.gradle @@ -9,7 +9,6 @@ android { defaultConfig { applicationId "org.fox.ttrss" buildConfigField "long", "TIMESTAMP", System.currentTimeMillis() + "L" - buildConfigField "boolean", "ENABLE_UPDATER", "false" minSdkVersion 24 //noinspection ExpiredTargetSdkVersion targetSdkVersion 31 @@ -45,7 +44,6 @@ android { minifyEnabled false versionNameSuffix "-signed" proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.txt' - buildConfigField "boolean", "ENABLE_UPDATER", "true" signingConfig signingConfigs.signed matchingFallbacks = ['release'] } @@ -127,7 +125,6 @@ dependencies { compileOnly 'com.evernote:android-state:1.4.1' annotationProcessor 'com.evernote:android-state:1.4.1' implementation 'com.github.livefront:bridge:v1.1.1' - implementation 'com.github.javiersantos:AppUpdater:2.7' } java { toolchain { diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java index 69fc8141..9bac8849 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java @@ -31,8 +31,6 @@ import android.widget.TextView; import androidx.appcompat.view.ActionMode; import androidx.appcompat.widget.Toolbar; -import com.github.javiersantos.appupdater.AppUpdater; -import com.github.javiersantos.appupdater.enums.UpdateFrom; import com.google.gson.Gson; import com.google.gson.JsonElement; import com.google.gson.JsonObject; @@ -271,21 +269,10 @@ public class OnlineActivity extends CommonActivity { if (isOffline) { switchOfflineSuccess(); } else { - checkUpdates(); - m_headlinesActionModeCallback = new HeadlinesActionModeCallback(); } } - protected void checkUpdates() { - if (m_prefs.getBoolean("check_for_updates", true) && (BuildConfig.DEBUG || BuildConfig.ENABLE_UPDATER)) { - new AppUpdater(this) - .setUpdateFrom(UpdateFrom.JSON) - .setUpdateJSON(String.format("https://srv.tt-rss.org/fdroid/updates/%1$s.json", this.getPackageName())) - .start(); - } - } - protected void switchOffline() { AlertDialog.Builder builder = new AlertDialog.Builder(this) .setMessage(R.string.dialog_offline_switch_prompt) diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/PreferencesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/PreferencesFragment.java index 65e0b556..14639abb 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/PreferencesFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/PreferencesFragment.java @@ -23,8 +23,6 @@ public class PreferencesFragment extends PreferenceFragment { SharedPreferences prefs = PreferenceManager.getDefaultSharedPreferences(getActivity().getApplicationContext()); - findPreference("check_for_updates").setEnabled(BuildConfig.DEBUG || BuildConfig.ENABLE_UPDATER); - findPreference("ttrss_url").setSummary(prefs.getString("ttrss_url", getString(R.string.ttrss_url_summary))); findPreference("login").setSummary(prefs.getString("login", getString(R.string.login_summary))); diff --git a/org.fox.ttrss/src/main/res/xml/preferences.xml b/org.fox.ttrss/src/main/res/xml/preferences.xml index 41d6c9ef..175639db 100755 --- a/org.fox.ttrss/src/main/res/xml/preferences.xml +++ b/org.fox.ttrss/src/main/res/xml/preferences.xml @@ -22,12 +22,6 @@ android:title="@string/ttrss_url" > - - -- cgit v1.2.3-54-g00ecf From 78155e9c3640b5ada6f2c5982db01fb0ea7e768b Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 6 May 2025 12:13:14 +0300 Subject: switch to material3 theme, switch some headline imageviews to material buttons, theme cleanup --- .../main/java/org/fox/ttrss/HeadlinesFragment.java | 37 ++++++---- .../ttrss/offline/OfflineHeadlinesFragment.java | 25 ++++--- .../src/main/res/layout/headlines_row.xml | 26 ++++--- .../src/main/res/layout/headlines_row_compact.xml | 8 ++- .../res/layout/headlines_row_selected_compact.xml | 9 +-- .../headlines_row_selected_unread_compact.xml | 9 +-- .../src/main/res/layout/headlines_row_unread.xml | 26 ++++--- org.fox.ttrss/src/main/res/layout/toolbar.xml | 4 +- .../src/main/res/values-night-v21/style.xml | 12 ---- org.fox.ttrss/src/main/res/values-v21/style.xml | 20 ------ org.fox.ttrss/src/main/res/values/style.xml | 79 +--------------------- 11 files changed, 87 insertions(+), 168 deletions(-) delete mode 100644 org.fox.ttrss/src/main/res/values-night-v21/style.xml delete mode 100755 org.fox.ttrss/src/main/res/values-v21/style.xml (limited to 'org.fox.ttrss/src/main/java/org') diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java index d45ff934..c6d4f902 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java @@ -9,6 +9,7 @@ import android.content.DialogInterface; import android.content.Intent; import android.content.SharedPreferences; import android.content.pm.ApplicationInfo; +import android.content.res.ColorStateList; import android.content.res.Resources.Theme; import android.graphics.Paint; import android.graphics.Point; @@ -42,6 +43,7 @@ import android.view.ViewGroup; import android.view.ViewTreeObserver; import android.view.WindowManager; import android.widget.AdapterView.AdapterContextMenuInfo; +import android.widget.Button; import android.widget.CheckBox; import android.widget.EditText; import android.widget.ImageView; @@ -70,6 +72,7 @@ import com.bumptech.glide.request.RequestListener; import com.bumptech.glide.request.target.GlideDrawableImageViewTarget; import com.bumptech.glide.request.target.Target; import com.evernote.android.state.State; +import com.google.android.material.button.MaterialButton; import com.google.android.material.snackbar.Snackbar; import com.google.gson.JsonElement; @@ -702,16 +705,16 @@ public class HeadlinesFragment extends StateSavedFragment { public TextView titleView; public TextView feedTitleView; - public ImageView markedView; - public ImageView scoreView; - public ImageView publishedView; + public MaterialButton markedView; + public MaterialButton scoreView; + public MaterialButton publishedView; public TextView excerptView; public ImageView flavorImageView; public ImageView flavorVideoKindView; public TextView authorView; public TextView dateView; public CheckBox selectionBoxView; - public ImageView menuButtonView; + public MaterialButton menuButtonView; public ViewGroup flavorImageHolder; public ProgressBar flavorImageLoadingBar; public View headlineFooter; @@ -720,7 +723,7 @@ public class HeadlinesFragment extends StateSavedFragment { public View headlineHeader; public View flavorImageOverflow; public TextureView flavorVideoView; - public ImageView attachmentsView; + public MaterialButton attachmentsView; //public int position; public boolean flavorImageEmbedded; public ProgressTarget flavorProgressTarget; @@ -1002,16 +1005,20 @@ public class HeadlinesFragment extends StateSavedFragment { TypedValue tvAccent = new TypedValue(); m_activity.getTheme().resolveAttribute(R.attr.colorAccent, tvAccent, true); + TypedValue tvPrimary = new TypedValue(); + m_activity.getTheme().resolveAttribute(R.attr.colorPrimary, tvPrimary, true); + if (holder.markedView != null) { TypedValue tv = new TypedValue(); m_activity.getTheme().resolveAttribute(article.marked ? R.attr.ic_star : R.attr.ic_star_outline, tv, true); - holder.markedView.setImageResource(tv.resourceId); + holder.markedView.setIconResource(tv.resourceId); + if (article.marked) - holder.markedView.setColorFilter(tvAccent.data); + holder.markedView.setIconTint(ColorStateList.valueOf(tvAccent.data)); else - holder.markedView.setColorFilter(null); + holder.markedView.setIconTint(ColorStateList.valueOf(tvPrimary.data)); holder.markedView.setOnClickListener(new OnClickListener() { @@ -1037,12 +1044,12 @@ public class HeadlinesFragment extends StateSavedFragment { m_activity.getTheme().resolveAttribute(scoreAttr, tv, true); - holder.scoreView.setImageResource(tv.resourceId); + holder.scoreView.setIconResource(tv.resourceId); if (article.score > Article.SCORE_HIGH) - holder.scoreView.setColorFilter(titleHighScoreUnreadColor); + holder.scoreView.setIconTint(ColorStateList.valueOf(tvAccent.data)); else - holder.scoreView.setColorFilter(null); + holder.scoreView.setIconTint(ColorStateList.valueOf(tvPrimary.data)); if (m_activity.getApiLevel() >= 16) { holder.scoreView.setOnClickListener(new OnClickListener() { @@ -1095,14 +1102,14 @@ public class HeadlinesFragment extends StateSavedFragment { if (holder.publishedView != null) { TypedValue tv = new TypedValue(); - m_activity.getTheme().resolveAttribute(article.published ? R.attr.ic_checkbox_marked : R.attr.ic_rss_box, tv, true); + m_activity.getTheme().resolveAttribute(R.attr.ic_rss_box, tv, true); - holder.publishedView.setImageResource(tv.resourceId); + holder.publishedView.setIconResource(tv.resourceId); if (article.published) - holder.publishedView.setColorFilter(tvAccent.data); + holder.publishedView.setIconTint(ColorStateList.valueOf(tvAccent.data)); else - holder.publishedView.setColorFilter(null); + holder.publishedView.setIconTint(ColorStateList.valueOf(tvPrimary.data)); holder.publishedView.setOnClickListener(new OnClickListener() { diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java index 669e4115..386af632 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java @@ -7,6 +7,7 @@ import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.content.SharedPreferences; +import android.content.res.ColorStateList; import android.content.res.Resources.Theme; import android.database.Cursor; import android.database.sqlite.SQLiteStatement; @@ -50,6 +51,7 @@ import com.bumptech.glide.load.engine.DiskCacheStrategy; import com.bumptech.glide.load.resource.drawable.GlideDrawable; import com.bumptech.glide.request.RequestListener; import com.bumptech.glide.request.target.Target; +import com.google.android.material.button.MaterialButton; import org.fox.ttrss.Application; import org.fox.ttrss.CommonActivity; @@ -487,14 +489,14 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis public TextView titleView; public TextView feedTitleView; - public ImageView markedView; - public ImageView publishedView; + public MaterialButton markedView; + public MaterialButton publishedView; public TextView excerptView; public ImageView flavorImageView; public TextView authorView; public TextView dateView; public CheckBox selectionBoxView; - public ImageView menuButtonView; + public MaterialButton menuButtonView; public ViewGroup flavorImageHolder; public ProgressBar flavorImageLoadingBar; public View headlineFooter; @@ -504,7 +506,7 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis public View flavorImageOverflow; public View headlineHeader; public ImageView attachmentsView; - public ImageView scoreView; + public MaterialButton scoreView; public ArticleViewHolder(View v) { @@ -791,6 +793,9 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis TypedValue tvAccent = new TypedValue(); m_activity.getTheme().resolveAttribute(R.attr.colorAccent, tvAccent, true); + TypedValue tvPrimary = new TypedValue(); + m_activity.getTheme().resolveAttribute(R.attr.colorPrimary, tvPrimary, true); + if (holder.attachmentsView != null) { holder.attachmentsView.setVisibility(View.GONE); } @@ -806,12 +811,12 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis m_activity.getTheme().resolveAttribute(marked ? R.attr.ic_star : R.attr.ic_star_outline, tv, true); - holder.markedView.setImageResource(tv.resourceId); + holder.markedView.setIconResource(tv.resourceId); if (marked) - holder.markedView.setColorFilter(tvAccent.data); + holder.markedView.setIconTint(ColorStateList.valueOf(tvAccent.data)); else - holder.markedView.setColorFilter(null); + holder.markedView.setIconTint(ColorStateList.valueOf(tvPrimary.data)); holder.markedView.setOnClickListener(new OnClickListener() { @@ -837,12 +842,12 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis m_activity.getTheme().resolveAttribute(published ? R.attr.ic_checkbox_marked : R.attr.ic_rss_box, tv, true); - holder.publishedView.setImageResource(tv.resourceId); + holder.publishedView.setIconResource(tv.resourceId); if (published) - holder.publishedView.setColorFilter(tvAccent.data); + holder.publishedView.setIconTint(ColorStateList.valueOf(tvAccent.data)); else - holder.publishedView.setColorFilter(null); + holder.publishedView.setIconTint(ColorStateList.valueOf(tvPrimary.data)); holder.publishedView.setOnClickListener(new OnClickListener() { diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row.xml b/org.fox.ttrss/src/main/res/layout/headlines_row.xml index 2e997e2c..f2057b8f 100755 --- a/org.fox.ttrss/src/main/res/layout/headlines_row.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines_row.xml @@ -1,6 +1,7 @@ @@ -226,7 +227,8 @@ android:textSize="12sp" android:textStyle="italic" /> - + app:icon="?ic_action_trending_flat" /> - + app:icon="?ic_attachment" /> - + app:icon="?ic_star_outline" /> - + app:icon="?ic_rss_box" /> - + app:icon="?ic_dots_vertical" /> diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_compact.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_compact.xml index d139313e..6375b574 100755 --- a/org.fox.ttrss/src/main/res/layout/headlines_row_compact.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines_row_compact.xml @@ -2,6 +2,7 @@ - + app:icon="?ic_star_outline" /> diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_selected_compact.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_selected_compact.xml index 2e449dbb..da2401eb 100755 --- a/org.fox.ttrss/src/main/res/layout/headlines_row_selected_compact.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines_row_selected_compact.xml @@ -2,6 +2,7 @@ - + app:icon="?ic_star_outline" /> diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread_compact.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread_compact.xml index 024eb7cf..3b6436fe 100755 --- a/org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread_compact.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines_row_selected_unread_compact.xml @@ -2,6 +2,7 @@ - + app:icon="?ic_star_outline" /> diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml index ba70bb89..aafad9a8 100755 --- a/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml @@ -1,6 +1,7 @@ - + app:icon="?ic_action_trending_flat" /> - + app:icon="?ic_attachment" /> - + app:icon="?ic_star_outline" /> - + app:icon="?ic_rss_box" /> - + app:icon="?ic_dots_vertical" /> diff --git a/org.fox.ttrss/src/main/res/layout/toolbar.xml b/org.fox.ttrss/src/main/res/layout/toolbar.xml index f5fb7654..94aa1eec 100755 --- a/org.fox.ttrss/src/main/res/layout/toolbar.xml +++ b/org.fox.ttrss/src/main/res/layout/toolbar.xml @@ -5,8 +5,8 @@ android:id="@+id/toolbar" android:elevation="4dp" app:layout_scrollFlags="scroll|enterAlways" - android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" - app:popupTheme="@style/ThemeOverlay.AppCompat.Light" + android:theme="@style/ThemeOverlay.Material3.Dark.ActionBar" + app:popupTheme="@style/ThemeOverlay.Material3.Light" android:layout_height="wrap_content" android:layout_width="match_parent" android:minHeight="?attr/actionBarSize" diff --git a/org.fox.ttrss/src/main/res/values-night-v21/style.xml b/org.fox.ttrss/src/main/res/values-night-v21/style.xml deleted file mode 100644 index c154ed8a..00000000 --- a/org.fox.ttrss/src/main/res/values-night-v21/style.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/values-v21/style.xml b/org.fox.ttrss/src/main/res/values-v21/style.xml deleted file mode 100755 index 3e26f96f..00000000 --- a/org.fox.ttrss/src/main/res/values-v21/style.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/values/style.xml b/org.fox.ttrss/src/main/res/values/style.xml index 033a9492..41b0a3ae 100755 --- a/org.fox.ttrss/src/main/res/values/style.xml +++ b/org.fox.ttrss/src/main/res/values/style.xml @@ -1,6 +1,6 @@ - - - - - - - - \ No newline at end of file -- cgit v1.2.3-54-g00ecf From 73f8dac69f24ba8e07b08a79b393cd64e13907e9 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 6 May 2025 13:04:28 +0300 Subject: switch some more imageviews to material buttons and drop hardcoded article background preferring material3 default --- .../main/java/org/fox/ttrss/ArticleFragment.java | 48 +++++++++++----------- .../fox/ttrss/offline/OfflineArticleFragment.java | 8 ++-- .../main/res/layout-sw600dp/activity_detail.xml | 1 - .../src/main/res/layout/activity_detail_phone.xml | 3 +- .../src/main/res/layout/fragment_article.xml | 19 +++++---- 5 files changed, 39 insertions(+), 40 deletions(-) (limited to 'org.fox.ttrss/src/main/java/org') diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java index 0523c144..08905aec 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java @@ -6,6 +6,7 @@ import android.app.AlertDialog; import android.app.Dialog; import android.content.DialogInterface; import android.content.SharedPreferences; +import android.content.res.ColorStateList; import android.content.res.Resources; import android.graphics.Color; import android.net.Uri; @@ -35,6 +36,7 @@ import android.widget.TextView; import androidx.core.text.HtmlCompat; import com.evernote.android.state.State; +import com.google.android.material.button.MaterialButton; import org.fox.ttrss.types.Article; import org.fox.ttrss.types.Attachment; @@ -218,21 +220,11 @@ public class ArticleFragment extends StateSavedFragment { } - final ImageView scoreView = view.findViewById(R.id.score); + final MaterialButton scoreView = view.findViewById(R.id.score); if (scoreView != null) { setScoreImage(scoreView, m_article.score); - Resources.Theme theme = m_activity.getTheme(); - TypedValue tv = new TypedValue(); - theme.resolveAttribute(R.attr.headlineTitleHighScoreUnreadTextColor, tv, true); - int titleHighScoreUnreadColor = tv.data; - - if (m_article.score > Article.SCORE_HIGH) - scoreView.setColorFilter(titleHighScoreUnreadColor); - else - scoreView.setColorFilter(null); - if (m_activity.getApiLevel() >= 16) { scoreView.setOnClickListener(new OnClickListener() { @Override @@ -282,7 +274,7 @@ public class ArticleFragment extends StateSavedFragment { } } - ImageView attachments = view.findViewById(R.id.attachments); + MaterialButton attachments = view.findViewById(R.id.attachments); if (attachments != null) { if (m_article.attachments != null && m_article.attachments.size() > 0) { @@ -298,7 +290,7 @@ public class ArticleFragment extends StateSavedFragment { } } - ImageView share = view.findViewById(R.id.share); + MaterialButton share = view.findViewById(R.id.share); if (share != null) { share.setOnClickListener(new OnClickListener() { @@ -409,6 +401,8 @@ public class ArticleFragment extends StateSavedFragment { m_web = view.findViewById(R.id.article_content); + m_web.setBackgroundColor(Color.TRANSPARENT); + m_web.setWebViewClient(new WebViewClient() { @Override public boolean shouldOverrideUrlLoading(WebView view, String url) { @@ -447,7 +441,7 @@ public class ArticleFragment extends StateSavedFragment { return view; } - private void setScoreImage(ImageView scoreView, int score) { + private void setScoreImage(MaterialButton scoreView, int score) { TypedValue tv = new TypedValue(); int scoreAttr = R.attr.ic_action_trending_flat; @@ -458,7 +452,20 @@ public class ArticleFragment extends StateSavedFragment { m_activity.getTheme().resolveAttribute(scoreAttr, tv, true); - scoreView.setImageResource(tv.resourceId); + scoreView.setIconResource(tv.resourceId); + + Resources.Theme theme = m_activity.getTheme(); + TypedValue tvColorHighScore = new TypedValue(); + theme.resolveAttribute(R.attr.headlineTitleHighScoreUnreadTextColor, tvColorHighScore, true); + + TypedValue tvPrimary = new TypedValue(); + m_activity.getTheme().resolveAttribute(R.attr.colorPrimary, tvPrimary, true); + + if (m_article.score > Article.SCORE_HIGH) + scoreView.setIconTint(ColorStateList.valueOf(tvColorHighScore.data)); + else + scoreView.setIconTint(ColorStateList.valueOf(tvPrimary.data)); + } protected void renderContent(Bundle savedInstanceState) { @@ -469,21 +476,12 @@ public class ArticleFragment extends StateSavedFragment { WebSettings ws = m_web.getSettings(); ws.setSupportZoom(false); - TypedValue tvBackground = new TypedValue(); - getActivity().getTheme().resolveAttribute(R.attr.articleBackground, tvBackground, true); - - String backgroundHexColor = String.format("#%06X", (0xFFFFFF & tvBackground.data)); - - String cssOverride = ""; - - cssOverride = "body { background : "+ backgroundHexColor+"; }"; - TypedValue tvTextColor = new TypedValue(); getActivity().getTheme().resolveAttribute(R.attr.articleTextColor, tvTextColor, true); String textColor = String.format("#%06X", (0xFFFFFF & tvTextColor.data)); - cssOverride += "body { color : "+textColor+"; }"; + String cssOverride = "body { color : "+textColor+"; }"; TypedValue tvLinkColor = new TypedValue(); getActivity().getTheme().resolveAttribute(R.attr.linkColor, tvLinkColor, true); diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java index 3f452a63..28839388 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java @@ -43,6 +43,8 @@ import java.util.Date; import androidx.fragment.app.Fragment; +import com.google.android.material.button.MaterialButton; + public class OfflineArticleFragment extends Fragment { private final String TAG = this.getClass().getSimpleName(); @@ -234,19 +236,19 @@ public class OfflineArticleFragment extends Fragment { } - ImageView score = view.findViewById(R.id.score); + MaterialButton score = view.findViewById(R.id.score); if (score != null) { score.setVisibility(View.GONE); } - ImageView attachments = view.findViewById(R.id.attachments); + MaterialButton attachments = view.findViewById(R.id.attachments); if (attachments != null) { attachments.setVisibility(View.GONE); } - ImageView share = view.findViewById(R.id.share); + MaterialButton share = view.findViewById(R.id.share); if (share != null) { share.setOnClickListener(new OnClickListener() { diff --git a/org.fox.ttrss/src/main/res/layout-sw600dp/activity_detail.xml b/org.fox.ttrss/src/main/res/layout-sw600dp/activity_detail.xml index 95215992..89ab61f5 100644 --- a/org.fox.ttrss/src/main/res/layout-sw600dp/activity_detail.xml +++ b/org.fox.ttrss/src/main/res/layout-sw600dp/activity_detail.xml @@ -35,7 +35,6 @@ android:layout_width="0dp" android:layout_weight="0.7" android:elevation="4dp" - android:background="?articleBackground" android:layout_height="match_parent"> + android:layout_height="wrap_content"> diff --git a/org.fox.ttrss/src/main/res/layout/fragment_article.xml b/org.fox.ttrss/src/main/res/layout/fragment_article.xml index 61215a40..cffc7c33 100755 --- a/org.fox.ttrss/src/main/res/layout/fragment_article.xml +++ b/org.fox.ttrss/src/main/res/layout/fragment_article.xml @@ -3,8 +3,7 @@ xmlns:tools="http://schemas.android.com/tools" android:id="@+id/article_fragment" android:layout_width="fill_parent" - android:layout_height="match_parent" - android:background="?articleBackground"> + android:layout_height="match_parent"> - - - -- cgit v1.2.3-54-g00ecf From 650c24732e70c528635d45314cea31de9fe571af Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 6 May 2025 15:06:31 +0300 Subject: drop annotation-based save handling and go back to stone-age vanilla methods --- org.fox.ttrss/build.gradle | 4 -- .../src/main/java/org/fox/ttrss/Application.java | 19 --------- .../main/java/org/fox/ttrss/ArticleFragment.java | 23 +++++++--- .../src/main/java/org/fox/ttrss/ArticlePager.java | 29 +++++++++---- .../java/org/fox/ttrss/BaseFeedlistFragment.java | 6 +-- .../main/java/org/fox/ttrss/CommonActivity.java | 10 ++--- .../main/java/org/fox/ttrss/DetailActivity.java | 14 ++++--- .../java/org/fox/ttrss/FeedCategoriesFragment.java | 27 ++++++++---- .../src/main/java/org/fox/ttrss/FeedsFragment.java | 41 ++++++++++++++---- .../main/java/org/fox/ttrss/GalleryActivity.java | 24 ++++++++--- .../java/org/fox/ttrss/GalleryBaseFragment.java | 2 +- .../java/org/fox/ttrss/GalleryImageFragment.java | 20 +++++++-- .../java/org/fox/ttrss/GalleryVideoFragment.java | 26 +++++++++--- .../main/java/org/fox/ttrss/HeadlinesFragment.java | 49 +++++++++++++++------- .../main/java/org/fox/ttrss/LogcatActivity.java | 20 ++++++--- .../main/java/org/fox/ttrss/MasterActivity.java | 12 ++++-- .../java/org/fox/ttrss/StateSavedFragment.java | 23 ---------- .../org/fox/ttrss/share/CommonShareActivity.java | 19 +++++++-- .../java/org/fox/ttrss/types/GalleryEntry.java | 39 ++++++++++++++++- 19 files changed, 276 insertions(+), 131 deletions(-) delete mode 100755 org.fox.ttrss/src/main/java/org/fox/ttrss/StateSavedFragment.java (limited to 'org.fox.ttrss/src/main/java/org') diff --git a/org.fox.ttrss/build.gradle b/org.fox.ttrss/build.gradle index 1b5cf135..be54fc88 100755 --- a/org.fox.ttrss/build.gradle +++ b/org.fox.ttrss/build.gradle @@ -121,10 +121,6 @@ dependencies { implementation 'me.relex:circleindicator:1.2.2@aar' implementation 'com.nineoldandroids:library:2.4.0' implementation 'com.github.amulyakhare:TextDrawable:558677ea31' - implementation 'com.evernote:android-state:1.4.1' - compileOnly 'com.evernote:android-state:1.4.1' - annotationProcessor 'com.evernote:android-state:1.4.1' - implementation 'com.github.livefront:bridge:v1.1.1' } java { toolchain { diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/Application.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/Application.java index a8c4ab00..ae6eaef6 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/Application.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/Application.java @@ -2,16 +2,9 @@ package org.fox.ttrss; import android.os.Bundle; -import com.evernote.android.state.StateSaver; -import com.livefront.bridge.Bridge; -import com.livefront.bridge.SavedStateHandler; - import org.fox.ttrss.types.Article; import org.fox.ttrss.types.ArticleList; -import androidx.annotation.NonNull; -import androidx.annotation.Nullable; - import java.util.LinkedHashMap; public class Application extends android.app.Application { @@ -33,18 +26,6 @@ public class Application extends android.app.Application { public final void onCreate() { super.onCreate(); - Bridge.initialize(getApplicationContext(), new SavedStateHandler() { - @Override - public void saveInstanceState(@NonNull Object target, @NonNull Bundle state) { - StateSaver.saveInstanceState(target, state); - } - - @Override - public void restoreInstanceState(@NonNull Object target, @Nullable Bundle state) { - StateSaver.restoreInstanceState(target, state); - } - }); - m_singleton = this; } diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java index 08905aec..2f5464f9 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java @@ -10,10 +10,8 @@ import android.content.res.ColorStateList; import android.content.res.Resources; import android.graphics.Color; import android.net.Uri; -import android.os.Build; import android.os.Bundle; import android.preference.PreferenceManager; -import android.text.Html; import android.util.Log; import android.util.TypedValue; import android.view.ContextMenu; @@ -30,12 +28,10 @@ import android.webkit.WebView.HitTestResult; import android.webkit.WebViewClient; import android.widget.EditText; import android.widget.FrameLayout; -import android.widget.ImageView; import android.widget.TextView; import androidx.core.text.HtmlCompat; -import com.evernote.android.state.State; import com.google.android.material.button.MaterialButton; import org.fox.ttrss.types.Article; @@ -47,11 +43,10 @@ import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Date; -public class ArticleFragment extends StateSavedFragment { +public class ArticleFragment extends androidx.fragment.app.Fragment { private final String TAG = this.getClass().getSimpleName(); private SharedPreferences m_prefs; - @State protected Article m_article; private DetailActivity m_activity; private WebView m_web; @@ -158,6 +153,15 @@ public class ArticleFragment extends StateSavedFragment { } + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + if (savedInstanceState != null) { + m_article = savedInstanceState.getParcelable("m_article"); + } + } + @SuppressLint("NewApi") @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, final Bundle savedInstanceState) { @@ -627,4 +631,11 @@ public class ArticleFragment extends StateSavedFragment { m_activity = (DetailActivity)activity; } + + @Override + public void onSaveInstanceState(Bundle out) { + super.onSaveInstanceState(out); + + out.putParcelable("m_article", m_article); + } } diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticlePager.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticlePager.java index 9f90df84..eb4cdd55 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticlePager.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticlePager.java @@ -28,20 +28,18 @@ import org.fox.ttrss.util.HeadlinesRequest; import java.util.HashMap; -import com.evernote.android.state.State; - -public class ArticlePager extends StateSavedFragment { +public class ArticlePager extends androidx.fragment.app.Fragment { private final String TAG = "ArticlePager"; private PagerAdapter m_adapter; private HeadlinesEventListener m_listener; - @State protected Article m_article; - @State protected ArticleList m_articles = new ArticleList(); //m_articles = Application.getInstance().m_loadedArticles; + protected Article m_article; + protected ArticleList m_articles = new ArticleList(); //m_articles = Application.getInstance().m_loadedArticles; private OnlineActivity m_activity; private String m_searchQuery = ""; - @State protected Feed m_feed; + protected Feed m_feed; private SharedPreferences m_prefs; - @State protected int m_firstId = 0; + protected int m_firstId = 0; private boolean m_refreshInProgress; private boolean m_lazyLoadDisabled; @@ -115,6 +113,13 @@ public class ArticlePager extends StateSavedFragment { public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + if (savedInstanceState != null) { + m_article = savedInstanceState.getParcelable("m_article"); + m_articles = savedInstanceState.getParcelable("m_articles"); + m_feed = savedInstanceState.getParcelable("m_feed"); + m_firstId = savedInstanceState.getInt("m_firstId"); + } + setRetainInstance(true); } @@ -354,6 +359,16 @@ public class ArticlePager extends StateSavedFragment { m_prefs = PreferenceManager.getDefaultSharedPreferences(getActivity().getApplicationContext()); } + + @Override + public void onSaveInstanceState(Bundle out) { + super.onSaveInstanceState(out); + + out.putParcelable("m_article", m_article); + out.putParcelable("m_articles", m_articles); + out.putParcelable("m_feed", m_feed); + out.putInt("m_firstId", m_firstId); + } @SuppressLint("NewApi") @Override diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/BaseFeedlistFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/BaseFeedlistFragment.java index b97448fe..853cfcbd 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/BaseFeedlistFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/BaseFeedlistFragment.java @@ -11,14 +11,14 @@ import android.widget.ImageView; import android.widget.ListView; import android.widget.TextView; +import androidx.appcompat.widget.SwitchCompat; + import org.fox.ttrss.offline.OfflineActivity; import java.net.MalformedURLException; import java.net.URL; -import androidx.appcompat.widget.SwitchCompat; - -public abstract class BaseFeedlistFragment extends StateSavedFragment { +public abstract class BaseFeedlistFragment extends androidx.fragment.app.Fragment { abstract public void refresh(); public void initDrawerHeader(LayoutInflater inflater, View view, ListView list, final CommonActivity activity, final SharedPreferences prefs, boolean isRoot) { diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java index 13c4490a..f0416353 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java @@ -47,9 +47,7 @@ import com.bumptech.glide.Glide; import com.bumptech.glide.load.engine.DiskCacheStrategy; import com.bumptech.glide.request.animation.GlideAnimation; import com.bumptech.glide.request.target.SimpleTarget; -import com.evernote.android.state.State; import com.google.android.material.snackbar.Snackbar; -import com.livefront.bridge.Bridge; import org.fox.ttrss.util.DatabaseHelper; import org.fox.ttrss.widget.SmallWidgetProvider; @@ -90,7 +88,6 @@ public class CommonActivity extends AppCompatActivity implements SharedPreferenc //private SQLiteDatabase m_writableDb; private boolean m_smallScreenMode = true; - @State protected String m_theme; private boolean m_needRestart; @@ -263,10 +260,10 @@ public class CommonActivity extends AppCompatActivity implements SharedPreferenc setupWidgetUpdates(this); - Bridge.restoreInstanceState(this, savedInstanceState); - if (savedInstanceState == null) { m_theme = m_prefs.getString("theme", CommonActivity.THEME_DEFAULT); + } else { + m_theme = savedInstanceState.getString("m_theme"); } String customTabPackageName = getCustomTabPackageName(this); @@ -282,7 +279,8 @@ public class CommonActivity extends AppCompatActivity implements SharedPreferenc @Override public void onSaveInstanceState(Bundle out) { super.onSaveInstanceState(out); - Bridge.saveInstanceState(this, out); + + out.putString("m_theme", m_theme); } public boolean isSmallScreen() { diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/DetailActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/DetailActivity.java index cd263d87..56fc1539 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/DetailActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/DetailActivity.java @@ -13,19 +13,17 @@ import android.util.Log; import android.view.MenuItem; import android.view.View; -import com.evernote.android.state.State; +import androidx.appcompat.widget.Toolbar; +import androidx.fragment.app.FragmentTransaction; + import com.google.android.material.floatingactionbutton.FloatingActionButton; import org.fox.ttrss.types.Article; import org.fox.ttrss.types.ArticleList; import org.fox.ttrss.types.Feed; -import androidx.appcompat.widget.Toolbar; -import androidx.fragment.app.FragmentTransaction; - public class DetailActivity extends OnlineActivity implements HeadlinesEventListener { private final String TAG = this.getClass().getSimpleName(); - @State protected ArticleList m_articles = new ArticleList(); protected SharedPreferences m_prefs; @@ -41,6 +39,10 @@ public class DetailActivity extends OnlineActivity implements HeadlinesEventList super.onCreate(savedInstanceState); + if (savedInstanceState != null) { + m_articles = savedInstanceState.getParcelable("m_articles"); + } + if (m_prefs.getBoolean("force_phone_layout", false)) { setContentView(R.layout.activity_detail_phone); } else { @@ -167,6 +169,8 @@ public class DetailActivity extends OnlineActivity implements HeadlinesEventList public void onSaveInstanceState(Bundle out) { super.onSaveInstanceState(out); + out.putParcelable("m_articles", m_articles); + Application.getInstance().save(out); } diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java index 876b3894..af925ea4 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java @@ -24,6 +24,10 @@ import android.widget.ImageView; import android.widget.ListView; import android.widget.TextView; +import androidx.loader.app.LoaderManager; +import androidx.loader.content.Loader; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; + import com.google.gson.Gson; import com.google.gson.JsonArray; import com.google.gson.JsonElement; @@ -40,17 +44,12 @@ import java.util.Comparator; import java.util.HashMap; import java.util.List; -import androidx.loader.app.LoaderManager; -import androidx.loader.content.Loader; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import com.evernote.android.state.State; - public class FeedCategoriesFragment extends BaseFeedlistFragment implements OnItemClickListener, OnSharedPreferenceChangeListener, LoaderManager.LoaderCallbacks { private final String TAG = this.getClass().getSimpleName(); private FeedCategoryListAdapter m_adapter; private FeedCategoryList m_cats = new FeedCategoryList(); - @State FeedCategory m_selectedCat; + FeedCategory m_selectedCat; private MasterActivity m_activity; private SwipeRefreshLayout m_swipeLayout; private ListView m_list; @@ -288,7 +287,16 @@ public class FeedCategoriesFragment extends BaseFeedlistFragment implements OnIt return null; } } - + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + if (savedInstanceState != null) { + m_selectedCat = savedInstanceState.getParcelable("m_selectedCat"); + } + } + @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { @@ -472,5 +480,10 @@ public class FeedCategoriesFragment extends BaseFeedlistFragment implements OnIt } } + @Override + public void onSaveInstanceState(Bundle out) { + super.onSaveInstanceState(out); + out.putParcelable("m_selectedCat", m_selectedCat); + } } diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java index c415eee9..ec6c508d 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java @@ -29,6 +29,10 @@ import android.widget.ImageView; import android.widget.ListView; import android.widget.TextView; +import androidx.loader.app.LoaderManager; +import androidx.loader.content.Loader; +import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; + import com.google.gson.Gson; import com.google.gson.JsonArray; import com.google.gson.JsonElement; @@ -45,11 +49,6 @@ import java.util.Comparator; import java.util.HashMap; import java.util.List; -import androidx.loader.app.LoaderManager; -import androidx.loader.content.Loader; -import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import com.evernote.android.state.State; - public class FeedsFragment extends BaseFeedlistFragment implements OnItemClickListener, OnSharedPreferenceChangeListener, LoaderManager.LoaderCallbacks { private final String TAG = this.getClass().getSimpleName(); @@ -57,10 +56,10 @@ public class FeedsFragment extends BaseFeedlistFragment implements OnItemClickLi private FeedListAdapter m_adapter; private FeedList m_feeds = new FeedList(); private MasterActivity m_activity; - @State Feed m_selectedFeed; - @State FeedCategory m_activeCategory; + Feed m_selectedFeed; + FeedCategory m_activeCategory; private SwipeRefreshLayout m_swipeLayout; - @State boolean m_enableParentBtn = false; + boolean m_enableParentBtn = false; private ListView m_list; public void initialize(FeedCategory cat, boolean enableParentBtn) { @@ -332,6 +331,32 @@ public class FeedsFragment extends BaseFeedlistFragment implements OnItemClickLi super.onCreateContextMenu(menu, v, menuInfo); } + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + if (savedInstanceState != null) { + ArrayList list = savedInstanceState.getParcelableArrayList("m_feeds"); + + m_feeds.clear(); + m_feeds.addAll(list); + + m_selectedFeed = savedInstanceState.getParcelable("m_selectedFeed"); + m_activeCategory = savedInstanceState.getParcelable("m_activeCategory"); + m_enableParentBtn = savedInstanceState.getBoolean("m_enableParentBtn"); + } + } + + @Override + public void onSaveInstanceState(Bundle out) { + super.onSaveInstanceState(out); + + out.putParcelableArrayList("m_feeds", m_feeds); + out.putParcelable("m_selectedFeed", m_selectedFeed); + out.putParcelable("m_activeCategory", m_activeCategory); + out.putBoolean("m_enableParentBtn", m_enableParentBtn); + } @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryActivity.java index e0cb2cea..f37d4a98 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryActivity.java @@ -34,16 +34,15 @@ import java.util.ArrayList; import java.util.List; import java.util.concurrent.ExecutionException; -import com.evernote.android.state.State; import me.relex.circleindicator.CircleIndicator; public class GalleryActivity extends CommonActivity { private final String TAG = this.getClass().getSimpleName(); - @State protected ArrayList m_items = new ArrayList<>(); - @State protected String m_title; + protected ArrayList m_items = new ArrayList<>(); + protected String m_title; private ArticleImagesPagerAdapter m_adapter; - @State public String m_content; + public String m_content; private ViewPager m_pager; private ProgressBar m_checkProgress; @@ -234,6 +233,14 @@ public class GalleryActivity extends CommonActivity { return firstFound; } + public void onSaveInstanceState(Bundle out) { + super.onSaveInstanceState(out); + + out.putParcelableArrayList("m_items", m_items); + out.putString("m_title", m_title); + out.putString("m_content", m_content); + } + @Override public void onCreate(Bundle savedInstanceState) { ActivityCompat.postponeEnterTransition(this); @@ -242,7 +249,6 @@ public class GalleryActivity extends CommonActivity { m_prefs = PreferenceManager .getDefaultSharedPreferences(getApplicationContext()); - getDelegate().setLocalNightMode(AppCompatDelegate.MODE_NIGHT_YES); setTheme(R.style.AppTheme); @@ -273,6 +279,14 @@ public class GalleryActivity extends CommonActivity { if (!collectGalleryContents(imgSrcFirst, doc, uncheckedItems)) if (!collectGalleryContents("", doc, uncheckedItems)) m_items.add(new GalleryEntry(imgSrcFirst, GalleryEntry.GalleryEntryType.TYPE_IMAGE, null)); + } else { + ArrayList list = savedInstanceState.getParcelableArrayList("m_items"); + + m_items.clear(); + m_items.addAll(list); + + m_title = savedInstanceState.getString("m_title"); + m_content = savedInstanceState.getString("m_content"); } findViewById(R.id.gallery_overflow).setOnClickListener(new View.OnClickListener() { diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryBaseFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryBaseFragment.java index 338845a2..b35ca9e7 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryBaseFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryBaseFragment.java @@ -5,7 +5,7 @@ import android.os.Bundle; import android.view.ContextMenu; import android.view.View; -public class GalleryBaseFragment extends StateSavedFragment { +public class GalleryBaseFragment extends androidx.fragment.app.Fragment { private final String TAG = this.getClass().getSimpleName(); protected GalleryActivity m_activity; diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryImageFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryImageFragment.java index 44dbea12..8513c50c 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryImageFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryImageFragment.java @@ -19,12 +19,19 @@ import com.bumptech.glide.request.RequestListener; import com.bumptech.glide.request.target.GlideDrawableImageViewTarget; import com.bumptech.glide.request.target.Target; -import com.evernote.android.state.State; - public class GalleryImageFragment extends GalleryBaseFragment { private final String TAG = this.getClass().getSimpleName(); - @State String m_url; + String m_url; + + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + if (savedInstanceState != null) { + m_url = savedInstanceState.getParcelable("m_url"); + } + } @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { @@ -84,6 +91,13 @@ public class GalleryImageFragment extends GalleryBaseFragment { m_url = url; } + @Override + public void onSaveInstanceState(Bundle out) { + super.onSaveInstanceState(out); + + out.putString("m_url", m_url); + } + /*@Override public boolean onContextItemSelected(MenuItem item) { int position = m_pager.getCurrentItem(); diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryVideoFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryVideoFragment.java index 751975d3..2e2df149 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryVideoFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryVideoFragment.java @@ -15,20 +15,36 @@ import android.view.ViewGroup; import android.widget.ImageView; import android.widget.MediaController; -import java.io.IOException; - import androidx.core.app.ActivityCompat; import androidx.core.view.ViewCompat; -import com.evernote.android.state.State; + +import java.io.IOException; public class GalleryVideoFragment extends GalleryBaseFragment { private final String TAG = this.getClass().getSimpleName(); - @State String m_url; - @State String m_coverUrl; + String m_url; + String m_coverUrl; MediaPlayer m_mediaPlayer; private boolean m_userVisibleHint = false; + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + + if (savedInstanceState != null) { + m_url = savedInstanceState.getString("m_url"); + m_coverUrl = savedInstanceState.getString("m_coverUrl"); + } + } + + @Override + public void onSaveInstanceState(Bundle out) { + super.onSaveInstanceState(out); + + out.putString("m_url", m_url); + out.putString("m_coverUrl", m_coverUrl); + } + @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { final View view = inflater.inflate(R.layout.fragment_gallery_entry, container, false); diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java index c6d4f902..35ca0dba 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java @@ -8,7 +8,6 @@ import android.content.Context; import android.content.DialogInterface; import android.content.Intent; import android.content.SharedPreferences; -import android.content.pm.ApplicationInfo; import android.content.res.ColorStateList; import android.content.res.Resources.Theme; import android.graphics.Paint; @@ -43,7 +42,6 @@ import android.view.ViewGroup; import android.view.ViewTreeObserver; import android.view.WindowManager; import android.widget.AdapterView.AdapterContextMenuInfo; -import android.widget.Button; import android.widget.CheckBox; import android.widget.EditText; import android.widget.ImageView; @@ -71,7 +69,6 @@ import com.bumptech.glide.load.resource.drawable.GlideDrawable; import com.bumptech.glide.request.RequestListener; import com.bumptech.glide.request.target.GlideDrawableImageViewTarget; import com.bumptech.glide.request.target.Target; -import com.evernote.android.state.State; import com.google.android.material.button.MaterialButton; import com.google.android.material.snackbar.Snackbar; import com.google.gson.JsonElement; @@ -91,14 +88,11 @@ import java.text.SimpleDateFormat; import java.util.ArrayList; import java.util.Date; import java.util.HashMap; -import java.util.List; import java.util.TimeZone; -import java.util.concurrent.TimeUnit; -import com.evernote.android.state.State; import jp.wasabeef.glide.transformations.CropCircleTransformation; -public class HeadlinesFragment extends StateSavedFragment { +public class HeadlinesFragment extends androidx.fragment.app.Fragment { public enum ArticlesSelection { ALL, NONE, UNREAD } @@ -109,24 +103,23 @@ public class HeadlinesFragment extends StateSavedFragment { private final String TAG = this.getClass().getSimpleName(); - @State Feed m_feed; - @State Article m_activeArticle; - @State String m_searchQuery = ""; + Article m_activeArticle; + String m_searchQuery = ""; private boolean m_refreshInProgress = false; - @State int m_firstId = 0; - @State boolean m_lazyLoadDisabled = false; + int m_firstId = 0; + boolean m_lazyLoadDisabled = false; private SharedPreferences m_prefs; private HeaderViewRecyclerAdapter m_adapter; - @State ArticleList m_articles = new ArticleList(); + ArticleList m_articles = new ArticleList(); private ArticleList m_readArticles = new ArticleList(); private HeadlinesEventListener m_listener; private OnlineActivity m_activity; private SwipeRefreshLayout m_swipeLayout; private int m_maxImageSize = 0; - @State boolean m_compactLayoutMode = false; + boolean m_compactLayoutMode = false; private RecyclerView m_list; private LinearLayoutManager m_layoutManager; @@ -287,11 +280,39 @@ public class HeadlinesFragment extends StateSavedFragment { public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + if (savedInstanceState != null) { + m_feed = savedInstanceState.getParcelable("m_feed"); + m_activeArticle = savedInstanceState.getParcelable("m_activeArticle"); + m_searchQuery = savedInstanceState.getString("m_searchQuery"); + m_firstId = savedInstanceState.getInt("m_firstId"); + m_lazyLoadDisabled = savedInstanceState.getBoolean("m_lazyLoadDisabled"); + + ArrayList
list = savedInstanceState.getParcelableArrayList("m_articles"); + + m_articles.clear(); // ? + m_articles.addAll(list); + + savedInstanceState.getBoolean("m_compactLayoutMode", m_compactLayoutMode); + } + setRetainInstance(true); Glide.get(getContext()).clearMemory(); } + @Override + public void onSaveInstanceState(Bundle out) { + super.onSaveInstanceState(out); + + out.putParcelable("m_feed", m_feed); + out.putParcelable("m_activeArticle", m_activeArticle); + out.putString("m_searchQuery", m_searchQuery); + out.putInt("m_firstId", m_firstId); + out.putBoolean("m_lazyLoadDisabled", m_lazyLoadDisabled); + out.putParcelable("m_articles", m_articles); + out.putBoolean("m_compactLayoutMode", m_compactLayoutMode); + } + @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/LogcatActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/LogcatActivity.java index 75a9c268..60fad0ba 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/LogcatActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/LogcatActivity.java @@ -7,19 +7,18 @@ import android.view.MenuItem; import android.widget.ArrayAdapter; import android.widget.ListView; -import java.io.BufferedReader; -import java.io.InputStreamReader; -import java.util.ArrayList; - import androidx.appcompat.app.AppCompatDelegate; import androidx.appcompat.widget.Toolbar; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; -import com.evernote.android.state.State; + +import java.io.BufferedReader; +import java.io.InputStreamReader; +import java.util.ArrayList; public class LogcatActivity extends CommonActivity { private static final int MAX_LOG_ENTRIES = 500; private final String TAG = this.getClass().getSimpleName(); - @State protected ArrayList m_items = new ArrayList<>(); + protected ArrayList m_items = new ArrayList<>(); ArrayAdapter m_adapter; ListView m_list; @@ -41,6 +40,8 @@ public class LogcatActivity extends CommonActivity { if (savedInstanceState == null) { refresh(); + } else { + m_items = savedInstanceState.getStringArrayList("m_items"); } m_adapter = new ArrayAdapter<>(this, R.layout.logcat_row, m_items); @@ -59,6 +60,13 @@ public class LogcatActivity extends CommonActivity { }); } + @Override + public void onSaveInstanceState(Bundle out) { + super.onSaveInstanceState(out); + + out.putStringArrayList("m_items", m_items); + } + private void refresh() { m_items.clear(); diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java index 7591774d..62fa7227 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java @@ -34,8 +34,6 @@ import java.util.Date; import java.util.HashMap; import java.util.LinkedHashMap; -import com.evernote.android.state.State; - public class MasterActivity extends OnlineActivity implements HeadlinesEventListener { private final String TAG = this.getClass().getSimpleName(); @@ -45,8 +43,8 @@ public class MasterActivity extends OnlineActivity implements HeadlinesEventList protected long m_lastRefresh = 0; protected long m_lastWidgetRefresh = 0; - @State protected boolean m_feedIsSelected = false; - @State protected boolean m_userFeedSelected = false; + protected boolean m_feedIsSelected = false; + protected boolean m_userFeedSelected = false; private ActionBarDrawerToggle m_drawerToggle; private DrawerLayout m_drawerLayout; @@ -196,6 +194,9 @@ public class MasterActivity extends OnlineActivity implements HeadlinesEventList } else { // savedInstanceState != null + m_feedIsSelected = savedInstanceState.getBoolean("m_feedIsSelected"); + m_userFeedSelected = savedInstanceState.getBoolean("m_userFeedSelected"); + if (m_drawerLayout != null && !m_feedIsSelected) { m_drawerLayout.openDrawer(GravityCompat.START); } @@ -411,6 +412,9 @@ public class MasterActivity extends OnlineActivity implements HeadlinesEventList public void onSaveInstanceState(Bundle out) { super.onSaveInstanceState(out); + out.putBoolean("m_feedIsSelected", m_feedIsSelected); + out.putBoolean("m_userFeedSelected", m_userFeedSelected); + Application.getInstance().save(out); } diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/StateSavedFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/StateSavedFragment.java deleted file mode 100755 index 08802acd..00000000 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/StateSavedFragment.java +++ /dev/null @@ -1,23 +0,0 @@ -package org.fox.ttrss; - -import android.os.Bundle; - -import com.livefront.bridge.Bridge; - -import androidx.fragment.app.Fragment; - -public class StateSavedFragment extends Fragment { - @Override - public void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - - Bridge.restoreInstanceState(this, savedInstanceState); - } - - @Override - public void onSaveInstanceState(Bundle out) { - super.onSaveInstanceState(out); - - Bridge.saveInstanceState(this, out); - } -} diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/share/CommonShareActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/share/CommonShareActivity.java index e810f49f..620916f8 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/share/CommonShareActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/share/CommonShareActivity.java @@ -16,13 +16,11 @@ import org.fox.ttrss.PreferencesActivity; import org.fox.ttrss.R; import org.fox.ttrss.util.SimpleLoginManager; -import com.evernote.android.state.State; - public abstract class CommonShareActivity extends CommonActivity { protected SharedPreferences m_prefs; - @State protected String m_sessionId; - @State protected int m_apiLevel = 0; + protected String m_sessionId; + protected int m_apiLevel = 0; private final String TAG = this.getClass().getSimpleName(); @@ -31,9 +29,22 @@ public abstract class CommonShareActivity extends CommonActivity { m_prefs = PreferenceManager .getDefaultSharedPreferences(getApplicationContext()); + if (savedInstanceState != null) { + m_sessionId = savedInstanceState.getString("m_sessionId"); + m_apiLevel = savedInstanceState.getInt("m_apiLevel"); + } + super.onCreate(savedInstanceState); } + @Override + public void onSaveInstanceState(Bundle out) { + super.onSaveInstanceState(out); + + out.putString("m_sessionId", m_sessionId); + out.putInt("m_apiLevel", m_apiLevel); + } + protected abstract void onLoggedIn(int requestId); protected abstract void onLoggingIn(int requestId); diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/types/GalleryEntry.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/types/GalleryEntry.java index 0eb45074..50e34f78 100644 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/types/GalleryEntry.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/types/GalleryEntry.java @@ -1,14 +1,51 @@ package org.fox.ttrss.types; +import android.os.Parcel; +import android.os.Parcelable; + import java.io.Serializable; -public class GalleryEntry implements Serializable { +public class GalleryEntry implements Serializable, Parcelable { + @Override + public int describeContents() { + return 0; + } + + @SuppressWarnings("rawtypes") + public static final Parcelable.Creator CREATOR = + new Parcelable.Creator() { + public GalleryEntry createFromParcel(Parcel in) { + return new GalleryEntry(in); + } + + public GalleryEntry[] newArray(int size) { + return new GalleryEntry[size]; + } + }; + public enum GalleryEntryType { TYPE_IMAGE, TYPE_VIDEO } public String url; public GalleryEntryType type; public String coverUrl; + @Override + public void writeToParcel(Parcel out, int flags) { + out.writeString(url); + out.writeString(type.name()); + out.writeString(coverUrl); + } + + public void readFromParcel(Parcel in) { + url = in.readString(); + type = GalleryEntryType.valueOf(in.readString()); + coverUrl = in.readString(); + } + + public GalleryEntry(Parcel in) { + readFromParcel(in); + } + public GalleryEntry() { // } -- cgit v1.2.3-54-g00ecf From 9644a0f5925fa09d5677784ba92b6710bfc29d15 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 6 May 2025 15:55:54 +0300 Subject: drop some custom colors, replace with material3 theme stock; some tablet fixes --- .../main/java/org/fox/ttrss/ArticleFragment.java | 8 ++----- .../src/main/java/org/fox/ttrss/ArticlePager.java | 22 +++++++++--------- .../main/java/org/fox/ttrss/DetailActivity.java | 1 + .../main/java/org/fox/ttrss/HeadlinesFragment.java | 15 ++++++++++--- .../fox/ttrss/offline/OfflineArticleFragment.java | 26 +++++----------------- .../ttrss/offline/OfflineHeadlinesFragment.java | 2 +- .../res/layout-sw600dp-land/activity_master.xml | 3 +-- .../res/layout-sw600dp-port/activity_master.xml | 6 ++--- .../main/res/layout-sw600dp/activity_detail.xml | 3 +-- .../src/main/res/layout/activity_detail_phone.xml | 3 +-- .../src/main/res/layout/activity_master_phone.xml | 6 ++--- .../src/main/res/layout/feeds_row_selected.xml | 2 +- .../res/layout/headlines_row_selected_compact.xml | 2 +- .../headlines_row_selected_unread_compact.xml | 2 +- .../src/main/res/layout/headlines_row_unread.xml | 2 +- .../res/layout/headlines_row_unread_compact.xml | 12 +++++----- org.fox.ttrss/src/main/res/values-night/style.xml | 6 ----- org.fox.ttrss/src/main/res/values/attrs.xml | 7 ------ org.fox.ttrss/src/main/res/values/style.xml | 6 ----- 19 files changed, 50 insertions(+), 84 deletions(-) (limited to 'org.fox.ttrss/src/main/java/org') diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java index 2f5464f9..86a68d5b 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java @@ -405,8 +405,6 @@ public class ArticleFragment extends androidx.fragment.app.Fragment { m_web = view.findViewById(R.id.article_content); - m_web.setBackgroundColor(Color.TRANSPARENT); - m_web.setWebViewClient(new WebViewClient() { @Override public boolean shouldOverrideUrlLoading(WebView view, String url) { @@ -495,17 +493,15 @@ public class ArticleFragment extends androidx.fragment.app.Fragment { String articleContent = m_article.content != null ? m_article.content : ""; - ws.setJavaScriptEnabled(true); + ws.setJavaScriptEnabled(false); m_chromeClient = new FSVideoChromeClient(getView()); m_web.setWebChromeClient(m_chromeClient); + m_web.setBackgroundColor(Color.TRANSPARENT); ws.setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW); ws.setMediaPlaybackRequiresUserGesture(true); - if (m_activity.isUiNightMode()) { - m_web.setBackgroundColor(Color.BLACK); - } if (m_prefs.getBoolean("justify_article_text", true)) { cssOverride += "body { text-align : justify; } "; diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticlePager.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticlePager.java index eb4cdd55..cdaca2dd 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticlePager.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticlePager.java @@ -109,13 +109,23 @@ public class ArticlePager extends androidx.fragment.app.Fragment { m_searchQuery = searchQuery; } + @Override + public void onSaveInstanceState(Bundle out) { + super.onSaveInstanceState(out); + + out.putParcelable("m_article", m_article); + //out.putParcelable("m_articles", m_articles); + out.putParcelable("m_feed", m_feed); + out.putInt("m_firstId", m_firstId); + } + @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); if (savedInstanceState != null) { m_article = savedInstanceState.getParcelable("m_article"); - m_articles = savedInstanceState.getParcelable("m_articles"); + //m_articles = savedInstanceState.getParcelable("m_articles"); m_feed = savedInstanceState.getParcelable("m_feed"); m_firstId = savedInstanceState.getInt("m_firstId"); } @@ -360,16 +370,6 @@ public class ArticlePager extends androidx.fragment.app.Fragment { m_prefs = PreferenceManager.getDefaultSharedPreferences(getActivity().getApplicationContext()); } - @Override - public void onSaveInstanceState(Bundle out) { - super.onSaveInstanceState(out); - - out.putParcelable("m_article", m_article); - out.putParcelable("m_articles", m_articles); - out.putParcelable("m_feed", m_feed); - out.putInt("m_firstId", m_firstId); - } - @SuppressLint("NewApi") @Override public void onResume() { diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/DetailActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/DetailActivity.java index 56fc1539..eda894dc 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/DetailActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/DetailActivity.java @@ -114,6 +114,7 @@ public class DetailActivity extends OnlineActivity implements HeadlinesEventList ArticleList tmp = Application.getInstance().tmpArticleList; if (tmp != null) { + m_articles.clear(); m_articles.addAll(tmp); } diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java index 35ca0dba..f1546080 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java @@ -287,10 +287,17 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment { m_firstId = savedInstanceState.getInt("m_firstId"); m_lazyLoadDisabled = savedInstanceState.getBoolean("m_lazyLoadDisabled"); - ArrayList
list = savedInstanceState.getParcelableArrayList("m_articles"); + /*ArrayList
list = savedInstanceState.getParcelableArrayList("m_articles"); m_articles.clear(); // ? - m_articles.addAll(list); + m_articles.addAll(list);*/ + + ArticleList tmp = Application.getInstance().tmpArticleList; + + if (tmp != null) { + m_articles.clear(); + m_articles.addAll(Application.getInstance().tmpArticleList); + } savedInstanceState.getBoolean("m_compactLayoutMode", m_compactLayoutMode); } @@ -309,8 +316,10 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment { out.putString("m_searchQuery", m_searchQuery); out.putInt("m_firstId", m_firstId); out.putBoolean("m_lazyLoadDisabled", m_lazyLoadDisabled); - out.putParcelable("m_articles", m_articles); + //out.putParcelable("m_articles", m_articles); out.putBoolean("m_compactLayoutMode", m_compactLayoutMode); + + Application.getInstance().tmpArticleList = m_articles; } @Override diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java index 28839388..465c461d 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java @@ -276,10 +276,6 @@ public class OfflineArticleFragment extends Fragment { if (m_web != null) { - if (m_activity.isUiNightMode()) { - m_web.setBackgroundColor(Color.BLACK); - } - m_web.setWebViewClient(new WebViewClient() { @Override public boolean shouldOverrideUrlLoading(WebView view, String url) { @@ -312,19 +308,16 @@ public class OfflineArticleFragment extends Fragment { }); String content; - String cssOverride = ""; WebSettings ws = m_web.getSettings(); ws.setSupportZoom(false); + ws.setJavaScriptEnabled(false); - if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { - ws.setJavaScriptEnabled(true); + m_chromeClient = new FSVideoChromeClient(getView()); + m_web.setWebChromeClient(m_chromeClient); + m_web.setBackgroundColor(Color.TRANSPARENT); - m_chromeClient = new FSVideoChromeClient(getView()); - m_web.setWebChromeClient(m_chromeClient); - - ws.setMediaPlaybackRequiresUserGesture(true); - } + ws.setMediaPlaybackRequiresUserGesture(true); // we need to show "insecure" file:// urls if (m_prefs.getBoolean("offline_image_cache_enabled", false) && @@ -333,19 +326,12 @@ public class OfflineArticleFragment extends Fragment { ws.setMixedContentMode(WebSettings.MIXED_CONTENT_ALWAYS_ALLOW); } - TypedValue tvBackground = new TypedValue(); - getActivity().getTheme().resolveAttribute(R.attr.articleBackground, tvBackground, true); - - String backgroundHexColor = String.format("#%06X", (0xFFFFFF & tvBackground.data)); - - cssOverride = "body { background : "+ backgroundHexColor+"; }"; - TypedValue tvTextColor = new TypedValue(); getActivity().getTheme().resolveAttribute(R.attr.articleTextColor, tvTextColor, true); String textColor = String.format("#%06X", (0xFFFFFF & tvTextColor.data)); - cssOverride += "body { color : "+textColor+"; }"; + String cssOverride = "body { color : "+textColor+"; }"; TypedValue tvLinkColor = new TypedValue(); getActivity().getTheme().resolveAttribute(R.attr.linkColor, tvLinkColor, true); diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java index 386af632..258a1ddd 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java @@ -505,7 +505,7 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis public ImageView flavorVideoKindView; public View flavorImageOverflow; public View headlineHeader; - public ImageView attachmentsView; + public MaterialButton attachmentsView; public MaterialButton scoreView; public ArticleViewHolder(View v) { diff --git a/org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_master.xml b/org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_master.xml index 9ba663f6..879725c1 100644 --- a/org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_master.xml +++ b/org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_master.xml @@ -27,14 +27,13 @@ android:layout_width="0dp" android:layout_height="match_parent" android:layout_weight="0.25" - android:background="?feedlistBackground" > + android:background="?colorSurfaceContainer"> + android:layout_height="wrap_content"/> @@ -45,7 +44,6 @@ android:layout_width="300dp" android:layout_height="match_parent" android:layout_gravity="start" - android:background="@android:color/white" android:elevation="10dp" android:fitsSystemWindows="true" app:insetForeground="#4000"> @@ -53,7 +51,7 @@ diff --git a/org.fox.ttrss/src/main/res/layout-sw600dp/activity_detail.xml b/org.fox.ttrss/src/main/res/layout-sw600dp/activity_detail.xml index 89ab61f5..be10ef36 100644 --- a/org.fox.ttrss/src/main/res/layout-sw600dp/activity_detail.xml +++ b/org.fox.ttrss/src/main/res/layout-sw600dp/activity_detail.xml @@ -26,8 +26,7 @@ android:id="@+id/headlines_fragment" android:layout_width="0dp" android:layout_height="match_parent" - android:layout_weight="0.3" - android:background="?headlinesBackground" > + android:layout_weight="0.3"> + android:layout_width="0dp"> \ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/layout/activity_master_phone.xml b/org.fox.ttrss/src/main/res/layout/activity_master_phone.xml index 6ae5064f..9f47eb24 100644 --- a/org.fox.ttrss/src/main/res/layout/activity_master_phone.xml +++ b/org.fox.ttrss/src/main/res/layout/activity_master_phone.xml @@ -31,8 +31,7 @@ android:id="@+id/headlines_fragment" app:layout_behavior=".util.FabAwareScrollingViewBehavior" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:background="?headlinesBackground" /> + android:layout_height="wrap_content"/> @@ -42,7 +41,6 @@ android:layout_width="300dp" android:layout_height="match_parent" android:layout_gravity="start" - android:background="@android:color/white" android:elevation="10dp" android:fitsSystemWindows="true" app:insetForeground="#4000"> @@ -50,7 +48,7 @@ diff --git a/org.fox.ttrss/src/main/res/layout/feeds_row_selected.xml b/org.fox.ttrss/src/main/res/layout/feeds_row_selected.xml index d5b6cb3c..6c7a4b29 100755 --- a/org.fox.ttrss/src/main/res/layout/feeds_row_selected.xml +++ b/org.fox.ttrss/src/main/res/layout/feeds_row_selected.xml @@ -5,7 +5,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:descendantFocusability="blocksDescendants" - android:background="?feedsSelectedBackground" + android:background="?colorSurfaceDim" android:paddingLeft="16dp" android:paddingRight="16dp" android:paddingTop="8dp" diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_selected_compact.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_selected_compact.xml index da2401eb..bd114157 100755 --- a/org.fox.ttrss/src/main/res/layout/headlines_row_selected_compact.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines_row_selected_compact.xml @@ -8,7 +8,7 @@ android:layout_width="fill_parent" android:layout_height="wrap_content" android:orientation="horizontal" - android:background="?headlineSelectedBackground" + android:background="?colorPrimaryContainer" tools:ignore="HardcodedText" > + android:background="?colorSurfaceContainerLowest"> - - - + app:icon="?ic_star_outline" /> diff --git a/org.fox.ttrss/src/main/res/values-night/style.xml b/org.fox.ttrss/src/main/res/values-night/style.xml index 3c15a0fd..9f9183e8 100644 --- a/org.fox.ttrss/src/main/res/values-night/style.xml +++ b/org.fox.ttrss/src/main/res/values-night/style.xml @@ -13,19 +13,13 @@ #00FF00 #bebebe ?headlineSelectedExcerptTextColor - #1c1c1c #99000000 - #101010 #2d92c8 @android:color/black #bebebe #303030 #101010 @android:drawable/divider_horizontal_dark - #1c1d1e - #1c1d1e - @android:color/black - #1c1c1c @android:color/white @android:color/transparent @android:color/white diff --git a/org.fox.ttrss/src/main/res/values/attrs.xml b/org.fox.ttrss/src/main/res/values/attrs.xml index 93892545..a16fd6f4 100755 --- a/org.fox.ttrss/src/main/res/values/attrs.xml +++ b/org.fox.ttrss/src/main/res/values/attrs.xml @@ -1,16 +1,9 @@ - - - - - - - diff --git a/org.fox.ttrss/src/main/res/values/style.xml b/org.fox.ttrss/src/main/res/values/style.xml index 6a494015..ab3f39dc 100755 --- a/org.fox.ttrss/src/main/res/values/style.xml +++ b/org.fox.ttrss/src/main/res/values/style.xml @@ -11,14 +11,8 @@ @android:drawable/divider_horizontal_bright - #e0e0e0 #909090 - #f0f0f0 - @android:color/white - #dddddd #ccffffff - @android:color/white - #dddddd @android:color/black @android:color/black @android:color/black -- cgit v1.2.3-54-g00ecf From 97e92defd99b4d9b4bbb85a6a7170a70b05cae75 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 6 May 2025 19:58:35 +0300 Subject: drawer style tweaks --- .../java/org/fox/ttrss/BaseFeedlistFragment.java | 210 +++++++++------------ .../java/org/fox/ttrss/FeedCategoriesFragment.java | 2 +- .../res/layout-sw600dp-land/activity_master.xml | 28 ++- .../res/layout-sw600dp-port/activity_master.xml | 11 +- .../src/main/res/layout/activity_detail_phone.xml | 1 - .../src/main/res/layout/activity_master_phone.xml | 24 +-- .../src/main/res/layout/drawer_header.xml | 38 ++-- org.fox.ttrss/src/main/res/layout/feeds_goback.xml | 8 +- org.fox.ttrss/src/main/res/layout/feeds_row.xml | 116 ++++++------ .../src/main/res/layout/feeds_row_selected.xml | 120 ++++++------ .../src/main/res/layout/feeds_row_toggle.xml | 6 +- .../src/main/res/layout/fragment_cats.xml | 20 -- .../src/main/res/layout/fragment_feeds.xml | 4 +- org.fox.ttrss/src/main/res/values/style.xml | 3 +- 14 files changed, 260 insertions(+), 331 deletions(-) delete mode 100755 org.fox.ttrss/src/main/res/layout/fragment_cats.xml (limited to 'org.fox.ttrss/src/main/java/org') diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/BaseFeedlistFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/BaseFeedlistFragment.java index 853cfcbd..0952e7f7 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/BaseFeedlistFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/BaseFeedlistFragment.java @@ -25,152 +25,112 @@ public abstract class BaseFeedlistFragment extends androidx.fragment.app.Fragmen boolean isOffline = activity instanceof OfflineActivity; - if (true /*m_activity.findViewById(R.id.headlines_drawer) != null*/) { - try { + try { + View layout = inflater.inflate(R.layout.drawer_header, list, false); + list.addHeaderView(layout, null, false); - boolean needSettingsFooter = false; + TextView login = view.findViewById(R.id.drawer_header_login); + TextView server = view.findViewById(R.id.drawer_header_server); - if (activity.isSmallScreen()) { - View layout = inflater.inflate(R.layout.drawer_header, list, false); - list.addHeaderView(layout, null, false); + login.setText(prefs.getString("login", "")); + try { + server.setText(new URL(prefs.getString("ttrss_url", "")).getHost()); + } catch (MalformedURLException e) { + server.setText(""); + } - TextView login = view.findViewById(R.id.drawer_header_login); - TextView server = view.findViewById(R.id.drawer_header_server); + View settings = view.findViewById(R.id.drawer_settings_btn); - login.setText(prefs.getString("login", "")); + settings.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { try { - server.setText(new URL(prefs.getString("ttrss_url", "")).getHost()); - } catch (MalformedURLException e) { - server.setText(""); - } + Intent intent = new Intent(getActivity(), + PreferencesActivity.class); - View settings = view.findViewById(R.id.drawer_settings_btn); + startActivityForResult(intent, 0); - settings.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - try { - Intent intent = new Intent(getActivity(), - PreferencesActivity.class); + } catch (Exception e) { + e.printStackTrace(); + } + } + }); - startActivityForResult(intent, 0); + /* deal with ~material~ footers */ - } catch (Exception e) { - e.printStackTrace(); - } - } - }); - } else { - needSettingsFooter = true; + // divider + final View footer = inflater.inflate(R.layout.drawer_divider, list, false); + footer.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + // + } + }); + list.addFooterView(footer); + + // unread only checkbox + final View rowToggle = inflater.inflate(R.layout.feeds_row_toggle, list, false); + list.addFooterView(rowToggle); + TextView text = rowToggle.findViewById(R.id.title); + text.setText(R.string.unread_only); + + ImageView icon = rowToggle.findViewById(R.id.icon); + TypedValue tv = new TypedValue(); + getActivity().getTheme().resolveAttribute(R.attr.ic_filter_variant, tv, true); + icon.setImageResource(tv.resourceId); + + final SwitchCompat rowSwitch = rowToggle.findViewById(R.id.row_switch); + rowSwitch.setChecked(activity.getUnreadOnly()); + + rowSwitch.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { + @Override + public void onCheckedChanged(CompoundButton button, boolean isChecked) { + activity.setUnreadOnly(isChecked); + refresh(); } + }); - /* deal with ~material~ footers */ + footer.setOnClickListener(new View.OnClickListener() { + @Override + public void onClick(View v) { + rowSwitch.setChecked(!rowSwitch.isChecked()); + } + }); - // divider - View footer = inflater.inflate(R.layout.drawer_divider, list, false); - footer.setOnClickListener(new View.OnClickListener() { + // root or subdirectory (i.e. feed category) + if (isRoot) { + // offline + final View offlineFooter = inflater.inflate(R.layout.feeds_row, list, false); + offlineFooter.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { - // - } - }); - list.addFooterView(footer); - - // unread only checkbox - footer = inflater.inflate(R.layout.feeds_row_toggle, list, false); - list.addFooterView(footer); - TextView text = footer.findViewById(R.id.title); - text.setText(R.string.unread_only); - - ImageView icon = footer.findViewById(R.id.icon); - TypedValue tv = new TypedValue(); - getActivity().getTheme().resolveAttribute(R.attr.ic_filter_variant, tv, true); - icon.setImageResource(tv.resourceId); - - final SwitchCompat rowSwitch = footer.findViewById(R.id.row_switch); - rowSwitch.setChecked(activity.getUnreadOnly()); + if (activity instanceof OnlineActivity) { + ((OnlineActivity)activity).switchOffline(); - rowSwitch.setOnCheckedChangeListener(new CompoundButton.OnCheckedChangeListener() { - @Override - public void onCheckedChanged(CompoundButton button, boolean isChecked) { - activity.setUnreadOnly(isChecked); - refresh(); - } - }); - - footer.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - rowSwitch.setChecked(!rowSwitch.isChecked()); + } else if (activity instanceof OfflineActivity) { + ((OfflineActivity)activity).switchOnline(); + } } }); - if (isRoot) { - if (needSettingsFooter) { - // settings (as a list footer row) - - footer = inflater.inflate(R.layout.feeds_row, list, false); - footer.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - try { - Intent intent = new Intent(getActivity(), - PreferencesActivity.class); - - startActivityForResult(intent, 0); - - } catch (Exception e) { - e.printStackTrace(); - } - } - }); - - list.addFooterView(footer); - text = footer.findViewById(R.id.title); - text.setText(R.string.action_settings); - - icon = footer.findViewById(R.id.icon); - tv = new TypedValue(); - getActivity().getTheme().resolveAttribute(R.attr.ic_settings, tv, true); - icon.setImageResource(tv.resourceId); - - TextView counter = footer.findViewById(R.id.unread_counter); - counter.setText(R.string.blank); - } + list.addFooterView(offlineFooter); + text = offlineFooter.findViewById(R.id.title); + text.setText(isOffline ? R.string.go_online : R.string.go_offline); - // offline - footer = inflater.inflate(R.layout.feeds_row, list, false); - footer.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - if (activity instanceof OnlineActivity) { - ((OnlineActivity)activity).switchOffline(); - - } else if (activity instanceof OfflineActivity) { - ((OfflineActivity)activity).switchOnline(); - } - } - }); - - list.addFooterView(footer); - text = footer.findViewById(R.id.title); - text.setText(isOffline ? R.string.go_online : R.string.go_offline); - - icon = footer.findViewById(R.id.icon); - tv = new TypedValue(); - getActivity().getTheme().resolveAttribute(isOffline ? R.attr.ic_cloud_upload : R.attr.ic_cloud_download, tv, true); - icon.setImageResource(tv.resourceId); - - TextView counter = footer.findViewById(R.id.unread_counter); - counter.setText(R.string.blank); - } + icon = offlineFooter.findViewById(R.id.icon); + tv = new TypedValue(); + getActivity().getTheme().resolveAttribute(isOffline ? R.attr.ic_cloud_upload : R.attr.ic_cloud_download, tv, true); + icon.setImageResource(tv.resourceId); - } catch (InflateException e) { - // welp couldn't inflate header i guess - e.printStackTrace(); - } catch (java.lang.UnsupportedOperationException e) { - e.printStackTrace(); + TextView counter = offlineFooter.findViewById(R.id.unread_counter); + counter.setText(R.string.blank); } + + } catch (InflateException e) { + // welp couldn't inflate header i guess + e.printStackTrace(); + } catch (java.lang.UnsupportedOperationException e) { + e.printStackTrace(); } } diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java index af925ea4..b805ee6a 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedCategoriesFragment.java @@ -300,7 +300,7 @@ public class FeedCategoriesFragment extends BaseFeedlistFragment implements OnIt @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { - View view = inflater.inflate(R.layout.fragment_cats, container, false); + View view = inflater.inflate(R.layout.fragment_feeds, container, false); m_swipeLayout = view.findViewById(R.id.feeds_swipe_container); diff --git a/org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_master.xml b/org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_master.xml index 879725c1..33b4ebba 100644 --- a/org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_master.xml +++ b/org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_master.xml @@ -1,19 +1,16 @@ - + android:orientation="horizontal"> - - + android:layout_gravity="start" + app:elevation="8dp"> + + + + + + + @@ -38,15 +37,13 @@ - + app:elevation="8dp"> - + diff --git a/org.fox.ttrss/src/main/res/layout/activity_detail_phone.xml b/org.fox.ttrss/src/main/res/layout/activity_detail_phone.xml index d21c2661..1edd3bea 100644 --- a/org.fox.ttrss/src/main/res/layout/activity_detail_phone.xml +++ b/org.fox.ttrss/src/main/res/layout/activity_detail_phone.xml @@ -1,6 +1,5 @@ diff --git a/org.fox.ttrss/src/main/res/layout/activity_master_phone.xml b/org.fox.ttrss/src/main/res/layout/activity_master_phone.xml index e154646f..afbddd08 100644 --- a/org.fox.ttrss/src/main/res/layout/activity_master_phone.xml +++ b/org.fox.ttrss/src/main/res/layout/activity_master_phone.xml @@ -1,6 +1,5 @@ @@ -37,23 +36,20 @@ - + android:layout_gravity="start"> - - + + - + diff --git a/org.fox.ttrss/src/main/res/layout/drawer_header.xml b/org.fox.ttrss/src/main/res/layout/drawer_header.xml index 56f7a225..d9a9cb0b 100755 --- a/org.fox.ttrss/src/main/res/layout/drawer_header.xml +++ b/org.fox.ttrss/src/main/res/layout/drawer_header.xml @@ -1,24 +1,15 @@ - - + tools:text="user" + android:textAppearance="?attr/textAppearanceHeadlineSmall" + android:textColor="?attr/colorOnSurface"/> + android:textAppearance="?attr/textAppearanceTitleSmall" + android:textColor="?attr/colorOnSurfaceVariant"/> diff --git a/org.fox.ttrss/src/main/res/layout/feeds_goback.xml b/org.fox.ttrss/src/main/res/layout/feeds_goback.xml index bb263237..90aac490 100755 --- a/org.fox.ttrss/src/main/res/layout/feeds_goback.xml +++ b/org.fox.ttrss/src/main/res/layout/feeds_goback.xml @@ -1,5 +1,6 @@ + android:src="?ic_go_back" + app:tint="?colorAccent" /> diff --git a/org.fox.ttrss/src/main/res/layout/feeds_row.xml b/org.fox.ttrss/src/main/res/layout/feeds_row.xml index 6b980382..cfdc284d 100755 --- a/org.fox.ttrss/src/main/res/layout/feeds_row.xml +++ b/org.fox.ttrss/src/main/res/layout/feeds_row.xml @@ -1,64 +1,64 @@ - - - - - + android:orientation="horizontal"> - + - + + + + + - \ No newline at end of file + diff --git a/org.fox.ttrss/src/main/res/layout/feeds_row_selected.xml b/org.fox.ttrss/src/main/res/layout/feeds_row_selected.xml index 23a972e3..a3d66851 100755 --- a/org.fox.ttrss/src/main/res/layout/feeds_row_selected.xml +++ b/org.fox.ttrss/src/main/res/layout/feeds_row_selected.xml @@ -1,66 +1,72 @@ - + app:cardElevation="0dp" + android:backgroundTint="?colorSurfaceDim" + android:layout_height="wrap_content"> - - - + android:orientation="horizontal"> - + - + + + + + + + - \ No newline at end of file + diff --git a/org.fox.ttrss/src/main/res/layout/feeds_row_toggle.xml b/org.fox.ttrss/src/main/res/layout/feeds_row_toggle.xml index 0dbbcfc9..53947a04 100755 --- a/org.fox.ttrss/src/main/res/layout/feeds_row_toggle.xml +++ b/org.fox.ttrss/src/main/res/layout/feeds_row_toggle.xml @@ -28,15 +28,13 @@ android:fontFamily="sans-serif-medium" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:gravity="center_vertical" + android:layout_gravity="center_vertical" android:layout_weight="1" android:ellipsize="end" - android:paddingStart="35dp" + android:paddingStart="16dp" android:paddingEnd="16dp" android:singleLine="true" tools:text="Unread only" - android:textAlignment="viewStart" - android:paddingBottom="2dp" android:textColor="?feedlistTextColor" android:textSize="14sp" /> diff --git a/org.fox.ttrss/src/main/res/layout/fragment_cats.xml b/org.fox.ttrss/src/main/res/layout/fragment_cats.xml deleted file mode 100755 index 64240be6..00000000 --- a/org.fox.ttrss/src/main/res/layout/fragment_cats.xml +++ /dev/null @@ -1,20 +0,0 @@ - - - - - - - - - \ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/layout/fragment_feeds.xml b/org.fox.ttrss/src/main/res/layout/fragment_feeds.xml index 2d8d963b..bf26e3fc 100755 --- a/org.fox.ttrss/src/main/res/layout/fragment_feeds.xml +++ b/org.fox.ttrss/src/main/res/layout/fragment_feeds.xml @@ -11,8 +11,10 @@ - -- cgit v1.2.3-54-g00ecf From 2ee7833ca1b401b76a04c88820589ddd527de09b Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 6 May 2025 21:51:19 +0300 Subject: reimport most material icons as uptodate vector resources --- org.fox.ttrss/build.gradle | 2 + .../main/java/org/fox/ttrss/CommonActivity.java | 2 +- .../main/java/org/fox/ttrss/HeadlinesFragment.java | 6 +-- .../main/java/org/fox/ttrss/OnlineActivity.java | 12 ++--- .../org/fox/ttrss/offline/OfflineActivity.java | 12 ++--- .../fox/ttrss/offline/OfflineDownloadService.java | 25 +++++------ .../ttrss/offline/OfflineHeadlinesFragment.java | 4 +- .../fox/ttrss/offline/OfflineUploadService.java | 4 +- .../java/org/fox/ttrss/util/ImageCacheService.java | 2 +- .../src/main/res/drawable-hdpi/drawer_header.png | Bin 18004 -> 0 bytes .../main/res/drawable-hdpi/drawer_header_amber.png | Bin 17915 -> 0 bytes .../main/res/drawable-hdpi/drawer_header_dark.png | Bin 17698 -> 0 bytes .../res/drawable-hdpi/ic_action_trending_down.png | Bin 819 -> 0 bytes .../drawable-hdpi/ic_action_trending_down_dark.png | Bin 768 -> 0 bytes .../res/drawable-hdpi/ic_action_trending_flat.png | Bin 545 -> 0 bytes .../drawable-hdpi/ic_action_trending_flat_dark.png | Bin 549 -> 0 bytes .../res/drawable-hdpi/ic_action_trending_up.png | Bin 858 -> 0 bytes .../drawable-hdpi/ic_action_trending_up_dark.png | Bin 753 -> 0 bytes .../main/res/drawable-hdpi/ic_action_web_site.png | Bin 608 -> 0 bytes .../src/main/res/drawable-hdpi/ic_archive.png | Bin 577 -> 0 bytes .../src/main/res/drawable-hdpi/ic_archive_dark.png | Bin 533 -> 0 bytes .../src/main/res/drawable-hdpi/ic_attachment.png | Bin 729 -> 0 bytes .../main/res/drawable-hdpi/ic_attachment_dark.png | Bin 653 -> 0 bytes .../main/res/drawable-hdpi/ic_attachment_vert.png | Bin 762 -> 0 bytes .../res/drawable-hdpi/ic_attachment_vert_dark.png | Bin 660 -> 0 bytes .../main/res/drawable-hdpi/ic_checkbox_marked.png | Bin 607 -> 0 bytes .../res/drawable-hdpi/ic_checkbox_marked_dark.png | Bin 563 -> 0 bytes .../main/res/drawable-hdpi/ic_cloud_download.png | Bin 795 -> 0 bytes .../res/drawable-hdpi/ic_cloud_download_dark.png | Bin 727 -> 0 bytes .../src/main/res/drawable-hdpi/ic_cloud_upload.png | Bin 811 -> 0 bytes .../res/drawable-hdpi/ic_cloud_upload_dark.png | Bin 735 -> 0 bytes .../src/main/res/drawable-hdpi/ic_content_copy.png | Bin 473 -> 0 bytes .../main/res/drawable-hdpi/ic_dots_vertical.png | Bin 307 -> 0 bytes .../res/drawable-hdpi/ic_dots_vertical_circle.png | Bin 1038 -> 0 bytes .../drawable-hdpi/ic_dots_vertical_circle_dark.png | Bin 927 -> 0 bytes .../res/drawable-hdpi/ic_dots_vertical_dark.png | Bin 272 -> 0 bytes .../src/main/res/drawable-hdpi/ic_email.png | Bin 642 -> 0 bytes .../src/main/res/drawable-hdpi/ic_email_open.png | Bin 739 -> 0 bytes .../main/res/drawable-hdpi/ic_filter_variant.png | Bin 261 -> 0 bytes .../res/drawable-hdpi/ic_filter_variant_dark.png | Bin 232 -> 0 bytes .../main/res/drawable-hdpi/ic_folder_outline.png | Bin 363 -> 0 bytes .../res/drawable-hdpi/ic_folder_outline_dark.png | Bin 336 -> 0 bytes .../src/main/res/drawable-hdpi/ic_fresh.png | Bin 1038 -> 0 bytes .../src/main/res/drawable-hdpi/ic_fresh_dark.png | Bin 920 -> 0 bytes .../src/main/res/drawable-hdpi/ic_go_back.png | Bin 890 -> 0 bytes .../src/main/res/drawable-hdpi/ic_go_back_dark.png | Bin 783 -> 0 bytes .../src/main/res/drawable-hdpi/ic_image_album.png | Bin 571 -> 0 bytes .../src/main/res/drawable-hdpi/ic_inbox.png | Bin 496 -> 0 bytes .../src/main/res/drawable-hdpi/ic_inbox_dark.png | Bin 460 -> 0 bytes .../src/main/res/drawable-hdpi/ic_login.png | Bin 527 -> 0 bytes .../src/main/res/drawable-hdpi/ic_logout.png | Bin 521 -> 0 bytes .../src/main/res/drawable-hdpi/ic_play_circle.png | Bin 806 -> 0 bytes .../src/main/res/drawable-hdpi/ic_refresh.png | Bin 830 -> 0 bytes .../src/main/res/drawable-hdpi/ic_restore.png | Bin 1061 -> 0 bytes .../src/main/res/drawable-hdpi/ic_restore_dark.png | Bin 943 -> 0 bytes .../src/main/res/drawable-hdpi/ic_rss_box.png | Bin 801 -> 0 bytes .../src/main/res/drawable-hdpi/ic_rss_box_dark.png | Bin 730 -> 0 bytes .../src/main/res/drawable-hdpi/ic_search.png | Bin 890 -> 0 bytes .../src/main/res/drawable-hdpi/ic_select.png | Bin 496 -> 0 bytes .../src/main/res/drawable-hdpi/ic_settings.png | Bin 892 -> 0 bytes .../main/res/drawable-hdpi/ic_settings_dark.png | Bin 799 -> 0 bytes .../src/main/res/drawable-hdpi/ic_share.png | Bin 821 -> 0 bytes .../src/main/res/drawable-hdpi/ic_share_dark.png | Bin 745 -> 0 bytes .../src/main/res/drawable-hdpi/ic_sort.png | Bin 1012 -> 0 bytes .../src/main/res/drawable-hdpi/ic_star.png | Bin 823 -> 0 bytes .../src/main/res/drawable-hdpi/ic_star_dark.png | Bin 745 -> 0 bytes .../src/main/res/drawable-hdpi/ic_star_outline.png | Bin 1047 -> 0 bytes .../res/drawable-hdpi/ic_star_outline_dark.png | Bin 916 -> 0 bytes .../src/main/res/drawable-hdpi/ic_youtube_play.png | Bin 625 -> 0 bytes .../res/drawable-mdpi/ic_action_trending_down.png | Bin 501 -> 0 bytes .../drawable-mdpi/ic_action_trending_down_dark.png | Bin 486 -> 0 bytes .../res/drawable-mdpi/ic_action_trending_flat.png | Bin 336 -> 0 bytes .../drawable-mdpi/ic_action_trending_flat_dark.png | Bin 337 -> 0 bytes .../res/drawable-mdpi/ic_action_trending_up.png | Bin 509 -> 0 bytes .../drawable-mdpi/ic_action_trending_up_dark.png | Bin 480 -> 0 bytes .../main/res/drawable-mdpi/ic_action_web_site.png | Bin 355 -> 0 bytes .../src/main/res/drawable-mdpi/ic_archive.png | Bin 335 -> 0 bytes .../src/main/res/drawable-mdpi/ic_archive_dark.png | Bin 310 -> 0 bytes .../src/main/res/drawable-mdpi/ic_attachment.png | Bin 423 -> 0 bytes .../main/res/drawable-mdpi/ic_attachment_dark.png | Bin 373 -> 0 bytes .../main/res/drawable-mdpi/ic_attachment_vert.png | Bin 439 -> 0 bytes .../res/drawable-mdpi/ic_attachment_vert_dark.png | Bin 399 -> 0 bytes .../main/res/drawable-mdpi/ic_checkbox_marked.png | Bin 414 -> 0 bytes .../res/drawable-mdpi/ic_checkbox_marked_dark.png | Bin 384 -> 0 bytes .../main/res/drawable-mdpi/ic_cloud_download.png | Bin 456 -> 0 bytes .../res/drawable-mdpi/ic_cloud_download_dark.png | Bin 411 -> 0 bytes .../src/main/res/drawable-mdpi/ic_cloud_upload.png | Bin 463 -> 0 bytes .../res/drawable-mdpi/ic_cloud_upload_dark.png | Bin 420 -> 0 bytes .../src/main/res/drawable-mdpi/ic_content_copy.png | Bin 269 -> 0 bytes .../main/res/drawable-mdpi/ic_dots_vertical.png | Bin 224 -> 0 bytes .../res/drawable-mdpi/ic_dots_vertical_circle.png | Bin 695 -> 0 bytes .../drawable-mdpi/ic_dots_vertical_circle_dark.png | Bin 613 -> 0 bytes .../res/drawable-mdpi/ic_dots_vertical_dark.png | Bin 210 -> 0 bytes .../src/main/res/drawable-mdpi/ic_email.png | Bin 366 -> 0 bytes .../src/main/res/drawable-mdpi/ic_email_open.png | Bin 564 -> 0 bytes .../main/res/drawable-mdpi/ic_filter_variant.png | Bin 176 -> 0 bytes .../res/drawable-mdpi/ic_filter_variant_dark.png | Bin 175 -> 0 bytes .../main/res/drawable-mdpi/ic_folder_outline.png | Bin 247 -> 0 bytes .../res/drawable-mdpi/ic_folder_outline_dark.png | Bin 233 -> 0 bytes .../src/main/res/drawable-mdpi/ic_fresh.png | Bin 601 -> 0 bytes .../src/main/res/drawable-mdpi/ic_fresh_dark.png | Bin 540 -> 0 bytes .../src/main/res/drawable-mdpi/ic_go_back.png | Bin 619 -> 0 bytes .../src/main/res/drawable-mdpi/ic_go_back_dark.png | Bin 548 -> 0 bytes .../src/main/res/drawable-mdpi/ic_image_album.png | Bin 347 -> 0 bytes .../src/main/res/drawable-mdpi/ic_inbox.png | Bin 271 -> 0 bytes .../src/main/res/drawable-mdpi/ic_inbox_dark.png | Bin 267 -> 0 bytes .../src/main/res/drawable-mdpi/ic_login.png | Bin 432 -> 0 bytes .../src/main/res/drawable-mdpi/ic_logout.png | Bin 433 -> 0 bytes .../src/main/res/drawable-mdpi/ic_play_circle.png | Bin 362 -> 0 bytes .../src/main/res/drawable-mdpi/ic_refresh.png | Bin 441 -> 0 bytes .../src/main/res/drawable-mdpi/ic_restore.png | Bin 528 -> 0 bytes .../src/main/res/drawable-mdpi/ic_restore_dark.png | Bin 477 -> 0 bytes .../src/main/res/drawable-mdpi/ic_rss_box.png | Bin 528 -> 0 bytes .../src/main/res/drawable-mdpi/ic_rss_box_dark.png | Bin 481 -> 0 bytes .../src/main/res/drawable-mdpi/ic_search.png | Bin 489 -> 0 bytes .../src/main/res/drawable-mdpi/ic_select.png | Bin 410 -> 0 bytes .../src/main/res/drawable-mdpi/ic_settings.png | Bin 409 -> 0 bytes .../main/res/drawable-mdpi/ic_settings_dark.png | Bin 374 -> 0 bytes .../src/main/res/drawable-mdpi/ic_share.png | Bin 453 -> 0 bytes .../src/main/res/drawable-mdpi/ic_share_dark.png | Bin 405 -> 0 bytes .../src/main/res/drawable-mdpi/ic_sort.png | Bin 590 -> 0 bytes .../src/main/res/drawable-mdpi/ic_star.png | Bin 455 -> 0 bytes .../src/main/res/drawable-mdpi/ic_star_dark.png | Bin 425 -> 0 bytes .../src/main/res/drawable-mdpi/ic_star_outline.png | Bin 571 -> 0 bytes .../res/drawable-mdpi/ic_star_outline_dark.png | Bin 505 -> 0 bytes .../src/main/res/drawable-mdpi/ic_youtube_play.png | Bin 506 -> 0 bytes .../res/drawable-xhdpi/ic_action_trending_down.png | Bin 839 -> 0 bytes .../ic_action_trending_down_dark.png | Bin 836 -> 0 bytes .../res/drawable-xhdpi/ic_action_trending_flat.png | Bin 617 -> 0 bytes .../ic_action_trending_flat_dark.png | Bin 570 -> 0 bytes .../res/drawable-xhdpi/ic_action_trending_up.png | Bin 858 -> 0 bytes .../drawable-xhdpi/ic_action_trending_up_dark.png | Bin 836 -> 0 bytes .../main/res/drawable-xhdpi/ic_action_web_site.png | Bin 536 -> 0 bytes .../src/main/res/drawable-xhdpi/ic_archive.png | Bin 585 -> 0 bytes .../main/res/drawable-xhdpi/ic_archive_dark.png | Bin 544 -> 0 bytes .../src/main/res/drawable-xhdpi/ic_attachment.png | Bin 842 -> 0 bytes .../main/res/drawable-xhdpi/ic_attachment_dark.png | Bin 769 -> 0 bytes .../main/res/drawable-xhdpi/ic_attachment_vert.png | Bin 932 -> 0 bytes .../res/drawable-xhdpi/ic_attachment_vert_dark.png | Bin 826 -> 0 bytes .../main/res/drawable-xhdpi/ic_checkbox_marked.png | Bin 760 -> 0 bytes .../res/drawable-xhdpi/ic_checkbox_marked_dark.png | Bin 716 -> 0 bytes .../main/res/drawable-xhdpi/ic_cloud_download.png | Bin 879 -> 0 bytes .../res/drawable-xhdpi/ic_cloud_download_dark.png | Bin 808 -> 0 bytes .../main/res/drawable-xhdpi/ic_cloud_upload.png | Bin 943 -> 0 bytes .../res/drawable-xhdpi/ic_cloud_upload_dark.png | Bin 848 -> 0 bytes .../main/res/drawable-xhdpi/ic_content_copy.png | Bin 507 -> 0 bytes .../main/res/drawable-xhdpi/ic_dots_vertical.png | Bin 432 -> 0 bytes .../res/drawable-xhdpi/ic_dots_vertical_circle.png | Bin 1571 -> 0 bytes .../ic_dots_vertical_circle_dark.png | Bin 1391 -> 0 bytes .../res/drawable-xhdpi/ic_dots_vertical_dark.png | Bin 412 -> 0 bytes .../src/main/res/drawable-xhdpi/ic_email.png | Bin 735 -> 0 bytes .../src/main/res/drawable-xhdpi/ic_email_open.png | Bin 1153 -> 0 bytes .../main/res/drawable-xhdpi/ic_filter_variant.png | Bin 272 -> 0 bytes .../res/drawable-xhdpi/ic_filter_variant_dark.png | Bin 269 -> 0 bytes .../main/res/drawable-xhdpi/ic_folder_outline.png | Bin 421 -> 0 bytes .../res/drawable-xhdpi/ic_folder_outline_dark.png | Bin 409 -> 0 bytes .../src/main/res/drawable-xhdpi/ic_fresh.png | Bin 1214 -> 0 bytes .../src/main/res/drawable-xhdpi/ic_fresh_dark.png | Bin 1125 -> 0 bytes .../src/main/res/drawable-xhdpi/ic_go_back.png | Bin 1342 -> 0 bytes .../main/res/drawable-xhdpi/ic_go_back_dark.png | Bin 1208 -> 0 bytes .../src/main/res/drawable-xhdpi/ic_image_album.png | Bin 641 -> 0 bytes .../src/main/res/drawable-xhdpi/ic_inbox.png | Bin 483 -> 0 bytes .../src/main/res/drawable-xhdpi/ic_inbox_dark.png | Bin 475 -> 0 bytes .../src/main/res/drawable-xhdpi/ic_login.png | Bin 751 -> 0 bytes .../src/main/res/drawable-xhdpi/ic_logout.png | Bin 756 -> 0 bytes .../src/main/res/drawable-xhdpi/ic_play_circle.png | Bin 684 -> 0 bytes .../src/main/res/drawable-xhdpi/ic_refresh.png | Bin 919 -> 0 bytes .../src/main/res/drawable-xhdpi/ic_restore.png | Bin 1118 -> 0 bytes .../main/res/drawable-xhdpi/ic_restore_dark.png | Bin 1008 -> 0 bytes .../src/main/res/drawable-xhdpi/ic_rss_box.png | Bin 1173 -> 0 bytes .../main/res/drawable-xhdpi/ic_rss_box_dark.png | Bin 1070 -> 0 bytes .../src/main/res/drawable-xhdpi/ic_search.png | Bin 973 -> 0 bytes .../src/main/res/drawable-xhdpi/ic_select.png | Bin 655 -> 0 bytes .../src/main/res/drawable-xhdpi/ic_settings.png | Bin 865 -> 0 bytes .../main/res/drawable-xhdpi/ic_settings_dark.png | Bin 795 -> 0 bytes .../src/main/res/drawable-xhdpi/ic_share.png | Bin 980 -> 0 bytes .../src/main/res/drawable-xhdpi/ic_share_dark.png | Bin 850 -> 0 bytes .../src/main/res/drawable-xhdpi/ic_sort.png | Bin 1234 -> 0 bytes .../src/main/res/drawable-xhdpi/ic_star.png | Bin 961 -> 0 bytes .../src/main/res/drawable-xhdpi/ic_star_dark.png | Bin 884 -> 0 bytes .../main/res/drawable-xhdpi/ic_star_outline.png | Bin 1307 -> 0 bytes .../res/drawable-xhdpi/ic_star_outline_dark.png | Bin 1159 -> 0 bytes .../main/res/drawable-xhdpi/ic_youtube_play.png | Bin 1041 -> 0 bytes .../src/main/res/drawable-xxhdpi/drawer_header.png | Bin 36635 -> 0 bytes .../res/drawable-xxhdpi/drawer_header_amber.png | Bin 35712 -> 0 bytes .../res/drawable-xxhdpi/drawer_header_dark.png | Bin 35541 -> 0 bytes .../drawable-xxhdpi/ic_action_trending_down.png | Bin 1385 -> 0 bytes .../ic_action_trending_down_dark.png | Bin 1351 -> 0 bytes .../drawable-xxhdpi/ic_action_trending_flat.png | Bin 966 -> 0 bytes .../ic_action_trending_flat_dark.png | Bin 882 -> 0 bytes .../res/drawable-xxhdpi/ic_action_trending_up.png | Bin 1415 -> 0 bytes .../drawable-xxhdpi/ic_action_trending_up_dark.png | Bin 1334 -> 0 bytes .../res/drawable-xxhdpi/ic_action_web_site.png | Bin 881 -> 0 bytes .../src/main/res/drawable-xxhdpi/ic_archive.png | Bin 990 -> 0 bytes .../main/res/drawable-xxhdpi/ic_archive_dark.png | Bin 919 -> 0 bytes .../src/main/res/drawable-xxhdpi/ic_attachment.png | Bin 1415 -> 0 bytes .../res/drawable-xxhdpi/ic_attachment_dark.png | Bin 1283 -> 0 bytes .../res/drawable-xxhdpi/ic_attachment_vert.png | Bin 1654 -> 0 bytes .../drawable-xxhdpi/ic_attachment_vert_dark.png | Bin 1471 -> 0 bytes .../res/drawable-xxhdpi/ic_checkbox_marked.png | Bin 1129 -> 0 bytes .../drawable-xxhdpi/ic_checkbox_marked_dark.png | Bin 1012 -> 0 bytes .../main/res/drawable-xxhdpi/ic_cloud_download.png | Bin 1518 -> 0 bytes .../res/drawable-xxhdpi/ic_cloud_download_dark.png | Bin 1384 -> 0 bytes .../main/res/drawable-xxhdpi/ic_cloud_upload.png | Bin 1631 -> 0 bytes .../res/drawable-xxhdpi/ic_cloud_upload_dark.png | Bin 1480 -> 0 bytes .../main/res/drawable-xxhdpi/ic_content_copy.png | Bin 786 -> 0 bytes .../main/res/drawable-xxhdpi/ic_dots_vertical.png | Bin 582 -> 0 bytes .../drawable-xxhdpi/ic_dots_vertical_circle.png | Bin 2243 -> 0 bytes .../ic_dots_vertical_circle_dark.png | Bin 1986 -> 0 bytes .../res/drawable-xxhdpi/ic_dots_vertical_dark.png | Bin 530 -> 0 bytes .../src/main/res/drawable-xxhdpi/ic_email.png | Bin 1305 -> 0 bytes .../src/main/res/drawable-xxhdpi/ic_email_open.png | Bin 1474 -> 0 bytes .../main/res/drawable-xxhdpi/ic_filter_variant.png | Bin 397 -> 0 bytes .../res/drawable-xxhdpi/ic_filter_variant_dark.png | Bin 376 -> 0 bytes .../main/res/drawable-xxhdpi/ic_folder_outline.png | Bin 661 -> 0 bytes .../res/drawable-xxhdpi/ic_folder_outline_dark.png | Bin 631 -> 0 bytes .../src/main/res/drawable-xxhdpi/ic_fresh.png | Bin 2177 -> 0 bytes .../src/main/res/drawable-xxhdpi/ic_fresh_dark.png | Bin 1941 -> 0 bytes .../src/main/res/drawable-xxhdpi/ic_go_back.png | Bin 1849 -> 0 bytes .../main/res/drawable-xxhdpi/ic_go_back_dark.png | Bin 1658 -> 0 bytes .../main/res/drawable-xxhdpi/ic_image_album.png | Bin 1168 -> 0 bytes .../src/main/res/drawable-xxhdpi/ic_inbox.png | Bin 850 -> 0 bytes .../src/main/res/drawable-xxhdpi/ic_inbox_dark.png | Bin 780 -> 0 bytes .../src/main/res/drawable-xxhdpi/ic_login.png | Bin 904 -> 0 bytes .../src/main/res/drawable-xxhdpi/ic_logout.png | Bin 895 -> 0 bytes .../main/res/drawable-xxhdpi/ic_play_circle.png | Bin 1672 -> 0 bytes .../src/main/res/drawable-xxhdpi/ic_refresh.png | Bin 1716 -> 0 bytes .../src/main/res/drawable-xxhdpi/ic_restore.png | Bin 2215 -> 0 bytes .../main/res/drawable-xxhdpi/ic_restore_dark.png | Bin 1955 -> 0 bytes .../src/main/res/drawable-xxhdpi/ic_rss_box.png | Bin 1636 -> 0 bytes .../main/res/drawable-xxhdpi/ic_rss_box_dark.png | Bin 1479 -> 0 bytes .../src/main/res/drawable-xxhdpi/ic_search.png | Bin 1806 -> 0 bytes .../src/main/res/drawable-xxhdpi/ic_select.png | Bin 721 -> 0 bytes .../src/main/res/drawable-xxhdpi/ic_settings.png | Bin 1935 -> 0 bytes .../main/res/drawable-xxhdpi/ic_settings_dark.png | Bin 1719 -> 0 bytes .../src/main/res/drawable-xxhdpi/ic_share.png | Bin 1721 -> 0 bytes .../src/main/res/drawable-xxhdpi/ic_share_dark.png | Bin 1601 -> 0 bytes .../src/main/res/drawable-xxhdpi/ic_sort.png | Bin 2189 -> 0 bytes .../src/main/res/drawable-xxhdpi/ic_star.png | Bin 1686 -> 0 bytes .../src/main/res/drawable-xxhdpi/ic_star_dark.png | Bin 1541 -> 0 bytes .../main/res/drawable-xxhdpi/ic_star_outline.png | Bin 2359 -> 0 bytes .../res/drawable-xxhdpi/ic_star_outline_dark.png | Bin 2106 -> 0 bytes .../main/res/drawable-xxhdpi/ic_youtube_play.png | Bin 1322 -> 0 bytes .../drawable-xxxhdpi/ic_action_trending_down.png | Bin 1425 -> 0 bytes .../ic_action_trending_down_dark.png | Bin 1403 -> 0 bytes .../drawable-xxxhdpi/ic_action_trending_flat.png | Bin 1063 -> 0 bytes .../ic_action_trending_flat_dark.png | Bin 1120 -> 0 bytes .../res/drawable-xxxhdpi/ic_action_trending_up.png | Bin 1467 -> 0 bytes .../ic_action_trending_up_dark.png | Bin 1429 -> 0 bytes .../res/drawable-xxxhdpi/ic_action_web_site.png | Bin 990 -> 0 bytes .../src/main/res/drawable-xxxhdpi/ic_archive.png | Bin 1140 -> 0 bytes .../main/res/drawable-xxxhdpi/ic_archive_dark.png | Bin 1130 -> 0 bytes .../main/res/drawable-xxxhdpi/ic_attachment.png | Bin 1804 -> 0 bytes .../res/drawable-xxxhdpi/ic_attachment_dark.png | Bin 1626 -> 0 bytes .../res/drawable-xxxhdpi/ic_attachment_vert.png | Bin 2019 -> 0 bytes .../drawable-xxxhdpi/ic_attachment_vert_dark.png | Bin 1821 -> 0 bytes .../res/drawable-xxxhdpi/ic_checkbox_marked.png | Bin 1544 -> 0 bytes .../drawable-xxxhdpi/ic_checkbox_marked_dark.png | Bin 1424 -> 0 bytes .../res/drawable-xxxhdpi/ic_cloud_download.png | Bin 1835 -> 0 bytes .../drawable-xxxhdpi/ic_cloud_download_dark.png | Bin 1705 -> 0 bytes .../main/res/drawable-xxxhdpi/ic_cloud_upload.png | Bin 2016 -> 0 bytes .../res/drawable-xxxhdpi/ic_cloud_upload_dark.png | Bin 1807 -> 0 bytes .../main/res/drawable-xxxhdpi/ic_content_copy.png | Bin 1082 -> 0 bytes .../main/res/drawable-xxxhdpi/ic_dots_vertical.png | Bin 957 -> 0 bytes .../drawable-xxxhdpi/ic_dots_vertical_circle.png | Bin 3284 -> 0 bytes .../ic_dots_vertical_circle_dark.png | Bin 2923 -> 0 bytes .../res/drawable-xxxhdpi/ic_dots_vertical_dark.png | Bin 899 -> 0 bytes .../src/main/res/drawable-xxxhdpi/ic_email.png | Bin 1586 -> 0 bytes .../main/res/drawable-xxxhdpi/ic_email_open.png | Bin 2354 -> 0 bytes .../res/drawable-xxxhdpi/ic_filter_variant.png | Bin 546 -> 0 bytes .../drawable-xxxhdpi/ic_filter_variant_dark.png | Bin 524 -> 0 bytes .../res/drawable-xxxhdpi/ic_folder_outline.png | Bin 900 -> 0 bytes .../drawable-xxxhdpi/ic_folder_outline_dark.png | Bin 812 -> 0 bytes .../src/main/res/drawable-xxxhdpi/ic_fresh.png | Bin 2636 -> 0 bytes .../main/res/drawable-xxxhdpi/ic_fresh_dark.png | Bin 2429 -> 0 bytes .../src/main/res/drawable-xxxhdpi/ic_go_back.png | Bin 2710 -> 0 bytes .../main/res/drawable-xxxhdpi/ic_go_back_dark.png | Bin 2432 -> 0 bytes .../main/res/drawable-xxxhdpi/ic_image_album.png | Bin 1451 -> 0 bytes .../src/main/res/drawable-xxxhdpi/ic_inbox.png | Bin 1101 -> 0 bytes .../main/res/drawable-xxxhdpi/ic_inbox_dark.png | Bin 1047 -> 0 bytes .../src/main/res/drawable-xxxhdpi/ic_login.png | Bin 1356 -> 0 bytes .../src/main/res/drawable-xxxhdpi/ic_logout.png | Bin 1375 -> 0 bytes .../main/res/drawable-xxxhdpi/ic_play_circle.png | Bin 1601 -> 0 bytes .../src/main/res/drawable-xxxhdpi/ic_refresh.png | Bin 1939 -> 0 bytes .../src/main/res/drawable-xxxhdpi/ic_restore.png | Bin 2370 -> 0 bytes .../main/res/drawable-xxxhdpi/ic_restore_dark.png | Bin 2141 -> 0 bytes .../src/main/res/drawable-xxxhdpi/ic_rss_box.png | Bin 2526 -> 0 bytes .../main/res/drawable-xxxhdpi/ic_rss_box_dark.png | Bin 2293 -> 0 bytes .../src/main/res/drawable-xxxhdpi/ic_search.png | Bin 2115 -> 0 bytes .../src/main/res/drawable-xxxhdpi/ic_select.png | Bin 1158 -> 0 bytes .../src/main/res/drawable-xxxhdpi/ic_settings.png | Bin 2008 -> 0 bytes .../main/res/drawable-xxxhdpi/ic_settings_dark.png | Bin 1789 -> 0 bytes .../src/main/res/drawable-xxxhdpi/ic_share.png | Bin 2066 -> 0 bytes .../main/res/drawable-xxxhdpi/ic_share_dark.png | Bin 1888 -> 0 bytes .../src/main/res/drawable-xxxhdpi/ic_sort.png | Bin 2499 -> 0 bytes .../src/main/res/drawable-xxxhdpi/ic_star.png | Bin 2029 -> 0 bytes .../src/main/res/drawable-xxxhdpi/ic_star_dark.png | Bin 1886 -> 0 bytes .../main/res/drawable-xxxhdpi/ic_star_outline.png | Bin 2699 -> 0 bytes .../res/drawable-xxxhdpi/ic_star_outline_dark.png | Bin 2473 -> 0 bytes .../main/res/drawable-xxxhdpi/ic_youtube_play.png | Bin 1974 -> 0 bytes .../src/main/res/drawable/baseline_archive_24.xml | 5 +++ .../main/res/drawable/baseline_arrow_back_24.xml | 5 +++ .../main/res/drawable/baseline_attach_file_24.xml | 5 +++ .../main/res/drawable/baseline_attachment_24.xml | 5 +++ .../main/res/drawable/baseline_check_box_24.xml | 5 +++ .../res/drawable/baseline_cloud_download_24.xml | 5 +++ .../main/res/drawable/baseline_cloud_upload_24.xml | 5 +++ .../main/res/drawable/baseline_content_copy_24.xml | 5 +++ .../src/main/res/drawable/baseline_email_24.xml | 5 +++ .../main/res/drawable/baseline_filter_alt_24.xml | 5 +++ .../main/res/drawable/baseline_folder_open_24.xml | 5 +++ .../src/main/res/drawable/baseline_inbox_24.xml | 5 +++ .../drawable/baseline_local_fire_department_24.xml | 5 +++ .../src/main/res/drawable/baseline_login_24.xml | 5 +++ .../res/drawable/baseline_mark_as_unread_24.xml | 5 +++ .../res/drawable/baseline_mark_email_read_24.xml | 5 +++ .../main/res/drawable/baseline_more_vert_24.xml | 5 +++ .../res/drawable/baseline_open_in_browser_24.xml | 5 +++ .../main/res/drawable/baseline_photo_album_24.xml | 5 +++ .../main/res/drawable/baseline_play_circle_24.xml | 5 +++ .../drawable/baseline_play_circle_outline_24.xml | 5 +++ .../src/main/res/drawable/baseline_refresh_24.xml | 5 +++ .../src/main/res/drawable/baseline_restore_24.xml | 5 +++ .../src/main/res/drawable/baseline_rss_feed_24.xml | 7 +++ .../src/main/res/drawable/baseline_search_24.xml | 5 +++ .../main/res/drawable/baseline_select_all_24.xml | 5 +++ .../src/main/res/drawable/baseline_settings_24.xml | 5 +++ .../src/main/res/drawable/baseline_share_24.xml | 5 +++ .../src/main/res/drawable/baseline_sort_24.xml | 5 +++ .../res/drawable/baseline_sort_by_alpha_24.xml | 5 +++ .../src/main/res/drawable/baseline_star_24.xml | 5 +++ .../main/res/drawable/baseline_star_outline_24.xml | 5 +++ .../res/drawable/baseline_trending_down_24.xml | 5 +++ .../res/drawable/baseline_trending_flat_24.xml | 5 +++ .../main/res/drawable/baseline_trending_up_24.xml | 5 +++ .../src/main/res/drawable/outline_more_24.xml | 11 +++++ .../res/layout-sw600dp-land/activity_master.xml | 2 +- .../res/layout-sw600dp-port/activity_master.xml | 2 +- .../main/res/layout-sw600dp/activity_detail.xml | 2 +- .../src/main/res/layout/activity_detail_phone.xml | 2 +- .../src/main/res/layout/activity_gallery.xml | 7 +-- .../src/main/res/layout/activity_master_phone.xml | 2 +- .../src/main/res/layout/drawer_divider.xml | 2 +- .../src/main/res/layout/drawer_header.xml | 2 +- org.fox.ttrss/src/main/res/layout/feeds_row.xml | 1 + .../src/main/res/layout/feeds_row_selected.xml | 1 + .../src/main/res/layout/feeds_row_toggle.xml | 1 + .../src/main/res/layout/headlines_footer.xml | 2 +- .../src/main/res/layout/headlines_row.xml | 5 +-- .../src/main/res/layout/headlines_row_unread.xml | 5 +-- .../src/main/res/menu/action_mode_headlines.xml | 7 +-- .../src/main/res/menu/activity_logcat.xml | 4 +- org.fox.ttrss/src/main/res/menu/activity_main.xml | 33 +++++++------- .../src/main/res/menu/activity_offline.xml | 16 +++---- org.fox.ttrss/src/main/res/menu/activity_share.xml | 2 +- .../src/main/res/menu/activity_youtube_player.xml | 19 -------- .../src/main/res/menu/content_gallery_entry.xml | 9 ++-- org.fox.ttrss/src/main/res/values-night/style.xml | 26 ----------- org.fox.ttrss/src/main/res/values/attrs.xml | 2 - org.fox.ttrss/src/main/res/values/style.xml | 49 ++++++++++----------- 360 files changed, 303 insertions(+), 157 deletions(-) delete mode 100644 org.fox.ttrss/src/main/res/drawable-hdpi/drawer_header.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-hdpi/drawer_header_amber.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-hdpi/drawer_header_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-hdpi/ic_action_trending_down.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-hdpi/ic_action_trending_down_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-hdpi/ic_action_trending_flat.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-hdpi/ic_action_trending_flat_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-hdpi/ic_action_trending_up.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-hdpi/ic_action_trending_up_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-hdpi/ic_action_web_site.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-hdpi/ic_archive.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-hdpi/ic_archive_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-hdpi/ic_attachment.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-hdpi/ic_attachment_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-hdpi/ic_attachment_vert.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-hdpi/ic_attachment_vert_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-hdpi/ic_checkbox_marked.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-hdpi/ic_checkbox_marked_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-hdpi/ic_cloud_download.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-hdpi/ic_cloud_download_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-hdpi/ic_cloud_upload.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-hdpi/ic_cloud_upload_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-hdpi/ic_content_copy.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-hdpi/ic_dots_vertical.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-hdpi/ic_dots_vertical_circle.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-hdpi/ic_dots_vertical_circle_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-hdpi/ic_dots_vertical_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-hdpi/ic_email.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-hdpi/ic_email_open.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-hdpi/ic_filter_variant.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-hdpi/ic_filter_variant_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-hdpi/ic_folder_outline.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-hdpi/ic_folder_outline_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-hdpi/ic_fresh.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-hdpi/ic_fresh_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-hdpi/ic_go_back.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-hdpi/ic_go_back_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-hdpi/ic_image_album.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-hdpi/ic_inbox.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-hdpi/ic_inbox_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-hdpi/ic_login.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-hdpi/ic_logout.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-hdpi/ic_play_circle.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-hdpi/ic_refresh.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-hdpi/ic_restore.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-hdpi/ic_restore_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-hdpi/ic_rss_box.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-hdpi/ic_rss_box_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-hdpi/ic_search.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-hdpi/ic_select.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-hdpi/ic_settings.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-hdpi/ic_settings_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-hdpi/ic_share.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-hdpi/ic_share_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-hdpi/ic_sort.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-hdpi/ic_star.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-hdpi/ic_star_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-hdpi/ic_star_outline.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-hdpi/ic_star_outline_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-hdpi/ic_youtube_play.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-mdpi/ic_action_trending_down.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-mdpi/ic_action_trending_down_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-mdpi/ic_action_trending_flat.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-mdpi/ic_action_trending_flat_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-mdpi/ic_action_trending_up.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-mdpi/ic_action_trending_up_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-mdpi/ic_action_web_site.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-mdpi/ic_archive.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-mdpi/ic_archive_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-mdpi/ic_attachment.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-mdpi/ic_attachment_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-mdpi/ic_attachment_vert.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-mdpi/ic_attachment_vert_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-mdpi/ic_checkbox_marked.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-mdpi/ic_checkbox_marked_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-mdpi/ic_cloud_download.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-mdpi/ic_cloud_download_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-mdpi/ic_cloud_upload.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-mdpi/ic_cloud_upload_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-mdpi/ic_content_copy.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-mdpi/ic_dots_vertical.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-mdpi/ic_dots_vertical_circle.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-mdpi/ic_dots_vertical_circle_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-mdpi/ic_dots_vertical_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-mdpi/ic_email.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-mdpi/ic_email_open.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-mdpi/ic_filter_variant.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-mdpi/ic_filter_variant_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-mdpi/ic_folder_outline.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-mdpi/ic_folder_outline_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-mdpi/ic_fresh.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-mdpi/ic_fresh_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-mdpi/ic_go_back.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-mdpi/ic_go_back_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-mdpi/ic_image_album.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-mdpi/ic_inbox.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-mdpi/ic_inbox_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-mdpi/ic_login.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-mdpi/ic_logout.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-mdpi/ic_play_circle.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-mdpi/ic_refresh.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-mdpi/ic_restore.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-mdpi/ic_restore_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-mdpi/ic_rss_box.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-mdpi/ic_rss_box_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-mdpi/ic_search.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-mdpi/ic_select.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-mdpi/ic_settings.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-mdpi/ic_settings_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-mdpi/ic_share.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-mdpi/ic_share_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-mdpi/ic_sort.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-mdpi/ic_star.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-mdpi/ic_star_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-mdpi/ic_star_outline.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-mdpi/ic_star_outline_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-mdpi/ic_youtube_play.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xhdpi/ic_action_trending_down.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xhdpi/ic_action_trending_down_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xhdpi/ic_action_trending_flat.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xhdpi/ic_action_trending_flat_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xhdpi/ic_action_trending_up.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xhdpi/ic_action_trending_up_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xhdpi/ic_action_web_site.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xhdpi/ic_archive.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xhdpi/ic_archive_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xhdpi/ic_attachment.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xhdpi/ic_attachment_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xhdpi/ic_attachment_vert.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xhdpi/ic_attachment_vert_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xhdpi/ic_checkbox_marked.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xhdpi/ic_checkbox_marked_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xhdpi/ic_cloud_download.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xhdpi/ic_cloud_download_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xhdpi/ic_cloud_upload.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xhdpi/ic_cloud_upload_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xhdpi/ic_content_copy.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xhdpi/ic_dots_vertical.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xhdpi/ic_dots_vertical_circle.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xhdpi/ic_dots_vertical_circle_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xhdpi/ic_dots_vertical_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xhdpi/ic_email.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xhdpi/ic_email_open.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xhdpi/ic_filter_variant.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xhdpi/ic_filter_variant_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xhdpi/ic_folder_outline.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xhdpi/ic_folder_outline_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xhdpi/ic_fresh.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xhdpi/ic_fresh_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xhdpi/ic_go_back.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xhdpi/ic_go_back_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xhdpi/ic_image_album.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xhdpi/ic_inbox.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xhdpi/ic_inbox_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xhdpi/ic_login.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xhdpi/ic_logout.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xhdpi/ic_play_circle.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xhdpi/ic_refresh.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xhdpi/ic_restore.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xhdpi/ic_restore_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xhdpi/ic_rss_box.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xhdpi/ic_rss_box_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xhdpi/ic_search.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xhdpi/ic_select.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xhdpi/ic_settings.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xhdpi/ic_settings_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xhdpi/ic_share.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xhdpi/ic_share_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xhdpi/ic_sort.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xhdpi/ic_star.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xhdpi/ic_star_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xhdpi/ic_star_outline.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xhdpi/ic_star_outline_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xhdpi/ic_youtube_play.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxhdpi/drawer_header.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxhdpi/drawer_header_amber.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxhdpi/drawer_header_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_action_trending_down.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_action_trending_down_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_action_trending_flat.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_action_trending_flat_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_action_trending_up.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_action_trending_up_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_action_web_site.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_archive.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_archive_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_attachment.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_attachment_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_attachment_vert.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_attachment_vert_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_checkbox_marked.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_checkbox_marked_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_cloud_download.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_cloud_download_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_cloud_upload.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_cloud_upload_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_content_copy.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_dots_vertical.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_dots_vertical_circle.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_dots_vertical_circle_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_dots_vertical_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_email.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_email_open.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_filter_variant.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_filter_variant_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_folder_outline.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_folder_outline_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_fresh.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_fresh_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_go_back.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_go_back_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_image_album.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_inbox.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_inbox_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_login.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_logout.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_play_circle.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_refresh.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_restore.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_restore_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_rss_box.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_rss_box_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_search.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_select.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_settings.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_settings_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_share.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_share_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_sort.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_star.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_star_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_star_outline.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_star_outline_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_youtube_play.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_action_trending_down.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_action_trending_down_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_action_trending_flat.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_action_trending_flat_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_action_trending_up.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_action_trending_up_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_action_web_site.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_archive.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_archive_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_attachment.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_attachment_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_attachment_vert.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_attachment_vert_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_checkbox_marked.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_checkbox_marked_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_cloud_download.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_cloud_download_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_cloud_upload.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_cloud_upload_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_content_copy.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_dots_vertical.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_dots_vertical_circle.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_dots_vertical_circle_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_dots_vertical_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_email.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_email_open.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_filter_variant.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_filter_variant_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_folder_outline.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_folder_outline_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_fresh.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_fresh_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_go_back.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_go_back_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_image_album.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_inbox.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_inbox_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_login.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_logout.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_play_circle.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_refresh.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_restore.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_restore_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_rss_box.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_rss_box_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_search.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_select.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_settings.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_settings_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_share.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_share_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_sort.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_star.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_star_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_star_outline.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_star_outline_dark.png delete mode 100644 org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_youtube_play.png create mode 100644 org.fox.ttrss/src/main/res/drawable/baseline_archive_24.xml create mode 100644 org.fox.ttrss/src/main/res/drawable/baseline_arrow_back_24.xml create mode 100644 org.fox.ttrss/src/main/res/drawable/baseline_attach_file_24.xml create mode 100644 org.fox.ttrss/src/main/res/drawable/baseline_attachment_24.xml create mode 100644 org.fox.ttrss/src/main/res/drawable/baseline_check_box_24.xml create mode 100644 org.fox.ttrss/src/main/res/drawable/baseline_cloud_download_24.xml create mode 100644 org.fox.ttrss/src/main/res/drawable/baseline_cloud_upload_24.xml create mode 100644 org.fox.ttrss/src/main/res/drawable/baseline_content_copy_24.xml create mode 100644 org.fox.ttrss/src/main/res/drawable/baseline_email_24.xml create mode 100644 org.fox.ttrss/src/main/res/drawable/baseline_filter_alt_24.xml create mode 100644 org.fox.ttrss/src/main/res/drawable/baseline_folder_open_24.xml create mode 100644 org.fox.ttrss/src/main/res/drawable/baseline_inbox_24.xml create mode 100644 org.fox.ttrss/src/main/res/drawable/baseline_local_fire_department_24.xml create mode 100644 org.fox.ttrss/src/main/res/drawable/baseline_login_24.xml create mode 100644 org.fox.ttrss/src/main/res/drawable/baseline_mark_as_unread_24.xml create mode 100644 org.fox.ttrss/src/main/res/drawable/baseline_mark_email_read_24.xml create mode 100644 org.fox.ttrss/src/main/res/drawable/baseline_more_vert_24.xml create mode 100644 org.fox.ttrss/src/main/res/drawable/baseline_open_in_browser_24.xml create mode 100644 org.fox.ttrss/src/main/res/drawable/baseline_photo_album_24.xml create mode 100644 org.fox.ttrss/src/main/res/drawable/baseline_play_circle_24.xml create mode 100644 org.fox.ttrss/src/main/res/drawable/baseline_play_circle_outline_24.xml create mode 100644 org.fox.ttrss/src/main/res/drawable/baseline_refresh_24.xml create mode 100644 org.fox.ttrss/src/main/res/drawable/baseline_restore_24.xml create mode 100644 org.fox.ttrss/src/main/res/drawable/baseline_rss_feed_24.xml create mode 100644 org.fox.ttrss/src/main/res/drawable/baseline_search_24.xml create mode 100644 org.fox.ttrss/src/main/res/drawable/baseline_select_all_24.xml create mode 100644 org.fox.ttrss/src/main/res/drawable/baseline_settings_24.xml create mode 100644 org.fox.ttrss/src/main/res/drawable/baseline_share_24.xml create mode 100644 org.fox.ttrss/src/main/res/drawable/baseline_sort_24.xml create mode 100644 org.fox.ttrss/src/main/res/drawable/baseline_sort_by_alpha_24.xml create mode 100644 org.fox.ttrss/src/main/res/drawable/baseline_star_24.xml create mode 100644 org.fox.ttrss/src/main/res/drawable/baseline_star_outline_24.xml create mode 100644 org.fox.ttrss/src/main/res/drawable/baseline_trending_down_24.xml create mode 100644 org.fox.ttrss/src/main/res/drawable/baseline_trending_flat_24.xml create mode 100644 org.fox.ttrss/src/main/res/drawable/baseline_trending_up_24.xml create mode 100644 org.fox.ttrss/src/main/res/drawable/outline_more_24.xml delete mode 100644 org.fox.ttrss/src/main/res/menu/activity_youtube_player.xml (limited to 'org.fox.ttrss/src/main/java/org') diff --git a/org.fox.ttrss/build.gradle b/org.fox.ttrss/build.gradle index be54fc88..694e01a3 100755 --- a/org.fox.ttrss/build.gradle +++ b/org.fox.ttrss/build.gradle @@ -15,6 +15,7 @@ android { compileSdk 35 versionCode 558 versionName getVersion() + vectorDrawables.useSupportLibrary = true } signingConfigs { @@ -121,6 +122,7 @@ dependencies { implementation 'me.relex:circleindicator:1.2.2@aar' implementation 'com.nineoldandroids:library:2.4.0' implementation 'com.github.amulyakhare:TextDrawable:558677ea31' + } java { toolchain { diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java index f0416353..ec1ddb9d 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java @@ -468,7 +468,7 @@ public class CommonActivity extends AppCompatActivity implements SharedPreferenc PendingIntent pendingIntent = PendingIntent.getActivity(getApplicationContext(), CommonActivity.PENDING_INTENT_CHROME_SHARE, shareIntent, PendingIntent.FLAG_UPDATE_CURRENT | PendingIntent.FLAG_IMMUTABLE); - builder.setActionButton(BitmapFactory.decodeResource(getResources(), R.drawable.ic_share), + builder.setActionButton(BitmapFactory.decodeResource(getResources(), R.drawable.baseline_share_24), getString(R.string.share_article), pendingIntent); CustomTabsIntent intent = builder.build(); diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java index f1546080..ef2e23a6 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java @@ -1679,13 +1679,13 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment { private void adjustVideoKindView(ArticleViewHolder holder, Article article) { if (article.flavorImage != null) { if (article.flavor_kind == Article.FLAVOR_KIND_YOUTUBE || "iframe".equals(article.flavorImage.tagName().toLowerCase())) { - holder.flavorVideoKindView.setImageResource(R.drawable.ic_youtube_play); + holder.flavorVideoKindView.setImageResource(R.drawable.baseline_play_circle_outline_24); holder.flavorVideoKindView.setVisibility(View.VISIBLE); } else if (article.flavor_kind == Article.FLAVOR_KIND_VIDEO || "video".equals(article.flavorImage.tagName().toLowerCase())) { - holder.flavorVideoKindView.setImageResource(R.drawable.ic_play_circle); + holder.flavorVideoKindView.setImageResource(R.drawable.baseline_play_circle_24); holder.flavorVideoKindView.setVisibility(View.VISIBLE); } else if (article.flavor_kind == Article.FLAVOR_KIND_ALBUM ||article.mediaList.size() > 1) { - holder.flavorVideoKindView.setImageResource(R.drawable.ic_image_album); + holder.flavorVideoKindView.setImageResource(R.drawable.baseline_photo_album_24); holder.flavorVideoKindView.setVisibility(View.VISIBLE); } else { holder.flavorVideoKindView.setVisibility(View.INVISIBLE); diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java index 9bac8849..d9550ef8 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java @@ -1403,14 +1403,14 @@ public class OnlineActivity extends CommonActivity { Article article = ap.getSelectedArticle(); if (article != null) { - m_menu.findItem(R.id.toggle_marked).setIcon(article.marked ? R.drawable.ic_star : - R.drawable.ic_star_outline); + m_menu.findItem(R.id.toggle_marked).setIcon(article.marked ? R.drawable.baseline_star_24 : + R.drawable.baseline_star_outline_24); - m_menu.findItem(R.id.toggle_published).setIcon(article.published ? R.drawable.ic_checkbox_marked : - R.drawable.ic_rss_box); + m_menu.findItem(R.id.toggle_published).setIcon(article.published ? R.drawable.baseline_check_box_24 : + R.drawable.baseline_rss_feed_24); - m_menu.findItem(R.id.toggle_unread).setIcon(article.unread ? R.drawable.ic_email : - R.drawable.ic_email_open); + m_menu.findItem(R.id.toggle_unread).setIcon(article.unread ? R.drawable.baseline_email_24 : + R.drawable.baseline_mark_as_unread_24); } } diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineActivity.java index 4c2e92a7..f2320a00 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineActivity.java @@ -605,14 +605,14 @@ public class OfflineActivity extends CommonActivity { boolean marked = article.getInt(article.getColumnIndex("marked")) == 1; boolean published = article.getInt(article.getColumnIndex("published")) == 1; - m_menu.findItem(R.id.toggle_marked).setIcon(marked ? R.drawable.ic_star : - R.drawable.ic_star_outline); + m_menu.findItem(R.id.toggle_marked).setIcon(marked ? R.drawable.baseline_star_24 : + R.drawable.baseline_star_outline_24); - m_menu.findItem(R.id.toggle_published).setIcon(published ? R.drawable.ic_checkbox_marked : - R.drawable.ic_rss_box); + m_menu.findItem(R.id.toggle_published).setIcon(published ? R.drawable.baseline_check_box_24 : + R.drawable.baseline_rss_feed_24); - m_menu.findItem(R.id.toggle_unread).setIcon(unread ? R.drawable.ic_email : - R.drawable.ic_email_open); + m_menu.findItem(R.id.toggle_unread).setIcon(unread ? R.drawable.baseline_email_24 : + R.drawable.baseline_mark_as_unread_24); article.close(); } diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineDownloadService.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineDownloadService.java index 933fbc03..c3c31133 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineDownloadService.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineDownloadService.java @@ -116,7 +116,7 @@ public class OfflineDownloadService extends Service { .setContentTitle(getString(R.string.notify_downloading_title)) .setContentIntent(contentIntent) .setWhen(System.currentTimeMillis()) - .setSmallIcon(R.drawable.ic_cloud_download) + .setSmallIcon(R.drawable.baseline_cloud_download_24) .setLargeIcon(BitmapFactory.decodeResource(getApplicationContext().getResources(), R.drawable.ic_launcher)) .setOngoing(!isError) @@ -124,20 +124,17 @@ public class OfflineDownloadService extends Service { if (showProgress) builder.setProgress(max, progress, max == 0); - if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { + intent = new Intent(this, OnlineActivity.class); + intent.setAction(INTENT_ACTION_CANCEL); - intent = new Intent(this, OnlineActivity.class); - intent.setAction(INTENT_ACTION_CANCEL); + PendingIntent cancelIntent = PendingIntent.getActivity(this, PI_CANCEL, intent, PendingIntent.FLAG_IMMUTABLE); - PendingIntent cancelIntent = PendingIntent.getActivity(this, PI_CANCEL, intent, PendingIntent.FLAG_IMMUTABLE); - - builder.setCategory(Notification.CATEGORY_PROGRESS) - .setVibrate(new long[0]) - .setVisibility(Notification.VISIBILITY_PUBLIC) - .setColor(0x88b0f0) - .setGroup("org.fox.ttrss") - .addAction(R.drawable.ic_launcher, getString(R.string.cancel), cancelIntent); - } + builder.setCategory(Notification.CATEGORY_PROGRESS) + .setVibrate(new long[0]) + .setVisibility(NotificationCompat.VISIBILITY_PUBLIC) + .setColor(0x88b0f0) + .setGroup("org.fox.ttrss") + .addAction(R.drawable.ic_launcher, getString(R.string.cancel), cancelIntent); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { builder.setChannelId(CommonActivity.NOTIFICATION_CHANNEL_NORMAL); @@ -182,7 +179,7 @@ public class OfflineDownloadService extends Service { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { builder.setCategory(Notification.CATEGORY_MESSAGE) .setVibrate(new long[0]) - .setVisibility(Notification.VISIBILITY_PUBLIC) + .setVisibility(NotificationCompat.VISIBILITY_PUBLIC) .setColor(0x88b0f0) .setGroup("org.fox.ttrss"); } diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java index 258a1ddd..368ec95c 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java @@ -1085,10 +1085,10 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis private void adjustVideoKindView(ArticleViewHolder holder, ArticleFlavorInfo afi) { if (afi.flavorImageUri != null) { if (afi.flavorStreamUri != null) { - holder.flavorVideoKindView.setImageResource(R.drawable.ic_play_circle); + holder.flavorVideoKindView.setImageResource(R.drawable.baseline_play_circle_24); holder.flavorVideoKindView.setVisibility(View.VISIBLE); } else if (afi.mediaList.size() > 1) { - holder.flavorVideoKindView.setImageResource(R.drawable.ic_image_album); + holder.flavorVideoKindView.setImageResource(R.drawable.baseline_photo_album_24); holder.flavorVideoKindView.setVisibility(View.VISIBLE); } else { holder.flavorVideoKindView.setVisibility(View.INVISIBLE); diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineUploadService.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineUploadService.java index cce355a1..efbeef2c 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineUploadService.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineUploadService.java @@ -68,7 +68,7 @@ public class OfflineUploadService extends IntentService { .setContentTitle(getString(R.string.notify_uploading_title)) .setContentIntent(contentIntent) .setWhen(System.currentTimeMillis()) - .setSmallIcon(R.drawable.ic_cloud_upload) + .setSmallIcon(R.drawable.baseline_cloud_upload_24) .setLargeIcon(BitmapFactory.decodeResource(getApplicationContext().getResources(), R.drawable.ic_launcher)) .setOngoing(!isError) @@ -79,7 +79,7 @@ public class OfflineUploadService extends IntentService { if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) { builder.setCategory(Notification.CATEGORY_PROGRESS) - .setVisibility(Notification.VISIBILITY_PUBLIC) + .setVisibility(NotificationCompat.VISIBILITY_PUBLIC) .setColor(0x88b0f0) .setGroup("org.fox.ttrss") .addAction(R.drawable.ic_launcher, getString(R.string.offline_sync_try_again), contentIntent); diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/util/ImageCacheService.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/util/ImageCacheService.java index ae8e7a4c..b2ae08f7 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/util/ImageCacheService.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/util/ImageCacheService.java @@ -204,7 +204,7 @@ public class ImageCacheService extends IntentService { .setContentTitle(getString(R.string.notify_downloading_title)) .setContentIntent(contentIntent) .setWhen(System.currentTimeMillis()) - .setSmallIcon(R.drawable.ic_cloud_download) + .setSmallIcon(R.drawable.baseline_cloud_download_24) .setLargeIcon(BitmapFactory.decodeResource(getApplicationContext().getResources(), R.drawable.ic_launcher)) .setOngoing(true) diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/drawer_header.png b/org.fox.ttrss/src/main/res/drawable-hdpi/drawer_header.png deleted file mode 100644 index d556700b..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-hdpi/drawer_header.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/drawer_header_amber.png b/org.fox.ttrss/src/main/res/drawable-hdpi/drawer_header_amber.png deleted file mode 100644 index e41c647d..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-hdpi/drawer_header_amber.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/drawer_header_dark.png b/org.fox.ttrss/src/main/res/drawable-hdpi/drawer_header_dark.png deleted file mode 100644 index 7cf97e22..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-hdpi/drawer_header_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_action_trending_down.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_action_trending_down.png deleted file mode 100644 index d84624ca..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_action_trending_down.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_action_trending_down_dark.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_action_trending_down_dark.png deleted file mode 100644 index 1b4e2ac6..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_action_trending_down_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_action_trending_flat.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_action_trending_flat.png deleted file mode 100644 index ec65283b..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_action_trending_flat.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_action_trending_flat_dark.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_action_trending_flat_dark.png deleted file mode 100644 index d877db05..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_action_trending_flat_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_action_trending_up.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_action_trending_up.png deleted file mode 100644 index 68945759..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_action_trending_up.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_action_trending_up_dark.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_action_trending_up_dark.png deleted file mode 100644 index b3ecbf00..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_action_trending_up_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_action_web_site.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_action_web_site.png deleted file mode 100644 index b7347bbc..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_action_web_site.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_archive.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_archive.png deleted file mode 100644 index 86658e2c..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_archive.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_archive_dark.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_archive_dark.png deleted file mode 100644 index 6849379a..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_archive_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_attachment.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_attachment.png deleted file mode 100644 index d444973e..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_attachment.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_attachment_dark.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_attachment_dark.png deleted file mode 100644 index 2f7c51d1..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_attachment_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_attachment_vert.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_attachment_vert.png deleted file mode 100644 index 389acd29..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_attachment_vert.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_attachment_vert_dark.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_attachment_vert_dark.png deleted file mode 100644 index 9e92b8c5..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_attachment_vert_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_checkbox_marked.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_checkbox_marked.png deleted file mode 100644 index a568060a..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_checkbox_marked.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_checkbox_marked_dark.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_checkbox_marked_dark.png deleted file mode 100644 index 67bd912b..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_checkbox_marked_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_cloud_download.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_cloud_download.png deleted file mode 100644 index 5d15649c..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_cloud_download.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_cloud_download_dark.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_cloud_download_dark.png deleted file mode 100644 index a9fee824..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_cloud_download_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_cloud_upload.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_cloud_upload.png deleted file mode 100644 index c27d448d..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_cloud_upload.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_cloud_upload_dark.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_cloud_upload_dark.png deleted file mode 100644 index b685b8d3..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_cloud_upload_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_content_copy.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_content_copy.png deleted file mode 100644 index f3febcae..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_content_copy.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_dots_vertical.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_dots_vertical.png deleted file mode 100644 index 9e091806..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_dots_vertical.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_dots_vertical_circle.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_dots_vertical_circle.png deleted file mode 100644 index 8f24f42c..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_dots_vertical_circle.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_dots_vertical_circle_dark.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_dots_vertical_circle_dark.png deleted file mode 100644 index bd6275c7..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_dots_vertical_circle_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_dots_vertical_dark.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_dots_vertical_dark.png deleted file mode 100644 index 1819c7f3..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_dots_vertical_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_email.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_email.png deleted file mode 100644 index c3a004a3..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_email.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_email_open.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_email_open.png deleted file mode 100644 index 463a808b..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_email_open.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_filter_variant.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_filter_variant.png deleted file mode 100644 index 4faa102b..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_filter_variant.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_filter_variant_dark.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_filter_variant_dark.png deleted file mode 100644 index 623ea2c5..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_filter_variant_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_folder_outline.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_folder_outline.png deleted file mode 100644 index f7cc7739..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_folder_outline.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_folder_outline_dark.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_folder_outline_dark.png deleted file mode 100644 index 2c505beb..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_folder_outline_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_fresh.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_fresh.png deleted file mode 100644 index 650d0f11..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_fresh.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_fresh_dark.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_fresh_dark.png deleted file mode 100644 index 29bed701..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_fresh_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_go_back.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_go_back.png deleted file mode 100644 index fc6ebb25..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_go_back.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_go_back_dark.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_go_back_dark.png deleted file mode 100644 index e4322c95..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_go_back_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_image_album.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_image_album.png deleted file mode 100644 index 58ae6503..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_image_album.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_inbox.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_inbox.png deleted file mode 100644 index 92ab24ce..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_inbox.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_inbox_dark.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_inbox_dark.png deleted file mode 100644 index 9c42749c..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_inbox_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_login.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_login.png deleted file mode 100644 index b4e322e2..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_login.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_logout.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_logout.png deleted file mode 100644 index 1778fb15..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_logout.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_play_circle.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_play_circle.png deleted file mode 100644 index b4d4f903..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_play_circle.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_refresh.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_refresh.png deleted file mode 100644 index 8c0a324d..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_refresh.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_restore.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_restore.png deleted file mode 100644 index 3cc4fd3f..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_restore.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_restore_dark.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_restore_dark.png deleted file mode 100644 index d3282429..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_restore_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_rss_box.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_rss_box.png deleted file mode 100644 index 2139f158..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_rss_box.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_rss_box_dark.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_rss_box_dark.png deleted file mode 100644 index 8ea7af61..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_rss_box_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_search.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_search.png deleted file mode 100644 index da11a757..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_search.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_select.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_select.png deleted file mode 100644 index 6c469fe9..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_select.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_settings.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_settings.png deleted file mode 100644 index e65808c9..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_settings.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_settings_dark.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_settings_dark.png deleted file mode 100644 index c404fd0c..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_settings_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_share.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_share.png deleted file mode 100644 index 60269c5f..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_share.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_share_dark.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_share_dark.png deleted file mode 100644 index 7d730af3..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_share_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_sort.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_sort.png deleted file mode 100644 index 69815f4a..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_sort.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_star.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_star.png deleted file mode 100644 index aadffe6a..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_star.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_star_dark.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_star_dark.png deleted file mode 100644 index a9e5ba81..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_star_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_star_outline.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_star_outline.png deleted file mode 100644 index e5e5c271..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_star_outline.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_star_outline_dark.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_star_outline_dark.png deleted file mode 100644 index 17afc5f5..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_star_outline_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_youtube_play.png b/org.fox.ttrss/src/main/res/drawable-hdpi/ic_youtube_play.png deleted file mode 100644 index f36d9259..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-hdpi/ic_youtube_play.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_action_trending_down.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_action_trending_down.png deleted file mode 100644 index 7dcdca0e..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_action_trending_down.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_action_trending_down_dark.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_action_trending_down_dark.png deleted file mode 100644 index 37ea9a33..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_action_trending_down_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_action_trending_flat.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_action_trending_flat.png deleted file mode 100644 index 7b47abd1..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_action_trending_flat.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_action_trending_flat_dark.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_action_trending_flat_dark.png deleted file mode 100644 index d9251d44..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_action_trending_flat_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_action_trending_up.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_action_trending_up.png deleted file mode 100644 index fe3218cf..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_action_trending_up.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_action_trending_up_dark.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_action_trending_up_dark.png deleted file mode 100644 index 5af3c92e..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_action_trending_up_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_action_web_site.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_action_web_site.png deleted file mode 100644 index 7e5958ac..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_action_web_site.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_archive.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_archive.png deleted file mode 100644 index 908e4bbc..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_archive.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_archive_dark.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_archive_dark.png deleted file mode 100644 index 0a350363..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_archive_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_attachment.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_attachment.png deleted file mode 100644 index 24ed83da..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_attachment.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_attachment_dark.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_attachment_dark.png deleted file mode 100644 index 9936076e..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_attachment_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_attachment_vert.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_attachment_vert.png deleted file mode 100644 index 781b6372..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_attachment_vert.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_attachment_vert_dark.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_attachment_vert_dark.png deleted file mode 100644 index 7c884662..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_attachment_vert_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_checkbox_marked.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_checkbox_marked.png deleted file mode 100644 index cea1ad89..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_checkbox_marked.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_checkbox_marked_dark.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_checkbox_marked_dark.png deleted file mode 100644 index 4b85499d..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_checkbox_marked_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_cloud_download.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_cloud_download.png deleted file mode 100644 index 7ac3955f..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_cloud_download.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_cloud_download_dark.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_cloud_download_dark.png deleted file mode 100644 index 37c3ccf9..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_cloud_download_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_cloud_upload.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_cloud_upload.png deleted file mode 100644 index f84984b0..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_cloud_upload.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_cloud_upload_dark.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_cloud_upload_dark.png deleted file mode 100644 index d025c97e..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_cloud_upload_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_content_copy.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_content_copy.png deleted file mode 100644 index aff7317c..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_content_copy.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_dots_vertical.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_dots_vertical.png deleted file mode 100644 index 38591372..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_dots_vertical.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_dots_vertical_circle.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_dots_vertical_circle.png deleted file mode 100644 index cb96e59b..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_dots_vertical_circle.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_dots_vertical_circle_dark.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_dots_vertical_circle_dark.png deleted file mode 100644 index 1284feba..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_dots_vertical_circle_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_dots_vertical_dark.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_dots_vertical_dark.png deleted file mode 100644 index eb100c47..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_dots_vertical_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_email.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_email.png deleted file mode 100644 index 688bcfdf..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_email.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_email_open.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_email_open.png deleted file mode 100644 index e3156355..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_email_open.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_filter_variant.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_filter_variant.png deleted file mode 100644 index 7f3d0364..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_filter_variant.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_filter_variant_dark.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_filter_variant_dark.png deleted file mode 100644 index a761e237..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_filter_variant_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_folder_outline.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_folder_outline.png deleted file mode 100644 index 6c1d7d85..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_folder_outline.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_folder_outline_dark.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_folder_outline_dark.png deleted file mode 100644 index 84a81461..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_folder_outline_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_fresh.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_fresh.png deleted file mode 100644 index 6c098bf5..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_fresh.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_fresh_dark.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_fresh_dark.png deleted file mode 100644 index 2bce1991..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_fresh_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_go_back.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_go_back.png deleted file mode 100644 index e88fe3db..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_go_back.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_go_back_dark.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_go_back_dark.png deleted file mode 100644 index bbe935db..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_go_back_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_image_album.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_image_album.png deleted file mode 100644 index 5c943d79..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_image_album.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_inbox.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_inbox.png deleted file mode 100644 index b12f5c19..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_inbox.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_inbox_dark.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_inbox_dark.png deleted file mode 100644 index 3ad671e3..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_inbox_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_login.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_login.png deleted file mode 100644 index b6ea39c8..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_login.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_logout.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_logout.png deleted file mode 100644 index 24abb2fb..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_logout.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_play_circle.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_play_circle.png deleted file mode 100644 index e442ae26..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_play_circle.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_refresh.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_refresh.png deleted file mode 100644 index 47e67916..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_refresh.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_restore.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_restore.png deleted file mode 100644 index 8417d747..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_restore.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_restore_dark.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_restore_dark.png deleted file mode 100644 index 6b5bee62..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_restore_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_rss_box.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_rss_box.png deleted file mode 100644 index fd54c863..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_rss_box.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_rss_box_dark.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_rss_box_dark.png deleted file mode 100644 index 1a878c47..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_rss_box_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_search.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_search.png deleted file mode 100644 index ddd225a7..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_search.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_select.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_select.png deleted file mode 100644 index 19dfda24..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_select.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_settings.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_settings.png deleted file mode 100644 index 6f4637a7..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_settings.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_settings_dark.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_settings_dark.png deleted file mode 100644 index 9947ffb8..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_settings_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_share.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_share.png deleted file mode 100644 index cff4a732..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_share.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_share_dark.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_share_dark.png deleted file mode 100644 index 829087f8..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_share_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_sort.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_sort.png deleted file mode 100644 index 31c6806f..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_sort.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_star.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_star.png deleted file mode 100644 index c87100e2..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_star.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_star_dark.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_star_dark.png deleted file mode 100644 index 6d15e8a7..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_star_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_star_outline.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_star_outline.png deleted file mode 100644 index a53d0f60..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_star_outline.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_star_outline_dark.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_star_outline_dark.png deleted file mode 100644 index d0405813..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_star_outline_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_youtube_play.png b/org.fox.ttrss/src/main/res/drawable-mdpi/ic_youtube_play.png deleted file mode 100644 index 5dbfc8d1..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-mdpi/ic_youtube_play.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_action_trending_down.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_action_trending_down.png deleted file mode 100644 index 53ff92a2..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_action_trending_down.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_action_trending_down_dark.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_action_trending_down_dark.png deleted file mode 100644 index 0f15737f..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_action_trending_down_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_action_trending_flat.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_action_trending_flat.png deleted file mode 100644 index 33d96f00..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_action_trending_flat.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_action_trending_flat_dark.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_action_trending_flat_dark.png deleted file mode 100644 index 8c1ea784..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_action_trending_flat_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_action_trending_up.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_action_trending_up.png deleted file mode 100644 index 33b01737..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_action_trending_up.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_action_trending_up_dark.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_action_trending_up_dark.png deleted file mode 100644 index ec479dbf..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_action_trending_up_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_action_web_site.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_action_web_site.png deleted file mode 100644 index db5cbe60..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_action_web_site.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_archive.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_archive.png deleted file mode 100644 index e759dc38..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_archive.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_archive_dark.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_archive_dark.png deleted file mode 100644 index d29d7861..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_archive_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_attachment.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_attachment.png deleted file mode 100644 index 26f61c29..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_attachment.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_attachment_dark.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_attachment_dark.png deleted file mode 100644 index 05aeeff7..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_attachment_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_attachment_vert.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_attachment_vert.png deleted file mode 100644 index 69d778e1..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_attachment_vert.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_attachment_vert_dark.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_attachment_vert_dark.png deleted file mode 100644 index d0657c0e..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_attachment_vert_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_checkbox_marked.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_checkbox_marked.png deleted file mode 100644 index 6964562d..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_checkbox_marked.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_checkbox_marked_dark.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_checkbox_marked_dark.png deleted file mode 100644 index 54936ef9..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_checkbox_marked_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_cloud_download.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_cloud_download.png deleted file mode 100644 index 20bcdd58..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_cloud_download.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_cloud_download_dark.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_cloud_download_dark.png deleted file mode 100644 index c1bb95d7..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_cloud_download_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_cloud_upload.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_cloud_upload.png deleted file mode 100644 index b0bed197..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_cloud_upload.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_cloud_upload_dark.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_cloud_upload_dark.png deleted file mode 100644 index ab9f1c71..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_cloud_upload_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_content_copy.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_content_copy.png deleted file mode 100644 index 9f63f9b0..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_content_copy.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_dots_vertical.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_dots_vertical.png deleted file mode 100644 index 8a1172f2..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_dots_vertical.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_dots_vertical_circle.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_dots_vertical_circle.png deleted file mode 100644 index 469e4074..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_dots_vertical_circle.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_dots_vertical_circle_dark.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_dots_vertical_circle_dark.png deleted file mode 100644 index d7dc01d2..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_dots_vertical_circle_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_dots_vertical_dark.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_dots_vertical_dark.png deleted file mode 100644 index 27538d34..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_dots_vertical_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_email.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_email.png deleted file mode 100644 index c1a79b44..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_email.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_email_open.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_email_open.png deleted file mode 100644 index d65791a1..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_email_open.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_filter_variant.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_filter_variant.png deleted file mode 100644 index 4511f444..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_filter_variant.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_filter_variant_dark.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_filter_variant_dark.png deleted file mode 100644 index 3468b02b..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_filter_variant_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_folder_outline.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_folder_outline.png deleted file mode 100644 index 036daa89..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_folder_outline.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_folder_outline_dark.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_folder_outline_dark.png deleted file mode 100644 index a5eeeca0..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_folder_outline_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_fresh.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_fresh.png deleted file mode 100644 index ff106b38..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_fresh.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_fresh_dark.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_fresh_dark.png deleted file mode 100644 index 7b541ca8..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_fresh_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_go_back.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_go_back.png deleted file mode 100644 index b3a5556b..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_go_back.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_go_back_dark.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_go_back_dark.png deleted file mode 100644 index a2ef528f..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_go_back_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_image_album.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_image_album.png deleted file mode 100644 index 2f4d73cb..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_image_album.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_inbox.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_inbox.png deleted file mode 100644 index 35f6fc1b..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_inbox.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_inbox_dark.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_inbox_dark.png deleted file mode 100644 index bcceb5c4..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_inbox_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_login.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_login.png deleted file mode 100644 index ee7edf0c..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_login.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_logout.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_logout.png deleted file mode 100644 index 25e32eff..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_logout.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_play_circle.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_play_circle.png deleted file mode 100644 index 46b06231..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_play_circle.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_refresh.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_refresh.png deleted file mode 100644 index 2582b47a..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_refresh.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_restore.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_restore.png deleted file mode 100644 index 24052165..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_restore.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_restore_dark.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_restore_dark.png deleted file mode 100644 index b066e8d6..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_restore_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_rss_box.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_rss_box.png deleted file mode 100644 index ad319be9..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_rss_box.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_rss_box_dark.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_rss_box_dark.png deleted file mode 100644 index 7e8b428c..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_rss_box_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_search.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_search.png deleted file mode 100644 index 1e01383f..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_search.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_select.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_select.png deleted file mode 100644 index d46a33e3..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_select.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_settings.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_settings.png deleted file mode 100644 index f01e5372..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_settings.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_settings_dark.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_settings_dark.png deleted file mode 100644 index 27c334bf..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_settings_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_share.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_share.png deleted file mode 100644 index 6688550f..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_share.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_share_dark.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_share_dark.png deleted file mode 100644 index 7185c9be..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_share_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_sort.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_sort.png deleted file mode 100644 index e735d160..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_sort.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_star.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_star.png deleted file mode 100644 index 06a24604..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_star.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_star_dark.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_star_dark.png deleted file mode 100644 index 71fc5c28..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_star_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_star_outline.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_star_outline.png deleted file mode 100644 index 1b932488..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_star_outline.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_star_outline_dark.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_star_outline_dark.png deleted file mode 100644 index 7be768e1..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_star_outline_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_youtube_play.png b/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_youtube_play.png deleted file mode 100644 index 1194d0db..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xhdpi/ic_youtube_play.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/drawer_header.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/drawer_header.png deleted file mode 100644 index 80c578ba..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxhdpi/drawer_header.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/drawer_header_amber.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/drawer_header_amber.png deleted file mode 100644 index 463fba18..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxhdpi/drawer_header_amber.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/drawer_header_dark.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/drawer_header_dark.png deleted file mode 100644 index 77170adb..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxhdpi/drawer_header_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_action_trending_down.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_action_trending_down.png deleted file mode 100644 index c2ec115e..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_action_trending_down.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_action_trending_down_dark.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_action_trending_down_dark.png deleted file mode 100644 index 02183b60..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_action_trending_down_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_action_trending_flat.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_action_trending_flat.png deleted file mode 100644 index 7b51ffcc..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_action_trending_flat.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_action_trending_flat_dark.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_action_trending_flat_dark.png deleted file mode 100644 index f55069c1..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_action_trending_flat_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_action_trending_up.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_action_trending_up.png deleted file mode 100644 index dd732d55..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_action_trending_up.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_action_trending_up_dark.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_action_trending_up_dark.png deleted file mode 100644 index f8d6b481..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_action_trending_up_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_action_web_site.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_action_web_site.png deleted file mode 100644 index 1a845b9f..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_action_web_site.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_archive.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_archive.png deleted file mode 100644 index 97ebb509..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_archive.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_archive_dark.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_archive_dark.png deleted file mode 100644 index 03a36027..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_archive_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_attachment.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_attachment.png deleted file mode 100644 index 0117966d..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_attachment.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_attachment_dark.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_attachment_dark.png deleted file mode 100644 index d91d1cd7..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_attachment_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_attachment_vert.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_attachment_vert.png deleted file mode 100644 index 9df9428f..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_attachment_vert.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_attachment_vert_dark.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_attachment_vert_dark.png deleted file mode 100644 index 369567c6..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_attachment_vert_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_checkbox_marked.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_checkbox_marked.png deleted file mode 100644 index 8237fa47..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_checkbox_marked.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_checkbox_marked_dark.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_checkbox_marked_dark.png deleted file mode 100644 index 84cc49cc..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_checkbox_marked_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_cloud_download.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_cloud_download.png deleted file mode 100644 index 87110eb1..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_cloud_download.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_cloud_download_dark.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_cloud_download_dark.png deleted file mode 100644 index 3906cd11..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_cloud_download_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_cloud_upload.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_cloud_upload.png deleted file mode 100644 index f9d8318d..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_cloud_upload.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_cloud_upload_dark.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_cloud_upload_dark.png deleted file mode 100644 index f02f39f4..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_cloud_upload_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_content_copy.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_content_copy.png deleted file mode 100644 index b4ae0edb..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_content_copy.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_dots_vertical.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_dots_vertical.png deleted file mode 100644 index b1618d48..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_dots_vertical.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_dots_vertical_circle.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_dots_vertical_circle.png deleted file mode 100644 index 2d21a371..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_dots_vertical_circle.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_dots_vertical_circle_dark.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_dots_vertical_circle_dark.png deleted file mode 100644 index 3e09a58d..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_dots_vertical_circle_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_dots_vertical_dark.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_dots_vertical_dark.png deleted file mode 100644 index 449deaea..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_dots_vertical_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_email.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_email.png deleted file mode 100644 index a68455d0..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_email.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_email_open.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_email_open.png deleted file mode 100644 index 7527bb3b..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_email_open.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_filter_variant.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_filter_variant.png deleted file mode 100644 index 8639bb4b..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_filter_variant.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_filter_variant_dark.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_filter_variant_dark.png deleted file mode 100644 index 4bfc1042..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_filter_variant_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_folder_outline.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_folder_outline.png deleted file mode 100644 index 87307ab0..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_folder_outline.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_folder_outline_dark.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_folder_outline_dark.png deleted file mode 100644 index ce60e7e3..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_folder_outline_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_fresh.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_fresh.png deleted file mode 100644 index af3e831b..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_fresh.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_fresh_dark.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_fresh_dark.png deleted file mode 100644 index e2ff7761..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_fresh_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_go_back.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_go_back.png deleted file mode 100644 index 24202f15..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_go_back.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_go_back_dark.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_go_back_dark.png deleted file mode 100644 index ed7dcbd0..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_go_back_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_image_album.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_image_album.png deleted file mode 100644 index a301f00e..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_image_album.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_inbox.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_inbox.png deleted file mode 100644 index 78b64c81..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_inbox.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_inbox_dark.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_inbox_dark.png deleted file mode 100644 index c2752bf9..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_inbox_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_login.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_login.png deleted file mode 100644 index f77fb27a..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_login.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_logout.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_logout.png deleted file mode 100644 index 5ef9b41d..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_logout.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_play_circle.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_play_circle.png deleted file mode 100644 index 0e41ce8c..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_play_circle.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_refresh.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_refresh.png deleted file mode 100644 index 31c4c443..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_refresh.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_restore.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_restore.png deleted file mode 100644 index 2951c59f..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_restore.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_restore_dark.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_restore_dark.png deleted file mode 100644 index 35331d03..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_restore_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_rss_box.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_rss_box.png deleted file mode 100644 index 34b1df58..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_rss_box.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_rss_box_dark.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_rss_box_dark.png deleted file mode 100644 index beb0dd19..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_rss_box_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_search.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_search.png deleted file mode 100644 index 04814136..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_search.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_select.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_select.png deleted file mode 100644 index 4f81a58d..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_select.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_settings.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_settings.png deleted file mode 100644 index 1b0e3149..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_settings.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_settings_dark.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_settings_dark.png deleted file mode 100644 index f51b3913..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_settings_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_share.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_share.png deleted file mode 100644 index a44cf763..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_share.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_share_dark.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_share_dark.png deleted file mode 100644 index 3e712879..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_share_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_sort.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_sort.png deleted file mode 100644 index 0f0f4ed8..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_sort.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_star.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_star.png deleted file mode 100644 index 176e426f..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_star.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_star_dark.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_star_dark.png deleted file mode 100644 index 4b25596f..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_star_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_star_outline.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_star_outline.png deleted file mode 100644 index 8b7b8367..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_star_outline.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_star_outline_dark.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_star_outline_dark.png deleted file mode 100644 index fb68b6c6..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_star_outline_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_youtube_play.png b/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_youtube_play.png deleted file mode 100644 index bd097e4f..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxhdpi/ic_youtube_play.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_action_trending_down.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_action_trending_down.png deleted file mode 100644 index ef0c2a10..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_action_trending_down.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_action_trending_down_dark.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_action_trending_down_dark.png deleted file mode 100644 index 7dd24dcd..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_action_trending_down_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_action_trending_flat.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_action_trending_flat.png deleted file mode 100644 index 26cffdf5..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_action_trending_flat.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_action_trending_flat_dark.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_action_trending_flat_dark.png deleted file mode 100644 index bd78a122..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_action_trending_flat_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_action_trending_up.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_action_trending_up.png deleted file mode 100644 index 0d020b1f..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_action_trending_up.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_action_trending_up_dark.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_action_trending_up_dark.png deleted file mode 100644 index 7a750aa4..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_action_trending_up_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_action_web_site.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_action_web_site.png deleted file mode 100644 index 97798369..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_action_web_site.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_archive.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_archive.png deleted file mode 100644 index 6de98b17..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_archive.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_archive_dark.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_archive_dark.png deleted file mode 100644 index 516be711..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_archive_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_attachment.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_attachment.png deleted file mode 100644 index 78d73b80..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_attachment.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_attachment_dark.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_attachment_dark.png deleted file mode 100644 index e4b8794e..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_attachment_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_attachment_vert.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_attachment_vert.png deleted file mode 100644 index f9edd9d6..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_attachment_vert.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_attachment_vert_dark.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_attachment_vert_dark.png deleted file mode 100644 index d0939f3c..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_attachment_vert_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_checkbox_marked.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_checkbox_marked.png deleted file mode 100644 index 3cc0cbaf..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_checkbox_marked.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_checkbox_marked_dark.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_checkbox_marked_dark.png deleted file mode 100644 index a29076b6..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_checkbox_marked_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_cloud_download.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_cloud_download.png deleted file mode 100644 index de4e3ed3..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_cloud_download.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_cloud_download_dark.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_cloud_download_dark.png deleted file mode 100644 index 838f62b7..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_cloud_download_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_cloud_upload.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_cloud_upload.png deleted file mode 100644 index d82c1f1b..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_cloud_upload.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_cloud_upload_dark.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_cloud_upload_dark.png deleted file mode 100644 index b6797aab..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_cloud_upload_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_content_copy.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_content_copy.png deleted file mode 100644 index f9ed3a1a..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_content_copy.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_dots_vertical.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_dots_vertical.png deleted file mode 100644 index 2dacd528..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_dots_vertical.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_dots_vertical_circle.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_dots_vertical_circle.png deleted file mode 100644 index 05895fa3..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_dots_vertical_circle.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_dots_vertical_circle_dark.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_dots_vertical_circle_dark.png deleted file mode 100644 index 884d0f0d..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_dots_vertical_circle_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_dots_vertical_dark.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_dots_vertical_dark.png deleted file mode 100644 index f463232f..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_dots_vertical_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_email.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_email.png deleted file mode 100644 index 9482e57b..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_email.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_email_open.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_email_open.png deleted file mode 100644 index 1eb68434..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_email_open.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_filter_variant.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_filter_variant.png deleted file mode 100644 index bb353bd9..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_filter_variant.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_filter_variant_dark.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_filter_variant_dark.png deleted file mode 100644 index 6a640b3c..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_filter_variant_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_folder_outline.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_folder_outline.png deleted file mode 100644 index ede9f7b9..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_folder_outline.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_folder_outline_dark.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_folder_outline_dark.png deleted file mode 100644 index 7d012c92..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_folder_outline_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_fresh.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_fresh.png deleted file mode 100644 index 89b72943..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_fresh.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_fresh_dark.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_fresh_dark.png deleted file mode 100644 index 2525f453..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_fresh_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_go_back.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_go_back.png deleted file mode 100644 index c909f21a..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_go_back.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_go_back_dark.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_go_back_dark.png deleted file mode 100644 index d6eeb6cb..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_go_back_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_image_album.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_image_album.png deleted file mode 100644 index bbd94d99..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_image_album.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_inbox.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_inbox.png deleted file mode 100644 index 2aa78d56..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_inbox.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_inbox_dark.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_inbox_dark.png deleted file mode 100644 index 90dbaf9b..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_inbox_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_login.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_login.png deleted file mode 100644 index b4dea4a0..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_login.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_logout.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_logout.png deleted file mode 100644 index 5c1dca04..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_logout.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_play_circle.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_play_circle.png deleted file mode 100644 index 2f2eff29..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_play_circle.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_refresh.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_refresh.png deleted file mode 100644 index 2db096de..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_refresh.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_restore.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_restore.png deleted file mode 100644 index b7c389e4..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_restore.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_restore_dark.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_restore_dark.png deleted file mode 100644 index 193ce37b..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_restore_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_rss_box.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_rss_box.png deleted file mode 100644 index d31146fd..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_rss_box.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_rss_box_dark.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_rss_box_dark.png deleted file mode 100644 index 4aa1057b..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_rss_box_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_search.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_search.png deleted file mode 100644 index 0f671764..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_search.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_select.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_select.png deleted file mode 100644 index 161476e1..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_select.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_settings.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_settings.png deleted file mode 100644 index 6f0a9d57..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_settings.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_settings_dark.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_settings_dark.png deleted file mode 100644 index 5b597b8b..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_settings_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_share.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_share.png deleted file mode 100644 index 095a4574..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_share.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_share_dark.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_share_dark.png deleted file mode 100644 index f51c3e91..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_share_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_sort.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_sort.png deleted file mode 100644 index 431756b0..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_sort.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_star.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_star.png deleted file mode 100644 index dacfc20e..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_star.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_star_dark.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_star_dark.png deleted file mode 100644 index c156ea15..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_star_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_star_outline.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_star_outline.png deleted file mode 100644 index 191708d1..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_star_outline.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_star_outline_dark.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_star_outline_dark.png deleted file mode 100644 index 06b4ddae..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_star_outline_dark.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_youtube_play.png b/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_youtube_play.png deleted file mode 100644 index ee708798..00000000 Binary files a/org.fox.ttrss/src/main/res/drawable-xxxhdpi/ic_youtube_play.png and /dev/null differ diff --git a/org.fox.ttrss/src/main/res/drawable/baseline_archive_24.xml b/org.fox.ttrss/src/main/res/drawable/baseline_archive_24.xml new file mode 100644 index 00000000..c50fa951 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable/baseline_archive_24.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/org.fox.ttrss/src/main/res/drawable/baseline_arrow_back_24.xml b/org.fox.ttrss/src/main/res/drawable/baseline_arrow_back_24.xml new file mode 100644 index 00000000..075e95dc --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable/baseline_arrow_back_24.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/org.fox.ttrss/src/main/res/drawable/baseline_attach_file_24.xml b/org.fox.ttrss/src/main/res/drawable/baseline_attach_file_24.xml new file mode 100644 index 00000000..b09f8bc0 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable/baseline_attach_file_24.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/org.fox.ttrss/src/main/res/drawable/baseline_attachment_24.xml b/org.fox.ttrss/src/main/res/drawable/baseline_attachment_24.xml new file mode 100644 index 00000000..def9bd66 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable/baseline_attachment_24.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/org.fox.ttrss/src/main/res/drawable/baseline_check_box_24.xml b/org.fox.ttrss/src/main/res/drawable/baseline_check_box_24.xml new file mode 100644 index 00000000..f6d56943 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable/baseline_check_box_24.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/org.fox.ttrss/src/main/res/drawable/baseline_cloud_download_24.xml b/org.fox.ttrss/src/main/res/drawable/baseline_cloud_download_24.xml new file mode 100644 index 00000000..9a6427bc --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable/baseline_cloud_download_24.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/org.fox.ttrss/src/main/res/drawable/baseline_cloud_upload_24.xml b/org.fox.ttrss/src/main/res/drawable/baseline_cloud_upload_24.xml new file mode 100644 index 00000000..82b88ac1 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable/baseline_cloud_upload_24.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/org.fox.ttrss/src/main/res/drawable/baseline_content_copy_24.xml b/org.fox.ttrss/src/main/res/drawable/baseline_content_copy_24.xml new file mode 100644 index 00000000..942aeb96 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable/baseline_content_copy_24.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/org.fox.ttrss/src/main/res/drawable/baseline_email_24.xml b/org.fox.ttrss/src/main/res/drawable/baseline_email_24.xml new file mode 100644 index 00000000..a3335d40 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable/baseline_email_24.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/org.fox.ttrss/src/main/res/drawable/baseline_filter_alt_24.xml b/org.fox.ttrss/src/main/res/drawable/baseline_filter_alt_24.xml new file mode 100644 index 00000000..22ac7411 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable/baseline_filter_alt_24.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/org.fox.ttrss/src/main/res/drawable/baseline_folder_open_24.xml b/org.fox.ttrss/src/main/res/drawable/baseline_folder_open_24.xml new file mode 100644 index 00000000..56013720 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable/baseline_folder_open_24.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/org.fox.ttrss/src/main/res/drawable/baseline_inbox_24.xml b/org.fox.ttrss/src/main/res/drawable/baseline_inbox_24.xml new file mode 100644 index 00000000..bb6540aa --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable/baseline_inbox_24.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/org.fox.ttrss/src/main/res/drawable/baseline_local_fire_department_24.xml b/org.fox.ttrss/src/main/res/drawable/baseline_local_fire_department_24.xml new file mode 100644 index 00000000..ec632cbb --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable/baseline_local_fire_department_24.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/org.fox.ttrss/src/main/res/drawable/baseline_login_24.xml b/org.fox.ttrss/src/main/res/drawable/baseline_login_24.xml new file mode 100644 index 00000000..d99fc664 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable/baseline_login_24.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/org.fox.ttrss/src/main/res/drawable/baseline_mark_as_unread_24.xml b/org.fox.ttrss/src/main/res/drawable/baseline_mark_as_unread_24.xml new file mode 100644 index 00000000..94381df3 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable/baseline_mark_as_unread_24.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/org.fox.ttrss/src/main/res/drawable/baseline_mark_email_read_24.xml b/org.fox.ttrss/src/main/res/drawable/baseline_mark_email_read_24.xml new file mode 100644 index 00000000..8c898cfa --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable/baseline_mark_email_read_24.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/org.fox.ttrss/src/main/res/drawable/baseline_more_vert_24.xml b/org.fox.ttrss/src/main/res/drawable/baseline_more_vert_24.xml new file mode 100644 index 00000000..5ffb98a5 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable/baseline_more_vert_24.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/org.fox.ttrss/src/main/res/drawable/baseline_open_in_browser_24.xml b/org.fox.ttrss/src/main/res/drawable/baseline_open_in_browser_24.xml new file mode 100644 index 00000000..465c22e8 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable/baseline_open_in_browser_24.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/org.fox.ttrss/src/main/res/drawable/baseline_photo_album_24.xml b/org.fox.ttrss/src/main/res/drawable/baseline_photo_album_24.xml new file mode 100644 index 00000000..19eeec6a --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable/baseline_photo_album_24.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/org.fox.ttrss/src/main/res/drawable/baseline_play_circle_24.xml b/org.fox.ttrss/src/main/res/drawable/baseline_play_circle_24.xml new file mode 100644 index 00000000..9bb5a196 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable/baseline_play_circle_24.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/org.fox.ttrss/src/main/res/drawable/baseline_play_circle_outline_24.xml b/org.fox.ttrss/src/main/res/drawable/baseline_play_circle_outline_24.xml new file mode 100644 index 00000000..b1bdebfe --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable/baseline_play_circle_outline_24.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/org.fox.ttrss/src/main/res/drawable/baseline_refresh_24.xml b/org.fox.ttrss/src/main/res/drawable/baseline_refresh_24.xml new file mode 100644 index 00000000..86504d0e --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable/baseline_refresh_24.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/org.fox.ttrss/src/main/res/drawable/baseline_restore_24.xml b/org.fox.ttrss/src/main/res/drawable/baseline_restore_24.xml new file mode 100644 index 00000000..6ad75a1c --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable/baseline_restore_24.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/org.fox.ttrss/src/main/res/drawable/baseline_rss_feed_24.xml b/org.fox.ttrss/src/main/res/drawable/baseline_rss_feed_24.xml new file mode 100644 index 00000000..1cccd026 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable/baseline_rss_feed_24.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/org.fox.ttrss/src/main/res/drawable/baseline_search_24.xml b/org.fox.ttrss/src/main/res/drawable/baseline_search_24.xml new file mode 100644 index 00000000..d29c6ea6 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable/baseline_search_24.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/org.fox.ttrss/src/main/res/drawable/baseline_select_all_24.xml b/org.fox.ttrss/src/main/res/drawable/baseline_select_all_24.xml new file mode 100644 index 00000000..b59b4f77 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable/baseline_select_all_24.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/org.fox.ttrss/src/main/res/drawable/baseline_settings_24.xml b/org.fox.ttrss/src/main/res/drawable/baseline_settings_24.xml new file mode 100644 index 00000000..6593f3a4 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable/baseline_settings_24.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/org.fox.ttrss/src/main/res/drawable/baseline_share_24.xml b/org.fox.ttrss/src/main/res/drawable/baseline_share_24.xml new file mode 100644 index 00000000..74753b7a --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable/baseline_share_24.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/org.fox.ttrss/src/main/res/drawable/baseline_sort_24.xml b/org.fox.ttrss/src/main/res/drawable/baseline_sort_24.xml new file mode 100644 index 00000000..33eeeae1 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable/baseline_sort_24.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/org.fox.ttrss/src/main/res/drawable/baseline_sort_by_alpha_24.xml b/org.fox.ttrss/src/main/res/drawable/baseline_sort_by_alpha_24.xml new file mode 100644 index 00000000..db03b2e5 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable/baseline_sort_by_alpha_24.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/org.fox.ttrss/src/main/res/drawable/baseline_star_24.xml b/org.fox.ttrss/src/main/res/drawable/baseline_star_24.xml new file mode 100644 index 00000000..9b295a03 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable/baseline_star_24.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/org.fox.ttrss/src/main/res/drawable/baseline_star_outline_24.xml b/org.fox.ttrss/src/main/res/drawable/baseline_star_outline_24.xml new file mode 100644 index 00000000..925b9731 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable/baseline_star_outline_24.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/org.fox.ttrss/src/main/res/drawable/baseline_trending_down_24.xml b/org.fox.ttrss/src/main/res/drawable/baseline_trending_down_24.xml new file mode 100644 index 00000000..9038a87a --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable/baseline_trending_down_24.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/org.fox.ttrss/src/main/res/drawable/baseline_trending_flat_24.xml b/org.fox.ttrss/src/main/res/drawable/baseline_trending_flat_24.xml new file mode 100644 index 00000000..45b32861 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable/baseline_trending_flat_24.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/org.fox.ttrss/src/main/res/drawable/baseline_trending_up_24.xml b/org.fox.ttrss/src/main/res/drawable/baseline_trending_up_24.xml new file mode 100644 index 00000000..756f7ed3 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable/baseline_trending_up_24.xml @@ -0,0 +1,5 @@ + + + + + diff --git a/org.fox.ttrss/src/main/res/drawable/outline_more_24.xml b/org.fox.ttrss/src/main/res/drawable/outline_more_24.xml new file mode 100644 index 00000000..c80312a7 --- /dev/null +++ b/org.fox.ttrss/src/main/res/drawable/outline_more_24.xml @@ -0,0 +1,11 @@ + + + + + + + + + + + diff --git a/org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_master.xml b/org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_master.xml index 33b4ebba..e08e9a31 100644 --- a/org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_master.xml +++ b/org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_master.xml @@ -56,7 +56,7 @@ android:layout_height="wrap_content" android:layout_gravity="end|bottom" android:visibility="gone" - android:src="@drawable/ic_refresh" + android:src="@drawable/baseline_refresh_24" android:layout_margin="16dp" /> diff --git a/org.fox.ttrss/src/main/res/layout-sw600dp-port/activity_master.xml b/org.fox.ttrss/src/main/res/layout-sw600dp-port/activity_master.xml index 287db8ab..fa1612f8 100644 --- a/org.fox.ttrss/src/main/res/layout-sw600dp-port/activity_master.xml +++ b/org.fox.ttrss/src/main/res/layout-sw600dp-port/activity_master.xml @@ -24,7 +24,7 @@ android:layout_height="wrap_content" android:layout_gravity="end|bottom" android:visibility="gone" - android:src="@drawable/ic_refresh" + android:src="@drawable/baseline_refresh_24" android:layout_margin="16dp" /> diff --git a/org.fox.ttrss/src/main/res/layout/activity_detail_phone.xml b/org.fox.ttrss/src/main/res/layout/activity_detail_phone.xml index 1edd3bea..331164e0 100644 --- a/org.fox.ttrss/src/main/res/layout/activity_detail_phone.xml +++ b/org.fox.ttrss/src/main/res/layout/activity_detail_phone.xml @@ -17,7 +17,7 @@ android:visibility="gone" app:tint="@android:color/white" app:backgroundTint="?colorAccent" - android:src="@drawable/ic_action_web_site" + android:src="@drawable/baseline_open_in_browser_24" android:layout_margin="16dp" /> + android:layout_marginTop="@dimen/activity_vertical_margin" + app:tint="?colorAccent" /> diff --git a/org.fox.ttrss/src/main/res/layout/drawer_divider.xml b/org.fox.ttrss/src/main/res/layout/drawer_divider.xml index d47c3b5b..a242164d 100644 --- a/org.fox.ttrss/src/main/res/layout/drawer_divider.xml +++ b/org.fox.ttrss/src/main/res/layout/drawer_divider.xml @@ -9,6 +9,6 @@ android:layout_marginTop="10dp" android:layout_width="match_parent" android:layout_height="1dp" - android:background="?headlineFooterColor"/> + android:background="?colorPrimary"/> \ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/layout/drawer_header.xml b/org.fox.ttrss/src/main/res/layout/drawer_header.xml index d9a9cb0b..6d6e6ffe 100755 --- a/org.fox.ttrss/src/main/res/layout/drawer_header.xml +++ b/org.fox.ttrss/src/main/res/layout/drawer_header.xml @@ -16,7 +16,7 @@ style="?attr/materialIconButtonStyle" android:layout_width="wrap_content" android:layout_height="wrap_content" - app:icon="@drawable/ic_settings" + app:icon="@drawable/baseline_settings_24" android:id="@+id/drawer_settings_btn" android:layout_gravity="center_vertical|end" android:layout_marginEnd="8dp" diff --git a/org.fox.ttrss/src/main/res/layout/feeds_row.xml b/org.fox.ttrss/src/main/res/layout/feeds_row.xml index cfdc284d..97235dd1 100755 --- a/org.fox.ttrss/src/main/res/layout/feeds_row.xml +++ b/org.fox.ttrss/src/main/res/layout/feeds_row.xml @@ -22,6 +22,7 @@ android:layout_height="21dp" android:layout_weight="0" android:scaleType="fitXY" + app:tint="?colorOnPrimaryContainer" android:src="?ic_rss_box" /> + android:background="?colorPrimary"/> \ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row.xml b/org.fox.ttrss/src/main/res/layout/headlines_row.xml index 89302cfb..d0c2ce2d 100755 --- a/org.fox.ttrss/src/main/res/layout/headlines_row.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines_row.xml @@ -67,7 +67,6 @@ android:adjustViewBounds="true" android:background="@null" android:cropToPadding="true" - android:src="@drawable/drawer_header" android:scaleType="fitCenter" android:visibility="gone" android:layout_alignBottom="@+id/flavor_image" @@ -143,7 +142,7 @@ android:layout_height="wrap_content" android:layout_gravity="start|bottom" android:scaleType="fitXY" - android:src="@drawable/ic_play_circle" + android:src="@drawable/baseline_play_circle_24" android:visibility="visible" android:layout_below="@+id/headline_header" android:layout_alignParentRight="true" @@ -162,7 +161,7 @@ android:background="@drawable/ripple" android:paddingLeft="4dp" android:paddingRight="4dp" - android:src="@drawable/ic_dots_vertical_circle" + android:src="@drawable/baseline_more_vert_24" android:layout_gravity="bottom|end" android:elevation="4dp" app:tint="?colorAccent" diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml index ffeadb7a..6fc4fc0c 100755 --- a/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml @@ -68,7 +68,6 @@ android:adjustViewBounds="true" android:background="@null" android:cropToPadding="true" - android:src="@drawable/drawer_header" android:scaleType="fitCenter" android:visibility="gone" android:layout_alignBottom="@+id/flavor_image" @@ -145,7 +144,7 @@ android:layout_height="wrap_content" android:layout_gravity="start|bottom" android:scaleType="fitXY" - android:src="@drawable/ic_play_circle" + android:src="@drawable/baseline_play_circle_24" android:visibility="visible" android:layout_below="@+id/headline_header" android:layout_alignParentRight="true" @@ -164,7 +163,7 @@ android:background="@drawable/ripple" android:paddingLeft="4dp" android:paddingRight="4dp" - android:src="@drawable/ic_dots_vertical_circle" + android:src="@drawable/baseline_more_vert_24" android:layout_gravity="bottom|end" android:elevation="4dp" app:tint="?colorAccent" diff --git a/org.fox.ttrss/src/main/res/menu/action_mode_headlines.xml b/org.fox.ttrss/src/main/res/menu/action_mode_headlines.xml index b3afdafc..0e0f5792 100644 --- a/org.fox.ttrss/src/main/res/menu/action_mode_headlines.xml +++ b/org.fox.ttrss/src/main/res/menu/action_mode_headlines.xml @@ -3,18 +3,19 @@ diff --git a/org.fox.ttrss/src/main/res/menu/activity_logcat.xml b/org.fox.ttrss/src/main/res/menu/activity_logcat.xml index 52ee9b26..1241f72f 100755 --- a/org.fox.ttrss/src/main/res/menu/activity_logcat.xml +++ b/org.fox.ttrss/src/main/res/menu/activity_logcat.xml @@ -2,13 +2,13 @@ diff --git a/org.fox.ttrss/src/main/res/menu/activity_main.xml b/org.fox.ttrss/src/main/res/menu/activity_main.xml index d2ef27a0..21676f17 100755 --- a/org.fox.ttrss/src/main/res/menu/activity_main.xml +++ b/org.fox.ttrss/src/main/res/menu/activity_main.xml @@ -12,22 +12,27 @@ @@ -45,17 +50,20 @@ - diff --git a/org.fox.ttrss/src/main/res/menu/activity_offline.xml b/org.fox.ttrss/src/main/res/menu/activity_offline.xml index c533ae75..09dbf194 100644 --- a/org.fox.ttrss/src/main/res/menu/activity_offline.xml +++ b/org.fox.ttrss/src/main/res/menu/activity_offline.xml @@ -5,22 +5,22 @@ + android:icon="@drawable/baseline_search_24" + android:title="@string/search" + app:showAsAction="ifRoom" /> @@ -32,17 +32,17 @@ - diff --git a/org.fox.ttrss/src/main/res/values/style.xml b/org.fox.ttrss/src/main/res/values/style.xml index fe2fd77d..41785b97 100755 --- a/org.fox.ttrss/src/main/res/values/style.xml +++ b/org.fox.ttrss/src/main/res/values/style.xml @@ -3,6 +3,29 @@ -- cgit v1.2.3-54-g00ecf From a94ba6713757434ec42595c9a652f1bd5dd93237 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Tue, 6 May 2025 22:07:03 +0300 Subject: adjust some dynamic icons and article toolbar padding --- .../main/java/org/fox/ttrss/OnlineActivity.java | 4 +- .../org/fox/ttrss/offline/OfflineActivity.java | 4 +- .../org/fox/ttrss/util/ScrimInsetsFrameLayout.java | 142 --------------------- .../src/main/res/layout/fragment_article.xml | 8 +- 4 files changed, 9 insertions(+), 149 deletions(-) delete mode 100755 org.fox.ttrss/src/main/java/org/fox/ttrss/util/ScrimInsetsFrameLayout.java (limited to 'org.fox.ttrss/src/main/java/org') diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java index d9550ef8..807b133b 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java @@ -1409,8 +1409,8 @@ public class OnlineActivity extends CommonActivity { m_menu.findItem(R.id.toggle_published).setIcon(article.published ? R.drawable.baseline_check_box_24 : R.drawable.baseline_rss_feed_24); - m_menu.findItem(R.id.toggle_unread).setIcon(article.unread ? R.drawable.baseline_email_24 : - R.drawable.baseline_mark_as_unread_24); + m_menu.findItem(R.id.toggle_unread).setIcon(article.unread ? R.drawable.baseline_mark_as_unread_24 : + R.drawable.baseline_email_24); } } diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineActivity.java index f2320a00..4da85e76 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineActivity.java @@ -611,8 +611,8 @@ public class OfflineActivity extends CommonActivity { m_menu.findItem(R.id.toggle_published).setIcon(published ? R.drawable.baseline_check_box_24 : R.drawable.baseline_rss_feed_24); - m_menu.findItem(R.id.toggle_unread).setIcon(unread ? R.drawable.baseline_email_24 : - R.drawable.baseline_mark_as_unread_24); + m_menu.findItem(R.id.toggle_unread).setIcon(unread ? R.drawable.baseline_mark_as_unread_24 : + R.drawable.baseline_email_24); article.close(); } diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/util/ScrimInsetsFrameLayout.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/util/ScrimInsetsFrameLayout.java deleted file mode 100755 index d3a5ab27..00000000 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/util/ScrimInsetsFrameLayout.java +++ /dev/null @@ -1,142 +0,0 @@ -package org.fox.ttrss.util; -/* - * Copyright 2014 Google Inc. - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ - -import android.content.Context; -import android.content.res.TypedArray; -import android.graphics.Canvas; -import android.graphics.Rect; -import android.graphics.drawable.Drawable; -import android.util.AttributeSet; -import android.widget.FrameLayout; - -import org.fox.ttrss.R; - -import androidx.core.view.ViewCompat; - -/** - * A layout that draws something in the insets passed to {@link #fitSystemWindows(Rect)}, i.e. the area above UI chrome - * (status and navigation bars, overlay action bars). - */ -public class ScrimInsetsFrameLayout extends FrameLayout { - private Drawable mInsetForeground; - - private Rect mInsets; - private Rect mTempRect = new Rect(); - private OnInsetsCallback mOnInsetsCallback; - - public ScrimInsetsFrameLayout(Context context) { - super(context); - init(context, null, 0); - } - - public ScrimInsetsFrameLayout(Context context, AttributeSet attrs) { - super(context, attrs); - init(context, attrs, 0); - } - - public ScrimInsetsFrameLayout(Context context, AttributeSet attrs, int defStyle) { - super(context, attrs, defStyle); - init(context, attrs, defStyle); - } - - private void init(Context context, AttributeSet attrs, int defStyle) { - final TypedArray a = context.obtainStyledAttributes(attrs, - R.styleable.ScrimInsetsView, defStyle, 0); - if (a == null) { - return; - } - mInsetForeground = a.getDrawable(R.styleable.ScrimInsetsView_insetForeground); - a.recycle(); - - setWillNotDraw(true); - } - - @Override - protected boolean fitSystemWindows(Rect insets) { - mInsets = new Rect(insets); - setWillNotDraw(mInsetForeground == null); - ViewCompat.postInvalidateOnAnimation(this); - if (mOnInsetsCallback != null) { - mOnInsetsCallback.onInsetsChanged(insets); - } - return true; // consume insets - } - - @Override - public void draw(Canvas canvas) { - super.draw(canvas); - - int width = getWidth(); - int height = getHeight(); - if (mInsets != null && mInsetForeground != null) { - int sc = canvas.save(); - canvas.translate(getScrollX(), getScrollY()); - - // Top - mTempRect.set(0, 0, width, mInsets.top); - mInsetForeground.setBounds(mTempRect); - mInsetForeground.draw(canvas); - - // Bottom - mTempRect.set(0, height - mInsets.bottom, width, height); - mInsetForeground.setBounds(mTempRect); - mInsetForeground.draw(canvas); - - // Left - mTempRect.set(0, mInsets.top, mInsets.left, height - mInsets.bottom); - mInsetForeground.setBounds(mTempRect); - mInsetForeground.draw(canvas); - - // Right - mTempRect.set(width - mInsets.right, mInsets.top, width, height - mInsets.bottom); - mInsetForeground.setBounds(mTempRect); - mInsetForeground.draw(canvas); - - canvas.restoreToCount(sc); - } - } - - @Override - protected void onAttachedToWindow() { - super.onAttachedToWindow(); - if (mInsetForeground != null) { - mInsetForeground.setCallback(this); - } - } - - @Override - protected void onDetachedFromWindow() { - super.onDetachedFromWindow(); - if (mInsetForeground != null) { - mInsetForeground.setCallback(null); - } - } - - /** - * Allows the calling container to specify a callback for custom processing when insets change (i.e. when - * {@link #fitSystemWindows(Rect)} is called. This is useful for setting padding on UI elements based on - * UI chrome insets (e.g. a Google Map or a ListView). When using with ListView or GridView, remember to set - * clipToPadding to false. - */ - public void setOnInsetsCallback(OnInsetsCallback onInsetsCallback) { - mOnInsetsCallback = onInsetsCallback; - } - - public interface OnInsetsCallback { - void onInsetsChanged(Rect insets); - } -} \ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/layout/fragment_article.xml b/org.fox.ttrss/src/main/res/layout/fragment_article.xml index db407a22..f71ab5cc 100755 --- a/org.fox.ttrss/src/main/res/layout/fragment_article.xml +++ b/org.fox.ttrss/src/main/res/layout/fragment_article.xml @@ -24,12 +24,14 @@ + android:orientation="vertical"> Date: Wed, 7 May 2025 07:03:44 +0300 Subject: switch to static material3 colorset --- org.fox.ttrss/src/main/AndroidManifest.xml | 4 +- .../main/java/org/fox/ttrss/HeadlinesFragment.java | 10 +- .../ttrss/offline/OfflineHeadlinesFragment.java | 8 +- .../src/main/res/layout/activity_gallery.xml | 4 +- .../src/main/res/layout/activity_master_phone.xml | 2 +- org.fox.ttrss/src/main/res/layout/feeds_goback.xml | 2 +- org.fox.ttrss/src/main/res/layout/feeds_row.xml | 2 +- .../src/main/res/layout/feeds_row_selected.xml | 2 +- .../src/main/res/layout/headlines_row.xml | 4 +- .../src/main/res/layout/headlines_row_unread.xml | 4 +- org.fox.ttrss/src/main/res/values-night/colors.xml | 143 ++++++++++++++++++++ org.fox.ttrss/src/main/res/values-night/style.xml | 21 --- .../src/main/res/values-night/theme_overlays.xml | 98 ++++++++++++++ org.fox.ttrss/src/main/res/values-night/themes.xml | 89 +++++++++++++ org.fox.ttrss/src/main/res/values/colors.xml | 147 ++++++++++++++++++++- org.fox.ttrss/src/main/res/values/style.xml | 53 -------- .../src/main/res/values/theme_overlays.xml | 98 ++++++++++++++ org.fox.ttrss/src/main/res/values/themes.xml | 86 ++++++++++++ 18 files changed, 677 insertions(+), 100 deletions(-) create mode 100644 org.fox.ttrss/src/main/res/values-night/colors.xml delete mode 100644 org.fox.ttrss/src/main/res/values-night/style.xml create mode 100644 org.fox.ttrss/src/main/res/values-night/theme_overlays.xml create mode 100644 org.fox.ttrss/src/main/res/values-night/themes.xml mode change 100755 => 100644 org.fox.ttrss/src/main/res/values/colors.xml delete mode 100755 org.fox.ttrss/src/main/res/values/style.xml create mode 100644 org.fox.ttrss/src/main/res/values/theme_overlays.xml create mode 100644 org.fox.ttrss/src/main/res/values/themes.xml (limited to 'org.fox.ttrss/src/main/java/org') diff --git a/org.fox.ttrss/src/main/AndroidManifest.xml b/org.fox.ttrss/src/main/AndroidManifest.xml index b5da6cd3..b79e3b05 100755 --- a/org.fox.ttrss/src/main/AndroidManifest.xml +++ b/org.fox.ttrss/src/main/AndroidManifest.xml @@ -98,7 +98,7 @@ android:excludeFromRecents="true" android:label="@string/app_name" android:exported="true" - android:theme="@style/DarkDialogTheme" > + android:theme="@style/MaterialAlertDialog.Material3" > @@ -112,7 +112,7 @@ android:excludeFromRecents="true" android:label="@string/subscribe_name" android:exported="true" - android:theme="@style/DarkDialogTheme" > + android:theme="@style/MaterialAlertDialog.Material3" > diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java index ef2e23a6..06e815f0 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java @@ -1032,8 +1032,8 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment { } - TypedValue tvAccent = new TypedValue(); - m_activity.getTheme().resolveAttribute(R.attr.colorAccent, tvAccent, true); + TypedValue tvTertiary = new TypedValue(); + m_activity.getTheme().resolveAttribute(R.attr.colorTertiary, tvTertiary, true); TypedValue tvPrimary = new TypedValue(); m_activity.getTheme().resolveAttribute(R.attr.colorPrimary, tvPrimary, true); @@ -1046,7 +1046,7 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment { if (article.marked) - holder.markedView.setIconTint(ColorStateList.valueOf(tvAccent.data)); + holder.markedView.setIconTint(ColorStateList.valueOf(tvTertiary.data)); else holder.markedView.setIconTint(ColorStateList.valueOf(tvPrimary.data)); @@ -1077,7 +1077,7 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment { holder.scoreView.setIconResource(tv.resourceId); if (article.score > Article.SCORE_HIGH) - holder.scoreView.setIconTint(ColorStateList.valueOf(tvAccent.data)); + holder.scoreView.setIconTint(ColorStateList.valueOf(tvTertiary.data)); else holder.scoreView.setIconTint(ColorStateList.valueOf(tvPrimary.data)); @@ -1137,7 +1137,7 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment { holder.publishedView.setIconResource(tv.resourceId); if (article.published) - holder.publishedView.setIconTint(ColorStateList.valueOf(tvAccent.data)); + holder.publishedView.setIconTint(ColorStateList.valueOf(tvTertiary.data)); else holder.publishedView.setIconTint(ColorStateList.valueOf(tvPrimary.data)); diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java index 368ec95c..8500d7c7 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java @@ -790,8 +790,8 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis holder.feedTitleView.setVisibility(View.GONE); } - TypedValue tvAccent = new TypedValue(); - m_activity.getTheme().resolveAttribute(R.attr.colorAccent, tvAccent, true); + TypedValue tvTertiary = new TypedValue(); + m_activity.getTheme().resolveAttribute(R.attr.colorTertiary, tvTertiary, true); TypedValue tvPrimary = new TypedValue(); m_activity.getTheme().resolveAttribute(R.attr.colorPrimary, tvPrimary, true); @@ -814,7 +814,7 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis holder.markedView.setIconResource(tv.resourceId); if (marked) - holder.markedView.setIconTint(ColorStateList.valueOf(tvAccent.data)); + holder.markedView.setIconTint(ColorStateList.valueOf(tvTertiary.data)); else holder.markedView.setIconTint(ColorStateList.valueOf(tvPrimary.data)); @@ -845,7 +845,7 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis holder.publishedView.setIconResource(tv.resourceId); if (published) - holder.publishedView.setIconTint(ColorStateList.valueOf(tvAccent.data)); + holder.publishedView.setIconTint(ColorStateList.valueOf(tvTertiary.data)); else holder.publishedView.setIconTint(ColorStateList.valueOf(tvPrimary.data)); diff --git a/org.fox.ttrss/src/main/res/layout/activity_gallery.xml b/org.fox.ttrss/src/main/res/layout/activity_gallery.xml index 9770c4c8..9326a19e 100644 --- a/org.fox.ttrss/src/main/res/layout/activity_gallery.xml +++ b/org.fox.ttrss/src/main/res/layout/activity_gallery.xml @@ -20,11 +20,11 @@ android:layout_height="26dp" android:layout_weight="0" android:background="@drawable/ripple" - android:src="?ic_dots_vertical_circle" + android:src="?ic_dots_vertical" android:layout_alignParentRight="true" android:layout_marginRight="8dp" android:layout_marginTop="@dimen/activity_vertical_margin" - app:tint="?colorAccent" /> + app:tint="?colorTertiary" /> + app:tint="?colorTertiary" /> - #cccccc - - #F4511E - - - - - \ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/values/theme_overlays.xml b/org.fox.ttrss/src/main/res/values/theme_overlays.xml new file mode 100644 index 00000000..e81f18fb --- /dev/null +++ b/org.fox.ttrss/src/main/res/values/theme_overlays.xml @@ -0,0 +1,98 @@ + + + + diff --git a/org.fox.ttrss/src/main/res/values/themes.xml b/org.fox.ttrss/src/main/res/values/themes.xml new file mode 100644 index 00000000..54613ad9 --- /dev/null +++ b/org.fox.ttrss/src/main/res/values/themes.xml @@ -0,0 +1,86 @@ + + + -- cgit v1.2.3-54-g00ecf From 471404bfb1d01616f91037ea42fea72296f0652a Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 7 May 2025 07:18:20 +0300 Subject: drop linkColor & fix article header padding --- org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java | 6 +++--- .../src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java | 6 +++--- org.fox.ttrss/src/main/res/layout/fragment_article.xml | 2 +- org.fox.ttrss/src/main/res/values-night/themes.xml | 1 - org.fox.ttrss/src/main/res/values/attrs.xml | 1 - org.fox.ttrss/src/main/res/values/themes.xml | 1 - 6 files changed, 7 insertions(+), 10 deletions(-) (limited to 'org.fox.ttrss/src/main/java/org') diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java index 86a68d5b..729aa7fd 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java @@ -485,10 +485,10 @@ public class ArticleFragment extends androidx.fragment.app.Fragment { String cssOverride = "body { color : "+textColor+"; }"; - TypedValue tvLinkColor = new TypedValue(); - getActivity().getTheme().resolveAttribute(R.attr.linkColor, tvLinkColor, true); + TypedValue tvColorPrimary = new TypedValue(); + getActivity().getTheme().resolveAttribute(R.attr.colorPrimary, tvColorPrimary, true); - String linkHexColor = String.format("#%06X", (0xFFFFFF & tvLinkColor.data)); + String linkHexColor = String.format("#%06X", (0xFFFFFF & tvColorPrimary.data)); cssOverride += " a:link {color: "+linkHexColor+";} a:visited { color: "+linkHexColor+";}"; String articleContent = m_article.content != null ? m_article.content : ""; diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java index 465c461d..aac19b51 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java @@ -333,10 +333,10 @@ public class OfflineArticleFragment extends Fragment { String cssOverride = "body { color : "+textColor+"; }"; - TypedValue tvLinkColor = new TypedValue(); - getActivity().getTheme().resolveAttribute(R.attr.linkColor, tvLinkColor, true); + TypedValue tvColorPrimary = new TypedValue(); + getActivity().getTheme().resolveAttribute(R.attr.colorPrimary, tvColorPrimary, true); - String linkHexColor = String.format("#%06X", (0xFFFFFF & tvLinkColor.data)); + String linkHexColor = String.format("#%06X", (0xFFFFFF & tvColorPrimary.data)); cssOverride += " a:link {color: "+linkHexColor+";} a:visited { color: "+linkHexColor+";}"; String articleContent = m_cursor.getString(m_cursor.getColumnIndex("content")); diff --git a/org.fox.ttrss/src/main/res/layout/fragment_article.xml b/org.fox.ttrss/src/main/res/layout/fragment_article.xml index f71ab5cc..ea244873 100755 --- a/org.fox.ttrss/src/main/res/layout/fragment_article.xml +++ b/org.fox.ttrss/src/main/res/layout/fragment_article.xml @@ -26,7 +26,7 @@ app:layout_scrollFlags="scroll|enterAlways" android:paddingTop="0dp" android:paddingStart="16dp" - android:paddingEnd="0dp" + android:paddingEnd="8dp" android:paddingBottom="8dp" android:id="@+id/article_header" android:layout_width="match_parent" diff --git a/org.fox.ttrss/src/main/res/values-night/themes.xml b/org.fox.ttrss/src/main/res/values-night/themes.xml index e5f738e1..a84ed131 100644 --- a/org.fox.ttrss/src/main/res/values-night/themes.xml +++ b/org.fox.ttrss/src/main/res/values-night/themes.xml @@ -29,7 +29,6 @@ @android:color/white #00FF00 #99000000 - #2d92c8 #bebebe #303030 #101010 diff --git a/org.fox.ttrss/src/main/res/values/attrs.xml b/org.fox.ttrss/src/main/res/values/attrs.xml index d0886639..f5fac361 100755 --- a/org.fox.ttrss/src/main/res/values/attrs.xml +++ b/org.fox.ttrss/src/main/res/values/attrs.xml @@ -5,7 +5,6 @@ - diff --git a/org.fox.ttrss/src/main/res/values/themes.xml b/org.fox.ttrss/src/main/res/values/themes.xml index 54613ad9..1e348393 100644 --- a/org.fox.ttrss/src/main/res/values/themes.xml +++ b/org.fox.ttrss/src/main/res/values/themes.xml @@ -28,7 +28,6 @@ @android:color/black @android:color/black #008000 - ?colorPrimary #9a8c59 #fff7d5 #dddddd -- cgit v1.2.3-54-g00ecf From 36030bab3a7926692cb1815b85ef130f4426d828 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 7 May 2025 07:32:08 +0300 Subject: update dialog activity styling --- .../src/main/java/org/fox/ttrss/share/ShareActivity.java | 10 +++------- .../src/main/java/org/fox/ttrss/share/SubscribeActivity.java | 4 +--- 2 files changed, 4 insertions(+), 10 deletions(-) (limited to 'org.fox.ttrss/src/main/java/org') diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/share/ShareActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/share/ShareActivity.java index 3b1da2c9..9e391411 100644 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/share/ShareActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/share/ShareActivity.java @@ -22,12 +22,10 @@ public class ShareActivity extends CommonShareActivity { @Override public void onCreate(Bundle savedInstanceState) { - //setTheme(R.style.DarkTheme); - super.onCreate(savedInstanceState); - - requestWindowFeature(Window.FEATURE_LEFT_ICON); + requestWindowFeature(Window.FEATURE_LEFT_ICON); + Intent intent = getIntent(); String urlValue = intent.getStringExtra(Intent.EXTRA_TEXT); @@ -41,9 +39,7 @@ public class ShareActivity extends CommonShareActivity { } setContentView(R.layout.activity_share); - - getWindow().setFeatureDrawableResource(Window.FEATURE_LEFT_ICON, R.drawable.ic_launcher); - + setSmallScreen(false); EditText url = (EditText) findViewById(R.id.url); diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/share/SubscribeActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/share/SubscribeActivity.java index 1463958d..df0c82f9 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/share/SubscribeActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/share/SubscribeActivity.java @@ -90,9 +90,7 @@ public class SubscribeActivity extends CommonShareActivity { setContentView(R.layout.activity_subscribe); - getWindow().setFeatureDrawableResource(Window.FEATURE_LEFT_ICON, R.drawable.ic_launcher); - - setSmallScreen(false); + setSmallScreen(false); m_progressBar = (ProgressBar) findViewById(R.id.subscribe_progress); Spinner catList = (Spinner) findViewById(R.id.category_spinner); -- cgit v1.2.3-54-g00ecf From b4744f2adb5c057c360f7b4aed1d1f5a385901f0 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 7 May 2025 08:45:31 +0300 Subject: switch to material alert dialogs --- .../main/java/org/fox/ttrss/ArticleFragment.java | 3 +- .../main/java/org/fox/ttrss/CommonActivity.java | 10 ++-- .../src/main/java/org/fox/ttrss/FeedsFragment.java | 6 +-- .../main/java/org/fox/ttrss/HeadlinesFragment.java | 8 +-- .../main/java/org/fox/ttrss/MasterActivity.java | 3 +- .../main/java/org/fox/ttrss/OnlineActivity.java | 61 ++++++++++------------ .../org/fox/ttrss/offline/OfflineActivity.java | 25 +++++---- .../ttrss/offline/OfflineHeadlinesFragment.java | 6 +-- .../fox/ttrss/offline/OfflineMasterActivity.java | 4 +- .../org/fox/ttrss/share/CommonShareActivity.java | 15 +++--- 10 files changed, 72 insertions(+), 69 deletions(-) (limited to 'org.fox.ttrss/src/main/java/org') diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java index 729aa7fd..0d9a37c2 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java @@ -33,6 +33,7 @@ import android.widget.TextView; import androidx.core.text.HtmlCompat; import com.google.android.material.button.MaterialButton; +import com.google.android.material.dialog.MaterialAlertDialogBuilder; import org.fox.ttrss.types.Article; import org.fox.ttrss.types.Attachment; @@ -236,7 +237,7 @@ public class ArticleFragment extends androidx.fragment.app.Fragment { final EditText edit = new EditText(getActivity()); edit.setText(String.valueOf(m_article.score)); - AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()) + MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getContext()) .setTitle(R.string.score_for_this_article) .setPositiveButton(R.string.set_score, new DialogInterface.OnClickListener() { diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java index ec1ddb9d..8e672aac 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java @@ -47,6 +47,7 @@ import com.bumptech.glide.Glide; import com.bumptech.glide.load.engine.DiskCacheStrategy; import com.bumptech.glide.request.animation.GlideAnimation; import com.bumptech.glide.request.target.SimpleTarget; +import com.google.android.material.dialog.MaterialAlertDialogBuilder; import com.google.android.material.snackbar.Snackbar; import org.fox.ttrss.util.DatabaseHelper; @@ -506,8 +507,7 @@ public class CommonActivity extends AppCompatActivity implements SharedPreferenc View dialogView = View.inflate(this, R.layout.dialog_open_link_askcb, null); final CheckBox askEveryTimeCB = dialogView.findViewById(R.id.open_link_ask_checkbox); - AlertDialog.Builder builder = new AlertDialog.Builder( - CommonActivity.this) + MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this) .setView(dialogView) .setMessage(uri.toString()) .setPositiveButton(R.string.quick_preview, @@ -562,7 +562,7 @@ public class CommonActivity extends AppCompatActivity implements SharedPreferenc } });*/ - AlertDialog dlg = builder.create(); + Dialog dlg = builder.create(); dlg.show(); } else { @@ -614,7 +614,7 @@ public class CommonActivity extends AppCompatActivity implements SharedPreferenc if (es.size() > 0) { if (es.get(0).hasAttr("title")) { - AlertDialog.Builder builder = new AlertDialog.Builder(this) + MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this) .setCancelable(true) .setMessage(es.get(0).attr("title")) .setPositiveButton(R.string.dialog_close, new DialogInterface.OnClickListener() { @@ -625,7 +625,7 @@ public class CommonActivity extends AppCompatActivity implements SharedPreferenc } ); - AlertDialog dialog = builder.create(); + Dialog dialog = builder.create(); dialog.show(); } else { diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java index ec6c508d..55c8950b 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/FeedsFragment.java @@ -33,6 +33,7 @@ import androidx.loader.app.LoaderManager; import androidx.loader.content.Loader; import androidx.swiperefreshlayout.widget.SwipeRefreshLayout; +import com.google.android.material.dialog.MaterialAlertDialogBuilder; import com.google.gson.Gson; import com.google.gson.JsonArray; import com.google.gson.JsonElement; @@ -257,8 +258,7 @@ public class FeedsFragment extends BaseFeedlistFragment implements OnItemClickLi if (true) { final Feed feed = getFeedAtPosition(info.position); - AlertDialog.Builder builder = new AlertDialog.Builder( - m_activity) + MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getContext()) .setMessage(getString(R.string.unsubscribe_from_prompt, feed.title)) .setPositiveButton(R.string.unsubscribe, new Dialog.OnClickListener() { @@ -277,7 +277,7 @@ public class FeedsFragment extends BaseFeedlistFragment implements OnItemClickLi } }); - AlertDialog dlg = builder.create(); + Dialog dlg = builder.create(); dlg.show(); } diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java index 06e815f0..a843bf39 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java @@ -70,6 +70,7 @@ import com.bumptech.glide.request.RequestListener; import com.bumptech.glide.request.target.GlideDrawableImageViewTarget; import com.bumptech.glide.request.target.Target; import com.google.android.material.button.MaterialButton; +import com.google.android.material.dialog.MaterialAlertDialogBuilder; import com.google.android.material.snackbar.Snackbar; import com.google.gson.JsonElement; @@ -190,8 +191,7 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment { final Article fa = article; - AlertDialog.Builder builder = new AlertDialog.Builder( - m_activity) + MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getContext()) .setMessage(R.string.confirm_catchup_above) .setPositiveButton(R.string.dialog_ok, new Dialog.OnClickListener() { @@ -210,7 +210,7 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment { } }); - AlertDialog dialog = builder.create(); + Dialog dialog = builder.create(); dialog.show(); } return true; @@ -1088,7 +1088,7 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment { final EditText edit = new EditText(getActivity()); edit.setText(String.valueOf(article.score)); - AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()) + MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getContext()) .setTitle(R.string.score_for_this_article) .setPositiveButton(R.string.set_score, new DialogInterface.OnClickListener() { diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java index 62fa7227..7ccfb646 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/MasterActivity.java @@ -22,6 +22,7 @@ import androidx.drawerlayout.widget.DrawerLayout; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentTransaction; +import com.google.android.material.dialog.MaterialAlertDialogBuilder; import com.google.android.material.floatingactionbutton.FloatingActionButton; import com.google.gson.JsonElement; @@ -352,7 +353,7 @@ public class MasterActivity extends OnlineActivity implements HeadlinesEventList ++i; } - AlertDialog.Builder builder = new AlertDialog.Builder(this) + MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this) .setTitle(getString(R.string.headlines_sort_articles_title)) .setSingleChoiceItems( sortTitles, diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java index 807b133b..b8680c71 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/OnlineActivity.java @@ -31,6 +31,7 @@ import android.widget.TextView; import androidx.appcompat.view.ActionMode; import androidx.appcompat.widget.Toolbar; +import com.google.android.material.dialog.MaterialAlertDialogBuilder; import com.google.gson.Gson; import com.google.gson.JsonElement; import com.google.gson.JsonObject; @@ -89,7 +90,7 @@ public class OnlineActivity extends CommonActivity { int titleStringId = searchQuery.length() > 0 ? R.string.catchup_dialog_title_search : R.string.catchup_dialog_title; - AlertDialog.Builder builder = new AlertDialog.Builder(this) + MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this) .setTitle(getString(titleStringId, feed.title)) .setSingleChoiceItems( new String[] { @@ -133,8 +134,7 @@ public class OnlineActivity extends CommonActivity { dialog.show(); } else { - AlertDialog.Builder builder = new AlertDialog.Builder( - this) + MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this) .setMessage(getString(R.string.catchup_dialog_title, feed.title)) .setPositiveButton(R.string.catchup, new Dialog.OnClickListener() { @@ -153,7 +153,7 @@ public class OnlineActivity extends CommonActivity { } }); - AlertDialog dialog = builder.create(); + Dialog dialog = builder.create(); dialog.show(); } } @@ -274,7 +274,7 @@ public class OnlineActivity extends CommonActivity { } protected void switchOffline() { - AlertDialog.Builder builder = new AlertDialog.Builder(this) + MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this) .setMessage(R.string.dialog_offline_switch_prompt) .setPositiveButton(R.string.dialog_offline_go, new Dialog.OnClickListener() { @@ -301,7 +301,7 @@ public class OnlineActivity extends CommonActivity { } }); - AlertDialog dlg = builder.create(); + Dialog dlg = builder.create(); dlg.show(); } @@ -367,8 +367,8 @@ public class OnlineActivity extends CommonActivity { setLoadingStatus(R.string.login_need_configure); - AlertDialog.Builder builder = new AlertDialog.Builder(this); - builder.setMessage(R.string.dialog_need_configure_prompt) + MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this) + .setMessage(R.string.dialog_need_configure_prompt) .setCancelable(false) .setPositiveButton(R.string.dialog_open_preferences, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { @@ -384,7 +384,8 @@ public class OnlineActivity extends CommonActivity { dialog.cancel(); } }); - AlertDialog alert = builder.create(); + + Dialog alert = builder.create(); alert.show(); } else { @@ -485,8 +486,7 @@ public class OnlineActivity extends CommonActivity { itemUrls[i] = article.attachments.get(i).content_url; } - Dialog dialog = new Dialog(OnlineActivity.this); - AlertDialog.Builder builder = new AlertDialog.Builder(OnlineActivity.this) + MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this) .setTitle(R.string.attachments_prompt) .setCancelable(true) .setSingleChoiceItems(items, 0, new OnClickListener() { @@ -519,7 +519,7 @@ public class OnlineActivity extends CommonActivity { } }); - dialog = builder.create(); + Dialog dialog = builder.create(); dialog.show(); } } @@ -568,7 +568,7 @@ public class OnlineActivity extends CommonActivity { final EditText edit = new EditText(this); - AlertDialog.Builder builder = new AlertDialog.Builder(this) + MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this) .setTitle(R.string.search) .setPositiveButton(getString(R.string.search), new OnClickListener() { @@ -619,7 +619,7 @@ public class OnlineActivity extends CommonActivity { int selectedIndex = Arrays.asList(headlineModeValues).indexOf(headlineMode); - AlertDialog.Builder builder = new AlertDialog.Builder(this) + MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this) .setTitle(R.string.headlines_set_view_mode) .setSingleChoiceItems(headlineModeNames, selectedIndex, new OnClickListener() { @@ -674,7 +674,7 @@ public class OnlineActivity extends CommonActivity { selectedIndex = 4; } - AlertDialog.Builder builder = new AlertDialog.Builder(this) + MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this) .setTitle(R.string.headlines_set_view_mode) .setSingleChoiceItems( new String[]{ @@ -717,8 +717,7 @@ public class OnlineActivity extends CommonActivity { return true; } else if (itemId == R.id.headlines_select) { if (hf != null) { - Dialog dialog = new Dialog(this); - AlertDialog.Builder builder = new AlertDialog.Builder(this) + MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this) .setTitle(R.string.headlines_select_dialog) .setSingleChoiceItems( new String[]{ @@ -745,7 +744,7 @@ public class OnlineActivity extends CommonActivity { } }); - dialog = builder.create(); + Dialog dialog = builder.create(); dialog.show(); } return true; @@ -833,8 +832,7 @@ public class OnlineActivity extends CommonActivity { } else if (itemId == R.id.catchup_above) { if (hf != null) { - AlertDialog.Builder builder = new AlertDialog.Builder( - OnlineActivity.this) + MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this) .setMessage(R.string.confirm_catchup_above) .setPositiveButton(R.string.dialog_ok, new OnClickListener() { @@ -853,7 +851,7 @@ public class OnlineActivity extends CommonActivity { } }); - AlertDialog dialog = builder.create(); + Dialog dialog = builder.create(); dialog.show(); } @@ -937,9 +935,10 @@ public class OnlineActivity extends CommonActivity { public void editArticleNote(final Article article) { String note = ""; - - AlertDialog.Builder builder = new AlertDialog.Builder(this); - builder.setTitle(article.title); + + MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this) + .setTitle(article.title); + final EditText topicEdit = new EditText(this); topicEdit.setText(note); builder.setView(topicEdit); @@ -965,7 +964,7 @@ public class OnlineActivity extends CommonActivity { } }); - AlertDialog dialog = builder.create(); + Dialog dialog = builder.create(); dialog.show(); } @@ -988,9 +987,8 @@ public class OnlineActivity extends CommonActivity { itemIds[i] = labels.get(i).id; checkedItems[i] = labels.get(i).checked; } - - Dialog dialog = new Dialog(OnlineActivity.this); - AlertDialog.Builder builder = new AlertDialog.Builder(OnlineActivity.this) + + MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(OnlineActivity.this) .setTitle(R.string.article_set_labels) .setMultiChoiceItems(items, checkedItems, new OnMultiChoiceClickListener() { @@ -1018,7 +1016,7 @@ public class OnlineActivity extends CommonActivity { } }); - dialog = builder.create(); + Dialog dialog = builder.create(); dialog.show(); } @@ -1060,8 +1058,7 @@ public class OnlineActivity extends CommonActivity { if (getDatabaseHelper().hasOfflineData()) { - AlertDialog.Builder builder = new AlertDialog.Builder( - OnlineActivity.this) + MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this) .setMessage(R.string.dialog_offline_prompt) .setPositiveButton(R.string.dialog_offline_go, new Dialog.OnClickListener() { @@ -1078,7 +1075,7 @@ public class OnlineActivity extends CommonActivity { } }); - AlertDialog dlg = builder.create(); + Dialog dlg = builder.create(); dlg.show(); } } diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineActivity.java index 4da85e76..d7f487a1 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineActivity.java @@ -24,6 +24,8 @@ import android.widget.EditText; import androidx.appcompat.view.ActionMode; import androidx.appcompat.widget.Toolbar; +import com.google.android.material.dialog.MaterialAlertDialogBuilder; + import org.fox.ttrss.CommonActivity; import org.fox.ttrss.OnlineActivity; import org.fox.ttrss.PreferencesActivity; @@ -264,7 +266,7 @@ public class OfflineActivity extends CommonActivity { final EditText edit = new EditText(this); - AlertDialog.Builder builder = new AlertDialog.Builder(this) + MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this) .setTitle(R.string.search) .setPositiveButton(getString(R.string.search), new OnClickListener() { @@ -320,7 +322,7 @@ public class OfflineActivity extends CommonActivity { selectedIndex = 3; } - AlertDialog.Builder builder = new AlertDialog.Builder(this) + MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this) .setTitle(R.string.headlines_set_view_mode) .setSingleChoiceItems( new String[]{ @@ -363,11 +365,10 @@ public class OfflineActivity extends CommonActivity { return true; } else if (itemId == R.id.headlines_select) { if (ohf != null) { - Dialog dialog = new Dialog(this); - AlertDialog.Builder builder = new AlertDialog.Builder(this); - builder.setTitle(R.string.headlines_select_dialog); - builder.setSingleChoiceItems(new String[]{ + MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this) + .setTitle(R.string.headlines_select_dialog) + .setSingleChoiceItems(new String[]{ getString(R.string.headlines_select_all), getString(R.string.headlines_select_unread), getString(R.string.headlines_select_none)}, 0, @@ -384,7 +385,7 @@ public class OfflineActivity extends CommonActivity { } }); - dialog = builder.create(); + Dialog dialog = builder.create(); dialog.show(); } return true; @@ -396,8 +397,7 @@ public class OfflineActivity extends CommonActivity { int count = getUnreadArticleCount(feedId, isCat); if (count > 0) { - AlertDialog.Builder builder = new AlertDialog.Builder( - OfflineActivity.this) + MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this) .setMessage(getResources().getQuantityString(R.plurals.mark_num_headlines_as_read, count, count)) .setPositiveButton(R.string.catchup, new OnClickListener() { @@ -416,7 +416,7 @@ public class OfflineActivity extends CommonActivity { } }); - AlertDialog dlg = builder.create(); + Dialog dlg = builder.create(); dlg.show(); } } @@ -508,8 +508,7 @@ public class OfflineActivity extends CommonActivity { return true; } else if (itemId == R.id.catchup_above) { if (oap != null) { - AlertDialog.Builder builder = new AlertDialog.Builder( - OfflineActivity.this) + MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this) .setMessage(R.string.confirm_catchup_above) .setPositiveButton(R.string.dialog_ok, new OnClickListener() { @@ -528,7 +527,7 @@ public class OfflineActivity extends CommonActivity { } }); - AlertDialog dlg = builder.create(); + Dialog dlg = builder.create(); dlg.show(); } return true; diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java index 8500d7c7..ef032609 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java @@ -52,6 +52,7 @@ import com.bumptech.glide.load.resource.drawable.GlideDrawable; import com.bumptech.glide.request.RequestListener; import com.bumptech.glide.request.target.Target; import com.google.android.material.button.MaterialButton; +import com.google.android.material.dialog.MaterialAlertDialogBuilder; import org.fox.ttrss.Application; import org.fox.ttrss.CommonActivity; @@ -203,8 +204,7 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis return true; } else if (itemId == R.id.catchup_above) { if (true) { - AlertDialog.Builder builder = new AlertDialog.Builder( - m_activity) + MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(getContext()) .setMessage(R.string.confirm_catchup_above) .setPositiveButton(R.string.dialog_ok, new Dialog.OnClickListener() { @@ -223,7 +223,7 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis } }); - AlertDialog dialog = builder.create(); + Dialog dialog = builder.create(); dialog.show(); } return true; diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineMasterActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineMasterActivity.java index 78dad8f3..44016124 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineMasterActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineMasterActivity.java @@ -25,6 +25,8 @@ import androidx.drawerlayout.widget.DrawerLayout; import androidx.fragment.app.Fragment; import androidx.fragment.app.FragmentTransaction; +import com.google.android.material.dialog.MaterialAlertDialogBuilder; + import java.util.HashMap; public class OfflineMasterActivity extends OfflineActivity implements OfflineHeadlinesEventListener { @@ -150,7 +152,7 @@ public class OfflineMasterActivity extends OfflineActivity implements OfflineHea int selectedIndex = m_prefs.getBoolean("offline_oldest_first", false) ? 1 : 0; - AlertDialog.Builder builder = new AlertDialog.Builder(this) + MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this) .setTitle(getString(R.string.headlines_sort_articles_title)) .setSingleChoiceItems( new String[]{ diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/share/CommonShareActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/share/CommonShareActivity.java index 620916f8..39d6c2ef 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/share/CommonShareActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/share/CommonShareActivity.java @@ -1,6 +1,7 @@ package org.fox.ttrss.share; import android.app.AlertDialog; +import android.app.Dialog; import android.content.DialogInterface; import android.content.Intent; import android.content.SharedPreferences; @@ -11,6 +12,8 @@ import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; +import com.google.android.material.dialog.MaterialAlertDialogBuilder; + import org.fox.ttrss.ApiRequest; import org.fox.ttrss.PreferencesActivity; import org.fox.ttrss.R; @@ -53,10 +56,10 @@ public abstract class CommonShareActivity extends CommonActivity { if (m_prefs.getString("ttrss_url", "").trim().length() == 0) { - AlertDialog.Builder builder = new AlertDialog.Builder(this); - builder.setMessage(R.string.dialog_need_configure_prompt) - .setCancelable(false) - .setPositiveButton(R.string.dialog_open_preferences, new DialogInterface.OnClickListener() { + MaterialAlertDialogBuilder builder = new MaterialAlertDialogBuilder(this) + .setMessage(R.string.dialog_need_configure_prompt) + .setCancelable(false) + .setPositiveButton(R.string.dialog_open_preferences, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { // launch preferences @@ -65,12 +68,12 @@ public abstract class CommonShareActivity extends CommonActivity { startActivityForResult(intent, 0); } }) - .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() { + .setNegativeButton(R.string.cancel, new DialogInterface.OnClickListener() { public void onClick(DialogInterface dialog, int id) { dialog.cancel(); } }); - AlertDialog alert = builder.create(); + Dialog alert = builder.create(); alert.show(); } else { -- cgit v1.2.3-54-g00ecf From e6c3107189a296b817562462221e0165695196f7 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 7 May 2025 11:51:17 +0300 Subject: remove flavor image reparenting hacks, simplify headline row layout (somewhat), switch to materialcards --- .../main/java/org/fox/ttrss/HeadlinesFragment.java | 62 +----- .../src/main/res/layout/fragment_headlines.xml | 1 + .../main/res/layout/fragment_headlines_offline.xml | 4 + .../src/main/res/layout/headlines_row.xml | 217 ++++++++++---------- .../src/main/res/layout/headlines_row_unread.xml | 220 ++++++++++----------- org.fox.ttrss/src/main/res/values-night/themes.xml | 1 - org.fox.ttrss/src/main/res/values/attrs.xml | 1 - org.fox.ttrss/src/main/res/values/themes.xml | 1 - 8 files changed, 212 insertions(+), 295 deletions(-) (limited to 'org.fox.ttrss/src/main/java/org') diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java index a843bf39..6cc92d87 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java @@ -44,6 +44,7 @@ import android.view.WindowManager; import android.widget.AdapterView.AdapterContextMenuInfo; import android.widget.CheckBox; import android.widget.EditText; +import android.widget.FrameLayout; import android.widget.ImageView; import android.widget.ListView; import android.widget.PopupMenu; @@ -359,7 +360,6 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment { m_layoutManager = new LinearLayoutManager(m_activity.getApplicationContext()); m_list.setLayoutManager(m_layoutManager); m_list.setItemAnimator(new DefaultItemAnimator()); - m_list.addItemDecoration(new DividerItemDecoration(m_list.getContext(), m_layoutManager.getOrientation())); ArticleListAdapter adapter = new ArticleListAdapter(getActivity(), R.layout.headlines_row, m_articles); @@ -1211,7 +1211,6 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment { holder.flavorVideoKindView.setVisibility(View.GONE); holder.flavorImageOverflow.setVisibility(View.GONE); holder.flavorVideoView.setVisibility(View.GONE); - holder.headlineHeader.setBackgroundDrawable(null); Glide.clear(holder.flavorImageView); @@ -1291,24 +1290,15 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment { //Log.d(TAG, "TAG:" + holder.flavorImageOverflow.getTag()); holder.flavorImageView.setVisibility(View.VISIBLE); + holder.flavorImageView.setMaxHeight((int)(m_screenHeight * 0.6f)); - holder.flavorImageView.setMaxHeight((int)(m_screenHeight * 0.8f)); - holder.flavorProgressTarget.setModel(article.flavorImageUri); - + // prevent lower listiew entries from jumping around if this row is modified if (article.flavorViewHeight > 0) { - RelativeLayout.LayoutParams lp = (RelativeLayout.LayoutParams) holder.flavorImageView.getLayoutParams(); + FrameLayout.LayoutParams lp = (FrameLayout.LayoutParams) holder.flavorImageView.getLayoutParams(); lp.height = article.flavorViewHeight; - holder.flavorImageView.setLayoutParams(lp); } - - /* TODO: maybe an option? force height for all images to reduce list jumping around - - RelativeLayout.LayoutParams lp = (RelativeLayout.LayoutParams) holder.flavorImageView.getLayoutParams(); - lp.height = (int)(m_screenHeight * 0.5f); - lp.addRule(RelativeLayout.BELOW, R.id.headline_header); - holder.flavorImageView.setLayoutParams(lp); - */ + holder.flavorProgressTarget.setModel(article.flavorImageUri); try { @@ -1334,16 +1324,9 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment { if (resource.getIntrinsicWidth() > FLAVOR_IMG_MIN_SIZE && resource.getIntrinsicHeight() > FLAVOR_IMG_MIN_SIZE) { - //holder.flavorImageView.setVisibility(View.VISIBLE); + holder.flavorImageView.setVisibility(View.VISIBLE); holder.flavorImageOverflow.setVisibility(View.VISIBLE); - boolean forceDown = !m_activity.isSmallScreen() || article.flavorImage != null && "video".equals(article.flavorImage.tagName().toLowerCase()); - - RelativeLayout.LayoutParams lp = (RelativeLayout.LayoutParams) holder.flavorImageView.getLayoutParams(); - lp.height = RelativeLayout.LayoutParams.WRAP_CONTENT; - holder.flavorImageView.setLayoutParams(lp); - - maybeRepositionFlavorImage(holder.flavorImageView, resource, holder, forceDown); adjustVideoKindView(holder, article); return false; @@ -1684,9 +1667,6 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment { } else if (article.flavor_kind == Article.FLAVOR_KIND_VIDEO || "video".equals(article.flavorImage.tagName().toLowerCase())) { holder.flavorVideoKindView.setImageResource(R.drawable.baseline_play_circle_24); holder.flavorVideoKindView.setVisibility(View.VISIBLE); - } else if (article.flavor_kind == Article.FLAVOR_KIND_ALBUM ||article.mediaList.size() > 1) { - holder.flavorVideoKindView.setImageResource(R.drawable.baseline_photo_album_24); - holder.flavorVideoKindView.setVisibility(View.VISIBLE); } else { holder.flavorVideoKindView.setVisibility(View.INVISIBLE); } @@ -1707,36 +1687,6 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment { return px; } - private void maybeRepositionFlavorImage(View view, GlideDrawable resource, ArticleViewHolder holder, boolean forceDown) { - RelativeLayout.LayoutParams lp = (RelativeLayout.LayoutParams) view.getLayoutParams(); - - int w = resource.getIntrinsicWidth(); - int h = resource.getIntrinsicHeight(); - float r = h != 0 ? (float)w/h : 0; - - //Log.d(TAG, "XYR: " + pxToDp(w) + " " + pxToDp(h) + " " + r); - - if (forceDown || h < m_minimumHeightToEmbed || r >= 1) { - - lp.addRule(RelativeLayout.BELOW, R.id.headline_header); - - holder.headlineHeader.setBackgroundDrawable(null); - holder.flavorImageEmbedded = false; - - } else { - lp.addRule(RelativeLayout.BELOW, 0); - - TypedValue tv = new TypedValue(); - if (m_activity.getTheme().resolveAttribute(R.attr.headlineHeaderBackground, tv, true)) { - holder.headlineHeader.setBackgroundColor(tv.data); - } - - holder.flavorImageEmbedded = true; - } - - view.setLayoutParams(lp); - } - private void adjustTitleTextView(int score, TextView tv, int position) { int viewType = getItemViewType(position); if (origTitleColors[viewType] == null) diff --git a/org.fox.ttrss/src/main/res/layout/fragment_headlines.xml b/org.fox.ttrss/src/main/res/layout/fragment_headlines.xml index 9f09290f..22bed766 100755 --- a/org.fox.ttrss/src/main/res/layout/fragment_headlines.xml +++ b/org.fox.ttrss/src/main/res/layout/fragment_headlines.xml @@ -12,6 +12,7 @@ diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row.xml b/org.fox.ttrss/src/main/res/layout/headlines_row.xml index d41e5b37..b43d0fbb 100755 --- a/org.fox.ttrss/src/main/res/layout/headlines_row.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines_row.xml @@ -1,8 +1,9 @@ - @@ -13,160 +14,143 @@ android:shrinkColumns="0,1" android:stretchColumns="0,1"> - - + android:clickable="true" + android:layout_span="2" + android:padding="16dp"> - + android:layout_height="wrap_content" + android:ellipsize="end" + android:maxLines="3" + android:paddingBottom="8dp" + android:singleLine="false" + android:textColor="?colorPrimary" + android:textSize="18sp" + android:textStyle="normal" + tools:text="Sample entry title which is overwhelmingly long blah blah blah" /> - + - + android:layout_weight="0.5" + android:ellipsize="middle" + android:fontFamily="sans-serif-light" + android:singleLine="true" + android:textAlignment="viewStart" + android:textColor="?colorSecondary" + android:textSize="12sp" + tools:text="Example Feed AAA AAA AAAAAA AAAA AAAAA AA A A AA AA" /> - + android:layout_weight="0.5" + android:ellipsize="none" + android:fontFamily="sans-serif-light" + android:singleLine="true" + android:textAlignment="viewEnd" + android:textColor="?colorSecondary" + android:textSize="12sp" + tools:text="Jan 01, 12:00, 1970" /> - + - + - + - + - + - + - + - + + app:tint="?colorTertiary" /> @@ -277,5 +261,4 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml b/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml index b00f344c..82baeec3 100755 --- a/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml +++ b/org.fox.ttrss/src/main/res/layout/headlines_row_unread.xml @@ -1,9 +1,10 @@ - @@ -14,160 +15,143 @@ android:shrinkColumns="0,1" android:stretchColumns="0,1"> - - + android:clickable="true" + android:layout_span="2" + android:padding="16dp"> - + android:layout_height="wrap_content" + android:ellipsize="end" + android:maxLines="3" + android:paddingBottom="8dp" + android:singleLine="false" + android:textColor="?colorOnSurface" + android:textSize="18sp" + android:textStyle="bold" + tools:text="Sample entry title which is overwhelmingly long blah blah blah" /> - + - + android:layout_weight="0.5" + android:ellipsize="middle" + android:fontFamily="sans-serif-light" + android:singleLine="true" + android:textAlignment="viewStart" + android:textColor="?colorSecondary" + android:textSize="12sp" + tools:text="Example Feed AAA AAA AAAAAA AAAA AAAAA AA A A AA AA" /> - + android:layout_weight="0.5" + android:ellipsize="none" + android:fontFamily="sans-serif-light" + android:singleLine="true" + android:textAlignment="viewEnd" + android:textColor="?colorSecondary" + android:textSize="12sp" + tools:text="Jan 01, 12:00, 1970" /> - + - + - + - + - + - + - + - + + app:tint="?colorTertiary" /> @@ -188,7 +172,6 @@ android:maxLines="5" android:padding="16dp" tools:text="Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua." - android:textColor="?colorOnSurface" android:textSize="13sp" /> @@ -279,5 +262,4 @@ - - \ No newline at end of file + \ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/values-night/themes.xml b/org.fox.ttrss/src/main/res/values-night/themes.xml index a84ed131..fc82117e 100644 --- a/org.fox.ttrss/src/main/res/values-night/themes.xml +++ b/org.fox.ttrss/src/main/res/values-night/themes.xml @@ -28,7 +28,6 @@ @android:color/white #00FF00 - #99000000 #bebebe #303030 #101010 diff --git a/org.fox.ttrss/src/main/res/values/attrs.xml b/org.fox.ttrss/src/main/res/values/attrs.xml index f5fac361..4b469913 100755 --- a/org.fox.ttrss/src/main/res/values/attrs.xml +++ b/org.fox.ttrss/src/main/res/values/attrs.xml @@ -3,7 +3,6 @@ - diff --git a/org.fox.ttrss/src/main/res/values/themes.xml b/org.fox.ttrss/src/main/res/values/themes.xml index 1e348393..b5e5d313 100644 --- a/org.fox.ttrss/src/main/res/values/themes.xml +++ b/org.fox.ttrss/src/main/res/values/themes.xml @@ -24,7 +24,6 @@ @drawable/baseline_trending_down_24 @android:drawable/divider_horizontal_bright - #ccffffff @android:color/black @android:color/black #008000 -- cgit v1.2.3-54-g00ecf From 71dfb0bdedfe03fdc507e39ad2f6836ca108a5e6 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 7 May 2025 12:11:56 +0300 Subject: remove several more obsolete setBackgroundDrawable(null)s and maybe fix layoutparams for offline --- .../ttrss/offline/OfflineHeadlinesFragment.java | 22 ++-------------------- 1 file changed, 2 insertions(+), 20 deletions(-) (limited to 'org.fox.ttrss/src/main/java/org') diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java index ef032609..cad9e028 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java @@ -37,6 +37,7 @@ import android.widget.AdapterView; import android.widget.AdapterView.AdapterContextMenuInfo; import android.widget.AdapterView.OnItemClickListener; import android.widget.CheckBox; +import android.widget.FrameLayout; import android.widget.ImageView; import android.widget.ListView; import android.widget.PopupMenu; @@ -939,8 +940,6 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis holder.flavorVideoKindView.setVisibility(View.GONE); holder.flavorImageOverflow.setVisibility(View.GONE); - holder.headlineHeader.setBackgroundDrawable(null); - // this is needed if our flavor image goes behind base listview element holder.headlineHeader.setOnClickListener(new OnClickListener() { @Override @@ -971,9 +970,8 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis //Log.d(TAG, articleId + " IMG: " + afi.flavorImageUri + " STREAM: " + afi.flavorStreamUri + " H:" + flavorViewHeight); if (flavorViewHeight > 0) { - RelativeLayout.LayoutParams lp = (RelativeLayout.LayoutParams) holder.flavorImageView.getLayoutParams(); + FrameLayout.LayoutParams lp = (FrameLayout.LayoutParams) holder.flavorImageView.getLayoutParams(); lp.height = flavorViewHeight; - holder.flavorImageView.setLayoutParams(lp); } final String articleContent = article.getString(article.getColumnIndex("content")); @@ -1015,24 +1013,8 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis holder.flavorImageView.setVisibility(View.VISIBLE); - - //TODO: not implemented - //holder.flavorImageOverflow.setVisibility(View.VISIBLE); - - /*boolean forceDown = article.flavorImage != null && "video".equals(article.flavorImage.tagName().toLowerCase()); - - maybeRepositionFlavorImage(holder.flavorImageView, resource, holder, forceDown);*/ adjustVideoKindView(holder, afi); - /* we don't support image embedding in offline */ - - RelativeLayout.LayoutParams lp = (RelativeLayout.LayoutParams) holder.flavorImageView.getLayoutParams(); - lp.addRule(RelativeLayout.BELOW, R.id.headline_header); - lp.height = RelativeLayout.LayoutParams.WRAP_CONTENT; - holder.flavorImageView.setLayoutParams(lp); - - holder.headlineHeader.setBackgroundDrawable(null); - return false; } else { -- cgit v1.2.3-54-g00ecf From 9c98f64e6bed0787a9f267f3a4ea2a3ceb506bdf Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 7 May 2025 12:27:25 +0300 Subject: drop some ripples and update compact headline views --- .../main/java/org/fox/ttrss/HeadlinesFragment.java | 34 +++++++++++++--------- .../src/main/res/layout/fragment_article.xml | 2 -- .../headlines_row_selected_unread_compact.xml | 7 +---- .../res/layout/headlines_row_unread_compact.xml | 17 +---------- 4 files changed, 23 insertions(+), 37 deletions(-) (limited to 'org.fox.ttrss/src/main/java/org') diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java index 6cc92d87..2b92283d 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java @@ -72,6 +72,7 @@ import com.bumptech.glide.request.target.GlideDrawableImageViewTarget; import com.bumptech.glide.request.target.Target; import com.google.android.material.button.MaterialButton; import com.google.android.material.dialog.MaterialAlertDialogBuilder; +import com.google.android.material.divider.MaterialDividerItemDecoration; import com.google.android.material.snackbar.Snackbar; import com.google.gson.JsonElement; @@ -361,6 +362,13 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment { m_list.setLayoutManager(m_layoutManager); m_list.setItemAnimator(new DefaultItemAnimator()); + if (m_compactLayoutMode) { + MaterialDividerItemDecoration materialDivider = new MaterialDividerItemDecoration(m_list.getContext(), m_layoutManager.getOrientation()); + materialDivider.setDividerInsetStart(dpToPx(80)); + + m_list.addItemDecoration(materialDivider); + } + ArticleListAdapter adapter = new ArticleListAdapter(getActivity(), R.layout.headlines_row, m_articles); m_adapter = new HeaderViewRecyclerAdapter(adapter); @@ -1675,18 +1683,6 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment { } } - public int pxToDp(int px) { - DisplayMetrics displayMetrics = getContext().getResources().getDisplayMetrics(); - int dp = Math.round(px / (displayMetrics.xdpi / DisplayMetrics.DENSITY_DEFAULT)); - return dp; - } - - public int dpToPx(int dp) { - DisplayMetrics displayMetrics = getContext().getResources().getDisplayMetrics(); - int px = Math.round(dp * (displayMetrics.xdpi / DisplayMetrics.DENSITY_DEFAULT)); - return px; - } - private void adjustTitleTextView(int score, TextView tv, int position) { int viewType = getItemViewType(position); if (origTitleColors[viewType] == null) @@ -1839,7 +1835,19 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment { m_adapter.notifyDataSetChanged(); } - @Override + public int pxToDp(int px) { + DisplayMetrics displayMetrics = getContext().getResources().getDisplayMetrics(); + int dp = Math.round(px / (displayMetrics.xdpi / DisplayMetrics.DENSITY_DEFAULT)); + return dp; + } + + public int dpToPx(int dp) { + DisplayMetrics displayMetrics = getContext().getResources().getDisplayMetrics(); + int px = Math.round(dp * (displayMetrics.xdpi / DisplayMetrics.DENSITY_DEFAULT)); + return px; + } + + @Override public void onPause() { super.onPause(); diff --git a/org.fox.ttrss/src/main/res/layout/fragment_article.xml b/org.fox.ttrss/src/main/res/layout/fragment_article.xml index 0c2593ab..3bca35de 100755 --- a/org.fox.ttrss/src/main/res/layout/fragment_article.xml +++ b/org.fox.ttrss/src/main/res/layout/fragment_article.xml @@ -81,7 +81,6 @@ - + android:textSize="12sp" /> - - - - \ No newline at end of file -- cgit v1.2.3-54-g00ecf From 0a678ddebb947bc1edb91ac339eabe2e4dfbd98a Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 7 May 2025 12:36:56 +0300 Subject: fix gallery crash due to wrong type being deserialized --- org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryImageFragment.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'org.fox.ttrss/src/main/java/org') diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryImageFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryImageFragment.java index 8513c50c..addb48d3 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryImageFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/GalleryImageFragment.java @@ -29,7 +29,7 @@ public class GalleryImageFragment extends GalleryBaseFragment { super.onCreate(savedInstanceState); if (savedInstanceState != null) { - m_url = savedInstanceState.getParcelable("m_url"); + m_url = savedInstanceState.getString("m_url"); } } -- cgit v1.2.3-54-g00ecf From 6e457f9f8430ae7439427a65895cd6dba90c97f0 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 7 May 2025 17:22:58 +0300 Subject: stop setting background for customtabs --- org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java | 4 ---- 1 file changed, 4 deletions(-) (limited to 'org.fox.ttrss/src/main/java/org') diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java index 8e672aac..31824310 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java @@ -453,15 +453,11 @@ public class CommonActivity extends AppCompatActivity implements SharedPreferenc private void openUriWithCustomTab(Uri uri) { if (m_customTabClient != null) { - TypedValue tvBackground = new TypedValue(); - getTheme().resolveAttribute(R.attr.colorPrimary, tvBackground, true); - CustomTabsIntent.Builder builder = new CustomTabsIntent.Builder(getCustomTabSession()); builder.setStartAnimations(this, R.anim.slide_in_right, R.anim.slide_out_left); builder.setExitAnimations(this, R.anim.slide_in_left, R.anim.slide_out_right); - builder.setToolbarColor(tvBackground.data); builder.setShowTitle(true); Intent shareIntent = getShareIntent(uri.toString(), null); -- cgit v1.2.3-54-g00ecf From f88aa097dfa381c63812c12c22f67dd3e97206a5 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 7 May 2025 18:10:22 +0300 Subject: drop all custom/hardcoded color refs, replace with m3 theme alternatives --- .../src/main/java/org/fox/ttrss/ArticleFragment.java | 12 +----------- .../src/main/java/org/fox/ttrss/HeadlinesFragment.java | 9 --------- .../java/org/fox/ttrss/offline/OfflineArticleFragment.java | 2 +- .../java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java | 9 --------- org.fox.ttrss/src/main/res/layout/drawer_divider.xml | 8 +++----- org.fox.ttrss/src/main/res/layout/feeds_goback.xml | 1 - org.fox.ttrss/src/main/res/layout/feeds_row.xml | 1 - org.fox.ttrss/src/main/res/layout/feeds_row_selected.xml | 2 +- org.fox.ttrss/src/main/res/layout/feeds_row_toggle.xml | 3 +-- org.fox.ttrss/src/main/res/layout/fragment_article.xml | 8 ++------ org.fox.ttrss/src/main/res/values-night/themes.xml | 9 --------- org.fox.ttrss/src/main/res/values/attrs.xml | 8 -------- org.fox.ttrss/src/main/res/values/themes.xml | 9 --------- 13 files changed, 9 insertions(+), 72 deletions(-) (limited to 'org.fox.ttrss/src/main/java/org') diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java index 0d9a37c2..621238c1 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/ArticleFragment.java @@ -457,18 +457,8 @@ public class ArticleFragment extends androidx.fragment.app.Fragment { scoreView.setIconResource(tv.resourceId); - Resources.Theme theme = m_activity.getTheme(); - TypedValue tvColorHighScore = new TypedValue(); - theme.resolveAttribute(R.attr.headlineTitleHighScoreUnreadTextColor, tvColorHighScore, true); - TypedValue tvPrimary = new TypedValue(); m_activity.getTheme().resolveAttribute(R.attr.colorPrimary, tvPrimary, true); - - if (m_article.score > Article.SCORE_HIGH) - scoreView.setIconTint(ColorStateList.valueOf(tvColorHighScore.data)); - else - scoreView.setIconTint(ColorStateList.valueOf(tvPrimary.data)); - } protected void renderContent(Bundle savedInstanceState) { @@ -480,7 +470,7 @@ public class ArticleFragment extends androidx.fragment.app.Fragment { ws.setSupportZoom(false); TypedValue tvTextColor = new TypedValue(); - getActivity().getTheme().resolveAttribute(R.attr.articleTextColor, tvTextColor, true); + getActivity().getTheme().resolveAttribute(R.attr.colorOnSurface, tvTextColor, true); String textColor = String.format("#%06X", (0xFFFFFF & tvTextColor.data)); diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java index 2b92283d..b0ffa853 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java @@ -857,7 +857,6 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment { public static final int VIEW_COUNT = VIEW_AMR_FOOTER + 1; private final Integer[] origTitleColors = new Integer[VIEW_COUNT]; - private final int titleHighScoreUnreadColor; private ColorGenerator m_colorGenerator = ColorGenerator.DEFAULT; private TextDrawable.IBuilder m_drawableBuilder = TextDrawable.builder().round(); @@ -900,11 +899,6 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment { flavorImageEnabled = "HL_DEFAULT".equals(headlineMode) || "HL_COMPACT".equals(headlineMode); m_cmgr = (ConnectivityManager) m_activity.getSystemService(Context.CONNECTIVITY_SERVICE); - - Theme theme = context.getTheme(); - TypedValue tv = new TypedValue(); - theme.resolveAttribute(R.attr.headlineTitleHighScoreUnreadTextColor, tv, true); - titleHighScoreUnreadColor = tv.data; } @Override @@ -1691,9 +1685,6 @@ public class HeadlinesFragment extends androidx.fragment.app.Fragment { if (score < Article.SCORE_LOW) { tv.setPaintFlags(tv.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG); - } else if (score > Article.SCORE_HIGH) { - tv.setTextColor(titleHighScoreUnreadColor); - tv.setPaintFlags(tv.getPaintFlags() & ~Paint.STRIKE_THRU_TEXT_FLAG); } else { tv.setTextColor(origTitleColors[viewType].intValue()); tv.setPaintFlags(tv.getPaintFlags() & ~Paint.STRIKE_THRU_TEXT_FLAG); diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java index aac19b51..9451f8f6 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineArticleFragment.java @@ -327,7 +327,7 @@ public class OfflineArticleFragment extends Fragment { } TypedValue tvTextColor = new TypedValue(); - getActivity().getTheme().resolveAttribute(R.attr.articleTextColor, tvTextColor, true); + getActivity().getTheme().resolveAttribute(R.attr.colorOnSurface, tvTextColor, true); String textColor = String.format("#%06X", (0xFFFFFF & tvTextColor.data)); diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java index cad9e028..bde4f52f 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/offline/OfflineHeadlinesFragment.java @@ -566,7 +566,6 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis public static final int VIEW_COUNT = VIEW_LOADMORE+1; private final Integer[] origTitleColors = new Integer[VIEW_COUNT]; - private final int titleHighScoreUnreadColor; private ColorGenerator m_colorGenerator = ColorGenerator.DEFAULT; private TextDrawable.IBuilder m_drawableBuilder = TextDrawable.builder().round(); @@ -578,11 +577,6 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis String[] from, int[] to, int flags) { super(context, layout, c, from, to, flags); - Theme theme = context.getTheme(); - TypedValue tv = new TypedValue(); - theme.resolveAttribute(R.attr.headlineTitleHighScoreUnreadTextColor, tv, true); - titleHighScoreUnreadColor = tv.data; - String headlineMode = m_prefs.getString("headline_mode", "HL_DEFAULT"); showFlavorImage = "HL_DEFAULT".equals(headlineMode) || "HL_COMPACT".equals(headlineMode); @@ -1194,9 +1188,6 @@ public class OfflineHeadlinesFragment extends Fragment implements OnItemClickLis if (score < -500) { tv.setPaintFlags(tv.getPaintFlags() | Paint.STRIKE_THRU_TEXT_FLAG); - } else if (score > 500) { - tv.setTextColor(titleHighScoreUnreadColor); - tv.setPaintFlags(tv.getPaintFlags() & ~Paint.STRIKE_THRU_TEXT_FLAG); } else { tv.setTextColor(origTitleColors[viewType].intValue()); tv.setPaintFlags(tv.getPaintFlags() & ~Paint.STRIKE_THRU_TEXT_FLAG); diff --git a/org.fox.ttrss/src/main/res/layout/drawer_divider.xml b/org.fox.ttrss/src/main/res/layout/drawer_divider.xml index 1e0166e8..3b4ab6fc 100644 --- a/org.fox.ttrss/src/main/res/layout/drawer_divider.xml +++ b/org.fox.ttrss/src/main/res/layout/drawer_divider.xml @@ -4,11 +4,9 @@ android:layout_width="fill_parent" android:layout_height="fill_parent"> - + android:layout_marginTop="8dp" + android:layout_height="wrap_content"/> \ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/layout/feeds_goback.xml b/org.fox.ttrss/src/main/res/layout/feeds_goback.xml index d826da41..f4c580a3 100755 --- a/org.fox.ttrss/src/main/res/layout/feeds_goback.xml +++ b/org.fox.ttrss/src/main/res/layout/feeds_goback.xml @@ -33,7 +33,6 @@ android:paddingStart="16dp" android:singleLine="true" android:text=".." - android:textColor="?feedlistTextColor" android:textSize="14sp" /> \ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/layout/feeds_row.xml b/org.fox.ttrss/src/main/res/layout/feeds_row.xml index 3ebcf0eb..32e20c26 100755 --- a/org.fox.ttrss/src/main/res/layout/feeds_row.xml +++ b/org.fox.ttrss/src/main/res/layout/feeds_row.xml @@ -37,7 +37,6 @@ android:paddingEnd="16dp" android:singleLine="true" tools:text="Feed title" - android:textColor="?feedlistTextColor" android:textSize="14sp" /> @@ -138,11 +136,9 @@ - + android:layout_height="wrap_content"/> diff --git a/org.fox.ttrss/src/main/res/values-night/themes.xml b/org.fox.ttrss/src/main/res/values-night/themes.xml index f072def8..196b4ad4 100644 --- a/org.fox.ttrss/src/main/res/values-night/themes.xml +++ b/org.fox.ttrss/src/main/res/values-night/themes.xml @@ -26,15 +26,6 @@ @drawable/baseline_trending_flat_24 @drawable/baseline_trending_down_24 - @android:color/white - #00FF00 - #101010 - @android:drawable/divider_horizontal_dark - @android:color/white - @android:color/transparent - #e0e0e0 - #303030 - @color/md_theme_primary @color/md_theme_onPrimary @color/md_theme_primaryContainer diff --git a/org.fox.ttrss/src/main/res/values/attrs.xml b/org.fox.ttrss/src/main/res/values/attrs.xml index 49daa405..daf2323c 100755 --- a/org.fox.ttrss/src/main/res/values/attrs.xml +++ b/org.fox.ttrss/src/main/res/values/attrs.xml @@ -1,13 +1,5 @@ - - - - - - - - diff --git a/org.fox.ttrss/src/main/res/values/themes.xml b/org.fox.ttrss/src/main/res/values/themes.xml index f9186c3e..4cc0d590 100644 --- a/org.fox.ttrss/src/main/res/values/themes.xml +++ b/org.fox.ttrss/src/main/res/values/themes.xml @@ -26,15 +26,6 @@ @drawable/baseline_trending_flat_24 @drawable/baseline_trending_down_24 - @android:drawable/divider_horizontal_bright - @android:color/black - @android:color/black - #008000 - #dddddd - @android:color/transparent - @android:color/black - #cccccc - @color/md_theme_primary @color/md_theme_onPrimary @color/md_theme_primaryContainer -- cgit v1.2.3-54-g00ecf From a354d2a348099be7e3cacc0441dd5c19944cd7a6 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Wed, 7 May 2025 18:59:22 +0300 Subject: add m3 edge-to-edge --- org.fox.ttrss/build.gradle | 1 + .../main/java/org/fox/ttrss/CommonActivity.java | 2 + .../res/layout-sw600dp-land/activity_master.xml | 13 ++++- .../res/layout-sw600dp-port/activity_master.xml | 61 +++------------------- .../src/main/res/layout/activity_detail_phone.xml | 1 + .../src/main/res/layout/activity_master.xml | 2 +- .../src/main/res/layout/activity_master_phone.xml | 61 +++------------------- .../src/main/res/layout/drawer_header.xml | 2 +- .../src/main/res/layout/fragment_article.xml | 2 +- .../src/main/res/layout/master_drawer_layout.xml | 54 +++++++++++++++++++ org.fox.ttrss/src/main/res/layout/toolbar.xml | 2 - org.fox.ttrss/src/main/res/values-night/themes.xml | 3 -- org.fox.ttrss/src/main/res/values/themes.xml | 3 -- 13 files changed, 87 insertions(+), 120 deletions(-) create mode 100644 org.fox.ttrss/src/main/res/layout/master_drawer_layout.xml (limited to 'org.fox.ttrss/src/main/java/org') diff --git a/org.fox.ttrss/build.gradle b/org.fox.ttrss/build.gradle index 9f130852..34d31f9c 100755 --- a/org.fox.ttrss/build.gradle +++ b/org.fox.ttrss/build.gradle @@ -110,6 +110,7 @@ dependencies { implementation 'com.github.bumptech.glide:glide:3.8.0' implementation files('libs/glide-transformations-2.0.2.jar') implementation 'androidx.recyclerview:recyclerview:1.4.0' + implementation 'androidx.activity:activity:1.10.1' implementation 'androidx.legacy:legacy-support-v4:1.0.0' implementation 'androidx.appcompat:appcompat:1.7.0' implementation 'androidx.appcompat:appcompat-resources:1.7.0' diff --git a/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java b/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java index 31824310..4eb5b6f0 100755 --- a/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java +++ b/org.fox.ttrss/src/main/java/org/fox/ttrss/CommonActivity.java @@ -33,6 +33,7 @@ import android.view.Display; import android.view.View; import android.widget.CheckBox; +import androidx.activity.EdgeToEdge; import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.app.AppCompatDelegate; import androidx.browser.customtabs.CustomTabsCallback; @@ -231,6 +232,7 @@ public class CommonActivity extends AppCompatActivity implements SharedPreferenc @Override public void onCreate(Bundle savedInstanceState) { + EdgeToEdge.enable(this); if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) { NotificationManager nmgr = (NotificationManager) getSystemService(NOTIFICATION_SERVICE); diff --git a/org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_master.xml b/org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_master.xml index 6976c873..f44e0e4a 100644 --- a/org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_master.xml +++ b/org.fox.ttrss/src/main/res/layout-sw600dp-land/activity_master.xml @@ -1,6 +1,7 @@ @@ -46,7 +47,17 @@ android:layout_width="match_parent" android:layout_height="wrap_content"> - + + diff --git a/org.fox.ttrss/src/main/res/layout-sw600dp-port/activity_master.xml b/org.fox.ttrss/src/main/res/layout-sw600dp-port/activity_master.xml index fa1612f8..9bb837cb 100644 --- a/org.fox.ttrss/src/main/res/layout-sw600dp-port/activity_master.xml +++ b/org.fox.ttrss/src/main/res/layout-sw600dp-port/activity_master.xml @@ -1,57 +1,8 @@ - - - + - - - - - - - - - - - - - - - - - - - - - + android:layout_width="match_parent" + android:layout_height="match_parent"> - + + \ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/layout/activity_detail_phone.xml b/org.fox.ttrss/src/main/res/layout/activity_detail_phone.xml index 6d2f94ea..56500d38 100644 --- a/org.fox.ttrss/src/main/res/layout/activity_detail_phone.xml +++ b/org.fox.ttrss/src/main/res/layout/activity_detail_phone.xml @@ -1,6 +1,7 @@ diff --git a/org.fox.ttrss/src/main/res/layout/activity_master.xml b/org.fox.ttrss/src/main/res/layout/activity_master.xml index 9bb9bff5..9bb837cb 100755 --- a/org.fox.ttrss/src/main/res/layout/activity_master.xml +++ b/org.fox.ttrss/src/main/res/layout/activity_master.xml @@ -4,5 +4,5 @@ android:layout_width="match_parent" android:layout_height="match_parent"> - + \ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/layout/activity_master_phone.xml b/org.fox.ttrss/src/main/res/layout/activity_master_phone.xml index f1c5e9d3..9bb837cb 100644 --- a/org.fox.ttrss/src/main/res/layout/activity_master_phone.xml +++ b/org.fox.ttrss/src/main/res/layout/activity_master_phone.xml @@ -1,53 +1,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - + + + + + \ No newline at end of file diff --git a/org.fox.ttrss/src/main/res/layout/drawer_header.xml b/org.fox.ttrss/src/main/res/layout/drawer_header.xml index f4954259..3540c094 100755 --- a/org.fox.ttrss/src/main/res/layout/drawer_header.xml +++ b/org.fox.ttrss/src/main/res/layout/drawer_header.xml @@ -1,7 +1,7 @@ diff --git a/org.fox.ttrss/src/main/res/layout/master_drawer_layout.xml b/org.fox.ttrss/src/main/res/layout/master_drawer_layout.xml new file mode 100644 index 00000000..4ce1249a --- /dev/null +++ b/org.fox.ttrss/src/main/res/layout/master_drawer_layout.xml @@ -0,0 +1,54 @@ + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/org.fox.ttrss/src/main/res/layout/toolbar.xml b/org.fox.ttrss/src/main/res/layout/toolbar.xml index c256e587..989292b2 100755 --- a/org.fox.ttrss/src/main/res/layout/toolbar.xml +++ b/org.fox.ttrss/src/main/res/layout/toolbar.xml @@ -3,10 +3,8 @@ xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:id="@+id/toolbar" - android:elevation="4dp" app:layout_scrollFlags="scroll|enterAlways" app:titleTextAppearance="?attr/textAppearanceTitleMedium" android:layout_height="wrap_content" android:layout_width="match_parent" - android:background="?colorSurfaceContainerLow" android:minHeight="?attr/actionBarSize"/> diff --git a/org.fox.ttrss/src/main/res/values-night/themes.xml b/org.fox.ttrss/src/main/res/values-night/themes.xml index 196b4ad4..83268f38 100644 --- a/org.fox.ttrss/src/main/res/values-night/themes.xml +++ b/org.fox.ttrss/src/main/res/values-night/themes.xml @@ -1,8 +1,5 @@