Merge remote-tracking branch 'origin/main'

SE2-Gwent-SS23 · Jun 19, 2023 · f46c94a · f46c94a
2 parents 861abc7 + 82072db
commit f46c94a
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 12 deletions.
diff --git a/app/src/main/java/at/moritzmusel/gwent/ui/SelectNameActivity.java b/app/src/main/java/at/moritzmusel/gwent/ui/SelectNameActivity.java
@@ -7,7 +7,6 @@
 import android.view.View;
 import android.widget.EditText;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import at.moritzmusel.gwent.R;
 
@@ -25,21 +24,21 @@ protected void onCreate(Bundle savedInstanceState) {
         Intent loadingIntent = new Intent(SelectNameActivity.this, LoadingActivity.class);
         String storedName = "" + SaveStringToFileClass.getSavedData(getBaseContext(), getString(R.string.playerName_fileName));
 
-        Boolean extra = getIntent().getExtras().getBoolean("comingFromSettings", false);
+        Boolean extra = getIntent().getExtras().getBoolean("comingFromWelcome", true);
 
-        if (storedName.length() > 4 && !extra) {
+        if (storedName.length() > 4 && Boolean.TRUE.equals(extra)) {
             startActivity(loadingIntent);
         }
 
         findViewById(R.id.button_enterName).setOnClickListener(view -> {
             String userInput = name.getText().toString();
 
-            if (userInput.length() > 0) {
+            if (userInput.length() > 4) {
                 SaveStringToFileClass.saveData(getBaseContext(), getString(R.string.playerName_fileName), userInput);
                 startActivity(loadingIntent);
             } else {
                 error.setVisibility(View.VISIBLE);
             }
         });
     }
-}
+}
diff --git a/app/src/main/java/at/moritzmusel/gwent/ui/SettingsActivity.java b/app/src/main/java/at/moritzmusel/gwent/ui/SettingsActivity.java
@@ -20,7 +20,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         changeName.setOnClickListener(view -> {
             Intent nameIntent = new Intent(SettingsActivity.this, SelectNameActivity.class);
-            nameIntent.putExtra("comingFromSettings", true);
+            nameIntent.putExtra("comingFromWelcome", false);
             startActivity(nameIntent);
         });
 

diff --git a/app/src/main/java/at/moritzmusel/gwent/ui/WelcomeActivity.java b/app/src/main/java/at/moritzmusel/gwent/ui/WelcomeActivity.java
@@ -22,7 +22,7 @@ protected void onCreate(Bundle savedInstanceState) {
         backgroundImg.setOnClickListener(view -> {
             // Starting Load Screen when Welcome Screen is clicked
             Intent intent = new Intent(WelcomeActivity.this, SelectNameActivity.class);
-            intent.putExtra("comingFromSettings", false);
+            intent.putExtra("comingFromWelcome", true);
             startActivity(intent);
         });
     }

diff --git a/app/src/main/res/layout/activity_select_name.xml b/app/src/main/res/layout/activity_select_name.xml
@@ -11,7 +11,7 @@
         android:id="@+id/textView_enterName"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Geben sie einen Namen ein:"
+        android:text="@string/enterNameString"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -22,21 +22,22 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:ems="10"
+        android:hint="@string/name"
         android:inputType="textPersonName"
         android:minHeight="48dp"
-        android:text="Name"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.499"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.606" />
+        app:layout_constraintVertical_bias="0.606"
+        android:importantForAutofill="no" />
 
     <Button
         android:id="@+id/button_enterName"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Bestätigen"
+        android:text="@string/btn_bestaetigen"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.499"
@@ -48,7 +49,7 @@
         android:id="@+id/textView_Error"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Bitte einen Namen eingeben!"
+        android:text="@string/errormsg"
         android:textColor="#F44336"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -25,4 +25,8 @@
     <string name="lobby">Lobby</string>
     <string name="info">Info</string>
     <string name="playerName_fileName">nameFile</string>
+    <string name="enterNameString">Geben sie einen Namen ein:</string>
+    <string name="name">Name</string>
+    <string name="btn_bestaetigen">Bestätigen</string>
+    <string name="errormsg">Bitte einen Namen mit mindestens 5 Zeichen eingeben!</string>
 </resources>