From 094cd67728beab71d75a5698ded7549df5b40f57 Mon Sep 17 00:00:00 2001 From: LucasGGamerM Date: Tue, 27 Dec 2022 21:19:54 -0300 Subject: [PATCH] Now adding a confirm button --- .../android/fragments/ProfileFragment.java | 9 ++++----- mastodon/src/main/res/layout/fragment_profile.xml | 14 +++++++++++--- 2 files changed, 15 insertions(+), 8 deletions(-) diff --git a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java index 4610a3d01..d92df441b 100644 --- a/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java +++ b/mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java @@ -116,7 +116,7 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList private SwipeRefreshLayout refreshLayout; private CoverOverlayGradientDrawable coverGradient=new CoverOverlayGradientDrawable(); private float titleTransY; - private View postsBtn, followersBtn, followingBtn; + private View postsBtn, followersBtn, followingBtn, noteEditConfirm, noteEditWrapper; private EditText nameEdit, bioEdit, noteEdit; private ProgressBar actionProgress, notifyProgress; private FrameLayout[] tabViews; @@ -181,6 +181,8 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList username=content.findViewById(R.id.username); bio=content.findViewById(R.id.bio); noteEdit=content.findViewById(R.id.note_edit); + noteEditConfirm=content.findViewById(R.id.note_edit_confirm); + noteEditWrapper=content.findViewById(R.id.note_edit_wrapper); followersCount=content.findViewById(R.id.followers_count); followersLabel=content.findViewById(R.id.followers_label); followersBtn=content.findViewById(R.id.followers_btn); @@ -473,12 +475,9 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList } if(isOwnProfile){ - noteEdit.setVisibility(View.GONE); + noteEditWrapper.setVisibility(View.GONE); } - - - followersCount.setText(UiUtils.abbreviateNumber(account.followersCount)); followingCount.setText(UiUtils.abbreviateNumber(account.followingCount)); postsCount.setText(UiUtils.abbreviateNumber(account.statusesCount)); diff --git a/mastodon/src/main/res/layout/fragment_profile.xml b/mastodon/src/main/res/layout/fragment_profile.xml index 0ad7a898e..f4b10a222 100644 --- a/mastodon/src/main/res/layout/fragment_profile.xml +++ b/mastodon/src/main/res/layout/fragment_profile.xml @@ -262,7 +262,7 @@ android:id="@+id/note_edit_wrapper" android:layout_below="@id/username" android:layout_marginTop="0dp" - android:padding="0dp"> + android:padding="2dp"> + android:textColorHint="?android:textColorSecondaryInverseNoDisable" /> + +