Revert "feat: make profile note box be visible at all times"

This reverts commit d6c05f0850.

mastodon/src/main/java/org/joinmastodon/android/fragments/ProfileFragment.java

@@ -293,8 +293,8 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 				noteEdit.setInputType(InputType.TYPE_CLASS_TEXT | InputType.TYPE_TEXT_FLAG_MULTI_LINE | InputType.TYPE_TEXT_FLAG_CAP_SENTENCES);
 			}else{
 				showFab();
+				savePrivateNote(noteEdit.getText().toString());
 			}
-			savePrivateNote(noteEdit.getText().toString());
 		});
 
 		FrameLayout sizeWrapper=new FrameLayout(getActivity()){
@@ -648,13 +648,13 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		if(pinnedPostsFragment.isAdded())
 			getChildFragmentManager().putFragment(outState, "pinnedPosts", pinnedPostsFragment);
 	}
-
+//
-	@Override
+//	@Override
-	public void onHidden(){
+//	public void onHidden(){
-		if (relationship != null && !noteEdit.getText().toString().equals(relationship.note)){
+//		if (relationship != null && !noteEdit.getText().toString().equals(relationship.note)){
-			savePrivateNote(noteEdit.getText().toString());
+//			savePrivateNote(noteEdit.getText().toString());
-		}
+//		}
-	}
+//	}
 
 	@Override
 	public void onConfigurationChanged(Configuration newConfig){
@@ -865,6 +865,8 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		}else{
 			blockDomain.setVisible(false);
 		}
+		menu.findItem(R.id.edit_note).setTitle(noteWrap.getVisibility()==View.GONE && (relationship.note==null || relationship.note.isEmpty())
+				? R.string.sk_add_note : R.string.sk_delete_note);
 	}
 
 	@Override
@@ -946,6 +948,26 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 		}else if(id==R.id.save){
 			if(isInEditMode)
 				saveAndExitEditMode();
+		}else if(id==R.id.edit_note){
+			if(noteWrap.getVisibility()==View.GONE){
+				showPrivateNote();
+				UiUtils.beginLayoutTransition(scrollableContent);
+				noteEdit.requestFocus();
+				noteEdit.postDelayed(()->{
+					InputMethodManager imm=getActivity().getSystemService(InputMethodManager.class);
+					imm.showSoftInput(noteEdit, 0);
+				}, 100);
+			}else if(relationship.note.isEmpty()){
+				hidePrivateNote();
+				UiUtils.beginLayoutTransition(scrollableContent);
+			}else{
+				new M3AlertDialogBuilder(getActivity())
+						.setMessage(getContext().getString(R.string.sk_private_note_confirm_delete, account.getDisplayUsername()))
+						.setPositiveButton(R.string.delete, (dlg, btn)->savePrivateNote(null))
+						.setNegativeButton(R.string.cancel, null)
+						.show();
+			}
+			invalidateOptionsMenu();
 		}
 		return true;
 	}
@@ -971,7 +993,8 @@ public class ProfileFragment extends LoaderFragment implements OnBackPressedList
 
 	private void updateRelationship(){
 		if(getActivity()==null) return;
-		showPrivateNote();
+		if(relationship.note!=null && !relationship.note.isEmpty()) showPrivateNote();
+		else hidePrivateNote();
 		invalidateOptionsMenu();
 		actionButton.setVisibility(View.VISIBLE);
 		notifyButton.setVisibility(relationship.following ? View.VISIBLE : View.GONE);

mastodon/src/main/java/org/joinmastodon/android/ui/viewholders/AccountViewHolder.java

@@ -217,6 +217,7 @@ public class AccountViewHolder extends BindableViewHolder<AccountViewModel> impl
 		Menu menu=contextMenu.getMenu();
 		Account account=item.account;
 
+		menu.findItem(R.id.edit_note).setVisible(false);
 		menu.findItem(R.id.manage_user_lists).setTitle(fragment.getString(R.string.sk_lists_with_user, account.getShortUsername()));
 		MenuItem mute=menu.findItem(R.id.mute);
 		mute.setTitle(fragment.getString(relationship.muting ? R.string.unmute_user : R.string.mute_user, account.getShortUsername()));

mastodon/src/main/res/layout/fragment_profile.xml

@@ -231,12 +231,13 @@
 					<EditText
 						android:id="@+id/note_edit"
 						android:layout_width="match_parent"
+						android:minHeight="52dp"
+						android:maxHeight="200dp"
 						android:layout_height="match_parent"
 						android:layout_marginTop="8dp"
 						android:padding="16dp"
 						android:background="@null"
 						android:inputType="text|textMultiLine|textCapSentences"
-						android:maxHeight="200dp"
 						android:hint="@string/mo_personal_note"
 						tools:ignore="RtlSymmetry" />
 				</org.joinmastodon.android.ui.views.FloatingHintEditTextLayout>

mastodon/src/main/res/menu/profile.xml

@@ -1,6 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android">
 	<group android:id="@+id/menu_group1">
+		<item android:id="@+id/edit_note" android:title="@string/sk_add_note" android:icon="@drawable/ic_fluent_person_note_24_regular" />
+	</group>
+	<group android:id="@+id/menu_group2">
 		<item android:id="@+id/manage_user_lists" android:title="@string/sk_lists_with_user" android:icon="@drawable/ic_fluent_people_24_regular"/>
 		<item android:id="@+id/mute" android:title="@string/mute_user" android:icon="@drawable/ic_fluent_speaker_off_24_regular"/>
 		<item android:id="@+id/hide_boosts" android:title="@string/hide_boosts_from_user" android:icon="@drawable/ic_fluent_arrow_repeat_all_off_24_regular"/>
@@ -9,7 +12,7 @@
 		<item android:id="@+id/report" android:title="@string/report_user" android:icon="@drawable/ic_fluent_warning_24_regular"/>
 		<item android:id="@+id/block_domain" android:title="@string/block_domain" android:icon="@drawable/ic_fluent_shield_prohibited_24_regular"/>
 	</group>
-	<group android:id="@+id/menu_group2">
+	<group android:id="@+id/menu_group3">
 		<item android:id="@+id/open_in_browser" android:title="@string/open_in_browser" android:icon="@drawable/ic_fluent_globe_24_regular"/>
 		<item android:id="@+id/share" android:title="@string/share_user" android:icon="@drawable/ic_fluent_share_24_regular"/>
 		<item android:id="@+id/open_with_account" android:title="@string/sk_open_with_account" android:visible="false" android:icon="@drawable/ic_fluent_person_swap_24_regular">