sduduzog 7 gadi atpakaļ
vecāks
revīzija
94a53b24c4
41 mainītis faili ar 96 papildinājumiem un 215 dzēšanām
  1. 3 7
      app/build.gradle
  2. 0 1
      app/proguard-rules.pro
  3. 3 6
      app/src/androidTest/java/com/sduduzog/slimlauncher/DBTest.kt
  4. 1 1
      app/src/androidTest/java/com/sduduzog/slimlauncher/TestUtil.kt
  5. 1 1
      app/src/main/AndroidManifest.xml
  6. 1 1
      app/src/main/java/com/sduduzog/slimlauncher/MainActivity.kt
  7. 5 10
      app/src/main/java/com/sduduzog/slimlauncher/data/DataRepository.kt
  8. 3 4
      app/src/main/java/com/sduduzog/slimlauncher/data/DataRoomDatabase.kt
  9. 1 1
      app/src/main/java/com/sduduzog/slimlauncher/data/Note.kt
  10. 1 1
      app/src/main/java/com/sduduzog/slimlauncher/ui/main/AboutFragment.kt
  11. 1 5
      app/src/main/java/com/sduduzog/slimlauncher/ui/main/DialerFragment.kt
  12. 2 2
      app/src/main/java/com/sduduzog/slimlauncher/ui/main/DoubleClickListener.kt
  13. 6 17
      app/src/main/java/com/sduduzog/slimlauncher/ui/main/MainFragment.kt
  14. 4 3
      app/src/main/java/com/sduduzog/slimlauncher/ui/main/MainViewModel.kt
  15. 2 14
      app/src/main/java/com/sduduzog/slimlauncher/ui/main/notes/NoteFragment.kt
  16. 4 10
      app/src/main/java/com/sduduzog/slimlauncher/ui/main/notes/NotesListFragment.kt
  17. 3 3
      app/src/main/java/com/sduduzog/slimlauncher/ui/main/notes/NotesViewModel.kt
  18. 0 69
      app/src/main/java/com/sduduzog/slimlauncher/ui/main/notes/VerticalViewPager.kt
  19. 4 6
      app/src/main/java/com/sduduzog/slimlauncher/ui/main/settings/AppsListAdapter.kt
  20. 1 1
      app/src/main/java/com/sduduzog/slimlauncher/ui/main/settings/SettingsFragment.kt
  21. 1 3
      app/src/main/java/com/sduduzog/slimlauncher/ui/main/settings/SettingsListAdapter.kt
  22. 1 1
      app/src/main/java/com/sduduzog/slimlauncher/ui/main/setup/OnPagerListener.kt
  23. 1 1
      app/src/main/java/com/sduduzog/slimlauncher/ui/main/setup/PagerHelperFragment.kt
  24. BIN
      app/src/main/res/drawable/clock_zoomed.jpg
  25. BIN
      app/src/main/res/drawable/clock_zoomed2.jpg
  26. 5 5
      app/src/main/res/drawable/ic_chevron_left.xml
  27. 5 5
      app/src/main/res/drawable/ic_drag_handle.xml
  28. 5 5
      app/src/main/res/drawable/ic_edit.xml
  29. 5 5
      app/src/main/res/drawable/ic_text_fields.xml
  30. BIN
      app/src/main/res/drawable/nav_options.jpg
  31. BIN
      app/src/main/res/drawable/nav_options2.jpg
  32. BIN
      app/src/main/res/drawable/nav_options3.jpg
  33. 4 5
      app/src/main/res/drawable/note_item_background.xml
  34. BIN
      app/src/main/res/drawable/screenshot.jpg
  35. 2 2
      app/src/main/res/layout/dialer_fragment.xml
  36. 1 1
      app/src/main/res/layout/main_bottom_sheet.xml
  37. 2 2
      app/src/main/res/layout/settings_list_item.xml
  38. 3 2
      app/src/main/res/layout/settings_rename_app.xml
  39. 12 12
      app/src/main/res/layout/theme_setup_fragment.xml
  40. 2 2
      app/src/main/res/navigation/nav_graph.xml
  41. 1 1
      app/src/main/res/values/strings.xml

+ 3 - 7
app/build.gradle

@@ -12,14 +12,15 @@ android {
         applicationId "com.sduduzog.slimlauncher"
         minSdkVersion 21
         targetSdkVersion 28
-        versionCode 19
-        versionName "2.0.3"
+        versionCode 20
+        versionName "2.1.0"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
     }
     buildTypes {
         release {
             minifyEnabled true
+            shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
         debug {
@@ -49,14 +50,9 @@ dependencies {
     implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0'
     implementation 'android.arch.navigation:navigation-fragment:1.0.0-alpha07'
     implementation 'androidx.room:room-runtime:2.1.0-alpha02'
-    implementation 'androidx.legacy:legacy-support-v4:1.0.0-alpha1'
-    implementation 'androidx.legacy:legacy-support-v13:1.0.0-alpha1'
     kapt "androidx.room:room-compiler:2.1.0-alpha02"
     kapt "androidx.lifecycle:lifecycle-compiler:2.0.0"
 
-    // 3rd Party libs
-    implementation 'com.daasuu:EasingInterpolator:1.0.0'
-
     // Test libs
     testImplementation 'junit:junit:4.12'
     testImplementation 'org.mockito:mockito-core:2.19.0'

+ 0 - 1
app/proguard-rules.pro

@@ -11,7 +11,6 @@
 #-keepclassmembers class fqcn.of.javascript.interface.for.webview {
 #   public *;
 #}
--keep class com.daasuu.** { *; }
 # Uncomment this to preserve the line number information for
 # debugging stack traces.
 #-keepattributes SourceFile,LineNumberTable

+ 3 - 6
app/src/androidTest/java/com/sduduzog/slimlauncher/DBTest.kt

@@ -4,19 +4,16 @@ import androidx.arch.core.executor.testing.InstantTaskExecutorRule
 import androidx.room.Room
 import androidx.test.InstrumentationRegistry
 import androidx.test.runner.AndroidJUnit4
-
 import com.sduduzog.slimlauncher.data.AppDao
 import com.sduduzog.slimlauncher.data.DataRoomDatabase
-
+import org.hamcrest.CoreMatchers.equalTo
 import org.junit.After
+import org.junit.Assert.assertThat
 import org.junit.Before
+import org.junit.Rule
 import org.junit.Test
 import org.junit.runner.RunWith
 
-import org.hamcrest.CoreMatchers.equalTo
-import org.junit.Assert.assertThat
-import org.junit.Rule
-
 @RunWith(AndroidJUnit4::class)
 class DBTest {
 

+ 1 - 1
app/src/androidTest/java/com/sduduzog/slimlauncher/TestUtil.kt

@@ -1,6 +1,6 @@
 package com.sduduzog.slimlauncher
 
-import com.sduduzog.slimlauncher.ui.main.model.App
+import com.sduduzog.slimlauncher.data.App
 
 internal object TestUtil {
 

+ 1 - 1
app/src/main/AndroidManifest.xml

@@ -4,7 +4,7 @@
     package="com.sduduzog.slimlauncher">
 
     <uses-permission android:name="com.android.alarm.permission.SET_ALARM" />
-    <uses-permission android:name="android.permission.CALL_PHONE"/>
+    <uses-permission android:name="android.permission.CALL_PHONE" />
 
     <application
         android:allowBackup="false"

+ 1 - 1
app/src/main/java/com/sduduzog/slimlauncher/MainActivity.kt

@@ -69,7 +69,7 @@ class MainActivity : AppCompatActivity(), SharedPreferences.OnSharedPreferenceCh
                 if (grantResults.isNotEmpty() && grantResults[0] == PackageManager.PERMISSION_GRANTED) {
                     navigator.navigate(R.id.action_mainFragment_to_dialerFragment)
                 } else {
-                // Do nothing
+                    // Do nothing
                 }
                 return
             }

+ 5 - 10
app/src/main/java/com/sduduzog/slimlauncher/data/DataRepository.kt

@@ -5,7 +5,6 @@ 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.*
 
@@ -27,7 +26,7 @@ class DataRepository(application: Application) {
         get() = _apps
 
     val notes: LiveData<List<Note>>
-    get() = _notes
+        get() = _notes
 
     fun insertHomeApp(app: HomeApp) {
         InsertHomeAppAsyncTask(appDao).execute(app)
@@ -37,7 +36,7 @@ class DataRepository(application: Application) {
         DeleteHomeAppAsyncTask(appDao).execute(app)
     }
 
-    fun clearHomeApps(){
+    fun clearHomeApps() {
         ClearHomeAppsAsyncTask(appDao).execute()
     }
 
@@ -55,15 +54,15 @@ class DataRepository(application: Application) {
         UpdateAppsAsyncTask(appDao).execute(app)
     }
 
-    fun saveNote(note: Note){
+    fun saveNote(note: Note) {
         SaveNoteAsyncTask(noteDao).execute(note)
     }
 
-    fun updateNote(note: Note){
+    fun updateNote(note: Note) {
         UpdateNoteAsyncTask(noteDao).execute(note)
     }
 
-    fun deleteNote(note: Note){
+    fun deleteNote(note: Note) {
         DeleteNoteAsyncTask(noteDao).execute(note)
     }
 
@@ -101,9 +100,6 @@ class DataRepository(application: Application) {
 
     private class RefreshAppsAsyncTask internal constructor(private val mAsyncTaskDao: AppDao) : AsyncTask<PackageManager, Void, Void>() {
 
-        @Suppress("PropertyName")
-        private val _tag = "DataRepository"
-
         override fun doInBackground(vararg params: PackageManager): Void? {
             val pm = params[0]
             val main = Intent(Intent.ACTION_MAIN, null)
@@ -116,7 +112,6 @@ class DataRepository(application: Application) {
             mAsyncTaskDao.deleteAll() // Need to find a less expensive way of doing this
             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)

+ 3 - 4
app/src/main/java/com/sduduzog/slimlauncher/data/DataRoomDatabase.kt

@@ -8,7 +8,6 @@ import androidx.room.migration.Migration
 import androidx.sqlite.db.SupportSQLiteDatabase
 
 
-
 @Database(entities = [App::class, HomeApp::class, Note::class], version = 3, exportSchema = false)
 abstract class DataRoomDatabase : RoomDatabase() {
 
@@ -33,13 +32,13 @@ abstract class DataRoomDatabase : RoomDatabase() {
             }
         }
 
-        private val MIGRATION_1_2 = object: Migration(1, 2){
+        private val MIGRATION_1_2 = object : Migration(1, 2) {
             override fun migrate(database: SupportSQLiteDatabase) {
                 database.execSQL("ALTER TABLE home_apps ADD COLUMN sorting_index INTEGER NOT NULL DEFAULT 0")
                 val cursor = database.query("SELECT package_name FROM home_apps")
                 cursor.moveToFirst()
                 var index = 0
-                while (!cursor.isAfterLast){
+                while (!cursor.isAfterLast) {
                     val column = cursor.getString(cursor.getColumnIndex("package_name"))
                     database.execSQL("UPDATE home_apps SET sorting_index=$index WHERE package_name='$column'")
                     cursor.moveToNext()
@@ -48,7 +47,7 @@ abstract class DataRoomDatabase : RoomDatabase() {
             }
         }
 
-        private val MIGRATION_2_3 = object: Migration(2, 3){
+        private val MIGRATION_2_3 = object : Migration(2, 3) {
             override fun migrate(database: SupportSQLiteDatabase) {
                 database.execSQL("CREATE TABLE IF NOT EXISTS `notes` (`id` INTEGER PRIMARY KEY AUTOINCREMENT, `title` TEXT, `body` TEXT NOT NULL, `edited` INTEGER NOT NULL)")
             }

+ 1 - 1
app/src/main/java/com/sduduzog/slimlauncher/data/Note.kt

@@ -12,7 +12,7 @@ data class Note(
         var body: String,
         @field:ColumnInfo(name = "edited")
         var edited: Long
-): Serializable {
+) : Serializable {
     @field:ColumnInfo(name = "id")
     @PrimaryKey(autoGenerate = true)
     var id: Int? = null

+ 1 - 1
app/src/main/java/com/sduduzog/slimlauncher/ui/main/AboutFragment.kt

@@ -2,11 +2,11 @@ package com.sduduzog.slimlauncher.ui.main
 
 
 import android.os.Bundle
-import androidx.fragment.app.Fragment
 import android.text.method.LinkMovementMethod
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
+import androidx.fragment.app.Fragment
 import com.sduduzog.slimlauncher.R
 import kotlinx.android.synthetic.main.about_fragment.*
 

+ 1 - 5
app/src/main/java/com/sduduzog/slimlauncher/ui/main/DialerFragment.kt

@@ -4,7 +4,6 @@ package com.sduduzog.slimlauncher.ui.main
 import android.content.Intent
 import android.net.Uri
 import android.os.Bundle
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -15,9 +14,6 @@ import kotlinx.android.synthetic.main.dialer_fragment.*
 
 class DialerFragment : Fragment(), View.OnClickListener {
 
-    @Suppress("PropertyName")
-    val TAG: String = "DialerFragment"
-
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
                               savedInstanceState: Bundle?): View? {
         // Inflate the layout for this fragment
@@ -49,7 +45,7 @@ class DialerFragment : Fragment(), View.OnClickListener {
                 i.data = Uri.parse("tel:${Uri.encode(number)}")
                 startActivity(i)
             } catch (e: Exception) {
-                Log.e(TAG, "$e")
+                // Do nothing
             }
         }
     }

+ 2 - 2
app/src/main/java/com/sduduzog/slimlauncher/ui/main/DoubleClickListener.kt

@@ -2,13 +2,13 @@ package com.sduduzog.slimlauncher.ui.main
 
 import android.view.View
 
-abstract class DoubleClickListener: View.OnClickListener { // courtesy of Xar E Ahmer @ stackoverflow
+abstract class DoubleClickListener : View.OnClickListener { // courtesy of Xar E Ahmer @ stackoverflow
 
     private var lastTickTime: Long = 0
 
     override fun onClick(view: View) {
         val clickTime = System.currentTimeMillis()
-        if (clickTime - lastTickTime < DOUBLE_CLICK_TIME_DELTA){
+        if (clickTime - lastTickTime < DOUBLE_CLICK_TIME_DELTA) {
             onDoubleClick(view)
         } else {
             onSingleClick(view)

+ 6 - 17
app/src/main/java/com/sduduzog/slimlauncher/ui/main/MainFragment.kt

@@ -1,6 +1,5 @@
 package com.sduduzog.slimlauncher.ui.main
 
-import android.animation.ObjectAnimator
 import android.content.*
 import android.content.pm.PackageManager
 import android.net.Uri
@@ -8,7 +7,6 @@ import android.os.Bundle
 import android.provider.AlarmClock
 import android.provider.MediaStore
 import android.provider.Settings
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -17,8 +15,6 @@ import androidx.core.app.ActivityCompat
 import androidx.core.content.ContextCompat
 import androidx.fragment.app.Fragment
 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_HALF_EXPANDED
@@ -32,9 +28,6 @@ import java.util.*
 
 class MainFragment : Fragment(), MainActivity.OnBackPressedListener {
 
-    @Suppress("PropertyName")
-    val TAG: String = "MainFragment"
-
     private lateinit var receiver: BroadcastReceiver
     private lateinit var sheetBehavior: BottomSheetBehavior<FrameLayout>
 
@@ -115,7 +108,7 @@ class MainFragment : Fragment(), MainActivity.OnBackPressedListener {
                     val intent = Intent(Intent.ACTION_DIAL)
                     startActivity(intent)
                 } catch (e: Exception) {
-                    Log.e(TAG, e.message)
+                    // Do nothing
                 }
             }
         }
@@ -125,7 +118,7 @@ class MainFragment : Fragment(), MainActivity.OnBackPressedListener {
                     val intent = Intent(Intent.ACTION_DIAL, null)
                     startActivity(intent)
                 } catch (e: ActivityNotFoundException) {
-                    Log.e(TAG, "$e")
+                    // Do nothing
                 }
             }
             true
@@ -139,7 +132,7 @@ class MainFragment : Fragment(), MainActivity.OnBackPressedListener {
                 val intent = Intent(MediaStore.INTENT_ACTION_STILL_IMAGE_CAMERA)
                 startActivity(intent)
             } catch (e: Exception) {
-                Log.e(TAG, e.message)
+                // Do nothing
             }
         }
     }
@@ -174,7 +167,6 @@ class MainFragment : Fragment(), MainActivity.OnBackPressedListener {
             goToMarket.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT)
             try {
                 startActivity(goToMarket)
-                Log.d(TAG, goToMarket.data?.query)
             } catch (e: ActivityNotFoundException) {
                 startActivity(Intent(Intent.ACTION_VIEW,
                         Uri.parse("http://play.google.com/store/apps/details?id=" + context?.packageName)))
@@ -194,12 +186,9 @@ class MainFragment : Fragment(), MainActivity.OnBackPressedListener {
     }
 
     private fun doBounceAnimation(targetView: View) {
-        val animator = ObjectAnimator.ofFloat(targetView, "translationY", 0f, -20f, 0f)
-        animator.interpolator = EasingInterpolator(Ease.QUINT_OUT)
-        animator.startDelay = 1000
-        animator.duration = 1000
-        animator.repeatCount = 1
-        animator.start()
+        targetView.animate().translationYBy(-20f).withEndAction {
+            targetView.animate().translationYBy(20f).duration = 300
+        }.duration = 100
     }
 
     fun updateUi() {

+ 4 - 3
app/src/main/java/com/sduduzog/slimlauncher/ui/main/MainViewModel.kt

@@ -38,16 +38,17 @@ class MainViewModel(application: Application) : AndroidViewModel(application) {
     fun addToHomeScreen(app: HomeApp) {
         _repository.insertHomeApp(app)
     }
-    fun renameApp(app: HomeApp){
+
+    fun renameApp(app: HomeApp) {
         _repository.renameApp(app)
     }
 
-    fun clearHomeApps(){
+    fun clearHomeApps() {
         _repository.clearHomeApps()
     }
 
     fun addToHomeScreen(apps: List<App>) {
-        for (i in apps.indices){
+        for (i in apps.indices) {
             val app = apps[i]
             val home = HomeApp(app.appName, app.packageName, app.activityName, i)
             _repository.insertHomeApp(home)

+ 2 - 14
app/src/main/java/com/sduduzog/slimlauncher/ui/main/notes/NoteFragment.kt

@@ -3,7 +3,6 @@ package com.sduduzog.slimlauncher.ui.main.notes
 
 import android.content.Context
 import android.os.Bundle
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -21,9 +20,6 @@ import java.util.*
 
 class NoteFragment : Fragment(), MainActivity.OnBackPressedListener {
 
-    @Suppress("PropertyName")
-    val TAG: String = "NoteFragment"
-
     private lateinit var note: Note
     private lateinit var viewModel: NotesViewModel
     private lateinit var initialDigest: String
@@ -59,9 +55,6 @@ class NoteFragment : Fragment(), MainActivity.OnBackPressedListener {
             bodyEditText.setText(note.body)
             titleEditText.isEnabled = false
         }
-        titleEditText.setOnClickListener {
-            Log.d(TAG, "title edit")
-        }
         titleEditText.setOnEditorActionListener { _, _, _ ->
             editBody()
             true
@@ -73,16 +66,11 @@ class NoteFragment : Fragment(), MainActivity.OnBackPressedListener {
             }
 
             override fun onSingleClick(v: View) {
-                Log.d(TAG, "single click")
+                // Do nothing
             }
         })
     }
 
-    override fun onPause() {
-        super.onPause()
-        saveNote()
-    }
-
     override fun onAttach(context: Context?) {
         super.onAttach(context)
         with(context as MainActivity) {
@@ -95,7 +83,7 @@ class NoteFragment : Fragment(), MainActivity.OnBackPressedListener {
     }
 
     override fun onBackPressed() {
-        Log.d(TAG, "onBackPressed")
+        saveNote()
     }
 
     private fun editBody() {

+ 4 - 10
app/src/main/java/com/sduduzog/slimlauncher/ui/main/notes/NotesListFragment.kt

@@ -1,8 +1,6 @@
 package com.sduduzog.slimlauncher.ui.main.notes
 
 
-import android.animation.ObjectAnimator
-import android.animation.PropertyValuesHolder
 import android.os.Bundle
 import android.util.Log
 import android.view.LayoutInflater
@@ -12,8 +10,6 @@ import androidx.fragment.app.Fragment
 import androidx.navigation.Navigation
 import androidx.recyclerview.widget.ItemTouchHelper
 import androidx.recyclerview.widget.RecyclerView
-import com.daasuu.ei.Ease
-import com.daasuu.ei.EasingInterpolator
 import com.sduduzog.slimlauncher.R
 import com.sduduzog.slimlauncher.ui.main.OnItemActionListener
 import kotlinx.android.synthetic.main.notes_list_fragment.*
@@ -65,11 +61,9 @@ class NotesListFragment : Fragment() {
     }
 
     private fun showFabAnimation(targetView: View) {
-        val scaleX = PropertyValuesHolder.ofFloat("scaleX", 0f, 1f)
-        val scaleY = PropertyValuesHolder.ofFloat("scaleY", 0f, 1f)
-        val animator = ObjectAnimator.ofPropertyValuesHolder(targetView, scaleX, scaleY)
-        animator.interpolator = EasingInterpolator(Ease.SINE_IN_OUT)
-        animator.duration = 100
-        animator.start()
+        targetView.scaleX = 0f
+        targetView.scaleY = 0f
+        targetView.animate().scaleY(1f).scaleX(1f).duration = 1000
+        // Animate fab
     }
 }

+ 3 - 3
app/src/main/java/com/sduduzog/slimlauncher/ui/main/notes/NotesViewModel.kt

@@ -18,15 +18,15 @@ class NotesViewModel(application: Application) : AndroidViewModel(application) {
     val notes: LiveData<List<Note>>
         get() = _notes
 
-    fun saveNote(note: Note){
+    fun saveNote(note: Note) {
         _repository.saveNote(note)
     }
 
-    fun updateNote(note: Note){
+    fun updateNote(note: Note) {
         _repository.updateNote(note)
     }
 
-    fun deleteNote(note: Note){
+    fun deleteNote(note: Note) {
         _repository.deleteNote(note)
     }
 }

+ 0 - 69
app/src/main/java/com/sduduzog/slimlauncher/ui/main/notes/VerticalViewPager.kt

@@ -1,69 +0,0 @@
-package com.sduduzog.slimlauncher.ui.main.notes
-
-import android.annotation.SuppressLint
-import android.content.Context
-import android.util.AttributeSet
-import android.view.MotionEvent
-import android.view.View
-import androidx.viewpager.widget.ViewPager
-
-
-@Suppress("unused")
-class VerticalViewPager @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) : ViewPager(context, attrs) {
-
-    init {
-        init()
-    }
-
-    override fun canScrollHorizontally(direction: Int): Boolean {
-        return false
-    }
-
-    override fun canScrollVertically(direction: Int): Boolean {
-        return super.canScrollHorizontally(direction)
-    }
-
-    private fun init() {
-        setPageTransformer(true, VerticalPageTransformer())
-        overScrollMode = View.OVER_SCROLL_NEVER
-    }
-
-    override fun onInterceptTouchEvent(ev: MotionEvent): Boolean {
-        val toIntercept = super.onInterceptTouchEvent(flipXY(ev))
-        flipXY(ev)
-        return toIntercept
-    }
-
-    @SuppressLint("ClickableViewAccessibility")
-    override fun onTouchEvent(ev: MotionEvent): Boolean {
-        val toHandle = super.onTouchEvent(flipXY(ev))
-        flipXY(ev)
-        return toHandle
-    }
-
-    private fun flipXY(ev: MotionEvent): MotionEvent {
-        val width = width.toFloat()
-        val height = height.toFloat()
-        val x = ev.y / height * width
-        val y = ev.x / width * height
-        ev.setLocation(x, y)
-        return ev
-    }
-
-    private class VerticalPageTransformer : ViewPager.PageTransformer {
-        override fun transformPage(view: View, position: Float) {
-            val pageWidth = view.width
-            val pageHeight = view.height
-            when {
-                position < -1 -> view.alpha = 0F
-                position <= 1 -> {
-                    view.alpha = 1F
-                    view.translationX = pageWidth * -position
-                    val yPosition = position * pageHeight
-                    view.translationY = yPosition
-                }
-                else -> view.alpha = 0F
-            }
-        }
-    }
-}

+ 4 - 6
app/src/main/java/com/sduduzog/slimlauncher/ui/main/settings/AppsListAdapter.kt

@@ -1,6 +1,6 @@
 package com.sduduzog.slimlauncher.ui.main.settings
 
-import androidx.recyclerview.widget.RecyclerView
+
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -8,24 +8,22 @@ import android.widget.TextView
 import androidx.fragment.app.Fragment
 import androidx.lifecycle.Observer
 import androidx.lifecycle.ViewModelProviders
+import androidx.recyclerview.widget.RecyclerView
 import com.sduduzog.slimlauncher.R
 import com.sduduzog.slimlauncher.data.App
 import com.sduduzog.slimlauncher.data.HomeApp
 import com.sduduzog.slimlauncher.ui.main.MainViewModel
-
-
 import com.sduduzog.slimlauncher.ui.main.settings.AppsFragment.OnAppsChooserListener
-
 import kotlinx.android.synthetic.main.apps_list_item.view.*
 
 
 class AppsListAdapter(fragment: Fragment,
-        private val mListener: OnAppsChooserListener?,
+                      private val mListener: OnAppsChooserListener?,
                       private val appIndex: Int)
     : RecyclerView.Adapter<AppsListAdapter.ViewHolder>() {
 
     private var mValues: List<App> = listOf()
-    private var viewModel: MainViewModel =  ViewModelProviders.of(fragment).get(MainViewModel::class.java)
+    private var viewModel: MainViewModel = ViewModelProviders.of(fragment).get(MainViewModel::class.java)
 
     init {
         viewModel.apps.observe(fragment, Observer {

+ 1 - 1
app/src/main/java/com/sduduzog/slimlauncher/ui/main/settings/SettingsFragment.kt

@@ -79,7 +79,7 @@ class SettingsFragment : Fragment() {
         initComponents()
     }
 
-    private fun initComponents(){
+    private fun initComponents() {
         val settings = context!!.getSharedPreferences(getString(R.string.prefs_settings), MODE_PRIVATE)
         clockSwitch.isChecked = settings.getBoolean(getString(R.string.prefs_settings_key_clock_type), false)
         clockSwitch.setOnCheckedChangeListener { _, b ->

+ 1 - 3
app/src/main/java/com/sduduzog/slimlauncher/ui/main/settings/SettingsListAdapter.kt

@@ -2,7 +2,6 @@ package com.sduduzog.slimlauncher.ui.main.settings
 
 import android.annotation.SuppressLint
 import android.os.Bundle
-import android.util.Log
 import android.view.LayoutInflater
 import android.view.MotionEvent
 import android.view.View
@@ -33,7 +32,6 @@ class SettingsListAdapter(private val fragment: Fragment) : RecyclerView.Adapter
 
     init {
         viewModel.homeApps.observe(fragment, Observer {
-            Log.d("Adapter", "$it")
             updateApps(it.orEmpty())
         })
     }
@@ -53,7 +51,7 @@ class SettingsListAdapter(private val fragment: Fragment) : RecyclerView.Adapter
             }
             holder.itemButton.visibility = View.GONE
             holder.itemDragger.visibility = View.VISIBLE
-            holder.itemDragger.setOnTouchListener { view, motionEvent ->
+            holder.itemDragger.setOnTouchListener { _, motionEvent ->
                 if (motionEvent.actionMasked == MotionEvent.ACTION_DOWN) {
                     touchHelper.startDrag(holder)
                 }

+ 1 - 1
app/src/main/java/com/sduduzog/slimlauncher/ui/main/setup/OnPagerListener.kt

@@ -1,5 +1,5 @@
 package com.sduduzog.slimlauncher.ui.main.setup
 
-interface OnPagerListener{
+interface OnPagerListener {
     fun onPage(position: Int)
 }

+ 1 - 1
app/src/main/java/com/sduduzog/slimlauncher/ui/main/setup/PagerHelperFragment.kt

@@ -2,6 +2,6 @@ package com.sduduzog.slimlauncher.ui.main.setup
 
 import androidx.fragment.app.Fragment
 
-abstract class PagerHelperFragment: Fragment() {
+abstract class PagerHelperFragment : Fragment() {
     var listener: OnPagerListener? = null
 }

BIN
app/src/main/res/drawable/clock_zoomed.jpg


BIN
app/src/main/res/drawable/clock_zoomed2.jpg


+ 5 - 5
app/src/main/res/drawable/ic_chevron_left.xml

@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
         android:fillColor="?android:colorForeground"
-        android:pathData="M15.41,7.41L14,6l-6,6 6,6 1.41,-1.41L10.83,12z"/>
+        android:pathData="M15.41,7.41L14,6l-6,6 6,6 1.41,-1.41L10.83,12z" />
 </vector>

+ 5 - 5
app/src/main/res/drawable/ic_drag_handle.xml

@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
         android:fillColor="?android:colorForeground"
-        android:pathData="M20,9H4v2h16V9zM4,15h16v-2H4v2z"/>
+        android:pathData="M20,9H4v2h16V9zM4,15h16v-2H4v2z" />
 </vector>

+ 5 - 5
app/src/main/res/drawable/ic_edit.xml

@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
         android:fillColor="#FFFFFFFF"
-        android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z"/>
+        android:pathData="M3,17.25V21h3.75L17.81,9.94l-3.75,-3.75L3,17.25zM20.71,7.04c0.39,-0.39 0.39,-1.02 0,-1.41l-2.34,-2.34c-0.39,-0.39 -1.02,-0.39 -1.41,0l-1.83,1.83 3.75,3.75 1.83,-1.83z" />
 </vector>

+ 5 - 5
app/src/main/res/drawable/ic_text_fields.xml

@@ -1,9 +1,9 @@
 <vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
     <path
         android:fillColor="#FF000000"
-        android:pathData="M2.5,4v3h5v12h3L10.5,7h5L15.5,4h-13zM21.5,9h-9v3h3v7h3v-7h3L21.5,9z"/>
+        android:pathData="M2.5,4v3h5v12h3L10.5,7h5L15.5,4h-13zM21.5,9h-9v3h3v7h3v-7h3L21.5,9z" />
 </vector>

BIN
app/src/main/res/drawable/nav_options.jpg


BIN
app/src/main/res/drawable/nav_options2.jpg


BIN
app/src/main/res/drawable/nav_options3.jpg


+ 4 - 5
app/src/main/res/drawable/note_item_background.xml

@@ -2,14 +2,13 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
 
-    <corners
-        android:radius="8dp" />
+    <corners android:radius="8dp" />
 
     <gradient
-        android:startColor="#18ffffff"
-        android:endColor="#10000000"
+        android:angle="45"
         android:centerX="0"
         android:centerY="0"
-        android:angle="45"/>
+        android:endColor="#10000000"
+        android:startColor="#18ffffff" />
 
 </shape>

BIN
app/src/main/res/drawable/screenshot.jpg


+ 2 - 2
app/src/main/res/layout/dialer_fragment.xml

@@ -265,13 +265,13 @@
         android:layout_marginEnd="8dp"
         android:background="?attr/selectableItemBackgroundBorderless"
         android:clickable="true"
+        android:contentDescription="@string/dialer_chevron"
         android:focusable="true"
         android:padding="8dp"
         android:src="@drawable/ic_chevron_left"
         android:visibility="invisible"
         app:layout_constraintBottom_toBottomOf="@+id/editText2"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/editText2"
-        android:contentDescription="@string/dialer_chevron" />
+        app:layout_constraintTop_toTopOf="@+id/editText2" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

+ 1 - 1
app/src/main/res/layout/main_bottom_sheet.xml

@@ -5,9 +5,9 @@
     android:id="@+id/bottomSheet"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
-    app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior"
     app:behavior_hideable="false"
     app:behavior_peekHeight="60dp"
+    app:layout_behavior="com.google.android.material.bottomsheet.BottomSheetBehavior"
     tools:context="com.sduduzog.slimlauncher.ui.main.MainFragment">
 
 

+ 2 - 2
app/src/main/res/layout/settings_list_item.xml

@@ -53,11 +53,11 @@
         android:layout_marginEnd="8dp"
         android:layout_marginBottom="8dp"
         android:alpha="0.5"
+        android:contentDescription="@string/settings_item_icon_drag_handler"
         android:padding="8dp"
         app:layout_constraintBottom_toBottomOf="parent"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintTop_toTopOf="parent"
-        app:srcCompat="@drawable/ic_drag_handle"
-        android:contentDescription="@string/settings_item_icon_drag_handler" />
+        app:srcCompat="@drawable/ic_drag_handle" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

+ 3 - 2
app/src/main/res/layout/settings_rename_app.xml

@@ -1,8 +1,9 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
-    android:orientation="vertical" android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical">
 
     <EditText
         android:id="@+id/rename_editText"

+ 12 - 12
app/src/main/res/layout/theme_setup_fragment.xml

@@ -26,20 +26,21 @@
         android:layout_marginStart="8dp"
         android:layout_marginTop="32dp"
         android:clickable="true"
+        android:focusable="true"
         android:src="@drawable/ic_text_fields"
         app:backgroundTint="@color/colorWhite"
         app:fabSize="normal"
         app:layout_constraintEnd_toStartOf="@+id/setup_fab_dark"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/textView18"
-        android:focusable="true" />
+        app:layout_constraintTop_toBottomOf="@+id/textView18" />
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/setup_fab_dark"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:clickable="true"
+        android:focusable="true"
         android:src="@drawable/ic_text_fields"
         android:tint="@color/inverseTextColor"
         app:backgroundTint="@color/primaryDarkColor"
@@ -47,8 +48,7 @@
         app:layout_constraintEnd_toStartOf="@+id/setup_fab_jupiter"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toEndOf="@+id/setup_fab_default"
-        app:layout_constraintTop_toTopOf="@+id/setup_fab_default"
-        android:focusable="true" />
+        app:layout_constraintTop_toTopOf="@+id/setup_fab_default" />
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/setup_fab_jupiter"
@@ -56,6 +56,7 @@
         android:layout_height="wrap_content"
         android:layout_marginEnd="8dp"
         android:clickable="true"
+        android:focusable="true"
         android:src="@drawable/ic_text_fields"
         android:tint="@color/inverseTextColor"
         app:backgroundTint="@color/colorBlueGrey"
@@ -63,8 +64,7 @@
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toEndOf="@+id/setup_fab_dark"
-        app:layout_constraintTop_toTopOf="@+id/setup_fab_dark"
-        android:focusable="true" />
+        app:layout_constraintTop_toTopOf="@+id/setup_fab_dark" />
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/setup_fab_teal"
@@ -72,20 +72,21 @@
         android:layout_height="wrap_content"
         android:layout_marginTop="32dp"
         android:clickable="true"
+        android:focusable="true"
         android:src="@drawable/ic_text_fields"
         app:backgroundTint="@color/colorTeal"
         app:fabSize="normal"
         app:layout_constraintEnd_toStartOf="@+id/setup_fab_candy"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/textView20"
-        android:focusable="true" />
+        app:layout_constraintTop_toBottomOf="@+id/textView20" />
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/setup_fab_candy"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:clickable="true"
+        android:focusable="true"
         android:src="@drawable/ic_text_fields"
         android:tint="@color/inverseTextColor"
         app:backgroundTint="@color/colorCandy"
@@ -93,22 +94,21 @@
         app:layout_constraintEnd_toStartOf="@+id/setup_fab_pastel"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toEndOf="@+id/setup_fab_teal"
-        app:layout_constraintTop_toTopOf="@+id/setup_fab_teal"
-        android:focusable="true" />
+        app:layout_constraintTop_toTopOf="@+id/setup_fab_teal" />
 
     <com.google.android.material.floatingactionbutton.FloatingActionButton
         android:id="@+id/setup_fab_pastel"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:clickable="true"
+        android:focusable="true"
         android:src="@drawable/ic_text_fields"
         app:backgroundTint="@color/colorPink"
         app:fabSize="normal"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintHorizontal_bias="0.5"
         app:layout_constraintStart_toEndOf="@+id/setup_fab_candy"
-        app:layout_constraintTop_toTopOf="@+id/setup_fab_candy"
-        android:focusable="true" />
+        app:layout_constraintTop_toTopOf="@+id/setup_fab_candy" />
 
     <TextView
         android:id="@+id/textView20"

+ 2 - 2
app/src/main/res/navigation/nav_graph.xml

@@ -46,7 +46,7 @@
         android:id="@+id/setupFragment"
         android:name="com.sduduzog.slimlauncher.ui.main.setup.SetupFragment"
         android:label="setup_fragment"
-        tools:layout="@layout/setup_fragment" >
+        tools:layout="@layout/setup_fragment">
         <action
             android:id="@+id/action_setupFragment_to_mainFragment2"
             app:destination="@id/mainFragment" />
@@ -55,7 +55,7 @@
         android:id="@+id/notesListFragment"
         android:name="com.sduduzog.slimlauncher.ui.main.notes.NotesListFragment"
         android:label="notes_list_fragment"
-        tools:layout="@layout/notes_list_fragment" >
+        tools:layout="@layout/notes_list_fragment">
         <action
             android:id="@+id/action_openNoteFragment"
             app:destination="@id/noteFragment" />

+ 1 - 1
app/src/main/res/values/strings.xml

@@ -45,7 +45,7 @@
     <string name="settings_button_change_theme">Change</string>
     <string name="about_title">Slim launcher</string>
     <string name="about_text">
-        "Slim v2.0.3 \u00a9 2018\n"
+        "Slim v2.1.0 \u00a9 2018\n"
         Created by : Beautus S Gumede\n
         Source : <a href="https://github.com/sduduzog/slim-launcher">https://github.com/sduduzog/slim-launcher</a>\n\n
         Slim is an open source application launcher created to be a minimal and simple launcher to