Mholloway has uploaded a new change for review.
https://gerrit.wikimedia.org/r/203947
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, 16 insertions(+), 5 deletions(-)
git pull ssh://gerrit.wikimedia.org:29418/apps/android/wikipedia
refs/changes/47/203947/1
diff --git a/wikipedia/res/layout/simple_list_item_activated_2.xml
b/wikipedia/res/layout/simple_list_item_activated_2.xml
index 85d6082..2c11cb5 100644
--- a/wikipedia/res/layout/simple_list_item_activated_2.xml
+++ b/wikipedia/res/layout/simple_list_item_activated_2.xml
@@ -25,26 +25,26 @@
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: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_alignStart="@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: newchange
Gerrit-Change-Id: I54d543bd5d73f02b32dc30678d0522dae55a3b20
Gerrit-PatchSet: 1
Gerrit-Project: apps/android/wikipedia
Gerrit-Branch: master
Gerrit-Owner: Mholloway <mhollo...@wikimedia.org>
_______________________________________________
MediaWiki-commits mailing list
MediaWiki-commits@lists.wikimedia.org
https://lists.wikimedia.org/mailman/listinfo/mediawiki-commits
