From 4a90bb2fc02483c8b0716b10a21240591bf1dd17 Mon Sep 17 00:00:00 2001 From: Kevin Hester Date: Sun, 21 Feb 2021 11:34:43 +0800 Subject: [PATCH] fix various lint warnings --- .../java/com/geeksville/mesh/MainActivity.kt | 2 +- .../com/geeksville/mesh/ui/MapFragment.kt | 3 +- .../geeksville/mesh/ui/SettingsFragment.kt | 2 +- .../{drawable => drawable-nodpi}/qrcode.png | Bin app/src/main/res/layout/debug_fragment.xml | 124 +++++++++--------- app/src/main/res/layout/map_view.xml | 2 +- app/src/main/res/layout/settings_fragment.xml | 3 +- app/src/main/res/values-de/strings.xml | 2 +- app/src/main/res/values-es/strings.xml | 2 +- app/src/main/res/values-fi/strings.xml | 2 +- app/src/main/res/values-ga/strings.xml | 2 +- app/src/main/res/values-ht/strings.xml | 2 +- app/src/main/res/values-it/strings.xml | 2 +- app/src/main/res/values-ja/strings.xml | 2 +- app/src/main/res/values-ko-rKR/strings.xml | 2 +- app/src/main/res/values-nl/strings.xml | 2 +- app/src/main/res/values-no/strings.xml | 2 +- app/src/main/res/values-pt/strings.xml | 2 +- app/src/main/res/values-ro/strings.xml | 2 +- app/src/main/res/values-ru/strings.xml | 2 +- app/src/main/res/values-sl/strings.xml | 2 +- app/src/main/res/values-sq/strings.xml | 2 +- app/src/main/res/values-sv/strings.xml | 2 +- app/src/main/res/values-tr/strings.xml | 2 +- app/src/main/res/values-zh/strings.xml | 2 +- app/src/main/res/values/strings.xml | 4 +- app/src/main/res/xml/device_filter.xml | 2 +- 27 files changed, 89 insertions(+), 89 deletions(-) rename app/src/main/res/{drawable => drawable-nodpi}/qrcode.png (100%) diff --git a/app/src/main/java/com/geeksville/mesh/MainActivity.kt b/app/src/main/java/com/geeksville/mesh/MainActivity.kt index 8fec49323..b79a26156 100644 --- a/app/src/main/java/com/geeksville/mesh/MainActivity.kt +++ b/app/src/main/java/com/geeksville/mesh/MainActivity.kt @@ -413,7 +413,7 @@ class MainActivity : AppCompatActivity(), Logging, // pager.offscreenPageLimit = 0 // Don't keep any offscreen pages around, because we want to make sure our bluetooth scanning stops TabLayoutMediator(binding.tabLayout, binding.pager) { tab, position -> // tab.text = tabInfos[position].text // I think it looks better with icons only - tab.icon = getDrawable(tabInfos[position].icon) + tab.icon = ContextCompat.getDrawable(this, tabInfos[position].icon) }.attach() model.isConnected.observe(this, Observer { connected -> diff --git a/app/src/main/java/com/geeksville/mesh/ui/MapFragment.kt b/app/src/main/java/com/geeksville/mesh/ui/MapFragment.kt index 486acbfc1..e4d6bd771 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/MapFragment.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/MapFragment.kt @@ -5,6 +5,7 @@ import android.os.Bundle import android.view.LayoutInflater import android.view.View import android.view.ViewGroup +import androidx.core.content.ContextCompat import androidx.fragment.app.activityViewModels import androidx.lifecycle.Observer import com.geeksville.android.GeeksvilleApplication @@ -157,7 +158,7 @@ class MapFragment : ScreenFragment("Map"), Logging { if (view != null) { // it might have gone away by now // val markerIcon = BitmapFactory.decodeResource(context.resources, R.drawable.ic_twotone_person_pin_24) val markerIcon = - requireActivity().getDrawable(R.drawable.ic_twotone_person_pin_24)!! + ContextCompat.getDrawable(requireActivity(), R.drawable.ic_twotone_person_pin_24)!! map.setStyle(Style.OUTDOORS) { style -> style.addSource(nodePositions) diff --git a/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt b/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt index 874c00af1..06eb73658 100644 --- a/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt +++ b/app/src/main/java/com/geeksville/mesh/ui/SettingsFragment.kt @@ -107,7 +107,7 @@ private fun requestBonding( class BTScanModel(app: Application) : AndroidViewModel(app), Logging { - private val context = getApplication().applicationContext + private val context: Context get() = getApplication().applicationContext init { debug("BTScanModel created") diff --git a/app/src/main/res/drawable/qrcode.png b/app/src/main/res/drawable-nodpi/qrcode.png similarity index 100% rename from app/src/main/res/drawable/qrcode.png rename to app/src/main/res/drawable-nodpi/qrcode.png diff --git a/app/src/main/res/layout/debug_fragment.xml b/app/src/main/res/layout/debug_fragment.xml index 9374ae282..954648759 100644 --- a/app/src/main/res/layout/debug_fragment.xml +++ b/app/src/main/res/layout/debug_fragment.xml @@ -1,63 +1,63 @@ - - - - - -