mobi/seedvault
1
0
Fork 0
Code Pull requests Activity

Move AppCheckFragment into check package

Browse source
This commit is contained in:
Torsten Grote 2024-10-28 15:33:42 -03:00
parent 06191a1fc3
commit beedafd042
No known key found for this signature in database
GPG key ID: 3E5F77D92CF891FF
2 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
app/src/main/java/com/stevesoltys/seedvault/settings/AppCheckFragment.kt → app/src/main/java/com/stevesoltys/seedvault/ui/check/AppCheckFragment.kt
View file

@ -3,22 +3,21 @@
* SPDX-License-Identifier: Apache-2.0 * SPDX-License-Identifier: Apache-2.0
*/ */
package com.stevesoltys.seedvault.settings package com.stevesoltys.seedvault.ui.check
import android.os.Bundle import android.os.Bundle
import android.text.format.Formatter.formatShortFileSize import android.text.format.Formatter
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
import android.view.View.GONE
import android.view.View.VISIBLE
import android.view.ViewGroup import android.view.ViewGroup
import android.widget.Button import android.widget.Button
import android.widget.ScrollView import android.widget.ScrollView
import android.widget.TextView import android.widget.TextView
import androidx.fragment.app.Fragment import androidx.fragment.app.Fragment
import com.google.android.material.slider.LabelFormatter.LABEL_VISIBLE import com.google.android.material.slider.LabelFormatter
import com.google.android.material.slider.Slider import com.google.android.material.slider.Slider
import com.stevesoltys.seedvault.R import com.stevesoltys.seedvault.R
import com.stevesoltys.seedvault.settings.SettingsViewModel
import org.koin.androidx.viewmodel.ext.android.activityViewModel import org.koin.androidx.viewmodel.ext.android.activityViewModel
private const val WARN_PERCENT = 25 private const val WARN_PERCENT = 25
@ -42,7 +41,7 @@ class AppCheckFragment : Fragment() {
// label not scrolling will be fixed in material-components 1.12.0 (next update) // label not scrolling will be fixed in material-components 1.12.0 (next update)
slider.setLabelFormatter { value -> slider.setLabelFormatter { value ->
viewModel.backupSize.value?.let { viewModel.backupSize.value?.let {
formatShortFileSize(context, (it * value / 100).toLong()) Formatter.formatShortFileSize(context, (it * value / 100).toLong())
} ?: "${value.toInt()}%" } ?: "${value.toInt()}%"
} }
slider.addOnChangeListener { _, value, _ -> slider.addOnChangeListener { _, value, _ ->
@ -51,7 +50,7 @@ class AppCheckFragment : Fragment() {
viewModel.backupSize.observe(viewLifecycleOwner) { viewModel.backupSize.observe(viewLifecycleOwner) {
if (it != null) { if (it != null) {
slider.labelBehavior = LABEL_VISIBLE slider.labelBehavior = LabelFormatter.LABEL_VISIBLE
slider.invalidate() slider.invalidate()
onSliderChanged(slider.value) onSliderChanged(slider.value)
} }
@ -81,7 +80,7 @@ class AppCheckFragment : Fragment() {
size * value / 100 > WARN_BYTES size * value / 100 > WARN_BYTES
} }
// only update label visibility when different from before // only update label visibility when different from before
val newVisibility = if (showWarning) VISIBLE else GONE val newVisibility = if (showWarning) View.VISIBLE else View.GONE
if (sliderLabel.visibility != newVisibility) { if (sliderLabel.visibility != newVisibility) {
sliderLabel.visibility = newVisibility sliderLabel.visibility = newVisibility
} }

2
app/src/main/res/xml/settings.xml
View file

@ -51,7 +51,7 @@
tools:summary="Next backup: Never" /> tools:summary="Next backup: Never" />
<androidx.preference.Preference <androidx.preference.Preference
app:fragment="com.stevesoltys.seedvault.settings.AppCheckFragment" app:fragment="com.stevesoltys.seedvault.ui.check.AppCheckFragment"
app:icon="@drawable/ic_cloud_search" app:icon="@drawable/ic_cloud_search"
app:key="backup_scheduling" app:key="backup_scheduling"
app:summary="@string/settings_backup_app_check_summary" app:summary="@string/settings_backup_app_check_summary"