From ffe7d0908838caaf0c288a80ed2dda87998902b3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=A4rkl?= Date: Wed, 11 Mar 2020 19:38:14 +0100 Subject: [PATCH] Fix Android Warnings --- .../metallic/chiaki/common/SerializedSettings.kt | 2 +- .../com/metallic/chiaki/main/MainActivity.kt | 5 ++--- .../manualconsole/EditManualConsoleActivity.kt | 5 ++--- .../com/metallic/chiaki/regist/RegistActivity.kt | 4 ++-- .../chiaki/regist/RegistExecuteActivity.kt | 5 ++--- .../metallic/chiaki/settings/SettingsFragment.kt | 16 ++++++---------- .../chiaki/settings/SettingsLogsFragment.kt | 7 +++---- .../settings/SettingsRegisteredHostsFragment.kt | 5 ++--- .../com/metallic/chiaki/stream/StreamActivity.kt | 4 ++-- 9 files changed, 22 insertions(+), 31 deletions(-) diff --git a/android/app/src/main/java/com/metallic/chiaki/common/SerializedSettings.kt b/android/app/src/main/java/com/metallic/chiaki/common/SerializedSettings.kt index 174e620..234f5db 100644 --- a/android/app/src/main/java/com/metallic/chiaki/common/SerializedSettings.kt +++ b/android/app/src/main/java/com/metallic/chiaki/common/SerializedSettings.kt @@ -150,7 +150,7 @@ fun exportAndShareAllSettings(activity: Activity): Disposable file } .observeOn(AndroidSchedulers.mainThread()) - .subscribe { it: File -> + .subscribe { _ -> val uri = FileProvider.getUriForFile(activity, fileProviderAuthority, file) Intent(Intent.ACTION_SEND).also { it.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION) diff --git a/android/app/src/main/java/com/metallic/chiaki/main/MainActivity.kt b/android/app/src/main/java/com/metallic/chiaki/main/MainActivity.kt index 9e85b91..07c06eb 100644 --- a/android/app/src/main/java/com/metallic/chiaki/main/MainActivity.kt +++ b/android/app/src/main/java/com/metallic/chiaki/main/MainActivity.kt @@ -25,7 +25,7 @@ import android.view.MenuItem import android.view.View import androidx.appcompat.app.AppCompatActivity import androidx.lifecycle.Observer -import androidx.lifecycle.ViewModelProviders +import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.LinearLayoutManager import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.metallic.chiaki.R @@ -67,8 +67,7 @@ class MainActivity : AppCompatActivity() registerButton.setOnClickListener { showRegistration() } registerLabelButton.setOnClickListener { showRegistration() } - viewModel = ViewModelProviders - .of(this, viewModelFactory { MainViewModel(getDatabase(this), Preferences(this)) }) + viewModel = ViewModelProvider(this, viewModelFactory { MainViewModel(getDatabase(this), Preferences(this)) }) .get(MainViewModel::class.java) val recyclerViewAdapter = DisplayHostRecyclerViewAdapter(this::hostTriggered, this::wakeupHost, this::editHost, this::deleteHost) diff --git a/android/app/src/main/java/com/metallic/chiaki/manualconsole/EditManualConsoleActivity.kt b/android/app/src/main/java/com/metallic/chiaki/manualconsole/EditManualConsoleActivity.kt index 01ed245..c200781 100644 --- a/android/app/src/main/java/com/metallic/chiaki/manualconsole/EditManualConsoleActivity.kt +++ b/android/app/src/main/java/com/metallic/chiaki/manualconsole/EditManualConsoleActivity.kt @@ -25,7 +25,7 @@ import android.widget.AdapterView import android.widget.ArrayAdapter import androidx.appcompat.app.AppCompatActivity import androidx.lifecycle.Observer -import androidx.lifecycle.ViewModelProviders +import androidx.lifecycle.ViewModelProvider import com.metallic.chiaki.R import com.metallic.chiaki.common.RegisteredHost import com.metallic.chiaki.common.ext.RevealActivity @@ -57,8 +57,7 @@ class EditManualConsoleActivity: AppCompatActivity(), RevealActivity setContentView(R.layout.activity_edit_manual) handleReveal() - viewModel = ViewModelProviders - .of(this, viewModelFactory { + viewModel = ViewModelProvider(this, viewModelFactory { EditManualConsoleViewModel(getDatabase(this), if(intent.hasExtra(EXTRA_MANUAL_HOST_ID)) intent.getLongExtra(EXTRA_MANUAL_HOST_ID, 0) diff --git a/android/app/src/main/java/com/metallic/chiaki/regist/RegistActivity.kt b/android/app/src/main/java/com/metallic/chiaki/regist/RegistActivity.kt index aa8b650..04e29f0 100644 --- a/android/app/src/main/java/com/metallic/chiaki/regist/RegistActivity.kt +++ b/android/app/src/main/java/com/metallic/chiaki/regist/RegistActivity.kt @@ -24,7 +24,7 @@ import android.view.View import android.view.Window import androidx.appcompat.app.AppCompatActivity import androidx.lifecycle.Observer -import androidx.lifecycle.ViewModelProviders +import androidx.lifecycle.ViewModelProvider import com.metallic.chiaki.R import com.metallic.chiaki.common.ext.RevealActivity import com.metallic.chiaki.lib.RegistInfo @@ -56,7 +56,7 @@ class RegistActivity: AppCompatActivity(), RevealActivity setContentView(R.layout.activity_regist) handleReveal() - viewModel = ViewModelProviders.of(this).get(RegistViewModel::class.java) + viewModel = ViewModelProvider(this).get(RegistViewModel::class.java) hostEditText.setText(intent.getStringExtra(EXTRA_HOST) ?: "255.255.255.255") broadcastCheckBox.isChecked = intent.getBooleanExtra(EXTRA_BROADCAST, true) diff --git a/android/app/src/main/java/com/metallic/chiaki/regist/RegistExecuteActivity.kt b/android/app/src/main/java/com/metallic/chiaki/regist/RegistExecuteActivity.kt index d339578..c56a86c 100644 --- a/android/app/src/main/java/com/metallic/chiaki/regist/RegistExecuteActivity.kt +++ b/android/app/src/main/java/com/metallic/chiaki/regist/RegistExecuteActivity.kt @@ -25,7 +25,7 @@ import android.view.View import androidx.appcompat.app.AlertDialog import androidx.appcompat.app.AppCompatActivity import androidx.lifecycle.Observer -import androidx.lifecycle.ViewModelProviders +import androidx.lifecycle.ViewModelProvider import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.metallic.chiaki.R import com.metallic.chiaki.common.MacAddress @@ -52,8 +52,7 @@ class RegistExecuteActivity: AppCompatActivity() super.onCreate(savedInstanceState) setContentView(R.layout.activity_regist_execute) - viewModel = ViewModelProviders - .of(this, viewModelFactory { RegistExecuteViewModel(getDatabase(this)) }) + viewModel = ViewModelProvider(this, viewModelFactory { RegistExecuteViewModel(getDatabase(this)) }) .get(RegistExecuteViewModel::class.java) logTextView.setHorizontallyScrolling(true) diff --git a/android/app/src/main/java/com/metallic/chiaki/settings/SettingsFragment.kt b/android/app/src/main/java/com/metallic/chiaki/settings/SettingsFragment.kt index ee2cf57..e541a61 100644 --- a/android/app/src/main/java/com/metallic/chiaki/settings/SettingsFragment.kt +++ b/android/app/src/main/java/com/metallic/chiaki/settings/SettingsFragment.kt @@ -18,24 +18,21 @@ package com.metallic.chiaki.settings import android.app.Activity -import android.content.ClipData import android.content.Intent import android.content.res.Resources import android.os.Bundle import android.text.InputType -import androidx.core.content.FileProvider import androidx.lifecycle.Observer -import androidx.lifecycle.ViewModelProviders +import androidx.lifecycle.ViewModelProvider import androidx.preference.* import com.metallic.chiaki.R -import com.metallic.chiaki.common.* -import com.metallic.chiaki.common.ext.toLiveData +import com.metallic.chiaki.common.Preferences +import com.metallic.chiaki.common.exportAndShareAllSettings import com.metallic.chiaki.common.ext.viewModelFactory -import io.reactivex.android.schedulers.AndroidSchedulers +import com.metallic.chiaki.common.getDatabase +import com.metallic.chiaki.common.importSettingsFromUri import io.reactivex.disposables.CompositeDisposable import io.reactivex.rxkotlin.addTo -import io.reactivex.schedulers.Schedulers -import java.io.File class DataStore(val preferences: Preferences): PreferenceDataStore() { @@ -96,8 +93,7 @@ class SettingsFragment: PreferenceFragmentCompat(), TitleFragment { val context = context ?: return - val viewModel = ViewModelProviders - .of(this, viewModelFactory { SettingsViewModel(getDatabase(context), Preferences(context)) }) + val viewModel = ViewModelProvider(this, viewModelFactory { SettingsViewModel(getDatabase(context), Preferences(context)) }) .get(SettingsViewModel::class.java) val preferences = viewModel.preferences diff --git a/android/app/src/main/java/com/metallic/chiaki/settings/SettingsLogsFragment.kt b/android/app/src/main/java/com/metallic/chiaki/settings/SettingsLogsFragment.kt index b1edbba..82c3a15 100644 --- a/android/app/src/main/java/com/metallic/chiaki/settings/SettingsLogsFragment.kt +++ b/android/app/src/main/java/com/metallic/chiaki/settings/SettingsLogsFragment.kt @@ -27,7 +27,7 @@ import android.view.ViewGroup import androidx.appcompat.app.AppCompatDialogFragment import androidx.core.content.FileProvider import androidx.lifecycle.Observer -import androidx.lifecycle.ViewModelProviders +import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.ItemTouchHelper import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView @@ -49,15 +49,14 @@ class SettingsLogsFragment: AppCompatDialogFragment(), TitleFragment { val context = context!! - viewModel = ViewModelProviders - .of(this, viewModelFactory { SettingsLogsViewModel(LogManager(context)) }) + viewModel = ViewModelProvider(this, viewModelFactory { SettingsLogsViewModel(LogManager(context)) }) .get(SettingsLogsViewModel::class.java) val adapter = SettingsLogsAdapter() logsRecyclerView.layoutManager = LinearLayoutManager(context) logsRecyclerView.adapter = adapter adapter.shareCallback = this::shareLogFile - viewModel.sessionLogs.observe(this, Observer { + viewModel.sessionLogs.observe(viewLifecycleOwner, Observer { adapter.logFiles = it emptyInfoGroup.visibility = if(it.isEmpty()) View.VISIBLE else View.GONE }) diff --git a/android/app/src/main/java/com/metallic/chiaki/settings/SettingsRegisteredHostsFragment.kt b/android/app/src/main/java/com/metallic/chiaki/settings/SettingsRegisteredHostsFragment.kt index 517f08e..946c3ea 100644 --- a/android/app/src/main/java/com/metallic/chiaki/settings/SettingsRegisteredHostsFragment.kt +++ b/android/app/src/main/java/com/metallic/chiaki/settings/SettingsRegisteredHostsFragment.kt @@ -26,7 +26,7 @@ import android.view.View import android.view.ViewGroup import androidx.appcompat.app.AppCompatDialogFragment import androidx.lifecycle.Observer -import androidx.lifecycle.ViewModelProviders +import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.ItemTouchHelper import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView @@ -47,8 +47,7 @@ class SettingsRegisteredHostsFragment: AppCompatDialogFragment(), TitleFragment override fun onViewCreated(view: View, savedInstanceState: Bundle?) { - viewModel = ViewModelProviders - .of(this, viewModelFactory { SettingsRegisteredHostsViewModel(getDatabase(context!!)) }) + viewModel = ViewModelProvider(this, viewModelFactory { SettingsRegisteredHostsViewModel(getDatabase(context!!)) }) .get(SettingsRegisteredHostsViewModel::class.java) val adapter = SettingsRegisteredHostsAdapter() diff --git a/android/app/src/main/java/com/metallic/chiaki/stream/StreamActivity.kt b/android/app/src/main/java/com/metallic/chiaki/stream/StreamActivity.kt index 40be5f9..a7913a4 100644 --- a/android/app/src/main/java/com/metallic/chiaki/stream/StreamActivity.kt +++ b/android/app/src/main/java/com/metallic/chiaki/stream/StreamActivity.kt @@ -72,7 +72,7 @@ class StreamActivity : AppCompatActivity(), View.OnSystemUiVisibilityChangeListe return } - viewModel = ViewModelProviders.of(this, viewModelFactory { + viewModel = ViewModelProvider(this, viewModelFactory { StreamViewModel(Preferences(this), LogManager(this), connectInfo) })[StreamViewModel::class.java] @@ -101,7 +101,7 @@ class StreamActivity : AppCompatActivity(), View.OnSystemUiVisibilityChangeListe showOverlay() } - displayModeToggle.addOnButtonCheckedListener {group, checkedId, _ -> + displayModeToggle.addOnButtonCheckedListener { _, checkedId, _ -> // following 'if' is a workaround until selectionRequired for MaterialButtonToggleGroup // comes out of alpha. // See https://stackoverflow.com/questions/56164004/required-single-selection-on-materialbuttontogglegroup