sduduzog 7 жил өмнө
parent
commit
94290205a1

+ 4 - 0
app/src/main/java/com/sduduzog/slimlauncher/data/DataRepository.kt

@@ -5,6 +5,7 @@ import android.content.Intent
 import android.content.pm.PackageManager
 import android.content.pm.ResolveInfo
 import android.os.AsyncTask
+import android.util.Log
 import androidx.lifecycle.LiveData
 import java.util.*
 
@@ -84,6 +85,8 @@ class DataRepository(application: Application) {
 
     private class RefreshAppsAsyncTask internal constructor(private val mAsyncTaskDao: AppDao) : AsyncTask<PackageManager, Void, Void>() {
 
+        private val TAG = "DataRepository"
+
         override fun doInBackground(vararg params: PackageManager): Void? {
             val pm = params[0]
             val main = Intent(Intent.ACTION_MAIN, null)
@@ -95,6 +98,7 @@ class DataRepository(application: Application) {
                     ResolveInfo.DisplayNameComparator(pm))
             for (i in launchables.indices) {
                 val item = launchables[i]
+                Log.d(TAG, "$item")
                 val activity = item.activityInfo
                 val app = App(launchables[i].loadLabel(pm).toString(), activity.applicationInfo.packageName, activity.name)
                 mAsyncTaskDao.insert(app)

+ 5 - 7
app/src/main/java/com/sduduzog/slimlauncher/ui/main/MainFragment.kt

@@ -20,8 +20,7 @@ import androidx.navigation.Navigation
 import com.daasuu.ei.Ease
 import com.daasuu.ei.EasingInterpolator
 import com.google.android.material.bottomsheet.BottomSheetBehavior
-import com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_COLLAPSED
-import com.google.android.material.bottomsheet.BottomSheetBehavior.STATE_EXPANDED
+import com.google.android.material.bottomsheet.BottomSheetBehavior.*
 import com.sduduzog.slimlauncher.MainActivity
 import com.sduduzog.slimlauncher.R
 import kotlinx.android.synthetic.main.main_bottom_sheet.*
@@ -121,7 +120,7 @@ class MainFragment : Fragment() {
             true
         }
         ivExpand.setOnClickListener {
-            if (sheetBehavior.state == STATE_COLLAPSED) sheetBehavior.state = STATE_EXPANDED
+            if (sheetBehavior.state == STATE_COLLAPSED) sheetBehavior.state = STATE_HALF_EXPANDED
         }
 
         ivCamera.setOnClickListener {
@@ -132,9 +131,11 @@ class MainFragment : Fragment() {
                 Log.e(TAG, e.message)
             }
         }
+    }
 
+    private fun setupBottomSheet(){
         bottomSheet.setOnClickListener {
-
+            // Do nothing
         }
         sheetBehavior.setBottomSheetCallback(object : BottomSheetBehavior.BottomSheetCallback() {
             override fun onSlide(p0: View, p1: Float) {
@@ -151,9 +152,6 @@ class MainFragment : Fragment() {
                 }
             }
         })
-    }
-
-    private fun setupBottomSheet(){
         settingsText.setOnClickListener(Navigation.createNavigateOnClickListener(R.id.action_mainFragment_to_settingsFragment))
 
         rateAppText.setOnClickListener {

+ 0 - 10
app/src/main/res/layout/main_bottom_sheet.xml

@@ -40,16 +40,6 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
-            <TextView
-                android:id="@+id/notesText"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_margin="8dp"
-                android:padding="8dp"
-                android:text="@string/main_options_text_notes"
-                android:textSize="24sp"
-                android:visibility="visible" />
-
             <TextView
                 android:id="@+id/settingsText"
                 android:layout_width="wrap_content"