From 7e10eb8df7728b41161bab71aa043802d32d6671 Mon Sep 17 00:00:00 2001 From: Ed Chao Date: Tue, 21 Jul 2026 18:44:26 +0900 Subject: [PATCH] feat: adopt new web design --- .../main/assets/json/path-configuration.json | 6 +++- .../android/bridge/AccountComponent.kt | 18 +++------- .../main/res/drawable/baseline_face_24.xml | 5 --- .../main/res/drawable/baseline_info_24.xml | 5 +++ .../main/res/drawable/baseline_people_24.xml | 5 --- androidApp/src/main/res/values/strings.xml | 3 +- iosApp/iosApp/Bridge/AccountComponent.swift | 24 ++++---------- iosApp/iosApp/Localizable.xcstrings | 33 +++++++------------ iosApp/iosApp/path-configuration.json | 5 ++- 9 files changed, 36 insertions(+), 68 deletions(-) delete mode 100644 androidApp/src/main/res/drawable/baseline_face_24.xml create mode 100644 androidApp/src/main/res/drawable/baseline_info_24.xml delete mode 100644 androidApp/src/main/res/drawable/baseline_people_24.xml diff --git a/androidApp/src/main/assets/json/path-configuration.json b/androidApp/src/main/assets/json/path-configuration.json index 4ea7714..273e7ff 100644 --- a/androidApp/src/main/assets/json/path-configuration.json +++ b/androidApp/src/main/assets/json/path-configuration.json @@ -34,7 +34,11 @@ }, { "patterns": [ - "^/dialog/*" + "^/about$", + "^/albums/[0-9]+/edit$", + "^/artists/[0-9]+/edit$", + "^/playlists/selections/?.+$", + "^/playlists/new$" ], "properties": { "context": "modal", diff --git a/androidApp/src/main/java/org/blackcandy/android/bridge/AccountComponent.kt b/androidApp/src/main/java/org/blackcandy/android/bridge/AccountComponent.kt index 4d3a773..ac94974 100644 --- a/androidApp/src/main/java/org/blackcandy/android/bridge/AccountComponent.kt +++ b/androidApp/src/main/java/org/blackcandy/android/bridge/AccountComponent.kt @@ -35,8 +35,7 @@ class AccountComponent( when (message.event) { "connect" -> handleConnectEvent(message) "menuItemConnected:settings" -> handleMenuItemConnectedEvent("settings") - "menuItemConnected:manage_users" -> handleMenuItemConnectedEvent("manage_users") - "menuItemConnected:update_profile" -> handleMenuItemConnectedEvent("update_profile") + "menuItemConnected:about" -> handleMenuItemConnectedEvent("about") "menuItemConnected:logout" -> handleMenuItemConnectedEvent("logout") } } @@ -85,19 +84,10 @@ class AccountComponent( ) } - "manage_users" -> { + "about" -> { menuItems.add( - MenuItem("manage_users", R.string.manage_users, R.drawable.baseline_people_24, { - replyTo("menuItemConnected:manage_users") - bottomSheet.dismiss() - }), - ) - } - - "update_profile" -> { - menuItems.add( - MenuItem("update_profile", R.string.update_profile, R.drawable.baseline_face_24, { - replyTo("menuItemConnected:update_profile") + MenuItem("about", R.string.about, R.drawable.baseline_info_24, { + replyTo("menuItemConnected:about") bottomSheet.dismiss() }), ) diff --git a/androidApp/src/main/res/drawable/baseline_face_24.xml b/androidApp/src/main/res/drawable/baseline_face_24.xml deleted file mode 100644 index 85fe39a..0000000 --- a/androidApp/src/main/res/drawable/baseline_face_24.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/androidApp/src/main/res/drawable/baseline_info_24.xml b/androidApp/src/main/res/drawable/baseline_info_24.xml new file mode 100644 index 0000000..0bd5b97 --- /dev/null +++ b/androidApp/src/main/res/drawable/baseline_info_24.xml @@ -0,0 +1,5 @@ + + + diff --git a/androidApp/src/main/res/drawable/baseline_people_24.xml b/androidApp/src/main/res/drawable/baseline_people_24.xml deleted file mode 100644 index a3ccd71..0000000 --- a/androidApp/src/main/res/drawable/baseline_people_24.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/androidApp/src/main/res/values/strings.xml b/androidApp/src/main/res/values/strings.xml index 96a305a..529ae5c 100644 --- a/androidApp/src/main/res/values/strings.xml +++ b/androidApp/src/main/res/values/strings.xml @@ -5,8 +5,7 @@ Search your library Account Settings - Manage Users - Update Profile + About Logout Server Address Connect diff --git a/iosApp/iosApp/Bridge/AccountComponent.swift b/iosApp/iosApp/Bridge/AccountComponent.swift index 6ddaef8..948a759 100644 --- a/iosApp/iosApp/Bridge/AccountComponent.swift +++ b/iosApp/iosApp/Bridge/AccountComponent.swift @@ -23,10 +23,8 @@ class AccountComponent: BridgeComponent { handleConnectEvent() case "menuItemConnected:settings": handleMenuItemConnectedEvent("settings") - case "menuItemConnected:manage_users": - handleMenuItemConnectedEvent("manage_users") - case "menuItemConnected:update_profile": - handleMenuItemConnectedEvent("update_profile") + case "menuItemConnected:about": + handleMenuItemConnectedEvent("about") case "menuItemConnected:logout": handleMenuItemConnectedEvent("logout") default: @@ -66,23 +64,13 @@ class AccountComponent: BridgeComponent { } ) ) - case "manage_users": + case "about": menuItems.append( .init( - id: "manage_users", - title: String(localized: "label.manage_users"), + id: "about", + title: String(localized: "label.about"), action: { - self.reply(to: "menuItemConnected:manage_users") - } - ) - ) - case "update_profile": - menuItems.append( - .init( - id: "update_profile", - title: String(localized: "label.update_profile"), - action: { - self.reply(to: "menuItemConnected:update_profile") + self.reply(to: "menuItemConnected:about") } ) ) diff --git a/iosApp/iosApp/Localizable.xcstrings b/iosApp/iosApp/Localizable.xcstrings index 6185d21..b90c059 100644 --- a/iosApp/iosApp/Localizable.xcstrings +++ b/iosApp/iosApp/Localizable.xcstrings @@ -1,6 +1,17 @@ { "sourceLanguage" : "en", "strings" : { + "label.about" : { + "extractionState" : "manual", + "localizations" : { + "en" : { + "stringUnit" : { + "state" : "translated", + "value" : "About" + } + } + } + }, "label.account" : { "extractionState" : "manual", "localizations" : { @@ -89,17 +100,6 @@ } } }, - "label.manage_users" : { - "extractionState" : "manual", - "localizations" : { - "en" : { - "stringUnit" : { - "state" : "translated", - "value" : "Manage Users" - } - } - } - }, "label.no_items" : { "extractionState" : "manual", "localizations" : { @@ -188,17 +188,6 @@ } } }, - "label.update_profile" : { - "extractionState" : "manual", - "localizations" : { - "en" : { - "stringUnit" : { - "state" : "translated", - "value" : "Update Profile" - } - } - } - }, "text.added_to_playlist" : { "extractionState" : "manual", "localizations" : { diff --git a/iosApp/iosApp/path-configuration.json b/iosApp/iosApp/path-configuration.json index af140f5..5da9649 100644 --- a/iosApp/iosApp/path-configuration.json +++ b/iosApp/iosApp/path-configuration.json @@ -2,7 +2,10 @@ "rules": [ { "patterns": [ - "^/dialog/*" + "^/albums/[0-9]+/edit$", + "^/artists/[0-9]+/edit$", + "^/playlists/selections/?.+$", + "^/playlists/new$" ], "properties": { "context": "modal"