From fdd58e9c6ee74947599c5c85349d15d95d2264d9 Mon Sep 17 00:00:00 2001
From: Rohitohlyan66 <ohlyanrohit66@gmail.com>
Date: Thu, 1 Oct 2020 21:37:16 +0530
Subject: [PATCH] Added a Back Arrow in FlamesActivity

---
 app/src/main/AndroidManifest.xml                  | 12 ++++++++----
 .../java/com/adpth/flamesapp/FlamesActivity.java  | 15 +++++++++------
 app/src/main/res/values/styles.xml                |  6 ++++++
 3 files changed, 23 insertions(+), 10 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index f5a5b66..02b920e 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -4,9 +4,9 @@
 
     <application
         android:allowBackup="true"
+        android:fullBackupContent="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
-        android:fullBackupContent="true"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
@@ -17,9 +17,13 @@
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name=".MainActivity"
-            android:theme="@style/AppTheme"/>
-        <activity android:name=".FlamesActivity" />
+        <activity
+            android:name=".MainActivity"
+            android:theme="@style/AppTheme" />
+        <activity
+            android:name=".FlamesActivity"
+            android:parentActivityName=".MainActivity"
+            android:theme="@style/AppTheme2" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/com/adpth/flamesapp/FlamesActivity.java b/app/src/main/java/com/adpth/flamesapp/FlamesActivity.java
index cd98ac5..4852141 100644
--- a/app/src/main/java/com/adpth/flamesapp/FlamesActivity.java
+++ b/app/src/main/java/com/adpth/flamesapp/FlamesActivity.java
@@ -20,6 +20,7 @@ public class FlamesActivity extends AppCompatActivity {
     ImageView output_img;
     Button back;
 
+
     String yourName, yourNameDisplay, partnerName, partnerNameDisplay, completeName;
     String[] arr_yourName, arr_partnerName, arr_completeName;
 
@@ -30,7 +31,9 @@ protected void onCreate(Bundle savedInstanceState) {
 
         Intent intent = getIntent();
         yourNameDisplay = intent.getStringExtra("your_name");
-        partnerNameDisplay =intent.getStringExtra("your_partner");
+        partnerNameDisplay = intent.getStringExtra("your_partner");
+
+        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
 
         output_img = findViewById(R.id.output_img);
         back = findViewById(R.id.back);
@@ -50,18 +53,18 @@ public void onClick(View v) {
 
     public void processName() {
         yourNameDisplay =
-        yourName = yourNameDisplay.toLowerCase().replaceAll("\\s+", "");
+                yourName = yourNameDisplay.toLowerCase().replaceAll("\\s+", "");
         arr_yourName = yourName.split("");
 
         partnerNameDisplay =
-        partnerName = partnerNameDisplay.toLowerCase().replaceAll("\\s+", "");
+                partnerName = partnerNameDisplay.toLowerCase().replaceAll("\\s+", "");
         arr_partnerName = partnerName.split("");
     }
 
     public void eliminateCommonLetters() {
         for (String i : arr_yourName) {
             for (String j : arr_partnerName) {
-                if ( i.equals(j) ) {
+                if (i.equals(j)) {
                     arr_yourName = ArrayUtils.removeElement(arr_yourName, i);
                     arr_partnerName = ArrayUtils.removeElement(arr_partnerName, j);
                     break;
@@ -127,9 +130,9 @@ public void onBackPressed() {
     }
 
     private void updateUi() {
-        Intent intent1 = new Intent(FlamesActivity.this,MainActivity.class);
+        Intent intent1 = new Intent(FlamesActivity.this, MainActivity.class);
         startActivity(intent1);
-        overridePendingTransition(R.anim.slide_in_left,R.anim.slide_out_right);
+        overridePendingTransition(R.anim.slide_in_left, R.anim.slide_out_right);
         finish();
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 5202981..9a37081 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -6,5 +6,11 @@
         <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
         <item name="colorAccent">@color/colorAccent</item>
     </style>
+    <style name="AppTheme2" parent="Theme.AppCompat.Light.DarkActionBar">
+        <!-- Customize your theme here. -->
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+        <item name="colorAccent">@color/colorAccent</item>
+    </style>
 
 </resources>
\ No newline at end of file