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

Added navigation layout on the mainpage + updated the main activity

parent 4ecb3b17
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
app/src/main/java/be/lepl1509group13/workoutwarrior/MainActivity.java
+ 24
− 5
Voir le fichier @ 2dbfc9fe
......@@ -4,9 +4,12 @@ import androidx.activity.result.ActivityResultLauncher;
import androidx.activity.result.contract.ActivityResultContracts;
import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatActivity;
import androidx.core.view.GravityCompat;
import androidx.drawerlayout.widget.DrawerLayout;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import android.annotation.SuppressLint;
import android.content.Intent;
import android.os.Bundle;
import android.view.View;
......@@ -14,6 +17,7 @@ import android.widget.ImageButton;
import android.widget.TextView;
import android.widget.Toast;
import com.google.android.material.navigation.NavigationView;
import com.google.firebase.database.DataSnapshot;
import com.google.firebase.database.DatabaseError;
import com.google.firebase.database.DatabaseReference;
......@@ -40,6 +44,7 @@ public class MainActivity extends AppCompatActivity implements MainAdapter.OnIte
private Integer numberOfProgramsToDisplay = 0, totalNumberOfCustomPrograms = 0;
private boolean needsRefresh = false;
@SuppressLint("ClickableViewAccessibility")
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
......@@ -52,8 +57,23 @@ public class MainActivity extends AppCompatActivity implements MainAdapter.OnIte
TextView open_program_creation_btn = findViewById(R.id.program_creation_button);
open_program_creation_btn.setOnClickListener(this::open_program_creation);
ImageButton open_account = findViewById(R.id.account);
open_account.setOnClickListener(this::open_account);
ImageButton open_nav = findViewById(R.id.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)) {
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
......@@ -78,15 +98,14 @@ public class MainActivity extends AppCompatActivity implements MainAdapter.OnIte
result -> {
if (result.getResultCode() == 1) {
//Update the page if a program is added or deleted
//Log.d("TAG", ": " + Activity.RESULT_OK );
//Log.d("TAG", ": " + result.getResultCode() );
needsRefresh = true;
}
}
);
private void open_account(View v) {
private void open_account(String item) {
Intent intent = new Intent(MainActivity.this, AccountActivity.class);
intent.putExtra("item", item);
startActivity(intent);
}
......
app/src/main/res/layout/activity_main.xml
+ 104
− 88
Voir le fichier @ 2dbfc9fe
<?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:tools="http://schemas.android.com/tools"
android:layout_width="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
android:id="@+id/top"
android:layout_width="376dp"
android:layout_height="90dp"
android:padding="16dp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.542"
app:layout_constraintStart_toStartOf="parent"
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"
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/top"
android:layout_width="376dp"
android:layout_height="90dp"
android:padding="16dp"
app:layout_constraintBottom_toBottomOf="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_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.0" />
app:layout_constraintVertical_bias="0.04">
<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"
<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_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/user"
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_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_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_height="wrap_content"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:src="@drawable/user"
app:tint="@color/orange" />
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/scrollView2">
<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>
<ScrollView
android:id="@+id/scrollView2"
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
<com.google.android.material.navigation.NavigationView
android:id="@+id/navigation_view"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/scrollView2">
<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>
android:layout_height="match_parent"
android:layout_gravity="start"
app:menu="@menu/menu_main"
app:headerLayout="@layout/menu_header"/>
</androidx.drawerlayout.widget.DrawerLayout>
app/src/main/res/layout/menu_header.xml 0 → 100644
+ 49
− 0
Voir le fichier @ 2dbfc9fe
<?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 @ 2dbfc9fe
<?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="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