bug fixes to work/study and groceries

Sakari De-Meis · Sakari De-Meis · commit deba852d48ef · 2018-12-30T17:08:03.000+01:00
diff --git a/app/build.gradle b/app/build.gradle
@@ -10,8 +10,8 @@ android {
         applicationId "app.bluecoral.MinimaLista"
         minSdkVersion 21
         targetSdkVersion 28
-        versionCode 2
-        versionName "1.0.1"
+        versionCode 4
+        versionName "1.0.4"
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
     }
     buildTypes {
diff --git a/app/src/main/java/app/bluecoral/MinimaLista/CreateModel/CleanSheetToDoActivity.kt b/app/src/main/java/app/bluecoral/MinimaLista/CreateModel/CleanSheetToDoActivity.kt
@@ -10,8 +10,7 @@ class CleanSheetToDoActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(R.layout.activity_create_clean_sheet_todo
-        )
+        setContentView(R.layout.activity_create_clean_sheet_todo)
 
         saveButton.setOnClickListener {
             var title = ""
diff --git a/app/src/main/java/app/bluecoral/MinimaLista/CreateModel/GroceriesToDoActivity.kt b/app/src/main/java/app/bluecoral/MinimaLista/CreateModel/GroceriesToDoActivity.kt
@@ -4,7 +4,6 @@ import android.content.Context
 import android.os.Bundle
 import android.support.v7.app.AppCompatActivity
 import app.bluecoral.MinimaLista.R
-import kotlinx.android.synthetic.main.activity_create_friends_family_todo.*
 import kotlinx.android.synthetic.main.activity_create_groceries_todo.*
 
 class GroceriesToDoActivity : AppCompatActivity() {
diff --git a/app/src/main/java/app/bluecoral/MinimaLista/CreateModel/MyDayToDoActivity.kt b/app/src/main/java/app/bluecoral/MinimaLista/CreateModel/MyDayToDoActivity.kt
@@ -10,9 +10,7 @@ class MyDayToDoActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(
-            R.layout.activity_create_my_day_todo
-        )
+        setContentView(R.layout.activity_create_my_day_todo)
 
         saveButton.setOnClickListener {
             var title = ""
diff --git a/app/src/main/java/app/bluecoral/MinimaLista/CreateModel/MyWallToDoActivity.kt b/app/src/main/java/app/bluecoral/MinimaLista/CreateModel/MyWallToDoActivity.kt
@@ -10,9 +10,7 @@ class MyWallToDoActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(
-            R.layout.activity_create_my_wall_todo
-        )
+        setContentView(R.layout.activity_create_my_wall_todo)
 
         saveButton.setOnClickListener {
             var title = ""
diff --git a/app/src/main/java/app/bluecoral/MinimaLista/CreateModel/MyWeekendToDoActivity.kt b/app/src/main/java/app/bluecoral/MinimaLista/CreateModel/MyWeekendToDoActivity.kt
@@ -10,9 +10,7 @@ class MyWeekendToDoActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(
-            R.layout.activity_create_my_weekend_todo
-        )
+        setContentView(R.layout.activity_create_my_weekend_todo)
 
         saveButton.setOnClickListener {
             var title = ""
diff --git a/app/src/main/java/app/bluecoral/MinimaLista/CreateModel/OtherToDoActivity.kt b/app/src/main/java/app/bluecoral/MinimaLista/CreateModel/OtherToDoActivity.kt
@@ -10,9 +10,7 @@ class OtherToDoActivity : AppCompatActivity() {
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
-        setContentView(
-            R.layout.activity_create_other_todo
-        )
+        setContentView(R.layout.activity_create_other_todo)
 
         saveButton.setOnClickListener {
             var title = ""
diff --git a/app/src/main/java/app/bluecoral/MinimaLista/CreateModel/WorkStudyToDoActivity.kt b/app/src/main/java/app/bluecoral/MinimaLista/CreateModel/WorkStudyToDoActivity.kt
@@ -4,18 +4,16 @@ import android.content.Context
 import android.os.Bundle
 import android.support.v7.app.AppCompatActivity
 import app.bluecoral.MinimaLista.R
-import kotlinx.android.synthetic.main.activity_create_home_bills_todo.*
 import kotlinx.android.synthetic.main.activity_create_work_study_todo.*
 
 class WorkStudyToDoActivity : AppCompatActivity() {
-
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_create_work_study_todo)
 
         saveButton.setOnClickListener {
             var title = ""
-            if (importantCheckBox1.isChecked) {
+            if (importantCheckBox.isChecked) {
                 title = "❗️️️️ " + titleEditText.text.toString()
             } else {
                 title = titleEditText.text.toString()
@@ -29,3 +27,4 @@ class WorkStudyToDoActivity : AppCompatActivity() {
         }
     }
 }
+
diff --git a/app/src/main/java/app/bluecoral/MinimaLista/TodoModel/WorkStudyActivity.kt b/app/src/main/java/app/bluecoral/MinimaLista/TodoModel/WorkStudyActivity.kt
@@ -7,7 +7,9 @@ import android.support.v7.app.AppCompatActivity;
 import android.support.v7.widget.LinearLayoutManager
 import android.view.Menu
 import android.view.MenuItem
+import app.bluecoral.MinimaLista.Adapter.HomeBillsAdapter
 import app.bluecoral.MinimaLista.Adapter.WorkStudyAdapter
+import app.bluecoral.MinimaLista.CreateModel.HomeBillsToDoActivity
 import app.bluecoral.MinimaLista.CreateModel.WorkStudyToDoActivity
 import app.bluecoral.MinimaLista.R
 
@@ -53,8 +55,7 @@ class WorkStudyActivity : AppCompatActivity() {
 
         if (item.itemId == R.id.action_delete_all) {
             var prefs = getSharedPreferences(getString(
-                R.string.SHARED_PREF_NAME
-            ), Context.MODE_PRIVATE)
+                R.string.SHARED_PREF_NAME), Context.MODE_PRIVATE)
             prefs.edit().putStringSet(getString(R.string.TODO_STRINGS4), null).apply()
             updateRecycler()
 
diff --git a/app/src/main/res/layout/activity_clean_sheet_todo.xml b/app/src/main/res/layout/activity_clean_sheet_todo.xml
@@ -32,5 +32,5 @@
             android:layout_gravity="bottom|end"
             android:layout_margin="@dimen/fab_margin"
             android:src="@drawable/ic_add_white_24dp"
-            app:backgroundTint="@color/colorAccent6"/>
+            app:backgroundTint="@color/colorAccent"/>
 </android.support.design.widget.CoordinatorLayout>
diff --git a/app/src/main/res/layout/activity_create_groceries_todo.xml b/app/src/main/res/layout/activity_create_groceries_todo.xml
@@ -11,7 +11,7 @@
             android:layout_height="wrap_content"
             android:inputType="textPersonName"
             android:ems="10"
-            android:id="@+id/titleEditText2"
+            android:id="@+id/titleEditText"
             android:hint="Title"
             app:layout_constraintStart_toStartOf="parent"
             android:layout_marginStart="16dp"
@@ -24,19 +24,19 @@
             android:text="Important"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            app:layout_constraintStart_toStartOf="@+id/titleEditText2"
-            android:id="@+id/importantCheckBox2"
+            app:layout_constraintStart_toStartOf="@+id/titleEditText"
+            android:id="@+id/importantCheckBox"
             android:textSize="24sp"
             android:layout_marginTop="16dp"
-            app:layout_constraintTop_toBottomOf="@+id/titleEditText2"/>
+            app:layout_constraintTop_toBottomOf="@+id/titleEditText"/>
     <Button
             android:text="Save"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            app:layout_constraintStart_toStartOf="@+id/importantCheckBox2"
-            android:id="@+id/saveButton2"
+            app:layout_constraintStart_toStartOf="@+id/importantCheckBox"
+            android:id="@+id/saveButton"
             android:layout_marginTop="16dp"
-            app:layout_constraintTop_toBottomOf="@+id/importantCheckBox2"
+            app:layout_constraintTop_toBottomOf="@+id/importantCheckBox"
             android:background="@color/colorAccent3"
             android:textColorLink="@color/colorAccent3"/>
 </android.support.constraint.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_create_work_study_todo.xml b/app/src/main/res/layout/activity_create_work_study_todo.xml
@@ -11,7 +11,7 @@
             android:layout_height="wrap_content"
             android:inputType="textPersonName"
             android:ems="10"
-            android:id="@+id/titleEditText1"
+            android:id="@+id/titleEditText"
             android:hint="Title"
             app:layout_constraintStart_toStartOf="parent"
             android:layout_marginStart="16dp"
@@ -24,19 +24,19 @@
             android:text="Important"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            app:layout_constraintStart_toStartOf="@+id/titleEditText1"
-            android:id="@+id/importantCheckBox1"
+            app:layout_constraintStart_toStartOf="@+id/titleEditText"
+            android:id="@+id/importantCheckBox"
             android:textSize="24sp"
             android:layout_marginTop="16dp"
-            app:layout_constraintTop_toBottomOf="@+id/titleEditText1"/>
+            app:layout_constraintTop_toBottomOf="@+id/titleEditText"/>
     <Button
             android:text="Save"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            app:layout_constraintStart_toStartOf="@+id/importantCheckBox1"
-            android:id="@+id/saveButton1"
+            app:layout_constraintStart_toStartOf="@+id/importantCheckBox"
+            android:id="@+id/saveButton"
             android:layout_marginTop="16dp"
-            app:layout_constraintTop_toBottomOf="@+id/importantCheckBox1"
+            app:layout_constraintTop_toBottomOf="@+id/importantCheckBox"
             android:background="@color/colorAccent2"
             android:textColorLink="@color/colorAccent2"/>
 </android.support.constraint.ConstraintLayout>
diff --git a/app/src/main/res/layout/activity_main_list.xml b/app/src/main/res/layout/activity_main_list.xml
@@ -24,8 +24,6 @@
                 android:background="@android:color/white">
 
         <android.support.v7.widget.CardView
-                xmlns:android="http://schemas.android.com/apk/res/android"
-                xmlns:app="http://schemas.android.com/apk/res-auto"
                 android:layout_width="0dp"
                 android:layout_height="210dp"
                 app:cardElevation="20dp"
@@ -63,8 +61,6 @@
         </android.support.v7.widget.CardView>
 
         <android.support.v7.widget.CardView
-                xmlns:android="http://schemas.android.com/apk/res/android"
-                xmlns:app="http://schemas.android.com/apk/res-auto"
                 android:layout_width="0dp"
                 android:layout_height="210dp"
                 app:cardElevation="20dp"
@@ -102,8 +98,6 @@
         </android.support.v7.widget.CardView>
 
         <android.support.v7.widget.CardView
-                xmlns:android="http://schemas.android.com/apk/res/android"
-                xmlns:app="http://schemas.android.com/apk/res-auto"
                 android:layout_width="0dp"
                 app:cardElevation="20dp"
                 android:layout_marginLeft="15dp"
@@ -141,8 +135,6 @@
         </android.support.v7.widget.CardView>
 
         <android.support.v7.widget.CardView
-                xmlns:android="http://schemas.android.com/apk/res/android"
-                xmlns:app="http://schemas.android.com/apk/res-auto"
                 android:layout_width="0dp"
                 android:layout_height="210dp"
                 app:cardElevation="20dp"
@@ -180,8 +172,6 @@
         </android.support.v7.widget.CardView>
 
         <android.support.v7.widget.CardView
-                xmlns:android="http://schemas.android.com/apk/res/android"
-                xmlns:app="http://schemas.android.com/apk/res-auto"
                 android:layout_width="0dp"
                 android:layout_height="210dp"
                 app:cardElevation="20dp"
@@ -219,8 +209,6 @@
         </android.support.v7.widget.CardView>
 
         <android.support.v7.widget.CardView
-                xmlns:android="http://schemas.android.com/apk/res/android"
-                xmlns:app="http://schemas.android.com/apk/res-auto"
                 android:layout_width="0dp"
                 android:layout_height="210dp"
                 app:cardElevation="20dp"
@@ -258,8 +246,6 @@
         </android.support.v7.widget.CardView>
 
         <android.support.v7.widget.CardView
-                xmlns:android="http://schemas.android.com/apk/res/android"
-                xmlns:app="http://schemas.android.com/apk/res-auto"
                 android:layout_width="0dp"
                 android:layout_height="210dp"
                 app:cardElevation="20dp"
@@ -297,8 +283,6 @@
         </android.support.v7.widget.CardView>
 
         <android.support.v7.widget.CardView
-                xmlns:android="http://schemas.android.com/apk/res/android"
-                xmlns:app="http://schemas.android.com/apk/res-auto"
                 android:layout_width="0dp"
                 android:layout_height="210dp"
                 app:cardElevation="20dp"
@@ -336,8 +320,6 @@
         </android.support.v7.widget.CardView>
 
         <android.support.v7.widget.CardView
-                xmlns:android="http://schemas.android.com/apk/res/android"
-                xmlns:app="http://schemas.android.com/apk/res-auto"
                 android:layout_width="0dp"
                 android:layout_height="210dp"
                 app:cardElevation="20dp"
@@ -375,8 +357,6 @@
         </android.support.v7.widget.CardView>
 
         <android.support.v7.widget.CardView
-                xmlns:android="http://schemas.android.com/apk/res/android"
-                xmlns:app="http://schemas.android.com/apk/res-auto"
                 android:layout_width="0dp"
                 android:layout_height="210dp"
                 app:cardElevation="20dp"
diff --git a/app/src/main/res/layout/content_main_list.xml b/app/src/main/res/layout/content_main_list.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<android.support.constraint.ConstraintLayout
+        xmlns:android="http://schemas.android.com/apk/res/android"
+        xmlns:tools="http://schemas.android.com/tools"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
+        tools:layout_editor_absoluteY="81dp"
+        tools:showIn="@layout/activity_main_list"
+        tools:context=".ListModel.MainActivity">
+
+    <android.support.design.widget.AppBarLayout
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:theme="@style/AppTheme">
+
+        <android.support.v7.widget.Toolbar
+                android:id="@+id/toolbar"
+                android:layout_width="match_parent"
+                android:layout_height="?attr/actionBarSize"
+                android:background="@color/colorPrimary"
+                android:popupTheme="@style/AppTheme"
+                android:titleTextColor="@android:color/white"/>
+
+    </android.support.design.widget.AppBarLayout>
+
+    <include layout="@layout/content_my_day"/>
+    <android.support.v7.widget.RecyclerView
+            android:layout_width="0dp"
+            android:layout_height="0dp"
+            android:id="@+id/recyclerView"/>
+</android.support.constraint.ConstraintLayout>
