From e3816ab399cc0431de08f2d04486f5825f4f31db Mon Sep 17 00:00:00 2001
From: Finn M Glas <finnmglas@gmail.com>
Date: Thu, 21 May 2020 16:20:35 +0200
Subject: [PATCH] Adjust icons to new functions

---
 app/src/main/res/layout/activity_main.xml     | 6 ++++--
 app/src/main/res/layout/activity_settings.xml | 9 ++++++---
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
index 232fd1e..c334520 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -1,5 +1,6 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:custom="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/container"
     android:layout_width="match_parent"
@@ -36,7 +37,7 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
-    <com.finnmglas.launcher.FontAwesomeSolid
+    <com.finnmglas.launcher.FontAwesome
         android:id="@+id/settingstooltip"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
@@ -50,6 +51,7 @@
         app:layout_constraintHorizontal_bias="0.95"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.95" />
+        app:layout_constraintVertical_bias="0.95"
+        custom:type="solid"/>
 
 </androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml
index fc6ff88..4dacd3f 100644
--- a/app/src/main/res/layout/activity_settings.xml
+++ b/app/src/main/res/layout/activity_settings.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:custom="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/container"
     android:layout_width="match_parent"
@@ -29,17 +30,19 @@
                 android:textAppearance="@style/TextAppearance.Widget.AppCompat.Toolbar.Title"
                 android:textSize="30sp" />
 
-            <com.finnmglas.launcher.FontAwesomeSolid
+            <com.finnmglas.launcher.FontAwesome
                 android:layout_width="match_parent"
+                android:id="@+id/fa"
                 android:layout_height="match_parent"
                 android:gravity="center|right"
                 android:includeFontPadding="true"
                 android:onClick="backHome"
                 android:paddingLeft="16sp"
                 android:paddingRight="16sp"
-                android:text="@string/fas_close_window"
+                android:text="@string/fa_close_window"
                 android:textColor="#ffffff"
-                android:textSize="22sp" />
+                android:textSize="22sp"
+                custom:type="solid"/>
         </LinearLayout>
 
         <com.google.android.material.tabs.TabLayout