Disconnect button on item toolbar
This commit is contained in:
parent
e832e5139b
commit
327da05ac0
@ -29,7 +29,7 @@
|
|||||||
|
|
||||||
<activity
|
<activity
|
||||||
android:name=".view.PropertiesActivity"
|
android:name=".view.PropertiesActivity"
|
||||||
android:theme="@style/Theme.MyRealEstateAgency"></activity>
|
android:theme="@style/Theme.MyRealEstateAgency.NoActionBar"></activity>
|
||||||
|
|
||||||
<activity
|
<activity
|
||||||
android:name=".view.AddPropertyActivity"
|
android:name=".view.AddPropertyActivity"
|
||||||
|
|||||||
@ -2,10 +2,15 @@ package fr.romanet.vj.apps.myrealestateagency.view;
|
|||||||
|
|
||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
import android.os.Bundle;
|
import android.os.Bundle;
|
||||||
|
import android.view.Menu;
|
||||||
|
import android.view.MenuItem;
|
||||||
import android.view.View;
|
import android.view.View;
|
||||||
|
|
||||||
import android.view.View.OnClickListener;
|
import android.view.View.OnClickListener;
|
||||||
|
|
||||||
|
import androidx.annotation.NonNull;
|
||||||
import androidx.appcompat.app.AppCompatActivity;
|
import androidx.appcompat.app.AppCompatActivity;
|
||||||
|
import androidx.appcompat.widget.Toolbar;
|
||||||
import androidx.lifecycle.Observer;
|
import androidx.lifecycle.Observer;
|
||||||
import androidx.lifecycle.ViewModelProvider;
|
import androidx.lifecycle.ViewModelProvider;
|
||||||
import androidx.recyclerview.widget.DividerItemDecoration;
|
import androidx.recyclerview.widget.DividerItemDecoration;
|
||||||
@ -41,6 +46,10 @@ public class PropertiesActivity extends AppCompatActivity implements OnClickList
|
|||||||
recyclerView.addItemDecoration(new DividerItemDecoration(this, DividerItemDecoration.VERTICAL));
|
recyclerView.addItemDecoration(new DividerItemDecoration(this, DividerItemDecoration.VERTICAL));
|
||||||
findViewById(R.id.buttonAddProperty).setOnClickListener(this);
|
findViewById(R.id.buttonAddProperty).setOnClickListener(this);
|
||||||
agency = (Agency) getIntent().getSerializableExtra("agencyExtra");
|
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);
|
viewModel = new ViewModelProvider(this, new PropertiesActivityViewModelFactory(this.getApplication(), agency)).get(PropertiesActivityViewModel.class);
|
||||||
observeProperties();
|
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
|
@Override
|
||||||
protected void onResume()
|
protected void onResume()
|
||||||
{
|
{
|
||||||
|
|||||||
@ -6,26 +6,36 @@
|
|||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="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
|
<androidx.recyclerview.widget.RecyclerView
|
||||||
android:id="@+id/recyclerViewProperties"
|
android:id="@+id/recyclerViewProperties"
|
||||||
android:layout_width="0dp"
|
android:layout_width="411dp"
|
||||||
android:layout_height="0dp"
|
android:layout_height="670dp"
|
||||||
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
|
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
|
||||||
app:layout_constraintBottom_toBottomOf="parent"
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
|
app:layout_constraintHorizontal_bias="0.0"
|
||||||
app:layout_constraintStart_toStartOf="parent"
|
app:layout_constraintStart_toStartOf="parent"
|
||||||
app:layout_constraintTop_toTopOf="parent"
|
app:layout_constraintTop_toBottomOf="@+id/toolbarDisconnect" />
|
||||||
/>
|
|
||||||
|
|
||||||
<com.google.android.material.floatingactionbutton.FloatingActionButton
|
<com.google.android.material.floatingactionbutton.FloatingActionButton
|
||||||
android:id="@+id/buttonAddProperty"
|
android:id="@+id/buttonAddProperty"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
|
android:layout_margin="12dp"
|
||||||
android:src="@drawable/ic_agency_add"
|
android:src="@drawable/ic_agency_add"
|
||||||
app:backgroundTint="@color/white"
|
app:backgroundTint="@color/white"
|
||||||
app:fabSize="normal"
|
app:fabSize="normal"
|
||||||
android:layout_margin="12dp"
|
|
||||||
app:layout_constraintBottom_toBottomOf="parent"
|
app:layout_constraintBottom_toBottomOf="parent"
|
||||||
app:layout_constraintEnd_toEndOf="parent"
|
app:layout_constraintEnd_toEndOf="parent"
|
||||||
/>
|
app:layout_constraintStart_toStartOf="parent" />
|
||||||
</androidx.constraintlayout.widget.ConstraintLayout>
|
</androidx.constraintlayout.widget.ConstraintLayout>
|
||||||
9
app/src/main/res/menu/item_disconnect.xml
Normal file
9
app/src/main/res/menu/item_disconnect.xml
Normal file
@ -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>
|
||||||
@ -13,6 +13,7 @@
|
|||||||
<string name="surface">Surface</string>
|
<string name="surface">Surface</string>
|
||||||
<string name="statueSale">Statue</string>
|
<string name="statueSale">Statue</string>
|
||||||
<string name="soldDate">Date of Sold</string>
|
<string name="soldDate">Date of Sold</string>
|
||||||
|
<string name="deleteItem">Disconnect</string>
|
||||||
<string name="latitude">Latitude</string>
|
<string name="latitude">Latitude</string>
|
||||||
<string name="longitude">Longitude</string>
|
<string name="longitude">Longitude</string>
|
||||||
<string name="cannot_add_property">Cannot add the property</string>
|
<string name="cannot_add_property">Cannot add the property</string>
|
||||||
|
|||||||
@ -12,4 +12,12 @@
|
|||||||
<item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
|
<item name="android:statusBarColor" tools:targetApi="l">?attr/colorPrimaryVariant</item>
|
||||||
<!-- Customize your theme here. -->
|
<!-- Customize your theme here. -->
|
||||||
</style>
|
</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>
|
</resources>
|
||||||
Loading…
Reference in New Issue
Block a user