jenkins-bot has submitted this change and it was merged. Change subject: Right-align entries for RTL languages in Wikipedia language menu ......................................................................
Right-align entries for RTL languages in Wikipedia language menu Bug: T95895 Change-Id: I54d543bd5d73f02b32dc30678d0522dae55a3b20 --- M wikipedia/res/layout/simple_list_item_activated_2.xml M wikipedia/src/main/java/org/wikipedia/settings/LanguagePreference.java 2 files changed, 27 insertions(+), 12 deletions(-) Approvals: BearND: Looks good to me, approved jenkins-bot: Verified diff --git a/wikipedia/res/layout/simple_list_item_activated_2.xml b/wikipedia/res/layout/simple_list_item_activated_2.xml index 85d6082..126e972 100644 --- a/wikipedia/res/layout/simple_list_item_activated_2.xml +++ b/wikipedia/res/layout/simple_list_item_activated_2.xml @@ -16,35 +16,39 @@ <TwoLineListItem xmlns:android="http://schemas.android.com/apk/res/android"; xmlns:tools="http://schemas.android.com/tools"; - android:paddingTop="2dip" - android:paddingBottom="2dip" - android:paddingLeft="10dip" - android:paddingRight="10dip" + android:paddingTop="2dp" + android:paddingBottom="2dp" + android:paddingLeft="10dp" + android:paddingRight="10dp" android:layout_width="match_parent" android:layout_height="wrap_content" android:background="@drawable/selectable_item_background" android:minHeight="?android:attr/listPreferredItemHeight" android:mode="twoLine" - > + > <TextView android:id="@android:id/text1" - android:layout_width="wrap_content" + android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginLeft="6dip" - android:layout_marginStart="6dip" - android:layout_marginTop="6dip" + android:layout_marginLeft="6dp" + android:layout_marginRight="6dp" + android:layout_marginStart="6dp" + android:layout_marginEnd="6dp" + android:layout_marginTop="6dp" android:textAppearance="?android:attr/textAppearanceLarge" tools:text="Sample text 1" - /> + /> <TextView android:id="@android:id/text2" - android:layout_width="wrap_content" + android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_below="@android:id/text1" android:layout_alignLeft="@android:id/text1" + android:layout_alignRight="@android:id/text1" android:layout_alignStart="@android:id/text1" + android:layout_alignEnd="@android:id/text1" android:textAppearance="?android:attr/textAppearanceSmall" tools:text="Sample text 2" - /> + /> </TwoLineListItem> diff --git a/wikipedia/src/main/java/org/wikipedia/settings/LanguagePreference.java b/wikipedia/src/main/java/org/wikipedia/settings/LanguagePreference.java index 937320e..c183c40 100644 --- a/wikipedia/src/main/java/org/wikipedia/settings/LanguagePreference.java +++ b/wikipedia/src/main/java/org/wikipedia/settings/LanguagePreference.java @@ -6,6 +6,7 @@ import android.text.Editable; import android.text.TextWatcher; import android.util.AttributeSet; +import android.view.Gravity; import android.view.LayoutInflater; import android.view.View; import android.view.ViewGroup; @@ -17,6 +18,7 @@ import org.wikipedia.R; import org.wikipedia.WikipediaApp; +import java.text.Bidi; import java.util.ArrayList; import java.util.Arrays; import java.util.List; @@ -163,6 +165,15 @@ localNameText.setText(app.localNameFor(langIndex)); nameText.setText(app.canonicalNameFor(langIndex)); + + // Right-align English-language subheadings for right-to-left languages + Bidi bidi = new Bidi(app.localNameFor(langIndex), Bidi.DIRECTION_DEFAULT_LEFT_TO_RIGHT); + if (bidi.getBaseLevel() == Bidi.DIRECTION_LEFT_TO_RIGHT) { + nameText.setGravity(Gravity.START); + } else { + nameText.setGravity(Gravity.END); + } + return convertView; } } -- To view, visit https://gerrit.wikimedia.org/r/203947 To unsubscribe, visit https://gerrit.wikimedia.org/r/settings Gerrit-MessageType: merged Gerrit-Change-Id: I54d543bd5d73f02b32dc30678d0522dae55a3b20 Gerrit-PatchSet: 4 Gerrit-Project: apps/android/wikipedia Gerrit-Branch: master Gerrit-Owner: Mholloway <mhollo...@wikimedia.org> Gerrit-Reviewer: BearND <bsitzm...@wikimedia.org> Gerrit-Reviewer: Brion VIBBER <br...@wikimedia.org> Gerrit-Reviewer: Dbrant <dbr...@wikimedia.org> Gerrit-Reviewer: jenkins-bot <> _______________________________________________ MediaWiki-commits mailing list MediaWiki-commits@lists.wikimedia.org https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
