Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 5 additions & 1 deletion androidApp/src/main/assets/json/path-configuration.json
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,11 @@
},
{
"patterns": [
"^/dialog/*"
"^/about$",
"^/albums/[0-9]+/edit$",
"^/artists/[0-9]+/edit$",
"^/playlists/selections/?.+$",
"^/playlists/new$"
],
"properties": {
"context": "modal",
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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")
}
}
Expand Down Expand Up @@ -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()
}),
)
Expand Down
5 changes: 0 additions & 5 deletions androidApp/src/main/res/drawable/baseline_face_24.xml

This file was deleted.

5 changes: 5 additions & 0 deletions androidApp/src/main/res/drawable/baseline_info_24.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
<vector android:height="24dp" android:tint="#000000"
android:viewportHeight="24" android:viewportWidth="24"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="@android:color/white" android:pathData="M11,9h2L13,7h-2m1,13c-4.41,0 -8,-3.59 -8,-8s3.59,-8 8,-8 8,3.59 8,8 -3.59,8 -8,8m0,-18A10,10 0 0,0 2,12a10,10 0 0,0 10,10 10,10 0 0,0 10,-10A10,10 0 0,0 12,2m-1,15h2v-6h-2v6z"/>
</vector>
5 changes: 0 additions & 5 deletions androidApp/src/main/res/drawable/baseline_people_24.xml

This file was deleted.

3 changes: 1 addition & 2 deletions androidApp/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,7 @@
<string name="search_hint">Search your library</string>
<string name="account">Account</string>
<string name="settings">Settings</string>
<string name="manage_users">Manage Users</string>
<string name="update_profile">Update Profile</string>
<string name="about">About</string>
<string name="logout">Logout</string>
<string name="server_address">Server Address</string>
<string name="connect">Connect</string>
Expand Down
24 changes: 6 additions & 18 deletions iosApp/iosApp/Bridge/AccountComponent.swift
Original file line number Diff line number Diff line change
Expand Up @@ -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:
Expand Down Expand Up @@ -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")
}
)
)
Expand Down
33 changes: 11 additions & 22 deletions iosApp/iosApp/Localizable.xcstrings
Original file line number Diff line number Diff line change
@@ -1,6 +1,17 @@
{
"sourceLanguage" : "en",
"strings" : {
"label.about" : {
"extractionState" : "manual",
"localizations" : {
"en" : {
"stringUnit" : {
"state" : "translated",
"value" : "About"
}
}
}
},
"label.account" : {
"extractionState" : "manual",
"localizations" : {
Expand Down Expand Up @@ -89,17 +100,6 @@
}
}
},
"label.manage_users" : {
"extractionState" : "manual",
"localizations" : {
"en" : {
"stringUnit" : {
"state" : "translated",
"value" : "Manage Users"
}
}
}
},
"label.no_items" : {
"extractionState" : "manual",
"localizations" : {
Expand Down Expand Up @@ -188,17 +188,6 @@
}
}
},
"label.update_profile" : {
"extractionState" : "manual",
"localizations" : {
"en" : {
"stringUnit" : {
"state" : "translated",
"value" : "Update Profile"
}
}
}
},
"text.added_to_playlist" : {
"extractionState" : "manual",
"localizations" : {
Expand Down
5 changes: 4 additions & 1 deletion iosApp/iosApp/path-configuration.json
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,10 @@
"rules": [
{
"patterns": [
"^/dialog/*"
"^/albums/[0-9]+/edit$",
"^/artists/[0-9]+/edit$",
"^/playlists/selections/?.+$",
"^/playlists/new$"
],
"properties": {
"context": "modal"
Expand Down
Loading