mirror of
https://github.com/vitorpamplona/amethyst.git
synced 2025-06-29 23:10:39 +02:00
Updating coil
This commit is contained in:
@ -247,7 +247,7 @@ dependencies {
|
|||||||
playImplementation 'com.google.mlkit:translate:17.0.2'
|
playImplementation 'com.google.mlkit:translate:17.0.2'
|
||||||
|
|
||||||
// PushNotifications
|
// PushNotifications
|
||||||
playImplementation platform('com.google.firebase:firebase-bom:32.4.1')
|
playImplementation platform('com.google.firebase:firebase-bom:32.6.0')
|
||||||
playImplementation 'com.google.firebase:firebase-messaging-ktx'
|
playImplementation 'com.google.firebase:firebase-messaging-ktx'
|
||||||
|
|
||||||
//PushNotifications(FDroid)
|
//PushNotifications(FDroid)
|
||||||
|
@ -336,10 +336,14 @@ class UserReactionsViewModel(val account: Account) : ViewModel() {
|
|||||||
val chartEntryModelProducer1 = ChartEntryModelProducer(listOfCountCurves).getModel()
|
val chartEntryModelProducer1 = ChartEntryModelProducer(listOfCountCurves).getModel()
|
||||||
val chartEntryModelProducer2 = ChartEntryModelProducer(listOfValueCurves).getModel()
|
val chartEntryModelProducer2 = ChartEntryModelProducer(listOfValueCurves).getModel()
|
||||||
|
|
||||||
this.shouldShowDecimalsInAxis = shouldShowDecimals(chartEntryModelProducer2.minY, chartEntryModelProducer2.maxY)
|
chartEntryModelProducer1?.let { chart1 ->
|
||||||
|
chartEntryModelProducer2?.let { chart2 ->
|
||||||
|
this.shouldShowDecimalsInAxis = shouldShowDecimals(chart2.minY, chart2.maxY)
|
||||||
|
|
||||||
this._axisLabels.emit(listOf(6, 5, 4, 3, 2, 1, 0).map { displayAxisFormatter.format(now.minusSeconds(day * it)) })
|
this._axisLabels.emit(listOf(6, 5, 4, 3, 2, 1, 0).map { displayAxisFormatter.format(now.minusSeconds(day * it)) })
|
||||||
this._chartModel.emit(chartEntryModelProducer1.plus(chartEntryModelProducer2))
|
this._chartModel.emit(chart1.plus(chart2))
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// determine if the min max are so close that they render to the same number.
|
// determine if the min max are so close that they render to the same number.
|
||||||
|
@ -8,8 +8,8 @@ buildscript {
|
|||||||
nav_version = '2.7.5'
|
nav_version = '2.7.5'
|
||||||
room_version = "2.4.3"
|
room_version = "2.4.3"
|
||||||
accompanist_version = '0.30.1'
|
accompanist_version = '0.30.1'
|
||||||
coil_version = '2.4.0'
|
coil_version = '2.5.0'
|
||||||
vico_version = '1.12.0'
|
vico_version = '1.13.0'
|
||||||
media3_version = '1.2.0'
|
media3_version = '1.2.0'
|
||||||
core_ktx_version = '1.12.0'
|
core_ktx_version = '1.12.0'
|
||||||
material3_version = '1.1.2'
|
material3_version = '1.1.2'
|
||||||
|
Reference in New Issue
Block a user