Lomanic/BarInsta
1
0
Fork 0
mirror of https://github.com/KokaKiwi/BarInsta synced 2024-11-22 22:57:29 +00:00
Code Issues Releases Wiki Activity

changing profile layout... again

Browse Source
This commit is contained in:
Austin Huang 2021-03-05 11:44:42 -05:00
parent a37bb2d185
commit 508a80be53
No known key found for this signature in database
GPG Key ID: 84C23AA04587A91F
3 changed files with 154 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
app/src/main/java/awais/instagrabber/fragments/main/ProfileFragment.java
View File

@ -438,6 +438,7 @@ public class ProfileFragment extends Fragment implements SwipeRefreshLayout.OnRe
@Override @Override
public void onRefresh() { public void onRefresh() {
profileDetailsBinding.countsBarrier.setVisibility(View.GONE);
profileDetailsBinding.mainProfileImage.setVisibility(View.INVISIBLE); profileDetailsBinding.mainProfileImage.setVisibility(View.INVISIBLE);
fetchProfileDetails(); fetchProfileDetails();
} }
@ -655,6 +656,8 @@ public class ProfileFragment extends Fragment implements SwipeRefreshLayout.OnRe
profileDetailsBinding.mainProfileImage.setImageURI(profileModel.getProfilePicUrl()); profileDetailsBinding.mainProfileImage.setImageURI(profileModel.getProfilePicUrl());
profileDetailsBinding.mainProfileImage.setVisibility(View.VISIBLE); profileDetailsBinding.mainProfileImage.setVisibility(View.VISIBLE);
profileDetailsBinding.countsBarrier.setVisibility(View.VISIBLE);
final long followersCount = profileModel.getFollowerCount(); final long followersCount = profileModel.getFollowerCount();
final long followingCount = profileModel.getFollowingCount(); final long followingCount = profileModel.getFollowingCount();
@ -857,13 +860,13 @@ public class ProfileFragment extends Fragment implements SwipeRefreshLayout.OnRe
} }
if (profileModel.getFriendshipStatus().isFollowing()) { if (profileModel.getFriendshipStatus().isFollowing()) {
profileDetailsBinding.btnFollow.setText(R.string.unfollow); 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()) { } else if (profileModel.getFriendshipStatus().isOutgoingRequest()) {
profileDetailsBinding.btnFollow.setText(R.string.cancel); 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 { } else {
profileDetailsBinding.btnFollow.setText(R.string.follow); 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) { if (restrictMenuItem != null) {
restrictMenuItem.setVisible(true); restrictMenuItem.setVisible(true);

250
app/src/main/res/layout/layout_profile_details.xml
View File

@ -16,53 +16,27 @@
android:transitionName="profile_pic" android:transitionName="profile_pic"
android:visibility="invisible" android:visibility="invisible"
app:actualImageScaleType="centerCrop" app:actualImageScaleType="centerCrop"
app:layout_constraintEnd_toStartOf="@id/mainPostCount" app:layout_constraintEnd_toStartOf="@id/btnFollow"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toBottomOf="@id/fav_chip" app:layout_constraintBottom_toBottomOf="@id/btnTagged"
tools:background="@mipmap/ic_launcher" /> tools:visibility="visible"
tools:foreground="@mipmap/ic_launcher" />
<!-- for other people -->
<com.google.android.material.chip.Chip <com.google.android.material.chip.Chip
android:id="@+id/mainPostCount" android:id="@+id/btnFollow"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="@dimen/profile_chip_size" android:layout_height="@dimen/profile_chip_size"
android:layout_marginStart="4dp" android:layout_marginStart="4dp"
android:clickable="false" android:text="@string/follow"
android:gravity="center"
android:visibility="gone" android:visibility="gone"
app:chipBackgroundColor="@null" app:chipBackgroundColor="@null"
app:chipIcon="@drawable/ic_outline_person_add_24"
app:chipIconTint="@color/deep_purple_200"
app:layout_constraintStart_toEndOf="@id/mainProfileImage" app:layout_constraintStart_toEndOf="@id/mainProfileImage"
tools:text="35 Posts" app:layout_constraintBottom_toTopOf="@id/fav_chip"
tools:visibility="visible" /> app:rippleColor="@color/purple_200"
<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"
tools:visibility="visible" /> tools:visibility="visible" />
<com.google.android.material.chip.Chip <com.google.android.material.chip.Chip
@ -74,11 +48,42 @@
android:gravity="center" android:gravity="center"
android:visibility="gone" android:visibility="gone"
app:chipBackgroundColor="@null" app:chipBackgroundColor="@null"
app:layout_constraintStart_toEndOf="@id/mainFollowers" app:layout_constraintStart_toEndOf="@id/btnFollow"
app:layout_constraintTop_toTopOf="@id/mainFollowers" app:layout_constraintBottom_toTopOf="@id/fav_chip"
tools:text="omg what do u expect" tools:text="omg what do u expect"
tools:visibility="visible" /> 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 <com.google.android.material.chip.Chip
android:id="@+id/fav_chip" android:id="@+id/fav_chip"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -90,7 +95,7 @@
app:chipIcon="@drawable/ic_outline_star_plus_24" app:chipIcon="@drawable/ic_outline_star_plus_24"
app:chipIconTint="@color/yellow_800" app:chipIconTint="@color/yellow_800"
app:layout_constraintStart_toEndOf="@id/mainProfileImage" app:layout_constraintStart_toEndOf="@id/mainProfileImage"
app:layout_constraintTop_toBottomOf="@id/mainFollowers" app:layout_constraintTop_toBottomOf="@id/btnFollow"
app:rippleColor="@color/yellow_400" app:rippleColor="@color/yellow_400"
tools:visibility="visible" /> tools:visibility="visible" />
@ -104,24 +109,40 @@
app:chipBackgroundColor="@null" app:chipBackgroundColor="@null"
app:chipIcon="@drawable/ic_outline_person_pin_24" app:chipIcon="@drawable/ic_outline_person_pin_24"
app:chipIconTint="@color/deep_orange_800" app:chipIconTint="@color/deep_orange_800"
app:layout_constraintStart_toEndOf="@id/fav_chip" app:layout_constraintStart_toEndOf="@id/mainProfileImage"
app:layout_constraintTop_toTopOf="@id/fav_chip" app:layout_constraintTop_toBottomOf="@id/fav_chip"
app:rippleColor="@color/deep_orange_400" app:rippleColor="@color/deep_orange_400"
tools:visibility="visible" /> 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 <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/mainFullName" android:id="@+id/mainFullName"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:ellipsize="marquee" android:ellipsize="marquee"
android:paddingStart="8dp" android:paddingStart="8dp"
android:paddingTop="8dp" android:paddingTop="4dp"
android:paddingBottom="4dp"
android:paddingEnd="4dp" android:paddingEnd="4dp"
android:singleLine="true" android:singleLine="true"
android:textAppearance="@style/TextAppearance.AppCompat.Body1" android:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:textStyle="bold" android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/fav_chip" app:layout_constraintTop_toBottomOf="@id/btnTagged"
tools:text="Austin Huang" /> tools:text="Austin Huang" />
<androidx.appcompat.widget.AppCompatImageView <androidx.appcompat.widget.AppCompatImageView
@ -130,12 +151,13 @@
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_gravity="center" android:layout_gravity="center"
android:adjustViewBounds="true" android:adjustViewBounds="true"
android:paddingTop="8dp" android:paddingTop="4dp"
android:paddingBottom="4dp"
android:scaleType="fitCenter" android:scaleType="fitCenter"
android:visibility="gone" android:visibility="gone"
app:layout_constraintBottom_toBottomOf="@id/mainFullName" app:layout_constraintBottom_toBottomOf="@id/mainFullName"
app:layout_constraintStart_toEndOf="@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" app:srcCompat="@drawable/verified"
tools:visibility="visible" /> tools:visibility="visible" />
@ -165,14 +187,17 @@
android:id="@+id/mainBiography" android:id="@+id/mainBiography"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="8dp"
android:background="?android:selectableItemBackground" android:background="?android:selectableItemBackground"
android:paddingStart="8dp"
android:paddingEnd="8dp"
android:paddingTop="4dp"
android:paddingBottom="4dp"
android:textAppearance="@style/TextAppearance.AppCompat.Body1" android:textAppearance="@style/TextAppearance.AppCompat.Body1"
app:layout_constraintBottom_toTopOf="@id/mainUrl" app:layout_constraintBottom_toTopOf="@id/mainUrl"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/mainFullName" 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 <awais.instagrabber.customviews.RamboTextViewV2
android:id="@+id/mainUrl" android:id="@+id/mainUrl"
@ -180,7 +205,10 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@id/mainBiography" android:layout_below="@id/mainBiography"
android:ellipsize="marquee" 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:textAppearance="@style/TextAppearance.AppCompat.Body1"
android:visibility="gone" android:visibility="gone"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
@ -190,84 +218,92 @@
tools:textColor="@android:color/holo_blue_dark" tools:textColor="@android:color/holo_blue_dark"
tools:visibility="visible" /> tools:visibility="visible" />
<com.google.android.material.button.MaterialButton <awais.instagrabber.customviews.RamboTextViewV2
android:id="@+id/btnFollow" android:id="@+id/profileContext"
style="@style/Widget.MaterialComponents.Button.TextButton" android:layout_width="match_parent"
android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/follow" android:layout_below="@id/mainUrl"
android:textColor="@color/deep_purple_200" 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" android:visibility="gone"
app:icon="@drawable/ic_outline_person_add_24" app:layout_constraintEnd_toEndOf="parent"
app:iconGravity="top"
app:iconTint="@color/deep_purple_200"
app:layout_constraintBottom_toTopOf="@id/highlights_barrier"
app:layout_constraintEnd_toStartOf="@id/btnSaved"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/mainUrl" 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" /> tools:visibility="visible" />
<com.google.android.material.button.MaterialButton <View
android:id="@+id/btnSaved" android:id="@+id/counts_barrier"
style="@style/Widget.MaterialComponents.Button.TextButton" android:layout_width="fill_parent"
android:layout_width="0dp" android:layout_height="0.5dp"
android:layout_height="wrap_content" android:background="?attr/colorOnPrimary"
android:text="@string/saved"
android:textColor="@color/blue_700"
android:visibility="gone" android:visibility="gone"
app:icon="@drawable/ic_outline_class_24" app:layout_constraintTop_toBottomOf="@id/profileContext"
app:iconGravity="top" tools:layout_editor_absoluteX="8dp"
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"
tools:visibility="visible" /> tools:visibility="visible" />
<com.google.android.material.button.MaterialButton <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/btnLiked" android:id="@+id/mainPostCount"
style="@style/Widget.MaterialComponents.Button.TextButton"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/liked" android:paddingStart="8dp"
android:textColor="@color/red_600" android:paddingEnd="8dp"
android:visibility="gone" android:paddingTop="4dp"
app:icon="@drawable/ic_like" android:paddingBottom="8dp"
app:iconGravity="top" android:gravity="center"
app:iconTint="@color/red_600" android:textAppearance="@style/TextAppearance.AppCompat"
app:layout_constraintBottom_toTopOf="@id/highlights_barrier" app:layout_constraintBottom_toBottomOf="@id/highlights_barrier"
app:layout_constraintEnd_toStartOf="@id/btnDM" app:layout_constraintEnd_toStartOf="@id/mainFollowers"
app:layout_constraintStart_toEndOf="@id/btnSaved" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/mainUrl" app:layout_constraintTop_toBottomOf="@id/counts_barrier"
app:rippleColor="@color/red_300" tools:text="35\nPosts" />
tools:visibility="visible" />
<com.google.android.material.button.MaterialButton <androidx.appcompat.widget.AppCompatTextView
android:id="@+id/btnDM" android:id="@+id/mainFollowers"
style="@style/Widget.MaterialComponents.Button.TextButton"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/dm_person" android:paddingStart="8dp"
android:textColor="@color/green" android:paddingEnd="8dp"
android:visibility="gone" android:paddingTop="4dp"
app:icon="@drawable/ic_round_send_24" android:paddingBottom="8dp"
app:iconGravity="top" android:background="?selectableItemBackgroundBorderless"
app:iconTint="@color/green" android:gravity="center"
app:layout_constraintBottom_toTopOf="@id/highlights_barrier" 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_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@id/btnLiked" app:layout_constraintStart_toEndOf="@id/mainFollowers"
app:layout_constraintTop_toBottomOf="@id/mainUrl" app:layout_constraintTop_toBottomOf="@id/counts_barrier"
app:rippleColor="@color/green" tools:text="64\nFollowing" />
tools:visibility="visible" />
<androidx.constraintlayout.widget.Barrier <androidx.constraintlayout.widget.Barrier
android:id="@+id/highlights_barrier" android:id="@+id/highlights_barrier"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:barrierDirection="bottom" app:barrierDirection="bottom" />
app:constraint_referenced_ids="btnSaved, btnLiked, btnFollow, btnDM" />
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/highlightsList" android:id="@+id/highlightsList"

10
app/src/main/res/values/strings.xml
View File

@ -49,14 +49,14 @@
<string name="import_export">Import/Export</string> <string name="import_export">Import/Export</string>
<string name="select_language">Language</string> <string name="select_language">Language</string>
<plurals name="main_posts_count_inline"> <plurals name="main_posts_count_inline">
<item quantity="one">%s Post</item> <item quantity="one">%s\nPost</item>
<item quantity="other">%s Posts</item> <item quantity="other">%s\nPosts</item>
</plurals> </plurals>
<plurals name="main_posts_followers"> <plurals name="main_posts_followers">
<item quantity="one">%s Follower</item> <item quantity="one">%s\nFollower</item>
<item quantity="other">%s Followers</item> <item quantity="other">%s\nFollowers</item>
</plurals> </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_autoplay_video">Autoplay videos</string>
<string name="post_viewer_muted_autoplay">Always mute videos</string> <string name="post_viewer_muted_autoplay">Always mute videos</string>
<string name="post_viewer_show_captions">Always show post captions</string> <string name="post_viewer_show_captions">Always show post captions</string>