diff --git a/.idea/deploymentTargetDropDown.xml b/.idea/deploymentTargetDropDown.xml
new file mode 100644
index 0000000..77f1e66
--- /dev/null
+++ b/.idea/deploymentTargetDropDown.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/java/com/example/iubhgamerapp/ui/ChatFragment.java b/app/src/main/java/com/example/iubhgamerapp/ui/ChatFragment.java
index c83baae..ebcf9a1 100755
--- a/app/src/main/java/com/example/iubhgamerapp/ui/ChatFragment.java
+++ b/app/src/main/java/com/example/iubhgamerapp/ui/ChatFragment.java
@@ -34,7 +34,7 @@ import java.util.Objects;
public class ChatFragment extends Fragment {
private FirebaseUser mUser;
- private DatabaseReference refChatMessages, refUsers;
+ private DatabaseReference refChatMessages;
private Map users;
private List chatMessages;
private RecyclerView rv;
@@ -54,7 +54,7 @@ public class ChatFragment extends Fragment {
// Connect to Firebase realtime database
mUser = FirebaseAuth.getInstance().getCurrentUser();
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
refUsers.addValueEventListener(new ValueEventListener() {
@@ -142,7 +142,7 @@ public class ChatFragment extends Fragment {
// Convert epoch timestamp to formatted date string
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.
// If so, extract their nickname
diff --git a/app/src/main/java/com/example/iubhgamerapp/ui/HomeFragment.java b/app/src/main/java/com/example/iubhgamerapp/ui/HomeFragment.java
index 70ff578..d4d0bd6 100755
--- a/app/src/main/java/com/example/iubhgamerapp/ui/HomeFragment.java
+++ b/app/src/main/java/com/example/iubhgamerapp/ui/HomeFragment.java
@@ -35,6 +35,7 @@ import java.util.HashMap;
import java.util.List;
import java.util.Locale;
import java.util.Map;
+import java.util.Objects;
public class HomeFragment extends Fragment {
private View root;
@@ -45,7 +46,7 @@ public class HomeFragment extends Fragment {
private TextView welcome, nextDate, nextHost;
private Spinner spinnerGames;
private Map games = new HashMap<>();
- private String userNickname, nextDateID;
+ private String nextDateID;
public View onCreateView(@NonNull LayoutInflater inflater,
ViewGroup container, Bundle savedInstanceState) {
@@ -147,7 +148,7 @@ public class HomeFragment extends Fragment {
public void onDataChange(@NonNull DataSnapshot dataSnapshot) {
for(DataSnapshot ds : dataSnapshot.getChildren()) {
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)) {
addUpcomingEvent(epoch);
@@ -254,7 +255,7 @@ public class HomeFragment extends Fragment {
}
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);
welcome.setText(sWelcome);
}
diff --git a/app/src/main/java/com/example/iubhgamerapp/ui/RatingFragment.java b/app/src/main/java/com/example/iubhgamerapp/ui/RatingFragment.java
index 6333d85..3dfbc95 100644
--- a/app/src/main/java/com/example/iubhgamerapp/ui/RatingFragment.java
+++ b/app/src/main/java/com/example/iubhgamerapp/ui/RatingFragment.java
@@ -33,9 +33,10 @@ import java.util.Locale;
import java.util.Map;
public class RatingFragment extends Fragment {
+ private final int ratableEventsCount = 5;
private EventDate selectedEvent;
private FirebaseUser mUser;
- private DatabaseReference refUsers, refEvents;
+ private DatabaseReference refEvents;
private View root;
private List eventDates;
private Map users;
@@ -70,7 +71,7 @@ public class RatingFragment extends Fragment {
rbFood.setRating(selectedEvent.ownFoodRating);
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);
@@ -92,7 +93,7 @@ public class RatingFragment extends Fragment {
// Connect to Firebase realtime database
mUser = FirebaseAuth.getInstance().getCurrentUser();
- refUsers = FirebaseDatabase.getInstance().getReference().child("spieler");
+ DatabaseReference refUsers = FirebaseDatabase.getInstance().getReference().child("spieler");
refEvents = FirebaseDatabase.getInstance().getReference().child("termine");
// 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.
*/
private void getPastEvents() {
- refEvents.orderByKey().limitToLast(4).addValueEventListener(new ValueEventListener() {
+ refEvents.orderByKey().limitToLast(ratableEventsCount+1).addValueEventListener(new ValueEventListener() {
@Override
public void onDataChange(@NonNull DataSnapshot dataSnapshot) {
// Iterate through events to extract metadata
@@ -233,7 +234,7 @@ public class RatingFragment extends Fragment {
String getFormattedDate() {
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);
}
}
}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 3d637ef..2ab0b04 100755
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -22,6 +22,7 @@
android:hint="@string/prompt_email"
android:inputType="textEmailAddress"
android:selectAllOnFocus="true"
+ android:text="user@iubh-gamer-app.com"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@@ -39,6 +40,7 @@
android:imeOptions="actionDone"
android:inputType="textPassword"
android:selectAllOnFocus="true"
+ android:text="123abc"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/username" />
diff --git a/app/src/main/res/layout/fragment_rating.xml b/app/src/main/res/layout/fragment_rating.xml
index c49359c..afb0180 100644
--- a/app/src/main/res/layout/fragment_rating.xml
+++ b/app/src/main/res/layout/fragment_rating.xml
@@ -81,7 +81,7 @@
android:id="@+id/textView3"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:text="Essen & Trinken" />
+ android:text="Essen und Trinken" />
Database communication error.
Falsche E-Mail-Adresse oder Passwort.
Du wirst eingeloggt…
- Email or password field empty!
+ E-Mail- oder Passwortfeld leer!
Abbrechen
Spieletitel
- Please rate every item.
+ Bitte bewerte alle Kategorien.
Keine Bewertungen vorhanden.
- Others gave %1$d* (%2$d ratings)
+ Andere vergaben %1$d* (%2$d Bewertung)
+ Gastgeber (%1$s)