insert note to a pr description

app/src/main/java/org/mian/gitnex/activities/CreatePullRequestActivity.java

@@ -6,6 +6,7 @@ import android.content.Intent;
 import android.net.Uri;
 import android.os.Bundle;
 import android.os.Handler;
+import android.os.Looper;
 import android.view.LayoutInflater;
 import android.view.MotionEvent;
 import android.view.View;
@@ -14,6 +15,7 @@ import android.widget.TextView;
 import androidx.activity.result.ActivityResultLauncher;
 import androidx.activity.result.contract.ActivityResultContracts;
 import androidx.annotation.NonNull;
+import androidx.appcompat.app.AlertDialog;
 import androidx.recyclerview.widget.LinearLayoutManager;
 import com.google.android.material.bottomsheet.BottomSheetDialog;
 import com.google.android.material.datepicker.MaterialDatePicker;
@@ -41,9 +43,14 @@ import org.mian.gitnex.R;
 import org.mian.gitnex.actions.LabelsActions;
 import org.mian.gitnex.adapters.AttachmentsAdapter;
 import org.mian.gitnex.adapters.LabelsListAdapter;
+import org.mian.gitnex.adapters.NotesAdapter;
 import org.mian.gitnex.clients.RetrofitClient;
+import org.mian.gitnex.database.api.BaseApi;
+import org.mian.gitnex.database.api.NotesApi;
+import org.mian.gitnex.database.models.Notes;
 import org.mian.gitnex.databinding.ActivityCreatePrBinding;
 import org.mian.gitnex.databinding.BottomSheetAttachmentsBinding;
+import org.mian.gitnex.databinding.CustomInsertNoteBinding;
 import org.mian.gitnex.databinding.CustomLabelsSelectionDialogBinding;
 import org.mian.gitnex.fragments.PullRequestsFragment;
 import org.mian.gitnex.helpers.AlertDialogs;
@@ -51,6 +58,7 @@ import org.mian.gitnex.helpers.AppDatabaseSettings;
 import org.mian.gitnex.helpers.Constants;
 import org.mian.gitnex.helpers.Markdown;
 import org.mian.gitnex.helpers.SnackBar;
+import org.mian.gitnex.helpers.Toasty;
 import org.mian.gitnex.helpers.attachments.AttachmentUtils;
 import org.mian.gitnex.helpers.attachments.AttachmentsModel;
 import org.mian.gitnex.helpers.contexts.RepositoryContext;
@@ -74,11 +82,17 @@ public class CreatePullRequestActivity extends BaseActivity
 	private RepositoryContext repository;
 	private LabelsListAdapter labelsAdapter;
 	private MaterialAlertDialogBuilder materialAlertDialogBuilder;
+	private MaterialAlertDialogBuilder materialAlertDialogBuilderNotes;
 	private boolean renderMd = false;
 	private RepositoryContext repositoryContext;
 	private static List<AttachmentsModel> attachmentsList;
 	private AttachmentsAdapter attachmentsAdapter;
 	private static final List<Uri> contentUri = new ArrayList<>();
+	private CustomInsertNoteBinding customInsertNoteBinding;
+	private NotesAdapter adapter;
+	private NotesApi notesApi;
+	private List<Notes> notesList;
+	public AlertDialog dialogNotes;
 
 	@SuppressLint("ClickableViewAccessibility")
 	@Override
@@ -93,6 +107,8 @@ public class CreatePullRequestActivity extends BaseActivity
 
 		materialAlertDialogBuilder =
 				new MaterialAlertDialogBuilder(ctx, R.style.ThemeOverlay_Material3_Dialog_Alert);
+		materialAlertDialogBuilderNotes =
+				new MaterialAlertDialogBuilder(ctx, R.style.ThemeOverlay_Material3_Dialog_Alert);
 
 		repository = RepositoryContext.fromIntent(getIntent());
 
@@ -162,6 +178,8 @@ public class CreatePullRequestActivity extends BaseActivity
 					}
 				});
 
+		viewBinding.insertNote.setOnClickListener(insertNote -> showAllNotes());
+
 		getMilestones(repository.getOwner(), repository.getName(), resultLimit);
 		getBranches(repository.getOwner(), repository.getName());
 
@@ -190,6 +208,62 @@ public class CreatePullRequestActivity extends BaseActivity
 						}
 					});
 
+	private void showAllNotes() {
+
+		notesList = new ArrayList<>();
+		notesApi = BaseApi.getInstance(ctx, NotesApi.class);
+
+		customInsertNoteBinding = CustomInsertNoteBinding.inflate(LayoutInflater.from(ctx));
+
+		View view = customInsertNoteBinding.getRoot();
+		materialAlertDialogBuilderNotes.setView(view);
+
+		customInsertNoteBinding.recyclerView.setHasFixedSize(true);
+		customInsertNoteBinding.recyclerView.setLayoutManager(new LinearLayoutManager(ctx));
+
+		adapter = new NotesAdapter(ctx, notesList, "insert", "pr");
+
+		customInsertNoteBinding.pullToRefresh.setOnRefreshListener(
+				() ->
+						new Handler(Looper.getMainLooper())
+								.postDelayed(
+										() -> {
+											notesList.clear();
+											customInsertNoteBinding.pullToRefresh.setRefreshing(
+													false);
+											customInsertNoteBinding.progressBar.setVisibility(
+													View.VISIBLE);
+											fetchNotes();
+										},
+										250));
+
+		if (notesApi.getCount() > 0) {
+			fetchNotes();
+			dialogNotes = materialAlertDialogBuilderNotes.show();
+		} else {
+			Toasty.warning(ctx, getResources().getString(R.string.noNotes));
+		}
+	}
+
+	private void fetchNotes() {
+
+		notesApi.fetchAllNotes()
+				.observe(
+						this,
+						allNotes -> {
+							assert allNotes != null;
+							if (!allNotes.isEmpty()) {
+
+								notesList.clear();
+
+								notesList.addAll(allNotes);
+								adapter.notifyDataChanged();
+								customInsertNoteBinding.recyclerView.setAdapter(adapter);
+							}
+							customInsertNoteBinding.progressBar.setVisibility(View.GONE);
+						});
+	}
+
 	public void onDestroy() {
 		AttachmentsAdapter.setAttachmentsReceiveListener(null);
 		super.onDestroy();
@@ -202,7 +276,7 @@ public class CreatePullRequestActivity extends BaseActivity
 
 	private void checkForAttachments() {
 
-		if (contentUri.size() > 0) {
+		if (!contentUri.isEmpty()) {
 
 			BottomSheetAttachmentsBinding bottomSheetAttachmentsBinding =
 					BottomSheetAttachmentsBinding.inflate(getLayoutInflater());
@@ -241,7 +315,10 @@ public class CreatePullRequestActivity extends BaseActivity
 
 			RequestBody requestFile =
 					RequestBody.create(
-							file, MediaType.parse(getContentResolver().getType(contentUri.get(i))));
+							file,
+							MediaType.parse(
+									Objects.requireNonNull(
+											getContentResolver().getType(contentUri.get(i)))));
 
 			uploadAttachments(requestFile, issueIndex, file.getName());
 		}
@@ -301,7 +378,7 @@ public class CreatePullRequestActivity extends BaseActivity
 
 		assignees.add("");
 
-		if (labelsIds.size() == 0) {
+		if (labelsIds.isEmpty()) {
 
 			labelsIds.add(0);
 		}
@@ -383,7 +460,7 @@ public class CreatePullRequestActivity extends BaseActivity
 							PullRequestsFragment.resumePullRequests = true;
 							MainActivity.reloadRepos = true;
 
-							if (contentUri.size() > 0) {
+							if (!contentUri.isEmpty()) {
 								assert response.body() != null;
 								processAttachments(response.body().getNumber());
 								contentUri.clear();
@@ -555,7 +632,7 @@ public class CreatePullRequestActivity extends BaseActivity
 											.title(getString(R.string.issueCreatedNoMilestone)));
 							assert milestonesList_ != null;
 
-							if (milestonesList_.size() > 0) {
+							if (!milestonesList_.isEmpty()) {
 
 								for (Milestone milestone : milestonesList_) {
 

app/src/main/java/org/mian/gitnex/adapters/NotesAdapter.java

@@ -22,6 +22,7 @@ import org.apache.commons.lang3.StringUtils;
 import org.mian.gitnex.R;
 import org.mian.gitnex.activities.CreateIssueActivity;
 import org.mian.gitnex.activities.CreateNoteActivity;
+import org.mian.gitnex.activities.CreatePullRequestActivity;
 import org.mian.gitnex.activities.CreateReleaseActivity;
 import org.mian.gitnex.database.api.BaseApi;
 import org.mian.gitnex.database.api.NotesApi;
@@ -117,6 +118,21 @@ public class NotesAdapter extends RecyclerView.Adapter<NotesAdapter.NotesViewHol
 							parentActivity.dialogNotes.dismiss();
 						});
 			}
+
+			if (insert.equalsIgnoreCase("insert") && source.equalsIgnoreCase("pr")) {
+
+				deleteNote.setVisibility(View.GONE);
+
+				itemView.setOnClickListener(
+						view -> {
+							CreatePullRequestActivity parentActivity =
+									(CreatePullRequestActivity) ctx;
+							EditText text = parentActivity.findViewById(R.id.prBody);
+							text.append(notes.getContent());
+
+							parentActivity.dialogNotes.dismiss();
+						});
+			}
 		}
 	}
 

app/src/main/res/layout/activity_create_pr.xml

@@ -84,6 +84,17 @@
 
             </com.google.android.material.textfield.TextInputLayout>
 
+            <TextView
+                android:id="@+id/insertNote"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="end"
+                android:layout_marginTop="@dimen/dimen8dp"
+                android:layout_marginBottom="@dimen/dimen0dp"
+                android:text="@string/insertNote"
+                android:textColor="?attr/primaryTextColor"
+                android:textSize="@dimen/dimen14sp"/>
+            
             <com.google.android.material.textfield.TextInputLayout
                 android:id="@+id/prBodyLayout"
                 android:layout_width="match_parent"

app/src/main/res/layout/activity_issue_detail.xml

@@ -412,16 +412,16 @@
             <com.google.android.material.card.MaterialCardView
                 style="?attr/materialCardViewFilledStyle"
                 android:id="@+id/send_button"
-                android:layout_width="@dimen/dimen40dp"
-                android:layout_height="@dimen/dimen40dp"
+                android:layout_width="@dimen/dimen36dp"
+                android:layout_height="@dimen/dimen36dp"
                 android:layout_gravity="center_vertical"
                 android:backgroundTint="?attr/fabColor"
                 app:cardCornerRadius="@dimen/dimen36dp">
 
                <ImageView
                    android:id="@+id/send"
-                   android:layout_width="@dimen/dimen28dp"
-                   android:layout_height="@dimen/dimen28dp"
+                   android:layout_width="@dimen/dimen24dp"
+                   android:layout_height="@dimen/dimen24dp"
                    android:layout_gravity="center_vertical|center_horizontal"
                    android:contentDescription="@string/generalImgContentText"
                    app:tint="?attr/materialCardBackgroundColor"

app/src/main/res/layout/activity_settings_general.xml

@@ -138,6 +138,7 @@
                  android:layout_width="match_parent"
                  android:layout_height="wrap_content"
                  android:layout_marginTop="@dimen/dimen32dp"
+                 android:visibility="gone"
                  android:orientation="vertical">
 
                 <LinearLayout