From 1319cf8a8460adbefdd8d336afb1db32d7134c60 Mon Sep 17 00:00:00 2001 From: Page Asgardius Date: Tue, 28 Feb 2023 10:25:01 -0700 Subject: [PATCH] seekbar --- README.md | 6 +- .../asgardius/page/s3music/VideoPlayer.java | 6 + .../res/layout/activity_bucket_policy.xml | 53 -------- .../main/res/layout/activity_cors_config.xml | 61 ---------- .../res/layout/activity_create_bucket.xml | 70 ----------- .../main/res/layout/activity_downloader.xml | 41 ------- .../main/res/layout/activity_image_viewer.xml | 32 ----- .../main/res/layout/activity_object_info.xml | 49 -------- .../res/layout/activity_object_policy.xml | 54 --------- app/src/main/res/layout/activity_share.xml | 114 ------------------ .../main/res/layout/activity_text_viewer.xml | 30 ----- app/src/main/res/layout/activity_uploader.xml | 72 ----------- .../main/res/layout/activity_video_player.xml | 22 +++- .../res/layout/player_custom_controls.xml | 60 +++++++++ app/src/main/res/menu/bucket_menu.xml | 44 ------- app/src/main/res/menu/folder_menu.xml | 37 ------ app/src/main/res/menu/object_menu.xml | 36 ------ app/src/main/res/values-es/strings.xml | 55 +-------- app/src/main/res/values/strings.xml | 53 +------- 19 files changed, 94 insertions(+), 801 deletions(-) delete mode 100644 app/src/main/res/layout/activity_bucket_policy.xml delete mode 100644 app/src/main/res/layout/activity_cors_config.xml delete mode 100644 app/src/main/res/layout/activity_create_bucket.xml delete mode 100644 app/src/main/res/layout/activity_downloader.xml delete mode 100644 app/src/main/res/layout/activity_image_viewer.xml delete mode 100644 app/src/main/res/layout/activity_object_info.xml delete mode 100644 app/src/main/res/layout/activity_object_policy.xml delete mode 100644 app/src/main/res/layout/activity_share.xml delete mode 100644 app/src/main/res/layout/activity_text_viewer.xml delete mode 100644 app/src/main/res/layout/activity_uploader.xml create mode 100644 app/src/main/res/layout/player_custom_controls.xml delete mode 100644 app/src/main/res/menu/bucket_menu.xml delete mode 100644 app/src/main/res/menu/folder_menu.xml delete mode 100644 app/src/main/res/menu/object_menu.xml diff --git a/README.md b/README.md index e6e6375..66889bd 100644 --- a/README.md +++ b/README.md @@ -15,15 +15,13 @@ This app is based on Asgardius S3 Manager This app is a work in progress, so it have some bugs that need to be fixed -You need to setup a pdf.js server to use pdf viewer. Just download latest version from official website and upload to any web server with ssl on same root domain than S3 server (can be same subdomain or a different one). Then set url to pdfjs root folder like https://example.com/pdfjs-dist - [Get it on F-Droid](https://f-droid.org/packages/asgardius.page.s3manager/) + height="80">](https://f-droid.org/packages/asgardius.page.s3music/) [Get it on Google Play](https://play.google.com/store/apps/details?id=asgardius.page.s3manager) + height="80">](https://play.google.com/store/apps/details?id=asgardius.page.s3music) F-droid release may take a few days to get updated [More info here](https://www.f-droid.org/en/docs/FAQ_-_App_Developers/#ive-published-a-new-release-why-is-it-not-in-the-repository) diff --git a/app/src/main/java/asgardius/page/s3music/VideoPlayer.java b/app/src/main/java/asgardius/page/s3music/VideoPlayer.java index e01232e..dcf9d25 100644 --- a/app/src/main/java/asgardius/page/s3music/VideoPlayer.java +++ b/app/src/main/java/asgardius/page/s3music/VideoPlayer.java @@ -29,6 +29,7 @@ import com.google.android.exoplayer2.database.StandaloneDatabaseProvider; import com.google.android.exoplayer2.ext.mediasession.MediaSessionConnector; import com.google.android.exoplayer2.source.ProgressiveMediaSource; import com.google.android.exoplayer2.ui.PlayerNotificationManager; +import com.google.android.exoplayer2.ui.StyledPlayerControlView; import com.google.android.exoplayer2.ui.StyledPlayerView; import com.google.android.exoplayer2.upstream.DefaultHttpDataSource; import com.google.android.exoplayer2.upstream.cache.CacheDataSource; @@ -47,6 +48,7 @@ public class VideoPlayer extends AppCompatActivity { // creating a variable for exoplayerview. protected StyledPlayerView playerView; + protected StyledPlayerControlView controlView; private WifiManager.WifiLock mWifiLock; private PowerManager.WakeLock mWakeLock; private PowerManager powerManager; @@ -170,6 +172,7 @@ public class VideoPlayer extends AppCompatActivity { standaloneDatabaseProvider = new StandaloneDatabaseProvider(this); maxCacheSize = (long)videocache * 1024 * 1024; playerView = findViewById(R.id.player_view); + controlView = findViewById(R.id.control_view); // creating a variable for exoplayer player = new ExoPlayer.Builder(this).setLoadControl(loadControl).build(); player.setAudioAttributes(audioAttributes, true); @@ -181,6 +184,7 @@ public class VideoPlayer extends AppCompatActivity { evictor, standaloneDatabaseProvider); playerView.setPlayer(player); + controlView.setPlayer(player); playerView.setUseController(false); //MediaItem mediaItem = MediaItem.fromUri(videoURL); @@ -250,8 +254,10 @@ public class VideoPlayer extends AppCompatActivity { public void onIsPlayingChanged(boolean isPlaying) { if(player.isPlaying()) { playpause.setImageDrawable(pause); + playpause.setContentDescription(getResources().getString(R.string.pause)); } else { playpause.setImageDrawable(play); + playpause.setContentDescription(getResources().getString(R.string.play)); } Player.Listener.super.onIsPlayingChanged(isPlaying); } diff --git a/app/src/main/res/layout/activity_bucket_policy.xml b/app/src/main/res/layout/activity_bucket_policy.xml deleted file mode 100644 index 5912f8c..0000000 --- a/app/src/main/res/layout/activity_bucket_policy.xml +++ /dev/null @@ -1,53 +0,0 @@ - - - - - - - - - -