From 9e7224c7aa83b1aff63dc7f03b45a8258c7c6529 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov Date: Mon, 5 May 2025 14:31:26 +0300 Subject: bump gradle to 8.7 / agp to 8.4.2 --- org.fox.ttrss/src/main/AndroidManifest.xml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'org.fox.ttrss/src/main/AndroidManifest.xml') diff --git a/org.fox.ttrss/src/main/AndroidManifest.xml b/org.fox.ttrss/src/main/AndroidManifest.xml index d2d1a779..c9217d86 100755 --- a/org.fox.ttrss/src/main/AndroidManifest.xml +++ b/org.fox.ttrss/src/main/AndroidManifest.xml @@ -1,6 +1,5 @@ - + -- 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/AndroidManifest.xml') 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 695fa66d417e0f00db1c20c6034201079340b4d5 Mon Sep 17 00:00:00 2001 From: Andrew Dolgov 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/AndroidManifest.xml') 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