cleaning up the icons etc

README.md

@@ -1,5 +1,5 @@
 # Simple App Launcher
-<img alt="Logo" src="app/src/main/res/mipmap-xxxhdpi/launcher.png" width="80">
+<img alt="Logo" src="app/src/main/res/mipmap-xxxhdpi/ic_launcher.png" width="80">
 
 A simple holder for your favourite app launchers.
 
@@ -18,7 +18,7 @@ This app is just one piece of a bigger series of apps. You can find the rest of
 
 License
 -------
-    Copyright 2016 SimpleMobileTools
+    Copyright 2017 SimpleMobileTools
     
     Licensed under the Apache License, Version 2.0 (the "License");
     you may not use this file except in compliance with the License.

app/build.gradle

@@ -12,6 +12,7 @@ android {
         targetSdkVersion 27
         versionCode 6
         versionName "1.6"
+        multiDexEnabled true
         setProperty("archivesBaseName", "app-launcher")
     }
 
@@ -26,14 +27,22 @@ android {
             signingConfig signingConfigs.release
         }
     }
+
     sourceSets {
         main.java.srcDirs += 'src/main/kotlin'
     }
+
+    lintOptions {
+        checkReleaseBuilds false
+        abortOnError false
+    }
 }
 
 dependencies {
     compile 'com.simplemobiletools:commons:2.38.6'
+    compile 'com.android.support:multidex:1.0.2'
     compile 'com.bignerdranch.android:recyclerview-multiselect:0.2'
+    compile 'com.facebook.stetho:stetho:1.5.0'
     compile "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 }
 

app/src/main/AndroidManifest.xml

@@ -9,11 +9,11 @@
         tools:node="remove"/>
 
     <application
+        android:name=".App"
         android:allowBackup="true"
-        android:fullBackupContent="true"
+        android:icon="@mipmap/ic_launcher"
-        android:icon="@mipmap/launcher"
         android:label="@string/app_launcher_name"
-        android:supportsRtl="true"
+        android:roundIcon="@mipmap/ic_launcher_round"
         android:theme="@style/AppTheme">
 
         <activity

app/src/main/kotlin/com/simplemobiletools/applauncher/App.kt

@@ -0,0 +1,20 @@
+package com.simplemobiletools.applauncher
+
+import android.support.multidex.MultiDexApplication
+import com.facebook.stetho.Stetho
+import com.simplemobiletools.applauncher.extensions.config
+import java.util.*
+
+class App : MultiDexApplication() {
+    override fun onCreate() {
+        super.onCreate()
+
+        if (config.useEnglish) {
+            val conf = resources.configuration
+            conf.locale = Locale.ENGLISH
+            resources.updateConfiguration(conf, resources.displayMetrics)
+        }
+
+        Stetho.initializeWithDefaults(this)
+    }
+}

app/src/main/kotlin/com/simplemobiletools/applauncher/activities/MainActivity.kt

@@ -10,24 +10,23 @@ import android.widget.ImageView
 import com.simplemobiletools.applauncher.BuildConfig
 import com.simplemobiletools.applauncher.R
 import com.simplemobiletools.applauncher.adapters.RecyclerAdapter
-import com.simplemobiletools.applauncher.helpers.DBHelper
 import com.simplemobiletools.applauncher.dialogs.AddAppDialog
+import com.simplemobiletools.applauncher.extensions.dbHelper
 import com.simplemobiletools.applauncher.models.AppLauncher
 import com.simplemobiletools.commons.extensions.beInvisible
 import com.simplemobiletools.commons.helpers.LICENSE_KOTLIN
 import com.simplemobiletools.commons.helpers.LICENSE_MULTISELECT
+import com.simplemobiletools.commons.helpers.LICENSE_STETHO
 import kotlinx.android.synthetic.main.activity_main.*
 import java.util.*
 
 class MainActivity : SimpleActivity(), AddAppDialog.AddLaunchersInterface, RecyclerAdapter.RecyclerInterface {
-    lateinit var dbHelper: DBHelper
     lateinit var launchers: ArrayList<AppLauncher>
     lateinit var remainingLaunchers: ArrayList<AppLauncher>
 
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_main)
-        dbHelper = DBHelper(applicationContext)
         setupLaunchers()
 
         fab.setOnClickListener {
@@ -35,8 +34,9 @@ class MainActivity : SimpleActivity(), AddAppDialog.AddLaunchersInterface, Recyc
         }
     }
 
-    override fun onCreateOptionsMenu(menu: Menu?): Boolean {
+    override fun onCreateOptionsMenu(menu: Menu): Boolean {
         menuInflater.inflate(R.menu.menu, menu)
+        updateMenuTextSize(resources, menu)
         return true
     }
 
@@ -54,7 +54,7 @@ class MainActivity : SimpleActivity(), AddAppDialog.AddLaunchersInterface, Recyc
     }
 
     private fun launchAbout() {
-        startAboutActivity(R.string.app_name, LICENSE_KOTLIN or LICENSE_MULTISELECT, BuildConfig.VERSION_NAME)
+        startAboutActivity(R.string.app_name, LICENSE_KOTLIN or LICENSE_MULTISELECT or LICENSE_STETHO, BuildConfig.VERSION_NAME)
     }
 
     private fun setupLaunchers() {

app/src/main/kotlin/com/simplemobiletools/applauncher/activities/SettingsActivity.kt

@@ -2,6 +2,11 @@ package com.simplemobiletools.applauncher.activities
 
 import android.os.Bundle
 import com.simplemobiletools.applauncher.R
+import com.simplemobiletools.applauncher.extensions.config
+import com.simplemobiletools.commons.extensions.beVisibleIf
+import com.simplemobiletools.commons.extensions.useEnglishToggled
+import kotlinx.android.synthetic.main.activity_settings.*
+import java.util.*
 
 class SettingsActivity : SimpleActivity() {
 
@@ -9,4 +14,27 @@ class SettingsActivity : SimpleActivity() {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_settings)
     }
+
+    override fun onResume() {
+        super.onResume()
+
+        setupCustomizeColors()
+        setupUseEnglish()
+    }
+
+    private fun setupCustomizeColors() {
+        settings_customize_colors_holder.setOnClickListener {
+            startCustomizationActivity()
+        }
+    }
+
+    private fun setupUseEnglish() {
+        settings_use_english_holder.beVisibleIf(config.wasUseEnglishToggled || Locale.getDefault().language != "en")
+        settings_use_english.isChecked = config.useEnglish
+        settings_use_english_holder.setOnClickListener {
+            settings_use_english.toggle()
+            config.useEnglish = settings_use_english.isChecked
+            useEnglishToggled()
+        }
+    }
 }

app/src/main/kotlin/com/simplemobiletools/applauncher/adapters/RecyclerAdapter.kt

@@ -11,13 +11,13 @@ import com.bignerdranch.android.multiselector.ModalMultiSelectorCallback
 import com.bignerdranch.android.multiselector.MultiSelector
 import com.bignerdranch.android.multiselector.SwappingHolder
 import com.simplemobiletools.applauncher.R
-import com.simplemobiletools.applauncher.helpers.DBHelper
+import com.simplemobiletools.applauncher.extensions.dbHelper
 import com.simplemobiletools.applauncher.models.AppLauncher
 import com.simplemobiletools.commons.extensions.beInvisibleIf
 import com.simplemobiletools.commons.extensions.beVisible
 import com.simplemobiletools.commons.extensions.toast
 import kotlinx.android.synthetic.main.app_launcher_item.view.*
-import kotlinx.android.synthetic.main.edit_launcher.view.*
+import kotlinx.android.synthetic.main.dialog_edit_launcher.view.*
 import java.util.*
 
 class RecyclerAdapter(val act: Activity, val launchers: List<AppLauncher>, val itemClick: (AppLauncher) -> Unit) :
@@ -78,7 +78,7 @@ class RecyclerAdapter(val act: Activity, val launchers: List<AppLauncher>, val i
 
     private fun showEditDialog() {
         val selectedLauncher = launchers[multiSelector.selectedPositions[0]]
-        val editView = act.layoutInflater.inflate(R.layout.edit_launcher, null)
+        val editView = act.layoutInflater.inflate(R.layout.dialog_edit_launcher, null)
         editView.edit_launcher_edittext.setText(selectedLauncher.name)
 
         AlertDialog.Builder(act).apply {
@@ -92,7 +92,7 @@ class RecyclerAdapter(val act: Activity, val launchers: List<AppLauncher>, val i
                 getButton(AlertDialog.BUTTON_POSITIVE).setOnClickListener {
                     val newName = editView.edit_launcher_edittext.text.toString().trim()
                     if (!newName.isEmpty()) {
-                        if (DBHelper(act).updateLauncherName(selectedLauncher.id, newName) > 0) {
+                        if (act.dbHelper.updateLauncherName(selectedLauncher.id, newName) > 0) {
                             (act as RecyclerInterface).launcherRenamed()
                             finishActionMode()
                             dismiss()
@@ -123,17 +123,17 @@ class RecyclerAdapter(val act: Activity, val launchers: List<AppLauncher>, val i
             if (launcher.name.isNotEmpty())
                 deletedLaunchers.add(launcher)
         }
-        DBHelper(act).deleteLaunchers(deleteIds)
+        act.dbHelper.deleteLaunchers(deleteIds)
         finishActionMode()
         (act as RecyclerInterface).launchersDeleted(positions, deletedLaunchers)
     }
 
     private fun getRealAppName(launcher: AppLauncher): String {
-        try {
+        return try {
             val applicationInfo = act.packageManager.getApplicationInfo(launcher.pkgName, 0)
-            return act.packageManager.getApplicationLabel(applicationInfo).toString()
+            act.packageManager.getApplicationLabel(applicationInfo).toString()
         } catch (e: PackageManager.NameNotFoundException) {
-            return ""
+            ""
         }
     }
 
@@ -157,17 +157,17 @@ class RecyclerAdapter(val act: Activity, val launchers: List<AppLauncher>, val i
                     true
                 }
 
-                if (launcher.iconId != 0) {
+                /*if (launcher.iconId != 0) {
                     val icon = act.resources.getDrawable(launcher.iconId)
                     itemView.launcher_icon.setImageDrawable(icon)
                 } else {
                     val icon = act.packageManager.getApplicationIcon(launcher.pkgName)
                     itemView.launcher_icon.setImageDrawable(icon)
-                }
+                }*/
             }
         }
 
-        fun viewClicked(multiSelector: MultiSelector, appLauncher: AppLauncher) {
+        private fun viewClicked(multiSelector: MultiSelector, appLauncher: AppLauncher) {
             if (multiSelector.isSelectable) {
                 val isSelected = multiSelector.selectedPositions.contains(viewHolder.layoutPosition)
                 multiSelector.setSelected(viewHolder, !isSelected)

app/src/main/kotlin/com/simplemobiletools/applauncher/dialogs/AddAppDialog.kt

@@ -8,10 +8,10 @@ import android.view.View
 import com.simplemobiletools.applauncher.R
 import com.simplemobiletools.applauncher.adapters.RecyclerDialogAdapter
 import com.simplemobiletools.applauncher.models.AppLauncher
-import kotlinx.android.synthetic.main.launcher_picker.view.*
+import kotlinx.android.synthetic.main.dialog_pick_launcher.view.*
 import java.util.*
 
-class AddAppDialog() : DialogFragment() {
+class AddAppDialog : DialogFragment() {
     companion object {
         lateinit var launchers: ArrayList<AppLauncher>
         var callback: AddLaunchersInterface? = null
@@ -26,7 +26,7 @@ class AddAppDialog() : DialogFragment() {
     override fun onCreateDialog(savedInstanceState: Bundle?): Dialog {
         val builder = AlertDialog.Builder(activity)
 
-        val recyclerView = View.inflate(activity, R.layout.launcher_picker, null)
+        val recyclerView = View.inflate(activity, R.layout.dialog_pick_launcher, null)
         recyclerView.launchers_holder.adapter = RecyclerDialogAdapter(activity, launchers)
         builder.setView(recyclerView)
 

app/src/main/kotlin/com/simplemobiletools/applauncher/extensions/Context.kt

@@ -2,5 +2,8 @@ package com.simplemobiletools.applauncher.extensions
 
 import android.content.Context
 import com.simplemobiletools.applauncher.helpers.Config
+import com.simplemobiletools.applauncher.helpers.DBHelper
 
 val Context.config: Config get() = Config.newInstance(applicationContext)
+
+val Context.dbHelper: DBHelper get() = DBHelper.newInstance(applicationContext)

app/src/main/kotlin/com/simplemobiletools/applauncher/helpers/DBHelper.kt

@@ -22,8 +22,16 @@ class DBHelper(context: Context) : SQLiteOpenHelper(context, "launchers.db", nul
         val PKG_NAME: String = "pkgName"
         val ICON_ID: String = "icon"
         val POSITION: String = "position"
-    }
 
+        var dbInstance: DBHelper? = null
+
+        fun newInstance(context: Context): DBHelper {
+            if (dbInstance == null)
+                dbInstance = DBHelper(context)
+
+            return dbInstance!!
+        }
+    }
 
     override fun onCreate(db: SQLiteDatabase) {
         db.execSQL(CREATE_DB)
@@ -34,15 +42,15 @@ class DBHelper(context: Context) : SQLiteOpenHelper(context, "launchers.db", nul
     }
 
     private fun addInitialLaunchers(db: SQLiteDatabase) {
-        addLauncher(string(R.string.calculator), "com.simplemobiletools.calculator", R.mipmap.calculator, db)
+        addLauncher(string(R.string.calculator), "com.simplemobiletools.calculator", R.drawable.ic_calculator, db)
-        addLauncher(string(R.string.calendar), "com.simplemobiletools.calendar", R.mipmap.calendar, db)
+        addLauncher(string(R.string.calendar), "com.simplemobiletools.calendar", R.drawable.ic_calendar, db)
-        addLauncher(string(R.string.camera), "com.simplemobiletools.camera", R.mipmap.camera, db)
+        addLauncher(string(R.string.camera), "com.simplemobiletools.camera", R.drawable.ic_camera, db)
-        addLauncher(string(R.string.draw), "com.simplemobiletools.draw", R.mipmap.draw, db)
+        addLauncher(string(R.string.draw), "com.simplemobiletools.draw", R.drawable.ic_draw, db)
-        addLauncher(string(R.string.file_manager), "com.simplemobiletools.filemanager", R.mipmap.filemanager, db)
+        addLauncher(string(R.string.file_manager), "com.simplemobiletools.filemanager", R.drawable.ic_filemanager, db)
-        addLauncher(string(R.string.flashlight), "com.simplemobiletools.flashlight", R.mipmap.flashlight, db)
+        addLauncher(string(R.string.flashlight), "com.simplemobiletools.flashlight", R.drawable.ic_flashlight, db)
-        addLauncher(string(R.string.gallery), "com.simplemobiletools.gallery", R.mipmap.gallery, db)
+        addLauncher(string(R.string.gallery), "com.simplemobiletools.gallery", R.drawable.ic_gallery, db)
-        addLauncher(string(R.string.music_player), "com.simplemobiletools.musicplayer", R.mipmap.musicplayer, db)
+        addLauncher(string(R.string.music_player), "com.simplemobiletools.musicplayer", R.drawable.ic_musicplayer, db)
-        addLauncher(string(R.string.notes), "com.simplemobiletools.notes", R.mipmap.notes, db)
+        addLauncher(string(R.string.notes), "com.simplemobiletools.notes", R.drawable.ic_notes, db)
     }
 
     fun addLauncher(name: String, pkgName: String, iconId: Int = 0, db: SQLiteDatabase = writableDatabase) {

app/src/main/res/layout/activity_main.xml

@@ -22,6 +22,6 @@
         android:layout_height="wrap_content"
         android:layout_gravity="bottom|end"
         android:layout_margin="@dimen/activity_margin"
-        android:src="@mipmap/plus"/>
+        android:src="@drawable/ic_plus"/>
 
 </android.support.design.widget.CoordinatorLayout>

app/src/main/res/layout/activity_settings.xml

@@ -11,5 +11,43 @@
         android:layout_height="wrap_content"
         android:orientation="vertical">
 
+        <RelativeLayout
+            android:id="@+id/settings_customize_colors_holder"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/medium_margin"
+            android:background="?attr/selectableItemBackground"
+            android:padding="@dimen/activity_margin">
+
+            <com.simplemobiletools.commons.views.MyTextView
+                android:id="@+id/settings_customize_colors_label"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerVertical="true"
+                android:paddingLeft="@dimen/medium_margin"
+                android:paddingStart="@dimen/medium_margin"
+                android:text="@string/customize_colors"/>
+
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:id="@+id/settings_use_english_holder"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="@dimen/medium_margin"
+            android:background="?attr/selectableItemBackground"
+            android:padding="@dimen/activity_margin">
+
+            <com.simplemobiletools.commons.views.MySwitchCompat
+                android:id="@+id/settings_use_english"
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:background="@null"
+                android:clickable="false"
+                android:paddingLeft="@dimen/medium_margin"
+                android:paddingStart="@dimen/medium_margin"
+                android:text="@string/use_english_language"/>
+
+        </RelativeLayout>
     </LinearLayout>
 </ScrollView>

app/src/main/res/layout/app_launcher_item.xml

@@ -31,7 +31,7 @@
         android:layout_height="wrap_content"
         android:layout_alignParentRight="true"
         android:layout_alignParentTop="true"
-        android:background="@mipmap/check"
+        android:background="@drawable/ic_check"
         android:visibility="invisible"/>
 
 </RelativeLayout>