ui minor code cleanup

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

@@ -1,6 +1,11 @@
 package com.sduduzog.slimlauncher.ui.main
 
-import android.content.*
+import android.content.ActivityNotFoundException
+import android.content.BroadcastReceiver
+import android.content.ComponentName
+import android.content.Context
+import android.content.Intent
+import android.content.IntentFilter
 import android.os.Build
 import android.os.Bundle
 import android.provider.AlarmClock
@@ -19,7 +24,8 @@ import com.sduduzog.slimlauncher.utils.BaseFragment
 import com.sduduzog.slimlauncher.utils.OnLaunchAppListener
 import kotlinx.android.synthetic.main.home_fragment.*
 import java.text.SimpleDateFormat
-import java.util.*
+import java.util.Date
+import java.util.Locale
 
 
 class HomeFragment : BaseFragment(), OnLaunchAppListener {
@@ -64,9 +70,7 @@ class HomeFragment : BaseFragment(), OnLaunchAppListener {
         activity?.registerReceiver(receiver, IntentFilter(Intent.ACTION_TIME_TICK))
     }
 
-    override fun getFragmentView(): ViewGroup {
-        return home_fragment
-    }
+    override fun getFragmentView(): ViewGroup = home_fragment
 
     override fun onResume() {
         super.onResume()
@@ -100,10 +104,11 @@ class HomeFragment : BaseFragment(), OnLaunchAppListener {
 
         home_fragment_date.setOnClickListener {
             try {
-                val intent = Intent(Intent.ACTION_MAIN)
-                intent.addCategory(Intent.CATEGORY_APP_CALENDAR)
-                intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK
-                launchActivity(it, intent)
+                Intent(Intent.ACTION_MAIN).apply {
+                    addCategory(Intent.CATEGORY_APP_CALENDAR)
+                    flags = Intent.FLAG_ACTIVITY_NEW_TASK
+                    launchActivity(it, this)
+                }
             } catch (e: ActivityNotFoundException) {
                 // Do nothing, we've failed :(
             }
@@ -137,12 +142,15 @@ class HomeFragment : BaseFragment(), OnLaunchAppListener {
         val twenty4Hour = context?.getSharedPreferences(getString(R.string.prefs_settings), Context.MODE_PRIVATE)
                 ?.getBoolean(getString(R.string.prefs_settings_key_time_format), true)
         val date = Date()
-        if (twenty4Hour as Boolean) {
-            val fWatchTime = SimpleDateFormat("h:mm aa", Locale.ROOT)
-            home_fragment_time.text = fWatchTime.format(date)
-        } else {
-            val fWatchTime = SimpleDateFormat("H:mm", Locale.ROOT)
-            home_fragment_time.text = fWatchTime.format(date)
+        when (twenty4Hour) {
+            is Boolean -> {
+                val fWatchTime = SimpleDateFormat("h:mm aa", Locale.ROOT)
+                home_fragment_time.text = fWatchTime.format(date)
+            }
+            else -> {
+                val fWatchTime = SimpleDateFormat("H:mm", Locale.ROOT)
+                home_fragment_time.text = fWatchTime.format(date)
+            }
         }
         val fWatchDate = SimpleDateFormat("EEE, MMM dd", Locale.ROOT)
         home_fragment_date.text = fWatchDate.format(date)
@@ -150,14 +158,15 @@ class HomeFragment : BaseFragment(), OnLaunchAppListener {
 
     override fun onLaunch(app: HomeApp, view: View) {
         try {
-            val intent = Intent()
             val name = ComponentName(app.packageName, app.activityName)
-            intent.action = Intent.ACTION_MAIN
-            intent.addCategory(Intent.CATEGORY_LAUNCHER)
-            intent.flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED
-            intent.component = name
-            intent.resolveActivity(activity!!.packageManager)?.let {
-                launchActivity(view, intent)
+            Intent().apply {
+                action = Intent.ACTION_MAIN
+                addCategory(Intent.CATEGORY_LAUNCHER)
+                flags = Intent.FLAG_ACTIVITY_NEW_TASK or Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED
+                component = name
+                resolveActivity(activity!!.packageManager)?.let {
+                    launchActivity(view, this)
+                }
             }
         } catch (e: Exception) {
             // Do no shit yet

app/src/main/java/com/sduduzog/slimlauncher/ui/options/AddAppFragment.kt

@@ -37,6 +37,7 @@ class AddAppFragment : BaseFragment(), OnAppClickedListener {
         activity?.let {
             viewModel = ViewModelProviders.of(it).get(MainViewModel::class.java)
         } ?: throw Error("How the fuck is this fragment alive while there's no activity?")
+
         viewModel.installedApps.observe(this, Observer {
             val homeApps = viewModel.apps.value.orEmpty()
             it?.let { apps ->
@@ -64,10 +65,8 @@ class AddAppFragment : BaseFragment(), OnAppClickedListener {
             // Do nothing
         }
 
-        override fun onTextChanged(s: CharSequence?, start: Int, before: Int, count: Int) {
-            s?.let {
-                LoadInstalledApps(viewModel, s.toString()).execute(context!!.packageManager)
-            }
+        override fun onTextChanged(s: CharSequence, start: Int, before: Int, count: Int) {
+            LoadInstalledApps(viewModel, s.toString()).execute(context!!.packageManager)
         }
     }
 

app/src/main/java/com/sduduzog/slimlauncher/ui/options/CustomiseAppsFragment.kt

@@ -109,10 +109,10 @@ class CustomiseAppsFragment : BaseFragment(), OnShitDoneToAppsListener {
     }
 
     private fun showPopupMenu(view: View): PopupMenu {
-        val popup = PopupMenu(context!!, view)
-        popup.menuInflater.inflate(R.menu.customise_apps_popup_menu, popup.menu)
-        popup.show()
-        return popup
+        return PopupMenu(context!!, view).apply {
+            menuInflater.inflate(R.menu.customise_apps_popup_menu, menu)
+            show()
+        }
     }
 
     override fun onAppsUpdated(list: List<HomeApp>) {
@@ -123,7 +123,8 @@ class CustomiseAppsFragment : BaseFragment(), OnShitDoneToAppsListener {
         showPopupMenu(view).setOnMenuItemClickListener {
             when (it.itemId) {
                 R.id.ca_menu_rename -> {
-                    RenameAppDialog.getInstance(app, viewModel).show(childFragmentManager, "SettingsListAdapter")
+                    RenameAppDialog.getInstance(app, viewModel)
+                            .show(childFragmentManager, "SettingsListAdapter")
                 }
                 R.id.ca_menu_remove -> {
                     viewModel.remove(app)