diff options
Diffstat (limited to 'app')
13 files changed, 256 insertions, 185 deletions
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/RedditGalleryPayload.java b/app/src/main/java/ml/docilealligator/infinityforreddit/RedditGalleryPayload.java index bd3365c3..6106d09f 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/RedditGalleryPayload.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/RedditGalleryPayload.java @@ -17,6 +17,7 @@ public class RedditGalleryPayload { @SerializedName("show_error_list") public boolean showErrorList = true; public String title; + public String text; @SerializedName("spoiler") public boolean isSpoiler; @SerializedName("nsfw") @@ -36,11 +37,12 @@ public class RedditGalleryPayload { public String flairText; public ArrayList<Item> items; - public RedditGalleryPayload(String subredditName, String submitType, String title, + public RedditGalleryPayload(String subredditName, String submitType, String title, String text, boolean isSpoiler, boolean isNSFW, boolean sendReplies, Flair flair, ArrayList<Item> items) { this.subredditName = subredditName; this.submitType = submitType; this.title = title; + this.text = text; this.isSpoiler = isSpoiler; this.isNSFW = isNSFW; this.sendReplies = sendReplies; diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/PostGalleryActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/PostGalleryActivity.java index b27615ef..0123faf7 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/PostGalleryActivity.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/PostGalleryActivity.java @@ -22,6 +22,7 @@ import androidx.annotation.Nullable; import androidx.core.content.ContextCompat; import androidx.core.content.FileProvider; import androidx.recyclerview.widget.GridLayoutManager; +import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.RecyclerView; import com.bumptech.glide.Glide; @@ -53,12 +54,14 @@ import ml.docilealligator.infinityforreddit.R; import ml.docilealligator.infinityforreddit.RedditDataRoomDatabase; import ml.docilealligator.infinityforreddit.RedditGalleryPayload; import ml.docilealligator.infinityforreddit.account.Account; +import ml.docilealligator.infinityforreddit.adapters.MarkdownBottomBarRecyclerViewAdapter; import ml.docilealligator.infinityforreddit.adapters.RedditGallerySubmissionRecyclerViewAdapter; import ml.docilealligator.infinityforreddit.asynctasks.LoadSubredditIcon; import ml.docilealligator.infinityforreddit.bottomsheetfragments.AccountChooserBottomSheetFragment; import ml.docilealligator.infinityforreddit.bottomsheetfragments.FlairBottomSheetFragment; import ml.docilealligator.infinityforreddit.bottomsheetfragments.SelectOrCaptureImageBottomSheetFragment; import ml.docilealligator.infinityforreddit.customtheme.CustomThemeWrapper; +import ml.docilealligator.infinityforreddit.customviews.LinearLayoutManagerBugFixed; import ml.docilealligator.infinityforreddit.databinding.ActivityPostGalleryBinding; import ml.docilealligator.infinityforreddit.events.SubmitGalleryPostEvent; import ml.docilealligator.infinityforreddit.events.SwitchAccountEvent; @@ -338,6 +341,25 @@ public class PostGalleryActivity extends BaseActivity implements FlairBottomShee binding.receivePostReplyNotificationsLinearLayoutPostGalleryActivity.setOnClickListener(view -> { binding.receivePostReplyNotificationsSwitchMaterialPostGalleryActivity.performClick(); }); + + MarkdownBottomBarRecyclerViewAdapter adapter = new MarkdownBottomBarRecyclerViewAdapter( + mCustomThemeWrapper, + new MarkdownBottomBarRecyclerViewAdapter.ItemClickListener() { + @Override + public void onClick(int item) { + MarkdownBottomBarRecyclerViewAdapter.bindEditTextWithItemClickListener( + PostGalleryActivity.this, binding.postContentEditTextPostGalleryActivity, item); + } + + @Override + public void onUploadImage() { + + } + }); + + binding.markdownBottomBarRecyclerViewPostGalleryActivity.setLayoutManager(new LinearLayoutManagerBugFixed(this, + LinearLayoutManager.HORIZONTAL, false)); + binding.markdownBottomBarRecyclerViewPostGalleryActivity.setAdapter(adapter); } private void loadCurrentAccount() { @@ -399,6 +421,8 @@ public class PostGalleryActivity extends BaseActivity implements FlairBottomShee binding.nsfwCustomTextViewPostGalleryActivity.setTextColor(primaryTextColor); binding.postTitleEditTextPostGalleryActivity.setTextColor(primaryTextColor); binding.postTitleEditTextPostGalleryActivity.setHintTextColor(secondaryTextColor); + binding.postContentEditTextPostGalleryActivity.setTextColor(primaryTextColor); + binding.postContentEditTextPostGalleryActivity.setHintTextColor(secondaryTextColor); if (typeface != null) { binding.subredditNameTextViewPostGalleryActivity.setTypeface(typeface); binding.rulesButtonPostGalleryActivity.setTypeface(typeface); @@ -408,6 +432,9 @@ public class PostGalleryActivity extends BaseActivity implements FlairBottomShee binding.nsfwCustomTextViewPostGalleryActivity.setTypeface(typeface); binding.postTitleEditTextPostGalleryActivity.setTypeface(typeface); } + if (contentTypeface != null) { + binding.postContentEditTextPostGalleryActivity.setTypeface(contentTypeface); + } } public void selectImage() { @@ -462,7 +489,7 @@ public class PostGalleryActivity extends BaseActivity implements FlairBottomShee } private void displaySubredditIcon() { - if (iconUrl != null && !iconUrl.equals("")) { + if (iconUrl != null && !iconUrl.isEmpty()) { mGlide.load(iconUrl) .apply(RequestOptions.bitmapTransform(new RoundedCornersTransformation(72, 0))) .error(mGlide.load(R.drawable.subreddit_default_icon) @@ -515,7 +542,9 @@ public class PostGalleryActivity extends BaseActivity implements FlairBottomShee return true; } else { redditGalleryImageInfoList = adapter.getRedditGalleryImageInfoList(); - if (!binding.postTitleEditTextPostGalleryActivity.getText().toString().equals("") || redditGalleryImageInfoList != null) { + if (!binding.postTitleEditTextPostGalleryActivity.getText().toString().isEmpty() + || !binding.postContentEditTextPostGalleryActivity.getText().toString().isEmpty() + || redditGalleryImageInfoList != null) { promptAlertDialog(R.string.discard, R.string.discard_detail); return true; } @@ -528,7 +557,7 @@ public class PostGalleryActivity extends BaseActivity implements FlairBottomShee return true; } - if (binding.postTitleEditTextPostGalleryActivity.getText() == null || binding.postTitleEditTextPostGalleryActivity.getText().toString().equals("")) { + if (binding.postTitleEditTextPostGalleryActivity.getText() == null || binding.postTitleEditTextPostGalleryActivity.getText().toString().isEmpty()) { Snackbar.make(binding.coordinatorLayoutPostGalleryActivity, R.string.title_required, Snackbar.LENGTH_SHORT).show(); return true; } @@ -567,8 +596,9 @@ public class PostGalleryActivity extends BaseActivity implements FlairBottomShee items.add(i.payload); } RedditGalleryPayload payload = new RedditGalleryPayload(subredditName, subredditIsUser ? "profile" : "subreddit", - binding.postTitleEditTextPostGalleryActivity.getText().toString(), isSpoiler, isNSFW, binding.receivePostReplyNotificationsSwitchMaterialPostGalleryActivity.isChecked(), - flair, items); + binding.postTitleEditTextPostGalleryActivity.getText().toString(), + binding.postContentEditTextPostGalleryActivity.getText().toString(), isSpoiler, isNSFW, + binding.receivePostReplyNotificationsSwitchMaterialPostGalleryActivity.isChecked(), flair, items); intent.putExtra(SubmitPostService.EXTRA_REDDIT_GALLERY_PAYLOAD, new Gson().toJson(payload)); ContextCompat.startForegroundService(this, intent); @@ -585,7 +615,9 @@ public class PostGalleryActivity extends BaseActivity implements FlairBottomShee promptAlertDialog(R.string.exit_when_submit, R.string.exit_when_submit_post_detail); } else { redditGalleryImageInfoList = adapter.getRedditGalleryImageInfoList(); - if (!binding.postTitleEditTextPostGalleryActivity.getText().toString().equals("") || redditGalleryImageInfoList != null) { + if (!binding.postTitleEditTextPostGalleryActivity.getText().toString().isEmpty() + || !binding.postContentEditTextPostGalleryActivity.getText().toString().isEmpty() + || redditGalleryImageInfoList != null) { promptAlertDialog(R.string.discard, R.string.discard_detail); } else { finish(); @@ -702,7 +734,7 @@ public class PostGalleryActivity extends BaseActivity implements FlairBottomShee } else { mMemu.findItem(R.id.action_send_post_gallery_activity).setEnabled(true); mMemu.findItem(R.id.action_send_post_gallery_activity).getIcon().setAlpha(255); - if (submitGalleryPostEvent.errorMessage == null || submitGalleryPostEvent.errorMessage.equals("")) { + if (submitGalleryPostEvent.errorMessage == null || submitGalleryPostEvent.errorMessage.isEmpty()) { Snackbar.make(binding.coordinatorLayoutPostGalleryActivity, R.string.post_failed, Snackbar.LENGTH_SHORT).show(); } else { Snackbar.make(binding.coordinatorLayoutPostGalleryActivity, submitGalleryPostEvent.errorMessage.substring(0, 1).toUpperCase() diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/PostImageActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/PostImageActivity.java index 05169fe4..f821fafa 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/PostImageActivity.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/PostImageActivity.java @@ -426,6 +426,9 @@ public class PostImageActivity extends BaseActivity implements FlairBottomSheetF binding.postTitleEditTextPostImageActivity.setTypeface(typeface); binding.selectAgainTextViewPostImageActivity.setTypeface(typeface); } + if (contentTypeface != null) { + binding.postContentEditTextPostImageActivity.setTypeface(contentTypeface); + } } private void loadImage() { diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/PostLinkActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/PostLinkActivity.java index 123b27e9..85ef693b 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/PostLinkActivity.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/PostLinkActivity.java @@ -430,6 +430,7 @@ public class PostLinkActivity extends BaseActivity implements FlairBottomSheetFr binding.suggestTitleButtonPostLinkActivity.setTypeface(typeface); } if (contentTypeface != null) { + binding.postContentEditTextPostLinkActivity.setTypeface(contentTypeface); binding.postLinkEditTextPostLinkActivity.setTypeface(contentTypeface); } } diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/PostPollActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/PostPollActivity.java index 91939e61..3a9905e8 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/PostPollActivity.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/PostPollActivity.java @@ -460,6 +460,9 @@ public class PostPollActivity extends BaseActivity implements FlairBottomSheetFr binding.option5TextInputLayoutEditTextPostPollActivity.setTypeface(typeface); binding.option6TextInputLayoutEditTextPostPollActivity.setTypeface(typeface); } + if (contentTypeface != null) { + binding.postContentEditTextPostPollActivity.setTypeface(contentTypeface); + } } public void setCursorDrawableColor(EditText editText, int color) { diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/PostTextActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/PostTextActivity.java index 26ee62f7..c97820c1 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/PostTextActivity.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/PostTextActivity.java @@ -410,7 +410,7 @@ public class PostTextActivity extends BaseActivity implements FlairBottomSheetFr binding.postTitleEditTextPostTextActivity.setTypeface(typeface); } if (contentTypeface != null) { - binding.postTextContentEditTextPostTextActivity.setTypeface(typeface); + binding.postTextContentEditTextPostTextActivity.setTypeface(contentTypeface); } } diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/PostVideoActivity.java b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/PostVideoActivity.java index ca351860..5c1cef68 100644 --- a/app/src/main/java/ml/docilealligator/infinityforreddit/activities/PostVideoActivity.java +++ b/app/src/main/java/ml/docilealligator/infinityforreddit/activities/PostVideoActivity.java @@ -442,6 +442,9 @@ public class PostVideoActivity extends BaseActivity implements FlairBottomSheetF binding.postTitleEditTextPostVideoActivity.setTypeface(typeface); binding.selectAgainTextViewPostVideoActivity.setTypeface(typeface); } + if (contentTypeface != null) { + binding.postContentEditTextPostVideoActivity.setTypeface(contentTypeface); + } } private void loadVideo() { diff --git a/app/src/main/res/layout/activity_post_gallery.xml b/app/src/main/res/layout/activity_post_gallery.xml index acd64fe3..650a2e59 100644 --- a/app/src/main/res/layout/activity_post_gallery.xml +++ b/app/src/main/res/layout/activity_post_gallery.xml @@ -23,198 +23,225 @@ </com.google.android.material.appbar.AppBarLayout> - <androidx.core.widget.NestedScrollView + <LinearLayout android:layout_width="match_parent" android:layout_height="match_parent" + android:orientation="vertical" app:layout_behavior="@string/appbar_scrolling_view_behavior"> - <LinearLayout + <androidx.core.widget.NestedScrollView android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical"> + android:layout_height="0dp" + android:layout_weight="1"> <LinearLayout - android:id="@+id/account_linear_layout_post_gallery_activity" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingTop="16dp" - android:paddingBottom="16dp" - android:clickable="true" - android:focusable="true" - android:background="?attr/selectableItemBackground"> - - <pl.droidsonroids.gif.GifImageView - android:id="@+id/account_icon_gif_image_view_post_gallery_activity" - android:layout_width="24dp" - android:layout_height="24dp" - android:layout_marginStart="16dp" /> - - <TextView - android:id="@+id/account_name_text_view_post_gallery_activity" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:layout_marginStart="32dp" - android:textSize="?attr/font_default" - android:fontFamily="?attr/font_family" /> - - </LinearLayout> + android:layout_height="match_parent" + android:orientation="vertical"> - <RelativeLayout - android:id="@+id/subreddit_relative_layout_post_gallery_activity" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingTop="8dp" - android:paddingBottom="8dp"> - - <pl.droidsonroids.gif.GifImageView - android:id="@+id/subreddit_icon_gif_image_view_post_gallery_activity" - android:layout_width="24dp" - android:layout_height="24dp" - android:layout_alignParentStart="true" - android:layout_centerVertical="true" - android:layout_marginStart="16dp" /> - - <TextView - android:id="@+id/subreddit_name_text_view_post_gallery_activity" - android:layout_width="wrap_content" + <LinearLayout + android:id="@+id/account_linear_layout_post_gallery_activity" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_centerVertical="true" - android:layout_marginStart="32dp" - android:layout_toStartOf="@id/rules_button_post_gallery_activity" - android:layout_toEndOf="@id/subreddit_icon_gif_image_view_post_gallery_activity" - android:text="@string/choose_a_subreddit" - android:textSize="?attr/font_default" - android:fontFamily="?attr/font_family" /> - - <com.google.android.material.button.MaterialButton - android:id="@+id/rules_button_post_gallery_activity" - android:layout_width="wrap_content" + android:paddingTop="16dp" + android:paddingBottom="16dp" + android:clickable="true" + android:focusable="true" + android:background="?attr/selectableItemBackground"> + + <pl.droidsonroids.gif.GifImageView + android:id="@+id/account_icon_gif_image_view_post_gallery_activity" + android:layout_width="24dp" + android:layout_height="24dp" + android:layout_marginStart="16dp" /> + + <TextView + android:id="@+id/account_name_text_view_post_gallery_activity" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:layout_marginStart="32dp" + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" /> + + </LinearLayout> + + <RelativeLayout + android:id="@+id/subreddit_relative_layout_post_gallery_activity" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_alignParentEnd="true" - android:layout_centerVertical="true" - android:layout_marginStart="16dp" - android:layout_marginEnd="16dp" - android:text="@string/rules" - android:textSize="?attr/font_default" - android:fontFamily="?attr/font_family" /> - - </RelativeLayout> - - <com.google.android.material.divider.MaterialDivider - android:id="@+id/divider_1_post_gallery_activity" - android:layout_width="match_parent" - android:layout_height="wrap_content" /> - - <LinearLayout - android:layout_width="match_parent" - android:layout_height="wrap_content"> - - <com.libRG.CustomTextView - android:id="@+id/flair_custom_text_view_post_gallery_activity" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_margin="16dp" - android:padding="4dp" - android:text="@string/flair" - android:textColor="?attr/primaryTextColor" - android:textSize="?attr/font_default" - android:fontFamily="?attr/font_family" - android:visibility="gone" - app:lib_setRadius="6dp" - app:lib_setRoundedView="true" - app:lib_setShape="rectangle" /> - - <com.libRG.CustomTextView - android:id="@+id/spoiler_custom_text_view_post_gallery_activity" - android:layout_width="wrap_content" + android:paddingTop="8dp" + android:paddingBottom="8dp"> + + <pl.droidsonroids.gif.GifImageView + android:id="@+id/subreddit_icon_gif_image_view_post_gallery_activity" + android:layout_width="24dp" + android:layout_height="24dp" + android:layout_alignParentStart="true" + android:layout_centerVertical="true" + android:layout_marginStart="16dp" /> + + <TextView + android:id="@+id/subreddit_name_text_view_post_gallery_activity" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerVertical="true" + android:layout_marginStart="32dp" + android:layout_toStartOf="@id/rules_button_post_gallery_activity" + android:layout_toEndOf="@id/subreddit_icon_gif_image_view_post_gallery_activity" + android:text="@string/choose_a_subreddit" + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" /> + + <com.google.android.material.button.MaterialButton + android:id="@+id/rules_button_post_gallery_activity" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentEnd="true" + android:layout_centerVertical="true" + android:layout_marginStart="16dp" + android:layout_marginEnd="16dp" + android:text="@string/rules" + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" /> + + </RelativeLayout> + + <com.google.android.material.divider.MaterialDivider + android:id="@+id/divider_1_post_gallery_activity" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content"> + + <com.libRG.CustomTextView + android:id="@+id/flair_custom_text_view_post_gallery_activity" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="16dp" + android:padding="4dp" + android:text="@string/flair" + android:textColor="?attr/primaryTextColor" + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" + android:visibility="gone" + app:lib_setRadius="6dp" + app:lib_setRoundedView="true" + app:lib_setShape="rectangle" /> + + <com.libRG.CustomTextView + android:id="@+id/spoiler_custom_text_view_post_gallery_activity" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="16dp" + android:padding="4dp" + android:text="@string/spoiler" + android:textColor="?attr/primaryTextColor" + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" + app:lib_setRadius="6dp" + app:lib_setRoundedView="true" + app:lib_setShape="rectangle" /> + + <com.libRG.CustomTextView + android:id="@+id/nsfw_custom_text_view_post_gallery_activity" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="16dp" + android:padding="4dp" + android:text="@string/nsfw" + android:textColor="?attr/primaryTextColor" + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" + app:lib_setRadius="6dp" + app:lib_setRoundedView="true" + app:lib_setShape="rectangle" /> + + </LinearLayout> + + <LinearLayout + android:id="@+id/receive_post_reply_notifications_linear_layout_post_gallery_activity" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_margin="16dp" - android:padding="4dp" - android:text="@string/spoiler" - android:textColor="?attr/primaryTextColor" - android:textSize="?attr/font_default" - android:fontFamily="?attr/font_family" - app:lib_setRadius="6dp" - app:lib_setRoundedView="true" - app:lib_setShape="rectangle" /> - - <com.libRG.CustomTextView - android:id="@+id/nsfw_custom_text_view_post_gallery_activity" - android:layout_width="wrap_content" + android:paddingStart="16dp" + android:paddingEnd="16dp" + android:clickable="true" + android:focusable="true" + android:background="?attr/selectableItemBackground"> + + <TextView + android:id="@+id/receive_post_reply_notifications_text_view_post_gallery_activity" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:layout_gravity="center_vertical" + android:layout_marginEnd="16dp" + android:text="@string/receive_post_reply_notifications" + android:textSize="?attr/font_default" + android:fontFamily="?attr/font_family" /> + + <com.google.android.material.materialswitch.MaterialSwitch + android:id="@+id/receive_post_reply_notifications_switch_material_post_gallery_activity" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center_vertical" + android:checked="true" /> + + </LinearLayout> + + <com.google.android.material.divider.MaterialDivider + android:id="@+id/divider_2_post_gallery_activity" + android:layout_width="match_parent" + android:layout_height="wrap_content" /> + + <EditText + android:id="@+id/post_title_edit_text_post_gallery_activity" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_margin="16dp" - android:padding="4dp" - android:text="@string/nsfw" + android:background="#00000000" + android:gravity="top" + android:hint="@string/post_title_hint" + android:inputType="textCapSentences|textMultiLine" + android:padding="16dp" android:textColor="?attr/primaryTextColor" - android:textSize="?attr/font_default" - android:fontFamily="?attr/font_family" - app:lib_setRadius="6dp" - app:lib_setRoundedView="true" - app:lib_setShape="rectangle" /> - - </LinearLayout> + android:textSize="?attr/title_font_18" + android:fontFamily="?attr/title_font_family" /> - <LinearLayout - android:id="@+id/receive_post_reply_notifications_linear_layout_post_gallery_activity" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingStart="16dp" - android:paddingEnd="16dp" - android:clickable="true" - android:focusable="true" - android:background="?attr/selectableItemBackground"> - - <TextView - android:id="@+id/receive_post_reply_notifications_text_view_post_gallery_activity" - android:layout_width="0dp" + <EditText + android:id="@+id/post_content_edit_text_post_gallery_activity" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_weight="1" - android:layout_gravity="center_vertical" - android:layout_marginEnd="16dp" - android:text="@string/receive_post_reply_notifications" - android:textSize="?attr/font_default" - android:fontFamily="?attr/font_family" /> - - <com.google.android.material.materialswitch.MaterialSwitch - android:id="@+id/receive_post_reply_notifications_switch_material_post_gallery_activity" - android:layout_width="wrap_content" + android:background="#00000000" + android:gravity="top" + android:hint="@string/post_optional_text_content_hint" + android:inputType="textCapSentences|textMultiLine" + android:padding="16dp" + android:textSize="?attr/content_font_18" + android:fontFamily="?attr/content_font_family" /> + + <androidx.recyclerview.widget.RecyclerView + android:id="@+id/images_recycler_view_post_gallery_activity" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_gravity="center_vertical" - android:checked="true" /> + android:paddingTop="16dp" + android:paddingStart="8dp" + android:paddingEnd="8dp" + app:layoutManager="androidx.recyclerview.widget.GridLayoutManager" + app:spanCount="2" /> </LinearLayout> - <com.google.android.material.divider.MaterialDivider - android:id="@+id/divider_2_post_gallery_activity" - android:layout_width="match_parent" - android:layout_height="wrap_content" /> + </androidx.core.widget.NestedScrollView> - <EditText - android:id="@+id/post_title_edit_text_post_gallery_activity" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:background="#00000000" - android:gravity="top" - android:hint="@string/post_title_hint" - android:inputType="textCapSentences|textMultiLine" - android:padding="16dp" - android:textColor="?attr/primaryTextColor" - android:textSize="?attr/title_font_18" - android:fontFamily="?attr/title_font_family" /> - - <androidx.recyclerview.widget.RecyclerView - android:id="@+id/images_recycler_view_post_gallery_activity" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:paddingTop="16dp" - android:paddingStart="8dp" - android:paddingEnd="8dp" - app:layoutManager="androidx.recyclerview.widget.GridLayoutManager" - app:spanCount="2" /> - - </LinearLayout> + <androidx.recyclerview.widget.RecyclerView + android:id="@+id/markdown_bottom_bar_recycler_view_post_gallery_activity" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:scrollbars="horizontal" + android:layout_gravity="bottom" /> - </androidx.core.widget.NestedScrollView> + </LinearLayout> </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/activity_post_image.xml b/app/src/main/res/layout/activity_post_image.xml index b249f9bc..c2c223cf 100644 --- a/app/src/main/res/layout/activity_post_image.xml +++ b/app/src/main/res/layout/activity_post_image.xml @@ -212,7 +212,7 @@ <EditText android:id="@+id/post_content_edit_text_post_image_activity" android:layout_width="match_parent" - android:layout_height="match_parent" + android:layout_height="wrap_content" android:background="#00000000" android:gravity="top" android:hint="@string/post_optional_text_content_hint" diff --git a/app/src/main/res/layout/activity_post_link.xml b/app/src/main/res/layout/activity_post_link.xml index 765bc8a4..e6366e22 100644 --- a/app/src/main/res/layout/activity_post_link.xml +++ b/app/src/main/res/layout/activity_post_link.xml @@ -244,7 +244,7 @@ <EditText android:id="@+id/post_content_edit_text_post_link_activity" android:layout_width="match_parent" - android:layout_height="match_parent" + android:layout_height="wrap_content" android:background="#00000000" android:gravity="top" android:hint="@string/post_optional_text_content_hint" diff --git a/app/src/main/res/layout/activity_post_poll.xml b/app/src/main/res/layout/activity_post_poll.xml index e2d4101c..e54d988f 100644 --- a/app/src/main/res/layout/activity_post_poll.xml +++ b/app/src/main/res/layout/activity_post_poll.xml @@ -213,7 +213,7 @@ <EditText android:id="@+id/post_content_edit_text_post_poll_activity" android:layout_width="match_parent" - android:layout_height="match_parent" + android:layout_height="wrap_content" android:background="#00000000" android:gravity="top" android:hint="@string/post_optional_text_content_hint" diff --git a/app/src/main/res/layout/activity_post_video.xml b/app/src/main/res/layout/activity_post_video.xml index bc1d9b98..e4ea4876 100644 --- a/app/src/main/res/layout/activity_post_video.xml +++ b/app/src/main/res/layout/activity_post_video.xml @@ -212,7 +212,7 @@ <EditText android:id="@+id/post_content_edit_text_post_video_activity" android:layout_width="match_parent" - android:layout_height="match_parent" + android:layout_height="wrap_content" android:background="#00000000" android:gravity="top" android:hint="@string/post_optional_text_content_hint" diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 3a27f838..abf8e083 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1223,7 +1223,7 @@ 2. To write a superscript, please use ^(), and put the texts inside the parentheses, instead of only using a single ^. For simplicity, click the superscript option in the formatting tools to insert a superscript.\n 3. This feature converts your markdown to rich text format and some formatting may be lost in the process.\n - 4. Uploaded images may not be shown on the preview screen. + 4. Uploaded images may not be shown on the preview screen.\n 5. You cannot edit a submitted post with embedded images in it.\n 6. Please do not change your account using the account chooser on the editing screen. You should switch your account in the navigation drawer on the main screen.</string> |