Applied the default color scheme #5

This commit is contained in:
amazing-username
2019-03-12 21:29:39 -04:00
committed by amazing-username
parent 4663de6bb5
commit 748a28827b
10 changed files with 34 additions and 8 deletions
@@ -84,6 +84,7 @@ class MainActivity : AppCompatActivity() {
TrackElapsing.max = 100 TrackElapsing.max = 100
try { try {
window.statusBarColor = resources.getColor(R.color.track_seek)
initializeShuffle() initializeShuffle()
initializeServices() initializeServices()
initializeClickListeners() initializeClickListeners()
@@ -26,10 +26,15 @@ class SettingsActivity : AppCompatActivity() {
updateLibrary() updateLibrary()
} }
initialize()
supportActionBar?.setDisplayHomeAsUpEnabled(true) supportActionBar?.setDisplayHomeAsUpEnabled(true)
} }
private fun initialize() {
window.statusBarColor = resources.getColor(R.color.track_seek)
}
private fun loadSongPaths(): MutableList<String> { private fun loadSongPaths(): MutableList<String> {
val demoPath = Environment.getExternalStorageDirectory() val demoPath = Environment.getExternalStorageDirectory()
val mfPaths = MusicFiles(demoPath) val mfPaths = MusicFiles(demoPath)
+3 -1
View File
@@ -5,6 +5,7 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/color_background"
tools:context=".activities.MainActivity"> tools:context=".activities.MainActivity">
<android.support.design.widget.AppBarLayout <android.support.design.widget.AppBarLayout
@@ -22,7 +23,7 @@
android:id="@+id/toolbar" android:id="@+id/toolbar"
android:layout_width="324dp" android:layout_width="324dp"
android:layout_height="?attr/actionBarSize" android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary" android:background="@color/color_background"
android:baselineAligned="false" android:baselineAligned="false"
app:popupTheme="@style/AppTheme.PopupOverlay" /> app:popupTheme="@style/AppTheme.PopupOverlay" />
@@ -30,6 +31,7 @@
android:id="@+id/SettingsLink" android:id="@+id/SettingsLink"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/color_background"
android:layout_weight="1" android:layout_weight="1"
android:contentDescription="@string/settings_link" android:contentDescription="@string/settings_link"
app:srcCompat="@android:drawable/ic_menu_manage" /> app:srcCompat="@android:drawable/ic_menu_manage" />
@@ -4,6 +4,7 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="@color/color_background"
tools:context=".activities.SettingsActivity"> tools:context=".activities.SettingsActivity">
<android.support.design.widget.AppBarLayout <android.support.design.widget.AppBarLayout
@@ -15,7 +16,7 @@
android:id="@+id/toolbar" android:id="@+id/toolbar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize" android:layout_height="?attr/actionBarSize"
android:background="?attr/colorPrimary" android:background="@color/color_background"
app:popupTheme="@style/AppTheme.PopupOverlay" /> app:popupTheme="@style/AppTheme.PopupOverlay" />
</android.support.design.widget.AppBarLayout> </android.support.design.widget.AppBarLayout>
@@ -25,6 +25,7 @@
android:layout_weight="1" android:layout_weight="1"
android:lineSpacingExtra="12sp" android:lineSpacingExtra="12sp"
android:text="@string/update_library" android:text="@string/update_library"
android:textColor="@color/track_details"
android:textSize="18sp" android:textSize="18sp"
android:textStyle="bold" /> android:textStyle="bold" />
@@ -11,8 +11,8 @@
android:layout_height="66dp" android:layout_height="66dp"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:background="@android:drawable/screen_background_light_transparent" android:background="@color/color_background"
android:tint="@color/colorPrimaryDark" android:tint="@color/track_details"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:srcCompat="@android:drawable/ic_media_previous" /> app:srcCompat="@android:drawable/ic_media_previous" />
@@ -24,7 +24,7 @@
android:layout_marginStart="96dp" android:layout_marginStart="96dp"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:layout_marginBottom="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" android:tint="@color/color_player_not_initialized"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/NextTrack" app:layout_constraintEnd_toStartOf="@+id/NextTrack"
@@ -38,8 +38,8 @@
android:layout_height="66dp" android:layout_height="66dp"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:background="@android:drawable/screen_background_light_transparent" android:background="@color/color_background"
android:tint="@color/colorPrimaryDark" android:tint="@color/track_details"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:srcCompat="@android:drawable/ic_media_next" /> app:srcCompat="@android:drawable/ic_media_next" />
@@ -12,6 +12,7 @@
android:layout_marginTop="388dp" android:layout_marginTop="388dp"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:text="TextView" android:text="TextView"
android:textColor="@color/track_details"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.498" app:layout_constraintHorizontal_bias="0.498"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
@@ -25,6 +26,7 @@
android:layout_marginTop="4dp" android:layout_marginTop="4dp"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:text="TextView" android:text="TextView"
android:textColor="@color/track_details"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.498" app:layout_constraintHorizontal_bias="0.498"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
@@ -39,6 +41,7 @@
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:layout_marginBottom="240dp" android:layout_marginBottom="240dp"
android:text="TextView" android:text="TextView"
android:textColor="@color/track_details"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.498" app:layout_constraintHorizontal_bias="0.498"
@@ -12,6 +12,8 @@
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:backgroundTint="@color/track_details"
android:thumbTint="@color/track_seek"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/TrackDuration" app:layout_constraintEnd_toStartOf="@+id/TrackDuration"
app:layout_constraintStart_toEndOf="@+id/CurrentPosition" app:layout_constraintStart_toEndOf="@+id/CurrentPosition"
@@ -26,6 +28,7 @@
android:layout_marginBottom="84dp" android:layout_marginBottom="84dp"
android:text="@string/track_start" android:text="@string/track_start"
android:textAlignment="viewStart" android:textAlignment="viewStart"
android:textColor="@color/track_details"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent" /> app:layout_constraintStart_toStartOf="parent" />
@@ -37,6 +40,7 @@
android:layout_marginBottom="84dp" android:layout_marginBottom="84dp"
android:text="@string/track_end" android:text="@string/track_end"
android:textAlignment="textEnd" android:textAlignment="textEnd"
android:textColor="@color/track_details"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" /> app:layout_constraintEnd_toEndOf="parent" />
</android.support.constraint.ConstraintLayout> </android.support.constraint.ConstraintLayout>
@@ -11,7 +11,9 @@
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_marginEnd="4dp" android:layout_marginEnd="4dp"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:background="#00000000"
android:text="@string/shuffle_off" android:text="@string/shuffle_off"
android:textColor="@color/track_details"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/RepeatTrack" app:layout_constraintEnd_toStartOf="@+id/RepeatTrack"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
@@ -24,7 +26,9 @@
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_marginEnd="4dp" android:layout_marginEnd="4dp"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:background="#00000000"
android:text="@string/repeat_off" android:text="@string/repeat_off"
android:textColor="@color/track_details"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
+6 -1
View File
@@ -1,7 +1,12 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<color name="color_background">#262626</color>
<color name="colorPrimary">#6A6A6A</color> <color name="colorPrimary">#6A6A6A</color>
<color name="colorPrimaryDark">#00574B</color> <color name="colorPrimaryDark">#00574B</color>
<color name="colorAccent">#ED0057</color> <color name="colorAccent">#8c8cd9</color>
<color name="color_player_not_initialized">#585858</color> <color name="color_player_not_initialized">#585858</color>
<!-- Play Controls -->
<color name="track_details">#ffffff</color>
<color name="track_seek">#333399</color>
</resources> </resources>