Peertube
/
TubeLab-App-Android
mirror of https://framagit.org/tom79/fedilab-tube
1
0
Fork 0
Code Issues Releases Wiki Activity

Some improvements

This commit is contained in:
Thomas 2020-10-24 16:36:49 +02:00
parent 1194209c82
commit 857ab65f93
6 changed files with 45 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -11,8 +11,8 @@ android {
minSdkVersion 21 minSdkVersion 21
targetSdkVersion 30 targetSdkVersion 30
versionCode 20 versionCode 21
versionName "1.5.1" versionName "1.5.2"
multiDexEnabled true multiDexEnabled true
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
} }

8
app/src/fdroid_acad/play/release-notes/en-US/default.txt
View File

@ -1,3 +1,5 @@
- Theme: Clair, Sombre et automatique - Nouvelles options :
- Supprimer tous les commentaires d'un compte sur vos vidéos - Mode plein écran automatique
- Mettre en sourdine un compte depuis les commentaires. - Désactiver la lecture automatique des vidéos
- Quelques corrections de bugs

9
app/src/fdroid_full/play/release-notes/en-US/default.txt
View File

@ -1 +1,8 @@
- Fix some issues Added:
- Enable/disable auto playback
- Enter in fullscreen automatically (default disabled)
- Back press pauses the video in fullscreen
Fixes:
- Public timelines don't honor muted accounts
- Comments are not removed when switching to a video without comments

8
app/src/main/java/app/fedilab/fedilabtube/MainActivity.java
View File

@ -41,6 +41,7 @@ import com.kobakei.ratethisapp.RateThisApp;
import org.jetbrains.annotations.NotNull; import org.jetbrains.annotations.NotNull;
import java.util.LinkedHashMap;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
import java.util.TreeSet; import java.util.TreeSet;
@ -246,6 +247,13 @@ public class MainActivity extends AppCompatActivity {
} else { } else {
navView.inflateMenu(R.menu.bottom_nav_menu); navView.inflateMenu(R.menu.bottom_nav_menu);
} }
peertubeInformation = new PeertubeInformation();
peertubeInformation.setCategories(new LinkedHashMap<>());
peertubeInformation.setLanguages(new LinkedHashMap<>());
peertubeInformation.setLicences(new LinkedHashMap<>());
peertubeInformation.setPrivacies(new LinkedHashMap<>());
peertubeInformation.setPlaylistPrivacies(new LinkedHashMap<>());
peertubeInformation.setTranslations(new LinkedHashMap<>());
startInForeground(); startInForeground();
if (BuildConfig.google_restriction && BuildConfig.full_instances) { if (BuildConfig.google_restriction && BuildConfig.full_instances) {

15
app/src/main/java/app/fedilab/fedilabtube/PeertubeActivity.java
View File

@ -48,6 +48,7 @@ import android.view.inputmethod.InputMethodManager;
import android.widget.ArrayAdapter; import android.widget.ArrayAdapter;
import android.widget.EditText; import android.widget.EditText;
import android.widget.FrameLayout; import android.widget.FrameLayout;
import android.widget.ImageButton;
import android.widget.ImageView; import android.widget.ImageView;
import android.widget.LinearLayout; import android.widget.LinearLayout;
import android.widget.TextView; import android.widget.TextView;
@ -307,7 +308,7 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
playVideo(); playVideo();
} }
registBroadcastReceiver(); registBroadcastReceiver();
if( autoFullscreen) { if( autoFullscreen && autoPlay) {
openFullscreenDialog(); openFullscreenDialog();
setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE); setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
} }
@ -407,7 +408,7 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
player.setPlayWhenReady(autoPlay); player.setPlayWhenReady(autoPlay);
captions = null; captions = null;
} }
if( autoFullscreen) { if( autoFullscreen && autoPlay) {
fullscreen = FullScreenMediaController.fullscreen.ON; fullscreen = FullScreenMediaController.fullscreen.ON;
setFullscreen(FullScreenMediaController.fullscreen.ON); setFullscreen(FullScreenMediaController.fullscreen.ON);
fullScreenMode = true; fullScreenMode = true;
@ -1194,6 +1195,14 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
} }
}); });
ImageButton playButton = controlView.findViewById(R.id.exo_play);
playButton.setOnClickListener(v->{
if(autoFullscreen && !fullScreenMode) {
openFullscreenDialog();
setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE);
}
player.setPlayWhenReady(true);
});
} }
private void initResolution() { private void initResolution() {
@ -1237,7 +1246,7 @@ public class PeertubeActivity extends AppCompatActivity implements CommentListAd
} }
public void manageVIewPlaylists(APIResponse apiResponse) { public void manageVIewPlaylists(APIResponse apiResponse) {
if (apiResponse.getError() != null) { if (apiResponse == null || apiResponse.getError() != null || playlists == null || peertube == null) {
return; return;
} }
if (apiResponse.getPlaylists() != null && apiResponse.getPlaylists().size() > 0) { if (apiResponse.getPlaylists() != null && apiResponse.getPlaylists().size() > 0) {

18
app/src/main/java/app/fedilab/fedilabtube/services/RetrieveInfoService.java
View File

@ -127,14 +127,16 @@ public class RetrieveInfoService extends Service implements NetworkStateReceiver
@Override @Override
public void run() { public void run() {
EmojiHelper.fillMapEmoji(getApplicationContext()); EmojiHelper.fillMapEmoji(getApplicationContext());
peertubeInformation = new PeertubeInformation(); if( peertubeInformation == null || peertubeInformation.getCategories().size() == 0) {
peertubeInformation.setCategories(new LinkedHashMap<>()); peertubeInformation = new PeertubeInformation();
peertubeInformation.setLanguages(new LinkedHashMap<>()); peertubeInformation.setCategories(new LinkedHashMap<>());
peertubeInformation.setLicences(new LinkedHashMap<>()); peertubeInformation.setLanguages(new LinkedHashMap<>());
peertubeInformation.setPrivacies(new LinkedHashMap<>()); peertubeInformation.setLicences(new LinkedHashMap<>());
peertubeInformation.setPlaylistPrivacies(new LinkedHashMap<>()); peertubeInformation.setPrivacies(new LinkedHashMap<>());
peertubeInformation.setTranslations(new LinkedHashMap<>()); peertubeInformation.setPlaylistPrivacies(new LinkedHashMap<>());
peertubeInformation = new RetrofitPeertubeAPI(RetrieveInfoService.this).getPeertubeInformation(); peertubeInformation.setTranslations(new LinkedHashMap<>());
peertubeInformation = new RetrofitPeertubeAPI(RetrieveInfoService.this).getPeertubeInformation();
}
stopForeground(true); stopForeground(true);
} }
}; };