wbrawner/Simple-Music-Player
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix the positioning of some main screen elements

Browse source
This commit is contained in:
tibbi 2022-07-02 21:36:56 +02:00
parent 4ccd65cba7
commit 672b576358
2 changed files with 15 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
app/src/main/kotlin/com/simplemobiletools/musicplayer/activities/MainActivity.kt
View file

@ -13,7 +13,6 @@ import android.os.Bundle
import android.view.Menu
import android.view.MenuItem
import android.widget.ImageView
import android.widget.RelativeLayout
import android.widget.TextView
import android.widget.Toast
import androidx.appcompat.widget.SearchView
@ -334,7 +333,6 @@ class MainActivity : SimpleActivity() {
current_track_bar.updateColors()
current_track_bar.updateCurrentTrack(MusicService.mCurrTrack)
current_track_bar.updateTrackState(MusicService.getIsPlaying())
checkSleepTimerPosition()
}
private fun createNewPlaylist() {
@ -496,7 +494,6 @@ class MainActivity : SimpleActivity() {
}
private fun startSleepTimer() {
checkSleepTimerPosition()
sleep_timer_holder.fadeIn()
sendIntent(START_SLEEP_TIMER)
}
@ -506,14 +503,6 @@ class MainActivity : SimpleActivity() {
sleep_timer_holder.fadeOut()
}
private fun checkSleepTimerPosition() {
if (current_track_bar.isVisible()) {
(sleep_timer_holder.layoutParams as RelativeLayout.LayoutParams).removeRule(RelativeLayout.ALIGN_PARENT_BOTTOM)
} else {
(sleep_timer_holder.layoutParams as RelativeLayout.LayoutParams).addRule(RelativeLayout.ALIGN_PARENT_BOTTOM)
}
}
private fun getAllFragments() =
arrayListOf(playlists_fragment_holder, folders_fragment_holder, artists_fragment_holder, albums_fragment_holder, tracks_fragment_holder)

25
app/src/main/res/layout/activity_main.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/main_holder"
@ -10,19 +10,19 @@
android:id="@+id/view_pager"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_above="@+id/current_track_bar" />
app:layout_constraintBottom_toTopOf="@+id/current_track_bar" />
<include
layout="@layout/view_current_track_bar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_above="@+id/main_tabs_holder" />
app:layout_constraintBottom_toTopOf="@+id/main_tabs_holder" />
<com.google.android.material.tabs.TabLayout
android:id="@+id/main_tabs_holder"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
app:layout_constraintBottom_toBottomOf="parent"
app:tabIndicator="@null"
app:tabMinWidth="150dp"
app:tabRippleColor="@null" />
@ -31,19 +31,24 @@
android:id="@+id/sleep_timer_holder"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_above="@+id/current_track_bar"
android:layout_alignParentEnd="true"
android:background="@color/default_background_color"
android:clickable="true"
android:visibility="gone">
android:visibility="gone"
app:layout_constraintBottom_toTopOf="@+id/current_track_bar"
app:layout_constraintEnd_toEndOf="parent"
tools:visibility="visible">
<include
layout="@layout/divider"
<ImageView
android:id="@+id/sleep_timer_divider_top"
android:layout_width="0dp"
android:layout_height="1px"
android:background="@color/divider_grey"
app:layout_constraintBottom_toTopOf="@+id/sleep_timer_stop"
app:layout_constraintEnd_toEndOf="@+id/sleep_timer_stop"
app:layout_constraintStart_toStartOf="@+id/sleep_timer_label" />
<ImageView
android:id="@+id/sleep_timer_divider_start"
android:layout_width="1px"
android:layout_height="0dp"
android:background="@color/divider_grey"
@ -88,4 +93,4 @@
app:layout_constraintEnd_toEndOf="parent" />
</androidx.constraintlayout.widget.ConstraintLayout>
</RelativeLayout>
</androidx.constraintlayout.widget.ConstraintLayout>