diff --git a/app/src/main/java/be/lepl1509group13/workoutwarrior/AccountActivity.java b/app/src/main/java/be/lepl1509group13/workoutwarrior/AccountActivity.java index 6654f82d31e569f0f92739c40ef1eaf0061f8e6f..dfabbafc4d4778ae07bb8b279f5d556481e93586 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 3f430f1797a7d4560e8e7cb0901fb616b84509b2..c1ee501e4ee30b16f5c9dd32adc808e3da514158 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 Binary files /dev/null and b/app/src/main/res/drawable/menu.png differ diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index bd84dedce60afd82f6ee3ca82b7aa366028bc8e1..7c8bf82de008aa805854b5daa2c16a19628cb6d7 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 47cc71441d7666b160450ea8971830ceda4325fe..427245be6e70a2aa3921361d85f2c70b6d91c46b 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" />