use SimpleCheckBox in ExcludeAppsFragment

2 files changed, 10 insertions, 20 deletions

diff --git a/app/src/main/java/se/leap/bitmaskclient/base/fragments/ExcludeAppsFragment.java b/app/src/main/java/se/leap/bitmaskclient/base/fragments/ExcludeAppsFragment.java
index db5057cc..04745d42 100644
--- a/app/src/main/java/se/leap/bitmaskclient/base/fragments/ExcludeAppsFragment.java
+++ b/app/src/main/java/se/leap/bitmaskclient/base/fragments/ExcludeAppsFragment.java
@@ -39,11 +39,12 @@ import java.util.Vector;
 import de.blinkt.openvpn.VpnProfile;
 import se.leap.bitmaskclient.R;
 import se.leap.bitmaskclient.base.utils.PreferenceHelper;
+import se.leap.bitmaskclient.base.views.SimpleCheckBox;
 
 /**
  * Created by arne on 16.11.14.
  */
-public class ExcludeAppsFragment extends Fragment implements AdapterView.OnItemClickListener, CompoundButton.OnCheckedChangeListener, View.OnClickListener {
+public class ExcludeAppsFragment extends Fragment implements AdapterView.OnItemClickListener, SimpleCheckBox.OnCheckedChangeListener, View.OnClickListener {
     private ListView mListView;
     private VpnProfile mProfile;
     private PackageAdapter mListAdapter;
@@ -82,7 +83,7 @@ public class ExcludeAppsFragment extends Fragment implements AdapterView.OnItemC
         public ImageView appIcon;
         //public AppCompatTextView appSize;
         //public AppCompatTextView disabled;
-        public CompoundButton checkBox;
+        public SimpleCheckBox checkBox;
 
         static public AppViewHolder createOrRecycle(LayoutInflater inflater, View convertView, ViewGroup parent) {
             if (convertView == null) {
@@ -108,7 +109,7 @@ public class ExcludeAppsFragment extends Fragment implements AdapterView.OnItemC
     }
 
     @Override
-    public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
+    public void onCheckedChanged(SimpleCheckBox buttonView, boolean isChecked) {
         String packageName = (String) buttonView.getTag();
 
         if (isChecked) {
diff --git a/app/src/main/res/layout/allowed_application_layout.xml b/app/src/main/res/layout/allowed_application_layout.xml
index f1556875..61fc12c3 100644
--- a/app/src/main/res/layout/allowed_application_layout.xml
+++ b/app/src/main/res/layout/allowed_application_layout.xml
@@ -23,11 +23,11 @@
         android:layout_rowSpan="1"
         android:layout_marginEnd="8dip"
         android:scaleType="centerInside"
-        tools:background="@drawable/icon"
+        tools:background="@drawable/ic_btn_on_connecting"
         android:contentDescription="@null" />
 
     <androidx.appcompat.widget.AppCompatTextView
-        tools:text="@string/app"
+        tools:text="@string/app_name"
         android:id="@+id/app_name"
         android:layout_width="0dip"
         android:layout_columnSpan="2"
@@ -39,23 +39,12 @@
         android:textAppearance="?android:attr/textAppearanceMedium"
         android:textAlignment="viewStart" />
 
-    <CheckBox android:id="@+id/app_selected"
-        android:layout_marginStart="8dip"
+    <se.leap.bitmaskclient.base.views.SimpleCheckBox
+        android:id="@+id/app_selected"
+        android:layout_height="32dp"
+        android:layout_width="32dp"
         android:layout_gravity="center_vertical"
         android:layout_rowSpan="1"
         android:visibility="visible" />
 
-<!--    <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/app_size"
-        android:layout_width="0dip"
-        android:layout_gravity="fill_horizontal|top"
-        android:textAppearance="?android:attr/textAppearanceSmall"
-        android:textAlignment="viewStart" /> -->
-
-    <!-- <androidx.appcompat.widget.AppCompatTextView
-        android:id="@+id/app_disabled"
-        android:layout_marginStart="8dip"
-        android:layout_gravity="top"
-        android:textAppearance="?android:attr/textAppearanceSmall" /> -->
-
 </GridLayout>
\ No newline at end of file