From ad3bfb5141657a04ceef3a0a8a812dc3f4a92d04 Mon Sep 17 00:00:00 2001
From: deltazefiro <deltazefiro@gmail.com>
Date: Sat, 10 Feb 2024 21:52:46 +0800
Subject: [PATCH] fix: Back button in SettingsActivity

---
 .../java/deltazero/amarok/ui/settings/SettingsActivity.java  | 5 +++++
 app/src/main/res/layout/activity_settings.xml                | 1 +
 2 files changed, 6 insertions(+)

diff --git a/app/src/main/java/deltazero/amarok/ui/settings/SettingsActivity.java b/app/src/main/java/deltazero/amarok/ui/settings/SettingsActivity.java
index 6572ddd1..70664ccc 100644
--- a/app/src/main/java/deltazero/amarok/ui/settings/SettingsActivity.java
+++ b/app/src/main/java/deltazero/amarok/ui/settings/SettingsActivity.java
@@ -2,6 +2,7 @@
 
 import android.content.Context;
 import android.os.Bundle;
+import android.widget.Toolbar;
 
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.ActionBar;
@@ -10,6 +11,8 @@
 import androidx.preference.PreferenceFragmentCompat;
 import androidx.preference.PreferenceScreen;
 
+import com.google.android.material.appbar.MaterialToolbar;
+
 import java.util.Objects;
 
 import deltazero.amarok.AmarokActivity;
@@ -45,6 +48,8 @@ protected void onCreate(Bundle savedInstanceState) {
         ActionBar actionBar = getSupportActionBar();
         if (actionBar != null) actionBar.setDisplayHomeAsUpEnabled(true);
 
+        MaterialToolbar toolbar = findViewById(R.id.settings_tb_toolbar);
+        toolbar.setNavigationOnClickListener(v -> finish());
     }
 
     @Override
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index f38038e8..2e8f62a7 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -11,6 +11,7 @@
         android:fitsSystemWindows="true">
 
         <com.google.android.material.appbar.MaterialToolbar
+            android:id="@+id/settings_tb_toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             app:navigationIcon="@drawable/ic_back"