From 201b6cc7320154c5eb12846d805d0f9d57d8d67a Mon Sep 17 00:00:00 2001
From: remathieu <remy.mathieu@student.uclouvain.be>
Date: Wed, 12 Apr 2023 10:42:36 +0200
Subject: [PATCH] Patch navigation layout
---
.../workoutwarrior/AccountActivity.java | 12 +++++++++--
.../workoutwarrior/MainActivity.java | 19 +++++++++++++++++-
app/src/main/res/drawable/menu.png | Bin 0 -> 4534 bytes
app/src/main/res/layout/activity_main.xml | 2 +-
app/src/main/res/menu/menu_main.xml | 2 +-
5 files changed, 30 insertions(+), 5 deletions(-)
create mode 100644 app/src/main/res/drawable/menu.png
diff --git a/app/src/main/java/be/lepl1509group13/workoutwarrior/AccountActivity.java b/app/src/main/java/be/lepl1509group13/workoutwarrior/AccountActivity.java
index 6654f82..dfabbaf 100644
--- a/app/src/main/java/be/lepl1509group13/workoutwarrior/AccountActivity.java
+++ b/app/src/main/java/be/lepl1509group13/workoutwarrior/AccountActivity.java
@@ -3,6 +3,7 @@ package be.lepl1509group13.workoutwarrior;
import androidx.appcompat.app.AppCompatActivity;
import android.annotation.SuppressLint;
+import android.content.Intent;
import android.os.Bundle;
import android.text.Editable;
import android.util.Log;
@@ -27,6 +28,7 @@ import com.google.firebase.database.ValueEventListener;
import java.util.HashMap;
import java.util.Map;
+import java.util.Objects;
public class AccountActivity extends AppCompatActivity {
@@ -46,10 +48,16 @@ public class AccountActivity extends AppCompatActivity {
FirebaseUser currentUser = mAuth.getCurrentUser();
if(currentUser != null){
+ //get which button is clicked in the navigation
+ Intent intent = this.getIntent();
+ String item = intent.getStringExtra("item");
+ if(Objects.equals(item, "Mon compte")){
+ //todo
+ } else if (Objects.equals(item, "Mes amis")) {
+ //todo
+ }
setContentView(R.layout.activity_account);
- //Log.d("LOGIN", "onStart: LOGED");
-
db = firebaseDb.getReference("Account_pseudo");
getPseudo(currentUser);
}else{
diff --git a/app/src/main/java/be/lepl1509group13/workoutwarrior/MainActivity.java b/app/src/main/java/be/lepl1509group13/workoutwarrior/MainActivity.java
index 3f430f1..c1ee501 100644
--- a/app/src/main/java/be/lepl1509group13/workoutwarrior/MainActivity.java
+++ b/app/src/main/java/be/lepl1509group13/workoutwarrior/MainActivity.java
@@ -12,12 +12,16 @@ import androidx.recyclerview.widget.RecyclerView;
import android.annotation.SuppressLint;
import android.content.Intent;
import android.os.Bundle;
+import android.util.Log;
+import android.view.LayoutInflater;
import android.view.View;
import android.widget.ImageButton;
import android.widget.TextView;
import android.widget.Toast;
import com.google.android.material.navigation.NavigationView;
+import com.google.firebase.auth.FirebaseAuth;
+import com.google.firebase.auth.FirebaseUser;
import com.google.firebase.database.DataSnapshot;
import com.google.firebase.database.DatabaseError;
import com.google.firebase.database.DatabaseReference;
@@ -44,7 +48,7 @@ public class MainActivity extends AppCompatActivity implements MainAdapter.OnIte
private Integer numberOfProgramsToDisplay = 0, totalNumberOfCustomPrograms = 0;
private boolean needsRefresh = false;
- @SuppressLint("ClickableViewAccessibility")
+ @SuppressLint({"SetTextI18n"})
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
@@ -64,6 +68,19 @@ public class MainActivity extends AppCompatActivity implements MainAdapter.OnIte
//open the navigation
open_nav.setOnClickListener(view -> {
if (!drawerLayout.isDrawerOpen(GravityCompat.START)) {
+ FirebaseAuth mAuth = FirebaseAuth.getInstance();
+ FirebaseUser currentUser = mAuth.getCurrentUser();
+
+ LayoutInflater inflater = getLayoutInflater();
+ View menu_header = inflater.inflate(R.layout.menu_header, null);
+ TextView text_header_menu = menu_header.findViewById(R.id.menu_text);
+
+ if(currentUser != null){
+ //todo
+ text_header_menu.setText("Vous êtes connecté !");
+ }else{
+ text_header_menu.setText("Vous n'êtes pas connecté. Rendez-vous dans la section Mon compte pour vous connecter.");
+ }
drawerLayout.openDrawer(GravityCompat.START);
}
});
diff --git a/app/src/main/res/drawable/menu.png b/app/src/main/res/drawable/menu.png
new file mode 100644
index 0000000000000000000000000000000000000000..c8f355e0e25f19438a9c7684e24dd29d809b43e1
GIT binary patch
literal 4534
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
PT_`?Yeut{xV}1H>d4Pwi
literal 0
HcmV?d00001
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index bd84ded..7c8bf82 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -69,7 +69,7 @@
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
- android:src="@drawable/user"
+ android:src="@drawable/menu"
app:tint="@color/orange" />
</androidx.constraintlayout.widget.ConstraintLayout>
diff --git a/app/src/main/res/menu/menu_main.xml b/app/src/main/res/menu/menu_main.xml
index 47cc714..427245b 100644
--- a/app/src/main/res/menu/menu_main.xml
+++ b/app/src/main/res/menu/menu_main.xml
@@ -3,7 +3,7 @@
<group android:checkableBehavior="single">
<item
android:id="@+id/menu_item_1"
- android:title="Compte" />
+ android:title="Mon compte" />
<item
android:id="@+id/menu_item_2"
android:title="Mes amis" />
--
GitLab