From d318c0683730e55aac1170ed723f047f5f787e60 Mon Sep 17 00:00:00 2001
From: Desiree-Valdes <desireevaldes@gmail.com>
Date: Mon, 25 Jan 2021 13:39:46 +0100
Subject: [PATCH] [AG-005] Create intent 'Back to Main' in 'Achievements'
 Activity

---
 .../com/example/memocards/Achievements.java   | 31 +++++++++++++++++--
 .../com/example/memocards/MainActivity.java   | 14 +++++++--
 .../main/res/layout/activity_achievements.xml | 19 ++++++++++++
 app/src/main/res/layout/activity_levels.xml   |  4 +--
 app/src/main/res/layout/activity_main.xml     |  5 +--
 app/src/main/res/values/strings.xml           |  4 +--
 6 files changed, 67 insertions(+), 10 deletions(-)

diff --git a/app/src/main/java/com/example/memocards/Achievements.java b/app/src/main/java/com/example/memocards/Achievements.java
index d1810a7..a4b27d7 100644
--- a/app/src/main/java/com/example/memocards/Achievements.java
+++ b/app/src/main/java/com/example/memocards/Achievements.java
@@ -1,14 +1,41 @@
 package com.example.memocards;
 
-import androidx.appcompat.app.AppCompatActivity;
-
+import android.content.Intent;
 import android.os.Bundle;
+import android.util.Log;
+import android.view.View;
+import android.widget.Button;
+
+import androidx.appcompat.app.AppCompatActivity;
 
 public class Achievements extends AppCompatActivity {
 
+    private static final String LOG_TAG =
+            Achievements.class.getSimpleName();
+
+    private Button buttonBack;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_achievements);
+
+        // Find Button by its ID
+        this.buttonBack =  this.findViewById(R.id.button_back);
+
+        // When User click "Back" button
+        this.buttonBack.setOnClickListener(new Button.OnClickListener() {
+            @Override
+            public void onClick(View view) { backToMain(); }
+
+            public void backToMain() {
+                Log.d(LOG_TAG, "Back Button Clicked!");
+                Intent backToMain = new Intent(Achievements.this, MainActivity.class);
+                startActivity(backToMain);
+            }
+        });
+
+
     }
+
 }
\ No newline at end of file
diff --git a/app/src/main/java/com/example/memocards/MainActivity.java b/app/src/main/java/com/example/memocards/MainActivity.java
index 7cc3d16..533f0ff 100644
--- a/app/src/main/java/com/example/memocards/MainActivity.java
+++ b/app/src/main/java/com/example/memocards/MainActivity.java
@@ -1,14 +1,18 @@
 package com.example.memocards;
 
-import androidx.appcompat.app.AppCompatActivity;
-
 import android.content.Intent;
 import android.os.Bundle;
+import android.util.Log;
 import android.view.View;
 import android.widget.Button;
 
+import androidx.appcompat.app.AppCompatActivity;
+
 public class MainActivity extends AppCompatActivity{
 
+    private static final String LOG_TAG =
+            MainActivity.class.getSimpleName();
+
     private Button play;
 
     @Override
@@ -31,4 +35,10 @@ public void playPage() {
         Intent intent = new Intent(this, Levels.class);
         startActivity(intent);
     }
+
+    public void launchAchievements(View view) {
+        Log.d(LOG_TAG, "Achievement Button Clicked!");
+        Intent intent = new Intent(this, Achievements.class);
+        startActivity(intent);
+    }
 }
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_achievements.xml b/app/src/main/res/layout/activity_achievements.xml
index 4660f4a..cf84dc2 100644
--- a/app/src/main/res/layout/activity_achievements.xml
+++ b/app/src/main/res/layout/activity_achievements.xml
@@ -6,4 +6,23 @@
     android:layout_height="match_parent"
     tools:context=".Achievements">
 
+    <androidx.constraintlayout.widget.ConstraintLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toTopOf="parent"
+        tools:layout_editor_absoluteX="88dp">
+
+        <Button
+            android:id="@+id/button_back"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginStart="5dp"
+            android:layout_marginLeft="5dp"
+            android:layout_marginTop="5dp"
+            android:text="@string/back"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent"
+            app:layout_constraintTop_toTopOf="parent"
+            tools:ignore="OnClick" />
+    </androidx.constraintlayout.widget.ConstraintLayout>
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_levels.xml b/app/src/main/res/layout/activity_levels.xml
index ed79636..b412572 100644
--- a/app/src/main/res/layout/activity_levels.xml
+++ b/app/src/main/res/layout/activity_levels.xml
@@ -26,7 +26,7 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
-                android:text="@string/Back" />
+                android:text="@string/back" />
 
             <Button
                 android:id="@+id/home"
@@ -34,7 +34,7 @@
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
                 android:paddingLeft="20px"
-                android:text="@string/Home" />
+                android:text="@string/home" />
         </LinearLayout>
 
         <Button
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index b12a779..3fcaa44 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -33,12 +33,13 @@
             android:text="@string/settings" />
 
         <Button
-            android:id="@+id/achievments"
+            android:id="@+id/achievements"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:padding="20dp"
             android:text="@string/achievements"
-            app:iconPadding="8dp" />
+            app:iconPadding="8dp"
+            android:onClick="launchAchievements"/>
 
         <Button
             android:id="@+id/leaderboards"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f2a613e..9ea01c6 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -7,6 +7,6 @@
     <string name="easy">Easy</string>
     <string name="medium">Medium</string>
     <string name="difficult">Difficult</string>
-    <string name="Back">back</string>
-    <string name="Home">home</string>
+    <string name="back">Back</string>
+    <string name="home">Home</string>
 </resources>