Add terminate button to termination result view

Author: Julita Barkauskaite

app/src/main/java/stockholm/makerspace/boxterminator/termination/result/TerminationResultActivity.kt

@@ -38,7 +38,7 @@ class TerminationResultActivity : AppCompatActivity(), TerminationResultContract
                 terminationResultBtn.background= resources.getDrawable(R.color.memberBoxMembershipValidSecondary, null)
                 terminationResultBtn.visibility = View.INVISIBLE
                 member_last_nag.visibility = View.INVISIBLE
-
+                termiante_button.visibility = View.GONE
                 member_remaining.text = "${member.expire_date}"
                 member_remaining_sub.text = "Expiration date"
             }
@@ -48,6 +48,7 @@ class TerminationResultActivity : AppCompatActivity(), TerminationResultContract
                 member_remaining_background.background = resources.getDrawable(R.color.memberBoxMembershipInvalid, null)
                 terminationResultBtn.background= resources.getDrawable(R.color.memberBoxMembershipInvalidSecondary, null)
                 terminationResultBtn.visibility = View.VISIBLE
+                termiante_button.visibility = View.GONE
                 member_last_nag.visibility = View.VISIBLE
 
                 val expireDate = DateTime(member.expire_date)
@@ -71,7 +72,6 @@ class TerminationResultActivity : AppCompatActivity(), TerminationResultContract
                 member_validity.imageTintList = resources.getColorStateList(R.color.memberBoxMembershipVeryOld, null)
                 member_remaining_background.background = resources.getDrawable(R.color.memberBoxMembershipVeryOld, null)
                 terminationResultBtn.background = resources.getDrawable(R.color.memberBoxMembershipVeryOldSecondary, null)
-                terminationResultBtn.visibility = View.VISIBLE
                 member_last_nag.visibility = View.VISIBLE
 
                 val expireDate = DateTime(member.expire_date)
@@ -82,9 +82,6 @@ class TerminationResultActivity : AppCompatActivity(), TerminationResultContract
                 terminationResultBtn.apply {
                     setOnClickListener {
                         var nagType = NAG_TYPE_LAST_WARNING
-                        /*if(daysInBetween > 45){
-                            nagType = NAG_TYPE_TERMINATED
-                        }*/
                         presenter.nag(
                             member.member_number,
                             member.box_label_id,
@@ -93,6 +90,17 @@ class TerminationResultActivity : AppCompatActivity(), TerminationResultContract
                     }
                     visibility = View.VISIBLE
                 }
+                termiante_button.apply {
+                    visibility = View.VISIBLE
+                    setOnClickListener {
+                        var nagType = NAG_TYPE_TERMINATED
+                        presenter.nag(
+                            member.member_number,
+                            member.box_label_id,
+                            nagType
+                        )
+                    }
+                }
             }
         }
 

app/src/main/res/layout/termination_result_activity.xml

@@ -19,18 +19,6 @@
                app:layout_constraintDimensionRatio="1:1" android:layout_marginStart="120dp"
                android:layout_marginEnd="120dp" android:layout_marginTop="100dp"></ImageView>
 
-    <android.support.design.widget.AppBarLayout
-            android:layout_height="wrap_content"
-            android:layout_width="match_parent" app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintStart_toStartOf="parent" app:layout_constraintEnd_toEndOf="parent">
-
-        <android.support.v7.widget.Toolbar
-                android:id="@+id/toolbar"
-                android:layout_width="match_parent"
-                android:layout_height="?attr/actionBarSize"
-                android:background="?attr/colorPrimary"/>
-
-    </android.support.design.widget.AppBarLayout>
 
     <TextView
             android:layout_width="match_parent"
@@ -87,7 +75,6 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:text="Nag"
-
             android:textSize="32sp"
             android:textColor="@color/white"
             android:background="@android:color/holo_orange_dark"
@@ -134,5 +121,18 @@
             app:layout_constraintGuide_percent="0.45"
             android:id="@+id/guideline" app:layout_constraintGuide_begin="20dp"
             android:orientation="horizontal"/>
+    <Button
+            android:text="Terminate !!!"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:textSize="32sp"
+            android:textColor="@color/white"
+            android:paddingBottom="16dp"
+            android:paddingTop="16dp"
+            android:background="@color/memberBoxMembershipVeryOldSecondary"
+            android:id="@+id/termiante_button"
+            app:layout_constraintTop_toTopOf="parent" app:layout_constraintEnd_toEndOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+    />
 
 </android.support.constraint.ConstraintLayout>