diff --git a/app/build.gradle b/app/build.gradle
index 2e3b7d4..ced5831 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -3,7 +3,7 @@ android {
compileSdkVersion 26
buildToolsVersion "26.0.1"
defaultConfig {
- applicationId "net.DeltaWings.Android.Pendu"
+ applicationId "net.DeltaWings.Android.Hangman"
minSdkVersion 15
targetSdkVersion 26
versionCode 1
@@ -27,7 +27,6 @@ dependencies {
compile 'com.android.support.constraint:constraint-layout:1.0.2'
compile 'com.android.support:design:26.1.0'
compile 'com.android.support:support-vector-drawable:26.1.0'
- compile 'com.google.android.gms:play-services-ads:11.0.4'
testCompile 'junit:junit:4.12'
}
diff --git a/app/src/androidTest/java/net/DeltaWings/Android/Hangman/ExampleInstrumentedTest.java b/app/src/androidTest/java/net/DeltaWings/Android/Hangman/ExampleInstrumentedTest.java
index 2bfae03..7325021 100644
--- a/app/src/androidTest/java/net/DeltaWings/Android/Hangman/ExampleInstrumentedTest.java
+++ b/app/src/androidTest/java/net/DeltaWings/Android/Hangman/ExampleInstrumentedTest.java
@@ -21,6 +21,6 @@ public class ExampleInstrumentedTest {
// Context of the app under test.
Context appContext = InstrumentationRegistry.getTargetContext();
- assertEquals("net.DeltaWings.Android.Pendu", appContext.getPackageName());
+ assertEquals("net.DeltaWings.Android.Hangman", appContext.getPackageName());
}
}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index ade72a7..ba5ebb2 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,6 +1,6 @@
+ package="net.DeltaWings.Android.Hangman">
+ android:theme="@style/AppTheme"
+ android:fullBackupContent="@xml/backup_descriptor">
-
+
-
+
+
+
+
\ 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
new file mode 100644
index 0000000..62bf956
--- /dev/null
+++ b/app/src/main/java/net/DeltaWings/Android/Hangman/GameActivity.java
@@ -0,0 +1,75 @@
+package net.DeltaWings.Android.Hangman;
+
+import android.animation.ObjectAnimator;
+import android.content.DialogInterface;
+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.animation.DecelerateInterpolator;
+import android.widget.ProgressBar;
+import android.widget.Toast;
+
+import static net.DeltaWings.Android.Hangman.MainActivity.instance;
+
+public class GameActivity extends AppCompatActivity {
+
+ ProgressBar progressBar;
+ AlertDialog.Builder builder;
+
+ @Override
+ public void onBackPressed() {
+ }
+
+ @Override
+ public boolean onSupportNavigateUp(){
+ builder.show();
+ return true;
+ }
+
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+
+ setContentView(R.layout.game_activity);
+
+ 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();
+ }
+
+ 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;
+
+ case DialogInterface.BUTTON_NEGATIVE:
+ Toast.makeText(instance, "Selected No", Toast.LENGTH_LONG).show();
+ break;
+ }
+ }
+ };
+
+ builder = new AlertDialog.Builder(this);
+
+ builder.setMessage("Are you sure?").setPositiveButton("Yes", dialogClickListener)
+ .setNegativeButton("No", dialogClickListener);
+ }
+
+ 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();
+ }
+}
diff --git a/app/src/main/java/net/DeltaWings/Android/Hangman/MainActivity.java b/app/src/main/java/net/DeltaWings/Android/Hangman/MainActivity.java
index ed3ba91..d32fe53 100644
--- a/app/src/main/java/net/DeltaWings/Android/Hangman/MainActivity.java
+++ b/app/src/main/java/net/DeltaWings/Android/Hangman/MainActivity.java
@@ -1,7 +1,6 @@
package net.DeltaWings.Android.Hangman;
-import android.app.ProgressDialog;
-import android.content.DialogInterface;
+import android.content.Intent;
import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
@@ -11,59 +10,29 @@ import android.widget.Toast;
public class MainActivity extends AppCompatActivity {
public static MainActivity instance;
- public static Boolean test = true;
@Override
protected void onCreate(Bundle savedInstanceState) {
instance = this;
- test = true;
- final ProgressDialog progressDialog = new ProgressDialog(instance);
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_main);
- Toolbar toolbar = (Toolbar) findViewById(R.id.toolbar);
+ Toolbar toolbar = findViewById(R.id.toolbar);
setSupportActionBar(toolbar);
//Multiplayer button
findViewById(R.id.multiplayerButton).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- //setContentView(R.layout.activity_multiplayer);
- progressDialog.setMessage("Connecting...");
- //progressDialog.setCancelable(false);
- progressDialog.setOnShowListener(new ProgressDialog.OnShowListener() {
- @Override
- public void onShow(DialogInterface dialog) {
- Toast.makeText(instance, "test", Toast.LENGTH_LONG).show();
- }
- });
- progressDialog.setOnCancelListener(new ProgressDialog.OnCancelListener() {
- @Override
- public void onCancel(DialogInterface dialog) {
- progressDialog.setMessage("Cancelling...");
- progressDialog.setCancelable(false);
-
- //wait for canceletion.
- }
- });
- progressDialog.show();
- //Make Connection
-
- //
+ startActivity(new Intent(instance, GameActivity.class));
+ overridePendingTransition(R.anim.fade_in, R.anim.fade_out);
}
});
findViewById(R.id.singleplayerButton).setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
-
- }
- });
-
- findViewById(R.id.progressBar).setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- Toast.makeText(instance, test + "", Toast.LENGTH_LONG).show();
+ Toast.makeText(instance, "WIP", Toast.LENGTH_LONG).show();
}
});
}
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 3b10c4c..4aab150 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -11,6 +11,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/AppTheme.AppBarOverlay"
+ app:expanded="false"
tools:layout_editor_absoluteX="1dp"
tools:layout_editor_absoluteY="-1dp">
@@ -20,10 +21,10 @@
android:layout_height="?attr/actionBarSize"
android:layout_alignParentTop="true"
android:layout_toEndOf="@+id/relativeLayout"
+ android:layout_toRightOf="@+id/relativeLayout"
android:layout_weight="1"
android:background="?attr/colorPrimary"
- app:popupTheme="@style/AppTheme.PopupOverlay"
- android:layout_toRightOf="@+id/relativeLayout"/>
+ app:popupTheme="@style/AppTheme.PopupOverlay"/>
-
-