release: v1.2.2 - add about screen, migrate update server to VPS, and optimize UI
This commit is contained in:
1 parent
32fa4a611a
commit
94aa2c6ea2
16 files changed
+526
-363
No files matched your search
@@ -1,44 +1,70 @@
|
||||
<div align="center">
|
||||
<p align="center">
|
||||
<img src="assets/logo.png" width="128" height="128" alt="OpenLoc Logo" />
|
||||
</p>
|
||||
|
||||
<img src="assets/logo.png" width="128" height="128" alt="OpenLoc Logo" />
|
||||
<h1 align="center">OpenLoc</h1>
|
||||
|
||||
# OpenLoc
|
||||
|
||||
专为 Android 平台设计的现代地理位置模拟与隐私辅助工具
|
||||
<p align="center">
|
||||
专为 Android 平台设计的现代地理位置模拟与隐私辅助工具
|
||||
</p>
|
||||
|
||||
<p align="center">
|
||||
<img src="https://img.shields.io/badge/Platform-Android-3DDC84?style=flat-square&logo=android&logoColor=white" alt="Platform" />
|
||||
<img src="https://img.shields.io/badge/Language-Kotlin-7F52FF?style=flat-square&logo=kotlin&logoColor=white" alt="Language" />
|
||||
<img src="https://img.shields.io/badge/UI-Jetpack_Compose_/_Material_3-4285F4?style=flat-square&logo=jetpackcompose&logoColor=white" alt="UI" />
|
||||
<img src="https://img.shields.io/badge/Privacy-Local_Only-00C853?style=flat-square" alt="Privacy" />
|
||||
<img src="https://img.shields.io/badge/UI-Jetpack%20Compose%20%2F%20Material%203-4285F4?style=flat-square&logo=jetpackcompose&logoColor=white" alt="UI" />
|
||||
<br>
|
||||
<img src="https://img.shields.io/badge/Privacy-Local%20Only-00C853?style=flat-square" alt="Privacy" />
|
||||
<img src="https://img.shields.io/badge/License-GPL--3.0-007AFF?style=flat-square" alt="License" />
|
||||
</p>
|
||||
|
||||
</div>
|
||||
<p align="center">
|
||||
<b>简体中文</b> | <a href="README_EN.md">English</a>
|
||||
</p>
|
||||
|
||||
---
|
||||
|
||||
## 软件用途
|
||||
OpenLoc 旨在为开发者、测试人员以及关注个人数字隐私的用户提供安全、可控且纯净的位置环境模拟服务。基于 Xposed / LSPosed 运行时注入与现代 Android 架构设计,提供高拟真、无残留的多维环境模拟能力。
|
||||
|
||||
OpenLoc 旨在为开发者、测试人员以及关注个人数字隐私的用户提供安全、可控且纯净的位置环境模拟服务,主要用于以下场景:
|
||||
---
|
||||
|
||||
- **位置环境模拟**
|
||||
支持在地图上自由选定目标位置或精确检索地理坐标,为应用提供自定义的虚拟定位环境,便于进行基于位置的应用功能开发与场景联调。
|
||||
## 核心实现架构
|
||||
|
||||
- **应用作用域管控**
|
||||
支持全局模式、黑名单模式与白名单模式,用户可灵活指定哪些应用接收模拟位置、哪些应用使用真实网络环境,避免影响日常无关应用的正常使用。
|
||||
### 1. 底层 Hook 与多维定位拦截
|
||||
- **系统层级深度劫持**:通过 Xposed 框架深度挂钩 Android 系统底层 `LocationManagerService`、网络定位提供者及第三方 NLP 接口,接管全球卫星导航、网络基站与 Wi-Fi 扫描结果。
|
||||
- **内存级模拟脱敏**:在内存对象层实时抹除 `isMock` 与 `mIsFromMockProvider` 标志,从源头消除底层定位模拟特征。
|
||||
- **模块包名自隐匿**:针对受控目标应用动态隐藏 OpenLoc 自身的安装包信息,有效防御应用通过 `PackageManager` 扫描安装列表以识别模块存在的行为。
|
||||
|
||||
- **常用地点快捷收藏**
|
||||
提供便捷的地点收藏与管理功能,支持常用测试点位或兴趣位置的自定义命名、快速切换与拖拽排序。
|
||||
### 2. 多维拟真与防检测矩阵
|
||||
- **自然位置微漂移**:采用高斯平滑滤波与布朗运动随机游走模型,动态生成拟真经纬度微小漂移,防止因坐标绝对静止触发服务端风控策略。
|
||||
- **全星座卫星信号仿真**:支持 GPS、北斗(BeiDou)、GLONASS、Galileo 等主流卫星星座的物理载噪比与伪距仿真,动态生成合规的全量 NMEA GSV/GSA 报文流。
|
||||
- **生物手持生理拟真**:向设备传感器层注入微弱的生理微颤信号,模拟手持设备日常轻微晃动,规避步态与姿态静止监测。
|
||||
- **基站小区与 Wi-Fi 防反查**:针对周围蜂窝基站(Cell Tower)与 Wi-Fi 接入点(BSSID)进行脱敏混淆,杜绝目标应用上传网络指纹至云端数据库反查真实物理位置。
|
||||
|
||||
- **多维环境拟真与隐私防护**
|
||||
在提供虚拟坐标的同时,协同拟真设备在日常手持、运动状态下的环境表现,避免单一静态坐标导致的数据异常,有效防止个人真实物理行踪的过度获取与隐私泄露。
|
||||
### 3. 应用作用域精细化管控
|
||||
- **多维度生效策略**:
|
||||
- **全局模式**:整机所有应用统一接收模拟位置。
|
||||
- **黑名单模式**:黑名单内的特定应用保持真实物理定位,其余应用接收模拟位置。
|
||||
- **白名单模式**:仅白名单指定的应用接收模拟位置,其余应用保持真实定位。
|
||||
- **高效应用检索**:内置快速搜索、分类筛选(系统应用/用户应用)以及全选/全不选批处理能力。
|
||||
|
||||
- **纯粹无干扰的交互体验**
|
||||
基于 Material 3 现代设计语言构建,界面简洁直观,无后台冗余常驻,注重工具属性的克制与易用性。
|
||||
### 4. 交互式地图与地点管理
|
||||
- **现代化地图选点**:集成 OpenStreetMap 地图引擎,提供流畅的手势选点、缩放与精准坐标拾取体验。
|
||||
- **多引擎智能检索**:支持高德地图、百度地图、Photon、Nominatim 等多元化位置搜索引擎与经纬度坐标直达。
|
||||
- **常用地点收藏夹**:支持收藏自定义命名地点,提供即时选定、拖拽排序与离线存储管理。
|
||||
|
||||
### 5. 纯净体验与全站国际化
|
||||
- **Jetpack Compose & Material 3**:采用现代声明式 UI 体系构建,深度支持 Material You 壁纸动态取色与多套质感主题色切换。
|
||||
- **全站国际化(i18n)**:UI 界面文字完全解耦,支持简体中文与英文多语言环境,严格禁止硬编码。
|
||||
- **本地纯净运行**:无任何非必要的后台常驻常驻驻留进程,隐私数据完全保留于设备本地。
|
||||
|
||||
---
|
||||
|
||||
## 免责声明
|
||||
|
||||
本软件仅供合法的软件开发调试、学术研究、定位功能测试及个人隐私保护使用,请勿用于任何违反法律法规或破坏第三方服务协议的用途。
|
||||
|
||||
---
|
||||
|
||||
## 开源协议
|
||||
|
||||
本项目基于 **GNU General Public License v3.0 (GPL-3.0)** 协议开源。详细条款请参阅 [LICENSE](LICENSE) 文件。
|
||||
@@ -0,0 +1,70 @@
|
||||
<p align="center">
|
||||
<img src="assets/logo.png" width="128" height="128" alt="OpenLoc Logo" />
|
||||
</p>
|
||||
|
||||
<h1 align="center">OpenLoc</h1>
|
||||
|
||||
<p align="center">
|
||||
A modern location simulation and privacy assistant tailored for the Android platform
|
||||
</p>
|
||||
|
||||
<p align="center">
|
||||
<img src="https://img.shields.io/badge/Platform-Android-3DDC84?style=flat-square&logo=android&logoColor=white" alt="Platform" />
|
||||
<img src="https://img.shields.io/badge/Language-Kotlin-7F52FF?style=flat-square&logo=kotlin&logoColor=white" alt="Language" />
|
||||
<img src="https://img.shields.io/badge/UI-Jetpack%20Compose%20%2F%20Material%203-4285F4?style=flat-square&logo=jetpackcompose&logoColor=white" alt="UI" />
|
||||
<br>
|
||||
<img src="https://img.shields.io/badge/Privacy-Local%20Only-00C853?style=flat-square" alt="Privacy" />
|
||||
<img src="https://img.shields.io/badge/License-GPL--3.0-007AFF?style=flat-square" alt="License" />
|
||||
</p>
|
||||
|
||||
<p align="center">
|
||||
<a href="README.md">简体中文</a> | <b>English</b>
|
||||
</p>
|
||||
|
||||
---
|
||||
|
||||
OpenLoc is designed for developers, QA engineers, and privacy-conscious users who require a secure, controllable, and clean mock location environment. Built on top of runtime hooking via Xposed / LSPosed alongside modern Android architectural components, OpenLoc delivers high-fidelity, residue-free multi-dimensional environmental simulation.
|
||||
|
||||
---
|
||||
|
||||
## Core Architecture & Implementation
|
||||
|
||||
### 1. Low-Level Hooking & Multi-Dimensional Geolocation Interception
|
||||
- **System-Level Deep Hooking**: Deeply hooks into Android's core `LocationManagerService`, network location providers, and third-party NLP frameworks via Xposed to intercept GNSS data, cellular base station scans, and Wi-Fi networks.
|
||||
- **In-Memory Mock Flag Sanitization**: Clears the `isMock` and `mIsFromMockProvider` fields in memory objects in real time, eliminating fundamental mock location signatures at the source.
|
||||
- **Module Package Self-Stealth**: Transparently conceals OpenLoc's own package information from monitored applications, defeating detection mechanisms that scan installed packages via `PackageManager`.
|
||||
|
||||
### 2. Multi-Dimensional Realism & Anti-Detection Matrix
|
||||
- **Natural Location Drift**: Employs Gaussian smoothing and Brownian motion random walk models to dynamically generate lifelike subtle coordinate drifts, preventing risk control alarms triggered by absolute static coordinates.
|
||||
- **Full Constellation GNSS Simulation**: Simulates physical Carrier-to-Noise ratio (C/N0) and pseudoranges across GPS, BeiDou, GLONASS, and Galileo constellations, generating compliant full-stream NMEA GSV/GSA sentences.
|
||||
- **Physiological Micro-Tremor Simulation**: Injects subtle physiological tremors into the device's accelerometer sensors, replicating natural handheld micro-movements to bypass gait and stationary posture detections.
|
||||
- **Cell Tower & Wi-Fi Camouflage**: Sanitizes and obfuscates nearby cellular cell identifiers and Wi-Fi BSSIDs, preventing apps from querying cloud fingerprint databases to trace real physical locations.
|
||||
|
||||
### 3. Granular Application Scope Management
|
||||
- **Versatile Scope Policies**:
|
||||
- **Global Mode**: All applications across the system receive simulated coordinates.
|
||||
- **Blacklist Mode**: Designated blacklisted applications retain real physical positioning, while all other applications receive simulated locations.
|
||||
- **Whitelist Mode**: Only explicitly whitelisted applications receive simulated locations, leaving all other applications untouched.
|
||||
- **Intuitive App Selector**: Equipped with fast search indexing, category filtering (System vs. User apps), and bulk selection capabilities.
|
||||
|
||||
### 4. Interactive Map & Favorites Management
|
||||
- **Modern Map Interaction**: Integrated with OpenStreetMap engine for fluid gestures, smooth zooming, and accurate coordinate selection.
|
||||
- **Multi-Engine Geosearch**: Supports diverse search providers including AMap, Baidu Maps, Photon, and Nominatim, with direct coordinate jump functionality.
|
||||
- **Favorites & Waypoints**: Save and name custom locations with instant switching, drag-to-reorder, and persistent local storage.
|
||||
|
||||
### 5. Clean Experience & Internationalization
|
||||
- **Jetpack Compose & Material 3**: Built with a modern declarative UI framework, supporting Material You dynamic color extraction and customizable palette themes with light/dark modes.
|
||||
- **Strict Internationalization (i18n)**: All UI strings are completely decoupled with zero hardcoded text, providing comprehensive native support for Simplified Chinese and English.
|
||||
- **Pure Local Execution**: Zero background daemon overhead and zero external analytics; all privacy configurations remain strictly on the local device.
|
||||
|
||||
---
|
||||
|
||||
## Disclaimer
|
||||
|
||||
This software is intended solely for legitimate software development, academic research, geolocation testing, and personal privacy protection. Please do not use it for any activity that violates laws, regulations, or third-party service agreements.
|
||||
|
||||
---
|
||||
|
||||
## License
|
||||
|
||||
This project is licensed under the **GNU General Public License v3.0 (GPL-3.0)**. See the [LICENSE](LICENSE) file for details.
|
||||
@@ -18,8 +18,8 @@ android {
|
||||
applicationId = "com.lzxnone.openloc"
|
||||
minSdk = 28
|
||||
targetSdk = 36
|
||||
versionCode = 4
|
||||
versionName = "1.2.1"
|
||||
versionCode = 5
|
||||
versionName = "1.2.2"
|
||||
|
||||
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
||||
}
|
||||
@@ -75,6 +75,7 @@ android {
|
||||
}
|
||||
buildFeatures {
|
||||
compose = true
|
||||
buildConfig = true
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,8 +1,11 @@
|
||||
package com.lzxnone.openloc.core.util
|
||||
|
||||
import com.lzxnone.openloc.BuildConfig
|
||||
import kotlinx.coroutines.Dispatchers
|
||||
import kotlinx.coroutines.withContext
|
||||
import org.json.JSONObject
|
||||
import java.io.BufferedReader
|
||||
import java.io.InputStreamReader
|
||||
import java.net.HttpURLConnection
|
||||
import java.net.URL
|
||||
|
||||
@@ -10,94 +13,64 @@ import java.net.URL
|
||||
* 版本更新信息
|
||||
*/
|
||||
data class UpdateInfo(
|
||||
val hasUpdate: Boolean,
|
||||
val latestVersion: String,
|
||||
val currentVersion: String,
|
||||
val releaseTitle: String,
|
||||
val versionCode: Long,
|
||||
val versionName: String,
|
||||
val changelog: String,
|
||||
val releaseUrl: String
|
||||
)
|
||||
val downloadUrl: String,
|
||||
val apkSize: String = ""
|
||||
) {
|
||||
val hasUpdate: Boolean
|
||||
get() = versionCode > BuildConfig.VERSION_CODE
|
||||
}
|
||||
|
||||
/**
|
||||
* GitHub Releases 版本更新检查器
|
||||
* VPS 节点自建版本更新检查器
|
||||
*/
|
||||
object UpdateChecker {
|
||||
private const val GITHUB_API_URL = "https://api.github.com/repos/lzxnone/openloc/releases/latest"
|
||||
private const val UPDATE_URL = "https://update.lzxnone.cloud/openloc/version.json"
|
||||
|
||||
/**
|
||||
* 检查 GitHub 是否有新版本
|
||||
* 检查是否有新版本
|
||||
*/
|
||||
suspend fun checkUpdate(currentVersion: String = "v1.2.1"): Result<UpdateInfo> = withContext(Dispatchers.IO) {
|
||||
suspend fun checkUpdate(): Result<UpdateInfo> = withContext(Dispatchers.IO) {
|
||||
try {
|
||||
val url = URL(GITHUB_API_URL)
|
||||
val conn = (url.openConnection() as HttpURLConnection).apply {
|
||||
requestMethod = "GET"
|
||||
val url = URL(UPDATE_URL)
|
||||
val connection = (url.openConnection() as HttpURLConnection).apply {
|
||||
connectTimeout = 8000
|
||||
readTimeout = 8000
|
||||
setRequestProperty("Accept", "application/vnd.github.v3+json")
|
||||
setRequestProperty("User-Agent", "OpenLoc-App")
|
||||
requestMethod = "GET"
|
||||
setRequestProperty("Accept", "application/json")
|
||||
setRequestProperty("User-Agent", "OpenLoc-Android")
|
||||
}
|
||||
|
||||
val code = conn.responseCode
|
||||
if (code == 200) {
|
||||
val responseText = conn.inputStream.bufferedReader().use { it.readText() }
|
||||
val json = JSONObject(responseText)
|
||||
val tagName = json.optString("tag_name", "").trim()
|
||||
val title = json.optString("name", tagName).trim()
|
||||
val body = json.optString("body", "").trim()
|
||||
val htmlUrl = json.optString("html_url", "https://github.com/lzxnone/openloc/releases").trim()
|
||||
val responseCode = connection.responseCode
|
||||
if (responseCode == HttpURLConnection.HTTP_OK) {
|
||||
val reader = BufferedReader(InputStreamReader(connection.inputStream, Charsets.UTF_8))
|
||||
val response = reader.use { it.readText() }
|
||||
connection.disconnect()
|
||||
|
||||
val json = JSONObject(response)
|
||||
val versionCode = json.optLong("versionCode", 0L)
|
||||
val versionName = json.optString("versionName", "")
|
||||
val changelog = json.optString("changelog", "")
|
||||
val downloadUrl = json.optString("downloadUrl", "")
|
||||
val apkSize = json.optString("apkSize", "")
|
||||
|
||||
val hasUpdate = isNewerVersion(tagName, currentVersion)
|
||||
Result.success(
|
||||
UpdateInfo(
|
||||
hasUpdate = hasUpdate,
|
||||
latestVersion = tagName.ifEmpty { currentVersion },
|
||||
currentVersion = currentVersion,
|
||||
releaseTitle = title.ifEmpty { tagName },
|
||||
changelog = body,
|
||||
releaseUrl = htmlUrl
|
||||
)
|
||||
)
|
||||
} else if (code == 404) {
|
||||
// 仓库尚未发布任何 Release 时 GitHub 会返回 404
|
||||
Result.success(
|
||||
UpdateInfo(
|
||||
hasUpdate = false,
|
||||
latestVersion = currentVersion,
|
||||
currentVersion = currentVersion,
|
||||
releaseTitle = "",
|
||||
changelog = "",
|
||||
releaseUrl = "https://github.com/lzxnone/openloc/releases"
|
||||
versionCode = versionCode,
|
||||
versionName = versionName,
|
||||
changelog = changelog,
|
||||
downloadUrl = downloadUrl,
|
||||
apkSize = apkSize
|
||||
)
|
||||
)
|
||||
} else {
|
||||
Result.failure(Exception("HTTP $code"))
|
||||
connection.disconnect()
|
||||
Result.failure(Exception("HTTP error $responseCode"))
|
||||
}
|
||||
} catch (e: Exception) {
|
||||
Result.failure(e)
|
||||
}
|
||||
}
|
||||
|
||||
/**
|
||||
* 比较版本号:remote > current 则返回 true
|
||||
*/
|
||||
fun isNewerVersion(remoteTag: String, currentVer: String): Boolean {
|
||||
if (remoteTag.isBlank()) return false
|
||||
val cleanRemote = remoteTag.trim().removePrefix("v").removePrefix("V")
|
||||
val cleanCurrent = currentVer.trim().removePrefix("v").removePrefix("V")
|
||||
|
||||
val remoteParts = cleanRemote.split(".").mapNotNull { it.toIntOrNull() }
|
||||
val currentParts = cleanCurrent.split(".").mapNotNull { it.toIntOrNull() }
|
||||
|
||||
if (remoteParts.isEmpty()) return false
|
||||
|
||||
val maxLen = maxOf(remoteParts.size, currentParts.size)
|
||||
for (i in 0 until maxLen) {
|
||||
val r = remoteParts.getOrElse(i) { 0 }
|
||||
val c = currentParts.getOrElse(i) { 0 }
|
||||
if (r > c) return true
|
||||
if (r < c) return false
|
||||
}
|
||||
return false
|
||||
}
|
||||
}
|
||||
@@ -122,6 +122,7 @@ object AppPreferences {
|
||||
private const val KEY_ENABLE_STEALTH = "enable_stealth"
|
||||
private const val KEY_ENABLE_DEV_CAMOUFLAGE = "enable_dev_camouflage"
|
||||
private const val KEY_AUTO_CHECK_UPDATE = "auto_check_update"
|
||||
private const val KEY_SUPPRESSED_UPDATE_VERSION = "suppressed_update_version"
|
||||
|
||||
var appLanguage by mutableStateOf(AppLanguage.SYSTEM)
|
||||
private set
|
||||
@@ -129,6 +130,9 @@ object AppPreferences {
|
||||
var isAutoCheckUpdateEnabled by mutableStateOf(true)
|
||||
private set
|
||||
|
||||
var suppressedUpdateVersionCode by mutableLongStateOf(0L)
|
||||
private set
|
||||
|
||||
|
||||
var searchProvider by mutableStateOf(SearchProvider.AMAP)
|
||||
private set
|
||||
@@ -235,6 +239,7 @@ object AppPreferences {
|
||||
isStealthEnabled = prefs.getBoolean(KEY_ENABLE_STEALTH, true)
|
||||
isDevCamouflageEnabled = prefs.getBoolean(KEY_ENABLE_DEV_CAMOUFLAGE, true)
|
||||
isAutoCheckUpdateEnabled = prefs.getBoolean(KEY_AUTO_CHECK_UPDATE, true)
|
||||
suppressedUpdateVersionCode = prefs.getLong(KEY_SUPPRESSED_UPDATE_VERSION, 0L)
|
||||
|
||||
syncConfigToSystem()
|
||||
}
|
||||
@@ -560,5 +565,10 @@ object AppPreferences {
|
||||
isAutoCheckUpdateEnabled = enabled
|
||||
prefs.edit().putBoolean(KEY_AUTO_CHECK_UPDATE, enabled).apply()
|
||||
}
|
||||
|
||||
fun updateSuppressedVersionCode(code: Long) {
|
||||
suppressedUpdateVersionCode = code
|
||||
prefs.edit().putLong(KEY_SUPPRESSED_UPDATE_VERSION, code).apply()
|
||||
}
|
||||
}
|
||||
|
||||
@@ -1,6 +1,10 @@
|
||||
package com.lzxnone.openloc.ui.components
|
||||
|
||||
import androidx.compose.material.icons.Icons
|
||||
import androidx.compose.material.icons.outlined.Info
|
||||
import androidx.compose.material3.ExperimentalMaterial3Api
|
||||
import androidx.compose.material3.Icon
|
||||
import androidx.compose.material3.IconButton
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.material3.Text
|
||||
import androidx.compose.material3.TopAppBar
|
||||
@@ -18,6 +22,8 @@ import com.lzxnone.openloc.R
|
||||
@Composable
|
||||
fun OpenLocTopBar(
|
||||
title: String = stringResource(id = R.string.app_name),
|
||||
onAboutClick: () -> Unit = {},
|
||||
showAboutAction: Boolean = true,
|
||||
modifier: Modifier = Modifier
|
||||
) {
|
||||
TopAppBar(
|
||||
@@ -29,6 +35,17 @@ fun OpenLocTopBar(
|
||||
)
|
||||
)
|
||||
},
|
||||
actions = {
|
||||
if (showAboutAction) {
|
||||
IconButton(onClick = onAboutClick) {
|
||||
Icon(
|
||||
imageVector = Icons.Outlined.Info,
|
||||
contentDescription = stringResource(id = R.string.section_about),
|
||||
tint = MaterialTheme.colorScheme.primary
|
||||
)
|
||||
}
|
||||
}
|
||||
},
|
||||
colors = TopAppBarDefaults.topAppBarColors(
|
||||
containerColor = MaterialTheme.colorScheme.background,
|
||||
titleContentColor = MaterialTheme.colorScheme.onBackground
|
||||
|
||||
@@ -4,18 +4,13 @@ import android.content.Context
|
||||
import android.content.Intent
|
||||
import android.net.Uri
|
||||
import androidx.compose.foundation.layout.Column
|
||||
import androidx.compose.foundation.layout.Spacer
|
||||
import androidx.compose.foundation.layout.Row
|
||||
import androidx.compose.foundation.layout.fillMaxWidth
|
||||
import androidx.compose.foundation.layout.height
|
||||
import androidx.compose.foundation.layout.heightIn
|
||||
import androidx.compose.foundation.layout.size
|
||||
import androidx.compose.foundation.rememberScrollState
|
||||
import androidx.compose.foundation.verticalScroll
|
||||
import androidx.compose.material.icons.Icons
|
||||
import androidx.compose.material.icons.outlined.NewReleases
|
||||
import androidx.compose.material3.AlertDialog
|
||||
import androidx.compose.material3.Button
|
||||
import androidx.compose.material3.Icon
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.material3.Text
|
||||
import androidx.compose.material3.TextButton
|
||||
@@ -34,28 +29,26 @@ import com.lzxnone.openloc.core.util.UpdateInfo
|
||||
@Composable
|
||||
fun UpdateDialog(
|
||||
updateInfo: UpdateInfo,
|
||||
onDismiss: () -> Unit
|
||||
onDismiss: () -> Unit,
|
||||
onDontShowAgain: (Long) -> Unit = {}
|
||||
) {
|
||||
val context = LocalContext.current
|
||||
val scrollState = rememberScrollState()
|
||||
|
||||
val displayVersion = if (updateInfo.versionName.startsWith("v", ignoreCase = true)) {
|
||||
"V" + updateInfo.versionName.substring(1)
|
||||
} else {
|
||||
"V${updateInfo.versionName}"
|
||||
}
|
||||
|
||||
AlertDialog(
|
||||
onDismissRequest = onDismiss,
|
||||
icon = {
|
||||
Icon(
|
||||
imageVector = Icons.Outlined.NewReleases,
|
||||
contentDescription = null,
|
||||
tint = MaterialTheme.colorScheme.primary,
|
||||
modifier = Modifier.size(32.dp)
|
||||
)
|
||||
},
|
||||
title = {
|
||||
Text(
|
||||
text = stringResource(id = R.string.home_update_available_title, updateInfo.latestVersion),
|
||||
style = MaterialTheme.typography.titleLarge.copy(
|
||||
text = stringResource(id = R.string.update_dialog_title_format, displayVersion),
|
||||
style = MaterialTheme.typography.titleLarge,
|
||||
fontWeight = FontWeight.Bold
|
||||
)
|
||||
)
|
||||
},
|
||||
text = {
|
||||
Column(
|
||||
@@ -64,57 +57,47 @@ fun UpdateDialog(
|
||||
.heightIn(max = 280.dp)
|
||||
.verticalScroll(scrollState)
|
||||
) {
|
||||
if (updateInfo.releaseTitle.isNotBlank() && updateInfo.releaseTitle != updateInfo.latestVersion) {
|
||||
Text(
|
||||
text = updateInfo.releaseTitle,
|
||||
style = MaterialTheme.typography.titleMedium.copy(
|
||||
fontWeight = FontWeight.SemiBold
|
||||
),
|
||||
color = MaterialTheme.colorScheme.onSurface
|
||||
)
|
||||
Spacer(modifier = Modifier.height(8.dp))
|
||||
}
|
||||
|
||||
if (updateInfo.changelog.isNotBlank()) {
|
||||
Text(
|
||||
text = updateInfo.changelog,
|
||||
style = MaterialTheme.typography.bodyMedium,
|
||||
color = MaterialTheme.colorScheme.onSurfaceVariant
|
||||
color = MaterialTheme.colorScheme.onSurface
|
||||
)
|
||||
} else {
|
||||
Text(
|
||||
text = stringResource(id = R.string.home_update_dialog_msg),
|
||||
style = MaterialTheme.typography.bodyMedium,
|
||||
color = MaterialTheme.colorScheme.onSurfaceVariant
|
||||
)
|
||||
}
|
||||
}
|
||||
},
|
||||
confirmButton = {
|
||||
Button(
|
||||
onClick = {
|
||||
openBrowser(context, updateInfo.releaseUrl)
|
||||
openBrowser(context, updateInfo.downloadUrl)
|
||||
onDismiss()
|
||||
}
|
||||
) {
|
||||
Text(text = stringResource(id = R.string.home_update_btn_go))
|
||||
Text(text = stringResource(id = R.string.btn_download_update))
|
||||
}
|
||||
},
|
||||
dismissButton = {
|
||||
Row {
|
||||
TextButton(
|
||||
onClick = {
|
||||
onDontShowAgain(updateInfo.versionCode)
|
||||
onDismiss()
|
||||
}
|
||||
) {
|
||||
Text(text = stringResource(id = R.string.btn_dont_show_again))
|
||||
}
|
||||
TextButton(onClick = onDismiss) {
|
||||
Text(text = stringResource(id = R.string.home_update_btn_later))
|
||||
Text(text = stringResource(id = R.string.action_cancel))
|
||||
}
|
||||
}
|
||||
}
|
||||
)
|
||||
}
|
||||
|
||||
private fun openBrowser(context: Context, url: String) {
|
||||
try {
|
||||
val targetUri = Uri.parse(url.ifBlank { "https://github.com/lzxnone/openloc/releases" })
|
||||
val intent = Intent(Intent.ACTION_VIEW, targetUri).apply {
|
||||
if (url.isBlank()) return
|
||||
runCatching {
|
||||
val intent = Intent(Intent.ACTION_VIEW, Uri.parse(url)).apply {
|
||||
addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
|
||||
}
|
||||
context.startActivity(intent)
|
||||
} catch (_: Exception) {
|
||||
}
|
||||
}
|
||||
@@ -1,56 +1,66 @@
|
||||
package com.lzxnone.openloc.ui.screens
|
||||
|
||||
import androidx.compose.animation.AnimatedContent
|
||||
import androidx.compose.animation.fadeIn
|
||||
import androidx.compose.animation.fadeOut
|
||||
import androidx.compose.animation.togetherWith
|
||||
import androidx.compose.foundation.layout.WindowInsets
|
||||
import androidx.compose.foundation.layout.fillMaxSize
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.material3.Scaffold
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.material3.Surface
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.runtime.getValue
|
||||
import androidx.compose.runtime.mutableStateOf
|
||||
import androidx.compose.runtime.remember
|
||||
import androidx.compose.runtime.saveable.rememberSaveable
|
||||
import androidx.compose.runtime.setValue
|
||||
import androidx.compose.ui.Modifier
|
||||
import com.lzxnone.openloc.core.util.HookStatus
|
||||
import com.lzxnone.openloc.data.preference.AppPreferences
|
||||
import com.lzxnone.openloc.ui.components.OpenLocBottomBar
|
||||
import com.lzxnone.openloc.ui.components.OpenLocTopBar
|
||||
import com.lzxnone.openloc.ui.navigation.NavTab
|
||||
import com.lzxnone.openloc.ui.screens.home.HomeScreen
|
||||
import com.lzxnone.openloc.ui.screens.location.LocationScreen
|
||||
import com.lzxnone.openloc.ui.screens.settings.SettingsScreen
|
||||
|
||||
import android.Manifest
|
||||
import android.content.pm.PackageManager
|
||||
import android.widget.Toast
|
||||
import androidx.activity.compose.BackHandler
|
||||
import androidx.activity.compose.rememberLauncherForActivityResult
|
||||
import androidx.activity.result.contract.ActivityResultContracts
|
||||
import androidx.compose.animation.AnimatedVisibility
|
||||
import androidx.compose.animation.fadeIn
|
||||
import androidx.compose.animation.fadeOut
|
||||
import androidx.compose.animation.slideInHorizontally
|
||||
import androidx.compose.animation.slideOutHorizontally
|
||||
import androidx.compose.foundation.layout.Box
|
||||
import androidx.compose.foundation.layout.WindowInsets
|
||||
import androidx.compose.foundation.layout.fillMaxSize
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.material.icons.Icons
|
||||
import androidx.compose.material.icons.automirrored.filled.ArrowBack
|
||||
import androidx.compose.material3.ExperimentalMaterial3Api
|
||||
import androidx.compose.material3.Icon
|
||||
import androidx.compose.material3.IconButton
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.material3.Scaffold
|
||||
import androidx.compose.material3.Surface
|
||||
import androidx.compose.material3.Text
|
||||
import androidx.compose.material3.TopAppBar
|
||||
import androidx.compose.material3.TopAppBarDefaults
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.runtime.LaunchedEffect
|
||||
import androidx.compose.runtime.getValue
|
||||
import androidx.compose.runtime.mutableStateOf
|
||||
import androidx.compose.runtime.remember
|
||||
import androidx.compose.runtime.rememberCoroutineScope
|
||||
import androidx.compose.runtime.saveable.rememberSaveable
|
||||
import androidx.compose.runtime.setValue
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.platform.LocalContext
|
||||
import androidx.compose.ui.res.stringResource
|
||||
import androidx.compose.ui.text.font.FontWeight
|
||||
import androidx.core.content.ContextCompat
|
||||
import com.lzxnone.openloc.BuildConfig
|
||||
import com.lzxnone.openloc.R
|
||||
import com.lzxnone.openloc.core.util.HookStatus
|
||||
import com.lzxnone.openloc.core.util.UpdateChecker
|
||||
import com.lzxnone.openloc.core.util.UpdateInfo
|
||||
import com.lzxnone.openloc.data.preference.AppMockMode
|
||||
import com.lzxnone.openloc.data.preference.AppPreferences
|
||||
import com.lzxnone.openloc.ui.components.OpenLocBottomBar
|
||||
import com.lzxnone.openloc.ui.components.OpenLocTopBar
|
||||
import com.lzxnone.openloc.ui.components.UpdateDialog
|
||||
import com.lzxnone.openloc.ui.navigation.NavTab
|
||||
import com.lzxnone.openloc.ui.screens.about.AboutScreen
|
||||
import com.lzxnone.openloc.ui.screens.apps.AppSelectionScreen
|
||||
import com.lzxnone.openloc.ui.screens.home.HomeScreen
|
||||
import com.lzxnone.openloc.ui.screens.location.LocationScreen
|
||||
import com.lzxnone.openloc.ui.screens.settings.SettingsScreen
|
||||
import kotlinx.coroutines.launch
|
||||
|
||||
/**
|
||||
* 根容器页面:承载 TopAppBar、底部导航栏与各个 Tab 内容切换
|
||||
*/
|
||||
@OptIn(ExperimentalMaterial3Api::class)
|
||||
@Composable
|
||||
fun MainScreen(
|
||||
modifier: Modifier = Modifier
|
||||
@@ -59,8 +69,10 @@ fun MainScreen(
|
||||
val coroutineScope = rememberCoroutineScope()
|
||||
|
||||
var currentTab by rememberSaveable { mutableStateOf(NavTab.HOME) }
|
||||
var isAboutViewOpen by rememberSaveable { mutableStateOf(false) }
|
||||
var activeAppSelectionMode by rememberSaveable { mutableStateOf<AppMockMode?>(null) }
|
||||
var updateInfoToDisplay by remember { mutableStateOf<UpdateInfo?>(null) }
|
||||
var isCheckingAppUpdate by remember { mutableStateOf(false) }
|
||||
|
||||
// 响应式的总开关状态与激活状态
|
||||
val isServiceEnabled = AppPreferences.isServiceEnabled
|
||||
@@ -93,26 +105,26 @@ fun MainScreen(
|
||||
}
|
||||
}
|
||||
|
||||
// 每次进入软件,若开启了自动检查更新,则在后台静默检测,发现新版才弹窗
|
||||
// 每次进入软件,若开启了自动检查更新,则在后台静默检测,发现新版且未被抑制才弹窗
|
||||
LaunchedEffect(Unit) {
|
||||
if (AppPreferences.isAutoCheckUpdateEnabled) {
|
||||
val result = UpdateChecker.checkUpdate(currentVersion = "v1.2.1")
|
||||
val result = UpdateChecker.checkUpdate()
|
||||
result.getOrNull()?.let { info ->
|
||||
if (info.hasUpdate) {
|
||||
if (info.hasUpdate && info.versionCode > AppPreferences.suppressedUpdateVersionCode) {
|
||||
updateInfoToDisplay = info
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
val checkingUpdateText = stringResource(id = R.string.home_checking_update)
|
||||
val checkFailedText = stringResource(id = R.string.home_check_update_failed)
|
||||
val alreadyLatestText = stringResource(id = R.string.home_already_latest, "v1.2.1")
|
||||
val alreadyLatestText = stringResource(id = R.string.about_latest_version)
|
||||
|
||||
val performManualCheck: () -> Unit = {
|
||||
Toast.makeText(context, checkingUpdateText, Toast.LENGTH_SHORT).show()
|
||||
isCheckingAppUpdate = true
|
||||
coroutineScope.launch {
|
||||
val result = UpdateChecker.checkUpdate(currentVersion = "v1.2.1")
|
||||
val result = UpdateChecker.checkUpdate()
|
||||
isCheckingAppUpdate = false
|
||||
result.onSuccess { info ->
|
||||
if (info.hasUpdate) {
|
||||
updateInfoToDisplay = info
|
||||
@@ -125,13 +137,53 @@ fun MainScreen(
|
||||
}
|
||||
}
|
||||
|
||||
if (isAboutViewOpen) {
|
||||
BackHandler {
|
||||
isAboutViewOpen = false
|
||||
}
|
||||
|
||||
Scaffold(
|
||||
modifier = Modifier.fillMaxSize(),
|
||||
topBar = {
|
||||
TopAppBar(
|
||||
navigationIcon = {
|
||||
IconButton(onClick = { isAboutViewOpen = false }) {
|
||||
Icon(
|
||||
imageVector = Icons.AutoMirrored.Filled.ArrowBack,
|
||||
contentDescription = stringResource(R.string.btn_back)
|
||||
)
|
||||
}
|
||||
},
|
||||
title = {
|
||||
Text(
|
||||
text = stringResource(R.string.section_about),
|
||||
style = MaterialTheme.typography.titleLarge,
|
||||
fontWeight = FontWeight.Bold
|
||||
)
|
||||
},
|
||||
colors = TopAppBarDefaults.topAppBarColors(
|
||||
containerColor = MaterialTheme.colorScheme.surface,
|
||||
titleContentColor = MaterialTheme.colorScheme.onSurface
|
||||
)
|
||||
)
|
||||
}
|
||||
) { innerPadding ->
|
||||
AboutScreen(
|
||||
onCheckAppUpdate = performManualCheck,
|
||||
isCheckingUpdate = isCheckingAppUpdate,
|
||||
modifier = Modifier.padding(innerPadding)
|
||||
)
|
||||
}
|
||||
} else {
|
||||
Box(modifier = modifier.fillMaxSize()) {
|
||||
Scaffold(
|
||||
modifier = Modifier.fillMaxSize(),
|
||||
contentWindowInsets = WindowInsets(0, 0, 0, 0),
|
||||
topBar = {
|
||||
if (currentTab != NavTab.LOCATION) {
|
||||
OpenLocTopBar()
|
||||
OpenLocTopBar(
|
||||
onAboutClick = { isAboutViewOpen = true }
|
||||
)
|
||||
}
|
||||
},
|
||||
bottomBar = {
|
||||
@@ -179,8 +231,7 @@ fun MainScreen(
|
||||
AppPreferences.updateServiceEnabled(enabled)
|
||||
},
|
||||
onOpenBlacklist = { activeAppSelectionMode = AppMockMode.BLACKLIST },
|
||||
onOpenWhitelist = { activeAppSelectionMode = AppMockMode.WHITELIST },
|
||||
onCheckUpdate = performManualCheck
|
||||
onOpenWhitelist = { activeAppSelectionMode = AppMockMode.WHITELIST }
|
||||
)
|
||||
}
|
||||
}
|
||||
@@ -218,14 +269,17 @@ fun MainScreen(
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
// 新版本更新弹窗
|
||||
// 新版本更新弹窗(全局层级)
|
||||
updateInfoToDisplay?.let { info ->
|
||||
UpdateDialog(
|
||||
updateInfo = info,
|
||||
onDismiss = { updateInfoToDisplay = null }
|
||||
onDismiss = { updateInfoToDisplay = null },
|
||||
onDontShowAgain = { suppressedCode ->
|
||||
AppPreferences.updateSuppressedVersionCode(suppressedCode)
|
||||
}
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -0,0 +1,161 @@
|
||||
package com.lzxnone.openloc.ui.screens.about
|
||||
|
||||
import androidx.compose.foundation.Image
|
||||
import androidx.compose.foundation.background
|
||||
import androidx.compose.foundation.clickable
|
||||
import androidx.compose.foundation.layout.Box
|
||||
import androidx.compose.foundation.layout.Column
|
||||
import androidx.compose.foundation.layout.Row
|
||||
import androidx.compose.foundation.layout.Spacer
|
||||
import androidx.compose.foundation.layout.fillMaxSize
|
||||
import androidx.compose.foundation.layout.fillMaxWidth
|
||||
import androidx.compose.foundation.layout.height
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.foundation.layout.size
|
||||
import androidx.compose.foundation.layout.width
|
||||
import androidx.compose.foundation.shape.RoundedCornerShape
|
||||
import androidx.compose.material.icons.Icons
|
||||
import androidx.compose.material.icons.filled.Info
|
||||
import androidx.compose.material.icons.filled.Sync
|
||||
import androidx.compose.material3.Card
|
||||
import androidx.compose.material3.CardDefaults
|
||||
import androidx.compose.material3.HorizontalDivider
|
||||
import androidx.compose.material3.Icon
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.material3.Text
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.ui.Alignment
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.draw.clip
|
||||
import androidx.compose.ui.res.painterResource
|
||||
import androidx.compose.ui.res.stringResource
|
||||
import androidx.compose.ui.text.font.FontWeight
|
||||
import androidx.compose.ui.unit.dp
|
||||
import com.lzxnone.openloc.BuildConfig
|
||||
import com.lzxnone.openloc.R
|
||||
|
||||
@Composable
|
||||
fun AboutScreen(
|
||||
onCheckAppUpdate: () -> Unit = {},
|
||||
isCheckingUpdate: Boolean = false,
|
||||
modifier: Modifier = Modifier
|
||||
) {
|
||||
Column(
|
||||
modifier = modifier
|
||||
.fillMaxSize()
|
||||
.padding(horizontal = 24.dp),
|
||||
horizontalAlignment = Alignment.CenterHorizontally
|
||||
) {
|
||||
Spacer(modifier = Modifier.height(48.dp))
|
||||
|
||||
// 软件图标
|
||||
Image(
|
||||
painter = painterResource(id = R.drawable.app_logo),
|
||||
contentDescription = stringResource(R.string.app_name),
|
||||
modifier = Modifier
|
||||
.size(100.dp)
|
||||
.clip(RoundedCornerShape(22.dp))
|
||||
)
|
||||
|
||||
Spacer(modifier = Modifier.height(18.dp))
|
||||
|
||||
// 软件名称
|
||||
Text(
|
||||
text = stringResource(R.string.app_name),
|
||||
style = MaterialTheme.typography.headlineSmall,
|
||||
fontWeight = FontWeight.Bold,
|
||||
color = MaterialTheme.colorScheme.onSurface
|
||||
)
|
||||
|
||||
Spacer(modifier = Modifier.height(6.dp))
|
||||
|
||||
// 作者
|
||||
Text(
|
||||
text = stringResource(R.string.about_author, "lzxnone"),
|
||||
style = MaterialTheme.typography.bodyMedium,
|
||||
color = MaterialTheme.colorScheme.onSurfaceVariant
|
||||
)
|
||||
|
||||
Spacer(modifier = Modifier.height(36.dp))
|
||||
|
||||
// 版本与检查更新卡片
|
||||
Card(
|
||||
modifier = Modifier.fillMaxWidth(),
|
||||
shape = RoundedCornerShape(16.dp),
|
||||
colors = CardDefaults.cardColors(
|
||||
containerColor = MaterialTheme.colorScheme.surface
|
||||
),
|
||||
elevation = CardDefaults.cardElevation(
|
||||
defaultElevation = 1.dp
|
||||
)
|
||||
) {
|
||||
Column(modifier = Modifier.padding(vertical = 4.dp)) {
|
||||
// 版本
|
||||
Row(
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.padding(horizontal = 16.dp, vertical = 14.dp),
|
||||
verticalAlignment = Alignment.CenterVertically
|
||||
) {
|
||||
Icon(
|
||||
imageVector = Icons.Default.Info,
|
||||
contentDescription = null,
|
||||
tint = MaterialTheme.colorScheme.primary,
|
||||
modifier = Modifier.size(24.dp)
|
||||
)
|
||||
Spacer(modifier = Modifier.width(16.dp))
|
||||
Text(
|
||||
text = stringResource(R.string.about_app_version),
|
||||
style = MaterialTheme.typography.bodyLarge,
|
||||
fontWeight = FontWeight.Medium,
|
||||
color = MaterialTheme.colorScheme.onSurface,
|
||||
modifier = Modifier.weight(1f)
|
||||
)
|
||||
Text(
|
||||
text = "v${BuildConfig.VERSION_NAME}",
|
||||
style = MaterialTheme.typography.bodyMedium,
|
||||
color = MaterialTheme.colorScheme.onSurfaceVariant
|
||||
)
|
||||
}
|
||||
|
||||
HorizontalDivider(
|
||||
modifier = Modifier.padding(horizontal = 16.dp),
|
||||
color = MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.5f)
|
||||
)
|
||||
|
||||
// 检查更新
|
||||
Row(
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.clickable(enabled = !isCheckingUpdate) {
|
||||
onCheckAppUpdate()
|
||||
}
|
||||
.padding(horizontal = 16.dp, vertical = 14.dp),
|
||||
verticalAlignment = Alignment.CenterVertically
|
||||
) {
|
||||
Icon(
|
||||
imageVector = Icons.Default.Sync,
|
||||
contentDescription = null,
|
||||
tint = MaterialTheme.colorScheme.primary,
|
||||
modifier = Modifier.size(24.dp)
|
||||
)
|
||||
Spacer(modifier = Modifier.width(16.dp))
|
||||
Text(
|
||||
text = stringResource(R.string.about_check_updates),
|
||||
style = MaterialTheme.typography.bodyLarge,
|
||||
fontWeight = FontWeight.Medium,
|
||||
color = MaterialTheme.colorScheme.onSurface,
|
||||
modifier = Modifier.weight(1f)
|
||||
)
|
||||
if (isCheckingUpdate) {
|
||||
Text(
|
||||
text = stringResource(R.string.checking_updates),
|
||||
style = MaterialTheme.typography.bodyMedium,
|
||||
color = MaterialTheme.colorScheme.primary
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -22,7 +22,6 @@ fun HomeScreen(
|
||||
onServiceEnabledChange: (Boolean) -> Unit,
|
||||
onOpenBlacklist: () -> Unit,
|
||||
onOpenWhitelist: () -> Unit,
|
||||
onCheckUpdate: () -> Unit,
|
||||
modifier: Modifier = Modifier
|
||||
) {
|
||||
val scrollState = rememberScrollState()
|
||||
@@ -55,15 +54,5 @@ fun HomeScreen(
|
||||
onOpenBlacklist = onOpenBlacklist,
|
||||
onOpenWhitelist = onOpenWhitelist
|
||||
)
|
||||
|
||||
// 4. 版本与更新模块卡片
|
||||
VersionCard(
|
||||
versionName = "v1.2.1",
|
||||
isAutoCheckEnabled = AppPreferences.isAutoCheckUpdateEnabled,
|
||||
onAutoCheckChange = { AppPreferences.updateAutoCheckUpdateEnabled(it) },
|
||||
onCheckUpdate = onCheckUpdate
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
@@ -1,169 +0,0 @@
|
||||
package com.lzxnone.openloc.ui.screens.home
|
||||
|
||||
import androidx.compose.foundation.layout.Arrangement
|
||||
import androidx.compose.foundation.layout.Box
|
||||
import androidx.compose.foundation.layout.Column
|
||||
import androidx.compose.foundation.layout.Row
|
||||
import androidx.compose.foundation.layout.Spacer
|
||||
import androidx.compose.foundation.layout.fillMaxWidth
|
||||
import androidx.compose.foundation.layout.height
|
||||
import androidx.compose.foundation.layout.padding
|
||||
import androidx.compose.foundation.layout.size
|
||||
import androidx.compose.foundation.layout.width
|
||||
import androidx.compose.foundation.shape.CircleShape
|
||||
import androidx.compose.foundation.shape.RoundedCornerShape
|
||||
import androidx.compose.material.icons.Icons
|
||||
import androidx.compose.material.icons.outlined.Info
|
||||
import androidx.compose.material.icons.outlined.Refresh
|
||||
import androidx.compose.material3.ButtonDefaults
|
||||
import androidx.compose.material3.Card
|
||||
import androidx.compose.material3.CardDefaults
|
||||
import androidx.compose.material3.FilledTonalButton
|
||||
import androidx.compose.material3.HorizontalDivider
|
||||
import androidx.compose.material3.Icon
|
||||
import androidx.compose.material3.MaterialTheme
|
||||
import androidx.compose.material3.Surface
|
||||
import androidx.compose.material3.Switch
|
||||
import androidx.compose.material3.Text
|
||||
import androidx.compose.runtime.Composable
|
||||
import androidx.compose.ui.Alignment
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.res.stringResource
|
||||
import androidx.compose.ui.text.font.FontWeight
|
||||
import androidx.compose.ui.unit.dp
|
||||
import com.lzxnone.openloc.R
|
||||
import com.lzxnone.openloc.data.preference.AppPreferences
|
||||
|
||||
/**
|
||||
* 主页底部版本模块卡片
|
||||
* 显示应用当前版本(如 v1.0.0)、“检查更新”按钮,以及“启动时自动检查更新”开关
|
||||
*/
|
||||
@Composable
|
||||
fun VersionCard(
|
||||
versionName: String = stringResource(id = R.string.home_version_name),
|
||||
isAutoCheckEnabled: Boolean = AppPreferences.isAutoCheckUpdateEnabled,
|
||||
onAutoCheckChange: (Boolean) -> Unit = { AppPreferences.updateAutoCheckUpdateEnabled(it) },
|
||||
onCheckUpdate: () -> Unit,
|
||||
modifier: Modifier = Modifier
|
||||
) {
|
||||
Card(
|
||||
modifier = modifier.fillMaxWidth(),
|
||||
shape = RoundedCornerShape(16.dp),
|
||||
colors = CardDefaults.cardColors(
|
||||
containerColor = MaterialTheme.colorScheme.surface
|
||||
),
|
||||
elevation = CardDefaults.cardElevation(
|
||||
defaultElevation = 1.dp
|
||||
)
|
||||
) {
|
||||
Column(modifier = Modifier.fillMaxWidth()) {
|
||||
// 上半部分:版本信息与手动检查更新按钮
|
||||
Row(
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.padding(horizontal = 20.dp, vertical = 16.dp),
|
||||
verticalAlignment = Alignment.CenterVertically,
|
||||
horizontalArrangement = Arrangement.SpaceBetween
|
||||
) {
|
||||
Row(
|
||||
verticalAlignment = Alignment.CenterVertically,
|
||||
modifier = Modifier.weight(1f)
|
||||
) {
|
||||
Surface(
|
||||
shape = CircleShape,
|
||||
color = MaterialTheme.colorScheme.primaryContainer.copy(alpha = 0.5f),
|
||||
modifier = Modifier.size(40.dp)
|
||||
) {
|
||||
Box(contentAlignment = Alignment.Center) {
|
||||
Icon(
|
||||
imageVector = Icons.Outlined.Info,
|
||||
contentDescription = null,
|
||||
tint = MaterialTheme.colorScheme.primary,
|
||||
modifier = Modifier.size(22.dp)
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
Spacer(modifier = Modifier.width(14.dp))
|
||||
|
||||
Column {
|
||||
Text(
|
||||
text = stringResource(id = R.string.home_version_card_title),
|
||||
style = MaterialTheme.typography.bodySmall,
|
||||
color = MaterialTheme.colorScheme.onSurfaceVariant
|
||||
)
|
||||
Spacer(modifier = Modifier.height(2.dp))
|
||||
Text(
|
||||
text = versionName,
|
||||
style = MaterialTheme.typography.titleMedium.copy(
|
||||
fontWeight = FontWeight.Bold
|
||||
),
|
||||
color = MaterialTheme.colorScheme.onSurface
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
Spacer(modifier = Modifier.width(12.dp))
|
||||
|
||||
FilledTonalButton(
|
||||
onClick = onCheckUpdate,
|
||||
shape = RoundedCornerShape(12.dp),
|
||||
colors = ButtonDefaults.filledTonalButtonColors(
|
||||
containerColor = MaterialTheme.colorScheme.secondaryContainer,
|
||||
contentColor = MaterialTheme.colorScheme.onSecondaryContainer
|
||||
)
|
||||
) {
|
||||
Icon(
|
||||
imageVector = Icons.Outlined.Refresh,
|
||||
contentDescription = null,
|
||||
modifier = Modifier.size(16.dp)
|
||||
)
|
||||
Spacer(modifier = Modifier.width(6.dp))
|
||||
Text(
|
||||
text = stringResource(id = R.string.home_check_updates_btn),
|
||||
style = MaterialTheme.typography.labelLarge.copy(
|
||||
fontWeight = FontWeight.Medium
|
||||
)
|
||||
)
|
||||
}
|
||||
}
|
||||
|
||||
HorizontalDivider(
|
||||
modifier = Modifier.padding(horizontal = 20.dp),
|
||||
color = MaterialTheme.colorScheme.outlineVariant.copy(alpha = 0.4f)
|
||||
)
|
||||
|
||||
// 下半部分:自动检查更新选项(默认开启)
|
||||
Row(
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.padding(horizontal = 20.dp, vertical = 14.dp),
|
||||
verticalAlignment = Alignment.CenterVertically,
|
||||
horizontalArrangement = Arrangement.SpaceBetween
|
||||
) {
|
||||
Column(modifier = Modifier.weight(1f)) {
|
||||
Text(
|
||||
text = stringResource(id = R.string.home_auto_check_update_title),
|
||||
style = MaterialTheme.typography.titleSmall.copy(
|
||||
fontWeight = FontWeight.SemiBold
|
||||
),
|
||||
color = MaterialTheme.colorScheme.onSurface
|
||||
)
|
||||
Spacer(modifier = Modifier.height(2.dp))
|
||||
Text(
|
||||
text = stringResource(id = R.string.home_auto_check_update_desc),
|
||||
style = MaterialTheme.typography.bodySmall,
|
||||
color = MaterialTheme.colorScheme.onSurfaceVariant
|
||||
)
|
||||
}
|
||||
|
||||
Spacer(modifier = Modifier.width(16.dp))
|
||||
|
||||
Switch(
|
||||
checked = isAutoCheckEnabled,
|
||||
onCheckedChange = onAutoCheckChange
|
||||
)
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
Binary file not shown.
|
After Width: | Height: | Size: 9.6 KiB |
@@ -171,15 +171,27 @@
|
||||
|
||||
<!-- Version & Updates -->
|
||||
<string name="home_version_card_title">Current Version</string>
|
||||
<string name="home_version_name">v1.2.1</string>
|
||||
<string name="home_version_name">v1.2.2</string>
|
||||
<string name="home_check_updates_btn">Check for Updates</string>
|
||||
<string name="home_auto_check_update_title">Auto Check on Launch</string>
|
||||
<string name="home_auto_check_update_desc">Automatically check for new releases when opening the app</string>
|
||||
<string name="home_checking_update">Checking for updates…</string>
|
||||
<string name="home_update_available_title">New Version Available: %1$s</string>
|
||||
<string name="home_update_dialog_msg">A new version of OpenLoc has been released on GitHub.</string>
|
||||
<string name="home_update_dialog_msg">A new version of OpenLoc has been released.</string>
|
||||
<string name="home_update_btn_go">Go to Update</string>
|
||||
<string name="home_update_btn_later">Later</string>
|
||||
<string name="home_check_update_failed">Failed to check for updates, please check network</string>
|
||||
<string name="home_already_latest">Already the latest version (%1$s)</string>
|
||||
|
||||
<!-- About & Updates -->
|
||||
<string name="section_about">About</string>
|
||||
<string name="btn_back">Back</string>
|
||||
<string name="about_author">Author: %1$s</string>
|
||||
<string name="about_app_version">Version</string>
|
||||
<string name="about_check_updates">Check for Updates</string>
|
||||
<string name="about_latest_version">Already up to date</string>
|
||||
<string name="checking_updates">Checking for updates…</string>
|
||||
<string name="update_dialog_title_format">New Version %1$s</string>
|
||||
<string name="btn_dont_show_again">Don\'t show again</string>
|
||||
<string name="btn_download_update">Download Update</string>
|
||||
</resources>
|
||||
@@ -171,17 +171,29 @@
|
||||
|
||||
<!-- 版本与更新 -->
|
||||
<string name="home_version_card_title">当前版本</string>
|
||||
<string name="home_version_name">v1.2.1</string>
|
||||
<string name="home_version_name">v1.2.2</string>
|
||||
<string name="home_check_updates_btn">检查更新</string>
|
||||
<string name="home_auto_check_update_title">启动时自动检查更新</string>
|
||||
<string name="home_auto_check_update_desc">每次进入软件自动联网检测 GitHub 最新版本</string>
|
||||
<string name="home_auto_check_update_desc">每次进入软件自动联网检测最新版本</string>
|
||||
<string name="home_checking_update">正在检查更新…</string>
|
||||
<string name="home_update_available_title">发现新版本: %1$s</string>
|
||||
<string name="home_update_dialog_msg">OpenLoc 已在 GitHub 发布最新版本,欢迎前往下载更新。</string>
|
||||
<string name="home_update_dialog_msg">OpenLoc 已发布最新版本,欢迎前往下载更新。</string>
|
||||
<string name="home_update_btn_go">前往更新</string>
|
||||
<string name="home_update_btn_later">稍后</string>
|
||||
<string name="home_check_update_failed">检查更新失败,请检查网络</string>
|
||||
<string name="home_already_latest">当前已是最新版本 (%1$s)</string>
|
||||
|
||||
<!-- 关于与更新 -->
|
||||
<string name="section_about">关于</string>
|
||||
<string name="btn_back">返回</string>
|
||||
<string name="about_author">作者:%1$s</string>
|
||||
<string name="about_app_version">版本</string>
|
||||
<string name="about_check_updates">检查更新</string>
|
||||
<string name="about_latest_version">当前已是最新版本</string>
|
||||
<string name="checking_updates">正在检查更新…</string>
|
||||
<string name="update_dialog_title_format">新版本 %1$s</string>
|
||||
<string name="btn_dont_show_again">不再显示</string>
|
||||
<string name="btn_download_update">下载更新</string>
|
||||
</resources>
|
||||
|
||||
|
||||
@@ -171,17 +171,29 @@
|
||||
|
||||
<!-- 版本与更新 -->
|
||||
<string name="home_version_card_title">当前版本</string>
|
||||
<string name="home_version_name">v1.2.1</string>
|
||||
<string name="home_version_name">v1.2.2</string>
|
||||
<string name="home_check_updates_btn">检查更新</string>
|
||||
<string name="home_auto_check_update_title">启动时自动检查更新</string>
|
||||
<string name="home_auto_check_update_desc">每次进入软件自动联网检测 GitHub 最新版本</string>
|
||||
<string name="home_auto_check_update_desc">每次进入软件自动联网检测最新版本</string>
|
||||
<string name="home_checking_update">正在检查更新…</string>
|
||||
<string name="home_update_available_title">发现新版本: %1$s</string>
|
||||
<string name="home_update_dialog_msg">OpenLoc 已在 GitHub 发布最新版本,欢迎前往下载更新。</string>
|
||||
<string name="home_update_dialog_msg">OpenLoc 已发布最新版本,欢迎前往下载更新。</string>
|
||||
<string name="home_update_btn_go">前往更新</string>
|
||||
<string name="home_update_btn_later">稍后</string>
|
||||
<string name="home_check_update_failed">检查更新失败,请检查网络</string>
|
||||
<string name="home_already_latest">当前已是最新版本 (%1$s)</string>
|
||||
|
||||
<!-- 关于与更新 -->
|
||||
<string name="section_about">关于</string>
|
||||
<string name="btn_back">返回</string>
|
||||
<string name="about_author">作者:%1$s</string>
|
||||
<string name="about_app_version">版本</string>
|
||||
<string name="about_check_updates">检查更新</string>
|
||||
<string name="about_latest_version">当前已是最新版本</string>
|
||||
<string name="checking_updates">正在检查更新…</string>
|
||||
<string name="update_dialog_title_format">新版本 %1$s</string>
|
||||
<string name="btn_dont_show_again">不再显示</string>
|
||||
<string name="btn_download_update">下载更新</string>
|
||||
</resources>
|
||||
|
||||
|
||||
@@ -171,15 +171,27 @@
|
||||
|
||||
<!-- Version & Updates -->
|
||||
<string name="home_version_card_title">Current Version</string>
|
||||
<string name="home_version_name">v1.2.1</string>
|
||||
<string name="home_version_name">v1.2.2</string>
|
||||
<string name="home_check_updates_btn">Check for Updates</string>
|
||||
<string name="home_auto_check_update_title">Auto Check on Launch</string>
|
||||
<string name="home_auto_check_update_desc">Automatically check for new releases when opening the app</string>
|
||||
<string name="home_checking_update">Checking for updates…</string>
|
||||
<string name="home_update_available_title">New Version Available: %1$s</string>
|
||||
<string name="home_update_dialog_msg">A new version of OpenLoc has been released on GitHub.</string>
|
||||
<string name="home_update_dialog_msg">A new version of OpenLoc has been released.</string>
|
||||
<string name="home_update_btn_go">Go to Update</string>
|
||||
<string name="home_update_btn_later">Later</string>
|
||||
<string name="home_check_update_failed">Failed to check for updates, please check network</string>
|
||||
<string name="home_already_latest">Already the latest version (%1$s)</string>
|
||||
|
||||
<!-- About & Updates -->
|
||||
<string name="section_about">About</string>
|
||||
<string name="btn_back">Back</string>
|
||||
<string name="about_author">Author: %1$s</string>
|
||||
<string name="about_app_version">Version</string>
|
||||
<string name="about_check_updates">Check for Updates</string>
|
||||
<string name="about_latest_version">Already up to date</string>
|
||||
<string name="checking_updates">Checking for updates…</string>
|
||||
<string name="update_dialog_title_format">New Version %1$s</string>
|
||||
<string name="btn_dont_show_again">Don\'t show again</string>
|
||||
<string name="btn_download_update">Download Update</string>
|
||||
</resources>
|
||||
Reference in new issue
Block a user