From 327da05ac0b6eb6634b20bf40ee7735d162d0194 Mon Sep 17 00:00:00 2001
From: BGbaderguet <48762010+BGbaderguet@users.noreply.github.com>
Date: Mon, 4 Jan 2021 00:29:22 +0100
Subject: [PATCH] Disconnect button on item toolbar

---
 app/src/main/AndroidManifest.xml              |  2 +-
 .../view/PropertiesActivity.java              | 25 +++++++++++++++++++
 .../main/res/layout/activity_properties.xml   | 22 +++++++++++-----
 app/src/main/res/menu/item_disconnect.xml     |  9 +++++++
 app/src/main/res/values/strings.xml           |  1 +
 app/src/main/res/values/themes.xml            |  8 ++++++
 6 files changed, 60 insertions(+), 7 deletions(-)
 create mode 100644 app/src/main/res/menu/item_disconnect.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b7a9109..5e015c7 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -29,7 +29,7 @@
 
         <activity
             android:name=".view.PropertiesActivity"
-            android:theme="@style/Theme.MyRealEstateAgency"></activity>
+            android:theme="@style/Theme.MyRealEstateAgency.NoActionBar"></activity>
 
         <activity
             android:name=".view.AddPropertyActivity"
diff --git a/app/src/main/java/fr/romanet/vj/apps/myrealestateagency/view/PropertiesActivity.java b/app/src/main/java/fr/romanet/vj/apps/myrealestateagency/view/PropertiesActivity.java
index 7f2fef6..61865ce 100644
--- a/app/src/main/java/fr/romanet/vj/apps/myrealestateagency/view/PropertiesActivity.java
+++ b/app/src/main/java/fr/romanet/vj/apps/myrealestateagency/view/PropertiesActivity.java
@@ -2,10 +2,15 @@ package fr.romanet.vj.apps.myrealestateagency.view;
 
 import android.content.Intent;
 import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuItem;
 import android.view.View;
 
 import android.view.View.OnClickListener;
+
+import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.appcompat.widget.Toolbar;
 import androidx.lifecycle.Observer;
 import androidx.lifecycle.ViewModelProvider;
 import androidx.recyclerview.widget.DividerItemDecoration;
@@ -41,6 +46,10 @@ public class PropertiesActivity extends AppCompatActivity implements OnClickList
         recyclerView.addItemDecoration(new DividerItemDecoration(this, DividerItemDecoration.VERTICAL));
         findViewById(R.id.buttonAddProperty).setOnClickListener(this);
         agency = (Agency) getIntent().getSerializableExtra("agencyExtra");
+        Toolbar toolbarAddCity = (Toolbar) findViewById(R.id.toolbarDisconnect);
+        toolbarAddCity.setTitle(agency.agencyName);
+        setSupportActionBar(toolbarAddCity);
+
         viewModel = new ViewModelProvider(this, new PropertiesActivityViewModelFactory(this.getApplication(), agency)).get(PropertiesActivityViewModel.class);
         observeProperties();
     }
@@ -58,6 +67,22 @@ public class PropertiesActivity extends AppCompatActivity implements OnClickList
         });
     }
 
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        getMenuInflater().inflate(R.menu.item_disconnect, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(@NonNull MenuItem item)
+    {
+        if (item.getItemId() == R.id.item_disconnect)
+        {
+            finish();
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
     @Override
     protected void onResume()
     {
diff --git a/app/src/main/res/layout/activity_properties.xml b/app/src/main/res/layout/activity_properties.xml
index 91108c0..d2ce2e2 100644
--- a/app/src/main/res/layout/activity_properties.xml
+++ b/app/src/main/res/layout/activity_properties.xml
@@ -6,26 +6,36 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
+    <androidx.appcompat.widget.Toolbar
+        android:id="@+id/toolbarDisconnect"
+        android:layout_width="match_parent"
+        android:layout_height="60dp"
+        android:background="?attr/colorPrimary"
+        app:popupTheme="@style/Theme.MyRealEstateAgency.PopupOverlay"
+        android:clickable="false"
+        android:minHeight="60dp"
+        tools:ignore="MissingConstraints" />
+
     <androidx.recyclerview.widget.RecyclerView
         android:id="@+id/recyclerViewProperties"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
+        android:layout_width="411dp"
+        android:layout_height="670dp"
         app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintHorizontal_bias="0.0"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        />
+        app:layout_constraintTop_toBottomOf="@+id/toolbarDisconnect" />
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/buttonAddProperty"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_margin="12dp"
         android:src="@drawable/ic_agency_add"
         app:backgroundTint="@color/white"
         app:fabSize="normal"
-        android:layout_margin="12dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
-        />
+        app:layout_constraintStart_toStartOf="parent" />
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/item_disconnect.xml b/app/src/main/res/menu/item_disconnect.xml
new file mode 100644
index 0000000..828c9e8
--- /dev/null
+++ b/app/src/main/res/menu/item_disconnect.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:android="http://schemas.android.com/apk/res/android">
+
+    <item
+        android:id="@+id/item_disconnect"
+        android:title="@string/deleteItem"
+        app:showAsAction="never"/>
+</menu>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index cd384bf..7eb26fc 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -13,6 +13,7 @@
     <string name="surface">Surface</string>
     <string name="statueSale">Statue</string>
     <string name="soldDate">Date of Sold</string>
+    <string name="deleteItem">Disconnect</string>
     <string name="latitude">Latitude</string>
     <string name="longitude">Longitude</string>
     <string name="cannot_add_property">Cannot add the property</string>
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index 8aa3541..72b611a 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -12,4 +12,12 @@
         <item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
         <!-- Customize your theme here. -->
     </style>
+
+    <style name="Theme.MyRealEstateAgency.NoActionBar">
+        <item name="windowActionBar">false</item>
+        <item name="windowNoTitle">true</item>
+    </style>
+
+    <style name="Theme.MyRealEstateAgency.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
+    <style name="Theme.MyRealEstateAgency.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
 </resources>
\ No newline at end of file