github/chiaki
1
0
Fork 0
mirror of https://git.sr.ht/~thestr4ng3r/chiaki synced 2025-08-19 21:13:12 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix Android Warnings

Browse source
This commit is contained in:
Florian Märkl 2020-03-11 19:38:14 +01:00
commit ffe7d09088
No known key found for this signature in database
GPG key ID: 125BC8A5A6A1E857
9 changed files with 22 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

2
android/app/src/main/java/com/metallic/chiaki/common/SerializedSettings.kt
View file

@ -150,7 +150,7 @@ fun exportAndShareAllSettings(activity: Activity): Disposable
file file
} }
.observeOn(AndroidSchedulers.mainThread()) .observeOn(AndroidSchedulers.mainThread())
.subscribe { it: File -> .subscribe { _ ->
val uri = FileProvider.getUriForFile(activity, fileProviderAuthority, file) val uri = FileProvider.getUriForFile(activity, fileProviderAuthority, file)
Intent(Intent.ACTION_SEND).also { Intent(Intent.ACTION_SEND).also {
it.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION) it.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION)

5
android/app/src/main/java/com/metallic/chiaki/main/MainActivity.kt
View file

@ -25,7 +25,7 @@ import android.view.MenuItem
import android.view.View import android.view.View
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import androidx.lifecycle.Observer import androidx.lifecycle.Observer
import androidx.lifecycle.ViewModelProviders import androidx.lifecycle.ViewModelProvider
import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.LinearLayoutManager
import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.google.android.material.dialog.MaterialAlertDialogBuilder
import com.metallic.chiaki.R import com.metallic.chiaki.R
@ -67,8 +67,7 @@ class MainActivity : AppCompatActivity()
registerButton.setOnClickListener { showRegistration() } registerButton.setOnClickListener { showRegistration() }
registerLabelButton.setOnClickListener { showRegistration() } registerLabelButton.setOnClickListener { showRegistration() }
viewModel = ViewModelProviders viewModel = ViewModelProvider(this, viewModelFactory { MainViewModel(getDatabase(this), Preferences(this)) })
.of(this, viewModelFactory { MainViewModel(getDatabase(this), Preferences(this)) })
.get(MainViewModel::class.java) .get(MainViewModel::class.java)
val recyclerViewAdapter = DisplayHostRecyclerViewAdapter(this::hostTriggered, this::wakeupHost, this::editHost, this::deleteHost) val recyclerViewAdapter = DisplayHostRecyclerViewAdapter(this::hostTriggered, this::wakeupHost, this::editHost, this::deleteHost)

5
android/app/src/main/java/com/metallic/chiaki/manualconsole/EditManualConsoleActivity.kt
View file

@ -25,7 +25,7 @@ import android.widget.AdapterView
import android.widget.ArrayAdapter import android.widget.ArrayAdapter
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import androidx.lifecycle.Observer import androidx.lifecycle.Observer
import androidx.lifecycle.ViewModelProviders import androidx.lifecycle.ViewModelProvider
import com.metallic.chiaki.R import com.metallic.chiaki.R
import com.metallic.chiaki.common.RegisteredHost import com.metallic.chiaki.common.RegisteredHost
import com.metallic.chiaki.common.ext.RevealActivity import com.metallic.chiaki.common.ext.RevealActivity
@ -57,8 +57,7 @@ class EditManualConsoleActivity: AppCompatActivity(), RevealActivity
setContentView(R.layout.activity_edit_manual) setContentView(R.layout.activity_edit_manual)
handleReveal() handleReveal()
viewModel = ViewModelProviders viewModel = ViewModelProvider(this, viewModelFactory {
.of(this, viewModelFactory {
EditManualConsoleViewModel(getDatabase(this), EditManualConsoleViewModel(getDatabase(this),
if(intent.hasExtra(EXTRA_MANUAL_HOST_ID)) if(intent.hasExtra(EXTRA_MANUAL_HOST_ID))
intent.getLongExtra(EXTRA_MANUAL_HOST_ID, 0) intent.getLongExtra(EXTRA_MANUAL_HOST_ID, 0)

4
android/app/src/main/java/com/metallic/chiaki/regist/RegistActivity.kt
View file

@ -24,7 +24,7 @@ import android.view.View
import android.view.Window import android.view.Window
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import androidx.lifecycle.Observer import androidx.lifecycle.Observer
import androidx.lifecycle.ViewModelProviders import androidx.lifecycle.ViewModelProvider
import com.metallic.chiaki.R import com.metallic.chiaki.R
import com.metallic.chiaki.common.ext.RevealActivity import com.metallic.chiaki.common.ext.RevealActivity
import com.metallic.chiaki.lib.RegistInfo import com.metallic.chiaki.lib.RegistInfo
@ -56,7 +56,7 @@ class RegistActivity: AppCompatActivity(), RevealActivity
setContentView(R.layout.activity_regist) setContentView(R.layout.activity_regist)
handleReveal() 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") hostEditText.setText(intent.getStringExtra(EXTRA_HOST) ?: "255.255.255.255")
broadcastCheckBox.isChecked = intent.getBooleanExtra(EXTRA_BROADCAST, true) broadcastCheckBox.isChecked = intent.getBooleanExtra(EXTRA_BROADCAST, true)

5
android/app/src/main/java/com/metallic/chiaki/regist/RegistExecuteActivity.kt
View file

@ -25,7 +25,7 @@ import android.view.View
import androidx.appcompat.app.AlertDialog import androidx.appcompat.app.AlertDialog
import androidx.appcompat.app.AppCompatActivity import androidx.appcompat.app.AppCompatActivity
import androidx.lifecycle.Observer import androidx.lifecycle.Observer
import androidx.lifecycle.ViewModelProviders import androidx.lifecycle.ViewModelProvider
import com.google.android.material.dialog.MaterialAlertDialogBuilder import com.google.android.material.dialog.MaterialAlertDialogBuilder
import com.metallic.chiaki.R import com.metallic.chiaki.R
import com.metallic.chiaki.common.MacAddress import com.metallic.chiaki.common.MacAddress
@ -52,8 +52,7 @@ class RegistExecuteActivity: AppCompatActivity()
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
setContentView(R.layout.activity_regist_execute) setContentView(R.layout.activity_regist_execute)
viewModel = ViewModelProviders viewModel = ViewModelProvider(this, viewModelFactory { RegistExecuteViewModel(getDatabase(this)) })
.of(this, viewModelFactory { RegistExecuteViewModel(getDatabase(this)) })
.get(RegistExecuteViewModel::class.java) .get(RegistExecuteViewModel::class.java)
logTextView.setHorizontallyScrolling(true) logTextView.setHorizontallyScrolling(true)

16
android/app/src/main/java/com/metallic/chiaki/settings/SettingsFragment.kt
View file

@ -18,24 +18,21 @@
package com.metallic.chiaki.settings package com.metallic.chiaki.settings
import android.app.Activity import android.app.Activity
import android.content.ClipData
import android.content.Intent import android.content.Intent
import android.content.res.Resources import android.content.res.Resources
import android.os.Bundle import android.os.Bundle
import android.text.InputType import android.text.InputType
import androidx.core.content.FileProvider
import androidx.lifecycle.Observer import androidx.lifecycle.Observer
import androidx.lifecycle.ViewModelProviders import androidx.lifecycle.ViewModelProvider
import androidx.preference.* import androidx.preference.*
import com.metallic.chiaki.R import com.metallic.chiaki.R
import com.metallic.chiaki.common.* import com.metallic.chiaki.common.Preferences
import com.metallic.chiaki.common.ext.toLiveData import com.metallic.chiaki.common.exportAndShareAllSettings
import com.metallic.chiaki.common.ext.viewModelFactory 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.disposables.CompositeDisposable
import io.reactivex.rxkotlin.addTo import io.reactivex.rxkotlin.addTo
import io.reactivex.schedulers.Schedulers
import java.io.File
class DataStore(val preferences: Preferences): PreferenceDataStore() class DataStore(val preferences: Preferences): PreferenceDataStore()
{ {
@ -96,8 +93,7 @@ class SettingsFragment: PreferenceFragmentCompat(), TitleFragment
{ {
val context = context ?: return val context = context ?: return
val viewModel = ViewModelProviders val viewModel = ViewModelProvider(this, viewModelFactory { SettingsViewModel(getDatabase(context), Preferences(context)) })
.of(this, viewModelFactory { SettingsViewModel(getDatabase(context), Preferences(context)) })
.get(SettingsViewModel::class.java) .get(SettingsViewModel::class.java)
val preferences = viewModel.preferences val preferences = viewModel.preferences

7
android/app/src/main/java/com/metallic/chiaki/settings/SettingsLogsFragment.kt
View file

@ -27,7 +27,7 @@ import android.view.ViewGroup
import androidx.appcompat.app.AppCompatDialogFragment import androidx.appcompat.app.AppCompatDialogFragment
import androidx.core.content.FileProvider import androidx.core.content.FileProvider
import androidx.lifecycle.Observer import androidx.lifecycle.Observer
import androidx.lifecycle.ViewModelProviders import androidx.lifecycle.ViewModelProvider
import androidx.recyclerview.widget.ItemTouchHelper import androidx.recyclerview.widget.ItemTouchHelper
import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
@ -49,15 +49,14 @@ class SettingsLogsFragment: AppCompatDialogFragment(), TitleFragment
{ {
val context = context!! val context = context!!
viewModel = ViewModelProviders viewModel = ViewModelProvider(this, viewModelFactory { SettingsLogsViewModel(LogManager(context)) })
.of(this, viewModelFactory { SettingsLogsViewModel(LogManager(context)) })
.get(SettingsLogsViewModel::class.java) .get(SettingsLogsViewModel::class.java)
val adapter = SettingsLogsAdapter() val adapter = SettingsLogsAdapter()
logsRecyclerView.layoutManager = LinearLayoutManager(context) logsRecyclerView.layoutManager = LinearLayoutManager(context)
logsRecyclerView.adapter = adapter logsRecyclerView.adapter = adapter
adapter.shareCallback = this::shareLogFile adapter.shareCallback = this::shareLogFile
viewModel.sessionLogs.observe(this, Observer { viewModel.sessionLogs.observe(viewLifecycleOwner, Observer {
adapter.logFiles = it adapter.logFiles = it
emptyInfoGroup.visibility = if(it.isEmpty()) View.VISIBLE else View.GONE emptyInfoGroup.visibility = if(it.isEmpty()) View.VISIBLE else View.GONE
}) })

5
android/app/src/main/java/com/metallic/chiaki/settings/SettingsRegisteredHostsFragment.kt
View file

@ -26,7 +26,7 @@ import android.view.View
import android.view.ViewGroup import android.view.ViewGroup
import androidx.appcompat.app.AppCompatDialogFragment import androidx.appcompat.app.AppCompatDialogFragment
import androidx.lifecycle.Observer import androidx.lifecycle.Observer
import androidx.lifecycle.ViewModelProviders import androidx.lifecycle.ViewModelProvider
import androidx.recyclerview.widget.ItemTouchHelper import androidx.recyclerview.widget.ItemTouchHelper
import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.LinearLayoutManager
import androidx.recyclerview.widget.RecyclerView import androidx.recyclerview.widget.RecyclerView
@ -47,8 +47,7 @@ class SettingsRegisteredHostsFragment: AppCompatDialogFragment(), TitleFragment
override fun onViewCreated(view: View, savedInstanceState: Bundle?) override fun onViewCreated(view: View, savedInstanceState: Bundle?)
{ {
viewModel = ViewModelProviders viewModel = ViewModelProvider(this, viewModelFactory { SettingsRegisteredHostsViewModel(getDatabase(context!!)) })
.of(this, viewModelFactory { SettingsRegisteredHostsViewModel(getDatabase(context!!)) })
.get(SettingsRegisteredHostsViewModel::class.java) .get(SettingsRegisteredHostsViewModel::class.java)
val adapter = SettingsRegisteredHostsAdapter() val adapter = SettingsRegisteredHostsAdapter()

4
android/app/src/main/java/com/metallic/chiaki/stream/StreamActivity.kt
View file

@ -72,7 +72,7 @@ class StreamActivity : AppCompatActivity(), View.OnSystemUiVisibilityChangeListe
return return
} }
viewModel = ViewModelProviders.of(this, viewModelFactory { viewModel = ViewModelProvider(this, viewModelFactory {
StreamViewModel(Preferences(this), LogManager(this), connectInfo) StreamViewModel(Preferences(this), LogManager(this), connectInfo)
})[StreamViewModel::class.java] })[StreamViewModel::class.java]
@ -101,7 +101,7 @@ class StreamActivity : AppCompatActivity(), View.OnSystemUiVisibilityChangeListe
showOverlay() showOverlay()
} }
displayModeToggle.addOnButtonCheckedListener {group, checkedId, _ -> displayModeToggle.addOnButtonCheckedListener { _, checkedId, _ ->
// following 'if' is a workaround until selectionRequired for MaterialButtonToggleGroup // following 'if' is a workaround until selectionRequired for MaterialButtonToggleGroup
// comes out of alpha. // comes out of alpha.
// See https://stackoverflow.com/questions/56164004/required-single-selection-on-materialbuttontogglegroup // See https://stackoverflow.com/questions/56164004/required-single-selection-on-materialbuttontogglegroup