From 9aba2c63fe00436224c5d0c0e84f161e6d16fa26 Mon Sep 17 00:00:00 2001 From: Aviortheking <2bazert@gmail.com> Date: Mon, 19 Feb 2018 15:20:38 +0100 Subject: [PATCH] Yolo --- .idea/modules.xml | 2 +- app/build.gradle | 2 +- .../Android/Hangman/MainActivity.java | 2 ++ app/src/main/res/anim/bounce.xml | 12 ++++++++++++ app/src/main/res/anim/cycle.xml | 3 +++ app/src/main/res/anim/shake.xml | 9 +++++++++ app/src/main/res/drawable/btn_light.xml | 5 +++++ app/src/main/res/drawable/ripple.xml | 18 ++++++++++++++++++ app/src/main/res/layout/activity_main.xml | 4 ++++ app/src/main/res/values/colors.xml | 3 --- app/src/main/res/values/styles.xml | 1 + 11 files changed, 56 insertions(+), 5 deletions(-) create mode 100644 app/src/main/res/anim/bounce.xml create mode 100644 app/src/main/res/anim/cycle.xml create mode 100644 app/src/main/res/anim/shake.xml create mode 100644 app/src/main/res/drawable/btn_light.xml create mode 100644 app/src/main/res/drawable/ripple.xml diff --git a/.idea/modules.xml b/.idea/modules.xml index 7d95eba..5d35779 100644 --- a/.idea/modules.xml +++ b/.idea/modules.xml @@ -2,8 +2,8 @@ + - \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index a266e3e..0672615 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -4,7 +4,7 @@ android { buildToolsVersion "27.0.3" defaultConfig { applicationId "net.DeltaWings.Android.Hangman" - minSdkVersion 19 + minSdkVersion 21 targetSdkVersion 27 versionCode 1 versionName "1.0" 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 be5918a..9a3b36a 100644 --- a/app/src/main/java/net/DeltaWings/Android/Hangman/MainActivity.java +++ b/app/src/main/java/net/DeltaWings/Android/Hangman/MainActivity.java @@ -11,6 +11,8 @@ import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; import android.view.View; +import android.view.animation.Animation; +import android.view.animation.AnimationUtils; import android.widget.Toast; import net.DeltaWings.Android.Hangman.settings.SettingActivity; diff --git a/app/src/main/res/anim/bounce.xml b/app/src/main/res/anim/bounce.xml new file mode 100644 index 0000000..9abd7b4 --- /dev/null +++ b/app/src/main/res/anim/bounce.xml @@ -0,0 +1,12 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/anim/cycle.xml b/app/src/main/res/anim/cycle.xml new file mode 100644 index 0000000..0fd194c --- /dev/null +++ b/app/src/main/res/anim/cycle.xml @@ -0,0 +1,3 @@ + + \ No newline at end of file diff --git a/app/src/main/res/anim/shake.xml b/app/src/main/res/anim/shake.xml new file mode 100644 index 0000000..e9a2c88 --- /dev/null +++ b/app/src/main/res/anim/shake.xml @@ -0,0 +1,9 @@ + + \ No newline at end of file diff --git a/app/src/main/res/drawable/btn_light.xml b/app/src/main/res/drawable/btn_light.xml new file mode 100644 index 0000000..66bf142 --- /dev/null +++ b/app/src/main/res/drawable/btn_light.xml @@ -0,0 +1,5 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ripple.xml b/app/src/main/res/drawable/ripple.xml new file mode 100644 index 0000000..4aee894 --- /dev/null +++ b/app/src/main/res/drawable/ripple.xml @@ -0,0 +1,18 @@ + + + + + + + + + + + + + \ 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 50aa582..9e28dc7 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -40,8 +40,10 @@ android:layout_centerHorizontal="true" android:layout_marginTop="64dp" android:layout_weight="1" + android:background='@drawable/ripple' android:elevation="0dp" android:text="@string/singleplayer" + android:textColor="@color/White" android:textAppearance="@style/TextAppearance.AppCompat" app:layout_constraintTop_toBottomOf="@+id/imageView" tools:layout_editor_absoluteX="142dp"/> @@ -55,6 +57,8 @@ android:layout_marginTop="64dp" android:layout_weight="1" android:text="@string/multiplayer" + android:background='@drawable/ripple' + android:textColor="@color/White" android:textAppearance="@style/TextAppearance.AppCompat" app:layout_constraintTop_toBottomOf="@+id/singleplayerButton" tools:layout_editor_absoluteX="146dp"/> diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 6437e0b..e84b792 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -1,8 +1,5 @@ - #062988 - #303F9F - #111984 #2196f3 #0d47a1 #3f51b5 diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 2c992af..c9b90ca 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -28,6 +28,7 @@ +