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

..asd

Browse Source
This commit is contained in:
230409
2026-06-08 10:55:02 +01:00
parent 6f16f635e5
commit fe9266263f
5 changed files with 11 additions and 51 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -166,7 +166,7 @@ public class ClientDashboardActivity extends AppCompatActivity {
layoutAllRestaurants.setVisibility(View.GONE); layoutAllRestaurants.setVisibility(View.GONE);
DatabaseReference usersRef = FirebaseDatabase.getInstance().getReference("Restaurantes"); DatabaseReference usersRef = FirebaseDatabase.getInstance().getReference("Restaurantes");
usersRef.addListenerForSingleValueEvent(new ValueEventListener() { usersRef.addValueEventListener(new ValueEventListener() {
@Override @Override
public void onDataChange(@androidx.annotation.NonNull DataSnapshot snapshot) { public void onDataChange(@androidx.annotation.NonNull DataSnapshot snapshot) {
progressBar.setVisibility(View.GONE); progressBar.setVisibility(View.GONE);
@@ -176,7 +176,8 @@ public class ClientDashboardActivity extends AppCompatActivity {
String role = ds.child("role").getValue(String.class); String role = ds.child("role").getValue(String.class);
String accountType = ds.child("accountType").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); String name = ds.child("establishmentName").getValue(String.class);
if (name == null) if (name == null)
name = ds.child("displayName").getValue(String.class); name = ds.child("displayName").getValue(String.class);

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

@@ -135,7 +135,7 @@ public class ExplorarRestaurantesActivity extends AppCompatActivity {
if (progressBar != null) if (progressBar != null)
progressBar.setVisibility(android.view.View.VISIBLE); progressBar.setVisibility(android.view.View.VISIBLE);
query.addListenerForSingleValueEvent(new com.google.firebase.database.ValueEventListener() { query.addValueEventListener(new com.google.firebase.database.ValueEventListener() {
@Override @Override
public void onDataChange(@androidx.annotation.NonNull com.google.firebase.database.DataSnapshot snapshot) { public void onDataChange(@androidx.annotation.NonNull com.google.firebase.database.DataSnapshot snapshot) {
if (progressBar != null) if (progressBar != null)
@@ -145,7 +145,8 @@ public class ExplorarRestaurantesActivity extends AppCompatActivity {
String role = ds.child("role").getValue(String.class); String role = ds.child("role").getValue(String.class);
String accountType = ds.child("accountType").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); String name = ds.child("establishmentName").getValue(String.class);
if (name == null) if (name == null)
name = ds.child("displayName").getValue(String.class); name = ds.child("displayName").getValue(String.class);

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 AccountType selectedAccountType = AccountType.CLIENTE;
private AccountAction selectedAccountAction = AccountAction.ENTRAR; private AccountAction selectedAccountAction = AccountAction.ENTRAR;
private Button btnCliente;
private Button btnEstabelecimento;
private Button btnEntrar; private Button btnEntrar;
private Button btnCriarConta; private Button btnCriarConta;
private Button btnPrimaryAction; private Button btnPrimaryAction;
@@ -101,12 +98,13 @@ public class MainActivity extends AppCompatActivity {
return insets; return insets;
}); });
selectedAccountType = AccountType.CLIENTE;
FirebaseApp.initializeApp(this); FirebaseApp.initializeApp(this);
firebaseAuth = FirebaseAuth.getInstance(); firebaseAuth = FirebaseAuth.getInstance();
databaseReference = FirebaseDatabase.getInstance().getReference(); databaseReference = FirebaseDatabase.getInstance().getReference();
bindViews(); bindViews();
setupTypeToggle();
setupActionToggle(); setupActionToggle();
setupPrimaryAction(); setupPrimaryAction();
checkPermissions(); checkPermissions();
@@ -177,8 +175,6 @@ public class MainActivity extends AppCompatActivity {
} }
private void bindViews() { private void bindViews() {
btnCliente = findViewById(R.id.btnCliente);
btnEstabelecimento = findViewById(R.id.btnEstabelecimento);
btnEntrar = findViewById(R.id.btnEntrar); btnEntrar = findViewById(R.id.btnEntrar);
btnCriarConta = findViewById(R.id.btnCriarConta); btnCriarConta = findViewById(R.id.btnCriarConta);
btnPrimaryAction = findViewById(R.id.btnFinalCriarConta); 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() { private void setupActionToggle() {
btnEntrar.setOnClickListener(v -> { btnEntrar.setOnClickListener(v -> {
@@ -269,11 +254,6 @@ public class MainActivity extends AppCompatActivity {
updatePrimaryActionState(); updatePrimaryActionState();
} }
private void updateTypeButtons() {
setSelectedState(btnCliente, selectedAccountType == AccountType.CLIENTE);
setSelectedState(btnEstabelecimento, selectedAccountType == AccountType.ESTABELECIMENTO);
updateInputVisibility();
}
private void updateActionButtons() { private void updateActionButtons() {
setSelectedState(btnEntrar, selectedAccountAction == AccountAction.ENTRAR); 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 role = ds.child("role").getValue(String.class);
String accountType = ds.child("accountType").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); String name = ds.child("establishmentName").getValue(String.class);
if (name == null) if (name == null)
name = ds.child("displayName").getValue(String.class); name = ds.child("displayName").getValue(String.class);

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

@@ -79,30 +79,7 @@
android:layout_height="50dp" android:layout_height="50dp"
android:background="@drawable/bg_tabs" android:background="@drawable/bg_tabs"
android:orientation="horizontal" android:orientation="horizontal"
android:padding="3dp"> 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 <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"