mirror of
https://github.com/antebudimir/tempus.git
synced 2025-12-31 17:43:32 +00:00
Code cleanup
This commit is contained in:
parent
86279819ee
commit
2f5e81fdef
5 changed files with 10 additions and 9 deletions
2
.idea/misc.xml
generated
2
.idea/misc.xml
generated
|
|
@ -114,7 +114,7 @@
|
||||||
<entry key="app/src/main/res/layout/item_placeholder_year.xml" value="0.3229166666666667" />
|
<entry key="app/src/main/res/layout/item_placeholder_year.xml" value="0.3229166666666667" />
|
||||||
<entry key="app/src/main/res/layout/item_player_now_playing_song.xml" value="0.3229166666666667" />
|
<entry key="app/src/main/res/layout/item_player_now_playing_song.xml" value="0.3229166666666667" />
|
||||||
<entry key="app/src/main/res/layout/item_player_queue_song.xml" value="0.1" />
|
<entry key="app/src/main/res/layout/item_player_queue_song.xml" value="0.1" />
|
||||||
<entry key="app/src/main/res/layout/player_body_bottom_sheet.xml" value="0.1" />
|
<entry key="app/src/main/res/layout/player_body_bottom_sheet.xml" value="0.528125" />
|
||||||
<entry key="app/src/main/res/layout/player_body_new_bottom_sheet.xml" value="0.528125" />
|
<entry key="app/src/main/res/layout/player_body_new_bottom_sheet.xml" value="0.528125" />
|
||||||
<entry key="app/src/main/res/layout/player_header_bottom_sheet.xml" value="0.3229166666666667" />
|
<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" />
|
||||||
|
|
|
||||||
|
|
@ -159,7 +159,7 @@ public class MainActivity extends BaseActivity {
|
||||||
PlayerBottomSheetFragment playerBottomSheetFragment = (PlayerBottomSheetFragment) getSupportFragmentManager().findFragmentByTag("PlayerBottomSheet");
|
PlayerBottomSheetFragment playerBottomSheetFragment = (PlayerBottomSheetFragment) getSupportFragmentManager().findFragmentByTag("PlayerBottomSheet");
|
||||||
if (playerBottomSheetFragment != null) {
|
if (playerBottomSheetFragment != null) {
|
||||||
playerBottomSheetFragment.scrollOnTop();
|
playerBottomSheetFragment.scrollOnTop();
|
||||||
playerBottomSheetFragment.setPlayerCommandViewVisibility(false);
|
// playerBottomSheetFragment.setPlayerCommandViewVisibility(false);
|
||||||
}
|
}
|
||||||
break;
|
break;
|
||||||
case BottomSheetBehavior.STATE_DRAGGING:
|
case BottomSheetBehavior.STATE_DRAGGING:
|
||||||
|
|
|
||||||
|
|
@ -300,6 +300,7 @@ public class PlayerBottomSheetFragment extends Fragment implements MusicServiceE
|
||||||
|
|
||||||
protected void updatePlayPauseState() {
|
protected void updatePlayPauseState() {
|
||||||
headerBind.playerHeaderButton.setChecked(!MusicPlayerRemote.isPlaying());
|
headerBind.playerHeaderButton.setChecked(!MusicPlayerRemote.isPlaying());
|
||||||
|
bodyBind.playerBigPlayPauseButton.setChecked(!MusicPlayerRemote.isPlaying());
|
||||||
}
|
}
|
||||||
|
|
||||||
private void setUpMusicControllers() {
|
private void setUpMusicControllers() {
|
||||||
|
|
|
||||||
|
|
@ -7,6 +7,7 @@
|
||||||
style="@style/LyricsTextView"
|
style="@style/LyricsTextView"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
|
android:paddingTop="16dp"
|
||||||
android:paddingStart="24dp"
|
android:paddingStart="24dp"
|
||||||
android:paddingEnd="24dp"/>
|
android:paddingEnd="24dp"/>
|
||||||
</androidx.core.widget.NestedScrollView>
|
</androidx.core.widget.NestedScrollView>
|
||||||
|
|
@ -186,7 +186,6 @@
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:backgroundTint="@color/colorPrimary"
|
android:backgroundTint="@color/colorPrimary"
|
||||||
android:visibility="gone"
|
|
||||||
app:cardElevation="0dp"
|
app:cardElevation="0dp"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
|
|
@ -204,22 +203,22 @@
|
||||||
android:layout_marginEnd="24dp"
|
android:layout_marginEnd="24dp"
|
||||||
android:background="?attr/selectableItemBackgroundBorderless"
|
android:background="?attr/selectableItemBackgroundBorderless"
|
||||||
android:scaleType="fitCenter"
|
android:scaleType="fitCenter"
|
||||||
app:layout_constraintBottom_toBottomOf="parent"
|
|
||||||
app:layout_constraintEnd_toStartOf="@+id/player_big_play_pause_button"
|
app:layout_constraintEnd_toStartOf="@+id/player_big_play_pause_button"
|
||||||
app:layout_constraintTop_toTopOf="parent"
|
app:layout_constraintTop_toTopOf="@+id/player_big_play_pause_button"
|
||||||
|
app:layout_constraintBottom_toBottomOf="@+id/player_big_play_pause_button"
|
||||||
app:srcCompat="@drawable/ic_skip_previous" />
|
app:srcCompat="@drawable/ic_skip_previous" />
|
||||||
|
|
||||||
<ToggleButton
|
<ToggleButton
|
||||||
android:id="@+id/player_big_play_pause_button"
|
android:id="@+id/player_big_play_pause_button"
|
||||||
android:layout_width="48dp"
|
android:layout_width="48dp"
|
||||||
android:layout_height="48dp"
|
android:layout_height="48dp"
|
||||||
|
android:layout_marginTop="4dp"
|
||||||
android:background="@drawable/button_play_pause_selector"
|
android:background="@drawable/button_play_pause_selector"
|
||||||
android:checked="true"
|
android:checked="true"
|
||||||
android:foreground="?android:attr/selectableItemBackgroundBorderless"
|
android:foreground="?android:attr/selectableItemBackgroundBorderless"
|
||||||
android:text=""
|
android:text=""
|
||||||
android:textOff=""
|
android:textOff=""
|
||||||
android:textOn=""
|
android:textOn=""
|
||||||
app:layout_constraintBottom_toBottomOf="parent"
|
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toTopOf="parent" />
|
app:layout_constraintTop_toTopOf="parent" />
|
||||||
|
|
@ -231,17 +230,17 @@
|
||||||
android:layout_marginStart="24dp"
|
android:layout_marginStart="24dp"
|
||||||
android:background="?attr/selectableItemBackgroundBorderless"
|
android:background="?attr/selectableItemBackgroundBorderless"
|
||||||
android:scaleType="fitCenter"
|
android:scaleType="fitCenter"
|
||||||
app:layout_constraintBottom_toBottomOf="parent"
|
|
||||||
app:layout_constraintStart_toEndOf="@+id/player_big_play_pause_button"
|
app:layout_constraintStart_toEndOf="@+id/player_big_play_pause_button"
|
||||||
app:layout_constraintTop_toTopOf="parent"
|
app:layout_constraintTop_toTopOf="@+id/player_big_play_pause_button"
|
||||||
|
app:layout_constraintBottom_toBottomOf="@+id/player_big_play_pause_button"
|
||||||
app:srcCompat="@drawable/ic_skip_next" />
|
app:srcCompat="@drawable/ic_skip_next" />
|
||||||
|
|
||||||
<View
|
<View
|
||||||
android:id="@+id/player_divider_bottom"
|
android:id="@+id/player_divider_bottom"
|
||||||
style="@style/Divider"
|
style="@style/Divider"
|
||||||
android:layout_marginStart="18dp"
|
android:layout_marginStart="18dp"
|
||||||
android:layout_marginTop="12dp"
|
|
||||||
android:layout_marginEnd="18dp"
|
android:layout_marginEnd="18dp"
|
||||||
|
android:layout_marginTop="12dp"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toBottomOf="@+id/player_big_play_pause_button" />
|
app:layout_constraintTop_toBottomOf="@+id/player_big_play_pause_button" />
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue