feat(client/kotlin): add Favorite Resources menu by ReactorScram · Pull Request #6107 · firezone/firezone

ReactorScram · 2024-07-31T16:51:56Z

It's missing a couple pieces, see the tasklist

- [x] Add `Add to Favorites` and `Remove from Favorites` buttons
- [x] Update Changelog
- [x] Load and save Favorites from `SharedPreferences`
- [x] Wire up `onClick` events
- [x] Hide and show Resources in the menu based on whether they're favorited
- [x] Hide tabs if nothing is favorited
- [x] Tab icons
- [ ] Make the "Reset Settings" button also reset Favorites
- [ ] Change the "Add to Favorites" and "Remove from Favorites" to a checkbox or star or something cool

saved

…ites-store

…-menu

…ites-store

…ites-menu

vercel · 2024-07-31T16:52:00Z

The latest updates on your projects. Learn more about Vercel for Git ↗︎

Name	Status	Preview	Comments	Updated (UTC)
firezone	✅ Ready (Inspect)	Visit Preview	💬 Add feedback	Aug 6, 2024 9:50pm

ReactorScram · 2024-07-31T16:55:34Z

website/src/components/Changelog/Android.tsx

+import ChangeItem from "./ChangeItem";
 import Entries from "./Entries";
 import Entry from "./Entry";
+import Link from "next/link";


Alphabetized

Can we enforce this with a formatter?

I'm not aware of one, but probably

…-menu

github-actions · 2024-08-01T15:38:12Z

Bencher

Report	Tue, August 6, 2024 at 22:18:54 UTC
Project	Firezone
Branch	feat/kotlin/favorites-menu
Testbed	github-actions

Click to view all benchmark results

Benchmark	Throughput	Throughput Results bits/s \| (Δ%)	Throughput Lower Boundary bits/s \| (%)
direct-tcp-client2server	✅ (view plot)	239,671,662.55 (-0.91%)	237,136,976.31 (98.94%)
direct-tcp-server2client	✅ (view plot)	252,261,251.33 (+1.61%)	241,460,754.60 (95.72%)
direct-udp-client2server	✅ (view plot)	288,524,984.95 (-0.16%)	271,982,711.85 (94.27%)
direct-udp-server2client	✅ (view plot)	390,809,121.57 (-1.33%)	384,035,718.45 (98.27%)
relayed-tcp-client2server	✅ (view plot)	249,794,902.11 (+1.55%)	239,479,677.85 (95.87%)
relayed-tcp-server2client	✅ (view plot)	260,336,740.88 (+1.12%)	247,098,680.16 (94.92%)
relayed-udp-client2server	✅ (view plot)	240,726,380.40 (+4.84%)	218,931,548.08 (90.95%)
relayed-udp-server2client	✅ (view plot)	337,257,274.93 (-0.06%)	317,821,760.44 (94.24%)

Bencher - Continuous Benchmarking
View Public Perf Page
Docs | Repo | Chat | Help

…-menu

thomaseizinger

Nice work! I left some ideas and a question.

thomaseizinger · 2024-08-05T22:58:24Z

website/src/components/Changelog/Android.tsx

+import ChangeItem from "./ChangeItem";
 import Entries from "./Entries";
 import Entry from "./Entry";
+import Link from "next/link";


Can we enforce this with a formatter?

kotlin/android/app/src/main/java/dev/firezone/android/features/session/ui/SessionViewModel.kt

kotlin/android/app/src/main/java/dev/firezone/android/features/session/ui/SessionActivity.kt

thomaseizinger · 2024-08-05T23:13:33Z

kotlin/android/app/src/main/res/layout/activity_session.xml

+    <com.google.android.material.tabs.TabLayout
+        android:id="@+id/tabLayout"
+        android:layout_width="match_parent"
+        android:layout_height="0dp"
+        app:layout_constraintTop_toBottomOf="@+id/tvResourcesList"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="1.0"
+        app:layout_constraintStart_toStartOf="parent"
+        app:tabInlineLabel="true">
+
+        <com.google.android.material.tabs.TabItem
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:icon="@drawable/baseline_star_24"
+            android:text="@string/resources_favorites" />
+
+        <com.google.android.material.tabs.TabItem
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:icon="@drawable/all_resources"
+            android:text="@string/resources_all" />
+
+    </com.google.android.material.tabs.TabLayout>


This isn't a blocking concern but more of a question.

I don't really understand the choice of tabs here. To me, tabs are useful to separate unrelated entities, like Messages, Calls and Status in Whatsapp.

Favourite and non-favourite resources are still resources. Why split them into different tabs? In Fastmail for example, I can "Pin" emails (which is basically like a favourite). Those are sticky at the top of all my emails and the rest is sorted by "Recevied" date.

Absolutely no reason, I just had the tabs half-way implemented and I forgot what the conclusion was for UX.

@Patticatti If the pinned / sticky favorites sounds good, I'll change it to that ~~before merging~~ later on. Your call as UX person

kotlin/android/app/src/main/java/dev/firezone/android/features/session/ui/SessionViewModel.kt

Patticatti

Looks nice - maybe we can start leaning into theme colours eventually

ReactorScram added 8 commits July 30, 2024 16:34

checkpoint

63630d1

refactor(client/kotlin): save config the same way everything else gets

4d44dcb

saved

checkpoint

bab0ede

Merge remote-tracking branch 'origin/main' into refactor/kotlin-favor…

98fef38

…ites-store

satisfy Gradle linter

ab0f1fc

Merge remote-tracking branch 'origin/main' into feat/kotlin/favorites…

fcb389d

…-menu

Merge remote-tracking branch 'origin/main' into refactor/kotlin-favor…

2442e41

…ites-store

Merge branch 'refactor/kotlin-favorites-store' into feat/kotlin/favor…

4ed4939

…ites-menu

ReactorScram self-assigned this Jul 31, 2024

vercel bot deployed to Preview July 31, 2024 16:52 View deployment

update changelog

d0aa86b

ReactorScram commented Jul 31, 2024

View reviewed changes

fix copy-paste typo

a2c1cd7

vercel bot deployed to Preview July 31, 2024 16:59 View deployment

ReactorScram added 2 commits July 31, 2024 13:40

Merge remote-tracking branch 'origin/main' into feat/kotlin/favorites…

ee3f4e3

…-menu

fmt

a163df0

vercel bot deployed to Preview July 31, 2024 18:44 View deployment

save favorites to preferences

97fec7c

vercel bot deployed to Preview July 31, 2024 21:55 View deployment

Merge remote-tracking branch 'origin/main' into feat/kotlin/favorites…

11507a2

…-menu

vercel bot deployed to Preview August 1, 2024 14:50 View deployment

add tabs for favorite Resources and other Resources

a4b2047

vercel bot deployed to Preview August 1, 2024 15:30 View deployment

ReactorScram added 2 commits August 1, 2024 11:17

stars on tabs

a4aeac3

Merge remote-tracking branch 'origin/main' into feat/kotlin/favorites…

834ff36

…-menu

vercel bot deployed to Preview August 1, 2024 16:19 View deployment

ReactorScram mentioned this pull request Aug 1, 2024

Add resource to favorites #5123

Closed

checkpoint

90a9d9c

vercel bot deployed to Preview August 1, 2024 17:44 View deployment

fix

cc14233

vercel bot deployed to Preview August 1, 2024 20:49 View deployment

ReactorScram added 2 commits August 1, 2024 17:36

Merge remote-tracking branch 'origin/main' into feat/kotlin/favorites…

c531c25

…-menu

Merge remote-tracking branch 'origin/main' into feat/kotlin/favorites…

986792b

…-menu

vercel bot deployed to Preview August 5, 2024 20:51 View deployment

hide tabs when nothing is favorited

4982e00

vercel bot deployed to Preview August 5, 2024 21:30 View deployment

ReactorScram marked this pull request as ready for review August 5, 2024 22:01

add "all resources" icon

5cc3a46

ReactorScram requested review from Patticatti and thomaseizinger August 5, 2024 22:02

vercel bot deployed to Preview August 5, 2024 22:03 View deployment

thomaseizinger approved these changes Aug 5, 2024

View reviewed changes

Patticatti approved these changes Aug 6, 2024

View reviewed changes

apply PR feedback

8b68a57

vercel bot deployed to Preview August 6, 2024 20:46 View deployment

apply PR feedback

b2767dd

vercel bot deployed to Preview August 6, 2024 21:50 View deployment

ReactorScram enabled auto-merge August 6, 2024 22:16

ReactorScram added this pull request to the merge queue Aug 6, 2024

auto-merge was automatically disabled August 6, 2024 22:18
Pull Request is not mergeable

Merged via the queue into main with commit 861ca18 Aug 6, 2024

ReactorScram deleted the feat/kotlin/favorites-menu branch August 6, 2024 22:27

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

feat(client/kotlin): add Favorite Resources menu#6107

feat(client/kotlin): add Favorite Resources menu#6107
ReactorScram merged 25 commits intomainfrom
feat/kotlin/favorites-menu

ReactorScram commented Jul 31, 2024 •

edited

Loading

Uh oh!

vercel bot commented Jul 31, 2024 •

edited

Loading

Uh oh!

ReactorScram Jul 31, 2024

Uh oh!

thomaseizinger Aug 5, 2024

Uh oh!

ReactorScram Aug 6, 2024

Uh oh!

github-actions bot commented Aug 1, 2024 •

edited

Loading

Uh oh!

thomaseizinger left a comment

Uh oh!

thomaseizinger Aug 5, 2024

Uh oh!

Uh oh!

Uh oh!

thomaseizinger Aug 5, 2024

Uh oh!

ReactorScram Aug 6, 2024 •

edited

Loading

Uh oh!

Uh oh!

Patticatti left a comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

Conversation

ReactorScram commented Jul 31, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

vercel bot commented Jul 31, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

ReactorScram Jul 31, 2024

Choose a reason for hiding this comment

Uh oh!

thomaseizinger Aug 5, 2024

Choose a reason for hiding this comment

Uh oh!

ReactorScram Aug 6, 2024

Choose a reason for hiding this comment

Uh oh!

github-actions bot commented Aug 1, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Bencher

Uh oh!

thomaseizinger left a comment

Choose a reason for hiding this comment

Uh oh!

thomaseizinger Aug 5, 2024

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

thomaseizinger Aug 5, 2024

Choose a reason for hiding this comment

Uh oh!

ReactorScram Aug 6, 2024 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Patticatti left a comment

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants

ReactorScram commented Jul 31, 2024 •

edited

Loading

vercel bot commented Jul 31, 2024 •

edited

Loading

github-actions bot commented Aug 1, 2024 •

edited

Loading

ReactorScram Aug 6, 2024 •

edited

Loading