Skip to content
This repository was archived by the owner on Oct 28, 2024. It is now read-only.

Commit 7971f19

Browse files
aistra0528aistra0528
committed
style: format code
1 parent 40a31cf commit 7971f19

File tree

7 files changed

+64
-109
lines changed

7 files changed

+64
-109
lines changed

‎app/src/main/kotlin/com/aistra/hail/extensions/InsetsExtensions.kt‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,8 +48,7 @@ fun InsetterApplyTypeDsl.marginRelative(
4848
)
4949
}
5050

51-
fun InsetterDsl.typeDefault(f: InsetterApplyTypeDsl.() -> Unit) =
52-
type(INSETS_TYPE_DEFAULT, f = f)
51+
fun InsetterDsl.typeDefault(f: InsetterApplyTypeDsl.() -> Unit) = type(INSETS_TYPE_DEFAULT, f = f)
5352

5453
fun View.applyDefaultInsetter(f: InsetterApplyTypeDsl.() -> Unit) = applyInsetter {
5554
typeDefault(f)

‎app/src/main/kotlin/com/aistra/hail/extensions/ViewExtensions.kt‎

Lines changed: 0 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,5 @@
11
package com.aistra.hail.extensions
22

33
import android.view.View
4-
import android.view.ViewGroup.MarginLayoutParams
5-
import androidx.core.graphics.Insets
6-
import androidx.core.view.ViewCompat
7-
import androidx.core.view.WindowInsetsCompat.Type.displayCutout
8-
import androidx.core.view.WindowInsetsCompat.Type.systemBars
9-
import androidx.core.view.marginBottom
10-
import androidx.core.view.marginLeft
11-
import androidx.core.view.marginRight
12-
import androidx.core.view.marginTop
13-
import androidx.core.view.updatePaddingRelative
144

155
val View.isRtl get() = layoutDirection == View.LAYOUT_DIRECTION_RTL

‎app/src/main/kotlin/com/aistra/hail/ui/about/AboutFragment.kt‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ import com.aistra.hail.utils.HUI
1616
import com.google.android.material.dialog.MaterialAlertDialogBuilder
1717
import com.google.android.material.imageview.ShapeableImageView
1818
import com.google.android.material.textview.MaterialTextView
19-
import dev.chrisbanes.insetter.applyInsetter
2019

2120
class AboutFragment : MainFragment(), View.OnClickListener {
2221
private lateinit var aboutViewModel: AboutViewModel
@@ -64,11 +63,9 @@ class AboutFragment : MainFragment(), View.OnClickListener {
6463
binding.actionDonate -> onDonate()
6564
binding.actionGithub -> HUI.openLink(HailData.URL_GITHUB)
6665
binding.actionTranslate -> HUI.openLink(HailData.URL_TRANSLATE)
67-
binding.actionLicenses -> MaterialAlertDialogBuilder(activity)
68-
.setTitle(R.string.action_licenses)
66+
binding.actionLicenses -> MaterialAlertDialogBuilder(activity).setTitle(R.string.action_licenses)
6967
.setMessage(resources.openRawResource(R.raw.licenses).bufferedReader().readText())
70-
.setPositiveButton(android.R.string.ok, null)
71-
.show()
68+
.setPositiveButton(android.R.string.ok, null).show()
7269
.findViewById<MaterialTextView>(android.R.id.message)?.apply {
7370
setTextIsSelectable(true)
7471
Linkify.addLinks(this, Linkify.EMAIL_ADDRESSES or Linkify.WEB_URLS)

‎app/src/main/kotlin/com/aistra/hail/ui/apps/AppsFragment.kt‎

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,8 +32,7 @@ import kotlinx.coroutines.launch
3232
import kotlinx.coroutines.withContext
3333
import java.io.FileInputStream
3434

35-
class AppsFragment : MainFragment(), AppsAdapter.OnItemClickListener,
36-
AppsAdapter.OnItemCheckedChangeListener,
35+
class AppsFragment : MainFragment(), AppsAdapter.OnItemClickListener, AppsAdapter.OnItemCheckedChangeListener,
3736
MenuProvider {
3837

3938
private val model: AppsViewModel by viewModels()
@@ -57,10 +56,9 @@ class AppsFragment : MainFragment(), AppsAdapter.OnItemClickListener,
5756
this.exportApkPkg = null
5857
if (exportApkPkg == null || uri == null) return@registerForActivityResult
5958
lifecycleScope.launch {
60-
val applicationInfo =
61-
HPackages.getApplicationInfoOrNull(exportApkPkg) ?: return@launch
62-
val dialog = MaterialAlertDialogBuilder(activity)
63-
.setView(R.layout.dialog_progress).setCancelable(false).show()
59+
val applicationInfo = HPackages.getApplicationInfoOrNull(exportApkPkg) ?: return@launch
60+
val dialog =
61+
MaterialAlertDialogBuilder(activity).setView(R.layout.dialog_progress).setCancelable(false).show()
6462
runCatching {
6563
withContext(Dispatchers.IO) {
6664
FileInputStream(applicationInfo.sourceDir).use { source ->

‎app/src/main/kotlin/com/aistra/hail/ui/home/PagerFragment.kt‎

Lines changed: 46 additions & 68 deletions
Original file line numberDiff line numberDiff line change
@@ -35,8 +35,8 @@ import kotlinx.coroutines.launch
3535
import kotlinx.coroutines.withContext
3636
import org.json.JSONArray
3737

38-
class PagerFragment : MainFragment(), PagerAdapter.OnItemClickListener,
39-
PagerAdapter.OnItemLongClickListener, MenuProvider {
38+
class PagerFragment : MainFragment(), PagerAdapter.OnItemClickListener, PagerAdapter.OnItemLongClickListener,
39+
MenuProvider {
4040
private var query: String = String()
4141
private var _binding: FragmentPagerBinding? = null
4242
private val binding get() = _binding!!
@@ -51,9 +51,7 @@ class PagerFragment : MainFragment(), PagerAdapter.OnItemClickListener,
5151
private val adapter get() = (parentFragment as HomeFragment).binding.pager.adapter as HomeAdapter
5252
private val tag: Pair<String, Int> get() = HailData.tags[tabs.selectedTabPosition]
5353
override fun onCreateView(
54-
inflater: LayoutInflater,
55-
container: ViewGroup?,
56-
savedInstanceState: Bundle?
54+
inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?
5755
): View {
5856
val menuHost = requireActivity() as MenuHost
5957
menuHost.addMenuProvider(this, viewLifecycleOwner, Lifecycle.State.RESUMED)
@@ -115,10 +113,11 @@ class PagerFragment : MainFragment(), PagerAdapter.OnItemClickListener,
115113

116114
private fun updateCurrentList() = HailData.checkedList.filter {
117115
if (query.isEmpty()) it.tagId == tag.second
118-
else ((HailData.nineKeySearch && NineKeySearch.search(query, it.packageName, it.name.toString()))
119-
|| FuzzySearch.search(it.packageName, query)
120-
|| FuzzySearch.search(it.name.toString(), query)
121-
|| PinyinSearch.searchPinyinAll(it.name.toString(), query))
116+
else ((HailData.nineKeySearch && NineKeySearch.search(
117+
query, it.packageName, it.name.toString()
118+
)) || FuzzySearch.search(it.packageName, query) || FuzzySearch.search(
119+
it.name.toString(), query
120+
) || PinyinSearch.searchPinyinAll(it.name.toString(), query))
122121
}.sortedWith(NameComparator).let {
123122
binding.empty.isVisible = it.isEmpty()
124123
pagerAdapter.submitList(it)
@@ -134,8 +133,7 @@ class PagerFragment : MainFragment(), PagerAdapter.OnItemClickListener,
134133
override fun onItemClick(info: AppInfo) {
135134
if (info.applicationInfo == null) {
136135
Snackbar.make(activity.fab, R.string.app_not_installed, Snackbar.LENGTH_LONG)
137-
.setAction(R.string.action_remove_home) { removeCheckedApp(info.packageName) }
138-
.show()
136+
.setAction(R.string.action_remove_home) { removeCheckedApp(info.packageName) }.show()
139137
return
140138
}
141139
if (multiselect) {
@@ -173,19 +171,14 @@ class PagerFragment : MainFragment(), PagerAdapter.OnItemClickListener,
173171
val values = resources.getIntArray(R.array.deferred_task_values)
174172
val entries = arrayOfNulls<String>(values.size)
175173
values.forEachIndexed { i, it ->
176-
entries[i] =
177-
resources.getQuantityString(R.plurals.deferred_task_entry, it, it)
174+
entries[i] = resources.getQuantityString(R.plurals.deferred_task_entry, it, it)
178175
}
179176
MaterialAlertDialogBuilder(activity).setTitle(R.string.action_deferred_task)
180177
.setItems(entries) { _, i ->
181178
HWork.setDeferredFrozen(pkg, !frozen, values[i].toLong())
182179
Snackbar.make(
183180
activity.fab, resources.getQuantityString(
184-
R.plurals.msg_deferred_task,
185-
values[i],
186-
values[i],
187-
action,
188-
info.name
181+
R.plurals.msg_deferred_task, values[i], values[i], action, info.name
189182
), Snackbar.LENGTH_INDEFINITE
190183
).setAction(R.string.action_undo) { HWork.cancelWork(pkg) }.show()
191184
}.setNegativeButton(android.R.string.cancel, null).show()
@@ -206,19 +199,18 @@ class PagerFragment : MainFragment(), PagerAdapter.OnItemClickListener,
206199

207200
5 -> {
208201
val checked = HailData.tags.indexOfFirst { it.second == info.tagId }
209-
MaterialAlertDialogBuilder(activity).setTitle(R.string.action_tag_set)
210-
.setSingleChoiceItems(
211-
HailData.tags.map { it.first }.toTypedArray(), checked
212-
) { dialog, index ->
213-
if (info.tagId != HailData.tags[index].second) {
214-
info.tagId = HailData.tags[index].second
215-
HailData.saveApps()
216-
updateCurrentList()
217-
}
218-
dialog.dismiss()
219-
}.setNeutralButton(R.string.action_tag_add) { _, _ ->
220-
showTagDialog(listOf(info))
221-
}.setNegativeButton(android.R.string.cancel, null).show()
202+
MaterialAlertDialogBuilder(activity).setTitle(R.string.action_tag_set).setSingleChoiceItems(
203+
HailData.tags.map { it.first }.toTypedArray(), checked
204+
) { dialog, index ->
205+
if (info.tagId != HailData.tags[index].second) {
206+
info.tagId = HailData.tags[index].second
207+
HailData.saveApps()
208+
updateCurrentList()
209+
}
210+
dialog.dismiss()
211+
}.setNeutralButton(R.string.action_tag_add) { _, _ ->
212+
showTagDialog(listOf(info))
213+
}.setNegativeButton(android.R.string.cancel, null).show()
222214
}
223215

224216
6 -> MaterialAlertDialogBuilder(requireActivity()).setTitle(R.string.action_unfreeze_tag)
@@ -227,15 +219,11 @@ class PagerFragment : MainFragment(), PagerAdapter.OnItemClickListener,
227219
info,
228220
pkg,
229221
info.name,
230-
HailApi.getIntentForPackage(HailApi.ACTION_LAUNCH, pkg)
231-
.addTag(HailData.tags[index].first)
222+
HailApi.getIntentForPackage(HailApi.ACTION_LAUNCH, pkg).addTag(HailData.tags[index].first)
232223
)
233224
}.setPositiveButton(R.string.action_skip) { _, _ ->
234225
HShortcuts.addPinShortcut(
235-
info,
236-
pkg,
237-
info.name,
238-
HailApi.getIntentForPackage(HailApi.ACTION_LAUNCH, pkg)
226+
info, pkg, info.name, HailApi.getIntentForPackage(HailApi.ACTION_LAUNCH, pkg)
239227
)
240228
}.setNegativeButton(android.R.string.cancel, null).show()
241229

@@ -286,19 +274,18 @@ class PagerFragment : MainFragment(), PagerAdapter.OnItemClickListener,
286274
}
287275

288276
2 -> {
289-
val checked = if (selectedList.all { it.tagId == selectedList[0].tagId })
290-
HailData.tags.indexOfFirst { it.second == selectedList[0].tagId } else -1
291-
MaterialAlertDialogBuilder(activity).setTitle(R.string.action_tag_set)
292-
.setSingleChoiceItems(
293-
HailData.tags.map { it.first }.toTypedArray(), checked
294-
) { dialog, index ->
295-
selectedList.forEach { it.tagId = HailData.tags[index].second }
296-
HailData.saveApps()
297-
deselect()
298-
dialog.dismiss()
299-
}.setNeutralButton(R.string.action_tag_add) { _, _ ->
300-
showTagDialog(selectedList)
301-
}.setNegativeButton(android.R.string.cancel, null).show()
277+
val checked =
278+
if (selectedList.all { it.tagId == selectedList[0].tagId }) HailData.tags.indexOfFirst { it.second == selectedList[0].tagId } else -1
279+
MaterialAlertDialogBuilder(activity).setTitle(R.string.action_tag_set).setSingleChoiceItems(
280+
HailData.tags.map { it.first }.toTypedArray(), checked
281+
) { dialog, index ->
282+
selectedList.forEach { it.tagId = HailData.tags[index].second }
283+
HailData.saveApps()
284+
deselect()
285+
dialog.dismiss()
286+
}.setNeutralButton(R.string.action_tag_add) { _, _ ->
287+
showTagDialog(selectedList)
288+
}.setNegativeButton(android.R.string.cancel, null).show()
302289
}
303290

304291
3 -> {
@@ -315,8 +302,7 @@ class PagerFragment : MainFragment(), PagerAdapter.OnItemClickListener,
315302
5 -> {
316303
setListFrozen(false, selectedList, false)
317304
selectedList.forEach {
318-
if (!AppManager.isAppFrozen(it.packageName))
319-
removeCheckedApp(it.packageName, false)
305+
if (!AppManager.isAppFrozen(it.packageName)) removeCheckedApp(it.packageName, false)
320306
}
321307
HailData.saveApps()
322308
deselect()
@@ -346,15 +332,13 @@ class PagerFragment : MainFragment(), PagerAdapter.OnItemClickListener,
346332
frozen: Boolean, list: List<AppInfo> = HailData.checkedList, updateList: Boolean = true
347333
) {
348334
if (HailData.workingMode == HailData.MODE_DEFAULT) {
349-
MaterialAlertDialogBuilder(activity)
350-
.setMessage(R.string.msg_guide)
335+
MaterialAlertDialogBuilder(activity).setMessage(R.string.msg_guide)
351336
.setPositiveButton(android.R.string.ok, null).show()
352337
return
353338
} else if (HailData.workingMode == HailData.MODE_SHIZUKU_HIDE) {
354339
runCatching { HShizuku.isRoot }.onSuccess {
355340
if (!it) {
356-
MaterialAlertDialogBuilder(activity)
357-
.setMessage(R.string.shizuku_hide_adb)
341+
MaterialAlertDialogBuilder(activity).setMessage(R.string.shizuku_hide_adb)
358342
.setPositiveButton(android.R.string.ok, null).show()
359343
return
360344
}
@@ -366,8 +350,7 @@ class PagerFragment : MainFragment(), PagerAdapter.OnItemClickListener,
366350
else -> {
367351
if (updateList) updateCurrentList()
368352
HUI.showToast(
369-
if (frozen) R.string.msg_freeze else R.string.msg_unfreeze,
370-
result
353+
if (frozen) R.string.msg_freeze else R.string.msg_unfreeze, result
371354
)
372355
}
373356
}
@@ -377,10 +360,8 @@ class PagerFragment : MainFragment(), PagerAdapter.OnItemClickListener,
377360
val binding = DialogInputBinding.inflate(layoutInflater)
378361
binding.inputLayout.setHint(R.string.tag)
379362
list ?: binding.editText.setText(tag.first)
380-
MaterialAlertDialogBuilder(activity)
381-
.setTitle(if (list != null) R.string.action_tag_add else R.string.action_tag_set)
382-
.setView(binding.root)
383-
.setPositiveButton(android.R.string.ok) { _, _ ->
363+
MaterialAlertDialogBuilder(activity).setTitle(if (list != null) R.string.action_tag_add else R.string.action_tag_set)
364+
.setView(binding.root).setPositiveButton(android.R.string.ok) { _, _ ->
384365
val tagName = binding.editText.text.toString()
385366
val tagId = tagName.hashCode()
386367
if (HailData.tags.any { it.first == tagName || it.second == tagId }) return@setPositiveButton
@@ -481,14 +462,12 @@ class PagerFragment : MainFragment(), PagerAdapter.OnItemClickListener,
481462
} else deselect()
482463
}
483464

484-
R.id.action_freeze_current -> setListFrozen(true,
485-
pagerAdapter.currentList.filterNot { it.whitelisted })
465+
R.id.action_freeze_current -> setListFrozen(true, pagerAdapter.currentList.filterNot { it.whitelisted })
486466

487467
R.id.action_unfreeze_current -> setListFrozen(false, pagerAdapter.currentList)
488468
R.id.action_freeze_all -> setListFrozen(true)
489469
R.id.action_unfreeze_all -> setListFrozen(false)
490-
R.id.action_freeze_non_whitelisted -> setListFrozen(true,
491-
HailData.checkedList.filterNot { it.whitelisted })
470+
R.id.action_freeze_non_whitelisted -> setListFrozen(true, HailData.checkedList.filterNot { it.whitelisted })
492471

493472
R.id.action_import_clipboard -> importFromClipboard()
494473
R.id.action_import_frozen -> lifecycleScope.launch {
@@ -513,8 +492,7 @@ class PagerFragment : MainFragment(), PagerAdapter.OnItemClickListener,
513492
val editText = searchView.findViewById<EditText>(androidx.appcompat.R.id.search_src_text)
514493
editText.inputType = InputType.TYPE_CLASS_PHONE
515494
}
516-
searchView.setOnQueryTextListener(object :
517-
SearchView.OnQueryTextListener {
495+
searchView.setOnQueryTextListener(object : SearchView.OnQueryTextListener {
518496
private var inited = false
519497
override fun onQueryTextChange(newText: String): Boolean {
520498
if (inited) {

‎app/src/main/kotlin/com/aistra/hail/ui/main/MainActivity.kt‎

Lines changed: 8 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,8 @@ class MainActivity : AppCompatActivity(), NavController.OnDestinationChangedList
3939
.canAuthenticate(BIOMETRIC_STRONG or DEVICE_CREDENTIAL) != BiometricManager.BIOMETRIC_SUCCESS
4040
) return
4141
binding.root.isVisible = false
42-
val biometricPrompt = BiometricPrompt(this,
42+
val biometricPrompt = BiometricPrompt(
43+
this,
4344
ContextCompat.getMainExecutor(this),
4445
object : BiometricPrompt.AuthenticationCallback() {
4546
override fun onAuthenticationError(errorCode: Int, errString: CharSequence) {
@@ -53,10 +54,9 @@ class MainActivity : AppCompatActivity(), NavController.OnDestinationChangedList
5354
binding.root.isVisible = true
5455
}
5556
})
56-
val promptInfo =
57-
BiometricPrompt.PromptInfo.Builder().setTitle(getString(R.string.action_biometric))
58-
.setSubtitle(getString(R.string.msg_biometric))
59-
.setNegativeButtonText(getString(android.R.string.cancel)).build()
57+
val promptInfo = BiometricPrompt.PromptInfo.Builder().setTitle(getString(R.string.action_biometric))
58+
.setSubtitle(getString(R.string.msg_biometric)).setNegativeButtonText(getString(android.R.string.cancel))
59+
.build()
6060
biometricPrompt.authenticate(promptInfo)
6161
}
6262

@@ -66,8 +66,7 @@ class MainActivity : AppCompatActivity(), NavController.OnDestinationChangedList
6666
fab = appBarMain.fab
6767
appbar = appBarMain.appBarLayout
6868

69-
val navHostFragment =
70-
supportFragmentManager.findFragmentById(R.id.nav_host_fragment) as NavHostFragment
69+
val navHostFragment = supportFragmentManager.findFragmentById(R.id.nav_host_fragment) as NavHostFragment
7170
val navController = navHostFragment.navController
7271
navController.addOnDestinationChangedListener(this@MainActivity)
7372
val appBarConfiguration = AppBarConfiguration.Builder(
@@ -93,8 +92,7 @@ class MainActivity : AppCompatActivity(), NavController.OnDestinationChangedList
9392
}
9493

9594
fun ownerRemoveDialog() {
96-
MaterialAlertDialogBuilder(this).setTitle(R.string.title_remove_owner)
97-
.setMessage(R.string.msg_remove_owner)
95+
MaterialAlertDialogBuilder(this).setTitle(R.string.title_remove_owner).setMessage(R.string.msg_remove_owner)
9896
.setPositiveButton(R.string.action_continue) { _, _ ->
9997
HPolicy.setOrganizationName()
10098
HPolicy.clearDeviceOwnerApp()
@@ -107,9 +105,7 @@ class MainActivity : AppCompatActivity(), NavController.OnDestinationChangedList
107105
} */
108106

109107
override fun onDestinationChanged(
110-
controller: NavController,
111-
destination: NavDestination,
112-
arguments: Bundle?
108+
controller: NavController, destination: NavDestination, arguments: Bundle?
113109
) {
114110
fab.tag = destination.id == R.id.nav_home
115111
if (fab.tag == true) fab.show() else fab.hide()

0 commit comments

Comments
 (0)