diff options
author | Thomas <tschneider.ac@gmail.com> | 2023-01-23 09:31:32 +0100 |
---|---|---|
committer | Thomas <tschneider.ac@gmail.com> | 2023-01-23 09:31:32 +0100 |
commit | 74afdc0a7abbba3bd03fd783a40fbc554df1ff9b (patch) | |
tree | 5c13f28c2682fb185d3ca999fd823aaa269db61c | |
parent | 66161f4eb3e3b8b6457b3437123a50d286ca50f4 (diff) |
Some changes
91 files changed, 833 insertions, 603 deletions
diff --git a/app/src/androidTest/java/app/fedilab/android/ExampleInstrumentedTest.java b/app/src/androidTest/java/app/fedilab/android/ExampleInstrumentedTest.java index f422a923b..7c6eed8d7 100644 --- a/app/src/androidTest/java/app/fedilab/android/ExampleInstrumentedTest.java +++ b/app/src/androidTest/java/app/fedilab/android/ExampleInstrumentedTest.java @@ -1,15 +1,15 @@ package app.fedilab.android; +import static org.junit.Assert.assertEquals; + import android.content.Context; -import androidx.test.platform.app.InstrumentationRegistry; import androidx.test.ext.junit.runners.AndroidJUnit4; +import androidx.test.platform.app.InstrumentationRegistry; import org.junit.Test; import org.junit.runner.RunWith; -import static org.junit.Assert.*; - /** * Instrumented test, which will execute on an Android device. * diff --git a/app/src/fdroid/java/app/fedilab/android/activities/BasePeertubeActivity.java b/app/src/fdroid/java/app/fedilab/android/activities/BasePeertubeActivity.java new file mode 100644 index 000000000..229956318 --- /dev/null +++ b/app/src/fdroid/java/app/fedilab/android/activities/BasePeertubeActivity.java @@ -0,0 +1,207 @@ +package app.fedilab.android.activities; +/* Copyright 2021 Thomas Schneider + * + * This file is a part of TubeLab + * + * This program is free software; you can redistribute it and/or modify it under the terms of the + * GNU General Public License as published by the Free Software Foundation; either version 3 of the + * License, or (at your option) any later version. + * + * TubeLab is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even + * the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General + * Public License for more details. + * + * You should have received a copy of the GNU General Public License along with TubeLab; if not, + * see <http://www.gnu.org/licenses>. */ + + +import static app.fedilab.android.peertube.helper.Helper.CAST_ID; + +import android.content.Intent; +import android.os.Bundle; +import android.os.Handler; +import android.os.Looper; +import android.view.Menu; +import android.view.MenuItem; +import android.view.View; +import android.webkit.MimeTypeMap; + +import androidx.appcompat.app.AlertDialog; +import androidx.localbroadcastmanager.content.LocalBroadcastManager; + +import com.google.android.exoplayer2.SimpleExoPlayer; + +import org.jetbrains.annotations.NotNull; + +import java.io.IOException; +import java.security.GeneralSecurityException; + +import app.fedilab.android.R; +import app.fedilab.android.databinding.ActivityPeertubeBinding; +import app.fedilab.android.mastodon.activities.BaseBarActivity; +import app.fedilab.android.peertube.client.data.VideoData; +import app.fedilab.android.peertube.helper.Helper; +import su.litvak.chromecast.api.v2.ChromeCast; +import su.litvak.chromecast.api.v2.MediaStatus; +import su.litvak.chromecast.api.v2.Status; + + +public class BasePeertubeActivity extends BaseBarActivity { + + protected ActivityPeertubeBinding binding; + protected VideoData.Video peertube; + protected SimpleExoPlayer player; + protected String videoURL; + protected String subtitlesStr; + + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + binding = ActivityPeertubeBinding.inflate(getLayoutInflater()); + View view = binding.getRoot(); + setContentView(view); + binding.minController.castPlay.setOnClickListener(v -> { + binding.minController.castLoader.setVisibility(View.VISIBLE); + if (PeertubeBaseMainActivity.chromeCast != null) { + new Thread(() -> { + try { + int icon = -1; + if (PeertubeBaseMainActivity.chromeCast.getMediaStatus().playerState == MediaStatus.PlayerState.PLAYING) { + PeertubeBaseMainActivity.chromeCast.pause(); + icon = R.drawable.ic_baseline_play_arrow_32; + } else if (PeertubeBaseMainActivity.chromeCast.getMediaStatus().playerState == MediaStatus.PlayerState.PAUSED) { + PeertubeBaseMainActivity.chromeCast.play(); + icon = R.drawable.ic_baseline_pause_32; + } + if (icon != -1) { + Handler mainHandler = new Handler(Looper.getMainLooper()); + int finalIcon = icon; + Runnable myRunnable = () -> binding.minController.castPlay.setImageResource(finalIcon); + mainHandler.post(myRunnable); + } + Handler mainHandler = new Handler(Looper.getMainLooper()); + Runnable myRunnable = () -> binding.minController.castLoader.setVisibility(View.GONE); + mainHandler.post(myRunnable); + } catch (IOException e) { + e.printStackTrace(); + } + }).start(); + } + }); + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + if (item.getItemId() == R.id.action_cast) { + if (PeertubeBaseMainActivity.chromeCasts != null && PeertubeBaseMainActivity.chromeCasts.size() > 0) { + String[] chromecast_choice = new String[PeertubeBaseMainActivity.chromeCasts.size()]; + AlertDialog.Builder alt_bld = new AlertDialog.Builder(this); + alt_bld.setTitle(R.string.chromecast_choice); + int i = 0; + for (ChromeCast cc : PeertubeBaseMainActivity.chromeCasts) { + chromecast_choice[i] = cc.getTitle(); + i++; + } + i = 0; + for (ChromeCast cc : PeertubeBaseMainActivity.chromeCasts) { + if (PeertubeBaseMainActivity.chromecastActivated && cc.isConnected()) { + break; + } + i++; + } + + alt_bld.setSingleChoiceItems(chromecast_choice, i, (dialog, position) -> { + PeertubeBaseMainActivity.chromeCast = PeertubeBaseMainActivity.chromeCasts.get(position); + new Thread(() -> { + if (PeertubeBaseMainActivity.chromeCast != null) { + Intent intentBC = new Intent(Helper.RECEIVE_CAST_SETTINGS); + Bundle b = new Bundle(); + if (PeertubeBaseMainActivity.chromecastActivated) { + b.putInt("displayed", 0); + intentBC.putExtras(b); + LocalBroadcastManager.getInstance(BasePeertubeActivity.this).sendBroadcast(intentBC); + Handler mainHandler = new Handler(Looper.getMainLooper()); + Runnable myRunnable = () -> { + binding.doubleTapPlayerView.setVisibility(View.VISIBLE); + binding.minController.castMiniController.setVisibility(View.GONE); + }; + mainHandler.post(myRunnable); + + } else { + b.putInt("displayed", 1); + b.putParcelable("castedTube", peertube); + intentBC.putExtras(b); + LocalBroadcastManager.getInstance(B |