android: 2.14.0 - minSdk 23 + adaptive navigation (Stage 3)
- minSdkVersion 21 -> 23 (device is Android 17, no other users); jni Application.mk: APP_PLATFORM android-23 + -DHAVE_SIGWAITINFO (the NDK sysroot declares sigwaitinfo since API 23, conflicting with strongSwan's fallback prototype; the system implementation is used now) - replace the bottom NavigationBar with NavigationSuiteScaffold (bottom bar on phones, navigation rail in landscape/on tablets); item colors keep the brand palette via NavigationSuiteItemColors(bar/rail/drawer) - HomeScreen applies statusBarsPadding itself (the adaptive scaffold no longer pads the content area) - predictive back was already enabled (android:enableOnBackInvokedCallback)
This commit is contained in:
1 parent
285d14e996
commit
2c69cbe775
4 files changed
+82
-44
No files matched your search
@@ -34,11 +34,11 @@ android {
|
||||
defaultConfig {
|
||||
applicationId "one.shx.strongswan.ext"
|
||||
compileSdk = 36
|
||||
minSdkVersion 21
|
||||
minSdkVersion 23
|
||||
targetSdkVersion 36
|
||||
|
||||
versionCode 152
|
||||
versionName "2.13.15"
|
||||
versionCode 153
|
||||
versionName "2.14.0"
|
||||
|
||||
/* Base URL of the update storage, trailing slash included */
|
||||
buildConfigField "String", "UPDATE_BASE_URL", "\"${updateBaseUrl}\""
|
||||
@@ -146,15 +146,15 @@ dependencies {
|
||||
implementation 'androidx.work:work-runtime-ktx:2.10.1'
|
||||
implementation 'com.google.android.material:material:1.13.0'
|
||||
|
||||
/* BOM 2025.12.01 (compose 1.10) требует minSdk 23 — приложение поддерживает API 21.
|
||||
2025.09.01 = первый BOM с material3 1.4.0 (Expressive) на compose 1.9 (minSdk 21). */
|
||||
/* BOM 2025.12.01 (compose 1.10, Expressive-тема) — отдельная задача после
|
||||
стабилизации; 2025.09.01 = material3 1.4.0 на compose 1.9. */
|
||||
def composeBom = platform('androidx.compose:compose-bom:2025.09.01')
|
||||
implementation composeBom
|
||||
implementation 'androidx.compose.ui:ui'
|
||||
implementation 'androidx.compose.material3:material3'
|
||||
implementation 'androidx.compose.material3:material3-window-size-class'
|
||||
/* adaptive-navigation-suite требует minSdk 23 (adaptive:1.2.0) — подключить на этапе 3
|
||||
вместе с решением о minSdk; сейчас приложение поддерживает API 21 */
|
||||
/* adaptive-navigation-suite (NavigationSuiteScaffold): BOM 1.4.0, требует minSdk 23 */
|
||||
implementation 'androidx.compose.material3:material3-adaptive-navigation-suite'
|
||||
implementation 'androidx.compose.material:material-icons-extended'
|
||||
implementation 'androidx.activity:activity-compose:1.11.0'
|
||||
implementation 'androidx.navigation:navigation-compose:2.9.4'
|
||||
|
||||
Reference in new issue
Block a user