remove the redundant Drawable field of AppLauncher

This commit is contained in:
tibbi 2016-08-13 22:51:34 +02:00
parent 0bc34273d7
commit 9c30b32b8d
4 changed files with 4 additions and 7 deletions

View File

@ -25,7 +25,7 @@ class MyCursorAdapter(cxt: Context, dataCursor: Cursor, val itemClick: (AppLaunc
val name = cursor.getString(cursor.getColumnIndex(DbHelper.NAME))
val pkgName = cursor.getString(cursor.getColumnIndex(DbHelper.PKG_NAME))
val icon = cursor.getInt(cursor.getColumnIndex(DbHelper.ICON_ID))
val launcher = AppLauncher(name, pkgName, icon, null)
val launcher = AppLauncher(name, pkgName, icon)
holder.bindView(context, launcher)
}

View File

@ -52,7 +52,7 @@ class DbHelper(context: Context) : SQLiteOpenHelper(context, "launchers.db", nul
val name = cursor.getString(cursor.getColumnIndex(DbHelper.NAME))
val pkgName = cursor.getString(cursor.getColumnIndex(DbHelper.PKG_NAME))
val icon = cursor.getInt(cursor.getColumnIndex(DbHelper.ICON_ID))
launchers.add(AppLauncher(name, pkgName, icon, null))
launchers.add(AppLauncher(name, pkgName, icon))
}
} finally {
cursor.close()

View File

@ -41,8 +41,7 @@ class AddAppDialog() : DialogFragment() {
val componentInfo = info.activityInfo.applicationInfo
val label = componentInfo.loadLabel(packageManager).toString()
val pkgName = componentInfo.packageName
val icon = componentInfo.loadIcon(packageManager)
apps.add(AppLauncher(label, pkgName, 0, icon))
apps.add(AppLauncher(label, pkgName, 0))
}
val sorted = apps.sortedWith(compareBy { it.name.toLowerCase() })

View File

@ -1,5 +1,3 @@
package com.simplemobiletools.applauncher.models
import android.graphics.drawable.Drawable
data class AppLauncher(val name: String, val pkgName: String, val iconId: Int, val drawable: Drawable?)
data class AppLauncher(val name: String, val pkgName: String, val iconId: Int)