Skip to content

Commit b54fd40

Browse files
JOELwindows7JOELwindows7
committed
saa
1 parent fb80b08 commit b54fd40

File tree

1 file changed

+161
-77
lines changed

1 file changed

+161
-77
lines changed

‎app/src/main/java/com/perkedel/htlauncher/Navigation.kt‎

Lines changed: 161 additions & 77 deletions
Original file line numberDiff line numberDiff line change
@@ -1199,7 +1199,8 @@ fun Navigation(
11991199
},
12001200
onCheckPermission = {
12011201
view.playSoundEffect(SoundEffectConstants.CLICK)
1202-
attemptPermission.value = true
1202+
// attemptPermission.value = true
1203+
anViewModel.openPermissionRequest(true)
12031204
},
12041205
onClickVersion = {
12051206
view.playSoundEffect(SoundEffectConstants.CLICK)
@@ -1282,86 +1283,86 @@ fun Navigation(
12821283
}
12831284

12841285
if (attemptPermission.value) {
1285-
HTAlertDialog(
1286-
title = stringResource(R.string.permission_dialog),
1287-
text = stringResource(R.string.permission_description),
1288-
thirdButton = true,
1289-
confirmText = stringResource(R.string.permission_grant),
1290-
thirdText = stringResource(R.string.permission_details),
1291-
icon = {
1292-
Icon(Icons.Default.Security,"")
1293-
},
1294-
onConfirm = {
1295-
Log.d("PermissionDialog","Attempt to run permission grant!")
1296-
multiplePermissionLauncher.launch(permissionRequests)
1297-
Log.d("PermissionDialog","Is it done?")
1298-
attemptPermission.value = false
1299-
},
1300-
onThirdButton = {
1301-
startIntent(
1302-
context, Intent(
1303-
Settings.ACTION_APPLICATION_DETAILS_SETTINGS,
1304-
Uri.fromParts("package", packageName, null)
1305-
)
1306-
)
1307-
attemptPermission.value = false
1308-
},
1309-
onDismissRequest = {
1310-
attemptPermission.value = false
1311-
},
1312-
tts = tts,
1313-
)
1286+
// HTAlertDialog(
1287+
// title = stringResource(R.string.permission_dialog),
1288+
// text = stringResource(R.string.permission_description),
1289+
// thirdButton = true,
1290+
// confirmText = stringResource(R.string.permission_grant),
1291+
// thirdText = stringResource(R.string.permission_details),
1292+
// icon = {
1293+
// Icon(Icons.Default.Security,"")
1294+
// },
1295+
// onConfirm = {
1296+
// Log.d("PermissionDialog","Attempt to run permission grant!")
1297+
// multiplePermissionLauncher.launch(permissionRequests)
1298+
// Log.d("PermissionDialog","Is it done?")
1299+
// attemptPermission.value = false
1300+
// },
1301+
// onThirdButton = {
1302+
// startIntent(
1303+
// context, Intent(
1304+
// Settings.ACTION_APPLICATION_DETAILS_SETTINGS,
1305+
// Uri.fromParts("package", packageName, null)
1306+
// )
1307+
// )
1308+
// attemptPermission.value = false
1309+
// },
1310+
// onDismissRequest = {
1311+
// attemptPermission.value = false
1312+
// },
1313+
// tts = tts,
1314+
// )
13141315
} else {
13151316
// attemptPermission.value = false
13161317
}
13171318

1318-
anViewModel.visiblePermissionDialogQueue
1319-
.reversed()
1320-
.forEach{ permission ->
1321-
PermissionDialog(
1322-
permissionsTextProvider = when(permission){
1323-
Manifest.permission.READ_EXTERNAL_STORAGE -> {
1324-
ReadFilePermissionTextProvider()
1325-
}
1326-
Manifest.permission.WRITE_EXTERNAL_STORAGE -> {
1327-
WriteFilePermissionTextProvider()
1328-
}
1329-
Manifest.permission.CAMERA -> {
1330-
CameraPermissionTextProvider()
1331-
}
1332-
Manifest.permission.RECORD_AUDIO -> {
1333-
RecordAudioPermissionTextProvider()
1334-
}
1335-
Manifest.permission.CALL_PHONE -> {
1336-
PhoneCallPermissionTextProvider()
1337-
}
1338-
Manifest.permission.READ_PHONE_STATE -> {
1339-
PhoneStatePermissionTextProvider()
1340-
}
1341-
else -> return@forEach
1342-
},
1343-
isPermanentlyDeclined = !shouldShowRequestPermissionRationale(
1344-
activityHandOver,
1345-
permission,
1346-
),
1347-
onDismiss = anViewModel::dissmissPermissionDialog,
1348-
onOkClick = {
1349-
anViewModel.dissmissPermissionDialog()
1350-
multiplePermissionLauncher.launch(
1351-
arrayOf(permission)
1352-
)
1353-
},
1354-
onGoToAppSettingClick = {
1355-
1356-
startIntent(
1357-
context, Intent(
1358-
Settings.ACTION_APPLICATION_DETAILS_SETTINGS,
1359-
Uri.fromParts("package", packageName, null)
1360-
)
1361-
)
1362-
}
1363-
)
1364-
}
1319+
// anViewModel.visiblePermissionDialogQueue
1320+
// .reversed()
1321+
// .forEach{ permission ->
1322+
// PermissionDialog(
1323+
// permissionsTextProvider = when(permission){
1324+
// Manifest.permission.READ_EXTERNAL_STORAGE -> {
1325+
// ReadFilePermissionTextProvider()
1326+
// }
1327+
// Manifest.permission.WRITE_EXTERNAL_STORAGE -> {
1328+
// WriteFilePermissionTextProvider()
1329+
// }
1330+
// Manifest.permission.CAMERA -> {
1331+
// CameraPermissionTextProvider()
1332+
// }
1333+
// Manifest.permission.RECORD_AUDIO -> {
1334+
// RecordAudioPermissionTextProvider()
1335+
// }
1336+
// Manifest.permission.CALL_PHONE -> {
1337+
// PhoneCallPermissionTextProvider()
1338+
// }
1339+
// Manifest.permission.READ_PHONE_STATE -> {
1340+
// PhoneStatePermissionTextProvider()
1341+
// }
1342+
// else -> return@forEach
1343+
// },
1344+
// isPermanentlyDeclined = !shouldShowRequestPermissionRationale(
1345+
// activityHandOver,
1346+
// permission,
1347+
// ),
1348+
// onDismiss = anViewModel::dissmissPermissionDialog,
1349+
// onOkClick = {
1350+
// anViewModel.dissmissPermissionDialog()
1351+
// multiplePermissionLauncher.launch(
1352+
// arrayOf(permission)
1353+
// )
1354+
// },
1355+
// onGoToAppSettingClick = {
1356+
//
1357+
// startIntent(
1358+
// context, Intent(
1359+
// Settings.ACTION_APPLICATION_DETAILS_SETTINGS,
1360+
// Uri.fromParts("package", packageName, null)
1361+
// )
1362+
// )
1363+
// }
1364+
// )
1365+
// }
13651366
}
13661367
composable(route = Screen.AboutScreen.name,
13671368
enterTransition = {
@@ -1790,6 +1791,89 @@ fun Navigation(
17901791
} else {
17911792
anViewModel.openChangeSaveDir(false)
17921793
}
1794+
if(htuiState.openPermissionRequest)
1795+
{
1796+
//attemptPermission.value
1797+
HTAlertDialog(
1798+
title = stringResource(R.string.permission_dialog),
1799+
text = stringResource(R.string.permission_description),
1800+
thirdButton = true,
1801+
confirmText = stringResource(R.string.permission_grant),
1802+
thirdText = stringResource(R.string.permission_details),
1803+
icon = {
1804+
Icon(Icons.Default.Security,"")
1805+
},
1806+
onConfirm = {
1807+
Log.d("PermissionDialog","Attempt to run permission grant!")
1808+
multiplePermissionLauncher.launch(permissionRequests)
1809+
Log.d("PermissionDialog","Is it done?")
1810+
// attemptPermission.value = false
1811+
anViewModel.openPermissionRequest(false)
1812+
},
1813+
onThirdButton = {
1814+
startIntent(
1815+
context, Intent(
1816+
Settings.ACTION_APPLICATION_DETAILS_SETTINGS,
1817+
Uri.fromParts("package", packageName, null)
1818+
)
1819+
)
1820+
// attemptPermission.value = false
1821+
anViewModel.openPermissionRequest(false)
1822+
},
1823+
onDismissRequest = {
1824+
// attemptPermission.value = false
1825+
anViewModel.openPermissionRequest(false)
1826+
},
1827+
tts = tts,
1828+
)
1829+
}
1830+
anViewModel.visiblePermissionDialogQueue
1831+
.reversed()
1832+
.forEach{ permission ->
1833+
PermissionDialog(
1834+
permissionsTextProvider = when(permission){
1835+
Manifest.permission.READ_EXTERNAL_STORAGE -> {
1836+
ReadFilePermissionTextProvider()
1837+
}
1838+
Manifest.permission.WRITE_EXTERNAL_STORAGE -> {
1839+
WriteFilePermissionTextProvider()
1840+
}
1841+
Manifest.permission.CAMERA -> {
1842+
CameraPermissionTextProvider()
1843+
}
1844+
Manifest.permission.RECORD_AUDIO -> {
1845+
RecordAudioPermissionTextProvider()
1846+
}
1847+
Manifest.permission.CALL_PHONE -> {
1848+
PhoneCallPermissionTextProvider()
1849+
}
1850+
Manifest.permission.READ_PHONE_STATE -> {
1851+
PhoneStatePermissionTextProvider()
1852+
}
1853+
else -> return@forEach
1854+
},
1855+
isPermanentlyDeclined = !shouldShowRequestPermissionRationale(
1856+
activityHandOver,
1857+
permission,
1858+
),
1859+
onDismiss = anViewModel::dissmissPermissionDialog,
1860+
onOkClick = {
1861+
anViewModel.dissmissPermissionDialog()
1862+
multiplePermissionLauncher.launch(
1863+
arrayOf(permission)
1864+
)
1865+
},
1866+
onGoToAppSettingClick = {
1867+
1868+
startIntent(
1869+
context, Intent(
1870+
Settings.ACTION_APPLICATION_DETAILS_SETTINGS,
1871+
Uri.fromParts("package", packageName, null)
1872+
)
1873+
)
1874+
}
1875+
)
1876+
}
17931877
}
17941878

17951879
private fun goBackHome(

0 commit comments

Comments
 (0)