diff --git a/app/build.gradle b/app/build.gradle index cca1a94..f6c7477 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -10,8 +10,8 @@ android { applicationId "app.fedilab.fedilabtube" minSdkVersion 21 targetSdkVersion 30 - versionCode 3 - versionName "1.0.2" + versionCode 4 + versionName "1.0.3" multiDexEnabled true testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } diff --git a/app/src/main/java/app/fedilab/fedilabtube/drawer/PlaylistAdapter.java b/app/src/main/java/app/fedilab/fedilabtube/drawer/PlaylistAdapter.java index f734837..d27157c 100644 --- a/app/src/main/java/app/fedilab/fedilabtube/drawer/PlaylistAdapter.java +++ b/app/src/main/java/app/fedilab/fedilabtube/drawer/PlaylistAdapter.java @@ -32,12 +32,10 @@ import android.widget.TextView; import androidx.appcompat.widget.PopupMenu; import com.bumptech.glide.Glide; -import com.google.android.material.floatingactionbutton.FloatingActionButton; import java.util.List; import java.util.Map; -import app.fedilab.fedilabtube.PeertubeEditUploadActivity; import app.fedilab.fedilabtube.PlaylistsActivity; import app.fedilab.fedilabtube.R; import app.fedilab.fedilabtube.asynctasks.ManagePlaylistsAsyncTask; @@ -96,11 +94,16 @@ public class PlaylistAdapter extends BaseAdapter implements OnPlaylistActionInte } Glide.with(context) - .load("https://"+playlist.getOwnerAccount().getHost()+playlist.getThumbnailPath()) + .load("https://" + playlist.getOwnerAccount().getHost() + playlist.getThumbnailPath()) .into(holder.preview_playlist); holder.preview_title.setText(playlist.getDisplayName()); - holder.preview_description.setText(playlist.getDescription()); + if (playlist.getDescription() != null && playlist.getDescription().trim().compareTo("null") != 0 && playlist.getDescription().length() > 0) { + holder.preview_description.setText(playlist.getDescription()); + holder.preview_description.setVisibility(View.VISIBLE); + } else { + holder.preview_description.setVisibility(View.GONE); + } Map.Entry privacyM = playlist.getPrivacy().entrySet().iterator().next(); holder.preview_visibility.setText(privacyM.getValue()); @@ -135,9 +138,9 @@ public class PlaylistAdapter extends BaseAdapter implements OnPlaylistActionInte .setNegativeButton(R.string.no, (dialog, which) -> dialog.dismiss()) .show(); break; - case R.id.action_edit: + /*case R.id.action_edit: - break; + break;*/ } return true; }); diff --git a/app/src/main/res/drawable/ic_baseline_more_vert_24.xml b/app/src/main/res/drawable/ic_baseline_more_vert_24.xml index 34b93ec..14ff51e 100644 --- a/app/src/main/res/drawable/ic_baseline_more_vert_24.xml +++ b/app/src/main/res/drawable/ic_baseline_more_vert_24.xml @@ -1,10 +1,10 @@ - + android:viewportHeight="24"> + diff --git a/app/src/main/res/layout/drawer_playlist.xml b/app/src/main/res/layout/drawer_playlist.xml index 5c6bc37..b7d2e74 100644 --- a/app/src/main/res/layout/drawer_playlist.xml +++ b/app/src/main/res/layout/drawer_playlist.xml @@ -23,34 +23,35 @@ android:layout_height="wrap_content" android:divider="?android:dividerHorizontal" android:orientation="vertical" - android:paddingTop="5dp" android:showDividers="end"> + android:layout_height="wrap_content" + android:layout_marginTop="5dp" + android:layout_marginBottom="5dp"> + + app:layout_constraintTop_toTopOf="parent" /> + + + + app:layout_constraintStart_toStartOf="@+id/preview_title" + app:layout_constraintTop_toBottomOf="@+id/preview_visibility" /> + + diff --git a/fastlane/metadata/android/en-US/changelogs/4.txt b/fastlane/metadata/android/en-US/changelogs/4.txt new file mode 100644 index 0000000..80c0356 --- /dev/null +++ b/fastlane/metadata/android/en-US/changelogs/4.txt @@ -0,0 +1,9 @@ +Nouveautés : +- Modifier la vignette des vidéos +- Mettre des comptes en sourdine +- Refonte de la présentation des chaînes et des listes de lecture +- Refonte de l’affichage du compte +- Historique des vidéos regardées +- Possibilité de changer le mode pour les vidéos +- Possibilité de créer/supprimer une chaîne. +- Abonnements affichés dans des vignettes avec possibilité de filtrer les vidéos.