diff --git a/app/src/main/java/com/example/mear/activities/MainActivity.kt b/app/src/main/java/com/example/mear/activities/MainActivity.kt index c267e02..fab8bc8 100644 --- a/app/src/main/java/com/example/mear/activities/MainActivity.kt +++ b/app/src/main/java/com/example/mear/activities/MainActivity.kt @@ -84,6 +84,7 @@ class MainActivity : AppCompatActivity() { TrackElapsing.max = 100 try { + window.statusBarColor = resources.getColor(R.color.track_seek) initializeShuffle() initializeServices() initializeClickListeners() diff --git a/app/src/main/java/com/example/mear/activities/SettingsActivity.kt b/app/src/main/java/com/example/mear/activities/SettingsActivity.kt index e632e91..edf2471 100644 --- a/app/src/main/java/com/example/mear/activities/SettingsActivity.kt +++ b/app/src/main/java/com/example/mear/activities/SettingsActivity.kt @@ -26,10 +26,15 @@ class SettingsActivity : AppCompatActivity() { updateLibrary() } + initialize() supportActionBar?.setDisplayHomeAsUpEnabled(true) } + private fun initialize() { + window.statusBarColor = resources.getColor(R.color.track_seek) + } + private fun loadSongPaths(): MutableList { val demoPath = Environment.getExternalStorageDirectory() val mfPaths = MusicFiles(demoPath) diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 3d2b99f..fd0c707 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -5,6 +5,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/color_background" tools:context=".activities.MainActivity"> @@ -30,6 +31,7 @@ android:id="@+id/SettingsLink" android:layout_width="0dp" android:layout_height="match_parent" + android:background="@color/color_background" android:layout_weight="1" android:contentDescription="@string/settings_link" app:srcCompat="@android:drawable/ic_menu_manage" /> diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index 93d4f49..50f235f 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -4,6 +4,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/color_background" tools:context=".activities.SettingsActivity"> diff --git a/app/src/main/res/layout/content_settings.xml b/app/src/main/res/layout/content_settings.xml index b6fc6ae..7d193f9 100644 --- a/app/src/main/res/layout/content_settings.xml +++ b/app/src/main/res/layout/content_settings.xml @@ -25,6 +25,7 @@ android:layout_weight="1" android:lineSpacingExtra="12sp" android:text="@string/update_library" + android:textColor="@color/track_details" android:textSize="18sp" android:textStyle="bold" /> diff --git a/app/src/main/res/layout/fragment_play_controls.xml b/app/src/main/res/layout/fragment_play_controls.xml index 49c0e4a..ec416f3 100644 --- a/app/src/main/res/layout/fragment_play_controls.xml +++ b/app/src/main/res/layout/fragment_play_controls.xml @@ -11,8 +11,8 @@ android:layout_height="66dp" android:layout_marginStart="8dp" android:layout_marginBottom="8dp" - android:background="@android:drawable/screen_background_light_transparent" - android:tint="@color/colorPrimaryDark" + android:background="@color/color_background" + android:tint="@color/track_details" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" app:srcCompat="@android:drawable/ic_media_previous" /> @@ -24,7 +24,7 @@ android:layout_marginStart="96dp" android:layout_marginEnd="8dp" android:layout_marginBottom="8dp" - android:background="@android:drawable/screen_background_light_transparent" + android:background="@color/color_background" android:tint="@color/color_player_not_initialized" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/NextTrack" @@ -38,8 +38,8 @@ android:layout_height="66dp" android:layout_marginEnd="8dp" android:layout_marginBottom="8dp" - android:background="@android:drawable/screen_background_light_transparent" - android:tint="@color/colorPrimaryDark" + android:background="@color/color_background" + android:tint="@color/track_details" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:srcCompat="@android:drawable/ic_media_next" /> diff --git a/app/src/main/res/layout/fragment_track_details.xml b/app/src/main/res/layout/fragment_track_details.xml index 43ae24b..f79eccd 100644 --- a/app/src/main/res/layout/fragment_track_details.xml +++ b/app/src/main/res/layout/fragment_track_details.xml @@ -12,6 +12,7 @@ android:layout_marginTop="388dp" android:layout_marginEnd="8dp" android:text="TextView" + android:textColor="@color/track_details" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.498" app:layout_constraintStart_toStartOf="parent" @@ -25,6 +26,7 @@ android:layout_marginTop="4dp" android:layout_marginEnd="8dp" android:text="TextView" + android:textColor="@color/track_details" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.498" app:layout_constraintStart_toStartOf="parent" @@ -39,6 +41,7 @@ android:layout_marginEnd="8dp" android:layout_marginBottom="240dp" android:text="TextView" + android:textColor="@color/track_details" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.498" diff --git a/app/src/main/res/layout/fragment_track_elapsing.xml b/app/src/main/res/layout/fragment_track_elapsing.xml index 626da83..eba77e6 100644 --- a/app/src/main/res/layout/fragment_track_elapsing.xml +++ b/app/src/main/res/layout/fragment_track_elapsing.xml @@ -12,6 +12,8 @@ android:layout_marginTop="8dp" android:layout_marginEnd="8dp" android:layout_marginBottom="8dp" + android:backgroundTint="@color/track_details" + android:thumbTint="@color/track_seek" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/TrackDuration" app:layout_constraintStart_toEndOf="@+id/CurrentPosition" @@ -26,6 +28,7 @@ android:layout_marginBottom="84dp" android:text="@string/track_start" android:textAlignment="viewStart" + android:textColor="@color/track_details" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintStart_toStartOf="parent" /> @@ -37,6 +40,7 @@ android:layout_marginBottom="84dp" android:text="@string/track_end" android:textAlignment="textEnd" + android:textColor="@color/track_details" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" /> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_track_flow.xml b/app/src/main/res/layout/fragment_track_flow.xml index c3f3eec..fe60951 100644 --- a/app/src/main/res/layout/fragment_track_flow.xml +++ b/app/src/main/res/layout/fragment_track_flow.xml @@ -11,7 +11,9 @@ android:layout_marginTop="8dp" android:layout_marginEnd="4dp" android:layout_marginBottom="8dp" + android:background="#00000000" android:text="@string/shuffle_off" + android:textColor="@color/track_details" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toStartOf="@+id/RepeatTrack" app:layout_constraintTop_toTopOf="parent" @@ -24,7 +26,9 @@ android:layout_marginTop="8dp" android:layout_marginEnd="4dp" android:layout_marginBottom="8dp" + android:background="#00000000" android:text="@string/repeat_off" + android:textColor="@color/track_details" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index db2444a..22417c9 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,7 +1,12 @@ + #262626 #6A6A6A #00574B - #ED0057 + #8c8cd9 #585858 + + + #ffffff + #333399