user01/Pupil
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Improved Suggestions

Browse Source 
resolves #100
This commit is contained in:
tom5079
2020-09-10 16:50:26 +09:00
parent cea3fb1e65
commit 18c6954be3
28 changed files with 592 additions and 490 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/xyz/quaver/pupil/ui/fragment/ManageFavoritesFragment.kt
View File

@@ -82,7 +82,7 @@ class ManageFavoritesFragment : PreferenceFragmentCompat() {
.setTitle(R.string.settings_restore_title)
.setView(editText)
.setPositiveButton(android.R.string.ok) { _, _ ->
restore(favorites, editText.text.toString(),
restore(editText.text.toString(),
onFailure = onFailure@{
val view = view ?: return@onFailure
Snackbar.make(view, R.string.settings_restore_failed, Snackbar.LENGTH_LONG).show()

29
app/src/main/java/xyz/quaver/pupil/ui/fragment/SettingsFragment.kt
View File

@@ -18,6 +18,7 @@
package xyz.quaver.pupil.ui.fragment
import android.app.Activity
import android.content.*
import android.os.Bundle
import android.widget.Toast
@@ -27,14 +28,19 @@ import androidx.preference.PreferenceCategory
import androidx.preference.PreferenceFragmentCompat
import androidx.preference.SwitchPreferenceCompat
import com.google.android.gms.oss.licenses.OssLicensesMenuActivity
import com.google.android.material.snackbar.Snackbar
import kotlinx.serialization.decodeFromString
import kotlinx.serialization.json.Json
import xyz.quaver.io.FileX
import xyz.quaver.io.util.getChild
import xyz.quaver.pupil.R
import xyz.quaver.pupil.favorites
import xyz.quaver.pupil.ui.LockActivity
import xyz.quaver.pupil.ui.SettingsActivity
import xyz.quaver.pupil.ui.dialog.*
import xyz.quaver.pupil.util.*
import xyz.quaver.pupil.util.downloader.DownloadManager
import java.nio.charset.Charset
class SettingsFragment :
PreferenceFragmentCompat(),
@@ -69,7 +75,7 @@ class SettingsFragment :
checkUpdate(activity as SettingsActivity, true)
}
"download_folder" -> {
DownloadLocationDialogFragment().show(requireActivity().supportFragmentManager, "Download Location Dialog")
DownloadLocationDialogFragment().show(parentFragmentManager, "Download Location Dialog")
}
"default_query" -> {
DefaultQueryDialog(requireContext()).apply {
@@ -80,8 +86,10 @@ class SettingsFragment :
}.show()
}
"app_lock" -> {
val intent = Intent(requireContext(), LockActivity::class.java)
activity?.startActivityForResult(intent, R.id.request_lock.normalizeID())
val intent = Intent(requireContext(), LockActivity::class.java).apply {
putExtra("force", true)
}
startActivityForResult(intent, R.id.request_lock.normalizeID())
}
"mirrors" -> {
MirrorDialog(requireContext())
@@ -259,4 +267,19 @@ class SettingsFragment :
}
}
}
override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
when(requestCode) {
R.id.request_lock.normalizeID() -> {
if (resultCode == Activity.RESULT_OK) {
parentFragmentManager
.beginTransaction()
.replace(R.id.settings, LockSettingsFragment())
.addToBackStack("Lock")
.commitAllowingStateLoss()
}
}
else -> super.onActivityResult(requestCode, resultCode, data)
}
}
}