fix: localize disabled mock toast and bump version to 1.2.1
This commit is contained in:
1 parent
07abd416b6
commit
6ffa7d8108
9 files changed
+199
-12
No files matched your search
@@ -18,8 +18,8 @@ android {
|
|||||||
applicationId = "com.lzxnone.openloc"
|
applicationId = "com.lzxnone.openloc"
|
||||||
minSdk = 28
|
minSdk = 28
|
||||||
targetSdk = 36
|
targetSdk = 36
|
||||||
versionCode = 3
|
versionCode = 4
|
||||||
versionName = "1.2.0"
|
versionName = "1.2.1"
|
||||||
|
|
||||||
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
testInstrumentationRunner = "androidx.test.runner.AndroidJUnitRunner"
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -27,7 +27,7 @@ object UpdateChecker {
|
|||||||
/**
|
/**
|
||||||
* 检查 GitHub 是否有新版本
|
* 检查 GitHub 是否有新版本
|
||||||
*/
|
*/
|
||||||
suspend fun checkUpdate(currentVersion: String = "v1.2.0"): Result<UpdateInfo> = withContext(Dispatchers.IO) {
|
suspend fun checkUpdate(currentVersion: String = "v1.2.1"): Result<UpdateInfo> = withContext(Dispatchers.IO) {
|
||||||
try {
|
try {
|
||||||
val url = URL(GITHUB_API_URL)
|
val url = URL(GITHUB_API_URL)
|
||||||
val conn = (url.openConnection() as HttpURLConnection).apply {
|
val conn = (url.openConnection() as HttpURLConnection).apply {
|
||||||
|
|||||||
@@ -96,7 +96,7 @@ fun MainScreen(
|
|||||||
// 每次进入软件,若开启了自动检查更新,则在后台静默检测,发现新版才弹窗
|
// 每次进入软件,若开启了自动检查更新,则在后台静默检测,发现新版才弹窗
|
||||||
LaunchedEffect(Unit) {
|
LaunchedEffect(Unit) {
|
||||||
if (AppPreferences.isAutoCheckUpdateEnabled) {
|
if (AppPreferences.isAutoCheckUpdateEnabled) {
|
||||||
val result = UpdateChecker.checkUpdate(currentVersion = "v1.2.0")
|
val result = UpdateChecker.checkUpdate(currentVersion = "v1.2.1")
|
||||||
result.getOrNull()?.let { info ->
|
result.getOrNull()?.let { info ->
|
||||||
if (info.hasUpdate) {
|
if (info.hasUpdate) {
|
||||||
updateInfoToDisplay = info
|
updateInfoToDisplay = info
|
||||||
@@ -107,12 +107,12 @@ fun MainScreen(
|
|||||||
|
|
||||||
val checkingUpdateText = stringResource(id = R.string.home_checking_update)
|
val checkingUpdateText = stringResource(id = R.string.home_checking_update)
|
||||||
val checkFailedText = stringResource(id = R.string.home_check_update_failed)
|
val checkFailedText = stringResource(id = R.string.home_check_update_failed)
|
||||||
val alreadyLatestText = stringResource(id = R.string.home_already_latest, "v1.2.0")
|
val alreadyLatestText = stringResource(id = R.string.home_already_latest, "v1.2.1")
|
||||||
|
|
||||||
val performManualCheck: () -> Unit = {
|
val performManualCheck: () -> Unit = {
|
||||||
Toast.makeText(context, checkingUpdateText, Toast.LENGTH_SHORT).show()
|
Toast.makeText(context, checkingUpdateText, Toast.LENGTH_SHORT).show()
|
||||||
coroutineScope.launch {
|
coroutineScope.launch {
|
||||||
val result = UpdateChecker.checkUpdate(currentVersion = "v1.2.0")
|
val result = UpdateChecker.checkUpdate(currentVersion = "v1.2.1")
|
||||||
result.onSuccess { info ->
|
result.onSuccess { info ->
|
||||||
if (info.hasUpdate) {
|
if (info.hasUpdate) {
|
||||||
updateInfoToDisplay = info
|
updateInfoToDisplay = info
|
||||||
|
|||||||
@@ -58,7 +58,7 @@ fun HomeScreen(
|
|||||||
|
|
||||||
// 4. 版本与更新模块卡片
|
// 4. 版本与更新模块卡片
|
||||||
VersionCard(
|
VersionCard(
|
||||||
versionName = "v1.2.0",
|
versionName = "v1.2.1",
|
||||||
isAutoCheckEnabled = AppPreferences.isAutoCheckUpdateEnabled,
|
isAutoCheckEnabled = AppPreferences.isAutoCheckUpdateEnabled,
|
||||||
onAutoCheckChange = { AppPreferences.updateAutoCheckUpdateEnabled(it) },
|
onAutoCheckChange = { AppPreferences.updateAutoCheckUpdateEnabled(it) },
|
||||||
onCheckUpdate = onCheckUpdate
|
onCheckUpdate = onCheckUpdate
|
||||||
|
|||||||
@@ -11,6 +11,7 @@ import android.location.LocationManager
|
|||||||
import android.os.Bundle
|
import android.os.Bundle
|
||||||
import android.os.Looper
|
import android.os.Looper
|
||||||
import android.widget.Toast
|
import android.widget.Toast
|
||||||
|
import com.lzxnone.openloc.createLocalizedContext
|
||||||
import com.lzxnone.openloc.core.util.TraceLogger
|
import com.lzxnone.openloc.core.util.TraceLogger
|
||||||
import androidx.activity.compose.BackHandler
|
import androidx.activity.compose.BackHandler
|
||||||
import androidx.activity.compose.rememberLauncherForActivityResult
|
import androidx.activity.compose.rememberLauncherForActivityResult
|
||||||
@@ -577,9 +578,10 @@ fun LocationScreen(
|
|||||||
val tapOverlay = MapEventsOverlay(object : MapEventsReceiver {
|
val tapOverlay = MapEventsOverlay(object : MapEventsReceiver {
|
||||||
override fun singleTapConfirmedHelper(p: GeoPoint): Boolean {
|
override fun singleTapConfirmedHelper(p: GeoPoint): Boolean {
|
||||||
if (!AppPreferences.isServiceEnabled) {
|
if (!AppPreferences.isServiceEnabled) {
|
||||||
|
val localizedContext = createLocalizedContext(context, AppPreferences.appLanguage)
|
||||||
Toast.makeText(
|
Toast.makeText(
|
||||||
context,
|
localizedContext,
|
||||||
context.getString(R.string.location_mock_disabled_prompt),
|
localizedContext.getString(R.string.location_mock_disabled_prompt),
|
||||||
Toast.LENGTH_SHORT
|
Toast.LENGTH_SHORT
|
||||||
).show()
|
).show()
|
||||||
return true
|
return true
|
||||||
|
|||||||
@@ -0,0 +1,185 @@
|
|||||||
|
<resources>
|
||||||
|
<string name="app_name">OpenLoc</string>
|
||||||
|
<string name="xposed_description">OpenLoc virtual location hook module</string>
|
||||||
|
|
||||||
|
<!-- Bottom Navigation -->
|
||||||
|
<string name="nav_home">Home</string>
|
||||||
|
<string name="nav_location">Location</string>
|
||||||
|
<string name="nav_settings">Settings</string>
|
||||||
|
|
||||||
|
<!-- Home Screen - Module Status Card -->
|
||||||
|
<string name="module_status_title">Module Status</string>
|
||||||
|
<string name="module_status_activated">Activated</string>
|
||||||
|
<string name="module_status_inactive">Inactive</string>
|
||||||
|
|
||||||
|
<!-- Master Switch Card -->
|
||||||
|
<string name="service_switch_title">Master Switch</string>
|
||||||
|
<string name="service_switch_desc_enabled">Virtual location is running</string>
|
||||||
|
<string name="service_switch_desc_disabled">Virtual location is paused</string>
|
||||||
|
<string name="service_switch_disabled_hint">Module inactive, switch is disabled</string>
|
||||||
|
|
||||||
|
<!-- Settings - Categories -->
|
||||||
|
<string name="settings_category_language">Language</string>
|
||||||
|
<string name="settings_category_appearance">Appearance</string>
|
||||||
|
|
||||||
|
<!-- Settings - Language -->
|
||||||
|
<string name="settings_language_title">App Language</string>
|
||||||
|
<string name="settings_language_sheet_title">Select Language</string>
|
||||||
|
<string name="settings_language_system">Follow System</string>
|
||||||
|
<string name="settings_language_zh">简体中文 (Chinese)</string>
|
||||||
|
<string name="settings_language_en">English</string>
|
||||||
|
|
||||||
|
<!-- Settings - Appearance -->
|
||||||
|
<string name="settings_theme_mode_title">Theme Mode</string>
|
||||||
|
<string name="settings_theme_mode_sheet_title">Select Theme Mode</string>
|
||||||
|
<string name="settings_theme_mode_system">Follow System</string>
|
||||||
|
<string name="settings_theme_mode_light">Light Mode</string>
|
||||||
|
<string name="settings_theme_mode_dark">Dark Mode</string>
|
||||||
|
|
||||||
|
<string name="settings_dynamic_color_title">System Theme Color</string>
|
||||||
|
<string name="settings_dynamic_color_desc">Follow system wallpaper dynamic colors (Android 12+)</string>
|
||||||
|
|
||||||
|
<string name="settings_theme_color_title">Theme Color</string>
|
||||||
|
<string name="settings_theme_color_dialog_title">Choose Palette</string>
|
||||||
|
|
||||||
|
<string name="action_cancel">Cancel</string>
|
||||||
|
<string name="action_confirm">Confirm</string>
|
||||||
|
|
||||||
|
<!-- Location Screen -->
|
||||||
|
<string name="location_search_hint">Search location / address…</string>
|
||||||
|
<string name="location_default_name">Selected Location</string>
|
||||||
|
<string name="location_latitude_format">Lat: %1$.6f</string>
|
||||||
|
<string name="location_longitude_format">Lng: %1$.6f</string>
|
||||||
|
<string name="location_copy_coords">Copy Coordinates</string>
|
||||||
|
<string name="location_coords_copied">Coordinates copied to clipboard</string>
|
||||||
|
<string name="location_reset_current">Reset to current location</string>
|
||||||
|
<string name="location_located_to_real">Located to current position</string>
|
||||||
|
<string name="location_mock_disabled_prompt">Virtual location is not enabled, please enable it first</string>
|
||||||
|
<string name="location_search_back">Back</string>
|
||||||
|
<string name="location_search_clear">Clear</string>
|
||||||
|
<string name="location_search_history">Recent Searches</string>
|
||||||
|
<string name="location_search_clear_history">Clear History</string>
|
||||||
|
<string name="location_search_no_results">No matching places found</string>
|
||||||
|
<string name="location_search_empty_hint">Enter place name or coordinates to search</string>
|
||||||
|
<string name="location_search_coord_jump">Jump to coordinates</string>
|
||||||
|
|
||||||
|
<!-- Map & Search Service Settings -->
|
||||||
|
<string name="settings_category_map_service">Map & Search Service</string>
|
||||||
|
<string name="settings_search_provider_title">Search Engine Provider</string>
|
||||||
|
<string name="settings_search_provider_sheet_title">Select Search Provider</string>
|
||||||
|
<string name="search_provider_amap">AMap</string>
|
||||||
|
<string name="search_provider_baidu">Baidu</string>
|
||||||
|
<string name="search_provider_photon">Photon</string>
|
||||||
|
<string name="search_provider_nominatim">Nominatim</string>
|
||||||
|
<string name="search_provider_badge_requires_key">Key Required</string>
|
||||||
|
<string name="search_provider_badge_free">Free / No Key</string>
|
||||||
|
|
||||||
|
<string name="settings_api_key_title">API Key</string>
|
||||||
|
<string name="settings_api_key_free_value">Not Required</string>
|
||||||
|
<string name="settings_api_key_placeholder">Enter Key / AK</string>
|
||||||
|
<string name="settings_api_key_empty">Key cannot be empty</string>
|
||||||
|
<string name="error_unknown">Unknown error</string>
|
||||||
|
<string name="location_search_coord_format">Lng: %1$.6f, Lat: %2$.6f</string>
|
||||||
|
<string name="settings_api_key_test">Test</string>
|
||||||
|
<string name="settings_api_key_testing">Testing...</string>
|
||||||
|
<string name="settings_api_key_test_success">Test passed! Key is valid.</string>
|
||||||
|
<string name="settings_api_key_test_failed">Test failed: %1$s</string>
|
||||||
|
|
||||||
|
<string name="settings_amap_key_dialog_title">Configure AMap Key</string>
|
||||||
|
<string name="settings_amap_key_hint">Get Web Service Key from lbs.amap.com</string>
|
||||||
|
<string name="settings_baidu_key_dialog_title">Configure Baidu AK</string>
|
||||||
|
<string name="settings_baidu_key_hint">Get Server AK from lbsyun.baidu.com</string>
|
||||||
|
<string name="settings_amap_key_configured">Configured</string>
|
||||||
|
<string name="settings_amap_key_not_configured">Not Configured</string>
|
||||||
|
<string name="settings_amap_key_clear">Clear</string>
|
||||||
|
<string name="settings_amap_key_save">Save</string>
|
||||||
|
|
||||||
|
<string name="search_no_api_key_title_dynamic">%1$s Key Not Configured</string>
|
||||||
|
<string name="search_no_api_key_desc_dynamic">This engine requires an API Key. You can configure it or switch to a free engine.</string>
|
||||||
|
<string name="search_configure_key_button">Configure Key</string>
|
||||||
|
<string name="search_switch_provider_button">Switch Provider</string>
|
||||||
|
<string name="search_key_invalid_title_dynamic">Invalid %1$s Key</string>
|
||||||
|
<string name="search_key_invalid_desc">Key verification failed (%1$s). Please check platform type or re-enter.</string>
|
||||||
|
<string name="search_edit_key_button">Edit Key</string>
|
||||||
|
<string name="search_network_error">Network request failed, please check connection</string>
|
||||||
|
<string name="location_card_collapse">Collapse</string>
|
||||||
|
<string name="location_card_expand">Expand</string>
|
||||||
|
|
||||||
|
<!-- Favorites -->
|
||||||
|
<string name="favorites_title">Favorites</string>
|
||||||
|
<string name="favorite_add_title">Add Favorite Location</string>
|
||||||
|
<string name="favorite_name_label">Name</string>
|
||||||
|
<string name="favorite_name_hint">e.g. Home / Company</string>
|
||||||
|
<string name="favorite_address_label">Area / Address</string>
|
||||||
|
<string name="favorite_address_deriving">Deriving area name…</string>
|
||||||
|
<string name="favorite_latitude_label">Latitude (WGS-84)</string>
|
||||||
|
<string name="favorite_longitude_label">Longitude (WGS-84)</string>
|
||||||
|
<string name="favorite_search_hint">Search name or area…</string>
|
||||||
|
<string name="favorite_empty_list">No favorites yet. Tap + to add.</string>
|
||||||
|
<string name="favorite_search_empty">No matching favorites found</string>
|
||||||
|
<string name="favorite_delete_confirm_title">Delete Favorite</string>
|
||||||
|
<string name="favorite_delete_confirm_msg">Are you sure you want to delete \"%1$s\"?</string>
|
||||||
|
<string name="favorite_added_success">Added to favorites</string>
|
||||||
|
<string name="favorite_deleted_success">Favorite deleted</string>
|
||||||
|
<string name="favorite_applied_success">Moved to: %1$s</string>
|
||||||
|
<string name="favorite_invalid_coords">Please enter valid latitude (-90~90) and longitude (-180~180)</string>
|
||||||
|
<string name="favorite_invalid_name">Name cannot be empty</string>
|
||||||
|
<string name="favorite_delete">Delete</string>
|
||||||
|
<string name="favorite_drag_handle">Drag to reorder</string>
|
||||||
|
<string name="location_unknown_address">Unknown address</string>
|
||||||
|
|
||||||
|
<!-- App Management / Scope -->
|
||||||
|
<string name="apps_management_title">App Scope Management</string>
|
||||||
|
<string name="apps_management_desc">Configure target apps and mock rules</string>
|
||||||
|
<string name="apps_mode_title">Mock Mode</string>
|
||||||
|
<string name="apps_mode_global">Global</string>
|
||||||
|
<string name="apps_mode_blacklist">Blacklist</string>
|
||||||
|
<string name="apps_mode_whitelist">Whitelist</string>
|
||||||
|
<string name="apps_mode_global_desc">All applications on this device will receive mocked location.</string>
|
||||||
|
<string name="apps_mode_blacklist_desc">Apps in the blacklist keep real location, while all other apps receive mocked location.</string>
|
||||||
|
<string name="apps_mode_whitelist_desc">Only apps in the whitelist receive mocked location, while other apps keep real location.</string>
|
||||||
|
<string name="apps_blacklist_title">Blacklist Apps</string>
|
||||||
|
<string name="apps_whitelist_title">Whitelist Apps</string>
|
||||||
|
<string name="apps_blacklist_subtitle">%1$d apps excluded</string>
|
||||||
|
<string name="apps_whitelist_subtitle">%1$d apps enabled</string>
|
||||||
|
<string name="apps_search_hint">Search app name or package…</string>
|
||||||
|
<string name="apps_select_all">Select All</string>
|
||||||
|
<string name="apps_deselect_all">Deselect All</string>
|
||||||
|
<string name="apps_show_system_apps">Show system apps</string>
|
||||||
|
<string name="apps_hide_system_apps">Hide system apps</string>
|
||||||
|
<string name="apps_system_app_tag">System</string>
|
||||||
|
<string name="apps_loading">Loading installed applications…</string>
|
||||||
|
<string name="apps_empty_search">No matching applications found</string>
|
||||||
|
<string name="apps_empty_installed">No applications found</string>
|
||||||
|
<string name="apps_selected_count">%1$d / %2$d selected</string>
|
||||||
|
|
||||||
|
<!-- Anti-Detection & Realism Settings -->
|
||||||
|
<string name="settings_category_anti_detection">Anti-Detection & Realism</string>
|
||||||
|
<string name="settings_anti_jitter_title">Natural Location Drift</string>
|
||||||
|
<string name="settings_anti_jitter_desc">Simulate smooth Brownian motion / Gaussian GNSS noise to prevent static location detection</string>
|
||||||
|
<string name="settings_anti_gnss_title">Full Constellation GNSS Simulation</string>
|
||||||
|
<string name="settings_anti_gnss_desc">Simulate realistic multi-constellation satellites (GPS, BeiDou, GLONASS, Galileo) with physical C/N0 noise and NMEA GSV/GSA sentences</string>
|
||||||
|
<string name="settings_anti_network_title">Cell Tower & Wi-Fi Camouflage</string>
|
||||||
|
<string name="settings_anti_network_desc">Camouflage cell tower and Wi-Fi BSSID to prevent cloud reverse geolocation lookup</string>
|
||||||
|
<string name="settings_anti_sensor_title">Handheld Motion Sensor Simulation</string>
|
||||||
|
<string name="settings_anti_sensor_desc">Inject subtle physiological micro-tremor into accelerometer readings to mimic active human hand-holding</string>
|
||||||
|
<string name="settings_anti_stealth_title">Module Package Stealth</string>
|
||||||
|
<string name="settings_anti_stealth_desc">Hide OpenLoc package from target apps to prevent package scanning detection</string>
|
||||||
|
<string name="settings_anti_dev_title">Mock Flag Sanitization</string>
|
||||||
|
<string name="settings_anti_dev_desc">Sanitize isMock and mIsFromMockProvider flags in Location objects</string>
|
||||||
|
|
||||||
|
|
||||||
|
<!-- Version & Updates -->
|
||||||
|
<string name="home_version_card_title">Current Version</string>
|
||||||
|
<string name="home_version_name">v1.2.1</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_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>
|
||||||
|
</resources>
|
||||||
@@ -171,7 +171,7 @@
|
|||||||
|
|
||||||
<!-- 版本与更新 -->
|
<!-- 版本与更新 -->
|
||||||
<string name="home_version_card_title">当前版本</string>
|
<string name="home_version_card_title">当前版本</string>
|
||||||
<string name="home_version_name">v1.2.0</string>
|
<string name="home_version_name">v1.2.1</string>
|
||||||
<string name="home_check_updates_btn">检查更新</string>
|
<string name="home_check_updates_btn">检查更新</string>
|
||||||
<string name="home_auto_check_update_title">启动时自动检查更新</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">每次进入软件自动联网检测 GitHub 最新版本</string>
|
||||||
|
|||||||
@@ -171,7 +171,7 @@
|
|||||||
|
|
||||||
<!-- 版本与更新 -->
|
<!-- 版本与更新 -->
|
||||||
<string name="home_version_card_title">当前版本</string>
|
<string name="home_version_card_title">当前版本</string>
|
||||||
<string name="home_version_name">v1.2.0</string>
|
<string name="home_version_name">v1.2.1</string>
|
||||||
<string name="home_check_updates_btn">检查更新</string>
|
<string name="home_check_updates_btn">检查更新</string>
|
||||||
<string name="home_auto_check_update_title">启动时自动检查更新</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">每次进入软件自动联网检测 GitHub 最新版本</string>
|
||||||
|
|||||||
@@ -171,7 +171,7 @@
|
|||||||
|
|
||||||
<!-- Version & Updates -->
|
<!-- Version & Updates -->
|
||||||
<string name="home_version_card_title">Current Version</string>
|
<string name="home_version_card_title">Current Version</string>
|
||||||
<string name="home_version_name">v1.2.0</string>
|
<string name="home_version_name">v1.2.1</string>
|
||||||
<string name="home_check_updates_btn">Check for Updates</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_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_auto_check_update_desc">Automatically check for new releases when opening the app</string>
|
||||||
|
|||||||
Reference in new issue
Block a user