feat: cleanup dialog UIs
This commit is contained in:
rushiiMachine
parent
21e4a60fb3
commit
0b32488736
7 changed files with 65 additions and 6 deletions
|
|
@ -4,6 +4,7 @@ import androidx.compose.material3.*
|
|||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.ui.res.painterResource
|
||||
import androidx.compose.ui.res.stringResource
|
||||
import androidx.compose.ui.text.style.TextAlign
|
||||
import com.aliucord.manager.R
|
||||
|
||||
@Composable
|
||||
|
|
@ -35,7 +36,12 @@ fun AlternativeDownloaderDialog(
|
|||
}
|
||||
},
|
||||
title = { Text(stringResource(R.string.alt_downloader_dialog_title)) },
|
||||
text = { Text(stringResource(R.string.alt_downloader_dialog_desc)) },
|
||||
text = {
|
||||
Text(
|
||||
text = stringResource(R.string.alt_downloader_dialog_desc),
|
||||
textAlign = TextAlign.Center,
|
||||
)
|
||||
},
|
||||
icon = { Icon(painterResource(R.drawable.ic_download), contentDescription = null) },
|
||||
)
|
||||
}
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ import androidx.compose.material.icons.filled.Warning
|
|||
import androidx.compose.material3.*
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.ui.res.stringResource
|
||||
import androidx.compose.ui.text.style.TextAlign
|
||||
import com.aliucord.manager.R
|
||||
|
||||
@Composable
|
||||
|
|
@ -39,7 +40,10 @@ fun InstallerAbortDialog(
|
|||
Text(stringResource(R.string.installer_abort_title))
|
||||
},
|
||||
text = {
|
||||
Text(stringResource(R.string.installer_abort_body))
|
||||
Text(
|
||||
text = stringResource(R.string.installer_abort_body),
|
||||
textAlign = TextAlign.Center,
|
||||
)
|
||||
},
|
||||
icon = {
|
||||
Icon(Icons.Filled.Warning, contentDescription = null)
|
||||
|
|
|
|||
|
|
@ -5,6 +5,7 @@ import androidx.compose.material.icons.filled.Warning
|
|||
import androidx.compose.material3.*
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.ui.res.stringResource
|
||||
import androidx.compose.ui.text.style.TextAlign
|
||||
import androidx.compose.ui.window.DialogProperties
|
||||
import com.aliucord.manager.R
|
||||
|
||||
|
|
@ -40,7 +41,12 @@ fun NetworkWarningDialog(
|
|||
}
|
||||
},
|
||||
title = { Text(stringResource(R.string.network_warning_title)) },
|
||||
text = { Text(stringResource(R.string.network_warning_body)) },
|
||||
text = {
|
||||
Text(
|
||||
text = stringResource(R.string.network_warning_body),
|
||||
textAlign = TextAlign.Center,
|
||||
)
|
||||
},
|
||||
icon = { Icon(Icons.Filled.Warning, contentDescription = null) },
|
||||
containerColor = MaterialTheme.colorScheme.errorContainer,
|
||||
iconContentColor = MaterialTheme.colorScheme.onErrorContainer,
|
||||
|
|
|
|||
|
|
@ -8,9 +8,14 @@ import android.provider.Settings
|
|||
import androidx.activity.compose.rememberLauncherForActivityResult
|
||||
import androidx.activity.result.contract.ActivityResultContracts
|
||||
import androidx.annotation.RequiresApi
|
||||
import androidx.compose.foundation.layout.size
|
||||
import androidx.compose.material3.*
|
||||
import androidx.compose.runtime.*
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.res.painterResource
|
||||
import androidx.compose.ui.res.stringResource
|
||||
import androidx.compose.ui.text.style.TextAlign
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.compose.ui.window.DialogProperties
|
||||
import androidx.core.net.toUri
|
||||
import com.aliucord.manager.BuildConfig
|
||||
|
|
@ -51,8 +56,20 @@ private fun ManageStorageDialog() {
|
|||
Text(stringResource(R.string.action_open_settings))
|
||||
}
|
||||
},
|
||||
icon = {
|
||||
Icon(
|
||||
painter = painterResource(R.drawable.ic_tools),
|
||||
contentDescription = null,
|
||||
modifier = Modifier.size(32.dp),
|
||||
)
|
||||
},
|
||||
title = { Text(stringResource(R.string.permissions_grant_title)) },
|
||||
text = { Text(stringResource(R.string.storage_permissions_grant_body)) },
|
||||
text = {
|
||||
Text(
|
||||
text = stringResource(R.string.storage_permissions_grant_body),
|
||||
textAlign = TextAlign.Center,
|
||||
)
|
||||
},
|
||||
properties = DialogProperties(
|
||||
dismissOnBackPress = false,
|
||||
dismissOnClickOutside = false
|
||||
|
|
|
|||
|
|
@ -5,10 +5,15 @@ import android.os.Build
|
|||
import android.provider.Settings
|
||||
import androidx.activity.compose.rememberLauncherForActivityResult
|
||||
import androidx.activity.result.contract.ActivityResultContracts
|
||||
import androidx.compose.foundation.layout.size
|
||||
import androidx.compose.material3.*
|
||||
import androidx.compose.runtime.*
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.platform.LocalContext
|
||||
import androidx.compose.ui.res.painterResource
|
||||
import androidx.compose.ui.res.stringResource
|
||||
import androidx.compose.ui.text.style.TextAlign
|
||||
import androidx.compose.ui.unit.dp
|
||||
import androidx.compose.ui.window.DialogProperties
|
||||
import androidx.core.net.toUri
|
||||
import com.aliucord.manager.BuildConfig
|
||||
|
|
@ -40,8 +45,20 @@ fun UnknownSourcesPermissionDialog() {
|
|||
Text(stringResource(R.string.action_open_settings))
|
||||
}
|
||||
},
|
||||
icon = {
|
||||
Icon(
|
||||
painter = painterResource(R.drawable.ic_tools),
|
||||
contentDescription = null,
|
||||
modifier = Modifier.size(32.dp),
|
||||
)
|
||||
},
|
||||
title = { Text(stringResource(R.string.permissions_grant_title)) },
|
||||
text = { Text(stringResource(R.string.install_permissions_grant_body)) },
|
||||
text = {
|
||||
Text(
|
||||
text = stringResource(R.string.install_permissions_grant_body),
|
||||
textAlign = TextAlign.Center,
|
||||
)
|
||||
},
|
||||
properties = DialogProperties(
|
||||
dismissOnBackPress = false,
|
||||
dismissOnClickOutside = false
|
||||
|
|
|
|||
9
app/src/main/res/drawable/ic_tools.xml
Normal file
9
app/src/main/res/drawable/ic_tools.xml
Normal file
|
|
@ -0,0 +1,9 @@
|
|||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:width="24dp"
|
||||
android:height="24dp"
|
||||
android:viewportWidth="960"
|
||||
android:viewportHeight="960">
|
||||
<path
|
||||
android:fillColor="#e8eaed"
|
||||
android:pathData="M714.48,803.5 L537,626.02l89.02,-89.26 177.72,177.72q18.19,18.19 18.19,44.51 0,26.31 -18.19,44.51 -18.2,18.2 -44.63,18.2 -26.44,0 -44.63,-18.2ZM156.26,803.5q-18.19,-18.2 -18.19,-44.63 0,-26.44 18.19,-44.63l234.48,-234.48 -68.72,-68.72q-11,11 -27.88,11t-28.12,-11l-19.65,-19.41v83.3q0,15.68 -13.79,21.4 -13.8,5.71 -24.99,-5.48L97.87,381.13q-11.2,-11.2 -5.48,-24.99 5.72,-13.79 21.39,-13.79h83.31l-16.74,-16.74q-12.72,-12.72 -12.6,-30.03 0.12,-17.32 12.84,-30.04l114.48,-114.47q20.47,-20.48 44.55,-29.84t49.03,-9.36q19.52,0 37.98,5.76 18.46,5.76 34.98,17.52 8.96,5.72 9.57,16.03 0.62,10.32 -7.33,18.28l-74.81,74.8 21.76,21.76q11,11 11,28t-11,28l68.96,68.96 89.76,-89.76q-3.76,-10.76 -6.14,-22.64T561,254.93q0,-60.43 41.58,-102.13 41.57,-41.69 102.01,-41.69 8.48,0 16.07,0.74 7.6,0.74 15.08,2.74 9.96,3.48 12.46,14.05 2.5,10.58 -5.22,18.29l-61.18,61.42q-6.71,6.72 -6.71,15.91 0,9.2 6.71,15.91l37.55,37.55q6.72,6.71 15.91,6.71 9.2,0 15.91,-6.71l61.42,-61.42q7.95,-7.95 18.53,-5.83 10.58,2.12 14.29,13.07 2.24,7.72 2.86,15.32 0.62,7.6 0.62,16.07 0,60.44 -41.93,102.02 -41.94,41.57 -102.37,41.57 -11.76,0 -23.41,-2 -11.64,-2 -22.4,-6.52L245.52,803.5q-18.19,18.2 -44.63,18.2 -26.43,0 -44.63,-18.2Z" />
|
||||
</vector>
|
||||
|
|
@ -34,7 +34,7 @@
|
|||
|
||||
<string name="permissions_grant_title">Grant Permissions</string>
|
||||
<string name="storage_permissions_grant_body">In order for Aliucord Manager to function, file permissions are required. Since shared data is stored in ~/Aliucord, permissions are required in order to access it.</string>
|
||||
<string name="install_permissions_grant_body">Installing Aliucord requires permissions to install apps from unknown sources.</string>
|
||||
<string name="install_permissions_grant_body">Installing Aliucord requires granting permissions to install apps from unknown sources.</string>
|
||||
|
||||
<string name="installs_no_installs">No installations found!</string>
|
||||
<string name="launch_aliucord_fail">Failed to launch Aliucord</string>
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue