Skip to content

support rtl #26

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

support rtl #26

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 15 additions & 6 deletions pinentry/src/main/java/me/philio/pinentry/PinEntryView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@
import android.os.Build;
import android.os.Parcel;
import android.os.Parcelable;
import android.support.v4.text.TextUtilsCompat;
import android.support.v4.view.ViewCompat;
import android.text.Editable;
import android.text.InputFilter;
import android.text.InputType;
Expand All @@ -39,6 +41,8 @@
import android.widget.EditText;
import android.widget.TextView;

import java.util.Locale;

/**
* A PIN entry view widget for Android based on the Android 5 Material Theme via the AppCompat v7
* support library.
Expand Down Expand Up @@ -199,14 +203,19 @@ public PinEntryView(Context context, AttributeSet attrs, int defStyle) {

@Override protected void onLayout(boolean changed, int l, int t, int r, int b) {
// Position the text views
final boolean isLayoutRtl = TextUtilsCompat.getLayoutDirectionFromLocale(Locale.getDefault()) == ViewCompat.LAYOUT_DIRECTION_RTL;
for (int i = 0; i < digits; i++) {
View child = getChildAt(i);
int left = i * digitWidth + (i > 0 ? i * digitSpacing : 0);
child.layout(
left + getPaddingLeft() + digitElevation,
getPaddingTop() + (digitElevation / 2),
left + getPaddingLeft() + digitElevation + digitWidth,
getPaddingTop() + (digitElevation / 2) + digitHeight);
int left;
if (!isLayoutRtl) {
left = i * digitWidth + (i > 0 ? i * digitSpacing : 0);
} else {
int j = digits - 1 - i;
left = j * digitWidth + (j > 0 ? j * digitSpacing : 0);
}
int childLeft = left + getPaddingLeft() + digitElevation;
int childTop = getPaddingTop() + (digitElevation / 2);
child.layout(childLeft, childTop, childLeft + digitWidth, childTop + digitHeight);
}

// Add the edit text as a 1px wide view to allow it to focus
Expand Down