Creates a screen to allow the unblocking of users, communities and instances #1483

rodrigo-fm · 2024-04-24T20:43:12Z

This is my biggest PR on jerboa so far, users now have a dedicated screen to unblock anything they want, here's a video demonstrating:

unblock-demo.mp4

P.S: I also updated the AGP version

…nities and instances to the blocks screen

…ure/unblock-users-community-instances

…nctional

MV-GH

Thanks!

I'll give it a proper review later. But can you fix the conflicts. Diff is hard to read atm

That delete icon, is it a M3 icon? I would like to keep the same style across the app

app/build.gradle.kts

gradle/wrapper/gradle-wrapper.properties

app/src/main/java/com/jerboa/ui/components/blocks/BlocksActivity.kt

MV-GH · 2024-04-25T05:06:57Z

app/src/main/java/com/jerboa/ui/components/blocks/BlocksActivity.kt

+@OptIn(ExperimentalMaterial3Api::class)
+@Composable
+fun BlocksActivity(
+ siteViewModel: SiteViewModel,


I would make a viewModel for this screen. Keep the UI and data logic separate.

Absolutely, but I'd also add the block actions to the SiteViewModel rather than creating a new one, so that it can update the blocks. We may also need to change / fix some other block actions, such as CommunityViewModel.blockCommunity, so that it can stay in sync with SiteViewModel.my_user.community_blocks... etc.

@dessalines I don't think I understand the idea of adding the block actions to the SiteViewModel. I had to create an apiState for each element on the list to avoid the same state being displayed to every element (this would cause the loading state to be displayed on each element, for instance).

Add what you can to the blockviewmodel. ~~I don't understand what you would need a apistate per block~~ Ah you need a Loading state per element? I would probably look into having a list for this?

@MV-GH you suggest a list of ApiStates inside the BlockViewModel? That's interesting

Well or a BlockListEntryViewModel and have a ViewModel per entry.

See these guidelines on why we do this.

https://developer.android.com/develop/ui/compose/architecture#udf
https://android.googlesource.com/platform/frameworks/support/+/androidx-main/compose/docs/compose-api-guidelines.md#prefer-stateless-and-controlled-composable-functions

app/src/main/java/com/jerboa/ui/components/blocks/BlocksActivity.kt

…ithub.com/rodrigo-fm/jerboa into feature/unblock-users-community-instances

dessalines

As @MV-GH mentioned this needs to be reworked to follow the conventions of all the other examples: ViewModel, Activity, and read-only composables in their own file. IMO it makes sense to add the block responses to the siteViewModel, that makes sense, so that they can update those values without having to refetch the site.

Start with an existing somewhat similar example like ReportsActivity.kt, copy-paste the entire folder, then change as necessary.

edit: one more thing, add this screen to within the SettingsActivity, IE where look and feel and your user settings are. For now you can put it right below my user name settings, but in the future we'll rework this to put it within that my_user_name settings screen, since that needs to be reorganized.

app/src/main/java/com/jerboa/Utils.kt

app/src/main/java/com/jerboa/feat/Block.kt

app/src/main/java/com/jerboa/ui/components/blocks/BlocksActivity.kt

dessalines · 2024-04-25T22:51:10Z

app/src/main/java/com/jerboa/ui/components/blocks/BlocksActivity.kt

+
+@Composable
+private fun BlockedElementListItem(
+ apiState: ApiState<*>,


Don't have this take in the api state. The standard is for composables is to be separated from API calls, only take in the data structures, and then push up any events to the top-level activity.

Move this composable to its own file, Blocks.kt, and make sure this file only contains what's necessary for the activity, not composables.

Check out ReportsActivity.kt and Reports.kt for an example of how we separate these.

app/src/main/java/com/jerboa/ui/components/blocks/BlocksActivity.kt

dessalines · 2024-04-25T22:56:12Z

app/src/main/java/com/jerboa/ui/theme/Text.kt

None of this is necessary.

dessalines · 2024-05-07T17:45:39Z

Sry, been really busy lately. I'll try to get to this sometime this week.

app/src/main/java/com/jerboa/ui/components/blocks/BlockedPersonViewModel.kt

MV-GH · 2024-05-09T09:35:35Z

app/src/main/java/com/jerboa/ui/components/blocks/BlocksActivity.kt

+ val personBlocks = siteRes.data.my_user?.person_blocks?.toMutableStateList()
+ val communityBlocks =
+ siteRes.data.my_user?.community_blocks?.toMutableStateList()
+ val instanceBlocks = siteRes.data.my_user?.instance_blocks?.toMutableStateList()


Needs to be in the viewmodel.

The onSuccessfulUnblock needs to be removed from the UI. Instead the ViewModel updates the SnapShotList (on Block event). The UI will react to this change and update. Dont use a list, use mutableStateList and only expose SnapShotList (Its what I am doing with changes to the feed, atm we create a new list there constantly but causes the entire feed to recompose each time)

This would be a different ViewModel? The ones I created so far are ViewModels for each list element. This suggestion feels like a ViewModel that contains every element on the list.

Yes that was what I had in mind. But if you have a solution that works with viewmodel per element you can do that too. But I think it would be a lot simpler if you used just one viewmodel.

Agree, a BlocksViewModel sounds good. I'll see later what I can do about the unique viewmodel that represents a list item

MV-GH · 2024-05-09T09:42:44Z

app/src/main/java/com/jerboa/ui/components/blocks/BlocksActivity.kt

+ }
+
+ item { Spacer(modifier = Modifier.padding(vertical = MEDIUM_PADDING)) }
+ item { Title(stringResource(R.string.blocked_instances)) }


If you want https://developer.android.com/develop/ui/compose/lists#sticky-headers

Might look interesting for the subtitles

app/src/main/java/com/jerboa/ui/components/blocks/BlockedCommunityViewModel.kt

app/src/main/java/com/jerboa/ui/components/blocks/BlockedPersonViewModel.kt

app/src/main/java/com/jerboa/ui/components/blocks/BlocksActivity.kt

app/src/main/java/com/jerboa/ui/components/blocks/BlockedCommunityViewModel.kt

app/src/main/java/com/jerboa/ui/components/blocks/BlocksActivity.kt

rodrigo-fm · 2024-06-10T00:11:03Z

Hey, sorry for being away for weeks, had other things to take care of. I'll be marking the comments addressed by the commits as resolved.

MV-GH · 2024-06-10T02:05:42Z

No problem, but in the meantime I was working on this feature too. I'll post my PR soon.

rodrigo-fm added 10 commits April 3, 2024 19:42

[unblock-menu-option] - initial draft for a screen to show blocks

34aa89c

[unblock-menu-option] - adds the http request to the blocks screen

d2a5e6c

[unblock-menu-option] - nests the 3 lazy columns to display all blocks

b70bc98

[unblock-menu-option] - adds the method calls to unblock users, commu…

fb34597

…nities and instances to the blocks screen

Merge branch 'main' of https://github.com/rodrigo-fm/jerboa into feat…

fc1937c

…ure/unblock-users-community-instances

removes unnecessary column and LazyColumns

3a5a99b

makes the unblocking of users,communities and instances completely fu…

624cd8b

…nctional

upgrades AGP

85dde4f

finishes unblock button styling

4af1983

finishes the unblock screen

0558c07

rodrigo-fm requested review from dessalines and MV-GH as code owners April 24, 2024 20:43

MV-GH requested changes Apr 24, 2024

View reviewed changes

app/build.gradle.kts Outdated Show resolved Hide resolved

gradle/wrapper/gradle-wrapper.properties Outdated Show resolved Hide resolved

rodrigo-fm and others added 2 commits April 24, 2024 23:14

Merge branch 'main' into feature/unblock-users-community-instances

4a32ebb

fix merge dependencies with main

8ef0bca

MV-GH requested changes Apr 25, 2024

View reviewed changes

MV-GH reviewed Apr 25, 2024

View reviewed changes

app/src/main/java/com/jerboa/ui/components/blocks/BlocksActivity.kt Outdated Show resolved Hide resolved

rodrigo-fm added 2 commits April 25, 2024 19:14

uses icons and removes unnecessary items key attribute

f4519d8

Merge branch 'feature/unblock-users-community-instances' of https://g…

6e7f3e6

…ithub.com/rodrigo-fm/jerboa into feature/unblock-users-community-instances

dessalines reviewed Apr 25, 2024

View reviewed changes

rodrigo-fm added 3 commits April 29, 2024 22:55

moves toast blocks to jerboa\feat\Block.kt

da77a22

removes hardcoded sizes and colors from BlocksActivity

e124357

creates SMALL_ICON_SIZE constant

fda2d59

moves the unblock actions to separate viewModels

fdf82db

MV-GH requested changes May 9, 2024

View reviewed changes

MV-GH reviewed May 9, 2024

View reviewed changes

dessalines requested changes May 15, 2024

View reviewed changes

rodrigo-fm added 2 commits June 7, 2024 08:36

merges with main branch

892758e

refactors UI elements and ViewModels

9674e11

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Creates a screen to allow the unblocking of users, communities and instances #1483

Creates a screen to allow the unblocking of users, communities and instances #1483

rodrigo-fm commented Apr 24, 2024 •

edited

MV-GH left a comment

MV-GH Apr 25, 2024

dessalines Apr 25, 2024

rodrigo-fm May 5, 2024

MV-GH May 5, 2024 •

edited

rodrigo-fm May 5, 2024

MV-GH May 5, 2024 •

edited

MV-GH May 5, 2024

dessalines left a comment •

edited

dessalines Apr 25, 2024

dessalines Apr 25, 2024

dessalines commented May 7, 2024

MV-GH May 9, 2024 •

edited

rodrigo-fm May 13, 2024 •

edited

MV-GH May 13, 2024

rodrigo-fm May 13, 2024 •

edited

MV-GH May 9, 2024

rodrigo-fm commented Jun 10, 2024

MV-GH commented Jun 10, 2024

Creates a screen to allow the unblocking of users, communities and instances #1483

Are you sure you want to change the base?

Creates a screen to allow the unblocking of users, communities and instances #1483

Conversation

rodrigo-fm commented Apr 24, 2024 • edited

MV-GH left a comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

MV-GH May 5, 2024 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

MV-GH May 5, 2024 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dessalines left a comment • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

dessalines commented May 7, 2024

MV-GH May 9, 2024 • edited

Choose a reason for hiding this comment

rodrigo-fm May 13, 2024 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

rodrigo-fm May 13, 2024 • edited

Choose a reason for hiding this comment

Choose a reason for hiding this comment

rodrigo-fm commented Jun 10, 2024

MV-GH commented Jun 10, 2024

rodrigo-fm commented Apr 24, 2024 •

edited

MV-GH May 5, 2024 •

edited

MV-GH May 5, 2024 •

edited

dessalines left a comment •

edited

MV-GH May 9, 2024 •

edited

rodrigo-fm May 13, 2024 •

edited

rodrigo-fm May 13, 2024 •

edited