From f178bcbdd2bb921a866a098f6ce178c5a4e1781b Mon Sep 17 00:00:00 2001
From: Alinson Xavier <axavier@uwaterloo.ca>
Date: Sat, 3 Sep 2016 08:00:36 -0400
Subject: [PATCH] CheckmarkButtonView: avoid layout inflation

---
 .../list/views/CheckmarkButtonView.java       | 32 ++++++++-----------
 .../res/layout/list_habits_card_checkmark.xml | 23 -------------
 2 files changed, 14 insertions(+), 41 deletions(-)
 delete mode 100644 app/src/main/res/layout/list_habits_card_checkmark.xml

diff --git a/app/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkButtonView.java b/app/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkButtonView.java
index 69356f1ed..2b28f0a41 100644
--- a/app/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkButtonView.java
+++ b/app/src/main/java/org/isoron/uhabits/activities/habits/list/views/CheckmarkButtonView.java
@@ -25,21 +25,16 @@ import android.view.*;
 import android.widget.*;
 
 import org.isoron.uhabits.*;
-import org.isoron.uhabits.models.*;
 import org.isoron.uhabits.activities.habits.list.controllers.*;
+import org.isoron.uhabits.models.*;
 import org.isoron.uhabits.utils.*;
 
-import butterknife.*;
-
-public class CheckmarkButtonView extends FrameLayout
+public class CheckmarkButtonView extends TextView
 {
     private int color;
 
     private int value;
 
-    @BindView(R.id.tvCheck)
-    TextView tvCheck;
-
     private StyledResources res;
 
     public CheckmarkButtonView(Context context)
@@ -82,20 +77,20 @@ public class CheckmarkButtonView extends FrameLayout
 
         if (value == Checkmark.CHECKED_EXPLICITLY)
         {
-            tvCheck.setText(R.string.fa_check);
-            tvCheck.setTextColor(color);
+            setText(R.string.fa_check);
+            setTextColor(color);
         }
 
         if (value == Checkmark.CHECKED_IMPLICITLY)
         {
-            tvCheck.setText(R.string.fa_check);
-            tvCheck.setTextColor(lowContrastColor);
+            setText(R.string.fa_check);
+            setTextColor(lowContrastColor);
         }
 
         if (value == Checkmark.UNCHECKED)
         {
-            tvCheck.setText(R.string.fa_times);
-            tvCheck.setTextColor(lowContrastColor);
+            setText(R.string.fa_times);
+            setTextColor(lowContrastColor);
         }
 
         super.onDraw(canvas);
@@ -103,15 +98,16 @@ public class CheckmarkButtonView extends FrameLayout
 
     private void init()
     {
-        addView(
-            inflate(getContext(), R.layout.list_habits_card_checkmark, null));
-        ButterKnife.bind(this);
-
         res = new StyledResources(getContext());
 
         setWillNotDraw(false);
         setHapticFeedbackEnabled(false);
 
-        tvCheck.setTypeface(InterfaceUtils.getFontAwesome(getContext()));
+        setMinHeight(getResources().getDimensionPixelSize(R.dimen.checkmarkHeight));
+        setMinWidth(getResources().getDimensionPixelSize(R.dimen.checkmarkWidth));
+
+        setFocusable(false);
+        setGravity(Gravity.CENTER);
+        setTypeface(InterfaceUtils.getFontAwesome(getContext()));
     }
 }
diff --git a/app/src/main/res/layout/list_habits_card_checkmark.xml b/app/src/main/res/layout/list_habits_card_checkmark.xml
deleted file mode 100644
index 80372031c..000000000
--- a/app/src/main/res/layout/list_habits_card_checkmark.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2016 Álinson Santos Xavier <isoron@gmail.com>
-  ~
-  ~ This file is part of Loop Habit Tracker.
-  ~
-  ~ Loop Habit Tracker is free software: you can redistribute it and/or modify
-  ~ it under the terms of the GNU General Public License as published by the
-  ~ Free Software Foundation, either version 3 of the License, or (at your
-  ~ option) any later version.
-  ~
-  ~ Loop Habit Tracker is distributed in the hope that it will be useful, but
-  ~ WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY
-  ~ or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for
-  ~ more details.
-  ~
-  ~ You should have received a copy of the GNU General Public License along
-  ~ with this program. If not, see <http://www.gnu.org/licenses/>.
-  -->
-
-<TextView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/tvCheck"
-    style="@style/ListHabits.Checkmark" />