diff --git a/app/src/main/java/fr/forum_thalie/tsumugi/MainActivity.kt b/app/src/main/java/fr/forum_thalie/tsumugi/MainActivity.kt index e1b2369..511364c 100644 --- a/app/src/main/java/fr/forum_thalie/tsumugi/MainActivity.kt +++ b/app/src/main/java/fr/forum_thalie/tsumugi/MainActivity.kt @@ -122,11 +122,12 @@ class MainActivity : BaseActivity() { RadioAlarm.instance.setNextAlarm(c = this) // this checks the preferenceStore before actually setting an alarm, don't worry. // initialize programmatically accessible colors - colorBlue = ResourcesCompat.getColor(resources, R.color.bluereq, null) + colorBlue = ResourcesCompat.getColor(resources, R.color.rblue, null) colorWhited = ResourcesCompat.getColor(resources, R.color.whited, null) colorGreenList = (ResourcesCompat.getColorStateList(resources, R.color.button_green, null)) colorRedList = (ResourcesCompat.getColorStateList(resources, R.color.button_red, null)) colorGreenListCompat = (ResourcesCompat.getColorStateList(resources, R.color.button_green_compat, null)) + colorAccent = (ResourcesCompat.getColor(resources, R.color.colorAccent, null)) // Post-UI Launch if (PlayerStore.instance.isInitialized) diff --git a/app/src/main/java/fr/forum_thalie/tsumugi/Values.kt b/app/src/main/java/fr/forum_thalie/tsumugi/Values.kt index 912869d..85e49de 100644 --- a/app/src/main/java/fr/forum_thalie/tsumugi/Values.kt +++ b/app/src/main/java/fr/forum_thalie/tsumugi/Values.kt @@ -21,8 +21,8 @@ val weekdaysSundayFirst = ArrayList().apply { var colorBlue: Int = 0 var colorWhited: Int = 0 +var colorAccent : Int = 0 var colorGreenList: ColorStateList? = ColorStateList.valueOf(0) var colorRedList: ColorStateList? = ColorStateList.valueOf(0) var colorGreenListCompat : ColorStateList? = ColorStateList.valueOf(0) - lateinit var preferenceStore : SharedPreferences \ No newline at end of file diff --git a/app/src/main/java/fr/forum_thalie/tsumugi/ui/programme/ProgrammeAdapter.kt b/app/src/main/java/fr/forum_thalie/tsumugi/ui/programme/ProgrammeAdapter.kt index 8fddfdd..6742d87 100644 --- a/app/src/main/java/fr/forum_thalie/tsumugi/ui/programme/ProgrammeAdapter.kt +++ b/app/src/main/java/fr/forum_thalie/tsumugi/ui/programme/ProgrammeAdapter.kt @@ -1,17 +1,16 @@ package fr.forum_thalie.tsumugi.ui.programme import android.annotation.SuppressLint +import android.util.TypedValue import android.view.LayoutInflater import android.view.ViewGroup import android.widget.TextView import androidx.constraintlayout.widget.ConstraintLayout +import androidx.core.widget.TextViewCompat import androidx.recyclerview.widget.RecyclerView -import fr.forum_thalie.tsumugi.R -import fr.forum_thalie.tsumugi.colorBlue +import fr.forum_thalie.tsumugi.* import fr.forum_thalie.tsumugi.planning.Planning import fr.forum_thalie.tsumugi.planning.Programme -import fr.forum_thalie.tsumugi.weekdays -import fr.forum_thalie.tsumugi.weekdaysSundayFirst import java.util.* import kotlin.collections.ArrayList @@ -46,12 +45,17 @@ class ProgrammeAdapter(private val dataSet: ArrayList, private val da programmeName.text = dataSet[position].title programmeEnd.text = dataSet[position].end() - if (dataSet[position].isCurrent() && (Calendar.getInstance(Planning.instance.timeZone).get(Calendar.DAY_OF_WEEK) - 1 == weekdaysSundayFirst.indexOf(day))) - { - programmeStart.setTextColor(colorBlue) - programmeEnd.setTextColor(colorBlue) - programmeName.setTextColor(colorBlue) - } + val color = if (dataSet[position].isCurrent() && (Calendar.getInstance(Planning.instance.timeZone).get(Calendar.DAY_OF_WEEK) - 1 == weekdaysSundayFirst.indexOf(day))) + colorAccent + else + colorWhited + + programmeStart.setTextColor(color) + programmeEnd.setTextColor(color) + programmeName.setTextColor(color) + + //TextViewCompat.setAutoSizeTextTypeUniformWithConfiguration( + // programmeName,8, 16, 2, TypedValue.COMPLEX_UNIT_SP) } // Return the size of your dataset (invoked by the layout manager) diff --git a/app/src/main/res/layout/programme_view.xml b/app/src/main/res/layout/programme_view.xml index 5719834..34dab2b 100644 --- a/app/src/main/res/layout/programme_view.xml +++ b/app/src/main/res/layout/programme_view.xml @@ -4,49 +4,75 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:orientation="vertical" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="8dp" - android:layout_marginStart="12dp" - android:layout_marginEnd="12dp"> + android:layout_marginStart="8dp" + android:layout_marginEnd="8dp" + app:layout_constraintVertical_chainStyle="packed" + > - + android:layout_marginTop="8dp" + android:layout_marginBottom="8dp" + app:layout_constraintVertical_chainStyle="packed" + > + + + + + + - - + + diff --git a/app/src/main/res/layout/song_view.xml b/app/src/main/res/layout/song_view.xml index 71d41e1..4d29656 100644 --- a/app/src/main/res/layout/song_view.xml +++ b/app/src/main/res/layout/song_view.xml @@ -5,8 +5,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_marginTop="8dp" - android:layout_marginStart="12dp" - android:layout_marginEnd="12dp" + android:layout_marginStart="8dp" + android:layout_marginEnd="8dp" > #999999 #999999 #7F7F7F - #3A7AAF + #4FC3F7 #527a8e #527a8e #5cb85c @@ -19,12 +19,12 @@ #a15755 #585858 - #DF4C3A - #3A7AAF + #f58b01 + #4FC3F7 #585858 - #3A7AAF - #DF4C3A + #4FC3F7 + #f58b01 #FFFFFF #000000