diff options
author | cyberta <cyberta@riseup.net> | 2018-03-06 10:08:49 -0800 |
---|---|---|
committer | cyberta <cyberta@riseup.net> | 2018-03-06 10:08:49 -0800 |
commit | a95567b4bbb2319636a79cc5e8d6a7921df9f4d1 (patch) | |
tree | 7d5c7c36b141aa98e909f6b99baed769de5cf923 /app/src/main/res/layout/v_provider_header.xml | |
parent | fda23fc8c5aa916bce4ce985fcdf0aa08b21f1e6 (diff) | |
parent | 54e95a61bc553d985f6c55823da20985b6103aa0 (diff) |
Merge branch 'cleanup' into 'master'
cleanup - rename layout files
See merge request leap/bitmask_android!64
Diffstat (limited to 'app/src/main/res/layout/v_provider_header.xml')
-rw-r--r-- | app/src/main/res/layout/v_provider_header.xml | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/app/src/main/res/layout/v_provider_header.xml b/app/src/main/res/layout/v_provider_header.xml new file mode 100644 index 00000000..6b08976c --- /dev/null +++ b/app/src/main/res/layout/v_provider_header.xml @@ -0,0 +1,22 @@ +<?xml version="1.0" encoding="utf-8"?> +<merge xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto" > + + <android.support.v7.widget.AppCompatImageView + android:id="@+id/provider_header_logo" + android:layout_width="@dimen/bitmask_logo" + android:layout_height="@dimen/bitmask_logo" + android:adjustViewBounds="true" + app:srcCompat="@drawable/mask" /> + + <android.support.v7.widget.AppCompatTextView + android:id="@+id/provider_header_text" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="" + android:textAppearance="@style/Base.TextAppearance.AppCompat.Headline" + android:layout_marginTop="@dimen/standard_margin" + android:layout_marginBottom="@dimen/standard_margin" + /> + +</merge> |