summaryrefslogtreecommitdiff
path: root/org.fox.ttrss/src
diff options
context:
space:
mode:
Diffstat (limited to 'org.fox.ttrss/src')
-rwxr-xr-xorg.fox.ttrss/src/main/AndroidManifest.xml6
-rwxr-xr-xorg.fox.ttrss/src/main/java/org/fox/ttrss/HeadlinesFragment.java24
-rwxr-xr-xorg.fox.ttrss/src/main/java/org/fox/ttrss/YoutubePlayerActivity.java144
-rw-r--r--org.fox.ttrss/src/main/res/drawable-hdpi/dashclock.pngbin3054 -> 0 bytes
-rw-r--r--org.fox.ttrss/src/main/res/drawable-xhdpi/dashclock.pngbin3482 -> 0 bytes
-rw-r--r--org.fox.ttrss/src/main/res/layout/activity_youtube_player.xml29
6 files changed, 1 insertions, 202 deletions
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" >
</activity>
- <activity
- android:name=".YoutubePlayerActivity"
- android:configChanges="keyboardHidden|orientation|screenSize"
- android:label="@string/title_activity_video_player" >
- </activity>
-
<provider
android:name="androidx.core.content.FileProvider"
android:authorities="org.fox.ttrss.SharedFileProvider"
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 f6990207..e1fa2b4c 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
@@ -824,7 +824,6 @@ public class HeadlinesFragment extends StateSavedFragment {
boolean flavorImageEnabled;
private int m_minimumHeightToEmbed;
- boolean m_youtubeInstalled;
private int m_screenHeight;
private int m_lastAddedPosition;
@@ -866,14 +865,6 @@ public class HeadlinesFragment extends StateSavedFragment {
TypedValue tv = new TypedValue();
theme.resolveAttribute(R.attr.headlineTitleHighScoreUnreadTextColor, tv, true);
titleHighScoreUnreadColor = tv.data;
-
- List<ApplicationInfo> 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
--- a/org.fox.ttrss/src/main/res/drawable-hdpi/dashclock.png
+++ /dev/null
Binary files 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
--- a/org.fox.ttrss/src/main/res/drawable-xhdpi/dashclock.png
+++ /dev/null
Binary files 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 @@
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:fitsSystemWindows="true"
- android:background="@android:color/black">
-
- <FrameLayout
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_below="@+id/toolbar">
-
- <fragment
- android:name="com.google.android.youtube.player.YouTubePlayerSupportFragment"
- android:id="@+id/fragment_youtube_player"
- android:layout_width="match_parent"
- android:layout_height="match_parent" />
-
- <ProgressBar
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:id="@+id/video_loading"
- android:layout_gravity="center"
- android:indeterminate="true" />
-
- </FrameLayout>
-
- <include layout="@layout/toolbar" android:id="@+id/toolbar" />
-
-</RelativeLayout>
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2025-11-14 18:26:52 +0000