mobile/davx5-ose
mobile/davx5-ose
1
0
Fork 0
mirror of https://github.com/bitfireAT/davx5-ose synced 2024-10-06 11:25:31 +00:00
Code Issues Packages Projects Releases Wiki Activity

Use AppCompatResources.getDrawable instead of context.getDrawable

Browse source
This commit is contained in:
Ricki Hirner 2019-01-29 23:00:41 +01:00
parent 15008c1a53
commit 2cf73f0f07
2 changed files with 4 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
app/src/main/java/at/bitfire/davdroid/App.kt
View file

@ -18,6 +18,7 @@ import android.net.Uri
import android.os.Build
import android.os.StrictMode
import androidx.appcompat.app.AppCompatDelegate
import androidx.appcompat.content.res.AppCompatResources
import at.bitfire.davdroid.log.Logger
import at.bitfire.davdroid.ui.NotificationUtils
import kotlin.concurrent.thread
@ -28,11 +29,7 @@ class App: Application() {
companion object {
fun getLauncherBitmap(context: Context): Bitmap? {
val drawableLogo = if (android.os.Build.VERSION.SDK_INT >= 21)
context.getDrawable(R.mipmap.ic_launcher)
else
@Suppress("deprecation")
context.resources.getDrawable(R.mipmap.ic_launcher)
val drawableLogo = AppCompatResources.getDrawable(context, R.mipmap.ic_launcher)
return if (drawableLogo is BitmapDrawable)
drawableLogo.bitmap
else

7
app/src/main/java/at/bitfire/davdroid/ui/AccountActivity.kt
View file

@ -25,6 +25,7 @@ import android.view.*
import android.widget.*
import androidx.appcompat.app.AlertDialog
import androidx.appcompat.app.AppCompatActivity
import androidx.appcompat.content.res.AppCompatResources
import androidx.appcompat.widget.Toolbar
import androidx.core.app.ActivityCompat
import androidx.core.content.ContextCompat
@ -85,11 +86,7 @@ class AccountActivity: AppCompatActivity(), Toolbar.OnMenuItemClickListener, Pop
title = account.name
setContentView(R.layout.activity_account)
val icMenu = if (Build.VERSION.SDK_INT >= 21)
getDrawable(R.drawable.ic_menu_light)
else
resources.getDrawable(R.drawable.ic_menu_light)
val icMenu = AppCompatResources.getDrawable(this, R.drawable.ic_menu_light)
// CardDAV toolbar
carddav_menu.overflowIcon = icMenu