mirror/Infinity-For-Lemmy
1
0
Fork 0
mirror of https://codeberg.org/Bazsalanszky/Infinity-For-Lemmy.git synced 2024-11-07 03:07:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

Quote and code block are added to MarkdownBottomBarRecyclerViewAdapter. Fix issues in header size selection.

Browse Source
This commit is contained in:
Alex Ning 2021-01-06 15:03:15 +08:00
parent d2ca131d25
commit b3da83e373
4 changed files with 63 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
app/src/main/java/ml/docilealligator/infinityforreddit/adapters/MarkdownBottomBarRecyclerViewAdapter.java
View File

@ -26,8 +26,10 @@ public class MarkdownBottomBarRecyclerViewAdapter extends RecyclerView.Adapter<R
public static final int ORDERED_LIST = 5; public static final int ORDERED_LIST = 5;
public static final int UNORDERED_LIST = 6; public static final int UNORDERED_LIST = 6;
public static final int SPOILER = 7; public static final int SPOILER = 7;
public static final int QUOTE = 8;
public static final int CODE_BLOCK = 9;
private static final int ITEM_COUNT = 8; private static final int ITEM_COUNT = 10;
private CustomThemeWrapper customThemeWrapper; private CustomThemeWrapper customThemeWrapper;
private ItemClickListener itemClickListener; private ItemClickListener itemClickListener;
@ -76,6 +78,12 @@ public class MarkdownBottomBarRecyclerViewAdapter extends RecyclerView.Adapter<R
case SPOILER: case SPOILER:
((MarkdownBottomBarItemViewHolder) holder).imageView.setImageResource(R.drawable.ic_spoiler_black_24dp); ((MarkdownBottomBarItemViewHolder) holder).imageView.setImageResource(R.drawable.ic_spoiler_black_24dp);
break; break;
case QUOTE:
((MarkdownBottomBarItemViewHolder) holder).imageView.setImageResource(R.drawable.ic_quote_24dp);
break;
case CODE_BLOCK:
((MarkdownBottomBarItemViewHolder) holder).imageView.setImageResource(R.drawable.ic_code_24dp);
break;
} }
} }
} }
@ -171,23 +179,23 @@ public class MarkdownBottomBarRecyclerViewAdapter extends RecyclerView.Adapter<R
int end = Math.max(commentEditText.getSelectionEnd(), 0); int end = Math.max(commentEditText.getSelectionEnd(), 0);
String hashTags; String hashTags;
switch ((int) seekBar.getValue()) { switch ((int) seekBar.getValue()) {
case 0:
hashTags = "###### ";
break;
case 1: case 1:
hashTags = "##### "; hashTags = "# ";
break; break;
case 2: case 2:
hashTags = "#### "; hashTags = "## ";
break; break;
case 3: case 3:
hashTags = "### "; hashTags = "### ";
break; break;
case 4: case 4:
hashTags = "## "; hashTags = "#### ";
break;
case 5:
hashTags = "##### ";
break; break;
default: default:
hashTags = "# "; hashTags = "###### ";
break; break;
} }
if (end != start) { if (end != start) {
@ -243,6 +251,34 @@ public class MarkdownBottomBarRecyclerViewAdapter extends RecyclerView.Adapter<R
} }
break; break;
} }
case QUOTE: {
int start = Math.max(commentEditText.getSelectionStart(), 0);
int end = Math.max(commentEditText.getSelectionEnd(), 0);
if (end != start) {
String currentSelection = commentEditText.getText().subSequence(start, end).toString();
commentEditText.getText().replace(Math.min(start, end), Math.max(start, end),
"> " + currentSelection + "\n\n", 0, "> \n\n".length() + currentSelection.length());
} else {
commentEditText.getText().replace(start, end,
"> \n\n", 0, "> \n\n".length());
commentEditText.setSelection(start + "> ".length());
}
break;
}
case CODE_BLOCK: {
int start = Math.max(commentEditText.getSelectionStart(), 0);
int end = Math.max(commentEditText.getSelectionEnd(), 0);
if (end != start) {
String currentSelection = commentEditText.getText().subSequence(start, end).toString();
commentEditText.getText().replace(Math.min(start, end), Math.max(start, end),
"```\n" + currentSelection + "\n```\n", 0, "```\n\n```\n".length() + currentSelection.length());
} else {
commentEditText.getText().replace(start, end,
"```\n\n```\n", 0, "```\n\n```\n".length());
commentEditText.setSelection(start + "```\n".length());
}
break;
}
} }
} }

9
app/src/main/res/drawable/ic_code_24dp.xml Normal file
View File

@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M9.4,16.6L4.8,12l4.6,-4.6L8,6l-6,6 6,6 1.4,-1.4zM14.6,16.6l4.6,-4.6 -4.6,-4.6L16,6l6,6 -6,6 -1.4,-1.4z"
android:fillColor="#000000"/>
</vector>

9
app/src/main/res/drawable/ic_quote_24dp.xml Normal file
View File

@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="#FF000000"
android:pathData="M6,17h3l2,-4L11,7L5,7v6h3zM14,17h3l2,-4L19,7h-6v6h3z"/>
</vector>