Setup on fresh install rebuilt

app/src/main/java/com/sduduzog/slimlauncher/ui/main/HomeAppsAdapter.kt

@@ -3,7 +3,6 @@ package com.sduduzog.slimlauncher.ui.main
 import android.content.ActivityNotFoundException
 import android.content.ComponentName
 import android.content.Intent
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup

app/src/main/java/com/sduduzog/slimlauncher/ui/main/settings/RenameAppDialog.kt

@@ -2,7 +2,6 @@ package com.sduduzog.slimlauncher.ui.main.settings
 
 import android.app.Dialog
 import android.os.Bundle
-import android.util.Log
 import android.view.LayoutInflater
 import android.widget.EditText
 import androidx.appcompat.app.AlertDialog

app/src/main/java/com/sduduzog/slimlauncher/ui/main/settings/SettingsListAdapter.kt

@@ -83,12 +83,13 @@ class SettingsListAdapter(private val fragment: Fragment) : RecyclerView.Adapter
         val size = displayedApps.size
         displayedApps.clear()
         displayedApps.addAll(newList)
-        if (size > newList.size) {
-            notifyItemRemoved(deletedFromIndex)
-        } else if (size < newList.size) notifyItemRangeChanged(size, displayedApps.size - size)
-        else if (renamedOnIndex != -1) {
-            notifyItemChanged(renamedOnIndex)
-            renamedOnIndex = -1
+        when {
+            size > newList.size -> notifyItemRemoved(deletedFromIndex)
+            size < newList.size -> notifyItemRangeChanged(size, displayedApps.size - size)
+            renamedOnIndex != -1 -> {
+                notifyItemChanged(renamedOnIndex)
+                renamedOnIndex = -1
+            }
         }
     }
 

app/src/main/java/com/sduduzog/slimlauncher/ui/main/setup/DialogInteractionListener.kt

@@ -1,9 +0,0 @@
-package com.sduduzog.slimlauncher.ui.main.setup
-
-import com.sduduzog.slimlauncher.data.App
-
-
-interface DialogInteractionListener {
-    fun onAppsChosen(apps: List<App>)
-    fun onClockChosen()
-}

app/src/main/java/com/sduduzog/slimlauncher/ui/main/setup/SetupFragment.kt

@@ -2,7 +2,6 @@ package com.sduduzog.slimlauncher.ui.main.setup
 
 
 import android.os.Bundle
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -39,29 +38,6 @@ class SetupFragment : Fragment() {
         }
     }
 
-//    private fun checkFreshInstall() {
-//        val settings = activity!!.getSharedPreferences(getString(R.string.prefs_settings), MODE_PRIVATE)
-//        if (settings.getBoolean(getString(R.string.prefs_settings_key_fresh_install_setup), true)) {
-//            val pm = activity!!.packageManager
-//            val main = Intent(Intent.ACTION_MAIN, null)
-//
-//            main.addCategory(Intent.CATEGORY_LAUNCHER)
-//
-//            val launchables = pm.queryIntentActivities(main, 0)
-//            Collections.sort(launchables,
-//                    ResolveInfo.DisplayNameComparator(pm))
-//            for (i in launchables.indices) {
-//                val item = launchables[i]
-//                val activity = item.activityInfo
-//                val app = App(launchables[i].loadLabel(pm).toString(), activity.applicationInfo.packageName, activity.name)
-//                apps.add(app)
-//            }
-//            revealUI(state)
-//        } else {
-//            finishSetup()
-//        }
-//    }
-
     inner class SectionsPagerAdapter(fm: FragmentManager) : FragmentPagerAdapter(fm) {
 
         override fun getItem(position: Int): Fragment {

app/src/main/java/com/sduduzog/slimlauncher/ui/main/setup/SplashFragment.kt

@@ -27,6 +27,32 @@ class SplashFragment : PagerHelperFragment() {
         if (!settings.getBoolean(getString(R.string.prefs_settings_key_fresh_install_setup), true)) {
             Navigation.findNavController(splash_fragment).navigate(R.id.action_setupFragment_to_mainFragment2)
         }
+        animateViews()
+    }
+
+    private fun animateViews() {
+        setup_splash_button_start.alpha = 0f
+        setup_splash_button_start.translationX = -100f
+        welcome_text.alpha = 0f
+        welcome_text.translationY = 100f
+        welcome_title.alpha = 0f
+        welcome_title.translationY = 50f
+        cvIcon.alpha = 0f
+        cvIcon.scaleX = 0.5f
+        cvIcon.scaleY = 0.5f
+        cvIcon.animate().alpha(1f)
+                .scaleX(1f)
+                .scaleY(1f)
+                .duration = 2000
+        welcome_title.animate().alpha(1f)
+                .translationYBy(-50f)
+                .setStartDelay(1500).duration = 1000
+        welcome_text.animate().alpha(1f)
+                .translationYBy(-100f)
+                .setStartDelay(2000).duration = 1000
+        setup_splash_button_start.animate().alpha(1f)
+                .translationXBy(100f)
+                .setStartDelay(2500).duration = 1000
     }
 
     companion object {

app/src/main/java/com/sduduzog/slimlauncher/ui/main/setup/ThemeSetupFragment.kt

@@ -10,7 +10,6 @@ import android.view.ViewGroup
 import androidx.core.content.edit
 import androidx.navigation.Navigation
 import com.sduduzog.slimlauncher.R
-import kotlinx.android.synthetic.main.setup_fragment.*
 import kotlinx.android.synthetic.main.theme_setup_fragment.*
 
 

app/src/main/res/drawable/ic_check.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z"/>
-</vector>

app/src/main/res/drawable/ic_color_lens.xml

@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M12,3c-4.97,0 -9,4.03 -9,9s4.03,9 9,9c0.83,0 1.5,-0.67 1.5,-1.5 0,-0.39 -0.15,-0.74 -0.39,-1.01 -0.23,-0.26 -0.38,-0.61 -0.38,-0.99 0,-0.83 0.67,-1.5 1.5,-1.5L16,16c2.76,0 5,-2.24 5,-5 0,-4.42 -4.03,-8 -9,-8zM6.5,12c-0.83,0 -1.5,-0.67 -1.5,-1.5S5.67,9 6.5,9 8,9.67 8,10.5 7.33,12 6.5,12zM9.5,8C8.67,8 8,7.33 8,6.5S8.67,5 9.5,5s1.5,0.67 1.5,1.5S10.33,8 9.5,8zM14.5,8c-0.83,0 -1.5,-0.67 -1.5,-1.5S13.67,5 14.5,5s1.5,0.67 1.5,1.5S15.33,8 14.5,8zM17.5,12c-0.83,0 -1.5,-0.67 -1.5,-1.5S16.67,9 17.5,9s1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5z"/>
-</vector>

app/src/main/res/layout/clock_setup_fragment.xml

@@ -7,13 +7,12 @@
     android:layout_height="match_parent"
     tools:context=".ui.main.setup.ClockSetupFragment">
 
-    <!-- TODO: Update blank fragment layout -->
     <TextView
         android:id="@+id/textView14"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginTop="32dp"
-        android:text="Clock Type"
+        android:text="@string/setup_clock_type"
         android:textAppearance="@style/TextAppearance.AppCompat.Headline"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -26,6 +25,7 @@
         android:layout_marginStart="8dp"
         android:layout_marginTop="32dp"
         android:layout_marginEnd="16dp"
+        android:contentDescription="@string/setup_home_screenshot"
         android:src="@drawable/clock_zoomed"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="@+id/textView14"
@@ -39,7 +39,7 @@
         android:layout_marginTop="32dp"
         android:layout_marginEnd="32dp"
         android:gravity="center"
-        android:text="This is also changeable in preferences. Whether you prefer a 12hr clock type or a 24hr clock type"
+        android:text="@string/setup_clock_type_text_description"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/clock_setup_image" />

app/src/main/res/layout/settings_fragment.xml

@@ -69,7 +69,7 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="16dp"
         android:layout_marginTop="16dp"
-        android:text="Use Slim's built-in dialer"
+        android:text="@string/settings_use_slim_s_built_in_dialer"
         android:textAppearance="@style/TextAppearance.AppCompat"
         android:textSize="18sp"
         app:layout_constraintStart_toStartOf="parent"
@@ -79,7 +79,7 @@
         android:id="@+id/textView10"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:text="Faster shortcut to your calls"
+        android:text="@string/settings_faster_shortcut_to_your_calls"
         app:layout_constraintStart_toStartOf="@+id/textView9"
         app:layout_constraintTop_toBottomOf="@+id/textView9" />
 

app/src/main/res/layout/settings_list_item.xml

@@ -58,6 +58,6 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
         app:srcCompat="@drawable/ic_drag_handle"
-        android:contentDescription="@string/settings_itrem_icon_gradder" />
+        android:contentDescription="@string/settings_item_icon_drag_handler" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

app/src/main/res/layout/splash_fragment.xml

@@ -40,23 +40,8 @@
         </androidx.constraintlayout.widget.ConstraintLayout>
     </androidx.cardview.widget.CardView>
 
-    <ProgressBar
-        android:id="@+id/progressBar2"
-        style="?android:attr/progressBarStyle"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="8dp"
-        android:layout_marginEnd="8dp"
-        android:layout_marginBottom="8dp"
-        android:visibility="gone"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent" />
-
     <TextView
-        android:id="@+id/textView11"
+        android:id="@+id/welcome_title"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_marginStart="8dp"
@@ -69,7 +54,7 @@
         app:layout_constraintTop_toBottomOf="@+id/cvIcon" />
 
     <TextView
-        android:id="@+id/textView13"
+        android:id="@+id/welcome_text"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="32dp"
@@ -80,7 +65,7 @@
         android:textSize="18sp"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/textView11" />
+        app:layout_constraintTop_toBottomOf="@+id/welcome_title" />
 
     <Button
         android:id="@+id/setup_splash_button_start"

app/src/main/res/values/strings.xml

@@ -12,11 +12,6 @@
         <item>Pastel</item>
     </string-array>
 
-    <string-array name="clock_types">
-        <item>12 Hour</item>
-        <item>24 Hour</item>
-    </string-array>
-
     <string name="prefs_settings">settings</string>
     <string name="prefs_settings_key_theme">key_theme</string>
     <string name="prefs_settings_key_clock_type">clock_type</string>
@@ -88,25 +83,18 @@
     <string name="setup_text_lets_get_you_set_up">
     "Lets get you set up!\n Just a few tweaks and your new home screen will be ready for you."
     </string>
-    <string name="setup_text_choose_apps">
-        Choose apps that will appear on your home screen. You can change them later in \'Preferences\'
-    </string>
-    <string name="setup_text_choose_your_preferred_clock">Choose your preferred clock type</string>
-    <string name="icon_check">Icon check</string>
+
     <string name="setup_button_next">next</string>
     <string name="setup_button_finish">Finish</string>
-    <string name="setup_text_1">1.</string>
-    <string name="setup_text_2">2.</string>
 
     <string name="no_app_selected_toast_msg">Choose at least one app</string>
     <string name="choose_apps_title">Choose Apps</string>
-    <string name="double_tap_anywhere_to_edit">Double tap anywhere to edit</string>
 
 
     <string name="notes_date_placeholder">Edited at %s</string>
 
     <string name="dialer_chevron">deleter</string>
-    <string name="settings_itrem_icon_gradder">Dragger</string>
+    <string name="settings_item_icon_drag_handler">Dragger</string>
 
     <string name="setup_choose_theme">Choose Theme</string>
     <string name="setup_text_default">Default</string>
@@ -129,5 +117,9 @@
     </string>
     <string name="setup_choose_apps">Choose apps</string>
     <string name="setup_home_screenshot">Screenshot</string>
+    <string name="setup_clock_type_text_description">This is also changeable in preferences. Whether you prefer a 12hr clock type or a 24hr clock type</string>
+    <string name="setup_clock_type">Clock Type</string>
+    <string name="settings_use_slim_s_built_in_dialer">Use Slim\'s built-in dialer</string>
+    <string name="settings_faster_shortcut_to_your_calls">Faster shortcut to your calls</string>
 
 </resources>