Matrix/element-android-Github
1
0
Fork 0
mirror of https://github.com/vector-im/element-android.git synced 2024-11-16 02:05:06 +08:00
Code Issues Packages Projects Releases Wiki Activity

Color provider need to be aware of theme

Browse Source
This commit is contained in:
Valere 2019-05-21 14:10:19 +02:00
parent efcac6b3e4
commit a5a9fa3750
2 changed files with 21 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
matrix-sdk-android/src/main/java/im/vector/matrix/android/internal/session/room/EventRelationsAggregationUpdater.kt
View File

@ -1,3 +1,18 @@
/*
* Copyright 2019 New Vector Ltd
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*/
package im.vector.matrix.android.internal.session.room package im.vector.matrix.android.internal.session.room
import im.vector.matrix.android.api.auth.data.Credentials import im.vector.matrix.android.api.auth.data.Credentials
@ -13,7 +28,11 @@ import im.vector.matrix.android.internal.database.query.where
import io.realm.Realm import io.realm.Realm
import timber.log.Timber import timber.log.Timber
/**
* Acts as a listener of incoming messages in order to incrementally computes a summary of annotations.
* For reactions will build a EventAnnotationsSummaryEntity, ans for edits a EditAggregatedSummaryEntity.
* The summaries can then be extracted and added (as a decoration) to a TimelineEvent for final display.
*/
internal class EventRelationsAggregationUpdater(private val credentials: Credentials) { internal class EventRelationsAggregationUpdater(private val credentials: Credentials) {
fun update(realm: Realm, roomId: String, events: List<Event>?) { fun update(realm: Realm, roomId: String, events: List<Event>?) {
@ -79,7 +98,6 @@ internal class EventRelationsAggregationUpdater(private val credentials: Credent
} else { } else {
//ignore this event for the summary //ignore this event for the summary
Timber.v("###REPLACE ignoring event for summary, it's to old ${eventId}") Timber.v("###REPLACE ignoring event for summary, it's to old ${eventId}")
} }
} }

7
vector/src/main/java/im/vector/riotredesign/core/di/AppModule.kt
View File

@ -19,7 +19,6 @@ package im.vector.riotredesign.core.di
import android.content.Context import android.content.Context
import android.content.Context.MODE_PRIVATE import android.content.Context.MODE_PRIVATE
import im.vector.matrix.android.api.Matrix import im.vector.matrix.android.api.Matrix
import im.vector.riotredesign.core.resources.ColorProvider
import im.vector.riotredesign.core.resources.LocaleProvider import im.vector.riotredesign.core.resources.LocaleProvider
import im.vector.riotredesign.core.resources.StringProvider import im.vector.riotredesign.core.resources.StringProvider
import im.vector.riotredesign.features.home.group.SelectedGroupStore import im.vector.riotredesign.features.home.group.SelectedGroupStore
@ -40,11 +39,7 @@ class AppModule(private val context: Context) {
single { single {
StringProvider(context.resources) StringProvider(context.resources)
} }
single {
ColorProvider(context)
}
single { single {
context.getSharedPreferences("im.vector.riot", MODE_PRIVATE) context.getSharedPreferences("im.vector.riot", MODE_PRIVATE)
} }