Skip to content
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

Fix bug in RelativeLayout with empty content under RTL language, fix #1914. #2099

Closed
wants to merge 6 commits into from
Closed

Fix bug in RelativeLayout with empty content under RTL language, fix #1914. #2099

Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
7ba24c0
change parent class to linearlayout, fix #1914
huangyz0918 Mar 29, 2018
61c525e
reverse change, find focus in this bug, fix #1914
huangyz0918 Mar 29, 2018
27e8ed5
fix #1981 issue in this occasion, fix #1914
huangyz0918 Mar 29, 2018
f80040c
fix API 17, fix #1914
huangyz0918 Mar 29, 2018
69d09e5
clean code, fix checkstyle, fix #1914
huangyz0918 Mar 29, 2018
c90a0d5
clean code, fix #1914
huangyz0918 Mar 30, 2018
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: 19 additions & 2 deletions collect_app/src/main/java/org/odk/collect/android/views/HierarchyElementView.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,14 +16,17 @@

import android.content.Context;
import android.graphics.drawable.Drawable;
import android.os.Build;
import android.view.Gravity;
import android.view.View;
import android.widget.ImageView;
import android.widget.RelativeLayout;
import android.widget.TextView;

import org.odk.collect.android.logic.HierarchyElement;
import org.odk.collect.android.utilities.TextUtils;
import org.odk.collect.android.utilities.ViewIds;
import org.odk.collect.android.widgets.QuestionWidget;

public class HierarchyElementView extends RelativeLayout {

Expand Down Expand Up @@ -53,7 +56,12 @@ public HierarchyElementView(Context context, HierarchyElement it) {
LayoutParams l =
new RelativeLayout.LayoutParams(LayoutParams.WRAP_CONTENT,
LayoutParams.WRAP_CONTENT);
l.addRule(RelativeLayout.RIGHT_OF, icon.getId());
if (QuestionWidget.isRTL() && Build.VERSION.SDK_INT > 16) {
l.addRule(RelativeLayout.END_OF, icon.getId());
primaryTextView.setTextDirection(View.TEXT_DIRECTION_RTL);
} else {
l.addRule(RelativeLayout.RIGHT_OF, icon.getId());
}
addView(primaryTextView, l);

secondaryTextView = new TextView(context);
Expand All @@ -65,7 +73,16 @@ public HierarchyElementView(Context context, HierarchyElement it) {
new RelativeLayout.LayoutParams(LayoutParams.WRAP_CONTENT,
LayoutParams.WRAP_CONTENT);
lp.addRule(RelativeLayout.BELOW, primaryTextView.getId());
lp.addRule(RelativeLayout.RIGHT_OF, icon.getId());
if (QuestionWidget.isRTL() && Build.VERSION.SDK_INT > 17) {
lp.addRule(RelativeLayout.RIGHT_OF, icon.getId());
lp.addRule(RelativeLayout.END_OF, icon.getId());
secondaryTextView.setTextDirection(View.TEXT_DIRECTION_RTL);
} else if (QuestionWidget.isRTL() && Build.VERSION.SDK_INT == 17) {
lp.addRule(RelativeLayout.END_OF, icon.getId());
secondaryTextView.setTextDirection(View.TEXT_DIRECTION_RTL);
} else {
lp.addRule(RelativeLayout.RIGHT_OF, icon.getId());
}
addView(secondaryTextView, lp);

setPadding(dipToPx(8), dipToPx(4), dipToPx(8), dipToPx(8));
Expand Down