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

Renaming and refactor

Browse source
This commit is contained in:
CappielloAntonio 2022-01-03 11:14:05 +01:00
parent 32ac75f4ee
commit 2e2fe8fa0e
5 changed files with 13 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

2
.idea/misc.xml generated
View file

@ -126,7 +126,7 @@
<entry key="app/src/main/res/layout/player_control_view.xml" value="0.3229166666666667" /> <entry key="app/src/main/res/layout/player_control_view.xml" value="0.3229166666666667" />
<entry key="app/src/main/res/layout/player_control_view_body.xml" value="0.3229166666666667" /> <entry key="app/src/main/res/layout/player_control_view_body.xml" value="0.3229166666666667" />
<entry key="app/src/main/res/layout/player_control_view_header.xml" value="0.3229166666666667" /> <entry key="app/src/main/res/layout/player_control_view_header.xml" value="0.3229166666666667" />
<entry key="app/src/main/res/layout/player_header_bottom_sheet.xml" value="0.1" /> <entry key="app/src/main/res/layout/player_header_bottom_sheet.xml" value="0.3229166666666667" />
<entry key="app/src/main/res/menu/bottom_nav_menu.xml" value="0.3229166666666667" /> <entry key="app/src/main/res/menu/bottom_nav_menu.xml" value="0.3229166666666667" />
<entry key="app/src/main/res/menu/login_page_menu.xml" value="0.3229166666666667" /> <entry key="app/src/main/res/menu/login_page_menu.xml" value="0.3229166666666667" />
<entry key="app/src/main/res/menu/main_page_menu.xml" value="0.3229166666666667" /> <entry key="app/src/main/res/menu/main_page_menu.xml" value="0.3229166666666667" />

23
app/src/main/java/com/cappielloantonio/play/ui/fragment/PlayerBottomSheetFragment.java
View file

@ -7,15 +7,9 @@ import android.util.Log;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
import android.widget.ImageButton;
import android.widget.ImageView;
import android.widget.ScrollView;
import android.widget.TextView;
import android.widget.ToggleButton;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.annotation.Nullable; import androidx.annotation.Nullable;
import androidx.cardview.widget.CardView;
import androidx.fragment.app.Fragment; import androidx.fragment.app.Fragment;
import androidx.lifecycle.ViewModelProvider; import androidx.lifecycle.ViewModelProvider;
import androidx.media3.common.MediaMetadata; import androidx.media3.common.MediaMetadata;
@ -23,32 +17,19 @@ import androidx.media3.common.Player;
import androidx.media3.session.MediaBrowser; import androidx.media3.session.MediaBrowser;
import androidx.media3.session.MediaController; import androidx.media3.session.MediaController;
import androidx.media3.session.SessionToken; import androidx.media3.session.SessionToken;
import androidx.media3.ui.PlayerControlView;
import androidx.navigation.fragment.NavHostFragment;
import androidx.recyclerview.widget.ItemTouchHelper;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import androidx.viewpager2.widget.ViewPager2; import androidx.viewpager2.widget.ViewPager2;
import com.bumptech.glide.load.resource.bitmap.RoundedCorners; import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
import com.cappielloantonio.play.R; import com.cappielloantonio.play.R;
import com.cappielloantonio.play.adapter.PlayerBodyAdapter; import com.cappielloantonio.play.ui.fragment.pager.PlayerControllerVerticalPager;
import com.cappielloantonio.play.adapter.PlayerNowPlayingSongAdapter;
import com.cappielloantonio.play.adapter.PlayerSongQueueAdapter;
import com.cappielloantonio.play.databinding.FragmentPlayerBottomSheetBinding; import com.cappielloantonio.play.databinding.FragmentPlayerBottomSheetBinding;
import com.cappielloantonio.play.glide.CustomGlideRequest; import com.cappielloantonio.play.glide.CustomGlideRequest;
import com.cappielloantonio.play.service.MediaManager;
import com.cappielloantonio.play.service.MediaService; import com.cappielloantonio.play.service.MediaService;
import com.cappielloantonio.play.ui.activity.MainActivity;
import com.cappielloantonio.play.ui.dialog.RatingDialog;
import com.cappielloantonio.play.util.MappingUtil;
import com.cappielloantonio.play.util.MusicUtil; import com.cappielloantonio.play.util.MusicUtil;
import com.cappielloantonio.play.viewmodel.PlayerBottomSheetViewModel; import com.cappielloantonio.play.viewmodel.PlayerBottomSheetViewModel;
import com.google.common.util.concurrent.ListenableFuture; import com.google.common.util.concurrent.ListenableFuture;
import com.google.common.util.concurrent.MoreExecutors; import com.google.common.util.concurrent.MoreExecutors;
import java.util.Collections;
public class PlayerBottomSheetFragment extends Fragment { public class PlayerBottomSheetFragment extends Fragment {
private static final String TAG = "PlayerBottomSheetFragment"; private static final String TAG = "PlayerBottomSheetFragment";
@ -99,7 +80,7 @@ public class PlayerBottomSheetFragment extends Fragment {
private void initViewPager() { private void initViewPager() {
bind.playerBodyLayout.playerBodyBottomSheetViewPager.setOrientation(ViewPager2.ORIENTATION_VERTICAL); bind.playerBodyLayout.playerBodyBottomSheetViewPager.setOrientation(ViewPager2.ORIENTATION_VERTICAL);
bind.playerBodyLayout.playerBodyBottomSheetViewPager.setAdapter(new PlayerBodyAdapter(this)); bind.playerBodyLayout.playerBodyBottomSheetViewPager.setAdapter(new PlayerControllerVerticalPager(this));
} }
@SuppressLint("UnsafeOptInUsageError") @SuppressLint("UnsafeOptInUsageError")

4
app/src/main/java/com/cappielloantonio/play/ui/fragment/PlayerControllerFragment.java
View file

@ -24,7 +24,7 @@ import androidx.navigation.fragment.NavHostFragment;
import androidx.viewpager2.widget.ViewPager2; import androidx.viewpager2.widget.ViewPager2;
import com.cappielloantonio.play.R; import com.cappielloantonio.play.R;
import com.cappielloantonio.play.adapter.PlayerNowPlayingSongAdapter; import com.cappielloantonio.play.ui.fragment.pager.PlayerControllerHorizontalPager;
import com.cappielloantonio.play.databinding.InnerFragmentPlayerControllerBinding; import com.cappielloantonio.play.databinding.InnerFragmentPlayerControllerBinding;
import com.cappielloantonio.play.service.MediaService; import com.cappielloantonio.play.service.MediaService;
import com.cappielloantonio.play.ui.activity.MainActivity; import com.cappielloantonio.play.ui.activity.MainActivity;
@ -146,7 +146,7 @@ public class PlayerControllerFragment extends Fragment {
private void initCoverLyricsSlideView() { private void initCoverLyricsSlideView() {
playerSongCoverViewPager.setOrientation(ViewPager2.ORIENTATION_HORIZONTAL); playerSongCoverViewPager.setOrientation(ViewPager2.ORIENTATION_HORIZONTAL);
playerSongCoverViewPager.setAdapter(new PlayerNowPlayingSongAdapter(this)); playerSongCoverViewPager.setAdapter(new PlayerControllerHorizontalPager(this));
playerSongCoverViewPager.registerOnPageChangeCallback(new ViewPager2.OnPageChangeCallback() { playerSongCoverViewPager.registerOnPageChangeCallback(new ViewPager2.OnPageChangeCallback() {
@Override @Override

8
app/src/main/java/com/cappielloantonio/play/adapter/PlayerNowPlayingSongAdapter.java → app/src/main/java/com/cappielloantonio/play/ui/fragment/pager/PlayerControllerHorizontalPager.java
View file

@ -1,4 +1,4 @@
package com.cappielloantonio.play.adapter; package com.cappielloantonio.play.ui.fragment.pager;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.fragment.app.Fragment; import androidx.fragment.app.Fragment;
@ -7,10 +7,10 @@ import androidx.viewpager2.adapter.FragmentStateAdapter;
import com.cappielloantonio.play.ui.fragment.PlayerCoverFragment; import com.cappielloantonio.play.ui.fragment.PlayerCoverFragment;
import com.cappielloantonio.play.ui.fragment.PlayerLyricsFragment; import com.cappielloantonio.play.ui.fragment.PlayerLyricsFragment;
public class PlayerNowPlayingSongAdapter extends FragmentStateAdapter { public class PlayerControllerHorizontalPager extends FragmentStateAdapter {
private static final String TAG = "PlayerNowPlayingSongInfoAdapter"; private static final String TAG = "PlayerControllerHorizontalPager";
public PlayerNowPlayingSongAdapter(@NonNull Fragment fragment) { public PlayerControllerHorizontalPager(@NonNull Fragment fragment) {
super(fragment); super(fragment);
} }

8
app/src/main/java/com/cappielloantonio/play/adapter/PlayerBodyAdapter.java → app/src/main/java/com/cappielloantonio/play/ui/fragment/pager/PlayerControllerVerticalPager.java
View file

@ -1,4 +1,4 @@
package com.cappielloantonio.play.adapter; package com.cappielloantonio.play.ui.fragment.pager;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.fragment.app.Fragment; import androidx.fragment.app.Fragment;
@ -7,10 +7,10 @@ import androidx.viewpager2.adapter.FragmentStateAdapter;
import com.cappielloantonio.play.ui.fragment.PlayerControllerFragment; import com.cappielloantonio.play.ui.fragment.PlayerControllerFragment;
import com.cappielloantonio.play.ui.fragment.PlayerQueueFragment; import com.cappielloantonio.play.ui.fragment.PlayerQueueFragment;
public class PlayerBodyAdapter extends FragmentStateAdapter { public class PlayerControllerVerticalPager extends FragmentStateAdapter {
private static final String TAG = "PlayerNowPlayingSongInfoAdapter"; private static final String TAG = "PlayerControllerVerticalPager";
public PlayerBodyAdapter(@NonNull Fragment fragment) { public PlayerControllerVerticalPager(@NonNull Fragment fragment) {
super(fragment); super(fragment);
} }