Merge branch 'master' into fix/local-db-file-iteration

SDPepe · Jun 4, 2021 · 50a8e9f · 50a8e9f
2 parents e291ff1 + d4a9679
commit 50a8e9f
Show file tree

Hide file tree

Showing 7 changed files with 54 additions and 2 deletions.
diff --git a/app/src/main/java/ch/epfl/sdp/appart/FavoriteActivity.java b/app/src/main/java/ch/epfl/sdp/appart/FavoriteActivity.java
@@ -4,6 +4,8 @@
 import android.os.Bundle;
 import android.util.Log;
 import android.util.Pair;
+import android.view.Menu;
+import android.view.MenuItem;
 
 import androidx.appcompat.widget.Toolbar;
 import androidx.lifecycle.ViewModelProvider;
@@ -37,6 +39,15 @@ public class FavoriteActivity extends ToolbarActivity {
     private RecyclerView recyclerView;
     private FavoriteViewModel mViewModel;
 
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        super.onCreateOptionsMenu(menu);
+        MenuItem item = menu.findItem(R.id.action_favorite);
+        item.setVisible(false);
+        invalidateOptionsMenu();
+        return true;
+    }
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);

diff --git a/app/src/main/java/ch/epfl/sdp/appart/ScrollingActivity.java b/app/src/main/java/ch/epfl/sdp/appart/ScrollingActivity.java
@@ -8,6 +8,7 @@
 import android.text.Editable;
 import android.text.TextWatcher;
 import android.util.Log;
+import android.view.Menu;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.Button;
@@ -68,6 +69,16 @@ public class ScrollingActivity extends ToolbarActivity {
 
     private AlertDialog onBackPressed;
 
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        super.onCreateOptionsMenu(menu);
+        MenuItem item = menu.findItem(R.id.action_home_sweet_home);
+        item.setEnabled(false);
+        item.setVisible(false);
+        invalidateOptionsMenu();
+        return true;
+    }
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -97,6 +108,7 @@ protected void onCreate(Bundle savedInstanceState) {
         //if something is pressed return the result of the real toolbar
         navigationView.setNavigationItemSelectedListener(this::onOptionsItemSelected);
         drawerLayout = findViewById(R.id.drawer_layout);
+        navigationView.getMenu().findItem(R.id.action_home_sweet_home).setVisible(false);
         Toolbar toolbar = findViewById(R.id.login_Scrolling_toolbar);
         setSupportActionBar(toolbar);
 

diff --git a/app/src/main/java/ch/epfl/sdp/appart/ToolbarActivity.java b/app/src/main/java/ch/epfl/sdp/appart/ToolbarActivity.java
@@ -36,7 +36,6 @@ public abstract class ToolbarActivity extends AppCompatActivity {
     LocalDatabaseService localdb;
 
 
-
     /**
      * Sets the toolbar as the main menu
      *
@@ -95,7 +94,10 @@ public boolean onOptionsItemSelected(MenuItem item) {
                 Intent intentStepCounter = new Intent(this, StepCounterActivity.class);
                 startActivity(intentStepCounter);
                 return true;
-
+            case R.id.action_home_sweet_home:
+                Intent scrollingActivity = new Intent(this, ScrollingActivity.class);
+                startActivity(scrollingActivity);
+                return true;
             // If we got here, the user's action was not recognized.
             // Invoke the superclass to handle it.
             default:

diff --git a/app/src/main/java/ch/epfl/sdp/appart/UserAdsActivity.java b/app/src/main/java/ch/epfl/sdp/appart/UserAdsActivity.java
@@ -10,6 +10,10 @@
 import dagger.hilt.android.AndroidEntryPoint;
 
 import android.os.Bundle;
+import android.view.Menu;
+import android.view.MenuInflater;
+import android.view.MenuItem;
+import android.view.View;
 
 import java.util.ArrayList;
 import java.util.List;
@@ -23,13 +27,24 @@ public class UserAdsActivity extends ToolbarActivity {
     DatabaseService database;
     private RecyclerView recyclerView;
 
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+        super.onCreateOptionsMenu(menu);
+        MenuItem item = menu.findItem(R.id.action_userAds);
+        item.setVisible(false);
+        invalidateOptionsMenu();
+        return true;
+    }
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_user_ads);
 
         Toolbar toolbar = findViewById(R.id.UserAds_toolbar);
         setSupportActionBar(toolbar);
+        //toolbar.getMenu().removeItem(R.id.action_userAds);
+
 
         UserAdsViewModel mViewModel = new ViewModelProvider(this).get(UserAdsViewModel.class);
 

diff --git a/app/src/main/res/drawable/appart_icon_corrected.png b/app/src/main/res/drawable/appart_icon_corrected.png
diff --git a/app/src/main/res/menu/actions_toolbar.xml b/app/src/main/res/menu/actions_toolbar.xml
@@ -7,6 +7,12 @@
         android:title="@string/action_account"
         app:showAsAction="never" />
 
+    <item
+        android:id="@+id/action_home_sweet_home"
+        android:icon="@drawable/appart_icon_corrected"
+        android:title="@string/add_to_favorites"
+        app:showAsAction="ifRoom" />
+
     <item
         android:id="@+id/action_favorite"
         android:title="@string/favorites"

diff --git a/app/src/main/res/menu/ad_toolbar.xml b/app/src/main/res/menu/ad_toolbar.xml
@@ -8,6 +8,12 @@
         android:title="@string/add_to_favorites"
         app:showAsAction="ifRoom" />
 
+    <item
+        android:id="@+id/action_home_sweet_home"
+        android:icon="@drawable/appart_icon_corrected"
+        android:title="@string/add_to_favorites"
+        app:showAsAction="ifRoom" />
+
     <item
         android:id="@+id/action_account"
         android:title="@string/action_account"