admin/rider-pro-android-app
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

暗黑模式按钮、更新弹框文案

Browse Source
This commit is contained in:
Kevinlinpr
2024-10-26 06:53:47 +08:00
parent e38c36aa2c
commit 8dca3e8de1
6 changed files with 135 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
app/src/main/java/com/aiosman/riderpro/MainActivity.kt
View File

@@ -25,6 +25,7 @@ import androidx.compose.animation.SharedTransitionScope
import androidx.compose.runtime.LaunchedEffect
import androidx.compose.runtime.compositionLocalOf
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.stringResource
import androidx.core.content.ContextCompat
import androidx.core.view.WindowCompat
import androidx.lifecycle.ProcessLifecycleOwner
@@ -112,15 +113,16 @@ class MainActivity : ComponentActivity() {
private fun showUpdateDialog(updateInfo: UpdateInfo) {
val builder = AlertDialog.Builder(this)
builder.setTitle("发现新版本 v${updateInfo.versionName}")
builder.setTitle("🔴 ${getString(R.string.update_find_new_version)} v${updateInfo.versionName}")
builder.setMessage(updateInfo.updateContent)
builder.setPositiveButton("立即更新") { dialog, _ ->
builder.setPositiveButton(R.string.update_update_now) { dialog, _ ->
downloadApk(updateInfo.downloadUrl,updateInfo.versionName)
dialog.dismiss()
}
if (!updateInfo.forceUpdate) {
builder.setNegativeButton("稍后再说") { dialog, _ ->
builder.setNegativeButton(R.string.update_later) { dialog, _ ->
dialog.dismiss()
}
} else {

28
app/src/main/java/com/aiosman/riderpro/ui/index/tabs/profile/ProfileV3.kt
View File

@@ -3,6 +3,7 @@ package com.aiosman.riderpro.ui.index.tabs.profile
import android.content.Context
import android.content.Intent
import android.net.Uri
import android.widget.Toast
import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.foundation.Image
import androidx.compose.foundation.background
@@ -33,6 +34,7 @@ import androidx.compose.foundation.verticalScroll
import androidx.compose.material.ExperimentalMaterialApi
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Add
import androidx.compose.material.icons.filled.Refresh
import androidx.compose.material.pullrefresh.PullRefreshIndicator
import androidx.compose.material.pullrefresh.pullRefresh
import androidx.compose.material.pullrefresh.rememberPullRefreshState
@@ -61,6 +63,7 @@ import androidx.paging.PagingData
import androidx.paging.compose.collectAsLazyPagingItems
import com.aiosman.riderpro.AppColors
import com.aiosman.riderpro.AppState
import com.aiosman.riderpro.AppStore
import com.aiosman.riderpro.ConstVars
import com.aiosman.riderpro.LocalNavController
import com.aiosman.riderpro.R
@@ -282,6 +285,16 @@ fun ProfileV3(
scope.launch {
navController.navigate(NavigationRoute.FavouriteList.route)
}
},
MenuItem(
stringResource(R.string.dark_mode),
R.drawable.rider_pro_theme_mode_light
) {
expanded = false
scope.launch {
AppStore.saveDarkMode(!AppState.darkMode)
Toast.makeText(context, "Theme mode changed,please restart app", Toast.LENGTH_SHORT).show()
}
}
)
)
@@ -334,10 +347,6 @@ fun ProfileV3(
}
}
// collapsed bar
}
}
@@ -399,6 +408,7 @@ fun ProfileV3(
tint = AppColors.text
)
}
val themeModeString = if (AppState.darkMode) R.string.light_mode else R.string.dark_mode
DropdownMenu(
expanded = minibarExpanded,
onDismissRequest = { minibarExpanded = false },
@@ -435,6 +445,16 @@ fun ProfileV3(
scope.launch {
navController.navigate(NavigationRoute.FavouriteList.route)
}
},
MenuItem(
stringResource(themeModeString),
R.drawable.rider_pro_theme_mode_light
) {
minibarExpanded = false
scope.launch {
AppStore.saveDarkMode(!AppState.darkMode)
Toast.makeText(context, "Theme mode changed,please restart app", Toast.LENGTH_SHORT).show()
}
}
)
)

48
app/src/main/res/drawable/rider_pro_theme_mode.xml Normal file
View File

@@ -0,0 +1,48 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="20.053dp"
android:height="22dp"
android:viewportWidth="20.053"
android:viewportHeight="22">
<path
android:pathData="M10.026,11m-5.5,0a5.5,5.5 0,1 1,11 0a5.5,5.5 0,1 1,-11 0"
android:strokeWidth="2"
android:fillColor="#00000000"
android:strokeColor="#FFFFFF"
android:fillType="evenOdd"/>
<path
android:pathData="M10.026,0L10.026,0A1,1 0,0 1,11.026 1L11.026,2A1,1 0,0 1,10.026 3L10.026,3A1,1 0,0 1,9.026 2L9.026,1A1,1 0,0 1,10.026 0z"
android:strokeWidth="1"
android:fillColor="#FFFFFF"
android:fillType="evenOdd"
android:strokeColor="#00000000"/>
<path
android:pathData="M19.553,5.5L19.553,5.5A1,1 86.744,0 1,19.187 6.866L18.321,7.366A1,1 104.381,0 1,16.954 7L16.954,7A1,1 104.381,0 1,17.321 5.634L18.187,5.134A1,1 86.744,0 1,19.553 5.5z"
android:strokeWidth="1"
android:fillColor="#FFFFFF"
android:fillType="evenOdd"
android:strokeColor="#00000000"/>
<path
android:pathData="M19.553,16.5L19.553,16.5A1,1 88.45,0 1,18.187 16.866L17.321,16.366A1,1 128.042,0 1,16.954 15L16.954,15A1,1 128.042,0 1,18.321 14.634L19.187,15.134A1,1 88.45,0 1,19.553 16.5z"
android:strokeWidth="1"
android:fillColor="#FFFFFF"
android:fillType="evenOdd"
android:strokeColor="#00000000"/>
<path
android:pathData="M10.026,22L10.026,22A1,1 0,0 1,9.026 21L9.026,20A1,1 0,0 1,10.026 19L10.026,19A1,1 0,0 1,11.026 20L11.026,21A1,1 0,0 1,10.026 22z"
android:strokeWidth="1"
android:fillColor="#FFFFFF"
android:fillType="evenOdd"
android:strokeColor="#00000000"/>
<path
android:pathData="M0.5,16.5L0.5,16.5A1,1 104.381,0 1,0.866 15.134L1.732,14.634A1,1 104.381,0 1,3.098 15L3.098,15A1,1 72.827,0 1,2.732 16.366L1.866,16.866A1,1 88.177,0 1,0.5 16.5z"
android:strokeWidth="1"
android:fillColor="#FFFFFF"
android:fillType="evenOdd"
android:strokeColor="#00000000"/>
<path
android:pathData="M0.5,5.5L0.5,5.5A1,1 84.002,0 1,1.866 5.134L2.732,5.634A1,1 84.002,0 1,3.098 7L3.098,7A1,1 121.717,0 1,1.732 7.366L0.866,6.866A1,1 84.002,0 1,0.5 5.5z"
android:strokeWidth="1"
android:fillColor="#FFFFFF"
android:fillType="evenOdd"
android:strokeColor="#00000000"/>
</vector>

48
app/src/main/res/drawable/rider_pro_theme_mode_light.xml Normal file
View File

@@ -0,0 +1,48 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="20.053dp"
android:height="22dp"
android:viewportWidth="20.053"
android:viewportHeight="22">
<path
android:pathData="M10.026,11m-5.5,0a5.5,5.5 0,1 1,11 0a5.5,5.5 0,1 1,-11 0"
android:strokeWidth="2"
android:fillColor="#00000000"
android:strokeColor="#151515"
android:fillType="evenOdd"/>
<path
android:pathData="M10.026,0L10.026,0A1,1 0,0 1,11.026 1L11.026,2A1,1 0,0 1,10.026 3L10.026,3A1,1 0,0 1,9.026 2L9.026,1A1,1 0,0 1,10.026 0z"
android:strokeWidth="1"
android:fillColor="#151515"
android:fillType="evenOdd"
android:strokeColor="#00000000"/>
<path
android:pathData="M19.553,5.5L19.553,5.5A1,1 86.744,0 1,19.187 6.866L18.321,7.366A1,1 104.381,0 1,16.954 7L16.954,7A1,1 104.381,0 1,17.321 5.634L18.187,5.134A1,1 86.744,0 1,19.553 5.5z"
android:strokeWidth="1"
android:fillColor="#151515"
android:fillType="evenOdd"
android:strokeColor="#00000000"/>
<path
android:pathData="M19.553,16.5L19.553,16.5A1,1 88.45,0 1,18.187 16.866L17.321,16.366A1,1 128.042,0 1,16.954 15L16.954,15A1,1 128.042,0 1,18.321 14.634L19.187,15.134A1,1 88.45,0 1,19.553 16.5z"
android:strokeWidth="1"
android:fillColor="#151515"
android:fillType="evenOdd"
android:strokeColor="#00000000"/>
<path
android:pathData="M10.026,22L10.026,22A1,1 0,0 1,9.026 21L9.026,20A1,1 0,0 1,10.026 19L10.026,19A1,1 0,0 1,11.026 20L11.026,21A1,1 0,0 1,10.026 22z"
android:strokeWidth="1"
android:fillColor="#151515"
android:fillType="evenOdd"
android:strokeColor="#00000000"/>
<path
android:pathData="M0.5,16.5L0.5,16.5A1,1 104.381,0 1,0.866 15.134L1.732,14.634A1,1 104.381,0 1,3.098 15L3.098,15A1,1 72.827,0 1,2.732 16.366L1.866,16.866A1,1 88.177,0 1,0.5 16.5z"
android:strokeWidth="1"
android:fillColor="#151515"
android:fillType="evenOdd"
android:strokeColor="#00000000"/>
<path
android:pathData="M0.5,5.5L0.5,5.5A1,1 84.002,0 1,1.866 5.134L2.732,5.634A1,1 84.002,0 1,3.098 7L3.098,7A1,1 121.717,0 1,1.732 7.366L0.866,6.866A1,1 84.002,0 1,0.5 5.5z"
android:strokeWidth="1"
android:fillColor="#151515"
android:fillType="evenOdd"
android:strokeColor="#00000000"/>
</vector>

5
app/src/main/res/values-zh/strings.xml
View File

@@ -61,6 +61,11 @@
<string name="download">下载</string>
<string name="original">原始图片</string>
<string name="favourites">收藏</string>
<string name="dark_mode">暗黑模式</string>
<string name="light_mode">明亮模式</string>
<string name="update_find_new_version">发现新版本</string>
<string name="update_update_now">立即更新</string>
<string name="update_later">稍后再说</string>
<string name="delete">删除</string>
<string name="copy">复制</string>
<string name="like">点赞</string>

5
app/src/main/res/values/strings.xml
View File

@@ -60,6 +60,11 @@
<string name="download">Download</string>
<string name="original">Original</string>
<string name="favourites">Favourite</string>
<string name="dark_mode">Dark Mode</string>
<string name="light_mode">Light Mode</string>
<string name="update_find_new_version">New version</string>
<string name="update_update_now">Update Now</string>
<string name="update_later">Later</string>
<string name="delete">Delete</string>
<string name="copy">Copy</string>
<string name="like">Like</string>