Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Display All Friends When Grouped by Instance #1119

Merged
merged 2 commits into from
Feb 9, 2025
Merged

Display All Friends When Grouped by Instance #1119

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
347ffb6
Display All Friends When Grouped by Instance
Map1en Feb 4, 2025
d7e9e9b
Merge branch 'master' into hide-friends-in-same-instance
Map1en Feb 4, 2025
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
Next Next commit
Display All Friends When Grouped by Instance
  • Loading branch information
@Map1en
Map1en committed Feb 4, 2025
commit 347ffb6124d1d82e313ea7f2ec8dba14313877dd
33 changes: 22 additions & 11 deletions src/app.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23301,27 +23301,32 @@ console.log(`isLinux: ${LINUX}`);

// - SidebarGroupByInstance

$app.methods.handleSwitchGroupByInstance = async function () {
this.isSidebarGroupByInstance = !this.isSidebarGroupByInstance;
await configRepository.setBool(
'VRCX_sidebarGroupByInstance',
this.isSidebarGroupByInstance
);
};

$app.data.isSidebarGroupByInstance = await configRepository.getBool(
'VRCX_sidebarGroupByInstance',
true
);

$app.methods.handleSwitchGroupByInstance = function () {
$app.methods.toggleGroupByInstance = function () {
this.isSidebarGroupByInstance = !this.isSidebarGroupByInstance;
configRepository.setBool(
'VRCX_sidebarGroupByInstance',
this.isSidebarGroupByInstance
);
};

$app.data.isHideFriendsInSameInstance = await configRepository.getBool(
'VRCX_hideFriendsInSameInstance',
false
);

$app.methods.toggleHideFriendsInSameInstance = function () {
this.isHideFriendsInSameInstance = !this.isHideFriendsInSameInstance;
configRepository.setBool(
'VRCX_hideFriendsInSameInstance',
this.isHideFriendsInSameInstance
);
};

$app.data.isSidebarGroupByInstanceCollapsed =
await configRepository.getBool(
'VRCX_sidebarGroupByInstanceCollapsed',
Expand Down Expand Up @@ -23366,7 +23371,10 @@ console.log(`isLinux: ${LINUX}`);
};

$app.computed.onlineFriendsByGroupStatus = function () {
if (!this.isSidebarGroupByInstance) {
if (
!this.isSidebarGroupByInstance ||
(this.isSidebarGroupByInstance && !this.isHideFriendsInSameInstance)
) {
return this.onlineFriends;
}

Expand All @@ -23382,7 +23390,10 @@ console.log(`isLinux: ${LINUX}`);
};

$app.computed.vipFriendsByGroupStatus = function () {
if (!this.isSidebarGroupByInstance) {
if (
!this.isSidebarGroupByInstance ||
(this.isSidebarGroupByInstance && !this.isHideFriendsInSameInstance)
) {
return this.vipFriends;
}

Expand Down
6 changes: 4 additions & 2 deletions src/localization/en/en.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,6 +386,8 @@
"width": "Width",
"group_by_instance": "Group by Instance",
"group_by_instance_tooltip": "Enabling this will group friends by instance when there is more than one friend in the same instance.",
"hide_friends_in_same_instance": "Hide Friends in Same Instance",
"hide_friends_in_same_instance_tooltip": "Hide Friends from Friend List When They Are in the Same Instance.",
"split_favorite_friends": "Split Favorite Friends",
"split_favorite_friends_tooltip": "Separate favorite friends into their individual groups."
},
Expand Down Expand Up @@ -635,7 +637,7 @@
"friends": "Friends",
"me": "ME",
"favorite": "FAVORITES",
"same_instance": "Same Instance",
"same_instance": "SAME INSTANCE",
"online": "ONLINE",
"active": "ACTIVE",
"offline": "OFFLINE",
Expand Down Expand Up @@ -2017,4 +2019,4 @@
}
}
}
}
}
28 changes: 16 additions & 12 deletions src/mixins/tabs/settings.pug
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -414,18 +414,22 @@ mixin settingsTab
:min='200'
:max='500'
style='display: inline-block; width: 300px')
.options-container-item
simple-switch(
:label='$t("view.settings.appearance.side_panel.group_by_instance")'
:value='isSidebarGroupByInstance'
@change='handleSwitchGroupByInstance'
:tooltip='$t("view.settings.appearance.side_panel.group_by_instance_tooltip")')
.options-container-item
simple-switch(
:label='$t("view.settings.appearance.side_panel.split_favorite_friends")'
:value='isSidebarDivideByFriendGroup'
@change='handleSwitchDivideByFriendGroup'
:tooltip='$t("view.settings.appearance.side_panel.split_favorite_friends_tooltip")')
simple-switch(
:label='$t("view.settings.appearance.side_panel.group_by_instance")'
:value='isSidebarGroupByInstance'
@change='toggleGroupByInstance'
:tooltip='$t("view.settings.appearance.side_panel.group_by_instance_tooltip")')
simple-switch(
v-if='isSidebarGroupByInstance'
:label='$t("view.settings.appearance.side_panel.hide_friends_in_same_instance")'
:value='isHideFriendsInSameInstance'
@change='toggleHideFriendsInSameInstance'
:tooltip='$t("view.settings.appearance.side_panel.hide_friends_in_same_instance_tooltip")')
simple-switch(
:label='$t("view.settings.appearance.side_panel.split_favorite_friends")'
:value='isSidebarDivideByFriendGroup'
@change='handleSwitchDivideByFriendGroup'
:tooltip='$t("view.settings.appearance.side_panel.split_favorite_friends_tooltip")')
//- Appearance | User Dialog
.options-container
span.header {{ $t('view.settings.appearance.user_dialog.header') }}
Expand Down