diff options
author | cyberta <cyberta@riseup.net> | 2021-11-25 02:14:08 +0000 |
---|---|---|
committer | cyberta <cyberta@riseup.net> | 2021-11-25 02:14:08 +0000 |
commit | 5a2ff7c85f13fe2e875e4ca7ec4192df0e896d01 (patch) | |
tree | e74b21e0b9e24b5b8774598142b343aa56a7070c /app/src/main/java/se/leap/bitmaskclient/base/views | |
parent | 68ca9c827da3c3fad9e70c74960f113560fd6711 (diff) | |
parent | 6fb2050aaf6e992bf96d41c5f6b19f5c1a3771c3 (diff) |
Merge branch 'preferences_ui' into 'master'
Preferences ui
See merge request leap/bitmask_android!145
Diffstat (limited to 'app/src/main/java/se/leap/bitmaskclient/base/views')
-rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/base/views/IconSwitchEntry.java | 3 | ||||
-rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/base/views/IconTextEntry.java | 6 |
2 files changed, 8 insertions, 1 deletions
diff --git a/app/src/main/java/se/leap/bitmaskclient/base/views/IconSwitchEntry.java b/app/src/main/java/se/leap/bitmaskclient/base/views/IconSwitchEntry.java index a499cdd1..79563bcf 100644 --- a/app/src/main/java/se/leap/bitmaskclient/base/views/IconSwitchEntry.java +++ b/app/src/main/java/se/leap/bitmaskclient/base/views/IconSwitchEntry.java @@ -92,6 +92,9 @@ public class IconSwitchEntry extends LinearLayout { iconView.setImageDrawable(drawable); } + boolean singleLine = typedArray.getBoolean(R.styleable.IconTextEntry_singleLine, true); + subtitleView.setSingleLine(singleLine); + typedArray.recycle(); } } 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(); } |