[Modify]阿拉伯语适配

This commit is contained in:
wushaocheng
2023-05-24 18:06:30 +08:00
parent c6cef55b9a
commit 95f7c525ab
323 changed files with 1227 additions and 1291 deletions

View File

@@ -56,7 +56,7 @@ public interface Area {
void setPadding(float padding);
void setPadding(float paddingLeft, float paddingTop, float paddingRight, float paddingBottom);
void setPadding(float paddingStart, float paddingTop, float paddingRight, float paddingBottom);
}

View File

@@ -29,7 +29,7 @@ class SlantArea implements Area {
private PointF tempPoint;
private float paddingLeft;
private float paddingStart;
private float paddingTop;
private float paddingRight;
private float paddingBottom;
@@ -68,7 +68,7 @@ class SlantArea implements Area {
@Override
public float left() {
return Math.min(leftTop.x, leftBottom.x) + paddingLeft;
return Math.min(leftTop.x, leftBottom.x) + paddingStart;
}
@Override
@@ -117,13 +117,13 @@ class SlantArea implements Area {
if (radian > 0) {
float tempRatio = radian / SlantUtils.distance(leftTop, leftBottom);
SlantUtils.getPoint(tempPoint, leftTop, leftBottom, Line.Direction.VERTICAL, tempRatio);
tempPoint.offset(paddingLeft, paddingTop);
tempPoint.offset(paddingStart, paddingTop);
areaPath.moveTo(tempPoint.x, tempPoint.y);
tempRatio = radian / SlantUtils.distance(leftTop, rightTop);
SlantUtils.getPoint(tempPoint, leftTop, rightTop, Line.Direction.HORIZONTAL, tempRatio);
tempPoint.offset(paddingLeft, paddingTop);
areaPath.quadTo(leftTop.x + paddingLeft, leftTop.y + paddingTop, tempPoint.x, tempPoint.y);
tempPoint.offset(paddingStart, paddingTop);
areaPath.quadTo(leftTop.x + paddingStart, leftTop.y + paddingTop, tempPoint.x, tempPoint.y);
tempRatio = 1 - tempRatio;
SlantUtils.getPoint(tempPoint, leftTop, rightTop, Line.Direction.HORIZONTAL, tempRatio);
@@ -133,7 +133,7 @@ class SlantArea implements Area {
tempRatio = radian / SlantUtils.distance(rightTop, rightBottom);
SlantUtils.getPoint(tempPoint, rightTop, rightBottom, Line.Direction.VERTICAL, tempRatio);
tempPoint.offset(-paddingRight, paddingTop);
areaPath.quadTo(rightTop.x - paddingLeft, rightTop.y + paddingTop, tempPoint.x, tempPoint.y);
areaPath.quadTo(rightTop.x - paddingStart, rightTop.y + paddingTop, tempPoint.x, tempPoint.y);
tempRatio = 1 - tempRatio;
SlantUtils.getPoint(tempPoint, rightTop, rightBottom, Line.Direction.VERTICAL, tempRatio);
@@ -147,24 +147,24 @@ class SlantArea implements Area {
tempRatio = 1 - tempRatio;
SlantUtils.getPoint(tempPoint, leftBottom, rightBottom, Line.Direction.HORIZONTAL, tempRatio);
tempPoint.offset(paddingLeft, -paddingBottom);
tempPoint.offset(paddingStart, -paddingBottom);
areaPath.lineTo(tempPoint.x, tempPoint.y);
tempRatio = 1 - radian / SlantUtils.distance(leftTop, leftBottom);
SlantUtils.getPoint(tempPoint, leftTop, leftBottom, Line.Direction.VERTICAL, tempRatio);
tempPoint.offset(paddingLeft, -paddingBottom);
areaPath.quadTo(leftBottom.x + paddingLeft, leftBottom.y - paddingBottom, tempPoint.x, tempPoint.y);
tempPoint.offset(paddingStart, -paddingBottom);
areaPath.quadTo(leftBottom.x + paddingStart, leftBottom.y - paddingBottom, tempPoint.x, tempPoint.y);
tempRatio = 1 - tempRatio;
SlantUtils.getPoint(tempPoint, leftTop, leftBottom, Line.Direction.VERTICAL, tempRatio);
tempPoint.offset(paddingLeft, paddingTop);
tempPoint.offset(paddingStart, paddingTop);
areaPath.lineTo(tempPoint.x, tempPoint.y);
} else {
areaPath.moveTo(leftTop.x + paddingLeft, leftTop.y + paddingTop);
areaPath.moveTo(leftTop.x + paddingStart, leftTop.y + paddingTop);
areaPath.lineTo(rightTop.x - paddingRight, rightTop.y + paddingTop);
areaPath.lineTo(rightBottom.x - paddingRight, rightBottom.y - paddingBottom);
areaPath.lineTo(leftBottom.x + paddingLeft, leftBottom.y - paddingBottom);
areaPath.lineTo(leftTop.x + paddingLeft, leftTop.y + paddingTop);
areaPath.lineTo(leftBottom.x + paddingStart, leftBottom.y - paddingBottom);
areaPath.lineTo(leftTop.x + paddingStart, leftTop.y + paddingTop);
}
return areaPath;
}
@@ -199,8 +199,8 @@ class SlantArea implements Area {
if (line == lineLeft) {
SlantUtils.getPoint(handleBarPoints[0], leftTop, leftBottom, line.direction(), 0.25f);
SlantUtils.getPoint(handleBarPoints[1], leftTop, leftBottom, line.direction(), 0.75f);
handleBarPoints[0].offset(paddingLeft, 0);
handleBarPoints[1].offset(paddingLeft, 0);
handleBarPoints[0].offset(paddingStart, 0);
handleBarPoints[1].offset(paddingStart, 0);
} else if (line == lineTop) {
SlantUtils.getPoint(handleBarPoints[0], leftTop, rightTop, line.direction(), 0.25f);
SlantUtils.getPoint(handleBarPoints[1], leftTop, rightTop, line.direction(), 0.75f);
@@ -232,7 +232,7 @@ class SlantArea implements Area {
@Override
public float getPaddingLeft() {
return paddingLeft;
return paddingStart;
}
@Override
@@ -256,8 +256,8 @@ class SlantArea implements Area {
}
@Override
public void setPadding(float paddingLeft, float paddingTop, float paddingRight, float paddingBottom) {
this.paddingLeft = paddingLeft;
public void setPadding(float paddingStart, float paddingTop, float paddingRight, float paddingBottom) {
this.paddingStart = paddingStart;
this.paddingTop = paddingTop;
this.paddingRight = paddingRight;
this.paddingBottom = paddingBottom;

View File

@@ -25,7 +25,7 @@ class StraightArea implements Area {
private RectF areaRect = new RectF();
private PointF[] handleBarPoints = new PointF[2];
private float paddingLeft;
private float paddingStart;
private float paddingTop;
private float paddingRight;
private float paddingBottom;
@@ -65,7 +65,7 @@ class StraightArea implements Area {
@Override
public float left() {
return lineLeft.minX() + paddingLeft;
return lineLeft.minX() + paddingStart;
}
@Override
@@ -180,7 +180,7 @@ class StraightArea implements Area {
@Override
public float getPaddingLeft() {
return paddingLeft;
return paddingStart;
}
@Override
@@ -204,9 +204,9 @@ class StraightArea implements Area {
}
@Override
public void setPadding(float paddingLeft, float paddingTop, float paddingRight,
public void setPadding(float paddingStart, float paddingTop, float paddingRight,
float paddingBottom) {
this.paddingLeft = paddingLeft;
this.paddingStart = paddingStart;
this.paddingTop = paddingTop;
this.paddingRight = paddingRight;
this.paddingBottom = paddingBottom;

View File

@@ -40,10 +40,8 @@
android:layout_height="0dp"
android:background="@color/easy_photos_bar_primary_translation"
android:paddingStart="8dp"
android:paddingLeft="8dp"
android:paddingTop="50dp"
android:paddingEnd="8dp"
android:paddingRight="8dp"
android:visibility="gone"
app:layout_constraintBottom_toTopOf="@+id/m_bottom_bar"
app:layout_constraintLeft_toLeftOf="parent"
@@ -65,9 +63,7 @@
android:layout_height="wrap_content"
android:orientation="horizontal"
android:paddingStart="16dp"
android:paddingLeft="16dp"
android:paddingEnd="16dp"
android:paddingRight="16dp"
android:paddingBottom="8dp"
android:visibility="gone"
app:layout_constraintBottom_toTopOf="@+id/m_bottom_bar"
@@ -134,9 +130,7 @@
android:gravity="center"
android:minWidth="70dp"
android:paddingStart="16dp"
android:paddingLeft="16dp"
android:paddingEnd="6dp"
android:paddingRight="6dp"
android:text="@string/selector_folder_all_easy_photos"
android:textColor="@color/easy_photos_fg_primary"
app:layout_constraintBottom_toBottomOf="@+id/m_bottom_bar"
@@ -172,9 +166,7 @@
android:focusable="true"
android:gravity="center"
android:paddingStart="16dp"
android:paddingLeft="16dp"
android:paddingEnd="16dp"
android:paddingRight="16dp"
android:text="@string/selector_preview_easy_photos"
android:textColor="@color/easy_photos_fg_primary"
android:visibility="invisible"
@@ -215,7 +207,6 @@
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_marginStart="16dp"
android:layout_marginLeft="16dp"
android:gravity="center"
android:text="@string/picture_selection_easy_photos"
android:textColor="@color/easy_photos_fg_primary"
@@ -229,7 +220,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:layout_marginRight="8dp"
android:background="@drawable/bg_menu_done_easy_photos"
android:gravity="center"
android:padding="6dp"

View File

@@ -38,7 +38,6 @@
android:layout_width="42dp"
android:layout_height="match_parent"
android:layout_alignParentStart="true"
android:layout_alignParentLeft="true"
android:padding="10dp"
app:srcCompat="@drawable/ic_arrow_back_preview_easy_photos" />
@@ -47,7 +46,6 @@
android:layout_width="1dp"
android:layout_height="22dp"
android:layout_alignEnd="@+id/iv_back"
android:layout_alignRight="@+id/iv_back"
android:layout_centerVertical="true"
android:layout_gravity="center_vertical"
android:background="@color/easy_photos_bar_preview_primary_dark" />
@@ -57,10 +55,9 @@
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_toEndOf="@+id/m_back_line"
android:layout_toRightOf="@+id/m_back_line"
android:gravity="center"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:paddingStart="16dp"
android:paddingEnd="16dp"
android:textColor="@color/easy_photos_preview_fg_primary" />
<com.yizhuan.xchat_android_library.easyphoto.ui.widget.PressedTextView
@@ -68,10 +65,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginEnd="8dp"
android:layout_marginRight="8dp"
android:background="@drawable/bg_menu_done_easy_photos"
android:gravity="center"
android:maxWidth="200dp"
@@ -115,10 +110,9 @@
android:layout_height="42dp"
android:layout_below="@+id/fl_fragment"
android:layout_alignParentStart="true"
android:layout_alignParentLeft="true"
android:gravity="center"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:paddingStart="16dp"
android:paddingEnd="16dp"
android:text="@string/edit_easy_photos"
android:textColor="@color/easy_photos_preview_fg_primary"
android:textStyle="bold"
@@ -142,7 +136,6 @@
android:layout_height="42dp"
android:layout_below="@+id/fl_fragment"
android:layout_toStartOf="@+id/iv_selector"
android:layout_toLeftOf="@+id/iv_selector"
android:gravity="center"
android:text="@string/selector_easy_photos"
android:textColor="@color/easy_photos_preview_fg_primary"
@@ -154,11 +147,8 @@
android:layout_height="42dp"
android:layout_below="@+id/fl_fragment"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:paddingStart="6dp"
android:paddingLeft="6dp"
android:paddingEnd="16dp"
android:paddingRight="16dp"
app:srcCompat="@drawable/ic_selector_easy_photos" />
</RelativeLayout>

View File

@@ -28,8 +28,8 @@
android:layout_width="match_parent"
android:layout_height="42dp"
android:layout_alignParentTop="true"
android:layout_marginLeft="16dp"
android:layout_marginRight="16dp"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:visibility="gone" />
<LinearLayout
@@ -135,7 +135,6 @@
android:layout_height="wrap_content"
android:layout_above="@+id/m_bottom_layout"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_alignWithParentIfMissing="true"
android:layout_margin="16dp"
android:visibility="visible"
@@ -157,12 +156,9 @@
android:id="@+id/tv_back"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:gravity="center"
android:paddingEnd="16dp"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:paddingStart="16dp"
android:text="@string/cancel_easy_photos"
android:textColor="@color/easy_photos_fg_primary"
@@ -175,10 +171,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginEnd="8dp"
android:layout_marginRight="8dp"
android:gravity="center"
android:maxWidth="200dp"
android:minWidth="56dp"
@@ -193,10 +187,8 @@
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginEnd="20dp"
android:layout_marginRight="20dp"
android:visibility="invisible" />
</RelativeLayout>

View File

@@ -41,7 +41,6 @@
android:id="@+id/tv_message"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_alignParentStart="true"
android:padding="8dp"
android:textSize="12sp"
@@ -54,10 +53,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_alignParentTop="true"
android:layout_marginEnd="8dp"
android:layout_marginRight="8dp"
android:background="@drawable/bg_menu_done_easy_photos"
android:gravity="center"
android:padding="6dp"
@@ -81,8 +78,6 @@
android:layout_height="0dp"
android:background="@color/easy_photos_bar_primary_translation"
android:paddingEnd="8dp"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:paddingStart="8dp"
android:paddingTop="50dp"
android:visibility="gone"
@@ -108,8 +103,6 @@
android:gravity="center"
android:minWidth="70dp"
android:paddingEnd="6dp"
android:paddingLeft="16dp"
android:paddingRight="6dp"
android:paddingStart="16dp"
android:textColor="@color/easy_photos_fg_primary"
app:layout_constraintBottom_toBottomOf="@+id/m_tool_bar"

View File

@@ -10,8 +10,6 @@
android:layout_height="wrap_content"
android:paddingBottom="16dp"
android:paddingEnd="0dp"
android:paddingLeft="8dp"
android:paddingRight="0dp"
android:paddingStart="8dp"
android:paddingTop="16dp" />
</FrameLayout>

View File

@@ -69,13 +69,10 @@
android:id="@+id/et"
android:layout_width="0dp"
android:layout_height="0dp"
android:layout_marginLeft="16dp"
android:layout_marginStart="16dp"
android:background="@drawable/bg_text_sticker_editor_easy_photos"
android:paddingBottom="8dp"
android:paddingEnd="26dp"
android:paddingLeft="8dp"
android:paddingRight="26dp"
android:paddingStart="8dp"
android:paddingTop="8dp"
android:textColor="@color/easy_photos_fg_accent"
@@ -90,7 +87,6 @@
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_marginEnd="8dp"
android:layout_marginRight="8dp"
app:layout_constraintBottom_toBottomOf="@+id/et"
app:layout_constraintRight_toRightOf="@+id/et"
app:layout_constraintTop_toTopOf="@+id/et"
@@ -199,10 +195,6 @@
</LinearLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

View File

@@ -5,8 +5,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingEnd="16dp"
android:paddingLeft="16dp"
android:paddingRight="16dp"
android:paddingStart="16dp"
android:paddingTop="16dp">
@@ -30,7 +28,6 @@
android:id="@+id/tv_album_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="24dp"
android:layout_marginStart="24dp"
android:textColor="@color/album_item_name_easy_photos"
android:textSize="16sp"
@@ -42,7 +39,6 @@
android:id="@+id/tv_album_photos_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="24dp"
android:layout_marginStart="24dp"
android:layout_marginTop="2dp"
android:textColor="@color/album_item_count_easy_photos"
@@ -55,7 +51,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:layout_marginRight="8dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"

View File

@@ -2,8 +2,7 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:layout_marginRight="8dp">
android:layout_marginEnd="8dp">
<com.yizhuan.xchat_android_library.easyphoto.ui.widget.PressedImageView
android:id="@+id/iv_photo"
@@ -25,8 +24,6 @@
android:gravity="center"
android:paddingBottom="3dp"
android:paddingEnd="8dp"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:paddingStart="8dp"
android:paddingTop="3dp"
android:shadowColor="@color/easy_photos_bar_primary"

View File

@@ -25,8 +25,6 @@
android:gravity="center"
android:paddingBottom="3dp"
android:paddingEnd="8dp"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:paddingStart="8dp"
android:paddingTop="3dp"
android:shadowColor="@color/easy_photos_bar_primary"

View File

@@ -31,8 +31,6 @@
android:gravity="center"
android:paddingBottom="3dp"
android:paddingEnd="8dp"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:paddingStart="8dp"
android:paddingTop="3dp"
android:shadowColor="@color/easy_photos_bar_primary"

View File

@@ -47,8 +47,6 @@
android:gravity="center"
android:paddingBottom="3dp"
android:paddingEnd="8dp"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:paddingStart="8dp"
android:paddingTop="3dp"
android:shadowColor="@color/easy_photos_bar_primary"