Yim23/design fixes #329

pranavkonidena · 2024-01-07T08:17:34Z

Don't Merge till #328 is merged

This PR incorporates design fixes as pointed out by aerozol here (https://docs.google.com/document/d/1XLu5srnP6j5ehW6CKtLPrhxmLWNpxG_eHeKV1W9K22k/edit)

Dev to Main

…images for last page

…onality

… user has friends, removed trailing spaces

…t weight in YIM

07jasjeet · 2024-01-07T08:24:40Z

app/src/main/java/org/listenbrainz/android/ui/screens/yim23/Yim23LandingScreen.kt

@@ -103,10 +104,10 @@ fun Yim23HomeScreen(
                                    Image(
                                        painter =
                                        painterResource(id = when (viewModel.themeType.value) {
-                                            0 -> R.drawable.yim23_pick_color_green


In the Yim23ThemeData (Renamed to Yim23ThemeType) enum class, create a parameter with name pickColorRes and use viewModel.themeType.pickColorRes everywhere instead of running a when clause every time.
add other fields as well like colorRes, logoRes etc.

07jasjeet · 2024-01-07T08:27:33Z

app/src/main/java/org/listenbrainz/android/ui/screens/yim23/Yim23LandingScreen.kt

-                                            1 -> R.drawable.yim23_pick_color_red
-                                            2 -> R.drawable.yim23_pick_color_blue
-                                            3 -> R.drawable.yim23_pick_color_grey
+                                            Yim23ThemeData.greenTheme -> R.drawable.yim23_pick_color_green


Rename the enum class and member themes as such:

enum class Yim23ThemeType(@DrawableRes val colorRes: Int) { GREEN(pickColorRes = R.drawable.yim23_pick_color_green, colorRes = ...), RED(...), BLUE(...), GREY(...) }

Ya thats so better.. will do that thx

07jasjeet · 2024-01-07T08:38:40Z

app/src/main/java/org/listenbrainz/android/viewmodel/Yim23ViewModel.kt

@@ -30,7 +31,7 @@ import javax.inject.Inject
 class Yim23ViewModel @Inject constructor(
    private val repository: Yim23Repository,
    private val appPreferences: AppPreferences
-) : BaseYimViewModel() {
+) : ViewModel() {


Use BaseViewModel here instead.

07jasjeet · 2024-01-07T08:40:16Z

app/src/main/java/org/listenbrainz/android/ui/screens/yim23/Yim23AlbumsListScreen.kt

-                            color = MaterialTheme.colorScheme.background ,
-                            style = MaterialTheme.typography.labelLarge , maxLines = 1)
+    Yim23BaseScreen(
+        viewModel     = viewModel,


I like this, but for parameters, 1 space separation should be followed.

07jasjeet · 2024-01-07T08:43:02Z

app/src/main/java/org/listenbrainz/android/viewmodel/SocialViewModel.kt

@@ -38,6 +42,15 @@ class SocialViewModel @Inject constructor(
    private val remotePlaybackHandler: RemotePlaybackHandler,
    @IoDispatcher private val ioDispatcher: CoroutineDispatcher,
 ): FollowUnfollowModel<SocialUiState>(repository, ioDispatcher) {
+
+    var friendsData : MutableState<


Nope delete this.

07jasjeet · 2024-01-07T08:51:45Z

app/src/main/java/org/listenbrainz/android/viewmodel/SocialViewModel.kt

-            repository.getFollowers(username)
-        }
-       return@runBlocking deferredResult.await()
+   fun getFollowers() {


We need this function to be synchronous and have UI do state management on its own since this function won't be used everytime this View model is created.

Suggested change

fun getFollowers() {

suspend fun getFollowers(): Resource<SocialData> {

val username = appPreferences.getUsername()

return repository.getFollowers(username).also {

if(it.status == Resource.Status.FAILED){

emitError(result.error)

}

}

}

Some of the usages of appPreferences.getUsername() are old and use withContext(ioDispatcher) but the approach is actually redundant.

07jasjeet · 2024-01-08T06:17:47Z

@pranavkonidena Few Issues:

I still see crashes when scrolling down a list.
First screen is messed up for Devices with longer length.
Music Buddies screen 1 has different enter/exit animation than rest.
Both Music Buddies screens show weird loading signs that should not be there. Consider pre-loading followers and similar users in your Yim23ViewModel because your implementation demands so but you must not touch SocialViewModel because its a general use view-model.
Top and Bottom bars are still a mess.

akshaaatt · 2024-01-08T07:21:12Z

app/build.gradle

@@ -250,4 +250,7 @@ dependencies {
    // Third party libraries
    implementation 'com.github.a914-gowtham:compose-ratingbar:1.3.4'
    implementation 'com.github.akshaaatt:Logger-Android:1.0.0'
+
+    //Charting Library (Vico)
+    implementation("com.patrykandpatrick.vico:compose:1.13.1")


Can we please give an attribution to this library on the settings page? I think we already attribute the animations and icons we use there

akshaaatt

@pranavkonidena please never merge main into your PRs. Although it shouldn't do anything but you shouldn't be concerned about doing so

pranavkonidena · 2024-01-08T13:54:48Z

@akshaaatt So sorry, meant to update this PR with latest dev branch

pranavkonidena · 2024-01-08T15:46:13Z

Updated video for YIM23 ->
https://usercontent.irccloud-cdn.com/file/qtYqQMnu/IMG_7078.MP4

07jasjeet · 2024-01-09T20:33:39Z

More work has to be done but looks fine for beta.

07jasjeet · 2024-01-09T20:34:29Z

@akshaaatt your call if we should fix things here on in next PR.

akshaaatt

LGTM for now. Let's fix things in the next PR

akshaaatt and others added 21 commits January 1, 2024 21:35

Merge pull request metabrainz#315 from metabrainz/dev

fe18558

Dev to Main

Release 2.4.2!

d351d30

Release 2.4.2!

5dbdf70

Merge pull request metabrainz#323 from metabrainz/dev

8187f0c

Dev to Main

Beta Release 2.5.0!

7434eab

Replaced integer values for Yim23Theme with enums

f7baf3c

Removed base yim view model

122d667

Added YimBaseScreen , removed unused imports in every screen , added …

fe5e06c

…images for last page

Removed git add . and used ?: instead

f28db4b

Replaced NavGraphBuilder function to re-use older function

7b3644e

Reused YIM22 heatmap component and made it generic

fe0b571

Changed style in YIM Listen Card Component according to design

b6ea06d

Add swipe feature to base screen so that every screen has this functi…

d934818

…onality

Added library for charts, made YimGraph component

2f77f41

Changed getFollowers func to suspend , friends screen only visible if…

90229dd

… user has friends, removed trailing spaces

Made albums list uppercase , they are visible till end as in design

f7522e6

Made top songs to uppercase , visible till end as in design

2e13c2e

Made headers bold, capitalized genre in stats screen , used light fon…

ebc5c0f

…t weight in YIM

Rectified paragraph gap in heatmap screen

8a3dd3f

Changed automatic scroll timer to 3 seconds

be8b393

Rectified bottom box height issue in landing screen

c59759d

07jasjeet requested changes Jan 7, 2024

View reviewed changes

07jasjeet reviewed Jan 7, 2024

View reviewed changes

07jasjeet requested changes Jan 7, 2024

View reviewed changes

pranavkonidena added 2 commits January 7, 2024 21:48

Added Enum Parameters for color dependent resources

c3837da

Changed getFollowers function in SocialViewModel to a suspend function

84e145a

07jasjeet mentioned this pull request Jan 8, 2024

Yim23/fixes #328

Merged

akshaaatt requested changes Jan 8, 2024

View reviewed changes

Merge branch 'metabrainz:main' into YIM23/DesignFixes

c4cf226

akshaaatt reviewed Jan 8, 2024

View reviewed changes

pranavkonidena added 2 commits January 8, 2024 19:31

Fix first screen for large screen devices

c2d37c3

Rectified footer, pre computed followers list for user in viewModel

92b6a15

pranavkonidena added 2 commits January 9, 2024 17:51

Added attribution for Vico(Charting Library)

095347d

Rectified spacing in stats screen , added links to forums in last page

2bd48a5

pranavkonidena requested a review from 07jasjeet January 9, 2024 13:12

akshaaatt approved these changes Jan 10, 2024

View reviewed changes

akshaaatt merged commit 74d6078 into metabrainz:dev Jan 10, 2024
1 check passed

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Yim23/design fixes #329

Yim23/design fixes #329

pranavkonidena commented Jan 7, 2024

07jasjeet Jan 7, 2024

07jasjeet Jan 7, 2024

pranavkonidena Jan 7, 2024

07jasjeet Jan 7, 2024

07jasjeet Jan 7, 2024

07jasjeet Jan 7, 2024

07jasjeet Jan 7, 2024

07jasjeet commented Jan 8, 2024

akshaaatt Jan 8, 2024

akshaaatt left a comment •

edited

Loading

pranavkonidena commented Jan 8, 2024

pranavkonidena commented Jan 8, 2024

07jasjeet commented Jan 9, 2024

07jasjeet commented Jan 9, 2024

akshaaatt left a comment

-   fun getFollowers() {
+   suspend fun getFollowers(): Resource<SocialData> {
+           val username = appPreferences.getUsername()
+           return repository.getFollowers(username).also {
+               if(it.status == Resource.Status.FAILED){
+                   emitError(result.error)
+               }
+           }
+    }

Yim23/design fixes #329

Yim23/design fixes #329

Conversation

pranavkonidena commented Jan 7, 2024

Don't Merge till #328 is merged

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

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

07jasjeet commented Jan 8, 2024

Choose a reason for hiding this comment

akshaaatt left a comment • edited Loading

Choose a reason for hiding this comment

pranavkonidena commented Jan 8, 2024

pranavkonidena commented Jan 8, 2024

07jasjeet commented Jan 9, 2024

07jasjeet commented Jan 9, 2024

akshaaatt left a comment

Choose a reason for hiding this comment

akshaaatt left a comment •

edited

Loading