antebudimir/tempus
1
0
Fork 0
mirror of https://github.com/antebudimir/tempus.git synced 2025-12-31 09:33:33 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

feat:show rating on song view and allow setting/updating. #17 fixed a fr string error

Browse source
This commit is contained in:
eddyizm 2025-08-14 21:46:33 -07:00
parent c9e0581815
commit 5fa46cc49b
No known key found for this signature in database
GPG key ID: CF5F671829E8158A
5 changed files with 37 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/build.gradle
View file

@ -11,7 +11,7 @@ android {
targetSdk 35
versionCode 27
versionName '3.11.2'
versionName '3.11.3'
testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'

28
app/src/main/java/com/cappielloantonio/tempo/ui/fragment/PlayerControllerFragment.java
View file

@ -10,6 +10,8 @@ import android.widget.Button;
import android.widget.ImageButton;
import android.widget.TextView;
import android.widget.ToggleButton;
import android.widget.RatingBar;
import android.util.Log;
import androidx.annotation.NonNull;
import androidx.constraintlayout.widget.ConstraintLayout;
@ -36,6 +38,7 @@ import com.cappielloantonio.tempo.util.Constants;
import com.cappielloantonio.tempo.util.MusicUtil;
import com.cappielloantonio.tempo.util.Preferences;
import com.cappielloantonio.tempo.viewmodel.PlayerBottomSheetViewModel;
import com.cappielloantonio.tempo.viewmodel.RatingViewModel;
import com.google.android.material.chip.Chip;
import com.google.android.material.elevation.SurfaceColors;
import com.google.common.util.concurrent.ListenableFuture;
@ -53,6 +56,8 @@ public class PlayerControllerFragment extends Fragment {
private InnerFragmentPlayerControllerBinding bind;
private ViewPager2 playerMediaCoverViewPager;
private ToggleButton buttonFavorite;
private RatingViewModel ratingViewModel;
private RatingBar songRatingBar;
private TextView playerMediaTitleLabel;
private TextView playerArtistNameLabel;
private Button playbackSpeedButton;
@ -75,6 +80,7 @@ public class PlayerControllerFragment extends Fragment {
View view = bind.getRoot();
playerBottomSheetViewModel = new ViewModelProvider(requireActivity()).get(PlayerBottomSheetViewModel.class);
ratingViewModel = new ViewModelProvider(requireActivity()).get(RatingViewModel.class);
init();
initQuickActionView();
@ -117,6 +123,7 @@ public class PlayerControllerFragment extends Fragment {
playerQuickActionView = bind.getRoot().findViewById(R.id.player_quick_action_view);
playerOpenQueueButton = bind.getRoot().findViewById(R.id.player_open_queue_button);
playerTrackInfo = bind.getRoot().findViewById(R.id.player_info_track);
songRatingBar = bind.getRoot().findViewById(R.id.song_rating_bar);
}
private void initQuickActionView() {
@ -313,6 +320,7 @@ public class PlayerControllerFragment extends Fragment {
private void initMediaListenable() {
playerBottomSheetViewModel.getLiveMedia().observe(getViewLifecycleOwner(), media -> {
if (media != null) {
ratingViewModel.setSong(media);
buttonFavorite.setChecked(media.getStarred() != null);
buttonFavorite.setOnClickListener(v -> playerBottomSheetViewModel.setFavorite(requireContext(), media));
buttonFavorite.setOnLongClickListener(v -> {
@ -323,9 +331,29 @@ public class PlayerControllerFragment extends Fragment {
dialog.setArguments(bundle);
dialog.show(requireActivity().getSupportFragmentManager(), null);
return true;
});
Integer currentRating = media.getUserRating();
if (currentRating != null) {
songRatingBar.setRating(currentRating);
} else {
songRatingBar.setRating(0);
}
songRatingBar.setOnRatingBarChangeListener(new RatingBar.OnRatingBarChangeListener() {
@Override
public void onRatingChanged(RatingBar ratingBar, float rating, boolean fromUser) {
if (fromUser) {
ratingViewModel.rate((int) rating);
media.setUserRating((int) rating);
}
}
});
if (getActivity() != null) {
playerBottomSheetViewModel.refreshMediaInfo(requireActivity(), media);
}

6
app/src/main/java/com/cappielloantonio/tempo/viewmodel/PlayerBottomSheetViewModel.java
View file

@ -2,6 +2,7 @@ package com.cappielloantonio.tempo.viewmodel;
import android.app.Application;
import android.content.Context;
import android.util.Log;
import androidx.annotation.NonNull;
import androidx.annotation.OptIn;
@ -32,6 +33,8 @@ import com.cappielloantonio.tempo.util.NetworkUtil;
import com.cappielloantonio.tempo.util.OpenSubsonicExtensionsUtil;
import com.cappielloantonio.tempo.util.Preferences;
import org.jetbrains.annotations.Nullable;
import java.util.Collections;
import java.util.Date;
import java.util.List;
@ -103,7 +106,6 @@ public class PlayerBottomSheetViewModel extends AndroidViewModel {
favoriteRepository.starLater(media.getId(), null, null, false);
}
});
media.setStarred(null);
}
@ -131,7 +133,7 @@ public class PlayerBottomSheetViewModel extends AndroidViewModel {
}
}
public LiveData<String> getLiveLyrics() {
public LiveData<String> getLiveLyrics() {
return lyricsLiveData;
}

8
app/src/main/res/layout/inner_fragment_player_controller_layout.xml
View file

@ -108,12 +108,10 @@
android:id="@+id/rating_container"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="24dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="24dp"
android:orientation="horizontal"
android:gravity="center_vertical"
app:layout_constraintEnd_toStartOf="@+id/button_favorite"
android:gravity="center"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/player_artist_name_label">
@ -134,7 +132,7 @@
android:layout_marginStart="8dp"
android:textSize="12sp"
android:textColor="?attr/colorOnSurfaceVariant"
android:text="Not rated"/>
android:text=""/>
</LinearLayout>
<ToggleButton

2
app/src/main/res/values-fr/strings.xml
View file

@ -387,7 +387,7 @@
<string name="starred_sync_dialog_neutral_button">Continuer</string>
<string name="starred_sync_dialog_positive_button">Continuer et télécharger</string>
<string name="starred_sync_dialog_summary">Le téléchargement des titres favoris pourrer utiliser beaucoup de données.</string>
<string name="starred_sync_dialog_title">Synchroniser les titres favoris</string>Sync starred tracks</string>
<string name="starred_sync_dialog_title">Synchroniser les titres favoris</string>
<string name="streaming_cache_storage_dialog_sub_summary">Veuillez redémarrer l\'app pour appliquer les changements.</string>
<string name="streaming_cache_storage_dialog_summary">Modifier le chemin de stockage des fichiers mis en cache pourrait provoquer de tous les fichiers mis en cache précédemment.</string>
<string name="streaming_cache_storage_dialog_title">Sélectionner une option de stockage</string>