230409/namesa_final
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

base: 230409:main
Branches Tags
230409:main 230409:teste
...
compare: 230409:31a7cbb2df797bcbfafa160aaad69f8022fa2559
Branches Tags
230409:teste 230409:main

2 Commits
main ... 31a7cbb2df

Author SHA1 Message Date
230409
31a7cbb2df ..asd 2026-06-08 14:43:39 +01:00
230409
fe9266263f ..asd 2026-06-08 10:55:02 +01:00
8 changed files with 43 additions and 97 deletions
Expand all files Collapse all files

9
app/src/main/java/com/example/pap_teste/ClientDashboardActivity.java
View File

@@ -98,7 +98,7 @@ public class ClientDashboardActivity extends AppCompatActivity {
// NovaReservaActivity
// We pass the filter so it can maybe open directly or we just pass restaurant
// email
intent.putExtra("category_filter", restaurant.getCategory());
intent.putExtra("restaurant", restaurant);
startActivity(intent);
};
@@ -166,7 +166,7 @@ public class ClientDashboardActivity extends AppCompatActivity {
layoutAllRestaurants.setVisibility(View.GONE);
DatabaseReference usersRef = FirebaseDatabase.getInstance().getReference("Restaurantes");
usersRef.addListenerForSingleValueEvent(new ValueEventListener() {
usersRef.addValueEventListener(new ValueEventListener() {
@Override
public void onDataChange(@androidx.annotation.NonNull DataSnapshot snapshot) {
progressBar.setVisibility(View.GONE);
@@ -176,7 +176,8 @@ public class ClientDashboardActivity extends AppCompatActivity {
String role = ds.child("role").getValue(String.class);
String accountType = ds.child("accountType").getValue(String.class);
if ("ADMIN".equalsIgnoreCase(role) || "ESTABELECIMENTO".equalsIgnoreCase(accountType)) {
// Aceitar todos os registos na coleção Restaurantes
if (true) {
String name = ds.child("establishmentName").getValue(String.class);
if (name == null)
name = ds.child("displayName").getValue(String.class);
@@ -292,7 +293,7 @@ public class ClientDashboardActivity extends AppCompatActivity {
featuredAdapter = new FeaturedRestaurantAdapter(featuredList,
mainAdapter instanceof RestaurantAdapter ? restaurant -> {
Intent intent = new Intent(this, ExplorarRestaurantesActivity.class);
intent.putExtra("category_filter", restaurant.getCategory());
intent.putExtra("restaurant", restaurant);
startActivity(intent);
} : null);
rvFeatured.setAdapter(featuredAdapter);

10
app/src/main/java/com/example/pap_teste/ExplorarRestaurantesActivity.java
View File

@@ -59,6 +59,11 @@ public class ExplorarRestaurantesActivity extends AppCompatActivity {
back.setOnClickListener(v -> handleBackNavigation());
}
if (getIntent().hasExtra("restaurant")) {
selectedRestaurant = (com.example.pap_teste.models.Restaurant) getIntent().getSerializableExtra("restaurant");
currentState = State.DETAILS;
}
setupRestaurantList();
updateViewState();
}
@@ -135,7 +140,7 @@ public class ExplorarRestaurantesActivity extends AppCompatActivity {
if (progressBar != null)
progressBar.setVisibility(android.view.View.VISIBLE);
query.addListenerForSingleValueEvent(new com.google.firebase.database.ValueEventListener() {
query.addValueEventListener(new com.google.firebase.database.ValueEventListener() {
@Override
public void onDataChange(@androidx.annotation.NonNull com.google.firebase.database.DataSnapshot snapshot) {
if (progressBar != null)
@@ -145,7 +150,8 @@ public class ExplorarRestaurantesActivity extends AppCompatActivity {
String role = ds.child("role").getValue(String.class);
String accountType = ds.child("accountType").getValue(String.class);
if ("ADMIN".equalsIgnoreCase(role) || "ESTABELECIMENTO".equalsIgnoreCase(accountType)) {
// Aceitar todos os registos na coleção Restaurantes
if (true) {
String name = ds.child("establishmentName").getValue(String.class);
if (name == null)
name = ds.child("displayName").getValue(String.class);

2
app/src/main/java/com/example/pap_teste/FavoritosActivity.java
View File

@@ -55,7 +55,7 @@ public class FavoritosActivity extends AppCompatActivity {
list = new ArrayList<>();
adapter = new RestaurantAdapter(list, restaurant -> {
android.content.Intent intent = new android.content.Intent(this, ExplorarRestaurantesActivity.class);
intent.putExtra("category_filter", restaurant.getCategory()); // just as demo
intent.putExtra("restaurant", restaurant);
startActivity(intent);
});
rv.setAdapter(adapter);

24
app/src/main/java/com/example/pap_teste/MainActivity.java
View File

@@ -54,9 +54,6 @@ public class MainActivity extends AppCompatActivity {
private AccountType selectedAccountType = AccountType.CLIENTE;
private AccountAction selectedAccountAction = AccountAction.ENTRAR;
private Button btnCliente;
private Button btnEstabelecimento;
private Button btnEntrar;
private Button btnCriarConta;
private Button btnPrimaryAction;
@@ -101,12 +98,13 @@ public class MainActivity extends AppCompatActivity {
return insets;
});
selectedAccountType = AccountType.CLIENTE;
FirebaseApp.initializeApp(this);
firebaseAuth = FirebaseAuth.getInstance();
databaseReference = FirebaseDatabase.getInstance().getReference();
bindViews();
setupTypeToggle();
setupActionToggle();
setupPrimaryAction();
checkPermissions();
@@ -177,8 +175,6 @@ public class MainActivity extends AppCompatActivity {
}
private void bindViews() {
btnCliente = findViewById(R.id.btnCliente);
btnEstabelecimento = findViewById(R.id.btnEstabelecimento);
btnEntrar = findViewById(R.id.btnEntrar);
btnCriarConta = findViewById(R.id.btnCriarConta);
btnPrimaryAction = findViewById(R.id.btnFinalCriarConta);
@@ -240,17 +236,6 @@ public class MainActivity extends AppCompatActivity {
});
}
private void setupTypeToggle() {
btnCliente.setOnClickListener(v -> {
selectedAccountType = AccountType.CLIENTE;
updateTypeButtons();
});
btnEstabelecimento.setOnClickListener(v -> {
selectedAccountType = AccountType.ESTABELECIMENTO;
updateTypeButtons();
});
updateTypeButtons();
}
private void setupActionToggle() {
btnEntrar.setOnClickListener(v -> {
@@ -269,11 +254,6 @@ public class MainActivity extends AppCompatActivity {
updatePrimaryActionState();
}
private void updateTypeButtons() {
setSelectedState(btnCliente, selectedAccountType == AccountType.CLIENTE);
setSelectedState(btnEstabelecimento, selectedAccountType == AccountType.ESTABELECIMENTO);
updateInputVisibility();
}
private void updateActionButtons() {
setSelectedState(btnEntrar, selectedAccountAction == AccountAction.ENTRAR);

3
app/src/main/java/com/example/pap_teste/NovaReservaActivity.java
View File

@@ -119,7 +119,8 @@ public class NovaReservaActivity extends AppCompatActivity {
String role = ds.child("role").getValue(String.class);
String accountType = ds.child("accountType").getValue(String.class);
if ("ADMIN".equalsIgnoreCase(role) || "ESTABELECIMENTO".equalsIgnoreCase(accountType)) {
// Aceitar todos os registos na coleção Restaurantes
if (true) {
String name = ds.child("establishmentName").getValue(String.class);
if (name == null)
name = ds.child("displayName").getValue(String.class);

4
app/src/main/java/com/example/pap_teste/models/Restaurant.java
View File

@@ -1,6 +1,8 @@
package com.example.pap_teste.models;
public class Restaurant {
import java.io.Serializable;
public class Restaurant implements Serializable {
private String name;
private String category;
private String email;

21
app/src/main/res/layout/activity_client_dashboard.xml
View File

@@ -36,15 +36,13 @@
android:id="@+id/txtClientGreeting"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:fontFamily="sans-serif"
android:text="Olá, convidado!"
android:textColor="@color/colorTextPrimary"
android:textSize="28sp"
android:textStyle="bold"
android:fontFamily="sans-serif"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@id/imgNotification"
android:layout_marginEnd="16dp" />
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:layout_width="0dp"
@@ -52,21 +50,8 @@
android:text="Encontre a sua próxima mesa."
android:textColor="@color/colorTextSecondary"
android:textSize="16sp"
app:layout_constraintTop_toBottomOf="@id/txtClientGreeting"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintEnd_toStartOf="@id/imgNotification" />
<ImageButton
android:id="@+id/imgNotification"
android:layout_width="48dp"
android:layout_height="48dp"
android:background="@drawable/bg_circle_white"
android:src="@android:drawable/ic_popup_reminder"
app:tint="@color/colorTextPrimary"
android:layout_marginEnd="12dp"
app:layout_constraintTop_toTopOf="@id/cardProfile"
app:layout_constraintBottom_toBottomOf="@id/cardProfile"
app:layout_constraintEnd_toStartOf="@id/cardProfile" />
app:layout_constraintTop_toBottomOf="@id/txtClientGreeting" />
<com.google.android.material.card.MaterialCardView
android:id="@+id/cardProfile"

63
app/src/main/res/layout/activity_main.xml
View File

@@ -19,13 +19,14 @@
<ImageView
android:id="@+id/logoNaMesa"
android:layout_width="100dp"
android:layout_height="100dp"
android:layout_width="160dp"
android:layout_height="156dp"
android:layout_marginTop="124dp"
android:src="@drawable/na_mesa"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.508"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
android:layout_marginTop="50dp" />
app:layout_constraintTop_toTopOf="parent" />
<TextView
android:id="@+id/txtTitle"
@@ -70,43 +71,13 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_height="387dp"
android:orientation="vertical"
android:padding="24dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="50dp"
android:background="@drawable/bg_tabs"
android:orientation="horizontal"
android:padding="3dp">
<Button
android:id="@+id/btnCliente"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="@drawable/btn_light"
android:text="Cliente"
android:textAllCaps="false"
android:textColor="#231F1F"
android:textSize="14sp" />
<Button
android:id="@+id/btnEstabelecimento"
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="@android:color/transparent"
android:text="Estabelecimento"
android:textAllCaps="false"
android:textColor="@color/colorTextSecondary"
android:textSize="14sp" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="50dp"
android:layout_height="wrap_content"
android:layout_marginTop="16dp"
android:background="@drawable/bg_tabs"
android:orientation="horizontal"
@@ -221,37 +192,37 @@
android:layout_height="54dp"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:padding="12dp"
android:src="@drawable/ic_visibility_off"
android:background="?attr/selectableItemBackgroundBorderless"
android:clickable="true"
android:focusable="true"
android:background="?attr/selectableItemBackgroundBorderless" />
android:padding="12dp"
android:src="@drawable/ic_visibility_off" />
</RelativeLayout>
<TextView
android:id="@+id/txtForgotPassword"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="12dp"
android:layout_gravity="end"
android:layout_marginTop="12dp"
android:clickable="true"
android:focusable="true"
android:text="Esqueceu-se da palavra-passe?"
android:textColor="@color/colorPrimary"
android:textSize="14sp"
android:visibility="visible"
android:clickable="true"
android:focusable="true"/>
android:visibility="visible" />
<com.google.android.material.button.MaterialButton
android:id="@+id/btnFinalCriarConta"
android:layout_width="match_parent"
android:layout_height="56dp"
android:layout_marginTop="24dp"
app:cornerRadius="14dp"
app:backgroundTint="@color/colorPrimary"
android:text="Entrar"
android:textAllCaps="false"
android:textColor="@color/white"
android:textSize="16sp"
android:textColor="@color/white" />
app:backgroundTint="@color/colorPrimary"
app:cornerRadius="14dp" />
</LinearLayout>
</com.google.android.material.card.MaterialCardView>
</androidx.constraintlayout.widget.ConstraintLayout>