Rakantor/iubh-gamer-app
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Refactor

Browse Source
This commit is contained in:
Rakantor
2022-07-27 22:30:04 +02:00
parent 2a89f71aaa
commit c37f5b18e0
7 changed files with 37 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
.idea/deploymentTargetDropDown.xml generated Normal file
View File

@@ -0,0 +1,17 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="deploymentTargetDropDown">
<targetSelectedWithDropDown>
<Target>
<type value="QUICK_BOOT_TARGET" />
<deviceKey>
<Key>
<type value="VIRTUAL_DEVICE_PATH" />
<value value="C:\Users\Pro\.android\avd\Pixel_5_API_31.avd" />
</Key>
</deviceKey>
</Target>
</targetSelectedWithDropDown>
<timeTargetWasSelectedWithDropDown value="2022-07-26T20:44:47.808418600Z" />
</component>
</project>

6
app/src/main/java/com/example/iubhgamerapp/ui/ChatFragment.java
View File

@@ -34,7 +34,7 @@ import java.util.Objects;
public class ChatFragment extends Fragment { public class ChatFragment extends Fragment {
private FirebaseUser mUser; private FirebaseUser mUser;
private DatabaseReference refChatMessages, refUsers; private DatabaseReference refChatMessages;
private Map<String, String> users; private Map<String, String> users;
private List<ChatMessage> chatMessages; private List<ChatMessage> chatMessages;
private RecyclerView rv; private RecyclerView rv;
@@ -54,7 +54,7 @@ public class ChatFragment extends Fragment {
// Connect to Firebase realtime database // Connect to Firebase realtime database
mUser = FirebaseAuth.getInstance().getCurrentUser(); mUser = FirebaseAuth.getInstance().getCurrentUser();
refChatMessages = FirebaseDatabase.getInstance().getReference().child("nachrichten"); refChatMessages = FirebaseDatabase.getInstance().getReference().child("nachrichten");
refUsers = FirebaseDatabase.getInstance().getReference().child("spieler"); DatabaseReference refUsers = FirebaseDatabase.getInstance().getReference().child("spieler");
// Get list of registered users from Firebase database // Get list of registered users from Firebase database
refUsers.addValueEventListener(new ValueEventListener() { refUsers.addValueEventListener(new ValueEventListener() {
@@ -142,7 +142,7 @@ public class ChatFragment extends Fragment {
// Convert epoch timestamp to formatted date string // Convert epoch timestamp to formatted date string
Date date = new Date(timestamp * 1000L); Date date = new Date(timestamp * 1000L);
this.date = new SimpleDateFormat("dd.MM.yyyy HH:mm", Locale.getDefault()).format(date); this.date = new SimpleDateFormat("dd.MM.yyyy HH:mm", Locale.GERMAN).format(date);
// Check if the sender's user id still exist in the database. // Check if the sender's user id still exist in the database.
// If so, extract their nickname // If so, extract their nickname

7
app/src/main/java/com/example/iubhgamerapp/ui/HomeFragment.java
View File

@@ -35,6 +35,7 @@ import java.util.HashMap;
import java.util.List; import java.util.List;
import java.util.Locale; import java.util.Locale;
import java.util.Map; import java.util.Map;
import java.util.Objects;
public class HomeFragment extends Fragment { public class HomeFragment extends Fragment {
private View root; private View root;
@@ -45,7 +46,7 @@ public class HomeFragment extends Fragment {
private TextView welcome, nextDate, nextHost; private TextView welcome, nextDate, nextHost;
private Spinner spinnerGames; private Spinner spinnerGames;
private Map<Long, Integer> games = new HashMap<>(); private Map<Long, Integer> games = new HashMap<>();
private String userNickname, nextDateID; private String nextDateID;
public View onCreateView(@NonNull LayoutInflater inflater, public View onCreateView(@NonNull LayoutInflater inflater,
ViewGroup container, Bundle savedInstanceState) { ViewGroup container, Bundle savedInstanceState) {
@@ -147,7 +148,7 @@ public class HomeFragment extends Fragment {
public void onDataChange(@NonNull DataSnapshot dataSnapshot) { public void onDataChange(@NonNull DataSnapshot dataSnapshot) {
for(DataSnapshot ds : dataSnapshot.getChildren()) { for(DataSnapshot ds : dataSnapshot.getChildren()) {
nextDateID = ds.getKey(); nextDateID = ds.getKey();
long epoch = Long.parseLong(nextDateID); long epoch = Long.parseLong(Objects.requireNonNull(nextDateID, "Epoch time must not be null!"));
if(epoch < (System.currentTimeMillis() / 1000L)) { if(epoch < (System.currentTimeMillis() / 1000L)) {
addUpcomingEvent(epoch); addUpcomingEvent(epoch);
@@ -254,7 +255,7 @@ public class HomeFragment extends Fragment {
} }
private void updateUI() { private void updateUI() {
userNickname = (String)dsUsers.child(mUser.getUid()).child("nickname").getValue(); String userNickname = (String) dsUsers.child(mUser.getUid()).child("nickname").getValue();
String sWelcome = userNickname + getString(R.string.welcome_back); String sWelcome = userNickname + getString(R.string.welcome_back);
welcome.setText(sWelcome); welcome.setText(sWelcome);
} }

11
app/src/main/java/com/example/iubhgamerapp/ui/RatingFragment.java
View File

@@ -33,9 +33,10 @@ import java.util.Locale;
import java.util.Map; import java.util.Map;
public class RatingFragment extends Fragment { public class RatingFragment extends Fragment {
private final int ratableEventsCount = 5;
private EventDate selectedEvent; private EventDate selectedEvent;
private FirebaseUser mUser; private FirebaseUser mUser;
private DatabaseReference refUsers, refEvents; private DatabaseReference refEvents;
private View root; private View root;
private List<EventDate> eventDates; private List<EventDate> eventDates;
private Map<String, String> users; private Map<String, String> users;
@@ -70,7 +71,7 @@ public class RatingFragment extends Fragment {
rbFood.setRating(selectedEvent.ownFoodRating); rbFood.setRating(selectedEvent.ownFoodRating);
rbHost.setRating(selectedEvent.ownHostRating); rbHost.setRating(selectedEvent.ownHostRating);
tvHost.setText("Host (" + selectedEvent.hostName + ")"); tvHost.setText(getString(R.string.host_rating, selectedEvent.hostName));
String sNoRatings = getString(R.string.zero_ratings); String sNoRatings = getString(R.string.zero_ratings);
@@ -92,7 +93,7 @@ public class RatingFragment extends Fragment {
// Connect to Firebase realtime database // Connect to Firebase realtime database
mUser = FirebaseAuth.getInstance().getCurrentUser(); mUser = FirebaseAuth.getInstance().getCurrentUser();
refUsers = FirebaseDatabase.getInstance().getReference().child("spieler"); DatabaseReference refUsers = FirebaseDatabase.getInstance().getReference().child("spieler");
refEvents = FirebaseDatabase.getInstance().getReference().child("termine"); refEvents = FirebaseDatabase.getInstance().getReference().child("termine");
// Get list of registered users from Firebase database // Get list of registered users from Firebase database
@@ -144,7 +145,7 @@ public class RatingFragment extends Fragment {
* Only the last 3 events can be rated. * Only the last 3 events can be rated.
*/ */
private void getPastEvents() { private void getPastEvents() {
refEvents.orderByKey().limitToLast(4).addValueEventListener(new ValueEventListener() { refEvents.orderByKey().limitToLast(ratableEventsCount+1).addValueEventListener(new ValueEventListener() {
@Override @Override
public void onDataChange(@NonNull DataSnapshot dataSnapshot) { public void onDataChange(@NonNull DataSnapshot dataSnapshot) {
// Iterate through events to extract metadata // Iterate through events to extract metadata
@@ -233,7 +234,7 @@ public class RatingFragment extends Fragment {
String getFormattedDate() { String getFormattedDate() {
Date date = new Date(this.epochTimestamp * 1000L); Date date = new Date(this.epochTimestamp * 1000L);
return new SimpleDateFormat("EEEE, dd. MMMM yyyy", Locale.getDefault()).format(date); return new SimpleDateFormat("EEEE, dd. MMMM yyyy", Locale.GERMAN).format(date);
} }
} }
} }

2
app/src/main/res/layout/activity_login.xml
View File

@@ -22,6 +22,7 @@
android:hint="@string/prompt_email" android:hint="@string/prompt_email"
android:inputType="textEmailAddress" android:inputType="textEmailAddress"
android:selectAllOnFocus="true" android:selectAllOnFocus="true"
android:text="user@iubh-gamer-app.com"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
@@ -39,6 +40,7 @@
android:imeOptions="actionDone" android:imeOptions="actionDone"
android:inputType="textPassword" android:inputType="textPassword"
android:selectAllOnFocus="true" android:selectAllOnFocus="true"
android:text="123abc"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/username" /> app:layout_constraintTop_toBottomOf="@+id/username" />

2
app/src/main/res/layout/fragment_rating.xml
View File

@@ -81,7 +81,7 @@
android:id="@+id/textView3" android:id="@+id/textView3"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="Essen & Trinken" /> android:text="Essen und Trinken" />
<RatingBar <RatingBar
android:id="@+id/ratingBar_food" android:id="@+id/ratingBar_food"

7
app/src/main/res/values/strings.xml
View File

@@ -13,10 +13,11 @@
<string name="db_comm_err">Database communication error.</string> <string name="db_comm_err">Database communication error.</string>
<string name="firebase_auth_failed">Falsche E-Mail-Adresse oder Passwort.</string> <string name="firebase_auth_failed">Falsche E-Mail-Adresse oder Passwort.</string>
<string name="firebase_signin_progress">Du wirst eingeloggt…</string> <string name="firebase_signin_progress">Du wirst eingeloggt…</string>
<string name="firebase_credentials_missing">Email or password field empty!</string> <string name="firebase_credentials_missing">E-Mail- oder Passwortfeld leer!</string>
<string name="btn_cancel">Abbrechen</string> <string name="btn_cancel">Abbrechen</string>
<string name="input_dialog_title">Spieletitel</string> <string name="input_dialog_title">Spieletitel</string>
<string name="rate_error">Please rate every item.</string> <string name="rate_error">Bitte bewerte alle Kategorien.</string>
<string name="zero_ratings">Keine Bewertungen vorhanden.</string> <string name="zero_ratings">Keine Bewertungen vorhanden.</string>
<string name="other_ratings">Others gave %1$d* (%2$d ratings)</string> <string name="other_ratings">Andere vergaben %1$d* (%2$d Bewertung)</string>
<string name="host_rating">Gastgeber (%1$s)</string>
</resources> </resources>