* Free New Version

Reepeecheep · Mar 20, 2020 · 17bf9a5 · 17bf9a5
1 parent 15feb9f
commit 17bf9a5
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 9 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "com.numguesser.tonio_rpchp.numberguesser"
         minSdkVersion 14
         targetSdkVersion 28
-        versionCode 11
-        versionName "4.0.1"
+        versionCode 12
+        versionName "4.1.0"
     }
     buildTypes {
         release {

diff --git a/app/src/main/java/com/numguesser/tonio_rpchp/numberguesser/Guesser.java b/app/src/main/java/com/numguesser/tonio_rpchp/numberguesser/Guesser.java
@@ -48,6 +48,7 @@ protected void onCreate(Bundle savedInstanceState) {
         start_game();
 
         final TextView tries_label = findViewById(R.id.tries_label);
+        final TextView last_try_label = findViewById(R.id.last_try_label);
         final EditText number_txt = findViewById(R.id.number);
         final Button button = findViewById(R.id.guess_button);
 
@@ -70,17 +71,20 @@ public void onClick(View v) {
                         else if (num == rnd) {
                             switch_image(R.drawable.android_genio_sad);
                             Alert(getString(R.string.end_game), getString(R.string.win), 1);
+                            last_try_label.setText(getString(R.string.win));
                             vibrate();
                         }
                         else{
                             attempt--;
-                            tries_label.setText(getString(R.string.tries_text) + attempt);
+                            tries_label.setText(String.format("%s %d ",getString(R.string.tries_text), attempt));
 
                             if (attempt > 0){
-                                check_rand(num, rnd);
+                                String result = check_rand(num, rnd);
+                                last_try_label.setText(result);
                             }
                             else {
                                 Alert(getString(R.string.end_game), getString(R.string.lose)+rnd, 1);
+                                last_try_label.setText(String.format("%s %d ", getString(R.string.lose), rnd));
                             }
                         }
                     }
@@ -153,18 +157,17 @@ public void run() {
                           alertDialog.dismiss();
                       }
                   }
-              } , 3000
+              } , 2500
             );
         }
 
         //alertDialog.show();
     }
 
-    public void check_rand(Integer input_number, Integer rnd){
+    public String check_rand(Integer input_number, Integer rnd){
         String Tittle = "";
         String Text = getString(R.string.more);
 
-
         if (input_number > rnd){
             Text = getString(R.string.less);
         }
@@ -180,12 +183,18 @@ public void check_rand(Integer input_number, Integer rnd){
 
         Alert(Tittle, Text, 0);
 
+        if (Tittle != ""){
+            Text = String.format("%s, %s", Tittle, Text);
+        }
+
+        String msg = String.format("(%d) %s", input_number, Text);
+
+        return msg;
     }
     public void vibrate(){
         Vibrator v = (Vibrator) getSystemService(this.VIBRATOR_SERVICE);
         v.vibrate(500);
 
-
         // Vibrate for 500 milliseconds
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
             v.vibrate(VibrationEffect.createOneShot(500, VibrationEffect.DEFAULT_AMPLITUDE));
@@ -206,6 +215,8 @@ public void start_game(){
         rnd = rand_num.nextInt(100) + 1;
         attempt = 5;
         final TextView tries_label = findViewById(R.id.tries_label);
-        tries_label.setText(getString(R.string.tries_text)+ attempt);
+        final TextView last_try_label = findViewById(R.id.last_try_label);
+        tries_label.setText(String.format("%s %d ",getString(R.string.tries_text), attempt));
+        last_try_label.setText("");
     }
 }
diff --git a/app/src/main/res/layout/activity_guesser.xml b/app/src/main/res/layout/activity_guesser.xml
@@ -52,6 +52,15 @@
         android:textColor="#00C000"
         android:textSize="30sp" />
 
+    <TextView
+        android:id="@+id/last_try_label"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="end"
+        android:textColor="#00C000"
+        android:textSize="15sp"
+        />
+
     <TextView
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"