From 7969e353e75b5afd206e19cc87b8b2b71adb2f80 Mon Sep 17 00:00:00 2001 From: wh-t1 <1311743861@qq.com> Date: Mon, 16 Nov 2026 17:29:11 +0800 Subject: [PATCH] =?UTF-8?q?=E6=96=B0=E5=A2=9E=E6=A1=8C=E9=9D=A22*1?= =?UTF-8?q?=E5=B0=8F=E7=BB=84=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- README.md | 12 +- app/src/main/AndroidManifest.xml | 39 +++- .../com/github/kr328/clash/MainApplication.kt | 24 +++ .../github/kr328/clash/SettingsActivity.kt | 3 + .../github/kr328/clash/remote/StatusClient.kt | 17 ++ .../kr328/clash/widget/ClashWidgetProvider.kt | 49 +++++ .../clash/widget/WidgetAppearanceResolver.kt | 44 ++++ .../clash/widget/WidgetConfigActivity.kt | 124 +++++++++++ .../github/kr328/clash/widget/WidgetStore.kt | 50 +++++ .../clash/widget/WidgetToggleActivity.kt | 61 ++++++ .../kr328/clash/widget/WidgetUpdater.kt | 87 ++++++++ .../main/res/drawable/widget_bg_dark_high.xml | 9 + .../main/res/drawable/widget_bg_dark_low.xml | 9 + .../res/drawable/widget_bg_dark_medium.xml | 9 + .../res/drawable/widget_bg_light_high.xml | 9 + .../main/res/drawable/widget_bg_light_low.xml | 9 + .../res/drawable/widget_bg_light_medium.xml | 9 + .../res/layout/activity_widget_config.xml | 196 ++++++++++++++++++ app/src/main/res/layout/widget_clash.xml | 39 ++++ .../main/res/layout/widget_clash_preview.xml | 36 ++++ app/src/main/res/values-night/colors.xml | 4 + app/src/main/res/values-zh/strings.xml | 24 +++ app/src/main/res/values/colors.xml | 9 +- app/src/main/res/values/strings.xml | 24 +++ app/src/main/res/values/themes.xml | 11 + app/src/main/res/xml/clash_widget_info.xml | 16 ++ build.gradle.kts | 9 +- .../kr328/clash/common/constants/Intents.kt | 1 + .../kr328/clash/design/SettingsDesign.kt | 2 +- .../main/res/drawable/ic_baseline_widgets.xml | 10 + .../src/main/res/layout/design_settings.xml | 7 + design/src/main/res/values-zh/strings.xml | 1 + design/src/main/res/values/strings.xml | 1 + .../kr328/clash/service/ClashManager.kt | 8 +- .../kr328/clash/service/StatusProvider.kt | 31 +++ .../kr328/clash/service/util/Broadcast.kt | 4 + 36 files changed, 977 insertions(+), 20 deletions(-) create mode 100644 app/src/main/java/com/github/kr328/clash/widget/ClashWidgetProvider.kt create mode 100644 app/src/main/java/com/github/kr328/clash/widget/WidgetAppearanceResolver.kt create mode 100644 app/src/main/java/com/github/kr328/clash/widget/WidgetConfigActivity.kt create mode 100644 app/src/main/java/com/github/kr328/clash/widget/WidgetStore.kt create mode 100644 app/src/main/java/com/github/kr328/clash/widget/WidgetToggleActivity.kt create mode 100644 app/src/main/java/com/github/kr328/clash/widget/WidgetUpdater.kt create mode 100644 app/src/main/res/drawable/widget_bg_dark_high.xml create mode 100644 app/src/main/res/drawable/widget_bg_dark_low.xml create mode 100644 app/src/main/res/drawable/widget_bg_dark_medium.xml create mode 100644 app/src/main/res/drawable/widget_bg_light_high.xml create mode 100644 app/src/main/res/drawable/widget_bg_light_low.xml create mode 100644 app/src/main/res/drawable/widget_bg_light_medium.xml create mode 100644 app/src/main/res/layout/activity_widget_config.xml create mode 100644 app/src/main/res/layout/widget_clash.xml create mode 100644 app/src/main/res/layout/widget_clash_preview.xml create mode 100644 app/src/main/res/values-night/colors.xml create mode 100644 app/src/main/res/values-zh/strings.xml create mode 100644 app/src/main/res/values/strings.xml create mode 100644 app/src/main/res/xml/clash_widget_info.xml create mode 100644 design/src/main/res/drawable/ic_baseline_widgets.xml diff --git a/README.md b/README.md index 03757eca76..b9e6fd4acc 100644 --- a/README.md +++ b/README.md @@ -35,9 +35,9 @@ Feature of [Clash.Meta](https://github.com/MetaCubeX/Clash.Meta) 4. (Optional) Custom app package name. Add the following configuration to `local.properties`. ```properties - # config your ownn applicationId, or it will be 'com.github.metacubex.clash' + # config your own applicationId, or it will be 'com.github.metacubex.clash.meta.widget' custom.application.id=com.my.compile.clash - # remove application id suffix, or the applicaion id will be 'com.github.metacubex.clash.alpha' + # remove the version name suffix ('.Alpha' / '.Meta') remove.suffix=true 5. Create `signing.properties` in project root with @@ -57,14 +57,14 @@ Feature of [Clash.Meta](https://github.com/MetaCubeX/Clash.Meta) ### Automation -APP package name is `com.github.metacubex.clash.meta` +APP package name is `com.github.metacubex.clash.meta.widget` - Toggle Clash.Meta service status - - Send intent to activity `com.github.kr328.clash.ExternalControlActivity` with action `com.github.metacubex.clash.meta.action.TOGGLE_CLASH` + - Send intent to activity `com.github.kr328.clash.ExternalControlActivity` with action `com.github.metacubex.clash.meta.widget.action.TOGGLE_CLASH` - Start Clash.Meta service - - Send intent to activity `com.github.kr328.clash.ExternalControlActivity` with action `com.github.metacubex.clash.meta.action.START_CLASH` + - Send intent to activity `com.github.kr328.clash.ExternalControlActivity` with action `com.github.metacubex.clash.meta.widget.action.START_CLASH` - Stop Clash.Meta service - - Send intent to activity `com.github.kr328.clash.ExternalControlActivity` with action `com.github.metacubex.clash.meta.action.STOP_CLASH` + - Send intent to activity `com.github.kr328.clash.ExternalControlActivity` with action `com.github.metacubex.clash.meta.widget.action.STOP_CLASH` - Import a profile - URL Scheme `clash://install-config?url=` or `clashmeta://install-config?url=` diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 9900007e38..4b4f14a2a1 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -89,18 +89,32 @@ - + - + - + + + + + + + + + + + + + + + + + + + + + () { startActivity(OverrideSettingsActivity::class.intent) SettingsDesign.Request.StartMetaFeature -> startActivity(MetaFeatureSettingsActivity::class.intent) + SettingsDesign.Request.StartWidget -> + startActivity(WidgetConfigActivity::class.intent) } } } diff --git a/app/src/main/java/com/github/kr328/clash/remote/StatusClient.kt b/app/src/main/java/com/github/kr328/clash/remote/StatusClient.kt index fd3625befc..e8db01c6b6 100644 --- a/app/src/main/java/com/github/kr328/clash/remote/StatusClient.kt +++ b/app/src/main/java/com/github/kr328/clash/remote/StatusClient.kt @@ -31,4 +31,21 @@ class StatusClient(private val context: Context) { null } } + + fun currentProxy(): String? { + return try { + val result = context.contentResolver.call( + uri, + StatusProvider.METHOD_CURRENT_PROXY, + null, + null + ) + + result?.getString("name") + } catch (e: Exception) { + Log.w("Query current proxy: $e", e) + + null + } + } } \ No newline at end of file diff --git a/app/src/main/java/com/github/kr328/clash/widget/ClashWidgetProvider.kt b/app/src/main/java/com/github/kr328/clash/widget/ClashWidgetProvider.kt new file mode 100644 index 0000000000..4828790273 --- /dev/null +++ b/app/src/main/java/com/github/kr328/clash/widget/ClashWidgetProvider.kt @@ -0,0 +1,49 @@ +package com.github.kr328.clash.widget + +import android.appwidget.AppWidgetManager +import android.appwidget.AppWidgetProvider +import android.content.Context +import android.content.Intent +import com.github.kr328.clash.common.constants.Intents +import kotlinx.coroutines.CoroutineScope +import kotlinx.coroutines.Dispatchers +import kotlinx.coroutines.launch + +class ClashWidgetProvider : AppWidgetProvider() { + override fun onUpdate( + context: Context, + appWidgetManager: AppWidgetManager, + appWidgetIds: IntArray, + ) { + val pendingResult = goAsync() + + CoroutineScope(Dispatchers.IO).launch { + try { + WidgetUpdater.update(context, appWidgetManager, appWidgetIds) + } finally { + pendingResult.finish() + } + } + } + + override fun onReceive(context: Context, intent: Intent) { + when (intent.action) { + Intents.ACTION_CLASH_STARTED, + Intents.ACTION_CLASH_STOPPED, + Intents.ACTION_SERVICE_RECREATED, + Intents.ACTION_PROFILE_LOADED, + Intents.ACTION_SELECTION_CHANGED -> { + val pendingResult = goAsync() + + CoroutineScope(Dispatchers.IO).launch { + try { + WidgetUpdater.updateAll(context) + } finally { + pendingResult.finish() + } + } + } + else -> super.onReceive(context, intent) + } + } +} diff --git a/app/src/main/java/com/github/kr328/clash/widget/WidgetAppearanceResolver.kt b/app/src/main/java/com/github/kr328/clash/widget/WidgetAppearanceResolver.kt new file mode 100644 index 0000000000..7a2da77be7 --- /dev/null +++ b/app/src/main/java/com/github/kr328/clash/widget/WidgetAppearanceResolver.kt @@ -0,0 +1,44 @@ +package com.github.kr328.clash.widget + +import android.content.Context +import android.content.res.Configuration +import androidx.annotation.ColorRes +import androidx.annotation.DrawableRes +import com.github.kr328.clash.R + +object WidgetAppearanceResolver { + fun isNight(context: Context, appearance: WidgetAppearance): Boolean { + return when (appearance) { + WidgetAppearance.FollowSystem -> + (context.resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK) == + Configuration.UI_MODE_NIGHT_YES + WidgetAppearance.Light -> false + WidgetAppearance.Dark -> true + } + } + + @DrawableRes + fun background( + night: Boolean, + transparency: WidgetTransparency, + ): Int { + return when (transparency) { + WidgetTransparency.Low -> + if (night) R.drawable.widget_bg_dark_low else R.drawable.widget_bg_light_low + WidgetTransparency.Medium -> + if (night) R.drawable.widget_bg_dark_medium else R.drawable.widget_bg_light_medium + WidgetTransparency.High -> + if (night) R.drawable.widget_bg_dark_high else R.drawable.widget_bg_light_high + } + } + + @ColorRes + fun foreground(night: Boolean, running: Boolean): Int { + return when { + running && night -> R.color.widget_active_dark + running -> R.color.widget_active_light + night -> R.color.widget_inactive_dark + else -> R.color.widget_inactive_light + } + } +} diff --git a/app/src/main/java/com/github/kr328/clash/widget/WidgetConfigActivity.kt b/app/src/main/java/com/github/kr328/clash/widget/WidgetConfigActivity.kt new file mode 100644 index 0000000000..5848fe5048 --- /dev/null +++ b/app/src/main/java/com/github/kr328/clash/widget/WidgetConfigActivity.kt @@ -0,0 +1,124 @@ +package com.github.kr328.clash.widget + +import android.appwidget.AppWidgetManager +import android.content.Intent +import android.os.Bundle +import android.view.View +import android.widget.ImageView +import android.widget.RadioGroup +import android.widget.TextView +import androidx.appcompat.app.AppCompatActivity +import androidx.core.content.ContextCompat +import com.github.kr328.clash.R +import com.google.android.material.button.MaterialButton + +class WidgetConfigActivity : AppCompatActivity() { + private lateinit var store: WidgetStore + private var appWidgetId = AppWidgetManager.INVALID_APPWIDGET_ID + + private lateinit var appearanceGroup: RadioGroup + private lateinit var transparencyGroup: RadioGroup + private lateinit var previewRoot: View + private lateinit var previewIcon: ImageView + private lateinit var previewTitle: TextView + + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + + setResult(RESULT_CANCELED) + + appWidgetId = intent?.extras?.getInt( + AppWidgetManager.EXTRA_APPWIDGET_ID, + AppWidgetManager.INVALID_APPWIDGET_ID + ) ?: AppWidgetManager.INVALID_APPWIDGET_ID + + setContentView(R.layout.activity_widget_config) + + store = WidgetStore(this) + + appearanceGroup = findViewById(R.id.widget_appearance_group) + transparencyGroup = findViewById(R.id.widget_transparency_group) + previewRoot = findViewById(R.id.widget_preview) + previewIcon = findViewById(R.id.widget_preview_icon) + previewTitle = findViewById(R.id.widget_preview_title) + + appearanceGroup.check( + when (store.appearance) { + WidgetAppearance.FollowSystem -> R.id.widget_appearance_system + WidgetAppearance.Light -> R.id.widget_appearance_light + WidgetAppearance.Dark -> R.id.widget_appearance_dark + } + ) + + transparencyGroup.check( + when (store.transparency) { + WidgetTransparency.Low -> R.id.widget_transparency_low + WidgetTransparency.Medium -> R.id.widget_transparency_medium + WidgetTransparency.High -> R.id.widget_transparency_high + } + ) + + appearanceGroup.setOnCheckedChangeListener { _, _ -> updatePreview() } + transparencyGroup.setOnCheckedChangeListener { _, _ -> updatePreview() } + + findViewById(R.id.widget_cancel).setOnClickListener { + finish() + } + + findViewById(R.id.widget_save).setOnClickListener { + save() + } + + updatePreview() + } + + private fun selectedAppearance(): WidgetAppearance { + return when (appearanceGroup.checkedRadioButtonId) { + R.id.widget_appearance_light -> WidgetAppearance.Light + R.id.widget_appearance_dark -> WidgetAppearance.Dark + else -> WidgetAppearance.FollowSystem + } + } + + private fun selectedTransparency(): WidgetTransparency { + return when (transparencyGroup.checkedRadioButtonId) { + R.id.widget_transparency_low -> WidgetTransparency.Low + R.id.widget_transparency_high -> WidgetTransparency.High + else -> WidgetTransparency.Medium + } + } + + private fun updatePreview() { + val night = WidgetAppearanceResolver.isNight(this, selectedAppearance()) + + previewRoot.setBackgroundResource( + WidgetAppearanceResolver.background(night, selectedTransparency()) + ) + + val foreground = ContextCompat.getColor( + this, + WidgetAppearanceResolver.foreground(night, true) + ) + + previewIcon.setColorFilter(foreground) + previewTitle.setTextColor(foreground) + } + + private fun save() { + store.appearance = selectedAppearance() + store.transparency = selectedTransparency() + + Thread { + WidgetUpdater.updateAll(applicationContext) + }.start() + + if (appWidgetId != AppWidgetManager.INVALID_APPWIDGET_ID) { + setResult( + RESULT_OK, + Intent().putExtra(AppWidgetManager.EXTRA_APPWIDGET_ID, appWidgetId) + ) + } + + finish() + } +} diff --git a/app/src/main/java/com/github/kr328/clash/widget/WidgetStore.kt b/app/src/main/java/com/github/kr328/clash/widget/WidgetStore.kt new file mode 100644 index 0000000000..1cfc5d6ef2 --- /dev/null +++ b/app/src/main/java/com/github/kr328/clash/widget/WidgetStore.kt @@ -0,0 +1,50 @@ +package com.github.kr328.clash.widget + +import android.content.Context +import com.github.kr328.clash.common.store.Store +import com.github.kr328.clash.common.store.asStoreProvider + +enum class WidgetAppearance { + FollowSystem, + Light, + Dark, +} + +enum class WidgetTransparency { + Low, + Medium, + High, +} + +class WidgetStore(context: Context) { + private val store = Store( + context + .getSharedPreferences(FILE_NAME, Context.MODE_PRIVATE) + .asStoreProvider() + ) + + var appearance: WidgetAppearance by store.enum( + key = "appearance", + defaultValue = WidgetAppearance.FollowSystem, + values = WidgetAppearance.values(), + ) + + var transparency: WidgetTransparency by store.enum( + key = "transparency", + defaultValue = WidgetTransparency.Medium, + values = WidgetTransparency.values(), + ) + + /** + * The node name is remembered so the widget can still show the last used node + * after the proxy has been stopped. + */ + var lastNode: String by store.string( + key = "last_node", + defaultValue = "", + ) + + companion object { + private const val FILE_NAME = "widget" + } +} diff --git a/app/src/main/java/com/github/kr328/clash/widget/WidgetToggleActivity.kt b/app/src/main/java/com/github/kr328/clash/widget/WidgetToggleActivity.kt new file mode 100644 index 0000000000..c2428b1a3d --- /dev/null +++ b/app/src/main/java/com/github/kr328/clash/widget/WidgetToggleActivity.kt @@ -0,0 +1,61 @@ +package com.github.kr328.clash.widget + +import android.app.Activity +import android.content.Intent +import android.os.Bundle +import com.github.kr328.clash.remote.StatusClient +import com.github.kr328.clash.util.startClashService +import com.github.kr328.clash.util.stopClashService + +/** + * A transparent, no-UI activity used by the widget. Using an activity instead of a + * broadcast lets us request VPN permission on first use, and it is allowed to be + * launched from a widget PendingIntent. + */ +@Suppress("DEPRECATION") +class WidgetToggleActivity : Activity() { + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + + overridePendingTransition(0, 0) + + if (StatusClient(this).currentProfile() != null) { + stopClashService() + finish() + return + } + + val vpnRequest = startClashService() + + if (vpnRequest == null) { + finish() + return + } + + try { + startActivityForResult(vpnRequest, REQUEST_VPN) + } catch (e: Exception) { + finish() + } + } + + override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { + super.onActivityResult(requestCode, resultCode, data) + + if (requestCode == REQUEST_VPN && resultCode == RESULT_OK) { + startClashService() + } + + finish() + } + + override fun finish() { + super.finish() + + overridePendingTransition(0, 0) + } + + companion object { + private const val REQUEST_VPN = 1 + } +} diff --git a/app/src/main/java/com/github/kr328/clash/widget/WidgetUpdater.kt b/app/src/main/java/com/github/kr328/clash/widget/WidgetUpdater.kt new file mode 100644 index 0000000000..3d0ce144ae --- /dev/null +++ b/app/src/main/java/com/github/kr328/clash/widget/WidgetUpdater.kt @@ -0,0 +1,87 @@ +package com.github.kr328.clash.widget + +import android.app.PendingIntent +import android.appwidget.AppWidgetManager +import android.content.ComponentName +import android.content.Context +import android.content.Intent +import android.widget.RemoteViews +import androidx.core.content.ContextCompat +import com.github.kr328.clash.R +import com.github.kr328.clash.common.compat.pendingIntentFlags +import com.github.kr328.clash.common.log.Log +import com.github.kr328.clash.remote.StatusClient + +object WidgetUpdater { + fun updateAll(context: Context) { + val manager = AppWidgetManager.getInstance(context) + val component = ComponentName(context, ClashWidgetProvider::class.java) + + update(context, manager, manager.getAppWidgetIds(component)) + } + + @Synchronized + fun update(context: Context, manager: AppWidgetManager, appWidgetIds: IntArray) { + if (appWidgetIds.isEmpty()) + return + + try { + val store = WidgetStore(context) + val status = StatusClient(context) + val profile = status.currentProfile() + val running = profile != null + + val node = if (running) + status.currentProxy()?.takeIf { it.isNotBlank() } + else + null + + if (node != null) + store.lastNode = node + + val name = node + ?: profile?.takeIf { it.isNotBlank() } + ?: store.lastNode.takeIf { it.isNotBlank() } + ?: context.getString(R.string.widget_no_node) + + val night = WidgetAppearanceResolver.isNight(context, store.appearance) + val background = WidgetAppearanceResolver.background(night, store.transparency) + val foreground = ContextCompat.getColor( + context, + WidgetAppearanceResolver.foreground(night, running) + ) + + val state = context.getString( + if (running) R.string.widget_state_on else R.string.widget_state_off + ) + val description = context.getString(R.string.widget_content_description, state, name) + + val toggleIntent = Intent(context, WidgetToggleActivity::class.java).apply { + addFlags(Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_CLEAR_TOP) + } + val togglePendingIntent = PendingIntent.getActivity( + context, + REQUEST_TOGGLE, + toggleIntent, + pendingIntentFlags(PendingIntent.FLAG_UPDATE_CURRENT) + ) + + for (appWidgetId in appWidgetIds) { + val views = RemoteViews(context.packageName, R.layout.widget_clash).apply { + setInt(R.id.widget_root, "setBackgroundResource", background) + setInt(R.id.widget_icon, "setColorFilter", foreground) + setTextColor(R.id.widget_title, foreground) + setTextViewText(R.id.widget_title, name) + setContentDescription(R.id.widget_root, description) + setOnClickPendingIntent(R.id.widget_root, togglePendingIntent) + } + + manager.updateAppWidget(appWidgetId, views) + } + } catch (e: Exception) { + Log.w("Update widget: $e", e) + } + } + + private const val REQUEST_TOGGLE = 1 +} diff --git a/app/src/main/res/drawable/widget_bg_dark_high.xml b/app/src/main/res/drawable/widget_bg_dark_high.xml new file mode 100644 index 0000000000..93fe7db68d --- /dev/null +++ b/app/src/main/res/drawable/widget_bg_dark_high.xml @@ -0,0 +1,9 @@ + + + + + + diff --git a/app/src/main/res/drawable/widget_bg_dark_low.xml b/app/src/main/res/drawable/widget_bg_dark_low.xml new file mode 100644 index 0000000000..ca4472a62d --- /dev/null +++ b/app/src/main/res/drawable/widget_bg_dark_low.xml @@ -0,0 +1,9 @@ + + + + + + diff --git a/app/src/main/res/drawable/widget_bg_dark_medium.xml b/app/src/main/res/drawable/widget_bg_dark_medium.xml new file mode 100644 index 0000000000..d678cfcff5 --- /dev/null +++ b/app/src/main/res/drawable/widget_bg_dark_medium.xml @@ -0,0 +1,9 @@ + + + + + + diff --git a/app/src/main/res/drawable/widget_bg_light_high.xml b/app/src/main/res/drawable/widget_bg_light_high.xml new file mode 100644 index 0000000000..418d7e4f7b --- /dev/null +++ b/app/src/main/res/drawable/widget_bg_light_high.xml @@ -0,0 +1,9 @@ + + + + + + diff --git a/app/src/main/res/drawable/widget_bg_light_low.xml b/app/src/main/res/drawable/widget_bg_light_low.xml new file mode 100644 index 0000000000..f7f11e12b3 --- /dev/null +++ b/app/src/main/res/drawable/widget_bg_light_low.xml @@ -0,0 +1,9 @@ + + + + + + diff --git a/app/src/main/res/drawable/widget_bg_light_medium.xml b/app/src/main/res/drawable/widget_bg_light_medium.xml new file mode 100644 index 0000000000..729ae895a0 --- /dev/null +++ b/app/src/main/res/drawable/widget_bg_light_medium.xml @@ -0,0 +1,9 @@ + + + + + + diff --git a/app/src/main/res/layout/activity_widget_config.xml b/app/src/main/res/layout/activity_widget_config.xml new file mode 100644 index 0000000000..fad3678e38 --- /dev/null +++ b/app/src/main/res/layout/activity_widget_config.xml @@ -0,0 +1,196 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/widget_clash.xml b/app/src/main/res/layout/widget_clash.xml new file mode 100644 index 0000000000..3a2ff1ccf0 --- /dev/null +++ b/app/src/main/res/layout/widget_clash.xml @@ -0,0 +1,39 @@ + + + + + + + + diff --git a/app/src/main/res/layout/widget_clash_preview.xml b/app/src/main/res/layout/widget_clash_preview.xml new file mode 100644 index 0000000000..66ea0a83da --- /dev/null +++ b/app/src/main/res/layout/widget_clash_preview.xml @@ -0,0 +1,36 @@ + + + + + + + + diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml new file mode 100644 index 0000000000..7bcde10cbe --- /dev/null +++ b/app/src/main/res/values-night/colors.xml @@ -0,0 +1,4 @@ + + + #FF121212 + diff --git a/app/src/main/res/values-zh/strings.xml b/app/src/main/res/values-zh/strings.xml new file mode 100644 index 0000000000..17d830039c --- /dev/null +++ b/app/src/main/res/values-zh/strings.xml @@ -0,0 +1,24 @@ + + + ClashMate + 快速开关代理并查看当前代理节点。 + 未连接 + 代理已开启 + 代理已关闭 + ClashMate,%1$s,%2$s + + 微件设置 + 调整 ClashMate 微件的外观。 + 预览 + 香港 01 · IPLC + 颜色 + 跟随系统 + 浅色 + 深色 + 背景透明度 + 低 + 中 + 高 + 保存 + 取消 + diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 9f6352ff9c..ee314274f6 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,4 +1,11 @@ #FFFFFF - \ No newline at end of file + + + #FF1E4376 + #FF4C8DFF + #FF808080 + #FF9E9E9E + #FFFAFAFA + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml new file mode 100644 index 0000000000..6ebd2fb141 --- /dev/null +++ b/app/src/main/res/values/strings.xml @@ -0,0 +1,24 @@ + + + ClashMate + Quickly toggle the proxy and see the current proxy node. + Not connected + Proxy on + Proxy off + ClashMate, %1$s, %2$s + + Widget settings + Adjust the appearance of the ClashMate widget. + Preview + Hong Kong 01 · IPLC + Color + Follow system + Light + Dark + Background transparency + Low + Medium + High + Save + Cancel + diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml index 9fb80f6cec..47db75c75c 100644 --- a/app/src/main/res/values/themes.xml +++ b/app/src/main/res/values/themes.xml @@ -1,4 +1,15 @@ + + diff --git a/app/src/main/res/xml/clash_widget_info.xml b/app/src/main/res/xml/clash_widget_info.xml new file mode 100644 index 0000000000..5b5b162518 --- /dev/null +++ b/app/src/main/res/xml/clash_widget_info.xml @@ -0,0 +1,16 @@ + + diff --git a/build.gradle.kts b/build.gradle.kts index 3777092305..03197e4025 100644 --- a/build.gradle.kts +++ b/build.gradle.kts @@ -47,7 +47,8 @@ subprojects { defaultConfig { if (isApp) { val customApplicationId = queryConfigProperty("custom.application.id") as? String? - applicationId = customApplicationId.takeIf { it?.isNotBlank() == true } ?: "com.github.metacubex.clash" + applicationId = customApplicationId.takeIf { it?.isNotBlank() == true } + ?: "com.github.metacubex.clash.meta.widget" } project.name.let { name -> @@ -111,9 +112,6 @@ subprojects { resValue("string", "launch_name", "@string/launch_name_alpha") resValue("string", "application_name", "@string/application_name_alpha") - if (isApp && !removeSuffix) { - applicationIdSuffix = ".alpha" - } } create("meta") { @@ -128,9 +126,6 @@ subprojects { resValue("string", "launch_name", "@string/launch_name_meta") resValue("string", "application_name", "@string/application_name_meta") - if (isApp && !removeSuffix) { - applicationIdSuffix = ".meta" - } } } diff --git a/common/src/main/java/com/github/kr328/clash/common/constants/Intents.kt b/common/src/main/java/com/github/kr328/clash/common/constants/Intents.kt index b754dc701a..278d117646 100644 --- a/common/src/main/java/com/github/kr328/clash/common/constants/Intents.kt +++ b/common/src/main/java/com/github/kr328/clash/common/constants/Intents.kt @@ -23,6 +23,7 @@ object Intents { val ACTION_PROFILE_SCHEDULE_UPDATES = "$packageName.intent.action.SCHEDULE_UPDATES" val ACTION_PROFILE_LOADED = "$packageName.intent.action.PROFILE_LOADED" val ACTION_OVERRIDE_CHANGED = "$packageName.intent.action.OVERRIDE_CHANGED" + val ACTION_SELECTION_CHANGED = "$packageName.intent.action.SELECTION_CHANGED" const val EXTRA_STOP_REASON = "stop_reason" const val EXTRA_UUID = "uuid" diff --git a/design/src/main/java/com/github/kr328/clash/design/SettingsDesign.kt b/design/src/main/java/com/github/kr328/clash/design/SettingsDesign.kt index 0536a587cd..d318ba73f5 100644 --- a/design/src/main/java/com/github/kr328/clash/design/SettingsDesign.kt +++ b/design/src/main/java/com/github/kr328/clash/design/SettingsDesign.kt @@ -10,7 +10,7 @@ import com.github.kr328.clash.design.util.root class SettingsDesign(context: Context) : Design(context) { enum class Request { - StartApp, StartNetwork, StartOverride, StartMetaFeature, + StartApp, StartNetwork, StartOverride, StartMetaFeature, StartWidget, } private val binding = DesignSettingsBinding diff --git a/design/src/main/res/drawable/ic_baseline_widgets.xml b/design/src/main/res/drawable/ic_baseline_widgets.xml new file mode 100644 index 0000000000..2fc1079640 --- /dev/null +++ b/design/src/main/res/drawable/ic_baseline_widgets.xml @@ -0,0 +1,10 @@ + + + diff --git a/design/src/main/res/layout/design_settings.xml b/design/src/main/res/layout/design_settings.xml index 885ec4a5c8..6cb67d231f 100644 --- a/design/src/main/res/layout/design_settings.xml +++ b/design/src/main/res/layout/design_settings.xml @@ -56,6 +56,13 @@ app:icon="@drawable/ic_baseline_meta" app:text="@string/meta_features" /> + + diff --git a/design/src/main/res/values-zh/strings.xml b/design/src/main/res/values-zh/strings.xml index ee7daf75e1..06813e9dc4 100644 --- a/design/src/main/res/values-zh/strings.xml +++ b/design/src/main/res/values-zh/strings.xml @@ -239,6 +239,7 @@ 通过 VpnService 代理 Ipv6 流量 Clash Meta Wiki Meta 特性 + 桌面微件 统一延迟 Geodata 模式 TCP 并发 diff --git a/design/src/main/res/values/strings.xml b/design/src/main/res/values/strings.xml index a2f951e679..a9d98580ab 100644 --- a/design/src/main/res/values/strings.xml +++ b/design/src/main/res/values/strings.xml @@ -316,6 +316,7 @@ https://wiki.metacubex.one Meta Features + Home Screen Widget Unified Delay Geodata Mode TCP Concurrent diff --git a/service/src/main/java/com/github/kr328/clash/service/ClashManager.kt b/service/src/main/java/com/github/kr328/clash/service/ClashManager.kt index aa92b4afe4..7d8adde36d 100644 --- a/service/src/main/java/com/github/kr328/clash/service/ClashManager.kt +++ b/service/src/main/java/com/github/kr328/clash/service/ClashManager.kt @@ -10,6 +10,7 @@ import com.github.kr328.clash.service.remote.IClashManager import com.github.kr328.clash.service.remote.ILogObserver import com.github.kr328.clash.service.store.ServiceStore import com.github.kr328.clash.service.util.sendOverrideChanged +import com.github.kr328.clash.service.util.sendSelectionChanged import kotlinx.coroutines.* import kotlinx.coroutines.channels.ReceiveChannel @@ -47,10 +48,13 @@ class ClashManager(private val context: Context) : IClashManager, } override fun patchSelector(group: String, name: String): Boolean { - return Clash.patchSelector(group, name).also { + return Clash.patchSelector(group, name).also { applied -> + if (applied) + context.sendSelectionChanged() + val current = store.activeProfile ?: return@also - if (it) { + if (applied) { SelectionDao().setSelected(Selection(current, group, name)) } else { SelectionDao().removeSelected(current, group) diff --git a/service/src/main/java/com/github/kr328/clash/service/StatusProvider.kt b/service/src/main/java/com/github/kr328/clash/service/StatusProvider.kt index bd3eb8a9ba..cbb97520d9 100644 --- a/service/src/main/java/com/github/kr328/clash/service/StatusProvider.kt +++ b/service/src/main/java/com/github/kr328/clash/service/StatusProvider.kt @@ -6,6 +6,8 @@ import android.database.Cursor import android.net.Uri import android.os.Bundle import com.github.kr328.clash.common.Global +import com.github.kr328.clash.core.Clash +import com.github.kr328.clash.core.model.ProxySort class StatusProvider : ContentProvider() { override fun call(method: String, arg: String?, extras: Bundle?): Bundle? { @@ -18,10 +20,38 @@ class StatusProvider : ContentProvider() { else null } + METHOD_CURRENT_PROXY -> { + // currentProfile is only set after Clash.load() has finished, which + // guarantees that the native core is ready to be queried. + return if (serviceRunning && currentProfile != null) + Bundle().apply { + putString("name", queryCurrentProxy()) + } + else + null + } else -> super.call(method, arg, extras) } } + private fun queryCurrentProxy(): String? { + return try { + val names = Clash.queryGroupNames(false) + + // "Proxy" is the conventional main group. Otherwise fall back to the + // first group that is not the built-in GLOBAL group. + val groupName = names.firstOrNull { it == "Proxy" } + ?: names.firstOrNull { !it.equals("GLOBAL", ignoreCase = true) } + ?: return null + + Clash.queryGroup(groupName, ProxySort.Default) + .now + .takeIf { it.isNotBlank() } + } catch (e: Throwable) { + null + } + } + override fun insert(uri: Uri, values: ContentValues?): Uri? { throw IllegalArgumentException("Stub!") } @@ -59,6 +89,7 @@ class StatusProvider : ContentProvider() { companion object { const val METHOD_CURRENT_PROFILE = "currentProfile" + const val METHOD_CURRENT_PROXY = "currentProxy" private const val CLASH_SERVICE_RUNNING_FILE = "service_running.lock" diff --git a/service/src/main/java/com/github/kr328/clash/service/util/Broadcast.kt b/service/src/main/java/com/github/kr328/clash/service/util/Broadcast.kt index 8cbe278ef2..c0a2cc8d82 100644 --- a/service/src/main/java/com/github/kr328/clash/service/util/Broadcast.kt +++ b/service/src/main/java/com/github/kr328/clash/service/util/Broadcast.kt @@ -48,6 +48,10 @@ fun Context.sendOverrideChanged() { sendBroadcastSelf(intent) } +fun Context.sendSelectionChanged() { + sendBroadcastSelf(Intent(Intents.ACTION_SELECTION_CHANGED)) +} + fun Context.sendServiceRecreated() { sendBroadcastSelf(Intent(Intents.ACTION_SERVICE_RECREATED)) }