Bläddra i källkod

Some cleaning, with lint

sduduzog 7 år sedan
förälder
incheckning
3f79f883ba

+ 3 - 2
app/src/main/java/com/sduduzog/slimlauncher/data/DataRepository.kt

@@ -85,7 +85,8 @@ class DataRepository(application: Application) {
 
     private class RefreshAppsAsyncTask internal constructor(private val mAsyncTaskDao: AppDao) : AsyncTask<PackageManager, Void, Void>() {
 
-        private val TAG = "DataRepository"
+        @Suppress("PropertyName")
+        private val _tag = "DataRepository"
 
         override fun doInBackground(vararg params: PackageManager): Void? {
             val pm = params[0]
@@ -98,7 +99,7 @@ class DataRepository(application: Application) {
                     ResolveInfo.DisplayNameComparator(pm))
             for (i in launchables.indices) {
                 val item = launchables[i]
-                Log.d(TAG, "$item")
+                Log.d(_tag, "$item")
                 val activity = item.activityInfo
                 val app = App(launchables[i].loadLabel(pm).toString(), activity.applicationInfo.packageName, activity.name)
                 mAsyncTaskDao.insert(app)

+ 14 - 11
app/src/main/java/com/sduduzog/slimlauncher/ui/main/notes/VerticalViewPager.kt

@@ -1,5 +1,6 @@
 package com.sduduzog.slimlauncher.ui.main.notes
 
+import android.annotation.SuppressLint
 import android.content.Context
 import android.util.AttributeSet
 import android.view.MotionEvent
@@ -7,6 +8,7 @@ import android.view.View
 import androidx.viewpager.widget.ViewPager
 
 
+@Suppress("unused")
 class VerticalViewPager @JvmOverloads constructor(context: Context, attrs: AttributeSet? = null) : ViewPager(context, attrs) {
 
     init {
@@ -32,6 +34,7 @@ class VerticalViewPager @JvmOverloads constructor(context: Context, attrs: Attri
         return toIntercept
     }
 
+    @SuppressLint("ClickableViewAccessibility")
     override fun onTouchEvent(ev: MotionEvent): Boolean {
         val toHandle = super.onTouchEvent(flipXY(ev))
         flipXY(ev)
@@ -49,17 +52,17 @@ class VerticalViewPager @JvmOverloads constructor(context: Context, attrs: Attri
 
     private class VerticalPageTransformer : ViewPager.PageTransformer {
         override fun transformPage(view: View, position: Float) {
-            val pageWidth = view.getWidth()
-            val pageHeight = view.getHeight()
-            if (position < -1) {
-                view.setAlpha(0F)
-            } else if (position <= 1) {
-                view.setAlpha(1F)
-                view.setTranslationX(pageWidth * -position)
-                val yPosition = position * pageHeight
-                view.setTranslationY(yPosition)
-            } else {
-                view.setAlpha(0F)
+            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
             }
         }
     }

+ 0 - 15
app/src/main/res/anim/slide_down_enter.xml

@@ -1,15 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shareInterpolator="@android:anim/accelerate_decelerate_interpolator">
-
-    <translate
-        android:duration="@android:integer/config_shortAnimTime"
-        android:fromYDelta="-100%p"
-        android:toYDelta="0%p" />
-
-    <alpha
-        android:duration="@android:integer/config_shortAnimTime"
-        android:fromAlpha="0.5"
-        android:toAlpha="1.0" />
-
-</set>

+ 0 - 13
app/src/main/res/anim/slide_down_exit.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shareInterpolator="@android:anim/accelerate_decelerate_interpolator">
-    <translate
-        android:duration="@android:integer/config_shortAnimTime"
-        android:fromYDelta="0%p"
-        android:toYDelta="100%p" />
-
-    <alpha
-        android:duration="@android:integer/config_shortAnimTime"
-        android:fromAlpha="1.0"
-        android:toAlpha="0.0" />
-</set>

+ 0 - 12
app/src/main/res/anim/slide_up_enter.xml

@@ -1,12 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shareInterpolator="@android:anim/accelerate_decelerate_interpolator">
-    <translate
-        android:duration="@android:integer/config_shortAnimTime"
-        android:fromYDelta="100%p"
-        android:toYDelta="0%p" />
-    <alpha
-        android:duration="@android:integer/config_shortAnimTime"
-        android:fromAlpha="0.5"
-        android:toAlpha="1.0" />
-</set>

+ 0 - 13
app/src/main/res/anim/slide_up_exit.xml

@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<set xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shareInterpolator="@android:anim/accelerate_decelerate_interpolator">
-    <translate
-        android:duration="@android:integer/config_shortAnimTime"
-        android:fromYDelta="0%p"
-        android:toYDelta="-100%p" />
-
-    <alpha
-        android:duration="@android:integer/config_shortAnimTime"
-        android:fromAlpha="1.0"
-        android:toAlpha="0.0" />
-</set>

+ 0 - 11
app/src/main/res/drawable/app_background.xml

@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:shape="rectangle">
-
-    <corners
-        android:radius="8dp" />
-
-    <stroke android:color="?android:colorForeground"
-        android:width="1dp"/>
-
-</shape>

+ 0 - 9
app/src/main/res/drawable/ic_dashboard_black_24dp.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="M3,13h8L11,3L3,3v10zM3,21h8v-6L3,15v6zM13,21h8L21,11h-8v10zM13,3v6h8L21,3h-8z" />
-</vector>

+ 0 - 9
app/src/main/res/drawable/ic_home_black_24dp.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="M10,20v-6h4v6h5v-8h3L12,3 2,12h3v8z" />
-</vector>

+ 0 - 9
app/src/main/res/drawable/ic_note.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="M22,10l-6,-6L4,4c-1.1,0 -2,0.9 -2,2v12.01c0,1.1 0.9,1.99 2,1.99l16,-0.01c1.1,0 2,-0.89 2,-1.99v-8zM15,5.5l5.5,5.5L15,11L15,5.5z"/>
-</vector>

+ 0 - 9
app/src/main/res/drawable/ic_notifications_black_24dp.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,22c1.1,0 2,-0.9 2,-2h-4c0,1.1 0.89,2 2,2zM18,16v-5c0,-3.07 -1.64,-5.64 -4.5,-6.32L13.5,4c0,-0.83 -0.67,-1.5 -1.5,-1.5s-1.5,0.67 -1.5,1.5v0.68C7.63,5.36 6,7.92 6,11v5l-2,2v1h16v-1l-2,-2z" />
-</vector>

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

@@ -271,6 +271,7 @@
         android:visibility="invisible"
         app:layout_constraintBottom_toBottomOf="@+id/editText2"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintTop_toTopOf="@+id/editText2" />
+        app:layout_constraintTop_toTopOf="@+id/editText2"
+        android:contentDescription="@string/dialer_chevron" />
 
 </androidx.constraintlayout.widget.ConstraintLayout>

+ 0 - 3
app/src/main/res/transition/custom_transition.xml

@@ -1,3 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<transitionSet xmlns:android="http://schemas.android.com/apk/res/android">
-</transitionSet>

+ 0 - 8
app/src/main/res/values/dimens.xml

@@ -1,12 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
 
-
-    <!-- Default screen margins, per the Android Design guidelines. -->
-    <!--<dimen name="activity_horizontal_margin">16dp</dimen>-->
-    <!--<dimen name="activity_vertical_margin">16dp</dimen>-->
-
-    <!-- Default screen margins, per the Android Design guidelines. -->
-    <dimen name="activity_horizontal_margin">16dp</dimen>
-    <dimen name="activity_vertical_margin">16dp</dimen>
 </resources>

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

@@ -24,8 +24,6 @@
     <string name="prefs_settings_key_fresh_install_setup">key_fresh_install_setup</string>
 
     <!--main package strings-->
-    <string name="main_button_dialer">Dialer</string>
-    <string name="main_button_camera">Camera</string>
 
     <string name="main_slim_options">Slim options</string>
     <string name="main_options_change_theme">Change theme</string>
@@ -99,15 +97,11 @@
 
     <string name="no_app_selected_toast_msg">Choose at least one app</string>
     <string name="choose_apps_title">Choose Apps</string>
-    <string name="title_activity_main2">Main2Activity</string>
-    <string name="action_settings">Settings</string>
-    <string name="section_format">Hello World from section: %1$d</string>
     <string name="double_tap_anywhere_to_edit">Double tap anywhere to edit</string>
 
 
     <string name="notes_date_placeholder">Edited at %s</string>
 
-    <!-- TODO: Remove or change this placeholder text -->
-    <string name="hello_blank_fragment">Hello blank fragment</string>
+    <string name="dialer_chevron">deleter</string>
 
 </resources>