Merge branch 'preferences_ui' into 'master'

Preferences ui

See merge request leap/bitmask_android!145

1 files changed, 5 insertions, 1 deletions

diff --git a/app/src/main/java/se/leap/bitmaskclient/base/views/IconTextEntry.java b/app/src/main/java/se/leap/bitmaskclient/base/views/IconTextEntry.java
index 2d9525ed..7aefd089 100644
--- a/app/src/main/java/se/leap/bitmaskclient/base/views/IconTextEntry.java
+++ b/app/src/main/java/se/leap/bitmaskclient/base/views/IconTextEntry.java
@@ -14,6 +14,7 @@ import androidx.annotation.ColorRes;
 import androidx.annotation.DrawableRes;
 import androidx.annotation.Nullable;
 import androidx.annotation.StringRes;
+import androidx.appcompat.widget.AppCompatImageView;
 import androidx.appcompat.widget.AppCompatTextView;
 
 import se.leap.bitmaskclient.R;
@@ -22,7 +23,7 @@ import se.leap.bitmaskclient.R;
 public class IconTextEntry extends LinearLayout {
 
     private AppCompatTextView textView;
-    private ImageView iconView;
+    private AppCompatImageView iconView;
     private AppCompatTextView subtitleView;
 
     public IconTextEntry(Context context) {
@@ -73,6 +74,9 @@ public class IconTextEntry extends LinearLayout {
                 iconView.setImageDrawable(drawable);
             }
 
+            boolean singleLine = typedArray.getBoolean(R.styleable.IconTextEntry_singleLine, true);
+            subtitleView.setSingleLine(singleLine);
+
             typedArray.recycle();
         }