renaming & added missing string

SecUSo · Mar 5, 2017 · fda5632 · fda5632
1 parent dde2a8b
commit fda5632
Show file tree

Hide file tree

Showing 5 changed files with 12 additions and 9 deletions.
diff --git a/app/src/main/java/org/secuso/privacyfriendlywerwolf/activity/BaseActivity.java b/app/src/main/java/org/secuso/privacyfriendlywerwolf/activity/BaseActivity.java
@@ -19,7 +19,7 @@
 import android.view.View;
 
 import org.secuso.privacyfriendlywerwolf.R;
-import org.secuso.privacyfriendlywerwolf.dialog.PlayerNameInputDialog;
+import org.secuso.privacyfriendlywerwolf.dialog.PlayerInputDialog;
 
 /**
  * Base activity is the template for all other activities to inherite
@@ -148,9 +148,9 @@ private void callDrawerItem(final int itemId) {
                 startActivity(intent);
                 break;
             case R.id.nav_new_game:
-                PlayerNameInputDialog playerNameInputDialog = new PlayerNameInputDialog();
-                playerNameInputDialog.setCancelable(false);
-                playerNameInputDialog.show(getFragmentManager(), "dialog_from_drawer");
+                PlayerInputDialog playerInputDialog = new PlayerInputDialog();
+                playerInputDialog.setCancelable(false);
+                playerInputDialog.show(getFragmentManager(), "dialog_from_drawer");
                 break;
             case R.id.nav_join_game:
                 intent = new Intent(this, StartClientActivity.class);

diff --git a/app/src/main/java/org/secuso/privacyfriendlywerwolf/activity/MainActivity.java b/app/src/main/java/org/secuso/privacyfriendlywerwolf/activity/MainActivity.java
@@ -8,7 +8,7 @@
 import android.widget.Button;
 
 import org.secuso.privacyfriendlywerwolf.R;
-import org.secuso.privacyfriendlywerwolf.dialog.PlayerNameInputDialog;
+import org.secuso.privacyfriendlywerwolf.dialog.PlayerInputDialog;
 
 /**
  * Starting activiy when the game is fully loaded and tutorial is passed
@@ -54,9 +54,9 @@ public void onClick(View view) {
      * @param view
      */
     public void startNewGame(View view) {
-        PlayerNameInputDialog playerNameInputDialog = new PlayerNameInputDialog();
-        playerNameInputDialog.setCancelable(false);
-        playerNameInputDialog.show(getFragmentManager(), "playerNameInputDialog");
+        PlayerInputDialog playerInputDialog = new PlayerInputDialog();
+        playerInputDialog.setCancelable(false);
+        playerInputDialog.show(getFragmentManager(), "playerInputDialog");
     }
 
     /**

diff --git a/...werwolf/dialog/PlayernameInputDialog.java → ...ndlywerwolf/dialog/PlayerInputDialog.java b/...werwolf/dialog/PlayernameInputDialog.java → ...ndlywerwolf/dialog/PlayerInputDialog.java
@@ -24,7 +24,7 @@
  *
  * @author Tobias Kowalski <[email protected]>
  */
-public class PlayerNameInputDialog extends DialogFragment {
+public class PlayerInputDialog extends DialogFragment {
 
     private EditText userInput;
     private SharedPreferences sharedPref;

diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
@@ -208,4 +208,5 @@
     <string name="credit_artist">Interpret: Kevin MacLeod</string>
     <string name="license_cc_url">Lizenz: <a href="http://creativecommons.org/licenses/by/3.0/">CC-BY-3.0</a></string>
     <string name="credit_url">Quelle: <a href="http://incompetech.com/music/royalty-free/?keywords=comfortable+mystery+2">Incompetech</a></string>
+    <string name="pref_cat_title_timer">Timer</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -238,6 +238,8 @@ After these phases the process starts again.</string>
     <string name="credit_artist">Artist: Kevin MacLeod</string>
     <string name="license_cc_url">License: <a href="http://creativecommons.org/licenses/by/3.0/">CC-BY-3.0</a></string>
     <string name="credit_url">Source: <a href="http://incompetech.com/music/royalty-free/?keywords=comfortable+mystery+2">Incompetech</a></string>
+    <string name="pref_cat_title_timer">Timer</string>
+    <string name="pref_cat_title">Timer</string>
 </resources>