diff --git a/app/src/main/java/awais/instagrabber/fragments/main/ProfileFragment.java b/app/src/main/java/awais/instagrabber/fragments/main/ProfileFragment.java index d2f20cc1..86b1504a 100644 --- a/app/src/main/java/awais/instagrabber/fragments/main/ProfileFragment.java +++ b/app/src/main/java/awais/instagrabber/fragments/main/ProfileFragment.java @@ -438,6 +438,7 @@ public class ProfileFragment extends Fragment implements SwipeRefreshLayout.OnRe @Override public void onRefresh() { + profileDetailsBinding.countsBarrier.setVisibility(View.GONE); profileDetailsBinding.mainProfileImage.setVisibility(View.INVISIBLE); fetchProfileDetails(); } @@ -655,6 +656,8 @@ public class ProfileFragment extends Fragment implements SwipeRefreshLayout.OnRe profileDetailsBinding.mainProfileImage.setImageURI(profileModel.getProfilePicUrl()); profileDetailsBinding.mainProfileImage.setVisibility(View.VISIBLE); + profileDetailsBinding.countsBarrier.setVisibility(View.VISIBLE); + final long followersCount = profileModel.getFollowerCount(); final long followingCount = profileModel.getFollowingCount(); @@ -857,13 +860,13 @@ public class ProfileFragment extends Fragment implements SwipeRefreshLayout.OnRe } if (profileModel.getFriendshipStatus().isFollowing()) { profileDetailsBinding.btnFollow.setText(R.string.unfollow); - profileDetailsBinding.btnFollow.setIconResource(R.drawable.ic_outline_person_add_disabled_24); + profileDetailsBinding.btnFollow.setChipIconResource(R.drawable.ic_outline_person_add_disabled_24); } else if (profileModel.getFriendshipStatus().isOutgoingRequest()) { profileDetailsBinding.btnFollow.setText(R.string.cancel); - profileDetailsBinding.btnFollow.setIconResource(R.drawable.ic_outline_person_add_disabled_24); + profileDetailsBinding.btnFollow.setChipIconResource(R.drawable.ic_outline_person_add_disabled_24); } else { profileDetailsBinding.btnFollow.setText(R.string.follow); - profileDetailsBinding.btnFollow.setIconResource(R.drawable.ic_outline_person_add_24); + profileDetailsBinding.btnFollow.setChipIconResource(R.drawable.ic_outline_person_add_24); } if (restrictMenuItem != null) { restrictMenuItem.setVisible(true); diff --git a/app/src/main/res/layout/layout_profile_details.xml b/app/src/main/res/layout/layout_profile_details.xml index c54fca8c..c20bcfe3 100644 --- a/app/src/main/res/layout/layout_profile_details.xml +++ b/app/src/main/res/layout/layout_profile_details.xml @@ -16,53 +16,27 @@ android:transitionName="profile_pic" android:visibility="invisible" app:actualImageScaleType="centerCrop" - app:layout_constraintEnd_toStartOf="@id/mainPostCount" + app:layout_constraintEnd_toStartOf="@id/btnFollow" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" - app:layout_constraintBottom_toBottomOf="@id/fav_chip" - tools:background="@mipmap/ic_launcher" /> + app:layout_constraintBottom_toBottomOf="@id/btnTagged" + tools:visibility="visible" + tools:foreground="@mipmap/ic_launcher" /> + - - - - + + + + + @@ -104,24 +109,40 @@ app:chipBackgroundColor="@null" app:chipIcon="@drawable/ic_outline_person_pin_24" app:chipIconTint="@color/deep_orange_800" - app:layout_constraintStart_toEndOf="@id/fav_chip" - app:layout_constraintTop_toTopOf="@id/fav_chip" + app:layout_constraintStart_toEndOf="@id/mainProfileImage" + app:layout_constraintTop_toBottomOf="@id/fav_chip" app:rippleColor="@color/deep_orange_400" tools:visibility="visible" /> + + @@ -165,14 +187,17 @@ android:id="@+id/mainBiography" android:layout_width="0dp" android:layout_height="wrap_content" - android:padding="8dp" android:background="?android:selectableItemBackground" + android:paddingStart="8dp" + android:paddingEnd="8dp" + android:paddingTop="4dp" + android:paddingBottom="4dp" android:textAppearance="@style/TextAppearance.AppCompat.Body1" app:layout_constraintBottom_toTopOf="@id/mainUrl" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/mainFullName" - tools:text="THE GLORIOUS (step)OWNER OF THIS APP. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec id justo lorem. In malesuada feugiat ornare. Suspendisse et mauris imperdiet, luctus augue eget, tempus eros. Cras vitae molestie ipsum. " /> + tools:text="One of THE GLORIOUS OWNERS OF THIS APP. Lorem ipsum dolor sit amet, consectetur adipiscing elit. Donec id justo lorem. In malesuada feugiat ornare. Suspendisse et mauris imperdiet, luctus augue eget, tempus eros. Cras vitae molestie ipsum. " /> - - - + android:paddingStart="8dp" + android:paddingEnd="8dp" + android:paddingTop="4dp" + android:paddingBottom="8dp" + android:gravity="center" + android:textAppearance="@style/TextAppearance.AppCompat" + app:layout_constraintBottom_toBottomOf="@id/highlights_barrier" + app:layout_constraintEnd_toStartOf="@id/mainFollowers" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@id/counts_barrier" + tools:text="35\nPosts" /> - + + + app:layout_constraintStart_toEndOf="@id/mainFollowers" + app:layout_constraintTop_toBottomOf="@id/counts_barrier" + tools:text="64\nFollowing" /> + app:barrierDirection="bottom" /> Import/Export Language - %s Post - %s Posts + %s\nPost + %s\nPosts - %s Follower - %s Followers + %s\nFollower + %s\nFollowers - %s Following + %s\nFollowing Autoplay videos Always mute videos Always show post captions