diff --git a/app/build.gradle b/app/build.gradle index 1bd88f8..50a82e2 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -31,6 +31,7 @@ dependencies { implementation 'androidx.appcompat:appcompat:1.1.0' implementation 'androidx.core:core-ktx:1.2.0' implementation 'androidx.constraintlayout:constraintlayout:1.1.3' + implementation 'androidx.legacy:legacy-support-v4:1.0.0' testImplementation 'junit:junit:4.12' androidTestImplementation 'androidx.test.ext:junit:1.1.1' androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0' diff --git a/app/src/main/java/com/finnmglas/launcher/SettingsFragmentApps.kt b/app/src/main/java/com/finnmglas/launcher/SettingsFragmentApps.kt new file mode 100644 index 0000000..ad193fd --- /dev/null +++ b/app/src/main/java/com/finnmglas/launcher/SettingsFragmentApps.kt @@ -0,0 +1,20 @@ +package com.finnmglas.launcher + +import android.os.Bundle +import androidx.fragment.app.Fragment +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup + +/** The 'Apps' Tab associated Fragment in Settings */ + +class SettingsFragmentApps : Fragment() { + + override fun onCreateView( + inflater: LayoutInflater, container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { + + return inflater.inflate(R.layout.fragment_settings_apps, container, false) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/finnmglas/launcher/SettingsFragmentLauncher.kt b/app/src/main/java/com/finnmglas/launcher/SettingsFragmentLauncher.kt new file mode 100644 index 0000000..89cb44f --- /dev/null +++ b/app/src/main/java/com/finnmglas/launcher/SettingsFragmentLauncher.kt @@ -0,0 +1,20 @@ +package com.finnmglas.launcher + +import android.os.Bundle +import androidx.fragment.app.Fragment +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup + +/** The 'Launcher' Tab associated Fragment in Settings */ + +class SettingsFragmentLauncher : Fragment() { + + override fun onCreateView( + inflater: LayoutInflater, container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { + + return inflater.inflate(R.layout.fragment_settings_launcher, container, false) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/finnmglas/launcher/SettingsFragmentTheme.kt b/app/src/main/java/com/finnmglas/launcher/SettingsFragmentTheme.kt new file mode 100644 index 0000000..71d8d2f --- /dev/null +++ b/app/src/main/java/com/finnmglas/launcher/SettingsFragmentTheme.kt @@ -0,0 +1,20 @@ +package com.finnmglas.launcher + +import android.os.Bundle +import androidx.fragment.app.Fragment +import android.view.LayoutInflater +import android.view.View +import android.view.ViewGroup + +/** The 'Theme' Tab associated Fragment in Settings */ + +class SettingsFragmentTheme : Fragment() { + + override fun onCreateView( + inflater: LayoutInflater, container: ViewGroup?, + savedInstanceState: Bundle? + ): View? { + + return inflater.inflate(R.layout.fragment_settings_theme, container, false) + } +} \ No newline at end of file diff --git a/app/src/main/java/com/finnmglas/launcher/ui/main/SectionsPagerAdapter.kt b/app/src/main/java/com/finnmglas/launcher/ui/main/SectionsPagerAdapter.kt index be37cf4..f412ddd 100644 --- a/app/src/main/java/com/finnmglas/launcher/ui/main/SectionsPagerAdapter.kt +++ b/app/src/main/java/com/finnmglas/launcher/ui/main/SectionsPagerAdapter.kt @@ -18,6 +18,9 @@ class SectionsPagerAdapter(private val context: Context, fm: FragmentManager) override fun getItem(position: Int): Fragment { return when (position){ + 0 -> SettingsFragmentApps() + 1 -> SettingsFragmentTheme() + 2 -> SettingsFragmentLauncher() else -> Fragment() } } diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index 81ea85d..fc6ff88 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -2,6 +2,7 @@ @@ -25,7 +26,8 @@ android:minHeight="?actionBarSize" android:padding="@dimen/appbar_padding" android:text="@string/settings_title" - android:textAppearance="@style/TextAppearance.Widget.AppCompat.Toolbar.Title" /> + android:textAppearance="@style/TextAppearance.Widget.AppCompat.Toolbar.Title" + android:textSize="30sp" /> diff --git a/app/src/main/res/layout/fragment_settings_apps.xml b/app/src/main/res/layout/fragment_settings_apps.xml new file mode 100644 index 0000000..cedab90 --- /dev/null +++ b/app/src/main/res/layout/fragment_settings_apps.xml @@ -0,0 +1,188 @@ + + + + + + + + + +