From a56725c310d985b60027c754de2faf3a6a5fa641 Mon Sep 17 00:00:00 2001 From: Avior <2bazert@gmail.com> Date: Mon, 19 Feb 2018 22:28:35 +0100 Subject: [PATCH] Updating time --- .idea/modules.xml | 2 +- .../Android/Hangman/GameActivity.java | 9 ++- .../Android/Hangman/Util/GameUtil.java | 9 ++- .../Hangman/settings/SettingActivity.java | 1 - app/src/main/res/drawable/btn_light.xml | 5 -- .../res/drawable/{ripple.xml => button.xml} | 6 +- app/src/main/res/drawable/people.xml | 8 +++ app/src/main/res/drawable/people_black.xml | 9 --- app/src/main/res/drawable/people_white.xml | 9 --- app/src/main/res/drawable/person.xml | 8 +++ app/src/main/res/drawable/person_black.xml | 9 --- app/src/main/res/drawable/person_white.xml | 9 --- app/src/main/res/layout/activity_main.xml | 8 +-- app/src/main/res/layout/game_activity.xml | 2 +- app/src/main/res/values/arrays.xml | 3 +- app/src/main/res/values/colors.xml | 15 +++-- app/src/main/res/values/styles.xml | 55 ++++++++++++++----- 17 files changed, 91 insertions(+), 76 deletions(-) delete mode 100644 app/src/main/res/drawable/btn_light.xml rename app/src/main/res/drawable/{ripple.xml => button.xml} (72%) create mode 100644 app/src/main/res/drawable/people.xml delete mode 100644 app/src/main/res/drawable/people_black.xml delete mode 100644 app/src/main/res/drawable/people_white.xml create mode 100644 app/src/main/res/drawable/person.xml delete mode 100644 app/src/main/res/drawable/person_black.xml delete mode 100644 app/src/main/res/drawable/person_white.xml diff --git a/.idea/modules.xml b/.idea/modules.xml index 5d35779..7d95eba 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,8 +2,8 @@ - + \ No newline at end of file diff --git a/app/src/main/java/net/DeltaWings/Android/Hangman/GameActivity.java b/app/src/main/java/net/DeltaWings/Android/Hangman/GameActivity.java index 4f39e9e..bc207ed 100644 --- a/app/src/main/java/net/DeltaWings/Android/Hangman/GameActivity.java +++ b/app/src/main/java/net/DeltaWings/Android/Hangman/GameActivity.java @@ -17,6 +17,7 @@ import android.widget.TextView; import net.DeltaWings.Android.Hangman.Util.ConnectionUtil; import java.util.ArrayList; +import java.util.Arrays; import java.util.HashMap; import java.util.List; import java.util.Objects; @@ -25,7 +26,7 @@ public class GameActivity extends AppCompatActivity { private AlertDialog.Builder builder; private ConnectionUtil co; - private TextView textView; + private TextView word; private List letters = new ArrayList<>(); private Context context = this; @@ -47,7 +48,7 @@ public class GameActivity extends AppCompatActivity { MainActivity.setTheme(this); setContentView(R.layout.game_activity); - textView = findViewById(R.id.textView2); + word = findViewById(R.id.letters); ProgressBar progressBar = findViewById(R.id.progressBar); EditText input = findViewById(R.id.input); @@ -112,6 +113,7 @@ public class GameActivity extends AppCompatActivity { //get result HashMap result = co.getDatas(); + word.setText(result.get("newWord")); if(Objects.equals(result.get("status"), "won")) { //check if player won //Game Won @@ -142,6 +144,9 @@ public class GameActivity extends AppCompatActivity { .setPositiveButton("Restart", clickListener) .setNegativeButton("Quit", clickListener) .show(); + } else { + letters = Arrays.asList(result.get("lettersUsed")); + log(letters.toString()); } //Send Letter txt.setText("", TextView.BufferType.EDITABLE); diff --git a/app/src/main/java/net/DeltaWings/Android/Hangman/Util/GameUtil.java b/app/src/main/java/net/DeltaWings/Android/Hangman/Util/GameUtil.java index c12aa39..2600c12 100644 --- a/app/src/main/java/net/DeltaWings/Android/Hangman/Util/GameUtil.java +++ b/app/src/main/java/net/DeltaWings/Android/Hangman/Util/GameUtil.java @@ -1,5 +1,6 @@ package net.DeltaWings.Android.Hangman.Util; +import android.text.TextUtils; import android.util.Log; import android.widget.Toast; @@ -29,8 +30,6 @@ public class GameUtil { returning.clear(); String query = datas.get("query"); if(Objects.equals(query, "letter")) { - Log.v(tag, "1"); - Log.v(tag, "1"); String letter = datas.get("letter"); if(word.contains(letter)) { Log.v(tag, "2"); @@ -43,8 +42,12 @@ public class GameUtil { //winner returning.put("status", "won"); } + } else { + } - returning.put("newWord", res.toString()); + letters.add(letter); + returning.put("newWord", TextUtils.join("", res)); + returning.put("lettersUsed", TextUtils.join(",", letters)); } else if (Objects.equals(query, "word")) { if(Objects.equals(datas.get("word"), word)) { returning.put("status", "won"); diff --git a/app/src/main/java/net/DeltaWings/Android/Hangman/settings/SettingActivity.java b/app/src/main/java/net/DeltaWings/Android/Hangman/settings/SettingActivity.java index 3d88ff6..523211e 100644 --- a/app/src/main/java/net/DeltaWings/Android/Hangman/settings/SettingActivity.java +++ b/app/src/main/java/net/DeltaWings/Android/Hangman/settings/SettingActivity.java @@ -35,7 +35,6 @@ public class SettingActivity extends PreferenceActivity { @Override public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - MainActivity.setTheme(this); LinearLayout root = (LinearLayout)findViewById(android.R.id.list).getParent().getParent().getParent(); diff --git a/app/src/main/res/drawable/btn_light.xml b/app/src/main/res/drawable/btn_light.xml deleted file mode 100644 index 66bf142..0000000 --- a/app/src/main/res/drawable/btn_light.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ripple.xml b/app/src/main/res/drawable/button.xml similarity index 72% rename from app/src/main/res/drawable/ripple.xml rename to app/src/main/res/drawable/button.xml index 4aee894..f765427 100644 --- a/app/src/main/res/drawable/ripple.xml +++ b/app/src/main/res/drawable/button.xml @@ -2,9 +2,7 @@ + android:color="?android:attr/colorAccent"> - + \ No newline at end of file diff --git a/app/src/main/res/drawable/people.xml b/app/src/main/res/drawable/people.xml new file mode 100644 index 0000000..5dd51a2 --- /dev/null +++ b/app/src/main/res/drawable/people.xml @@ -0,0 +1,8 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/people_black.xml b/app/src/main/res/drawable/people_black.xml deleted file mode 100644 index ae79dd6..0000000 --- a/app/src/main/res/drawable/people_black.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/people_white.xml b/app/src/main/res/drawable/people_white.xml deleted file mode 100644 index 25d5892..0000000 --- a/app/src/main/res/drawable/people_white.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/person.xml b/app/src/main/res/drawable/person.xml new file mode 100644 index 0000000..5ca22d2 --- /dev/null +++ b/app/src/main/res/drawable/person.xml @@ -0,0 +1,8 @@ + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/person_black.xml b/app/src/main/res/drawable/person_black.xml deleted file mode 100644 index 480a3bf..0000000 --- a/app/src/main/res/drawable/person_black.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/person_white.xml b/app/src/main/res/drawable/person_white.xml deleted file mode 100644 index 725c83f..0000000 --- a/app/src/main/res/drawable/person_white.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 9e28dc7..dfe8c1c 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -40,12 +40,11 @@ android:layout_centerHorizontal="true" android:layout_marginTop="64dp" android:layout_weight="1" - android:background='@drawable/ripple' - android:elevation="0dp" + android:background="@drawable/button" android:text="@string/singleplayer" - android:textColor="@color/White" android:textAppearance="@style/TextAppearance.AppCompat" app:layout_constraintTop_toBottomOf="@+id/imageView" + android:stateListAnimator="@null" tools:layout_editor_absoluteX="142dp"/>