Skip to content

Commit 25b21bc

Browse files
authored
Merge pull request #12227 from keymanapp/fix/android/mirror-arrows
fix(android): Auto-mirror back and forward arrows for RTL support 📟
2 parents f6c2187 + c9bc396 commit 25b21bc

19 files changed

+23
-20
lines changed

Diff for: android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/KeyboardSettingsActivity.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -105,7 +105,7 @@ public void onCreate(Bundle savedInstanceState) {
105105
hashMap = new HashMap<>();
106106
final String customHelpLink = kbd.getHelpLink();
107107
// Check if app declared FileProvider
108-
icon = String.valueOf(R.drawable.ic_arrow_forward);
108+
icon = String.valueOf(R.drawable.ic_action_forward);
109109
// Don't show help link arrow if File Provider unavailable, or custom help doesn't exist
110110
if ( (customHelpLink != null && !FileProviderUtils.exists(context)) ||
111111
(customHelpLink == null && !packageID.equals(KMManager.KMDefault_UndefinedPackageID)) ) {

Diff for: android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/LanguageSettingsActivity.java

+3-3
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ public void onCreate(Bundle savedInstanceState) {
174174
updateActiveLexicalModel();
175175

176176
ImageView imageView = (ImageView) layout.findViewById(R.id.image1);
177-
imageView.setImageResource(R.drawable.ic_arrow_forward);
177+
imageView.setImageResource(R.drawable.ic_action_forward);
178178
layout.setEnabled(true);
179179
layout.setOnClickListener(new View.OnClickListener() {
180180
@Override
@@ -198,7 +198,7 @@ public void onClick(View v) {
198198
* textView = (TextView) layout.findViewById(R.id.text1);
199199
* textView.setText(getString(R.string.manage_dictionary));
200200
* imageView = (ImageView) layout.findViewById(R.id.image1);
201-
* imageView.setImageResource(R.drawable.ic_arrow_forward);
201+
* imageView.setImageResource(R.drawable.ic_action_forward);
202202
*/
203203

204204
listView.setAdapter(adapter);
@@ -346,7 +346,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
346346
}
347347

348348
holder.text.setText(kbd.getResourceName());
349-
holder.img.setImageResource(R.drawable.ic_arrow_forward);
349+
holder.img.setImageResource(R.drawable.ic_action_forward);
350350

351351
return convertView;
352352
}

Diff for: android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/LanguagesSettingsActivity.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -203,7 +203,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
203203
}
204204

205205
holder.textLang.setText(data.name);
206-
holder.img.setImageResource(R.drawable.ic_arrow_forward);
206+
holder.img.setImageResource(R.drawable.ic_action_forward);
207207

208208
holder.textCount.setText(getContext().getResources().getQuantityString(R.plurals.keyboard_count, data.keyboards.size(), data.keyboards.size()));
209209

Diff for: android/KMAPro/kMAPro/src/main/java/com/tavultesoft/kmapro/SelectPackageActivity.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public void onCreate(Bundle savedInstanceState) {
8181
HashMap<String, String> hashMap = new HashMap<>();
8282
hashMap.put(titleKey, keyboardName);
8383
hashMap.put(subtitleKey, pkgID);
84-
String icon = String.valueOf(R.drawable.ic_arrow_forward);
84+
String icon = String.valueOf(R.drawable.ic_action_forward);
8585
hashMap.put(iconKey, icon);
8686
list.add(hashMap);
8787
}

Diff for: android/KMAPro/kMAPro/src/main/res/drawable/ic_action_back.xml

-4
This file was deleted.

Diff for: android/KMAPro/kMAPro/src/main/res/layout/activity_info.xml

+3-2
Original file line numberDiff line numberDiff line change
@@ -19,11 +19,12 @@
1919
<ImageButton
2020
android:id="@+id/back_button"
2121
style="?android:attr/actionButtonStyle"
22+
app:tint="@color/image_button_color"
2223
android:layout_width="wrap_content"
2324
android:layout_height="wrap_content"
2425
android:layout_gravity="start"
2526
android:contentDescription="@string/label_back"
26-
android:src="@drawable/ic_navigation_back" />
27+
android:src="@drawable/ic_action_back" />
2728

2829
<ImageButton
2930
android:id="@+id/forward_button"
@@ -32,7 +33,7 @@
3233
android:layout_width="wrap_content"
3334
android:layout_height="wrap_content"
3435
android:contentDescription="@string/label_forward"
35-
android:src="@drawable/ic_navigation_forward" />
36+
android:src="@drawable/ic_action_forward" />
3637

3738
<ImageButton
3839
android:id="@+id/close_button"

Diff for: android/KMAPro/kMAPro/src/main/res/layout/activity_web_browser.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,7 @@
3434
android:layout_marginEnd="5dp"
3535
android:layout_weight="1"
3636
android:contentDescription="@string/image_button"
37-
android:src="@drawable/ic_navigation_back" />
37+
android:src="@drawable/ic_action_back" />
3838

3939
<ImageButton
4040
android:id="@+id/forwardButton"
@@ -45,7 +45,7 @@
4545
android:layout_marginEnd="5dp"
4646
android:layout_weight="1"
4747
android:contentDescription="@string/image_button"
48-
android:src="@drawable/ic_navigation_forward" />
48+
android:src="@drawable/ic_action_forward" />
4949

5050
<ImageButton
5151
android:id="@+id/bookmarksButton"

Diff for: android/KMAPro/kMAPro/src/main/res/layout/preference_icon_layout.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -2,4 +2,4 @@
22
<ImageView xmlns:android="http://schemas.android.com/apk/res/android"
33
android:layout_width="@dimen/preference_icon"
44
android:layout_height="@dimen/preference_icon"
5-
android:src="@drawable/ic_arrow_forward" />
5+
android:src="@drawable/ic_action_forward" />

Diff for: android/KMEA/app/src/main/java/com/keyman/engine/KeyboardInfoActivity.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ public void onCreate(Bundle savedInstanceState) {
8888
hashMap = new HashMap<String, String>();
8989
final String customHelpLink = kbd.getHelpLink();
9090
// Check if app declared FileProvider
91-
String icon = String.valueOf(R.drawable.ic_arrow_forward);
91+
String icon = String.valueOf(R.drawable.ic_action_forward);
9292
// Don't show help link arrow if it's a local help file and File Provider unavailable,
9393
// or custom help doesn't exist
9494
if ( (customHelpLink != null && ! KMManager.isTestMode() &&

Diff for: android/KMEA/app/src/main/java/com/keyman/engine/ModelInfoActivity.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -81,7 +81,7 @@ public void onCreate(Bundle savedInstanceState) {
8181
final String customHelpLink = lm.getHelpLink();
8282
// Check if app declared FileProvider
8383
// Currently, model help only available if custom link exists
84-
icon = String.valueOf(R.drawable.ic_arrow_forward);
84+
icon = String.valueOf(R.drawable.ic_action_forward);
8585
// Don't show help link arrow if both custom help and File Provider don't exist
8686
// TODO: Update this when model help available on help.keyman.com
8787
if ( (!customHelpLink.equals("") && !FileProviderUtils.exists(context)) ||

Diff for: android/KMEA/app/src/main/java/com/keyman/engine/ModelPickerActivity.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -321,7 +321,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
321321
// once it has its own backing Dataset instance.
322322
// Is this an installed model or not?
323323

324-
holder.imgDetails.setImageResource(R.drawable.ic_arrow_forward);
324+
holder.imgDetails.setImageResource(R.drawable.ic_action_forward);
325325
if (KeyboardPickerActivity.containsLexicalModel(context, modelKey)) {
326326
holder.imgInstalled.setImageResource(R.drawable.ic_check);
327327
} else {
321 Bytes
Loading
270 Bytes
Loading
330 Bytes
Loading
352 Bytes
Loading
413 Bytes
Loading
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:src="@drawable/ic_arrow_back"
4+
android:tint="@android:color/black"
5+
android:autoMirrored="true" />
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<bitmap xmlns:android="http://schemas.android.com/apk/res/android"
33
android:src="@drawable/ic_arrow_forward"
4-
android:tint="@color/keyman_blue" />
4+
android:tint="@android:color/black"
5+
android:autoMirrored="true"/>

Diff for: android/KMEA/app/src/main/res/layout/models_list_row_layout.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@
4444
android:layout_width="wrap_content"
4545
android:layout_height="wrap_content"
4646
android:background="@android:color/transparent"
47-
android:src="@drawable/ic_arrow_forward"
47+
android:src="@drawable/ic_action_forward"
4848
android:layout_alignParentEnd="true"
4949
android:layout_centerVertical="true"
5050
android:layout_marginEnd="12dp"

0 commit comments

Comments
 (0)