diff --git a/app/src/main/java/app/fedilab/android/ui/drawer/StatusAdapter.java b/app/src/main/java/app/fedilab/android/ui/drawer/StatusAdapter.java index 7879b09e..a2f6013f 100644 --- a/app/src/main/java/app/fedilab/android/ui/drawer/StatusAdapter.java +++ b/app/src/main/java/app/fedilab/android/ui/drawer/StatusAdapter.java @@ -68,6 +68,7 @@ import androidx.annotation.NonNull; import androidx.annotation.Nullable; import androidx.appcompat.app.AlertDialog; import androidx.appcompat.app.AppCompatActivity; +import androidx.appcompat.widget.LinearLayoutCompat; import androidx.appcompat.widget.PopupMenu; import androidx.constraintlayout.widget.ConstraintLayout; import androidx.core.app.ActivityOptionsCompat; @@ -397,6 +398,47 @@ public class StatusAdapter extends RecyclerView.Adapter boolean displayBookmark = sharedpreferences.getBoolean(context.getString(R.string.SET_DISPLAY_BOOKMARK), true); boolean displayTranslate = sharedpreferences.getBoolean(context.getString(R.string.SET_DISPLAY_TRANSLATE), false); boolean displayCounters = sharedpreferences.getBoolean(context.getString(R.string.SET_DISPLAY_COUNTER_FAV_BOOST), false); + boolean removeLeftMargin = sharedpreferences.getBoolean(context.getString(R.string.SET_REMOVE_LEFT_MARGIN), false); + + if (removeLeftMargin) { + LinearLayoutCompat.MarginLayoutParams p = (LinearLayoutCompat.MarginLayoutParams) holder.binding.spoiler.getLayoutParams(); + p.setMarginStart((int) Helper.convertDpToPixel(6, context)); + holder.binding.spoiler.setLayoutParams(p); + LinearLayoutCompat.MarginLayoutParams pe = (LinearLayoutCompat.MarginLayoutParams) holder.binding.spoilerExpand.getLayoutParams(); + pe.setMarginStart((int) Helper.convertDpToPixel(6, context)); + holder.binding.spoilerExpand.setLayoutParams(pe); + LinearLayoutCompat.MarginLayoutParams psc = (LinearLayoutCompat.MarginLayoutParams) holder.binding.statusContent.getLayoutParams(); + psc.setMarginStart((int) Helper.convertDpToPixel(6, context)); + holder.binding.statusContent.setLayoutParams(psc); + LinearLayoutCompat.MarginLayoutParams pct = (LinearLayoutCompat.MarginLayoutParams) holder.binding.containerTrans.getLayoutParams(); + psc.setMarginStart((int) Helper.convertDpToPixel(6, context)); + holder.binding.containerTrans.setLayoutParams(psc); + LinearLayoutCompat.MarginLayoutParams pcv = (LinearLayoutCompat.MarginLayoutParams) holder.binding.card.getLayoutParams(); + pcv.setMarginStart((int) Helper.convertDpToPixel(6, context)); + holder.binding.card.setLayoutParams(pcv); + LinearLayoutCompat.MarginLayoutParams pmc = (LinearLayoutCompat.MarginLayoutParams) holder.binding.mediaContainer.getLayoutParams(); + pmc.setMarginStart((int) Helper.convertDpToPixel(6, context)); + holder.binding.mediaContainer.setLayoutParams(pmc); + LinearLayoutCompat.MarginLayoutParams pal = (LinearLayoutCompat.MarginLayoutParams) holder.binding.attachmentsListContainer.getLayoutParams(); + pal.setMarginStart((int) Helper.convertDpToPixel(6, context)); + holder.binding.attachmentsListContainer.setLayoutParams(pal); + LinearLayoutCompat.MarginLayoutParams pp = (LinearLayoutCompat.MarginLayoutParams) holder.binding.poll.pollContainer.getLayoutParams(); + pp.setMarginStart((int) Helper.convertDpToPixel(6, context)); + holder.binding.poll.pollContainer.setLayoutParams(pp); + LinearLayoutCompat.MarginLayoutParams pet = (LinearLayoutCompat.MarginLayoutParams) holder.binding.editTime.getLayoutParams(); + pet.setMarginStart((int) Helper.convertDpToPixel(6, context)); + holder.binding.editTime.setLayoutParams(pet); + LinearLayoutCompat.MarginLayoutParams psi = (LinearLayoutCompat.MarginLayoutParams) holder.binding.statusInfo.getLayoutParams(); + psi.setMarginStart((int) Helper.convertDpToPixel(6, context)); + holder.binding.statusInfo.setLayoutParams(psi); + LinearLayoutCompat.MarginLayoutParams pas = (LinearLayoutCompat.MarginLayoutParams) holder.binding.actionShareContainer.getLayoutParams(); + pas.setMarginStart((int) Helper.convertDpToPixel(6, context)); + holder.binding.actionShareContainer.setLayoutParams(pas); + LinearLayoutCompat.MarginLayoutParams pab = (LinearLayoutCompat.MarginLayoutParams) holder.binding.actionButtons.getLayoutParams(); + pab.setMarginStart((int) Helper.convertDpToPixel(6, context)); + holder.binding.actionButtons.setLayoutParams(pab); + } + String loadMediaType = sharedpreferences.getString(context.getString(R.string.SET_LOAD_MEDIA_TYPE), "ALWAYS"); if (currentAccount != null && currentAccount.api == Account.API.PLEROMA) { diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 1a8c3a21..8644912b 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1402,6 +1402,8 @@ SET_DISPLAY_TRANSLATE SET_NOTIF_VALIDATION_FAV SET_DISPLAY_COUNTER_FAV_BOOST + SET_REMOVE_LEFT_MARGIN + SET_INNER_MARKER SET_NOTIF_SILENT SET_REMEMBER_POSITION @@ -2112,4 +2114,6 @@ Import data Group reblogs in home timeline Manage accounts + Remove left margin + Remove the left margin in timelines to make messages more compact \ No newline at end of file diff --git a/app/src/main/res/xml/pref_interface.xml b/app/src/main/res/xml/pref_interface.xml index 1799a2ed..f00bf82e 100644 --- a/app/src/main/res/xml/pref_interface.xml +++ b/app/src/main/res/xml/pref_interface.xml @@ -20,6 +20,14 @@ app:summary="@string/set_timelines_in_a_list" app:title="@string/set_timelines_in_a_list_title" /> + +