From 508a80be530c0c7d0f79ac88069e5cb8dc80d909 Mon Sep 17 00:00:00 2001
From: Austin Huang <im@austinhuang.me>
Date: Fri, 5 Mar 2021 11:44:42 -0500
Subject: [PATCH] changing profile layout... again

---
 .../fragments/main/ProfileFragment.java       |   9 +-
 .../res/layout/layout_profile_details.xml     | 250 ++++++++++--------
 app/src/main/res/values/strings.xml           |  10 +-
 3 files changed, 154 insertions(+), 115 deletions(-)

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" />
 
+    <!-- for other people -->
     <com.google.android.material.chip.Chip
-        android:id="@+id/mainPostCount"
+        android:id="@+id/btnFollow"
         android:layout_width="wrap_content"
         android:layout_height="@dimen/profile_chip_size"
         android:layout_marginStart="4dp"
-        android:clickable="false"
-        android:gravity="center"
+        android:text="@string/follow"
         android:visibility="gone"
         app:chipBackgroundColor="@null"
+        app:chipIcon="@drawable/ic_outline_person_add_24"
+        app:chipIconTint="@color/deep_purple_200"
         app:layout_constraintStart_toEndOf="@id/mainProfileImage"
-        tools:text="35 Posts"
-        tools:visibility="visible" />
-
-    <com.google.android.material.chip.Chip
-        android:id="@+id/mainFollowing"
-        android:layout_width="wrap_content"
-        android:layout_height="@dimen/profile_chip_size"
-        android:layout_marginStart="4dp"
-        android:clickable="false"
-        android:gravity="center"
-        android:visibility="gone"
-        app:chipBackgroundColor="@null"
-        app:layout_constraintStart_toEndOf="@id/mainPostCount"
-        app:layout_constraintTop_toTopOf="@id/mainPostCount"
-        app:rippleColor="@color/grey_400"
-        tools:text="10 Following"
-        tools:visibility="visible" />
-
-    <com.google.android.material.chip.Chip
-        android:id="@+id/mainFollowers"
-        android:layout_width="wrap_content"
-        android:layout_height="@dimen/profile_chip_size"
-        android:layout_marginStart="4dp"
-        android:clickable="false"
-        android:gravity="center"
-        android:visibility="gone"
-        app:chipBackgroundColor="@null"
-        app:layout_constraintStart_toEndOf="@id/mainProfileImage"
-        app:layout_constraintTop_toBottomOf="@id/mainPostCount"
-        app:rippleColor="@color/grey_400"
-        tools:text="10 Followers"
+        app:layout_constraintBottom_toTopOf="@id/fav_chip"
+        app:rippleColor="@color/purple_200"
         tools:visibility="visible" />
 
     <com.google.android.material.chip.Chip
@@ -74,11 +48,42 @@
         android:gravity="center"
         android:visibility="gone"
         app:chipBackgroundColor="@null"
-        app:layout_constraintStart_toEndOf="@id/mainFollowers"
-        app:layout_constraintTop_toTopOf="@id/mainFollowers"
+        app:layout_constraintStart_toEndOf="@id/btnFollow"
+        app:layout_constraintBottom_toTopOf="@id/fav_chip"
         tools:text="omg what do u expect"
         tools:visibility="visible" />
 
+    <!-- for user themself -->
+    <com.google.android.material.chip.Chip
+        android:id="@+id/btnSaved"
+        android:layout_width="wrap_content"
+        android:layout_height="@dimen/profile_chip_size"
+        android:layout_marginStart="4dp"
+        android:text="@string/saved"
+        android:visibility="gone"
+        app:chipBackgroundColor="@null"
+        app:chipIcon="@drawable/ic_outline_class_24"
+        app:chipIconTint="@color/blue_700"
+        app:layout_constraintStart_toEndOf="@id/mainStatus"
+        app:layout_constraintBottom_toTopOf="@id/fav_chip"
+        app:rippleColor="@color/blue_A400"
+        tools:visibility="visible" />
+
+    <com.google.android.material.chip.Chip
+        android:id="@+id/btnLiked"
+        android:layout_width="wrap_content"
+        android:layout_height="@dimen/profile_chip_size"
+        android:layout_marginStart="4dp"
+        android:text="@string/liked"
+        android:visibility="gone"
+        app:chipBackgroundColor="@null"
+        app:chipIcon="@drawable/ic_like"
+        app:chipIconTint="@color/red_600"
+        app:layout_constraintStart_toEndOf="@id/btnSaved"
+        app:layout_constraintBottom_toTopOf="@id/fav_chip"
+        app:rippleColor="@color/red_300"
+        tools:visibility="visible" />
+
     <com.google.android.material.chip.Chip
         android:id="@+id/fav_chip"
         android:layout_width="wrap_content"
@@ -90,7 +95,7 @@
         app:chipIcon="@drawable/ic_outline_star_plus_24"
         app:chipIconTint="@color/yellow_800"
         app:layout_constraintStart_toEndOf="@id/mainProfileImage"
-        app:layout_constraintTop_toBottomOf="@id/mainFollowers"
+        app:layout_constraintTop_toBottomOf="@id/btnFollow"
         app:rippleColor="@color/yellow_400"
         tools:visibility="visible" />
 
@@ -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" />
 
+    <com.google.android.material.chip.Chip
+        android:id="@+id/btnDM"
+        android:layout_width="wrap_content"
+        android:layout_height="@dimen/profile_chip_size"
+        android:layout_marginStart="4dp"
+        android:text="@string/dm_person"
+        android:visibility="gone"
+        app:chipBackgroundColor="@null"
+        app:chipIcon="@drawable/ic_round_send_24"
+        app:chipIconTint="@color/green"
+        app:layout_constraintStart_toEndOf="@id/btnTagged"
+        app:layout_constraintTop_toBottomOf="@id/fav_chip"
+        app:rippleColor="@color/green"
+        tools:visibility="visible" />
+
     <androidx.appcompat.widget.AppCompatTextView
         android:id="@+id/mainFullName"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:ellipsize="marquee"
         android:paddingStart="8dp"
-        android:paddingTop="8dp"
+        android:paddingTop="4dp"
+        android:paddingBottom="4dp"
         android:paddingEnd="4dp"
         android:singleLine="true"
         android:textAppearance="@style/TextAppearance.AppCompat.Body1"
         android:textStyle="bold"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@id/fav_chip"
+        app:layout_constraintTop_toBottomOf="@id/btnTagged"
         tools:text="Austin Huang" />
 
     <androidx.appcompat.widget.AppCompatImageView
@@ -130,12 +151,13 @@
         android:layout_height="match_parent"
         android:layout_gravity="center"
         android:adjustViewBounds="true"
-        android:paddingTop="8dp"
+        android:paddingTop="4dp"
+        android:paddingBottom="4dp"
         android:scaleType="fitCenter"
         android:visibility="gone"
         app:layout_constraintBottom_toBottomOf="@id/mainFullName"
         app:layout_constraintStart_toEndOf="@id/mainFullName"
-        app:layout_constraintTop_toBottomOf="@id/fav_chip"
+        app:layout_constraintTop_toBottomOf="@id/btnTagged"
         app:srcCompat="@drawable/verified"
         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. " />
 
     <awais.instagrabber.customviews.RamboTextViewV2
         android:id="@+id/mainUrl"
@@ -180,7 +205,10 @@
         android:layout_height="wrap_content"
         android:layout_below="@id/mainBiography"
         android:ellipsize="marquee"
-        android:padding="8dp"
+        android:paddingStart="8dp"
+        android:paddingEnd="8dp"
+        android:paddingTop="4dp"
+        android:paddingBottom="4dp"
         android:textAppearance="@style/TextAppearance.AppCompat.Body1"
         android:visibility="gone"
         app:layout_constraintEnd_toEndOf="parent"
@@ -190,84 +218,92 @@
         tools:textColor="@android:color/holo_blue_dark"
         tools:visibility="visible" />
 
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/btnFollow"
-        style="@style/Widget.MaterialComponents.Button.TextButton"
-        android:layout_width="0dp"
+    <awais.instagrabber.customviews.RamboTextViewV2
+        android:id="@+id/profileContext"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="@string/follow"
-        android:textColor="@color/deep_purple_200"
+        android:layout_below="@id/mainUrl"
+        android:ellipsize="marquee"
+        android:paddingStart="8dp"
+        android:paddingTop="4dp"
+        android:paddingEnd="8dp"
+        android:paddingBottom="4dp"
+        android:textAppearance="@style/TextAppearance.AppCompat.Body1"
+        android:textSize="12sp"
+        android:textStyle="italic"
         android:visibility="gone"
-        app:icon="@drawable/ic_outline_person_add_24"
-        app:iconGravity="top"
-        app:iconTint="@color/deep_purple_200"
-        app:layout_constraintBottom_toTopOf="@id/highlights_barrier"
-        app:layout_constraintEnd_toStartOf="@id/btnSaved"
+        app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@id/mainUrl"
-        app:rippleColor="@color/purple_200"
+        app:layout_constraintBottom_toTopOf="@id/counts_barrier"
+        tools:text="Followed by @instagram, @facebook + 69 more"
         tools:visibility="visible" />
 
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/btnSaved"
-        style="@style/Widget.MaterialComponents.Button.TextButton"
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:text="@string/saved"
-        android:textColor="@color/blue_700"
+    <View
+        android:id="@+id/counts_barrier"
+        android:layout_width="fill_parent"
+        android:layout_height="0.5dp"
+        android:background="?attr/colorOnPrimary"
         android:visibility="gone"
-        app:icon="@drawable/ic_outline_class_24"
-        app:iconGravity="top"
-        app:iconTint="@color/blue_700"
-        app:layout_constraintBottom_toTopOf="@id/highlights_barrier"
-        app:layout_constraintEnd_toStartOf="@id/btnLiked"
-        app:layout_constraintStart_toEndOf="@id/btnFollow"
-        app:layout_constraintTop_toBottomOf="@id/mainUrl"
-        app:rippleColor="@color/blue_A400"
+        app:layout_constraintTop_toBottomOf="@id/profileContext"
+        tools:layout_editor_absoluteX="8dp"
         tools:visibility="visible" />
 
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/btnLiked"
-        style="@style/Widget.MaterialComponents.Button.TextButton"
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/mainPostCount"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:text="@string/liked"
-        android:textColor="@color/red_600"
-        android:visibility="gone"
-        app:icon="@drawable/ic_like"
-        app:iconGravity="top"
-        app:iconTint="@color/red_600"
-        app:layout_constraintBottom_toTopOf="@id/highlights_barrier"
-        app:layout_constraintEnd_toStartOf="@id/btnDM"
-        app:layout_constraintStart_toEndOf="@id/btnSaved"
-        app:layout_constraintTop_toBottomOf="@id/mainUrl"
-        app:rippleColor="@color/red_300"
-        tools:visibility="visible" />
+        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" />
 
-    <com.google.android.material.button.MaterialButton
-        android:id="@+id/btnDM"
-        style="@style/Widget.MaterialComponents.Button.TextButton"
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/mainFollowers"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
-        android:text="@string/dm_person"
-        android:textColor="@color/green"
-        android:visibility="gone"
-        app:icon="@drawable/ic_round_send_24"
-        app:iconGravity="top"
-        app:iconTint="@color/green"
-        app:layout_constraintBottom_toTopOf="@id/highlights_barrier"
+        android:paddingStart="8dp"
+        android:paddingEnd="8dp"
+        android:paddingTop="4dp"
+        android:paddingBottom="8dp"
+        android:background="?selectableItemBackgroundBorderless"
+        android:gravity="center"
+        android:textAppearance="@style/TextAppearance.AppCompat"
+        app:layout_constraintBottom_toBottomOf="@id/highlights_barrier"
+        app:layout_constraintEnd_toStartOf="@id/mainFollowing"
+        app:layout_constraintStart_toEndOf="@id/mainPostCount"
+        app:layout_constraintTop_toBottomOf="@id/counts_barrier"
+        tools:text="68\nFollowers" />
+
+    <androidx.appcompat.widget.AppCompatTextView
+        android:id="@+id/mainFollowing"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        android:paddingStart="8dp"
+        android:paddingEnd="8dp"
+        android:paddingTop="4dp"
+        android:paddingBottom="8dp"
+        android:background="?selectableItemBackgroundBorderless"
+        android:gravity="center"
+        android:textAppearance="@style/TextAppearance.AppCompat"
+        app:layout_constraintBottom_toBottomOf="@id/highlights_barrier"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toEndOf="@id/btnLiked"
-        app:layout_constraintTop_toBottomOf="@id/mainUrl"
-        app:rippleColor="@color/green"
-        tools:visibility="visible" />
+        app:layout_constraintStart_toEndOf="@id/mainFollowers"
+        app:layout_constraintTop_toBottomOf="@id/counts_barrier"
+        tools:text="64\nFollowing" />
 
     <androidx.constraintlayout.widget.Barrier
         android:id="@+id/highlights_barrier"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        app:barrierDirection="bottom"
-        app:constraint_referenced_ids="btnSaved, btnLiked, btnFollow, btnDM" />
+        app:barrierDirection="bottom" />
 
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/highlightsList"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index a8e80ffb..3ae6ec58 100755
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -49,14 +49,14 @@
     <string name="import_export">Import/Export</string>
     <string name="select_language">Language</string>
     <plurals name="main_posts_count_inline">
-        <item quantity="one">%s Post</item>
-        <item quantity="other">%s Posts</item>
+        <item quantity="one">%s\nPost</item>
+        <item quantity="other">%s\nPosts</item>
     </plurals>
     <plurals name="main_posts_followers">
-        <item quantity="one">%s Follower</item>
-        <item quantity="other">%s Followers</item>
+        <item quantity="one">%s\nFollower</item>
+        <item quantity="other">%s\nFollowers</item>
     </plurals>
-    <string name="main_posts_following">%s Following </string>
+    <string name="main_posts_following">%s\nFollowing</string>
     <string name="post_viewer_autoplay_video">Autoplay videos</string>
     <string name="post_viewer_muted_autoplay">Always mute videos</string>
     <string name="post_viewer_show_captions">Always show post captions</string>