diff --git a/README.md b/README.md index 4c230ed..01c0b62 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ # Simple App Launcher -Logo +Logo 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. diff --git a/app/build.gradle b/app/build.gradle index c009116..6dced41 100644 --- a/app/build.gradle +++ b/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" } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 8739fea..c0e813d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -9,11 +9,11 @@ tools:node="remove"/> lateinit var remainingLaunchers: ArrayList 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() { diff --git a/app/src/main/kotlin/com/simplemobiletools/applauncher/activities/SettingsActivity.kt b/app/src/main/kotlin/com/simplemobiletools/applauncher/activities/SettingsActivity.kt index a444fd5..3744860 100644 --- a/app/src/main/kotlin/com/simplemobiletools/applauncher/activities/SettingsActivity.kt +++ b/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() + } + } } diff --git a/app/src/main/kotlin/com/simplemobiletools/applauncher/adapters/RecyclerAdapter.kt b/app/src/main/kotlin/com/simplemobiletools/applauncher/adapters/RecyclerAdapter.kt index 28f00c8..4a36b9c 100644 --- a/app/src/main/kotlin/com/simplemobiletools/applauncher/adapters/RecyclerAdapter.kt +++ b/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, val itemClick: (AppLauncher) -> Unit) : @@ -78,7 +78,7 @@ class RecyclerAdapter(val act: Activity, val launchers: List, 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, 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, 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, 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) diff --git a/app/src/main/kotlin/com/simplemobiletools/applauncher/dialogs/AddAppDialog.kt b/app/src/main/kotlin/com/simplemobiletools/applauncher/dialogs/AddAppDialog.kt index 1ab9e46..34af819 100644 --- a/app/src/main/kotlin/com/simplemobiletools/applauncher/dialogs/AddAppDialog.kt +++ b/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 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) diff --git a/app/src/main/kotlin/com/simplemobiletools/applauncher/extensions/Context.kt b/app/src/main/kotlin/com/simplemobiletools/applauncher/extensions/Context.kt index acfcf81..f9cdc38 100644 --- a/app/src/main/kotlin/com/simplemobiletools/applauncher/extensions/Context.kt +++ b/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) diff --git a/app/src/main/kotlin/com/simplemobiletools/applauncher/helpers/DBHelper.kt b/app/src/main/kotlin/com/simplemobiletools/applauncher/helpers/DBHelper.kt index 810370c..ad403b0 100644 --- a/app/src/main/kotlin/com/simplemobiletools/applauncher/helpers/DBHelper.kt +++ b/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.calendar), "com.simplemobiletools.calendar", R.mipmap.calendar, db) - addLauncher(string(R.string.camera), "com.simplemobiletools.camera", R.mipmap.camera, db) - addLauncher(string(R.string.draw), "com.simplemobiletools.draw", R.mipmap.draw, db) - addLauncher(string(R.string.file_manager), "com.simplemobiletools.filemanager", R.mipmap.filemanager, db) - addLauncher(string(R.string.flashlight), "com.simplemobiletools.flashlight", R.mipmap.flashlight, db) - addLauncher(string(R.string.gallery), "com.simplemobiletools.gallery", R.mipmap.gallery, db) - addLauncher(string(R.string.music_player), "com.simplemobiletools.musicplayer", R.mipmap.musicplayer, db) - addLauncher(string(R.string.notes), "com.simplemobiletools.notes", R.mipmap.notes, db) + addLauncher(string(R.string.calculator), "com.simplemobiletools.calculator", R.drawable.ic_calculator, db) + addLauncher(string(R.string.calendar), "com.simplemobiletools.calendar", R.drawable.ic_calendar, db) + addLauncher(string(R.string.camera), "com.simplemobiletools.camera", R.drawable.ic_camera, db) + addLauncher(string(R.string.draw), "com.simplemobiletools.draw", R.drawable.ic_draw, db) + addLauncher(string(R.string.file_manager), "com.simplemobiletools.filemanager", R.drawable.ic_filemanager, db) + addLauncher(string(R.string.flashlight), "com.simplemobiletools.flashlight", R.drawable.ic_flashlight, db) + addLauncher(string(R.string.gallery), "com.simplemobiletools.gallery", R.drawable.ic_gallery, db) + addLauncher(string(R.string.music_player), "com.simplemobiletools.musicplayer", R.drawable.ic_musicplayer, 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) { diff --git a/app/src/main/res/mipmap-hdpi/calculator.png b/app/src/main/res/drawable-hdpi/ic_calculator.png similarity index 100% rename from app/src/main/res/mipmap-hdpi/calculator.png rename to app/src/main/res/drawable-hdpi/ic_calculator.png diff --git a/app/src/main/res/mipmap-hdpi/calendar.png b/app/src/main/res/drawable-hdpi/ic_calendar.png similarity index 100% rename from app/src/main/res/mipmap-hdpi/calendar.png rename to app/src/main/res/drawable-hdpi/ic_calendar.png diff --git a/app/src/main/res/mipmap-hdpi/camera.png b/app/src/main/res/drawable-hdpi/ic_camera.png similarity index 100% rename from app/src/main/res/mipmap-hdpi/camera.png rename to app/src/main/res/drawable-hdpi/ic_camera.png diff --git a/app/src/main/res/mipmap-hdpi/draw.png b/app/src/main/res/drawable-hdpi/ic_draw.png similarity index 100% rename from app/src/main/res/mipmap-hdpi/draw.png rename to app/src/main/res/drawable-hdpi/ic_draw.png diff --git a/app/src/main/res/mipmap-hdpi/filemanager.png b/app/src/main/res/drawable-hdpi/ic_filemanager.png similarity index 100% rename from app/src/main/res/mipmap-hdpi/filemanager.png rename to app/src/main/res/drawable-hdpi/ic_filemanager.png diff --git a/app/src/main/res/mipmap-hdpi/flashlight.png b/app/src/main/res/drawable-hdpi/ic_flashlight.png similarity index 100% rename from app/src/main/res/mipmap-hdpi/flashlight.png rename to app/src/main/res/drawable-hdpi/ic_flashlight.png diff --git a/app/src/main/res/mipmap-hdpi/gallery.png b/app/src/main/res/drawable-hdpi/ic_gallery.png similarity index 100% rename from app/src/main/res/mipmap-hdpi/gallery.png rename to app/src/main/res/drawable-hdpi/ic_gallery.png diff --git a/app/src/main/res/mipmap-hdpi/launcher.png b/app/src/main/res/drawable-hdpi/ic_launcher.png similarity index 100% rename from app/src/main/res/mipmap-hdpi/launcher.png rename to app/src/main/res/drawable-hdpi/ic_launcher.png diff --git a/app/src/main/res/mipmap-hdpi/musicplayer.png b/app/src/main/res/drawable-hdpi/ic_musicplayer.png similarity index 100% rename from app/src/main/res/mipmap-hdpi/musicplayer.png rename to app/src/main/res/drawable-hdpi/ic_musicplayer.png diff --git a/app/src/main/res/mipmap-hdpi/notes.png b/app/src/main/res/drawable-hdpi/ic_notes.png similarity index 100% rename from app/src/main/res/mipmap-hdpi/notes.png rename to app/src/main/res/drawable-hdpi/ic_notes.png diff --git a/app/src/main/res/mipmap-xhdpi/calculator.png b/app/src/main/res/drawable-xhdpi/ic_calculator.png similarity index 100% rename from app/src/main/res/mipmap-xhdpi/calculator.png rename to app/src/main/res/drawable-xhdpi/ic_calculator.png diff --git a/app/src/main/res/mipmap-xhdpi/calendar.png b/app/src/main/res/drawable-xhdpi/ic_calendar.png similarity index 100% rename from app/src/main/res/mipmap-xhdpi/calendar.png rename to app/src/main/res/drawable-xhdpi/ic_calendar.png diff --git a/app/src/main/res/mipmap-xhdpi/camera.png b/app/src/main/res/drawable-xhdpi/ic_camera.png similarity index 100% rename from app/src/main/res/mipmap-xhdpi/camera.png rename to app/src/main/res/drawable-xhdpi/ic_camera.png diff --git a/app/src/main/res/mipmap-xhdpi/draw.png b/app/src/main/res/drawable-xhdpi/ic_draw.png similarity index 100% rename from app/src/main/res/mipmap-xhdpi/draw.png rename to app/src/main/res/drawable-xhdpi/ic_draw.png diff --git a/app/src/main/res/mipmap-xhdpi/filemanager.png b/app/src/main/res/drawable-xhdpi/ic_filemanager.png similarity index 100% rename from app/src/main/res/mipmap-xhdpi/filemanager.png rename to app/src/main/res/drawable-xhdpi/ic_filemanager.png diff --git a/app/src/main/res/mipmap-xhdpi/flashlight.png b/app/src/main/res/drawable-xhdpi/ic_flashlight.png similarity index 100% rename from app/src/main/res/mipmap-xhdpi/flashlight.png rename to app/src/main/res/drawable-xhdpi/ic_flashlight.png diff --git a/app/src/main/res/mipmap-xhdpi/gallery.png b/app/src/main/res/drawable-xhdpi/ic_gallery.png similarity index 100% rename from app/src/main/res/mipmap-xhdpi/gallery.png rename to app/src/main/res/drawable-xhdpi/ic_gallery.png diff --git a/app/src/main/res/mipmap-xhdpi/launcher.png b/app/src/main/res/drawable-xhdpi/ic_launcher.png similarity index 100% rename from app/src/main/res/mipmap-xhdpi/launcher.png rename to app/src/main/res/drawable-xhdpi/ic_launcher.png diff --git a/app/src/main/res/mipmap-xhdpi/musicplayer.png b/app/src/main/res/drawable-xhdpi/ic_musicplayer.png similarity index 100% rename from app/src/main/res/mipmap-xhdpi/musicplayer.png rename to app/src/main/res/drawable-xhdpi/ic_musicplayer.png diff --git a/app/src/main/res/mipmap-xhdpi/notes.png b/app/src/main/res/drawable-xhdpi/ic_notes.png similarity index 100% rename from app/src/main/res/mipmap-xhdpi/notes.png rename to app/src/main/res/drawable-xhdpi/ic_notes.png diff --git a/app/src/main/res/mipmap-xxhdpi/calculator.png b/app/src/main/res/drawable-xxhdpi/ic_calculator.png similarity index 100% rename from app/src/main/res/mipmap-xxhdpi/calculator.png rename to app/src/main/res/drawable-xxhdpi/ic_calculator.png diff --git a/app/src/main/res/mipmap-xxhdpi/calendar.png b/app/src/main/res/drawable-xxhdpi/ic_calendar.png similarity index 100% rename from app/src/main/res/mipmap-xxhdpi/calendar.png rename to app/src/main/res/drawable-xxhdpi/ic_calendar.png diff --git a/app/src/main/res/mipmap-xxhdpi/camera.png b/app/src/main/res/drawable-xxhdpi/ic_camera.png similarity index 100% rename from app/src/main/res/mipmap-xxhdpi/camera.png rename to app/src/main/res/drawable-xxhdpi/ic_camera.png diff --git a/app/src/main/res/mipmap-xxhdpi/draw.png b/app/src/main/res/drawable-xxhdpi/ic_draw.png similarity index 100% rename from app/src/main/res/mipmap-xxhdpi/draw.png rename to app/src/main/res/drawable-xxhdpi/ic_draw.png diff --git a/app/src/main/res/mipmap-xxhdpi/filemanager.png b/app/src/main/res/drawable-xxhdpi/ic_filemanager.png similarity index 100% rename from app/src/main/res/mipmap-xxhdpi/filemanager.png rename to app/src/main/res/drawable-xxhdpi/ic_filemanager.png diff --git a/app/src/main/res/mipmap-xxhdpi/flashlight.png b/app/src/main/res/drawable-xxhdpi/ic_flashlight.png similarity index 100% rename from app/src/main/res/mipmap-xxhdpi/flashlight.png rename to app/src/main/res/drawable-xxhdpi/ic_flashlight.png diff --git a/app/src/main/res/mipmap-xxhdpi/gallery.png b/app/src/main/res/drawable-xxhdpi/ic_gallery.png similarity index 100% rename from app/src/main/res/mipmap-xxhdpi/gallery.png rename to app/src/main/res/drawable-xxhdpi/ic_gallery.png diff --git a/app/src/main/res/mipmap-xxhdpi/launcher.png b/app/src/main/res/drawable-xxhdpi/ic_launcher.png similarity index 100% rename from app/src/main/res/mipmap-xxhdpi/launcher.png rename to app/src/main/res/drawable-xxhdpi/ic_launcher.png diff --git a/app/src/main/res/mipmap-xxhdpi/musicplayer.png b/app/src/main/res/drawable-xxhdpi/ic_musicplayer.png similarity index 100% rename from app/src/main/res/mipmap-xxhdpi/musicplayer.png rename to app/src/main/res/drawable-xxhdpi/ic_musicplayer.png diff --git a/app/src/main/res/mipmap-xxhdpi/notes.png b/app/src/main/res/drawable-xxhdpi/ic_notes.png similarity index 100% rename from app/src/main/res/mipmap-xxhdpi/notes.png rename to app/src/main/res/drawable-xxhdpi/ic_notes.png diff --git a/app/src/main/res/mipmap-xxxhdpi/calculator.png b/app/src/main/res/drawable-xxxhdpi/ic_calculator.png similarity index 100% rename from app/src/main/res/mipmap-xxxhdpi/calculator.png rename to app/src/main/res/drawable-xxxhdpi/ic_calculator.png diff --git a/app/src/main/res/mipmap-xxxhdpi/calendar.png b/app/src/main/res/drawable-xxxhdpi/ic_calendar.png similarity index 100% rename from app/src/main/res/mipmap-xxxhdpi/calendar.png rename to app/src/main/res/drawable-xxxhdpi/ic_calendar.png diff --git a/app/src/main/res/mipmap-xxxhdpi/camera.png b/app/src/main/res/drawable-xxxhdpi/ic_camera.png similarity index 100% rename from app/src/main/res/mipmap-xxxhdpi/camera.png rename to app/src/main/res/drawable-xxxhdpi/ic_camera.png diff --git a/app/src/main/res/mipmap-xxxhdpi/draw.png b/app/src/main/res/drawable-xxxhdpi/ic_draw.png similarity index 100% rename from app/src/main/res/mipmap-xxxhdpi/draw.png rename to app/src/main/res/drawable-xxxhdpi/ic_draw.png diff --git a/app/src/main/res/mipmap-xxxhdpi/filemanager.png b/app/src/main/res/drawable-xxxhdpi/ic_filemanager.png similarity index 100% rename from app/src/main/res/mipmap-xxxhdpi/filemanager.png rename to app/src/main/res/drawable-xxxhdpi/ic_filemanager.png diff --git a/app/src/main/res/mipmap-xxxhdpi/flashlight.png b/app/src/main/res/drawable-xxxhdpi/ic_flashlight.png similarity index 100% rename from app/src/main/res/mipmap-xxxhdpi/flashlight.png rename to app/src/main/res/drawable-xxxhdpi/ic_flashlight.png diff --git a/app/src/main/res/mipmap-xxxhdpi/gallery.png b/app/src/main/res/drawable-xxxhdpi/ic_gallery.png similarity index 100% rename from app/src/main/res/mipmap-xxxhdpi/gallery.png rename to app/src/main/res/drawable-xxxhdpi/ic_gallery.png diff --git a/app/src/main/res/mipmap-xxxhdpi/launcher.png b/app/src/main/res/drawable-xxxhdpi/ic_launcher.png similarity index 100% rename from app/src/main/res/mipmap-xxxhdpi/launcher.png rename to app/src/main/res/drawable-xxxhdpi/ic_launcher.png diff --git a/app/src/main/res/mipmap-xxxhdpi/musicplayer.png b/app/src/main/res/drawable-xxxhdpi/ic_musicplayer.png similarity index 100% rename from app/src/main/res/mipmap-xxxhdpi/musicplayer.png rename to app/src/main/res/drawable-xxxhdpi/ic_musicplayer.png diff --git a/app/src/main/res/mipmap-xxxhdpi/notes.png b/app/src/main/res/drawable-xxxhdpi/ic_notes.png similarity index 100% rename from app/src/main/res/mipmap-xxxhdpi/notes.png rename to app/src/main/res/drawable-xxxhdpi/ic_notes.png diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 81905e4..6584754 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/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"/> diff --git a/app/src/main/res/layout/activity_settings.xml b/app/src/main/res/layout/activity_settings.xml index 2b0f81b..26700f2 100644 --- a/app/src/main/res/layout/activity_settings.xml +++ b/app/src/main/res/layout/activity_settings.xml @@ -11,5 +11,43 @@ android:layout_height="wrap_content" android:orientation="vertical"> + + + + + + + + + + + diff --git a/app/src/main/res/layout/app_launcher_item.xml b/app/src/main/res/layout/app_launcher_item.xml index 23bc222..4da362f 100644 --- a/app/src/main/res/layout/app_launcher_item.xml +++ b/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"/> diff --git a/app/src/main/res/layout/edit_launcher.xml b/app/src/main/res/layout/dialog_edit_launcher.xml similarity index 100% rename from app/src/main/res/layout/edit_launcher.xml rename to app/src/main/res/layout/dialog_edit_launcher.xml diff --git a/app/src/main/res/layout/launcher_picker.xml b/app/src/main/res/layout/dialog_pick_launcher.xml similarity index 100% rename from app/src/main/res/layout/launcher_picker.xml rename to app/src/main/res/layout/dialog_pick_launcher.xml diff --git a/app/src/main/res/mipmap-hdpi/check.png b/app/src/main/res/mipmap-hdpi/check.png deleted file mode 100644 index ea00e6d..0000000 Binary files a/app/src/main/res/mipmap-hdpi/check.png and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/delete.png b/app/src/main/res/mipmap-hdpi/delete.png deleted file mode 100644 index f3d2e18..0000000 Binary files a/app/src/main/res/mipmap-hdpi/delete.png and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/edit.png b/app/src/main/res/mipmap-hdpi/edit.png deleted file mode 100644 index e4219c3..0000000 Binary files a/app/src/main/res/mipmap-hdpi/edit.png and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/facebook.png b/app/src/main/res/mipmap-hdpi/facebook.png deleted file mode 100644 index 92dc909..0000000 Binary files a/app/src/main/res/mipmap-hdpi/facebook.png and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/gplus.png b/app/src/main/res/mipmap-hdpi/gplus.png deleted file mode 100644 index 897f103..0000000 Binary files a/app/src/main/res/mipmap-hdpi/gplus.png and /dev/null differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..6f32ede Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 0000000..f9719e3 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-hdpi/plus.png b/app/src/main/res/mipmap-hdpi/plus.png deleted file mode 100644 index 76f27e6..0000000 Binary files a/app/src/main/res/mipmap-hdpi/plus.png and /dev/null differ diff --git a/app/src/main/res/mipmap-mdpi/calculator.png b/app/src/main/res/mipmap-mdpi/calculator.png deleted file mode 100644 index c22d4ed..0000000 Binary files a/app/src/main/res/mipmap-mdpi/calculator.png and /dev/null differ diff --git a/app/src/main/res/mipmap-mdpi/calendar.png b/app/src/main/res/mipmap-mdpi/calendar.png deleted file mode 100644 index c6ac887..0000000 Binary files a/app/src/main/res/mipmap-mdpi/calendar.png and /dev/null differ diff --git a/app/src/main/res/mipmap-mdpi/camera.png b/app/src/main/res/mipmap-mdpi/camera.png deleted file mode 100644 index a686f4b..0000000 Binary files a/app/src/main/res/mipmap-mdpi/camera.png and /dev/null differ diff --git a/app/src/main/res/mipmap-mdpi/check.png b/app/src/main/res/mipmap-mdpi/check.png deleted file mode 100644 index bcaa7ee..0000000 Binary files a/app/src/main/res/mipmap-mdpi/check.png and /dev/null differ diff --git a/app/src/main/res/mipmap-mdpi/delete.png b/app/src/main/res/mipmap-mdpi/delete.png deleted file mode 100644 index e66fba7..0000000 Binary files a/app/src/main/res/mipmap-mdpi/delete.png and /dev/null differ diff --git a/app/src/main/res/mipmap-mdpi/draw.png b/app/src/main/res/mipmap-mdpi/draw.png deleted file mode 100644 index fd20b74..0000000 Binary files a/app/src/main/res/mipmap-mdpi/draw.png and /dev/null differ diff --git a/app/src/main/res/mipmap-mdpi/edit.png b/app/src/main/res/mipmap-mdpi/edit.png deleted file mode 100644 index 5aa2289..0000000 Binary files a/app/src/main/res/mipmap-mdpi/edit.png and /dev/null differ diff --git a/app/src/main/res/mipmap-mdpi/facebook.png b/app/src/main/res/mipmap-mdpi/facebook.png deleted file mode 100644 index 998649f..0000000 Binary files a/app/src/main/res/mipmap-mdpi/facebook.png and /dev/null differ diff --git a/app/src/main/res/mipmap-mdpi/filemanager.png b/app/src/main/res/mipmap-mdpi/filemanager.png deleted file mode 100644 index c65a171..0000000 Binary files a/app/src/main/res/mipmap-mdpi/filemanager.png and /dev/null differ diff --git a/app/src/main/res/mipmap-mdpi/flashlight.png b/app/src/main/res/mipmap-mdpi/flashlight.png deleted file mode 100644 index 480f033..0000000 Binary files a/app/src/main/res/mipmap-mdpi/flashlight.png and /dev/null differ diff --git a/app/src/main/res/mipmap-mdpi/gallery.png b/app/src/main/res/mipmap-mdpi/gallery.png deleted file mode 100644 index 9fe8fe3..0000000 Binary files a/app/src/main/res/mipmap-mdpi/gallery.png and /dev/null differ diff --git a/app/src/main/res/mipmap-mdpi/gplus.png b/app/src/main/res/mipmap-mdpi/gplus.png deleted file mode 100644 index 54f1b83..0000000 Binary files a/app/src/main/res/mipmap-mdpi/gplus.png and /dev/null differ diff --git a/app/src/main/res/mipmap-mdpi/launcher.png b/app/src/main/res/mipmap-mdpi/launcher.png deleted file mode 100644 index 5e10def..0000000 Binary files a/app/src/main/res/mipmap-mdpi/launcher.png and /dev/null differ diff --git a/app/src/main/res/mipmap-mdpi/musicplayer.png b/app/src/main/res/mipmap-mdpi/musicplayer.png deleted file mode 100644 index 5d065ee..0000000 Binary files a/app/src/main/res/mipmap-mdpi/musicplayer.png and /dev/null differ diff --git a/app/src/main/res/mipmap-mdpi/notes.png b/app/src/main/res/mipmap-mdpi/notes.png deleted file mode 100644 index 4346854..0000000 Binary files a/app/src/main/res/mipmap-mdpi/notes.png and /dev/null differ diff --git a/app/src/main/res/mipmap-mdpi/plus.png b/app/src/main/res/mipmap-mdpi/plus.png deleted file mode 100644 index 193383a..0000000 Binary files a/app/src/main/res/mipmap-mdpi/plus.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/check.png b/app/src/main/res/mipmap-xhdpi/check.png deleted file mode 100644 index c0f552c..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/check.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/delete.png b/app/src/main/res/mipmap-xhdpi/delete.png deleted file mode 100644 index ca80a3b..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/delete.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/edit.png b/app/src/main/res/mipmap-xhdpi/edit.png deleted file mode 100644 index 6cbb134..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/edit.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/facebook.png b/app/src/main/res/mipmap-xhdpi/facebook.png deleted file mode 100644 index ff95719..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/facebook.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/gplus.png b/app/src/main/res/mipmap-xhdpi/gplus.png deleted file mode 100644 index 47bd6ef..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/gplus.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000..4d51720 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 0000000..2d7f5f4 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xhdpi/plus.png b/app/src/main/res/mipmap-xhdpi/plus.png deleted file mode 100644 index d8ef0f4..0000000 Binary files a/app/src/main/res/mipmap-xhdpi/plus.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/check.png b/app/src/main/res/mipmap-xxhdpi/check.png deleted file mode 100644 index 4db1129..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/check.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/delete.png b/app/src/main/res/mipmap-xxhdpi/delete.png deleted file mode 100644 index 1595bbc..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/delete.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/edit.png b/app/src/main/res/mipmap-xxhdpi/edit.png deleted file mode 100644 index 9c9ef75..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/edit.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/facebook.png b/app/src/main/res/mipmap-xxhdpi/facebook.png deleted file mode 100644 index 7f23d90..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/facebook.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/gplus.png b/app/src/main/res/mipmap-xxhdpi/gplus.png deleted file mode 100644 index d580cd5..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/gplus.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000..76cbc8e Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..20fc2d5 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/plus.png b/app/src/main/res/mipmap-xxhdpi/plus.png deleted file mode 100644 index b97c0e2..0000000 Binary files a/app/src/main/res/mipmap-xxhdpi/plus.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/check.png b/app/src/main/res/mipmap-xxxhdpi/check.png deleted file mode 100644 index 4f58f93..0000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/check.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/delete.png b/app/src/main/res/mipmap-xxxhdpi/delete.png deleted file mode 100644 index 8d322aa..0000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/delete.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/edit.png b/app/src/main/res/mipmap-xxxhdpi/edit.png deleted file mode 100644 index d6668a0..0000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/edit.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/facebook.png b/app/src/main/res/mipmap-xxxhdpi/facebook.png deleted file mode 100644 index 7635bf3..0000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/facebook.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/gplus.png b/app/src/main/res/mipmap-xxxhdpi/gplus.png deleted file mode 100644 index 932c51a..0000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/gplus.png and /dev/null differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000..e663fdd Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..1d4a344 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/plus.png b/app/src/main/res/mipmap-xxxhdpi/plus.png deleted file mode 100644 index 2bef059..0000000 Binary files a/app/src/main/res/mipmap-xxxhdpi/plus.png and /dev/null differ