From dcd596907a172e071c5ae7f10b6bcd07abf6ca9b Mon Sep 17 00:00:00 2001 From: Harsh Shandilya Date: Wed, 16 Sep 2020 18:54:00 +0530 Subject: ui: resolve getColor deprecation in LogViewerActivity Signed-off-by: Harsh Shandilya --- .../wireguard/android/activity/LogViewerActivity.kt | 20 ++++++-------------- 1 file changed, 6 insertions(+), 14 deletions(-) (limited to 'ui') diff --git a/ui/src/main/java/com/wireguard/android/activity/LogViewerActivity.kt b/ui/src/main/java/com/wireguard/android/activity/LogViewerActivity.kt index 7ef9222c..da1618f3 100644 --- a/ui/src/main/java/com/wireguard/android/activity/LogViewerActivity.kt +++ b/ui/src/main/java/com/wireguard/android/activity/LogViewerActivity.kt @@ -26,6 +26,7 @@ import android.view.View import android.view.ViewGroup import androidx.appcompat.app.AppCompatActivity import androidx.core.app.ShareCompat +import androidx.core.content.res.ResourcesCompat import androidx.lifecycle.lifecycleScope import androidx.recyclerview.widget.DividerItemDecoration import androidx.recyclerview.widget.LinearLayoutManager @@ -71,20 +72,15 @@ class LogViewerActivity : AppCompatActivity() { yearFormatter.format(Date()) } - @Suppress("Deprecation") - private val defaultColor by lazy { resources.getColor(R.color.primary_text_color) } + private val defaultColor by lazy { ResourcesCompat.getColor(resources, R.color.primary_text_color, theme) } - @Suppress("Deprecation") - private val debugColor by lazy { resources.getColor(R.color.debug_tag_color) } + private val debugColor by lazy { ResourcesCompat.getColor(resources, R.color.debug_tag_color, theme) } - @Suppress("Deprecation") - private val errorColor by lazy { resources.getColor(R.color.error_tag_color) } + private val errorColor by lazy { ResourcesCompat.getColor(resources, R.color.error_tag_color, theme) } - @Suppress("Deprecation") - private val infoColor by lazy { resources.getColor(R.color.info_tag_color) } + private val infoColor by lazy { ResourcesCompat.getColor(resources, R.color.info_tag_color, theme) } - @Suppress("Deprecation") - private val warningColor by lazy { resources.getColor(R.color.warning_tag_color) } + private val warningColor by lazy { ResourcesCompat.getColor(resources, R.color.warning_tag_color, theme) } private var lastUri: Uri? = null @@ -131,10 +127,6 @@ class LogViewerActivity : AppCompatActivity() { } } - override fun onDestroy() { - super.onDestroy() - } - override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { if (requestCode == SHARE_ACTIVITY_REQUEST) { revokeLastUri() -- cgit v1.2.3