From 23e4b4c19d5ac17f2e32c2a1bfe63bfb97b71c46 Mon Sep 17 00:00:00 2001
From: "luca0N\\!" <luca0n@luca0n.com>
Date: Tue, 9 Mar 2021 23:33:03 -0300
Subject: [PATCH] Added label to settings activity

Label added to settings activity and changed spaces to tabs.
---
 app/src/main/AndroidManifest.xml              | 53 ++++++++++---------
 .../pluck/settings/SettingsActivity.java      | 44 ++++++++-------
 2 files changed, 48 insertions(+), 49 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b7037a1..3732615 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -1,33 +1,34 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.luca0n.joguitos.pluck">
+	package="com.luca0n.joguitos.pluck">
 
-    <uses-permission android:name="android.permission.INTERNET" />
+	<uses-permission android:name="android.permission.INTERNET" />
 
-    <application
-        android:name=".PluckApplication"
-        android:allowBackup="true"
-        android:icon="@mipmap/ic_launcher"
-        android:label="@string/app_name"
-        android:roundIcon="@mipmap/ic_launcher_round"
-        android:supportsRtl="true"
-        android:theme="@style/AppTheme">
-        <activity android:name=".activities.MainActivity">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
+	<application
+		android:name=".PluckApplication"
+		android:allowBackup="true"
+		android:icon="@mipmap/ic_launcher"
+		android:label="@string/app_name"
+		android:roundIcon="@mipmap/ic_launcher_round"
+		android:supportsRtl="true"
+		android:theme="@style/AppTheme.Dark">
+	<activity android:name=".activities.MainActivity">
+		<intent-filter>
+			<action android:name="android.intent.action.MAIN" />
 
-                <category android:name="android.intent.category.LAUNCHER" />
-            </intent-filter>
-        </activity>
-        <activity android:name=".activities.TriviaGameActivity"
-            android:screenOrientation="fullUser"
-            android:configChanges="orientation|screenSize"/>
-        <activity android:name=".activities.TriviaGameResultsActivity"
-            android:screenOrientation="fullUser"
-            android:configChanges="orientation|screenSize"/>
-        <activity android:name=".settings.SettingsActivity"
-            android:screenOrientation="fullUser"
-            android:configChanges="orientation|screenSize"/>
-    </application>
+			<category android:name="android.intent.category.LAUNCHER" />
+		</intent-filter>
+	</activity>
+	<activity android:name=".activities.TriviaGameActivity"
+		android:screenOrientation="fullUser"
+		android:configChanges="orientation|screenSize"/>
+	<activity android:name=".activities.TriviaGameResultsActivity"
+		android:screenOrientation="fullUser"
+		android:configChanges="orientation|screenSize"/>
+	<activity android:name=".settings.SettingsActivity"
+		android:label="@string/ui_settings"
+		android:screenOrientation="fullUser"
+		android:configChanges="orientation|screenSize"/>
+	</application>
 
 </manifest>
diff --git a/app/src/main/java/com/luca0n/joguitos/pluck/settings/SettingsActivity.java b/app/src/main/java/com/luca0n/joguitos/pluck/settings/SettingsActivity.java
index 5cc8c8a..34e362d 100644
--- a/app/src/main/java/com/luca0n/joguitos/pluck/settings/SettingsActivity.java
+++ b/app/src/main/java/com/luca0n/joguitos/pluck/settings/SettingsActivity.java
@@ -31,30 +31,28 @@ import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AppCompatActivity;
 
 public class SettingsActivity extends AppCompatActivity {
-    @Override
-    protected void onCreate(@Nullable Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
+	@Override
+	protected void onCreate(@Nullable Bundle savedInstanceState) {
+		super.onCreate(savedInstanceState);
 
-        ActionBar actionBar = getSupportActionBar();
-        if (actionBar != null) {
-            actionBar.setDisplayHomeAsUpEnabled(true);
-            actionBar.setTitle(null);
-        }
+		ActionBar actionBar = getSupportActionBar();
+		if (actionBar != null)
+			actionBar.setDisplayHomeAsUpEnabled(true);
 
-        getFragmentManager()
-                .beginTransaction()
-                .replace(android.R.id.content, new SettingsFragment())
-                .commit();
-    }
+		getFragmentManager()
+			.beginTransaction()
+			.replace(android.R.id.content, new SettingsFragment())
+			.commit();
+	}
 
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        switch (item.getItemId()) {
-            case android.R.id.home:
-                finish();
-                return true;
-            default:
-                return super.onOptionsItemSelected(item);
-        }
-    }
+	@Override
+	public boolean onOptionsItemSelected(MenuItem item) {
+		switch (item.getItemId()) {
+			case android.R.id.home:
+				finish();
+				return true;
+			default:
+				return super.onOptionsItemSelected(item);
+		}
+	}
 }