diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 4da48e270b843b5cbe5ecc03f3a8307b3a86f9ac..ac13cdcaa904917d9ef8b85d1d6cade59711a934 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,8 @@ <?xml version="1.0" encoding="utf-8"?> <manifest xmlns:android="http://schemas.android.com/apk/res/android" - package="be.lepl1509group13.workoutwarrior" > + package="be.lepl1509group13.workoutwarrior"> + + <uses-permission android:name="android.permission.VIBRATE" /> <application android:allowBackup="true" @@ -9,7 +11,10 @@ android:label="@string/app_name" android:roundIcon="@drawable/logo" android:supportsRtl="true" - android:theme="@style/Theme.WorkoutWarrior" > + android:theme="@style/Theme.WorkoutWarrior"> + <activity + android:name=".AddFriendActivity" + android:exported="false" /> <activity android:name=".AccountActivity" android:exported="false" /> @@ -20,7 +25,7 @@ <activity android:name=".ProgramCreationActivity" /> <activity android:name=".MainActivity" - android:exported="true" > + android:exported="true"> <intent-filter> <action android:name="android.intent.action.MAIN" /> @@ -32,6 +37,5 @@ android:name="preloaded_fonts" android:resource="@array/preloaded_fonts" /> </application> - <uses-permission android:name="android.permission.VIBRATE"/> </manifest> \ No newline at end of file diff --git a/app/src/main/java/be/lepl1509group13/workoutwarrior/AccountActivity.java b/app/src/main/java/be/lepl1509group13/workoutwarrior/AccountActivity.java index dfabbafc4d4778ae07bb8b279f5d556481e93586..b7a65519a317aa23a9997b1fd90af3dbca849220 100644 --- a/app/src/main/java/be/lepl1509group13/workoutwarrior/AccountActivity.java +++ b/app/src/main/java/be/lepl1509group13/workoutwarrior/AccountActivity.java @@ -1,6 +1,9 @@ package be.lepl1509group13.workoutwarrior; +import androidx.annotation.NonNull; import androidx.appcompat.app.AppCompatActivity; +import androidx.recyclerview.widget.LinearLayoutManager; +import androidx.recyclerview.widget.RecyclerView; import android.annotation.SuppressLint; import android.content.Intent; @@ -15,6 +18,8 @@ import android.widget.TextView; import android.widget.Toast; import com.google.android.gms.tasks.OnCompleteListener; +import com.google.android.gms.tasks.OnFailureListener; +import com.google.android.gms.tasks.OnSuccessListener; import com.google.android.gms.tasks.Task; import com.google.android.material.textfield.TextInputEditText; import com.google.firebase.auth.AuthResult; @@ -30,13 +35,13 @@ import java.util.HashMap; import java.util.Map; import java.util.Objects; -public class AccountActivity extends AppCompatActivity { +public class AccountActivity extends AppCompatActivity implements FriendsAdapter.OnItemClickListener{ private FirebaseAuth mAuth; private final FirebaseDatabase firebaseDb = FirebaseDatabase.getInstance(); private DatabaseReference db; - private Button logout; private TextView title; + private String userPseudo; @SuppressLint("MissingInflatedId") @Override @@ -48,18 +53,27 @@ public class AccountActivity extends AppCompatActivity { FirebaseUser currentUser = mAuth.getCurrentUser(); if(currentUser != null){ + db = firebaseDb.getReference("Account_pseudo"); + //get which button is clicked in the navigation Intent intent = this.getIntent(); String item = intent.getStringExtra("item"); if(Objects.equals(item, "Mon compte")){ - //todo + setContentView(R.layout.activity_account); + getPseudo(currentUser); + + Button logout = findViewById(R.id.logout); + logout.setOnClickListener(view -> logout()); + } else if (Objects.equals(item, "Mes amis")) { - //todo - } - setContentView(R.layout.activity_account); + setContentView(R.layout.activity_account_friends); - db = firebaseDb.getReference("Account_pseudo"); - getPseudo(currentUser); + Button add_friend = findViewById(R.id.friends_add); + add_friend.setOnClickListener(view -> addFriend()); + + db = firebaseDb.getReference("Account_pseudo"); + getUserPseudo(currentUser); + } }else{ setContentView(R.layout.activity_account_login); @@ -77,9 +91,74 @@ public class AccountActivity extends AppCompatActivity { ImageButton return_btn = findViewById(R.id.return_from_account); return_btn.setOnClickListener(view -> finish()); + } + + private void getUserPseudo(FirebaseUser currentUser) { + db.addValueEventListener(new ValueEventListener() { + @Override + public void onDataChange(@NonNull DataSnapshot dataSnapshot) { + for (DataSnapshot childSnapshot: dataSnapshot.getChildren()) { + String userKey = childSnapshot.getKey(); + String pseudo = childSnapshot.getValue(String.class); + if(Objects.equals(userKey, currentUser.getUid())){ + userPseudo = pseudo; + + db = firebaseDb.getReference("Friends"); + getFriends(userPseudo); + return; + } + } + } + + @Override + public void onCancelled(@NonNull DatabaseError error) { + Toast.makeText(AccountActivity.this, "Une erreur est survenue !", Toast.LENGTH_SHORT).show(); + finish(); + } + }); + } + + private void addFriend() { + Intent intent = new Intent(AccountActivity.this, AddFriendActivity.class); + startActivity(intent); + } - logout = findViewById(R.id.logout); - logout.setOnClickListener(view -> logout()); + public void onItemClick(String friend_pseudo) { + //todo when a friend is clicked to be deleted + db = firebaseDb.getReference("Friends"); + db.child(userPseudo).child(friend_pseudo).removeValue() + .addOnSuccessListener(aVoid -> Toast.makeText(AccountActivity.this, friend_pseudo + " supprimé de vos amis !", Toast.LENGTH_SHORT).show()) + .addOnFailureListener(e -> Toast.makeText(AccountActivity.this, "Une erreur est survenue !", Toast.LENGTH_SHORT).show()); + } + + private void getFriends(String pseudo) { + db.addValueEventListener(new ValueEventListener() { + @Override + public void onDataChange(@NonNull DataSnapshot dataSnapshot) { + DataSnapshot friendsList = dataSnapshot.child(pseudo); + + String[][] friendsData = new String[(int) friendsList.getChildrenCount()][]; + + int i = 0; + for (DataSnapshot childFriendList: friendsList.getChildren()) { + String friendPseudo = childFriendList.getKey(); + + friendsData[i] = new String[]{friendPseudo}; + i ++; + } + + RecyclerView recyclerView = findViewById(R.id.friends_view_recycler); + recyclerView.setLayoutManager(new LinearLayoutManager(AccountActivity.this)); + FriendsAdapter adapter = new FriendsAdapter(friendsData); + adapter.setOnItemClickListener(AccountActivity.this); + recyclerView.setAdapter(adapter); + } + + @Override + public void onCancelled(@NonNull DatabaseError error) { + // Failed to read value + } + }); } private void getPseudo(FirebaseUser currentUser) { @@ -99,7 +178,7 @@ public class AccountActivity extends AppCompatActivity { String pseudo = data.getValue().toString(); - title.setText("Vous êtes connecté !\n" + currentUser.getEmail() + " & " + id_user + " & " + pseudo); + title.setText("Vous êtes connecté en tant que :\n" + pseudo + "\n avec l'adresse mail :\n" + currentUser.getEmail()); field_pseudo_layout.setVisibility(View.INVISIBLE); register.setVisibility(View.INVISIBLE); } catch (Exception e){ @@ -133,22 +212,6 @@ public class AccountActivity extends AppCompatActivity { isLoged(); } - /** - @Override - public void onStart() { - super.onStart(); - // Check if user is signed in (non-null) and update UI accordingly. - FirebaseUser currentUser = mAuth.getCurrentUser(); - if(currentUser != null){ - //reload(); - Log.d("LOGIN", "onStart: LOGED"); - isLoged(); - }else{ - logout.setVisibility(View.INVISIBLE); - } - } - */ - private void isLoged(){ //Refresh the layout when user is logged finish(); @@ -159,8 +222,8 @@ public class AccountActivity extends AppCompatActivity { private void login(Editable email, Editable password) { Log.d("listener", "login: click btn"); - String email_string = (String)email.toString(); - String password_string = (String)password.toString(); + String email_string = email.toString(); + String password_string = password.toString(); if(email_string.isEmpty() || password_string.isEmpty()){ return; } @@ -190,8 +253,8 @@ public class AccountActivity extends AppCompatActivity { } private void register(Editable email, Editable password) { - String email_string = (String)email.toString(); - String password_string = (String)password.toString(); + String email_string = email.toString(); + String password_string = password.toString(); if(email_string.isEmpty() || password_string.isEmpty()){ return; } @@ -199,7 +262,7 @@ public class AccountActivity extends AppCompatActivity { mAuth.createUserWithEmailAndPassword(email_string, password_string) .addOnCompleteListener(this, new OnCompleteListener<AuthResult>() { @Override - public void onComplete(Task<AuthResult> task) { + public void onComplete(@NonNull Task<AuthResult> task) { if (task.isSuccessful()) { // Sign in success, update UI with the signed-in user's information //Log.d("TAG", "createUserWithEmail:success"); diff --git a/app/src/main/java/be/lepl1509group13/workoutwarrior/AddFriendActivity.java b/app/src/main/java/be/lepl1509group13/workoutwarrior/AddFriendActivity.java new file mode 100644 index 0000000000000000000000000000000000000000..afeb6be4465ae8bbe35f903c20516256f88e1065 --- /dev/null +++ b/app/src/main/java/be/lepl1509group13/workoutwarrior/AddFriendActivity.java @@ -0,0 +1,159 @@ +package be.lepl1509group13.workoutwarrior; + +import androidx.annotation.NonNull; +import androidx.appcompat.app.AppCompatActivity; + +import android.os.Bundle; +import android.text.Editable; +import android.util.Log; +import android.widget.Button; +import android.widget.ImageButton; +import android.widget.Toast; + +import com.google.android.material.textfield.TextInputEditText; +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; +import com.google.firebase.database.FirebaseDatabase; +import com.google.firebase.database.ValueEventListener; + +import java.util.HashMap; +import java.util.Map; +import java.util.Objects; + +public class AddFriendActivity extends AppCompatActivity { + + private FirebaseAuth mAuth; + private FirebaseUser currentUser; + private final FirebaseDatabase firebaseDb = FirebaseDatabase.getInstance(); + private DatabaseReference db; + private String userPseudo; + private ValueEventListener checkPseudo; + private ValueEventListener checkIfFriends; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_add_friend); + getSupportActionBar().hide(); + + mAuth = FirebaseAuth.getInstance(); + currentUser = mAuth.getCurrentUser(); + + db = firebaseDb.getReference("Account_pseudo"); + getUserPseudo(); + + ImageButton back = findViewById(R.id.return_from_add_friend); + back.setOnClickListener(view -> finish()); + + Button add = findViewById(R.id.add_friend_activity_btn); + add.setOnClickListener(view -> addFriend()); + } + + private void getUserPseudo() { + db.addValueEventListener(new ValueEventListener() { + @Override + public void onDataChange(@NonNull DataSnapshot dataSnapshot) { + for (DataSnapshot childSnapshot: dataSnapshot.getChildren()) { + String userKey = childSnapshot.getKey(); + String pseudo = childSnapshot.getValue(String.class); + if(Objects.equals(userKey, currentUser.getUid())){ + userPseudo = pseudo; + return; + } + } + } + + @Override + public void onCancelled(@NonNull DatabaseError error) { + Toast.makeText(AddFriendActivity.this, "Une erreur est survenue !", Toast.LENGTH_SHORT).show(); + finish(); + } + }); + } + + private void addFriend() { + TextInputEditText pseudo_input = findViewById(R.id.add_friend_pseudo); + Editable pseudo_string = pseudo_input.getText(); + Log.d("TRYING TO:", "addFriend: " + pseudo_string); + + db = firebaseDb.getReference("Account_pseudo"); + checkPseudo(pseudo_string.toString()); + } + + private void checkPseudo(String pseudo) { + checkPseudo = new ValueEventListener() { + @Override + public void onDataChange(@NonNull DataSnapshot dataSnapshot) { + for (DataSnapshot childSnapshot: dataSnapshot.getChildren()) { + String pseudoInput = childSnapshot.getValue(String.class); + if(Objects.equals(pseudoInput, pseudo)){ + //the pseudo in the input exist in the database + db = firebaseDb.getReference("Friends"); + checkIfAlreadyFriends(pseudoInput, userPseudo); + return; + } + } + Toast.makeText(AddFriendActivity.this, "Ce pseudo n'existe pas !", Toast.LENGTH_SHORT).show(); + } + + @Override + public void onCancelled(@NonNull DatabaseError error) { + Toast.makeText(AddFriendActivity.this, "Erreur !", Toast.LENGTH_SHORT).show(); + } + }; + db.addValueEventListener(checkPseudo); + } + + private void checkIfAlreadyFriends(String newFriendPseudo, String userPseudo) { + checkIfFriends = new ValueEventListener() { + @Override + public void onDataChange(@NonNull DataSnapshot dataSnapshot) { + DataSnapshot friendsList = dataSnapshot.child(userPseudo); + + for (DataSnapshot childFriendList: friendsList.getChildren()) { + String friendPseudo = childFriendList.getKey(); + + if(Objects.equals(friendPseudo, newFriendPseudo)){ + Toast.makeText(AddFriendActivity.this, "Vous avez déjà ajouter cet ami !", Toast.LENGTH_SHORT).show(); + return; + } + } + addFriendship(userPseudo, newFriendPseudo); + } + + @Override + public void onCancelled(@NonNull DatabaseError error) { + Toast.makeText(AddFriendActivity.this, "Erreur !", Toast.LENGTH_SHORT).show(); + } + }; + db.addValueEventListener(checkIfFriends); + //db.removeEventListener(checkIfFriends); + } + + private void addFriendship(String userPseudo, String newFriendPseudo) { + db = firebaseDb.getReference("Friends").child(userPseudo); + + Map<String, Object> updates = new HashMap<>(); + updates.put(newFriendPseudo, ""); + + try { + db.updateChildren(updates); + Toast.makeText(AddFriendActivity.this, "Ami ajouté !", Toast.LENGTH_SHORT).show(); + resetFirebaseQuery(); + finish(); + return; + } catch (Exception e){ + Log.d("error", "savePseudo: " + e); + } + } + + private void resetFirebaseQuery(){ + //stop each onDataChange query + db = firebaseDb.getReference("Friends"); + db.removeEventListener(checkPseudo); + db.removeEventListener(checkIfFriends); + } +} \ No newline at end of file diff --git a/app/src/main/java/be/lepl1509group13/workoutwarrior/FriendsAdapter.java b/app/src/main/java/be/lepl1509group13/workoutwarrior/FriendsAdapter.java new file mode 100644 index 0000000000000000000000000000000000000000..3b3f4788dcc43739f1f094d10583cbb137c9e953 --- /dev/null +++ b/app/src/main/java/be/lepl1509group13/workoutwarrior/FriendsAdapter.java @@ -0,0 +1,66 @@ +package be.lepl1509group13.workoutwarrior; + +import android.annotation.SuppressLint; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ImageView; +import android.widget.TextView; + +import androidx.annotation.NonNull; +import androidx.recyclerview.widget.RecyclerView; + +public class FriendsAdapter extends RecyclerView.Adapter<FriendsAdapter.MyViewHolder>{ + + private final String[][] friendData; + private OnItemClickListener mListener; + public FriendsAdapter(String[][] data) {friendData = data;} + + @NonNull + @Override + public MyViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) { + View view = LayoutInflater.from(parent.getContext()).inflate(R.layout.friends_item, parent, false); + return new MyViewHolder(view); + } + + @Override + public void onBindViewHolder(@NonNull MyViewHolder holder, @SuppressLint("RecyclerView") int position) { + // Parcourir la liste et afficher le contenu de chaque tableau + String[] friend_data = friendData[position]; + + holder.pseudo.setText(friend_data[0]); + + holder.delete.setOnClickListener(view -> { + if (mListener != null) { + mListener.onItemClick(friend_data[0]); + } + }); + + } + + @Override + public int getItemCount() { + return friendData.length; + } + + public void setOnItemClickListener(OnItemClickListener listener) { + mListener = listener; + } + + public interface OnItemClickListener { + void onItemClick(String friend_pseudo); + } + public static class MyViewHolder extends RecyclerView.ViewHolder { + + public TextView pseudo; + public ImageView delete; + + public MyViewHolder(View itemView) { + super(itemView); + pseudo = itemView.findViewById(R.id.friend_pseudo); + delete = itemView.findViewById(R.id.friend_delete); + } + } +} + + diff --git a/app/src/main/java/be/lepl1509group13/workoutwarrior/MainActivity.java b/app/src/main/java/be/lepl1509group13/workoutwarrior/MainActivity.java index c1ee501e4ee30b16f5c9dd32adc808e3da514158..e84b222fb10c6efde701a83666010fd82fc65807 100644 --- a/app/src/main/java/be/lepl1509group13/workoutwarrior/MainActivity.java +++ b/app/src/main/java/be/lepl1509group13/workoutwarrior/MainActivity.java @@ -12,16 +12,12 @@ 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; @@ -68,19 +64,6 @@ 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/delete.png b/app/src/main/res/drawable/delete.png new file mode 100644 index 0000000000000000000000000000000000000000..0d30fb0646efbb883db75db9d985fb06af304adb Binary files /dev/null and b/app/src/main/res/drawable/delete.png differ diff --git a/app/src/main/res/layout/activity_account.xml b/app/src/main/res/layout/activity_account.xml index 18b81bf3827654df43a9c44492349caf1040827d..0a0887b439e685bd93d779144df8cd7c622e0c42 100644 --- a/app/src/main/res/layout/activity_account.xml +++ b/app/src/main/res/layout/activity_account.xml @@ -100,7 +100,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="Deconnexion" - android:backgroundTint="@color/orange" + android:background="#FFFFFF" + android:backgroundTint="#FFFFFF" app:layout_constraintBottom_toBottomOf="@+id/relativeLayout" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" diff --git a/app/src/main/res/layout/activity_account_friends.xml b/app/src/main/res/layout/activity_account_friends.xml new file mode 100644 index 0000000000000000000000000000000000000000..8cc4d76707275caf8fbc74c6ca5b47cc91233e7e --- /dev/null +++ b/app/src/main/res/layout/activity_account_friends.xml @@ -0,0 +1,89 @@ +<?xml version="1.0" encoding="utf-8"?> +<androidx.constraintlayout.widget.ConstraintLayout 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=".AccountActivity"> + + <TextView + android:id="@+id/account_friends_title" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="20dp" + android:paddingHorizontal="20dp" + android:textAlignment="center" + android:textSize="20sp" + android:text="@string/friends_list" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/relativeLayout" /> + + <ScrollView + android:id="@+id/scrollView_friends" + android:layout_width="match_parent" + android:layout_height="500dp" + android:padding="10dp" + android:fillViewport="true" + app:layout_constraintBottom_toTopOf="@+id/button_layout" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/account_friends_title"> + + <androidx.recyclerview.widget.RecyclerView + android:id="@+id/friends_view_recycler" + android:layout_width="match_parent" + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + + </ScrollView> + + <LinearLayout + android:id="@+id/button_layout" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_alignParentEnd="true" + android:gravity="center" + android:layout_marginBottom="15dp" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent"> + + <Button + android:id="@+id/friends_add" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/friends_add" /> + + </LinearLayout> + + <RelativeLayout + android:id="@+id/relativeLayout" + android:layout_width="match_parent" + android:layout_height="80dp" + android:background="@color/orange" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + <ImageButton + android:id="@+id/return_from_account" + android:layout_width="66dp" + android:layout_height="61dp" + android:layout_marginStart="10dp" + android:layout_marginTop="10dp" + android:layout_marginEnd="10dp" + android:layout_marginBottom="10dp" + android:background="@color/orange" + android:paddingLeft="10dp" + android:paddingTop="1dp" + android:paddingRight="10dp" + android:paddingBottom="4dp" + android:scaleType="fitCenter" + android:src="@drawable/return_button" + android:textAlignment="center" + android:textSize="16sp" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + +</androidx.constraintlayout.widget.ConstraintLayout> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_account_login.xml b/app/src/main/res/layout/activity_account_login.xml index 8767900d6713c4f3ab20ab8e8c412c37462db7cb..fd3221fcec5d66ad3baee5a4f007f76869ac7899 100644 --- a/app/src/main/res/layout/activity_account_login.xml +++ b/app/src/main/res/layout/activity_account_login.xml @@ -14,11 +14,11 @@ android:paddingHorizontal="20dp" android:textAlignment="center" android:textSize="20sp" + android:text="@string/login_title" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="0.0" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toBottomOf="@+id/relativeLayout" - tools:text="Hello" /> + app:layout_constraintTop_toBottomOf="@+id/relativeLayout" /> <RelativeLayout android:id="@+id/field_layout" @@ -115,17 +115,4 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent" /> - - - <Button - android:id="@+id/logout" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:text="Deconnexion" - android:backgroundTint="@color/orange" - app:layout_constraintBottom_toBottomOf="@+id/relativeLayout" - app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintTop_toTopOf="parent" - android:layout_marginRight="10dp"/> - </androidx.constraintlayout.widget.ConstraintLayout> \ No newline at end of file diff --git a/app/src/main/res/layout/activity_add_friend.xml b/app/src/main/res/layout/activity_add_friend.xml new file mode 100644 index 0000000000000000000000000000000000000000..51859383c3aed026039fe4b5d08b8921b7313aed --- /dev/null +++ b/app/src/main/res/layout/activity_add_friend.xml @@ -0,0 +1,95 @@ +<?xml version="1.0" encoding="utf-8"?> +<androidx.constraintlayout.widget.ConstraintLayout 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=".AddFriendActivity"> + + <TextView + android:id="@+id/account_friends_title" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_marginTop="20dp" + android:paddingHorizontal="20dp" + android:textAlignment="center" + android:textSize="20sp" + android:text="@string/add_friend_activity_title" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/relativeLayout" /> + + <RelativeLayout + android:id="@+id/add_friend_activity_field" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:padding="10dp" + android:layout_marginTop="35dp" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/account_friends_title"> + + <com.google.android.material.textfield.TextInputLayout + android:id="@+id/add_friend_pseudo_layout" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerHorizontal="true"> + + <com.google.android.material.textfield.TextInputEditText + android:id="@+id/add_friend_pseudo" + android:layout_width="300dp" + android:layout_height="wrap_content" + android:hint="Pseudo" /> + + </com.google.android.material.textfield.TextInputLayout> + + </RelativeLayout> + + <LinearLayout + android:id="@+id/button_layout" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_alignParentEnd="true" + android:gravity="center" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toBottomOf="@+id/add_friend_activity_field"> + + <Button + android:id="@+id/add_friend_activity_btn" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="@string/add_friend_activity_btn_text" /> + + </LinearLayout> + + <RelativeLayout + android:id="@+id/relativeLayout" + android:layout_width="match_parent" + android:layout_height="80dp" + android:background="@color/orange" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + <ImageButton + android:id="@+id/return_from_add_friend" + android:layout_width="66dp" + android:layout_height="61dp" + android:layout_marginStart="10dp" + android:layout_marginTop="10dp" + android:layout_marginEnd="10dp" + android:layout_marginBottom="10dp" + android:background="@color/orange" + android:paddingLeft="10dp" + android:paddingTop="1dp" + android:paddingRight="10dp" + android:paddingBottom="4dp" + android:scaleType="fitCenter" + android:src="@drawable/return_button" + android:textAlignment="center" + android:textSize="16sp" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + +</androidx.constraintlayout.widget.ConstraintLayout> \ No newline at end of file diff --git a/app/src/main/res/layout/friends_item.xml b/app/src/main/res/layout/friends_item.xml new file mode 100644 index 0000000000000000000000000000000000000000..72512fa0f81eb0f6e29b76bc78254cc397091dbc --- /dev/null +++ b/app/src/main/res/layout/friends_item.xml @@ -0,0 +1,42 @@ +<?xml version="1.0" encoding="utf-8"?> + <androidx.constraintlayout.widget.ConstraintLayout 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="wrap_content"> + + <androidx.constraintlayout.widget.ConstraintLayout + android:id="@+id/friend_layout" + android:layout_width="325dp" + android:layout_height="70dp" + android:layout_marginTop="25dp" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" + android:background="@drawable/border_orange" + android:padding="15dp"> + + <TextView + android:id="@+id/friend_pseudo" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:fontFamily="@font/poppins" + android:text="Pseudo" + android:textSize="24sp" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + <ImageView + android:id="@+id/friend_delete" + android:layout_width="40dp" + android:layout_height="wrap_content" + android:layout_alignParentEnd="true" + android:src="@drawable/delete" + android:textColor="@color/white" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toTopOf="parent" /> + + </androidx.constraintlayout.widget.ConstraintLayout> + +</androidx.constraintlayout.widget.ConstraintLayout> \ No newline at end of file diff --git a/app/src/main/res/layout/menu_header.xml b/app/src/main/res/layout/menu_header.xml index 7e283f7810342a6a81b47142d11837f0be34d935..845991e6ef0090aca184785c9f9050e238c4e029 100644 --- a/app/src/main/res/layout/menu_header.xml +++ b/app/src/main/res/layout/menu_header.xml @@ -32,16 +32,6 @@ 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> diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 2624b16b5748a98d20d58629cc0d92c1930fc209..2442df26381513a76c96b329db7368438f546378 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -18,5 +18,10 @@ <string name="welcome">"Welcome !"</string> <string name="invalid_username">Not a valid username</string> <string name="invalid_password">Password must be >5 characters</string> - <string name="login_failed">"Login failed"</string> + <string name="login_failed">Login failed</string> + <string name="friends_list">Voici la liste de vos amis</string> + <string name="friends_add">Ajouter des amis</string> + <string name="add_friend_activity_title">Entrez le pseudo de l\'ami à ajouter</string> + <string name="add_friend_activity_btn_text">Ajouter</string> + <string name="login_title">Veuillez d\'abord vous connecter</string> </resources>