From 243f26954928933c8b47df85152923e3bbab18c0 Mon Sep 17 00:00:00 2001
From: Phillip Thelen <viirus@pherth.net>
Date: Tue, 14 Jun 2016 15:00:49 +0200
Subject: [PATCH] improve task form display

---
 Habitica/res/layout/row_checklist.xml         | 20 ++++---------------
 .../ui/activities/TaskFormActivity.java       | 16 +++++++--------
 2 files changed, 11 insertions(+), 25 deletions(-)

diff --git a/Habitica/res/layout/row_checklist.xml b/Habitica/res/layout/row_checklist.xml
index fd2f5cc1e..081d7855a 100644
--- a/Habitica/res/layout/row_checklist.xml
+++ b/Habitica/res/layout/row_checklist.xml
@@ -1,22 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<TableRow xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="72dp">
-
-        <TextView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:textAppearance="?android:attr/textAppearanceMedium"
-            android:id="@+id/label"
-            android:layout_alignParentLeft="true"
-            android:layout_centerVertical="true"
-            android:layout_marginTop="11dp" />
-
+        android:layout_height="wrap_content">
         <CheckBox
-            android:layout_width="wrap_content"
+            android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:id="@+id/checkbox"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="true"
             android:layout_marginTop="0dp" />
-</RelativeLayout>
\ No newline at end of file
+</TableRow>
\ No newline at end of file
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.java
index 022b87906..96f48330d 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.java
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/TaskFormActivity.java
@@ -603,13 +603,13 @@ public class TaskFormActivity extends BaseActivity implements AdapterView.OnItem
     private void createTagsCheckBoxes() {
         int position = 0;
         for (Tag tag : tags) {
-            TableRow row = new TableRow(tagsContainerLinearLayout.getContext());
+            TableRow row = (TableRow) getLayoutInflater().inflate(R.layout.row_checklist, this.tagsContainerLinearLayout, false);
+            CheckBox checkbox = (CheckBox) row.findViewById(R.id.checkbox);
             row.setId(position);
-            CheckBox tagsCheckBox = new CheckBox(tagsContainerLinearLayout.getContext());
-            tagsCheckBox.setText(tag.getName()); // set text Name
-            tagsCheckBox.setId(position);
+            checkbox.setText(tag.getName()); // set text Name
+            checkbox.setId(position);
             //This is to check if the tag was selected by the user. Similar to onClickListener
-            tagsCheckBox.setOnCheckedChangeListener((buttonView, isChecked) -> {
+            checkbox.setOnCheckedChangeListener((buttonView, isChecked) -> {
                 if (buttonView.isChecked()) {
                     if (!selectedTags.contains(tag)) {
                         selectedTags.add(tag);
@@ -621,9 +621,8 @@ public class TaskFormActivity extends BaseActivity implements AdapterView.OnItem
                     }
                 }
             });
-            row.addView(tagsCheckBox);
             tagsContainerLinearLayout.addView(row);
-            tagCheckBoxList.add(tagsCheckBox);
+            tagCheckBoxList.add(checkbox);
             position++;
         }
 
@@ -669,11 +668,10 @@ public class TaskFormActivity extends BaseActivity implements AdapterView.OnItem
             String[] weekdays = getResources().getStringArray(R.array.weekdays);
             for (int i = 0; i < 7; i++) {
                 View weekdayRow = getLayoutInflater().inflate(R.layout.row_checklist, this.frequencyContainer, false);
-                TextView tv = (TextView) weekdayRow.findViewById(R.id.label);
                 CheckBox checkbox = (CheckBox) weekdayRow.findViewById(R.id.checkbox);
+                checkbox.setText(weekdays[i]);
                 checkbox.setChecked(true);
                 this.weekdayCheckboxes.add(checkbox);
-                tv.setText(weekdays[i]);
                 this.frequencyContainer.addView(weekdayRow);
             }
         } else {