Skip to content
Extraits de code Groupes Projets
Valider 5facaf80 rédigé par Rémy Mathieu's avatar Rémy Mathieu
Parcourir les fichiers

Merge branch 'remy' into 'main' 

Remy

See merge request !28
parents 22905fb2 201b6cc7
Aucune branche associée trouvée
Aucune étiquette associée trouvée
1 requête de fusion!28Remy
Masquer les modifications d'espaces
En ligne Côte à côte
Affichage de
avec 215 ajouts et 95 suppressions
app/src/main/java/be/lepl1509group13/workoutwarrior/AccountActivity.java
+ 10
− 2
Voir le fichier @ 5facaf80
...@@ -3,6 +3,7 @@ package be.lepl1509group13.workoutwarrior; ...@@ -3,6 +3,7 @@ package be.lepl1509group13.workoutwarrior;
import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import android.annotation.SuppressLint; import android.annotation.SuppressLint;
import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.text.Editable; import android.text.Editable;
import android.util.Log; import android.util.Log;
...@@ -27,6 +28,7 @@ import com.google.firebase.database.ValueEventListener; ...@@ -27,6 +28,7 @@ import com.google.firebase.database.ValueEventListener;
import java.util.HashMap; import java.util.HashMap;
import java.util.Map; import java.util.Map;
import java.util.Objects;
public class AccountActivity extends AppCompatActivity { public class AccountActivity extends AppCompatActivity {
...@@ -46,10 +48,16 @@ public class AccountActivity extends AppCompatActivity { ...@@ -46,10 +48,16 @@ public class AccountActivity extends AppCompatActivity {
FirebaseUser currentUser = mAuth.getCurrentUser(); FirebaseUser currentUser = mAuth.getCurrentUser();
if(currentUser != null){ 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); setContentView(R.layout.activity_account);
//Log.d("LOGIN", "onStart: LOGED");
db = firebaseDb.getReference("Account_pseudo"); db = firebaseDb.getReference("Account_pseudo");
getPseudo(currentUser); getPseudo(currentUser);
}else{ }else{
......
app/src/main/java/be/lepl1509group13/workoutwarrior/MainActivity.java
+ 41
− 5
Voir le fichier @ 5facaf80
...@@ -4,16 +4,24 @@ import androidx.activity.result.ActivityResultLauncher; ...@@ -4,16 +4,24 @@ import androidx.activity.result.ActivityResultLauncher;
import androidx.activity.result.contract.ActivityResultContracts; import androidx.activity.result.contract.ActivityResultContracts;
import androidx.annotation.NonNull; import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.app.AppCompatActivity;
import androidx.core.view.GravityCompat;
import androidx.drawerlayout.widget.DrawerLayout;
import androidx.recyclerview.widget.LinearLayoutManager; import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView; import androidx.recyclerview.widget.RecyclerView;
import android.annotation.SuppressLint;
import android.content.Intent; import android.content.Intent;
import android.os.Bundle; import android.os.Bundle;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.widget.ImageButton; import android.widget.ImageButton;
import android.widget.TextView; import android.widget.TextView;
import android.widget.Toast; 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.DataSnapshot;
import com.google.firebase.database.DatabaseError; import com.google.firebase.database.DatabaseError;
import com.google.firebase.database.DatabaseReference; import com.google.firebase.database.DatabaseReference;
...@@ -40,6 +48,7 @@ public class MainActivity extends AppCompatActivity implements MainAdapter.OnIte ...@@ -40,6 +48,7 @@ public class MainActivity extends AppCompatActivity implements MainAdapter.OnIte
private Integer numberOfProgramsToDisplay = 0, totalNumberOfCustomPrograms = 0; private Integer numberOfProgramsToDisplay = 0, totalNumberOfCustomPrograms = 0;
private boolean needsRefresh = false; private boolean needsRefresh = false;
@SuppressLint({"SetTextI18n"})
@Override @Override
protected void onCreate(Bundle savedInstanceState) { protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
...@@ -52,8 +61,36 @@ public class MainActivity extends AppCompatActivity implements MainAdapter.OnIte ...@@ -52,8 +61,36 @@ public class MainActivity extends AppCompatActivity implements MainAdapter.OnIte
TextView open_program_creation_btn = findViewById(R.id.program_creation_button); TextView open_program_creation_btn = findViewById(R.id.program_creation_button);
open_program_creation_btn.setOnClickListener(this::open_program_creation); open_program_creation_btn.setOnClickListener(this::open_program_creation);
ImageButton open_account = findViewById(R.id.account); ImageButton open_nav = findViewById(R.id.account);
open_account.setOnClickListener(this::open_account); DrawerLayout drawerLayout = findViewById(R.id.drawer_layout);
NavigationView navigationView = findViewById(R.id.navigation_view);
//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);
}
});
//check when a button is clicked in the navigation
navigationView.setNavigationItemSelectedListener(item -> {
open_account((String) item.getTitle());
drawerLayout.closeDrawer(GravityCompat.START);
return false;
});
} }
@Override @Override
...@@ -78,15 +115,14 @@ public class MainActivity extends AppCompatActivity implements MainAdapter.OnIte ...@@ -78,15 +115,14 @@ public class MainActivity extends AppCompatActivity implements MainAdapter.OnIte
result -> { result -> {
if (result.getResultCode() == 1) { if (result.getResultCode() == 1) {
//Update the page if a program is added or deleted //Update the page if a program is added or deleted
//Log.d("TAG", ": " + Activity.RESULT_OK );
//Log.d("TAG", ": " + result.getResultCode() );
needsRefresh = true; needsRefresh = true;
} }
} }
); );
private void open_account(View v) { private void open_account(String item) {
Intent intent = new Intent(MainActivity.this, AccountActivity.class); Intent intent = new Intent(MainActivity.this, AccountActivity.class);
intent.putExtra("item", item);
startActivity(intent); startActivity(intent);
} }
......
app/src/main/res/drawable/menu.png 0 → 100644
+ 0
− 0
Voir le fichier @ 5facaf80
app/src/main/res/drawable/menu.png

4,43 ko

app/src/main/res/layout/activity_main.xml
+ 104
− 88
Voir le fichier @ 5facaf80
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android" <androidx.drawerlayout.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
tools:context=".MainActivity"> tools:context=".MainActivity"
tools:openDrawer="start"
android:id="@+id/drawer_layout">
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/top" android:layout_width="match_parent"
android:layout_width="376dp" android:layout_height="match_parent">
android:layout_height="90dp"
android:padding="16dp" <androidx.constraintlayout.widget.ConstraintLayout
app:layout_constraintBottom_toBottomOf="parent" android:id="@+id/top"
app:layout_constraintEnd_toEndOf="parent" android:layout_width="376dp"
app:layout_constraintHorizontal_bias="0.542" android:layout_height="90dp"
app:layout_constraintStart_toStartOf="parent" android:padding="16dp"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.04">
<ImageView
android:id="@+id/imageView"
android:layout_width="56dp"
android:layout_height="56dp"
android:adjustViewBounds="false"
android:background="@drawable/homepage_activities_border"
android:clipToOutline="true"
android:fadingEdgeLength="10dp"
android:scaleType="centerCrop"
android:src="@drawable/logo"
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_constraintHorizontal_bias="0.542"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.0" /> app:layout_constraintVertical_bias="0.04">
<TextView
android:id="@+id/welcomebacktxt" <ImageView
android:layout_width="wrap_content" android:id="@+id/imageView"
android:layout_height="65dp" android:layout_width="56dp"
android:fontFamily="@font/poppins_semibold" android:layout_height="56dp"
android:gravity="center" android:adjustViewBounds="false"
android:text="@string/bienvenue_message" android:background="@drawable/homepage_activities_border"
android:textSize="29sp" android:clipToOutline="true"
app:layout_constraintBottom_toBottomOf="parent" android:fadingEdgeLength="10dp"
android:scaleType="centerCrop"
android:src="@drawable/logo"
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_constraintVertical_bias="0.0" />
<TextView
android:id="@+id/welcomebacktxt"
android:layout_width="wrap_content"
android:layout_height="65dp"
android:fontFamily="@font/poppins_semibold"
android:gravity="center"
android:text="@string/bienvenue_message"
android:textSize="29sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.054"
app:layout_constraintStart_toEndOf="@+id/imageView"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.0"
tools:text="Bienvenue" />
<ImageButton
android:id="@+id/account"
android:layout_width="32dp"
android:layout_height="32dp"
android:adjustViewBounds="false"
android:background="@drawable/homepage_activities_border"
android:clipToOutline="true"
android:scaleType="centerCrop"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:src="@drawable/menu"
app:tint="@color/orange" />
</androidx.constraintlayout.widget.ConstraintLayout>
<ScrollView
android:id="@+id/scrollView2"
android:layout_width="377dp"
android:layout_height="450dp"
android:fillViewport="true"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.054" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintStart_toEndOf="@+id/imageView" app:layout_constraintTop_toBottomOf="@+id/top"
app:layout_constraintTop_toTopOf="parent" android:layout_marginTop="20dp" >
app:layout_constraintVertical_bias="0.0"
tools:text="Bienvenue" /> <androidx.recyclerview.widget.RecyclerView
android:id="@+id/homepage_recycler"
<ImageButton android:layout_width="match_parent"
android:id="@+id/account" android:layout_height="match_parent"
android:layout_width="32dp" app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"/>
android:layout_height="32dp"
android:adjustViewBounds="false" </ScrollView>
android:background="@drawable/homepage_activities_border"
android:clipToOutline="true" <RelativeLayout
android:scaleType="centerCrop" android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintStart_toStartOf="parent"
android:src="@drawable/user" app:layout_constraintTop_toBottomOf="@+id/scrollView2">
app:tint="@color/orange" />
<Button
android:id="@+id/program_creation_button"
android:layout_width="318dp"
android:layout_height="37dp"
android:backgroundTint="@color/orange"
android:clipToOutline="true"
android:text="Créer un programme" />
</RelativeLayout>
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
<ScrollView <com.google.android.material.navigation.NavigationView
android:id="@+id/scrollView2" android:id="@+id/navigation_view"
android:layout_width="377dp"
android:layout_height="450dp"
android:fillViewport="true"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/top"
android:layout_marginTop="20dp" >
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/homepage_recycler"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"/>
</ScrollView>
<RelativeLayout
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="match_parent"
app:layout_constraintBottom_toBottomOf="parent" android:layout_gravity="start"
app:layout_constraintEnd_toEndOf="parent" app:menu="@menu/menu_main"
app:layout_constraintStart_toStartOf="parent" app:headerLayout="@layout/menu_header"/>
app:layout_constraintTop_toBottomOf="@+id/scrollView2">
</androidx.drawerlayout.widget.DrawerLayout>
<Button
android:id="@+id/program_creation_button"
android:layout_width="318dp"
android:layout_height="37dp"
android:backgroundTint="@color/orange"
android:clipToOutline="true"
android:text="Créer un programme" />
</RelativeLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
app/src/main/res/layout/menu_header.xml 0 → 100644
+ 49
− 0
Voir le fichier @ 5facaf80
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="120dp"
android:background="@color/orange">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/menu_layout"
android:layout_width="match_parent"
android:layout_height="match_parent">
<ImageView
android:id="@+id/menu_image"
android:layout_width="50dp"
android:layout_height="50dp"
android:src="@drawable/user"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:layout_marginLeft="30dp"/>
<TextView
android:id="@+id/menu_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginLeft="10dp"
android:layout_toEndOf="@+id/menu_image"
android:text="Paramètres"
android:textSize="30sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toEndOf="@+id/menu_image"
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/menu_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Vous êtes connecté !"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/menu_title" />
</androidx.constraintlayout.widget.ConstraintLayout>
</RelativeLayout>
\ No newline at end of file
app/src/main/res/menu/menu_main.xml 0 → 100644
+ 11
− 0
Voir le fichier @ 5facaf80
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">
<group android:checkableBehavior="single">
<item
android:id="@+id/menu_item_1"
android:title="Mon compte" />
<item
android:id="@+id/menu_item_2"
android:title="Mes amis" />
</group>
</menu>
\ No newline at end of file
0% ou .
You are about to add 0 people to the discussion. Proceed with caution.
Terminez d'abord l'édition de ce message.
Veuillez vous inscrire ou vous pour commenter