diff --git a/app/src/main/java/com/finnmglas/launcher/settings/SettingsActivity.kt b/app/src/main/java/com/finnmglas/launcher/settings/SettingsActivity.kt index 29a97b9..2b8ee70 100644 --- a/app/src/main/java/com/finnmglas/launcher/settings/SettingsActivity.kt +++ b/app/src/main/java/com/finnmglas/launcher/settings/SettingsActivity.kt @@ -13,7 +13,7 @@ import androidx.fragment.app.Fragment import androidx.fragment.app.FragmentManager import androidx.fragment.app.FragmentPagerAdapter import com.finnmglas.launcher.settings.actions.SettingsFragmentActions -import com.finnmglas.launcher.settings.theme.SettingsFragmentTheme +import com.finnmglas.launcher.settings.launcher.SettingsFragmentLauncher import com.finnmglas.launcher.settings.meta.SettingsFragmentMeta @@ -23,7 +23,7 @@ var intendedSettingsPause = false // know when to close * The [SettingsActivity] is a tabbed activity: * * | Actions | Choose apps or intents to be launched | [SettingsFragmentActions] | - * | Theme | Select a theme / Customize | [SettingsFragmentTheme] | + * | Theme | Select a theme / Customize | [SettingsFragmentLauncher] | * | Meta | About Launcher / Contact etc. | [SettingsFragmentMeta] | * * Settings are closed automatically if the activity goes `onPause` unexpectedly. @@ -88,8 +88,8 @@ class SettingsActivity: AppCompatActivity(), UIObject { private val TAB_TITLES = arrayOf( R.string.settings_tab_app, - R.string.settings_tab_theme, - R.string.settings_tab_launcher + R.string.settings_tab_launcher, + R.string.settings_tab_meta ) class SettingsSectionsPagerAdapter(private val context: Context, fm: FragmentManager) @@ -98,7 +98,7 @@ class SettingsSectionsPagerAdapter(private val context: Context, fm: FragmentMan override fun getItem(position: Int): Fragment { return when (position){ 0 -> SettingsFragmentActions() - 1 -> SettingsFragmentTheme() + 1 -> SettingsFragmentLauncher() 2 -> SettingsFragmentMeta() else -> Fragment() } diff --git a/app/src/main/java/com/finnmglas/launcher/settings/theme/SettingsFragmentTheme.kt b/app/src/main/java/com/finnmglas/launcher/settings/launcher/SettingsFragmentLauncher.kt similarity index 96% rename from app/src/main/java/com/finnmglas/launcher/settings/theme/SettingsFragmentTheme.kt rename to app/src/main/java/com/finnmglas/launcher/settings/launcher/SettingsFragmentLauncher.kt index d3e47db..8d06b45 100644 --- a/app/src/main/java/com/finnmglas/launcher/settings/theme/SettingsFragmentTheme.kt +++ b/app/src/main/java/com/finnmglas/launcher/settings/launcher/SettingsFragmentLauncher.kt @@ -1,4 +1,4 @@ -package com.finnmglas.launcher.settings.theme +package com.finnmglas.launcher.settings.launcher import android.Manifest import android.content.Intent @@ -19,11 +19,11 @@ import com.finnmglas.launcher.settings.intendedSettingsPause import kotlinx.android.synthetic.main.settings_theme.* /** - * The [SettingsFragmentTheme] is a used as a tab in the SettingsActivity. + * The [SettingsFragmentLauncher] is a used as a tab in the SettingsActivity. * * It is used to change themes, select wallpapers ... theme related stuff */ -class SettingsFragmentTheme : Fragment(), UIObject { +class SettingsFragmentLauncher : Fragment(), UIObject { override fun onCreateView( inflater: LayoutInflater, container: ViewGroup?, @@ -115,7 +115,7 @@ class SettingsFragmentTheme : Fragment(), UIObject { setSwitchColor(settings_launcher_switch_screen_timeout, vibrantColor) - settings_theme_container.setBackgroundColor(dominantColor) + settings_launcher_container.setBackgroundColor(dominantColor) setButtonColor(settings_theme_finn_button_select, vibrantColor) setButtonColor(settings_theme_dark_button_select, vibrantColor) setButtonColor(settings_theme_custom_button_select, vibrantColor) diff --git a/app/src/main/res/layout/settings_theme.xml b/app/src/main/res/layout/settings_theme.xml index 882cd60..5ee0463 100644 --- a/app/src/main/res/layout/settings_theme.xml +++ b/app/src/main/res/layout/settings_theme.xml @@ -3,7 +3,7 @@ xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:tools="http://schemas.android.com/tools" - android:id="@+id/settings_theme_container" + android:id="@+id/settings_launcher_container" android:layout_width="match_parent" android:layout_height="match_parent" android:background="?attr/colorPrimary" diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index d6d3eb2..1350b78 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -17,8 +17,8 @@ Settings Apps - Themes - Meta + Launcher + Meta Rate us on Google Play View Launcher Tutorial