From b46c9d76d37c256d2076d902f9255662b61ee5e4 Mon Sep 17 00:00:00 2001 From: Finn M Glas Date: Thu, 28 May 2020 18:42:58 +0200 Subject: [PATCH] Name adjustments and minor fixes + Fix `top-margin` in the choose activity + Rename `ViewPager` files for Settings to contain the string 'Settings' + Rename `firstStartup` to `Tutorial` + Remove unused library imports in `SettingsActivity.kt` --- app/src/main/AndroidManifest.xml | 2 +- .../main/java/com/finnmglas/launcher/MainActivity.kt | 2 +- .../java/com/finnmglas/launcher/SettingsActivity.kt | 11 ----------- .../{FirstStartupActivity.kt => TutorialActivity.kt} | 6 +++--- .../launcher/settings/SettingsFragmentMeta.kt | 4 ++-- .../{PageViewModel.kt => SettingsPageViewModel.kt} | 2 +- ...agerAdapter.kt => SettingsSectionsPagerAdapter.kt} | 0 app/src/main/res/layout/activity_choose.xml | 3 +-- ...ctivity_firststartup.xml => activity_tutorial.xml} | 2 +- 9 files changed, 10 insertions(+), 22 deletions(-) rename app/src/main/java/com/finnmglas/launcher/{FirstStartupActivity.kt => TutorialActivity.kt} (96%) rename app/src/main/java/com/finnmglas/launcher/settings/{PageViewModel.kt => SettingsPageViewModel.kt} (89%) rename app/src/main/java/com/finnmglas/launcher/settings/{SectionsPagerAdapter.kt => SettingsSectionsPagerAdapter.kt} (100%) rename app/src/main/res/layout/{activity_firststartup.xml => activity_tutorial.xml} (98%) diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index a6ab6d5..1be47a5 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -24,7 +24,7 @@ - diff --git a/app/src/main/java/com/finnmglas/launcher/MainActivity.kt b/app/src/main/java/com/finnmglas/launcher/MainActivity.kt index f11c5c3..4748900 100644 --- a/app/src/main/java/com/finnmglas/launcher/MainActivity.kt +++ b/app/src/main/java/com/finnmglas/launcher/MainActivity.kt @@ -86,7 +86,7 @@ class MainActivity : AppCompatActivity(), // First Startup if (!sharedPref.getBoolean("startedBefore", false)){ - startActivity(Intent(this, FirstStartupActivity::class.java)) + startActivity(Intent(this, TutorialActivity::class.java)) tooltipTimer.cancel() } } diff --git a/app/src/main/java/com/finnmglas/launcher/SettingsActivity.kt b/app/src/main/java/com/finnmglas/launcher/SettingsActivity.kt index bb77d13..60ef865 100644 --- a/app/src/main/java/com/finnmglas/launcher/SettingsActivity.kt +++ b/app/src/main/java/com/finnmglas/launcher/SettingsActivity.kt @@ -1,26 +1,15 @@ package com.finnmglas.launcher -import android.Manifest -import android.app.AlertDialog import android.content.* -import android.content.pm.PackageManager -import android.net.Uri -import android.os.Build import android.os.Bundle -import android.provider.MediaStore -import android.provider.Settings import android.view.View import android.view.WindowManager -import android.widget.Toast import androidx.appcompat.app.AppCompatActivity -import androidx.core.content.ContextCompat import androidx.viewpager.widget.ViewPager import com.finnmglas.launcher.extern.* import com.finnmglas.launcher.settings.SectionsPagerAdapter import com.google.android.material.tabs.TabLayout import kotlinx.android.synthetic.main.activity_settings.* -import kotlinx.android.synthetic.main.fragment_settings_apps.* -import kotlinx.android.synthetic.main.fragment_settings_theme.* class SettingsActivity : AppCompatActivity() { diff --git a/app/src/main/java/com/finnmglas/launcher/FirstStartupActivity.kt b/app/src/main/java/com/finnmglas/launcher/TutorialActivity.kt similarity index 96% rename from app/src/main/java/com/finnmglas/launcher/FirstStartupActivity.kt rename to app/src/main/java/com/finnmglas/launcher/TutorialActivity.kt index be43ead..871a635 100644 --- a/app/src/main/java/com/finnmglas/launcher/FirstStartupActivity.kt +++ b/app/src/main/java/com/finnmglas/launcher/TutorialActivity.kt @@ -7,10 +7,10 @@ import android.util.TypedValue import android.view.* import androidx.appcompat.app.AppCompatActivity import com.finnmglas.launcher.extern.* -import kotlinx.android.synthetic.main.activity_firststartup.* +import kotlinx.android.synthetic.main.activity_tutorial.* -class FirstStartupActivity : AppCompatActivity(){ +class TutorialActivity : AppCompatActivity(){ /** Variables for this activity */ @@ -37,7 +37,7 @@ class FirstStartupActivity : AppCompatActivity(){ else -> R.style.finnmglasTheme } ) - setContentView(R.layout.activity_firststartup) + setContentView(R.layout.activity_tutorial) if (getSavedTheme(this) == "custom") { activity_firststartup_app_bar.setBackgroundColor(dominantColor) diff --git a/app/src/main/java/com/finnmglas/launcher/settings/SettingsFragmentMeta.kt b/app/src/main/java/com/finnmglas/launcher/settings/SettingsFragmentMeta.kt index 0629bde..9eb3de5 100644 --- a/app/src/main/java/com/finnmglas/launcher/settings/SettingsFragmentMeta.kt +++ b/app/src/main/java/com/finnmglas/launcher/settings/SettingsFragmentMeta.kt @@ -13,7 +13,7 @@ import androidx.fragment.app.Fragment import android.view.LayoutInflater import android.view.View import android.view.ViewGroup -import com.finnmglas.launcher.FirstStartupActivity +import com.finnmglas.launcher.TutorialActivity import com.finnmglas.launcher.R import com.finnmglas.launcher.extern.* import kotlinx.android.synthetic.main.fragment_settings_meta.* @@ -76,7 +76,7 @@ class SettingsFragmentMeta : Fragment() { } fragment_settings_meta_view_tutorial_btn.setOnClickListener { - startActivity(Intent(this.context, FirstStartupActivity::class.java)) + startActivity(Intent(this.context, TutorialActivity::class.java)) } // prompting for settings-reset confirmation diff --git a/app/src/main/java/com/finnmglas/launcher/settings/PageViewModel.kt b/app/src/main/java/com/finnmglas/launcher/settings/SettingsPageViewModel.kt similarity index 89% rename from app/src/main/java/com/finnmglas/launcher/settings/PageViewModel.kt rename to app/src/main/java/com/finnmglas/launcher/settings/SettingsPageViewModel.kt index 7157d60..ae8199a 100644 --- a/app/src/main/java/com/finnmglas/launcher/settings/PageViewModel.kt +++ b/app/src/main/java/com/finnmglas/launcher/settings/SettingsPageViewModel.kt @@ -5,7 +5,7 @@ import androidx.lifecycle.MutableLiveData import androidx.lifecycle.Transformations import androidx.lifecycle.ViewModel -class PageViewModel : ViewModel() { +class SettingsPageViewModel : ViewModel() { private val _index = MutableLiveData() val text: LiveData = Transformations.map(_index) { diff --git a/app/src/main/java/com/finnmglas/launcher/settings/SectionsPagerAdapter.kt b/app/src/main/java/com/finnmglas/launcher/settings/SettingsSectionsPagerAdapter.kt similarity index 100% rename from app/src/main/java/com/finnmglas/launcher/settings/SectionsPagerAdapter.kt rename to app/src/main/java/com/finnmglas/launcher/settings/SettingsSectionsPagerAdapter.kt diff --git a/app/src/main/res/layout/activity_choose.xml b/app/src/main/res/layout/activity_choose.xml index 911d0cd..eb68a91 100644 --- a/app/src/main/res/layout/activity_choose.xml +++ b/app/src/main/res/layout/activity_choose.xml @@ -61,10 +61,9 @@ + tools:context=".TutorialActivity">