filippodb/SchildiChat-android
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Let the app be compatible with android 16

Browse Source
This commit is contained in:
ganfra 2019-01-24 16:30:05 +01:00
parent 7c4ac7b53a
commit 946ae32cd8
4 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@ -15,8 +15,9 @@ android {
compileSdkVersion 28 compileSdkVersion 28
defaultConfig { defaultConfig {
applicationId "im.vector.riotredesign" applicationId "im.vector.riotredesign"
minSdkVersion 21 minSdkVersion 16
targetSdkVersion 28 targetSdkVersion 28
multiDexEnabled true
versionCode 1 versionCode 1
versionName "1.0" versionName "1.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
@ -42,6 +43,7 @@ dependencies {
implementation project(":matrix-sdk-android") implementation project(":matrix-sdk-android")
implementation project(":matrix-sdk-android-rx") implementation project(":matrix-sdk-android-rx")
implementation 'com.android.support:multidex:1.0.3'
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"

8
app/src/main/java/im/vector/riotredesign/Riot.kt
View File

@ -1,6 +1,8 @@
package im.vector.riotredesign package im.vector.riotredesign
import android.app.Application import android.app.Application
import android.content.Context
import androidx.multidex.MultiDex
import com.jakewharton.threetenabp.AndroidThreeTen import com.jakewharton.threetenabp.AndroidThreeTen
import im.vector.matrix.android.BuildConfig import im.vector.matrix.android.BuildConfig
import im.vector.riotredesign.core.di.AppModule import im.vector.riotredesign.core.di.AppModule
@ -8,6 +10,7 @@ import org.koin.log.EmptyLogger
import org.koin.standalone.StandAloneContext.startKoin import org.koin.standalone.StandAloneContext.startKoin
import timber.log.Timber import timber.log.Timber
class Riot : Application() { class Riot : Application() {
override fun onCreate() { override fun onCreate() {
@ -19,4 +22,9 @@ class Riot : Application() {
startKoin(listOf(AppModule(this).definition), logger = EmptyLogger()) startKoin(listOf(AppModule(this).definition), logger = EmptyLogger())
} }
override fun attachBaseContext(base: Context) {
super.attachBaseContext(base)
MultiDex.install(this)
}
} }

8
app/src/main/java/im/vector/riotredesign/features/home/room/list/RoomCategoryItem.kt
View File

@ -1,8 +1,9 @@
package im.vector.riotredesign.features.home.room.list package im.vector.riotredesign.features.home.room.list
import androidx.core.content.ContextCompat
import android.view.ViewGroup import android.view.ViewGroup
import android.widget.TextView import android.widget.TextView
import androidx.core.content.ContextCompat
import androidx.core.graphics.drawable.DrawableCompat
import im.vector.riotredesign.R import im.vector.riotredesign.R
import im.vector.riotredesign.core.epoxy.KotlinModel import im.vector.riotredesign.core.epoxy.KotlinModel
@ -21,8 +22,9 @@ data class RoomCategoryItem(
override fun bind() { override fun bind() {
val expandedArrowDrawableRes = if (isExpanded) R.drawable.ic_expand_more_white else R.drawable.ic_expand_less_white val expandedArrowDrawableRes = if (isExpanded) R.drawable.ic_expand_more_white else R.drawable.ic_expand_less_white
val expandedArrowDrawable = ContextCompat.getDrawable(rootView.context, expandedArrowDrawableRes) val expandedArrowDrawable = ContextCompat.getDrawable(rootView.context, expandedArrowDrawableRes)?.also {
expandedArrowDrawable?.setTint(tintColor) DrawableCompat.setTint(it, tintColor)
}
titleView.setCompoundDrawablesWithIntrinsicBounds(expandedArrowDrawable, null, null, null) titleView.setCompoundDrawablesWithIntrinsicBounds(expandedArrowDrawable, null, null, null)
titleView.text = title titleView.text = title
rootView.setOnClickListener { listener?.invoke() } rootView.setOnClickListener { listener?.invoke() }

2
matrix-sdk-android/build.gradle
View File

@ -24,7 +24,7 @@ android {
testOptions.unitTests.includeAndroidResources = true testOptions.unitTests.includeAndroidResources = true
defaultConfig { defaultConfig {
minSdkVersion 21 minSdkVersion 16
targetSdkVersion 28 targetSdkVersion 28
versionCode 1 versionCode 1
versionName "1.0" versionName "1.0"