From a018ad56eecb2cb4703b31996dcae3c9beb6b9f1 Mon Sep 17 00:00:00 2001 From: Aviortheking <2bazert@gmail.com> Date: Mon, 29 Jan 2018 00:13:06 +0100 Subject: [PATCH] Update time ! --- .idea/misc.xml | 15 +-- app/build.gradle | 2 +- .../Android/Hangman/GameActivity.java | 93 ++++++++++++++++--- .../Android/Hangman/Util/ConnectionUtil.java | 32 +++++++ app/src/main/res/layout/game_activity.xml | 24 +++-- build.gradle | 2 +- gradle/wrapper/gradle-wrapper.properties | 4 +- 7 files changed, 131 insertions(+), 41 deletions(-) create mode 100644 app/src/main/java/net/DeltaWings/Android/Hangman/Util/ConnectionUtil.java diff --git a/.idea/misc.xml b/.idea/misc.xml index 5d19981..635999d 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,8 +1,5 @@ - - - - - - - - - - - - - - + diff --git a/app/build.gradle b/app/build.gradle index ced5831..c7df1fa 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -4,7 +4,7 @@ android { buildToolsVersion "26.0.1" defaultConfig { applicationId "net.DeltaWings.Android.Hangman" - minSdkVersion 15 + minSdkVersion 16 targetSdkVersion 26 versionCode 1 versionName "1.0" 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 62bf956..5cd6c5d 100644 --- a/app/src/main/java/net/DeltaWings/Android/Hangman/GameActivity.java +++ b/app/src/main/java/net/DeltaWings/Android/Hangman/GameActivity.java @@ -6,19 +6,26 @@ import android.os.Bundle; import android.support.v7.app.ActionBar; import android.support.v7.app.AlertDialog; import android.support.v7.app.AppCompatActivity; +import android.view.KeyEvent; import android.view.animation.DecelerateInterpolator; +import android.widget.EditText; import android.widget.ProgressBar; -import android.widget.Toast; +import android.widget.TextView; -import static net.DeltaWings.Android.Hangman.MainActivity.instance; +import net.DeltaWings.Android.Hangman.Util.ConnectionUtil; + +import java.util.ArrayList; +import java.util.List; public class GameActivity extends AppCompatActivity { - ProgressBar progressBar; - AlertDialog.Builder builder; + private AlertDialog.Builder builder; + private ConnectionUtil co; + private List letters = new ArrayList<>(); @Override public void onBackPressed() { + builder.show(); } @Override @@ -29,47 +36,105 @@ public class GameActivity extends AppCompatActivity { @Override protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); + super.onCreate(savedInstanceState); setContentView(R.layout.game_activity); + ProgressBar progressBar = findViewById(R.id.progressBar); + EditText input = findViewById(R.id.input); + + log("Logs"); + log("Connecting..."); + co = new ConnectionUtil(); + ActionBar actionBar = getSupportActionBar(); if (actionBar != null) { actionBar.setHomeButtonEnabled(true); actionBar.setDisplayHomeAsUpEnabled(true); actionBar.setDisplayShowHomeEnabled(true); } else { - Toast.makeText(instance, " There is a problem here let's see what it is", Toast.LENGTH_LONG).show(); + log("A problem occurred Please restart the application"); } - progressBar = findViewById(R.id.progressBar); + + + DialogInterface.OnClickListener dialogClickListener = new DialogInterface.OnClickListener() { @Override public void onClick(DialogInterface dialog, int which) { switch (which){ case DialogInterface.BUTTON_POSITIVE: - Toast.makeText(instance, "Selected Yes", Toast.LENGTH_LONG).show(); - break; + //Close Connection + log("Closing connection"); + co.closeConnection(); - case DialogInterface.BUTTON_NEGATIVE: - Toast.makeText(instance, "Selected No", Toast.LENGTH_LONG).show(); + //send to main menu + finish(); + overridePendingTransition(R.anim.fade_in, R.anim.fade_out); break; } } }; + + + + + + //Input Management + input.setOnEditorActionListener(new TextView.OnEditorActionListener() { + @Override + public boolean onEditorAction(TextView v, int actionId, KeyEvent event) { + String text = ((EditText) v).getText().toString(); + if(text.length() == 1) { + log("Letter : " + text); + if(letters.contains(text)) { + log("Letter : " + text + "Already in"); + } else { + log("Sending letter " + text); + //Send Letter + } + } else if(text.length() > 1) { + log("Word : " + text); + } + return false; + } + }); + //Input Management + + + + + + + //Return Builder builder = new AlertDialog.Builder(this); - builder.setMessage("Are you sure?").setPositiveButton("Yes", dialogClickListener) + builder.setMessage("Do you really want to quit your game ?") + .setPositiveButton("Yes", dialogClickListener) .setNegativeButton("No", dialogClickListener); + //Return Builder + + + + + + + log("Connected !"); + setProgressAnimate(progressBar, 100); } - private void setProgressAnimate(ProgressBar pb, int progressTo) - { + + private void setProgressAnimate(ProgressBar pb, int progressTo) { ObjectAnimator animation = ObjectAnimator.ofInt(pb, "progress", pb.getProgress(), progressTo); animation.setDuration(250); animation.setInterpolator(new DecelerateInterpolator()); animation.start(); } + + private void log(String message) { + TextView logs = findViewById(R.id.logs); + logs.setText(logs.getText().toString() + "\n" + message); + } } diff --git a/app/src/main/java/net/DeltaWings/Android/Hangman/Util/ConnectionUtil.java b/app/src/main/java/net/DeltaWings/Android/Hangman/Util/ConnectionUtil.java new file mode 100644 index 0000000..46d24b4 --- /dev/null +++ b/app/src/main/java/net/DeltaWings/Android/Hangman/Util/ConnectionUtil.java @@ -0,0 +1,32 @@ +package net.DeltaWings.Android.Hangman.Util; + +import java.util.List; + +public class ConnectionUtil { + + static public ConnectionUtil connection; + + private String ip = null; + private String userID = null; + private String jsp = "jsp"; + public int percent = 0; + + public ConnectionUtil ConnectionUtil() { + + return this; + } + + public void closeConnection() { + + } + + public boolean sendData(List query) { + + return true; + } + + public Object getData() { + + return null; + } +} diff --git a/app/src/main/res/layout/game_activity.xml b/app/src/main/res/layout/game_activity.xml index 8472908..454d147 100644 --- a/app/src/main/res/layout/game_activity.xml +++ b/app/src/main/res/layout/game_activity.xml @@ -14,6 +14,7 @@ style="@android:style/Widget.DeviceDefault.Light.ProgressBar.Horizontal" android:layout_width="0dp" android:layout_height="wrap_content" + android:indeterminate="false" android:max="100" android:paddingTop="-4dp" android:progress="50" @@ -27,14 +28,13 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:orientation="horizontal" - app:layout_constraintGuide_begin="4dp" + app:layout_constraintGuide_begin="3dp" tools:layout_editor_absoluteX="0dp" tools:layout_editor_absoluteY="4dp"/> - + android:layout_height="0dp" + android:layout_weight="1"> + + + diff --git a/build.gradle b/build.gradle index c2eea8e..a47fa4b 100644 --- a/build.gradle +++ b/build.gradle @@ -5,7 +5,7 @@ buildscript { jcenter() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.3' + classpath 'com.android.tools.build:gradle:3.0.1' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 693a187..4bbd8e4 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Mon Sep 18 17:41:18 CEST 2017 +#Mon Jan 22 23:59:18 CET 2018 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip