mirror of
https://git.sr.ht/~thestr4ng3r/chiaki
synced 2025-08-14 10:46:51 -07:00
Fix Android Warnings
This commit is contained in:
parent
ec2cad480c
commit
ffe7d09088
9 changed files with 22 additions and 31 deletions
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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)
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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
|
||||
})
|
||||
|
|
|
@ -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()
|
||||
|
|
|
@ -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
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue