diff options
author | cyberta <cyberta@riseup.net> | 2021-11-21 01:31:56 +0000 |
---|---|---|
committer | cyberta <cyberta@riseup.net> | 2021-11-21 01:31:56 +0000 |
commit | 4ebcedd733efce56c91ef21c9b5b167a7820db12 (patch) | |
tree | 20c15802e7c238790fd582b309ef1815c8691917 /app/src/main/java/se/leap/bitmaskclient/base/views/IconTextEntry.java | |
parent | e4cd4773651ef4080a2e8853c5e348e24153467d (diff) | |
parent | 948bc99196a05efa33072f0cc6776b81165ed06a (diff) |
Merge branch 'custom_font' into 'simply_secure_UI_changes'
Custom font
See merge request leap/bitmask_android!144
Diffstat (limited to 'app/src/main/java/se/leap/bitmaskclient/base/views/IconTextEntry.java')
-rw-r--r-- | app/src/main/java/se/leap/bitmaskclient/base/views/IconTextEntry.java | 15 |
1 files changed, 8 insertions, 7 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 6b9bd760..2d9525ed 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 @@ -4,25 +4,26 @@ import android.annotation.TargetApi; import android.content.Context; import android.content.res.TypedArray; import android.graphics.drawable.Drawable; -import androidx.annotation.ColorRes; -import androidx.annotation.DrawableRes; -import androidx.annotation.Nullable; -import androidx.annotation.StringRes; import android.util.AttributeSet; import android.view.LayoutInflater; import android.view.View; import android.widget.ImageView; import android.widget.LinearLayout; -import android.widget.TextView; + +import androidx.annotation.ColorRes; +import androidx.annotation.DrawableRes; +import androidx.annotation.Nullable; +import androidx.annotation.StringRes; +import androidx.appcompat.widget.AppCompatTextView; import se.leap.bitmaskclient.R; public class IconTextEntry extends LinearLayout { - private TextView textView; + private AppCompatTextView textView; private ImageView iconView; - private TextView subtitleView; + private AppCompatTextView subtitleView; public IconTextEntry(Context context) { super(context); |