mirror/matomocamp-companion-android
1
0
Fork 0
mirror of https://github.com/MatomoCamp/matomocamp-companion-android.git synced 2024-09-19 16:13:46 +02:00
Code Releases Activity

use track colors

Browse source
This commit is contained in:
Lukas Winkler 2022-10-25 21:30:00 +02:00
parent 2609cb150f
commit c7ff845de9
Signed by: lukas
GPG key ID: 54DE4D798D244853
9 changed files with 69 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/src/main/java/org/matomocamp/companion/activities/EventDetailsActivity.kt
View file

@ -108,14 +108,13 @@ class EventDetailsActivity : AppCompatActivity(R.layout.single_event), CreateNfc
title = event.track.name
}
val trackType = event.track.type
if (isLightTheme) {
window.statusBarColorCompat = ContextCompat.getColor(this, trackType.statusBarColorResId)
val trackAppBarColor = ContextCompat.getColorStateList(this, trackType.appBarColorResId)!!
window.statusBarColorCompat = ContextCompat.getColor(this, event.track.statusBarColorResId)
val trackAppBarColor = ContextCompat.getColorStateList(this, event.track.appBarColorResId)!!
setTaskColorPrimary(trackAppBarColor.defaultColor)
findViewById<View>(R.id.appbar).tintBackground(trackAppBarColor)
} else {
val trackTextColor = ContextCompat.getColorStateList(this, trackType.textColorResId)!!
val trackTextColor = ContextCompat.getColorStateList(this, event.track.textColorResId)!!
toolbar.setTitleTextColor(trackTextColor)
}

6
app/src/main/java/org/matomocamp/companion/activities/TrackScheduleActivity.kt
View file

@ -59,12 +59,12 @@ class TrackScheduleActivity : AppCompatActivity(R.layout.track_schedule), Create
title = "$track, $day"
val trackType = track.type
if (isLightTheme) {
window.statusBarColorCompat = ContextCompat.getColor(this, trackType.statusBarColorResId)
val trackAppBarColor = ContextCompat.getColorStateList(this, trackType.appBarColorResId)!!
window.statusBarColorCompat = ContextCompat.getColor(this, track.statusBarColorResId)
val trackAppBarColor = ContextCompat.getColorStateList(this, track.appBarColorResId)!!
setTaskColorPrimary(trackAppBarColor.defaultColor)
toolbar.tintBackground(trackAppBarColor)
} else {
val trackTextColor = ContextCompat.getColorStateList(this, trackType.textColorResId)!!
val trackTextColor = ContextCompat.getColorStateList(this, track.textColorResId)!!
toolbar.setTitleTextColor(trackTextColor)
}

4
app/src/main/java/org/matomocamp/companion/activities/TrackScheduleEventActivity.kt
View file

@ -83,8 +83,8 @@ class TrackScheduleEventActivity : AppCompatActivity(R.layout.track_schedule_eve
title = "$track, $day"
val trackType = track.type
if (isLightTheme) {
window.statusBarColorCompat = ContextCompat.getColor(this, trackType.statusBarColorResId)
val trackAppBarColor = ContextCompat.getColorStateList(this, trackType.appBarColorResId)!!
window.statusBarColorCompat = ContextCompat.getColor(this, track.statusBarColorResId)
val trackAppBarColor = ContextCompat.getColorStateList(this, track.appBarColorResId)!!
setTaskColorPrimary(trackAppBarColor.defaultColor)
findViewById<View>(R.id.appbar).tintBackground(trackAppBarColor)
} else {

2
app/src/main/java/org/matomocamp/companion/adapters/BookmarksAdapter.kt
View file

@ -133,7 +133,7 @@ class BookmarksAdapter(context: Context, private val multiChoiceHelper: MultiCho
persons.isGone = personsSummary.isNullOrEmpty()
val track = event.track
trackName.text = track.name
trackName.setTextColor(ContextCompat.getColorStateList(context, track.type.textColorResId))
trackName.setTextColor(ContextCompat.getColorStateList(context, track.textColorResId))
trackName.contentDescription = context.getString(R.string.track_content_description, track.name)
}

2
app/src/main/java/org/matomocamp/companion/adapters/EventsAdapter.kt
View file

@ -114,7 +114,7 @@ class EventsAdapter constructor(context: Context, private val showDay: Boolean =
persons.isGone = personsSummary.isNullOrEmpty()
val track = event.track
trackName.text = track.name
trackName.setTextColor(ContextCompat.getColorStateList(context, track.type.textColorResId))
trackName.setTextColor(ContextCompat.getColorStateList(context, track.textColorResId))
trackName.contentDescription = context.getString(R.string.track_content_description, track.name)
}

2
app/src/main/java/org/matomocamp/companion/fragments/EventDetailsFragment.kt
View file

@ -339,7 +339,7 @@ class EventDetailsFragment : Fragment(R.layout.fragment_event_details) {
try {
val context = v.context
CustomTabsIntent.Builder()
.configureToolbarColors(context, event.track.type.appBarColorResId)
.configureToolbarColors(context, event.track.appBarColorResId)
.setShowTitle(true)
.setStartAnimations(context, R.anim.slide_in_right, R.anim.slide_out_left)
.setExitAnimations(context, R.anim.slide_in_left, R.anim.slide_out_right)

2
app/src/main/java/org/matomocamp/companion/fragments/TracksListFragment.kt
View file

@ -104,7 +104,7 @@ class TracksListFragment : Fragment(R.layout.recyclerview) {
this.track = track
name.text = track.name
type.setText(track.type.nameResId)
type.setTextColor(ContextCompat.getColorStateList(type.context, track.type.textColorResId))
type.setTextColor(ContextCompat.getColorStateList(type.context, track.textColorResId))
}
override fun onClick(view: View) {

34
app/src/main/java/org/matomocamp/companion/model/Track.kt
View file

@ -57,4 +57,38 @@ data class Track(
companion object {
const val TABLE_NAME = "tracks"
}
val appBarColorResId: Int
get() = when (name) {
"Privacy" -> R.color.track_privacy
"System administration" -> R.color.track_system_administration
"Integration" -> R.color.track_integration
"Digital Analytics" -> R.color.track_digital_analytics
"Using Matomo" -> R.color.track_using_matomo
"Use Cases" -> R.color.track_use_cases
"MatomoCamp" -> R.color.track_matomocamp
"Plugin Development" -> R.color.track_plugin_development
"Contributing" -> R.color.track_contributing
"Other Free Analytics" -> R.color.track_other_free_analytics
else -> R.color.track_other
}
val textColorResId: Int
get() = appBarColorResId
val statusBarColorResId: Int
get() = when (name) {
"Privacy" -> R.color.track_privacy_dark
"System administration" -> R.color.track_system_administration_dark
"Integration" -> R.color.track_integration_dark
"Digital Analytics" -> R.color.track_digital_analytics_dark
"Using Matomo" -> R.color.track_using_matomo_dark
"Use Cases" -> R.color.track_use_cases_dark
"MatomoCamp" -> R.color.track_matomocamp_dark
"Plugin Development" -> R.color.track_plugin_development_dark
"Contributing" -> R.color.track_contributing_dark
"Other Free Analytics" -> R.color.track_other_free_analytics_dark
else -> R.color.track_other_dark
}
}

23
app/src/main/res/values/colors.xml
View file

@ -16,6 +16,29 @@
<color name="schedule_time_ongoing_background">@color/color_secondary</color>
<color name="light_emphasis_background">#0d000000</color>
<color name="track_privacy">#F38334</color>
<color name="track_privacy_dark">#C3621D</color>
<color name="track_system_administration">#95C748</color>
<color name="track_system_administration_dark">#6F9C2B</color>
<color name="track_integration">#8E0F0F</color>
<color name="track_integration_dark">#700404</color>
<color name="track_digital_analytics">#3152A0</color>
<color name="track_digital_analytics_dark">#2f4892</color>
<color name="track_using_matomo">#35BFC0</color>
<color name="track_using_matomo_dark">#229B9C</color>
<color name="track_other_free_analytics">#673AB7</color>
<color name="track_other_free_analytics_dark">#4D2693</color>
<color name="track_use_cases">#1B5E20</color>
<color name="track_use_cases_dark">#0E3E12</color>
<color name="track_matomocamp">#404040</color>
<color name="track_matomocamp_dark">#000000</color>
<color name="track_plugin_development">#F00DE7</color>
<color name="track_plugin_development_dark">#B309AD</color>
<color name="track_contributing">#BF360C</color>
<color name="track_contributing_dark">#A62E0A</color>
<color name="track_other">#757575</color>
<color name="track_other_dark">#494949</color>
<!-- Track types -->
<color name="track_type_keynote">#a91991</color>
<color name="track_type_keynote_dark">#760063</color>