diff --git a/app/src/main/java/com/chwl/app/avroom/widget/MicroView.java b/app/src/main/java/com/chwl/app/avroom/widget/MicroView.java index 6ee2a81ed..e49c5cd66 100644 --- a/app/src/main/java/com/chwl/app/avroom/widget/MicroView.java +++ b/app/src/main/java/com/chwl/app/avroom/widget/MicroView.java @@ -99,7 +99,7 @@ public class MicroView extends LinearLayout implements View.OnLayoutChangeListen public void bindAdapter(@NonNull BaseMicroViewAdapter adapter) { if (adapter instanceof DatingMicroViewAdapter) { - if (datingItemDecoration == null) datingItemDecoration = new DatingItemDecoration(); + if (datingItemDecoration == null) datingItemDecoration = new DatingItemDecoration(UiUtils.INSTANCE.isRtl(getContext())); recyclerView.addItemDecoration(datingItemDecoration); } else if (datingItemDecoration != null) { recyclerView.removeItemDecoration(datingItemDecoration); diff --git a/app/src/main/java/com/chwl/app/ui/widget/recyclerview/decoration/DatingItemDecoration.java b/app/src/main/java/com/chwl/app/ui/widget/recyclerview/decoration/DatingItemDecoration.java index 1703bbbd2..5577422a0 100644 --- a/app/src/main/java/com/chwl/app/ui/widget/recyclerview/decoration/DatingItemDecoration.java +++ b/app/src/main/java/com/chwl/app/ui/widget/recyclerview/decoration/DatingItemDecoration.java @@ -15,6 +15,12 @@ public class DatingItemDecoration extends RecyclerView.ItemDecoration { private final int spacingWidth = ScreenUtil.dip2px(48f); private final int vSpacing = ScreenUtil.dip2px(5f); + private boolean isRTL = false; + + public DatingItemDecoration(boolean isRTL){ + this.isRTL = isRTL; + } + @Override public void getItemOffsets(@NotNull Rect outRect, @NotNull View view, @NotNull RecyclerView parent, @NotNull RecyclerView.State state) { super.getItemOffsets(outRect, view, parent, state); @@ -34,6 +40,10 @@ public class DatingItemDecoration extends RecyclerView.ItemDecoration { if (position == 5 || position == 6 || position == 7 || position == 8) { outRect.top = vSpacing; } - + if (isRTL) { + int temp = outRect.right; + outRect.right = outRect.left; + outRect.left = temp; + } } } diff --git a/app/src/main/res/layout/fragment_av_room_game.xml b/app/src/main/res/layout/fragment_av_room_game.xml index 09e7e40f8..441726b02 100644 --- a/app/src/main/res/layout/fragment_av_room_game.xml +++ b/app/src/main/res/layout/fragment_av_room_game.xml @@ -151,9 +151,9 @@ android:id="@+id/iv_queuing_micro" android:layout_width="65dp" android:layout_height="wrap_content" - android:layout_above="@id/bottom_view" + android:layout_above="@id/gameplay_widget" android:layout_alignParentEnd="true" - android:layout_marginEnd="15dp" + android:layout_marginEnd="6dp" android:layout_marginBottom="10dp" android:adjustViewBounds="true" android:onClick="@{click}" diff --git a/app/src/main/res/layout/item_micro_dating_boss.xml b/app/src/main/res/layout/item_micro_dating_boss.xml index b8bef76b8..57213f511 100644 --- a/app/src/main/res/layout/item_micro_dating_boss.xml +++ b/app/src/main/res/layout/item_micro_dating_boss.xml @@ -316,20 +316,26 @@ android:visibility="gone" tools:text="@string/layout_item_micro_dating_boss_04" /> - + android:layout_height="wrap_content"> + + +