create custom UI classes navigation drawer entries

7 files changed, 228 insertions, 6 deletions

diff --git a/app/src/main/java/se/leap/bitmaskclient/views/IconSwitchEntry.java b/app/src/main/java/se/leap/bitmaskclient/views/IconSwitchEntry.java
new file mode 100644
index 00000000..82e02a6e
--- /dev/null
+++ b/app/src/main/java/se/leap/bitmaskclient/views/IconSwitchEntry.java
@@ -0,0 +1,96 @@
+package se.leap.bitmaskclient.views;
+
+import android.annotation.TargetApi;
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.drawable.Drawable;
+import android.support.annotation.DrawableRes;
+import android.support.annotation.Nullable;
+import android.support.annotation.StringRes;
+import android.support.v7.widget.SwitchCompat;
+import android.util.AttributeSet;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.CompoundButton;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import se.leap.bitmaskclient.R;
+
+public class IconSwitchEntry extends LinearLayout {
+
+    private TextView textView;
+    private ImageView iconView;
+    private SwitchCompat switchView;
+    private CompoundButton.OnCheckedChangeListener checkedChangeListener;
+
+    public IconSwitchEntry(Context context) {
+        super(context);
+        initLayout(context, null);
+    }
+
+    public IconSwitchEntry(Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+        initLayout(context, attrs);
+    }
+
+    public IconSwitchEntry(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        initLayout(context, attrs);
+    }
+
+    @TargetApi(21)
+    public IconSwitchEntry(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+        initLayout(context, attrs);
+    }
+
+    void initLayout(Context context, AttributeSet attrs) {
+        LayoutInflater inflater = (LayoutInflater) context
+                .getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+        View rootview = inflater.inflate(R.layout.v_switch_list_item, this, true);
+        textView = rootview.findViewById(android.R.id.text1);
+        iconView = rootview.findViewById(R.id.material_icon);
+        switchView = rootview.findViewById(R.id.option_switch);
+
+        if (attrs != null) {
+            TypedArray typedArray = context.obtainStyledAttributes(attrs, R.styleable.IconSwitchEntry);
+
+            String entryText = typedArray.getString(R.styleable.IconTextEntry_text);
+            if (entryText != null) {
+                textView.setText(entryText);
+            }
+
+            Drawable drawable = typedArray.getDrawable(R.styleable.IconTextEntry_icon);
+            if (drawable != null) {
+                iconView.setImageDrawable(drawable);
+            }
+
+            typedArray.recycle();
+        }
+    }
+
+    public void setOnCheckedChangeListener(CompoundButton.OnCheckedChangeListener listener) {
+        checkedChangeListener = listener;
+        switchView.setOnCheckedChangeListener(checkedChangeListener);
+    }
+
+    public void setText(@StringRes int id) {
+        textView.setText(id);
+    }
+
+    public void setIcon(@DrawableRes int id) {
+        iconView.setImageResource(id);
+    }
+
+    public void setChecked(boolean isChecked) {
+        switchView.setChecked(isChecked);
+    }
+
+    public void setCheckedQuietly(boolean isChecked) {
+        switchView.setOnCheckedChangeListener(null);
+        switchView.setChecked(isChecked);
+        switchView.setOnCheckedChangeListener(checkedChangeListener);
+    }
+}
diff --git a/app/src/main/java/se/leap/bitmaskclient/views/IconTextEntry.java b/app/src/main/java/se/leap/bitmaskclient/views/IconTextEntry.java
new file mode 100644
index 00000000..5689f429
--- /dev/null
+++ b/app/src/main/java/se/leap/bitmaskclient/views/IconTextEntry.java
@@ -0,0 +1,84 @@
+package se.leap.bitmaskclient.views;
+
+import android.annotation.TargetApi;
+import android.content.Context;
+import android.content.res.TypedArray;
+import android.graphics.drawable.Drawable;
+import android.support.annotation.DrawableRes;
+import android.support.annotation.Nullable;
+import android.support.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 se.leap.bitmaskclient.R;
+
+
+public class IconTextEntry extends LinearLayout {
+
+    private TextView textView;
+    private ImageView iconView;
+
+    public IconTextEntry(Context context) {
+        super(context);
+        initLayout(context, null);
+    }
+
+    public IconTextEntry(Context context, @Nullable AttributeSet attrs) {
+        super(context, attrs);
+        initLayout(context, attrs);
+    }
+
+    public IconTextEntry(Context context, @Nullable AttributeSet attrs, int defStyleAttr) {
+        super(context, attrs, defStyleAttr);
+        initLayout(context, attrs);
+    }
+
+    @TargetApi(21)
+    public IconTextEntry(Context context, AttributeSet attrs, int defStyleAttr, int defStyleRes) {
+        super(context, attrs, defStyleAttr, defStyleRes);
+        initLayout(context, attrs);
+    }
+
+    void initLayout(Context context, AttributeSet attrs) {
+        LayoutInflater inflater = (LayoutInflater) context
+                .getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+        View rootview = inflater.inflate(R.layout.v_icon_text_list_item, this, true);
+        textView = rootview.findViewById(android.R.id.text1);
+        iconView = rootview.findViewById(R.id.material_icon);
+
+        if (attrs != null) {
+            TypedArray typedArray = context.obtainStyledAttributes(attrs, R.styleable.IconTextEntry);
+
+            String entryText = typedArray.getString(R.styleable.IconTextEntry_text);
+            if (entryText != null) {
+                textView.setText(entryText);
+            }
+
+            Drawable drawable = typedArray.getDrawable(R.styleable.IconTextEntry_icon);
+            if (drawable != null) {
+                iconView.setImageDrawable(drawable);
+            }
+
+            typedArray.recycle();
+        }
+
+
+    }
+
+    public void setText(@StringRes int id) {
+        textView.setText(id);
+    }
+
+    public void setText(CharSequence text) {
+        textView.setText(text);
+    }
+
+    public void setIcon(@DrawableRes int id) {
+        iconView.setImageResource(id);
+    }
+
+}
diff --git a/app/src/main/res/layout-xlarge/v_icon_text_list_item.xml b/app/src/main/res/layout-xlarge/v_icon_text_list_item.xml
index 0192e080..7ecd32a9 100644
--- a/app/src/main/res/layout-xlarge/v_icon_text_list_item.xml
+++ b/app/src/main/res/layout-xlarge/v_icon_text_list_item.xml
@@ -1,6 +1,6 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/item_container"
-    android:layout_height="wrap_content"
+    android:layout_height="?android:attr/listPreferredItemHeight"
     android:layout_width="match_parent"
     android:orientation="horizontal"
     xmlns:tools="http://schemas.android.com/tools">
@@ -27,6 +27,14 @@
         android:paddingRight="?android:attr/listPreferredItemPaddingRight"
         android:minHeight="?android:attr/listPreferredItemHeight"
         tools:text="TEST"
+        android:layout_toEndOf="@id/material_icon"
+        android:layout_toRightOf="@+id/material_icon"
         />
 
-</LinearLayout>
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1px"
+        android:background="@android:color/darker_gray"
+        android:layout_alignParentBottom="true"
+        />
+</RelativeLayout>
diff --git a/app/src/main/res/layout-xlarge/v_switch_list_item.xml b/app/src/main/res/layout-xlarge/v_switch_list_item.xml
index d692070e..68f63dc1 100644
--- a/app/src/main/res/layout-xlarge/v_switch_list_item.xml
+++ b/app/src/main/res/layout-xlarge/v_switch_list_item.xml
@@ -45,4 +45,10 @@
         android:minHeight="?android:attr/listPreferredItemHeight"
         android:checked="false"
         tools:text="" />
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1px"
+        android:background="@android:color/darker_gray"
+        android:layout_alignParentBottom="true"
+        />
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/v_icon_text_list_item.xml b/app/src/main/res/layout/v_icon_text_list_item.xml
index 0631b2fc..d34baeb6 100644
--- a/app/src/main/res/layout/v_icon_text_list_item.xml
+++ b/app/src/main/res/layout/v_icon_text_list_item.xml
@@ -1,6 +1,6 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/item_container"
-    android:layout_height="wrap_content"
+    android:layout_height="?android:attr/listPreferredItemHeightSmall"
     android:layout_width="match_parent"
     android:orientation="horizontal"
     xmlns:tools="http://schemas.android.com/tools">
@@ -26,6 +26,14 @@
         android:paddingRight="?android:attr/listPreferredItemPaddingRight"
         android:minHeight="?android:attr/listPreferredItemHeightSmall"
         tools:text="TEST"
+        android:layout_toEndOf="@id/material_icon"
+        android:layout_toRightOf="@+id/material_icon"
         />
 
-</LinearLayout>
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1px"
+        android:background="@android:color/darker_gray"
+        android:layout_alignParentBottom="true"
+        />
+</RelativeLayout>
diff --git a/app/src/main/res/layout/v_switch_list_item.xml b/app/src/main/res/layout/v_switch_list_item.xml
index 26060a73..de0e4f36 100644
--- a/app/src/main/res/layout/v_switch_list_item.xml
+++ b/app/src/main/res/layout/v_switch_list_item.xml
@@ -45,4 +45,11 @@
         android:minHeight="?android:attr/listPreferredItemHeightSmall"
         android:checked="false"
         tools:text="" />
+
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1px"
+        android:background="@android:color/darker_gray"
+        android:layout_alignParentBottom="true"
+        />
 </RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index eb9626bc..66a351ae 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -1,6 +1,19 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
+    <!--TODO: check that it's not needed and throw it out!-->
     <declare-styleable name="foo">
         <attr name="textColorError" format="color" />
     </declare-styleable>
+
+    <attr name="text" format="string|reference"/>
+    <attr name="icon" format="reference"/>
+    <declare-styleable name="IconSwitchEntry">
+        <attr name="text"/>
+        <attr name="icon"/>
+    </declare-styleable>
+
+    <declare-styleable name="IconTextEntry">
+        <attr name="text"/>
+        <attr name="icon"/>
+    </declare-styleable>
 </resources>
\ No newline at end of file