diff --git a/app/src/main/java/com/finnmglas/launcher/HomeActivity.kt b/app/src/main/java/com/finnmglas/launcher/HomeActivity.kt index 09964de..fafb5a2 100644 --- a/app/src/main/java/com/finnmglas/launcher/HomeActivity.kt +++ b/app/src/main/java/com/finnmglas/launcher/HomeActivity.kt @@ -9,7 +9,6 @@ import android.provider.MediaStore import android.view.* import androidx.appcompat.app.AppCompatActivity import androidx.core.view.GestureDetectorCompat -import com.finnmglas.launcher.list.apps.AppsRecyclerAdapter import com.finnmglas.launcher.tutorial.TutorialActivity import kotlinx.android.synthetic.main.home.* import java.text.SimpleDateFormat @@ -107,8 +106,8 @@ class HomeActivity: UIObject, AppCompatActivity(), // Applying the date / time format (changeable in settings) val dFormat = launcherPreferences.getInt(PREF_DATE_FORMAT, 0) - val upperFMT = resources.getStringArray(R.array.settings_time_formats_upper) - val lowerFMT = resources.getStringArray(R.array.settings_time_formats_lower) + val upperFMT = resources.getStringArray(R.array.settings_launcher_time_formats_upper) + val lowerFMT = resources.getStringArray(R.array.settings_launcher_time_formats_lower) val dateFormat = SimpleDateFormat(upperFMT[dFormat], Locale.getDefault()) val timeFormat = SimpleDateFormat(lowerFMT[dFormat], Locale.getDefault()) diff --git a/app/src/main/java/com/finnmglas/launcher/list/ListActivity.kt b/app/src/main/java/com/finnmglas/launcher/list/ListActivity.kt index 42a4ad7..9eda1c3 100644 --- a/app/src/main/java/com/finnmglas/launcher/list/ListActivity.kt +++ b/app/src/main/java/com/finnmglas/launcher/list/ListActivity.kt @@ -60,10 +60,10 @@ class ListActivity : AppCompatActivity(), UIObject { super.onActivityResult(requestCode, resultCode, data) if (requestCode == REQUEST_UNINSTALL) { if (resultCode == Activity.RESULT_OK) { - Toast.makeText(this, getString(R.string.list_removed_toast), Toast.LENGTH_LONG).show() + Toast.makeText(this, getString(R.string.list_removed), Toast.LENGTH_LONG).show() finish() } else if (resultCode == Activity.RESULT_FIRST_USER) { - Toast.makeText(this, getString(R.string.list_not_removed_toast), Toast.LENGTH_LONG).show() + Toast.makeText(this, getString(R.string.list_not_removed), Toast.LENGTH_LONG).show() finish() } } diff --git a/app/src/main/java/com/finnmglas/launcher/settings/actions/SettingsFragmentActions.kt b/app/src/main/java/com/finnmglas/launcher/settings/actions/SettingsFragmentActions.kt index 27c5c5b..6d0de32 100644 --- a/app/src/main/java/com/finnmglas/launcher/settings/actions/SettingsFragmentActions.kt +++ b/app/src/main/java/com/finnmglas/launcher/settings/actions/SettingsFragmentActions.kt @@ -61,7 +61,7 @@ class SettingsFragmentActions : Fragment(), UIObject { startActivity(rateIntent) intendedSettingsPause = true } catch (e: ActivityNotFoundException) { - Toast.makeText(this.context, getString(R.string.settings_toast_store_not_found), Toast.LENGTH_SHORT) + Toast.makeText(this.context, getString(R.string.settings_apps_toast_store_not_found), Toast.LENGTH_SHORT) .show() } } diff --git a/app/src/main/java/com/finnmglas/launcher/settings/actions/SettingsFragmentActionsRecycler.kt b/app/src/main/java/com/finnmglas/launcher/settings/actions/SettingsFragmentActionsRecycler.kt index de24413..a0b55cb 100644 --- a/app/src/main/java/com/finnmglas/launcher/settings/actions/SettingsFragmentActionsRecycler.kt +++ b/app/src/main/java/com/finnmglas/launcher/settings/actions/SettingsFragmentActionsRecycler.kt @@ -135,28 +135,28 @@ class ActionsRecyclerAdapter(val activity: Activity): init { actionsList = ArrayList() - actionsList.add(ActionInfo(activity.getString(R.string.settings_choose_up),"upApp", + actionsList.add(ActionInfo(activity.getString(R.string.settings_apps_up),"upApp", upApp )) - actionsList.add(ActionInfo(activity.getString(R.string.settings_choose_down),"downApp", + actionsList.add(ActionInfo(activity.getString(R.string.settings_apps_down),"downApp", downApp )) - actionsList.add(ActionInfo(activity.getString(R.string.settings_choose_left), "leftApp", + actionsList.add(ActionInfo(activity.getString(R.string.settings_apps_left), "leftApp", leftApp )) - actionsList.add(ActionInfo(activity.getString(R.string.settings_choose_right), "rightApp", + actionsList.add(ActionInfo(activity.getString(R.string.settings_apps_right), "rightApp", rightApp )) - actionsList.add(ActionInfo(activity.getString(R.string.settings_choose_vol_up), "volumeUpApp", + actionsList.add(ActionInfo(activity.getString(R.string.settings_apps_vol_up), "volumeUpApp", volumeUpApp )) - actionsList.add(ActionInfo(activity.getString(R.string.settings_choose_vol_down), "volumeDownApp", + actionsList.add(ActionInfo(activity.getString(R.string.settings_apps_vol_down), "volumeDownApp", volumeDownApp )) - actionsList.add(ActionInfo(activity.getString(R.string.settings_choose_double_click), "doubleClickApp", + actionsList.add(ActionInfo(activity.getString(R.string.settings_apps_double_click), "doubleClickApp", doubleClickApp )) - actionsList.add(ActionInfo(activity.getString(R.string.settings_choose_long_click), "longClickApp", + actionsList.add(ActionInfo(activity.getString(R.string.settings_apps_long_click), "longClickApp", longClickApp )) } diff --git a/app/src/main/java/com/finnmglas/launcher/settings/launcher/SettingsFragmentLauncher.kt b/app/src/main/java/com/finnmglas/launcher/settings/launcher/SettingsFragmentLauncher.kt index ee5692e..4f5aae7 100644 --- a/app/src/main/java/com/finnmglas/launcher/settings/launcher/SettingsFragmentLauncher.kt +++ b/app/src/main/java/com/finnmglas/launcher/settings/launcher/SettingsFragmentLauncher.kt @@ -1,6 +1,7 @@ package com.finnmglas.launcher.settings.launcher import android.Manifest +import android.app.Activity import android.content.Intent import android.content.pm.PackageManager import android.os.Build @@ -11,7 +12,6 @@ import android.view.LayoutInflater import android.view.View import android.view.ViewGroup import android.widget.AdapterView -import android.widget.AdapterView.OnItemSelectedListener import android.widget.ArrayAdapter import androidx.appcompat.app.AppCompatActivity import androidx.core.content.ContextCompat @@ -100,7 +100,6 @@ class SettingsFragmentLauncher : Fragment(), UIObject { .putInt(PREF_VIBRANT, vibrantColor) .apply() - saveTheme("custom") intendedSettingsPause = true activity!!.recreate() } @@ -109,56 +108,17 @@ class SettingsFragmentLauncher : Fragment(), UIObject { } override fun applyTheme() { - // Hide 'select' button for the selected theme or allow customisation - when (getSavedTheme(context!!)) { - "dark" -> settings_theme_dark_button_select.visibility = View.INVISIBLE - "finn" -> settings_theme_finn_button_select.visibility = View.INVISIBLE - "custom" -> - settings_theme_custom_button_select.text = getString(R.string.settings_select_image) - } setSwitchColor(settings_launcher_switch_screen_timeout, vibrantColor) settings_launcher_container.setBackgroundColor(dominantColor) - setButtonColor(settings_theme_finn_button_select, vibrantColor) - setButtonColor(settings_theme_dark_button_select, vibrantColor) setButtonColor(settings_theme_custom_button_select, vibrantColor) - setButtonColor(settings_theme_custom_button_examples, vibrantColor) } override fun setOnClicks() { - // Theme changing buttons - settings_theme_dark_button_select.setOnClickListener { - resetToDarkTheme(activity!!) - } - settings_theme_finn_button_select.setOnClickListener { - resetToDefaultTheme(activity!!) - } + settings_theme_custom_button_select.setOnClickListener { - intendedSettingsPause = true - // Request permission (on newer APIs) - if (Build.VERSION.SDK_INT >= 23) { - when { - ContextCompat.checkSelfPermission(context!!, - Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED - -> letUserPickImage(true) - shouldShowRequestPermissionRationale(Manifest.permission.WRITE_EXTERNAL_STORAGE) - -> {} - else - -> requestPermissions(arrayOf(Manifest.permission.WRITE_EXTERNAL_STORAGE), - REQUEST_PERMISSION_STORAGE - ) - } - } - else letUserPickImage() - } - settings_theme_custom_button_examples.setOnClickListener { - intendedSettingsPause = true - // Show example usage - openNewTabWindow( - "https://github.com/finnmglas/Launcher/blob/master/docs/README.md", - context!! - ) + resetToCustomTheme(activity!!) } settings_launcher_switch_screen_timeout.setOnClickListener { // Toggle screen timeout launcherPreferences.edit() @@ -170,14 +130,39 @@ class SettingsFragmentLauncher : Fragment(), UIObject { } } + fun resetToCustomTheme(context: Activity) { + intendedSettingsPause = true + saveTheme("custom") // TODO: Fix the bug this creates (displays custom theme without chosen img) + + // Request permission (on newer APIs) + if (Build.VERSION.SDK_INT >= 23) { + when { + ContextCompat.checkSelfPermission(context, + Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED + -> letUserPickImage(true) + shouldShowRequestPermissionRationale(Manifest.permission.WRITE_EXTERNAL_STORAGE) + -> {} + else + -> requestPermissions(arrayOf(Manifest.permission.WRITE_EXTERNAL_STORAGE), + REQUEST_PERMISSION_STORAGE + ) + } + } + else letUserPickImage() + } + override fun adjustLayout() { + if (getSavedTheme(activity!!) == "custom") settings_theme_custom_button_select.text = getString( + R.string.settings_launcher_change_wallpaper + ) + // visually load settings settings_launcher_switch_screen_timeout.isChecked = launcherPreferences.getBoolean(PREF_SCREEN_TIMEOUT_DISABLED, false) // Load values into the date-format spinner val staticAdapter = ArrayAdapter.createFromResource( - activity!!, R.array.settings_launcher_time_formats, + activity!!, R.array.settings_launcher_time_format_spinner_items, android.R.layout.simple_spinner_item ) staticAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item) @@ -196,5 +181,36 @@ class SettingsFragmentLauncher : Fragment(), UIObject { } } + + // Load values into the theme spinner + val staticThemeAdapter = ArrayAdapter.createFromResource( + activity!!, R.array.settings_launcher_theme_spinner_items, + android.R.layout.simple_spinner_item ) + + staticThemeAdapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item) + settings_launcher_theme_spinner.adapter = staticThemeAdapter + + var themeInt = when (getSavedTheme(activity!!)) { + "finn" -> 0 + "dark" -> 1 + "custom" -> 2 + else -> 0 + }; + + settings_launcher_theme_spinner.setSelection(themeInt) + + settings_launcher_theme_spinner.onItemSelectedListener = object : AdapterView.OnItemSelectedListener { + override fun onItemSelected(parent: AdapterView<*>, view: View, position: Int, id: Long) { + when (position) { + 0 -> if (getSavedTheme(activity!!) != "finn") resetToDefaultTheme(activity!!) + 1 -> if (getSavedTheme(activity!!) != "dark") resetToDarkTheme(activity!!) + 2 -> if (getSavedTheme(activity!!) != "custom") resetToCustomTheme(activity!!) + } + } + + override fun onNothingSelected(parent: AdapterView<*>?) { + + } + } } } \ No newline at end of file diff --git a/app/src/main/java/com/finnmglas/launcher/settings/meta/SettingsFragmentMeta.kt b/app/src/main/java/com/finnmglas/launcher/settings/meta/SettingsFragmentMeta.kt index 1a46578..3ff4d4d 100644 --- a/app/src/main/java/com/finnmglas/launcher/settings/meta/SettingsFragmentMeta.kt +++ b/app/src/main/java/com/finnmglas/launcher/settings/meta/SettingsFragmentMeta.kt @@ -86,8 +86,8 @@ class SettingsFragmentMeta : Fragment(), UIObject { // on older sdk: manage app details else { AlertDialog.Builder(this.context!!, R.style.AlertDialogCustom) - .setTitle(getString(R.string.alert_cant_choose_launcher)) - .setMessage(getString(R.string.alert_cant_choose_launcher_message)) + .setTitle(getString(R.string.settings_meta_cant_select_launcher)) + .setMessage(getString(R.string.settings_meta_cant_select_launcher_msg)) .setPositiveButton(android.R.string.yes, DialogInterface.OnClickListener { _, _ -> try { @@ -114,8 +114,8 @@ class SettingsFragmentMeta : Fragment(), UIObject { // prompting for settings-reset confirmation settings_meta_button_reset_settings.setOnClickListener { AlertDialog.Builder(this.context!!, R.style.AlertDialogCustom) - .setTitle(getString(R.string.settings_reset)) - .setMessage(getString(R.string.settings_reset_message)) + .setTitle(getString(R.string.settings_meta_reset)) + .setMessage(getString(R.string.settings_meta_reset_confirm)) .setPositiveButton(android.R.string.yes, DialogInterface.OnClickListener { _, _ -> resetSettings(this.context!!) @@ -130,7 +130,7 @@ class SettingsFragmentMeta : Fragment(), UIObject { settings_meta_icon_github.setOnClickListener { intendedSettingsPause = true openNewTabWindow( - getString(R.string.settings_footer_repo), + getString(R.string.settings_meta_link_github), this.context!! ) } @@ -150,7 +150,7 @@ class SettingsFragmentMeta : Fragment(), UIObject { settings_meta_icon_globe.setOnClickListener { intendedSettingsPause = true openNewTabWindow( - getString(R.string.settings_footer_web), + getString(R.string.settings_meta_link_web), this.context!! ) } diff --git a/app/src/main/res/drawable-de/custom_theme.jpg b/app/src/main/res/drawable-de/custom_theme.jpg deleted file mode 100644 index af575d0..0000000 Binary files a/app/src/main/res/drawable-de/custom_theme.jpg and /dev/null differ diff --git a/app/src/main/res/drawable-de/dark_theme.jpg b/app/src/main/res/drawable-de/dark_theme.jpg deleted file mode 100644 index 60018be..0000000 Binary files a/app/src/main/res/drawable-de/dark_theme.jpg and /dev/null differ diff --git a/app/src/main/res/drawable-de/finnmglas_theme.jpg b/app/src/main/res/drawable-de/finnmglas_theme.jpg deleted file mode 100644 index 1b65f60..0000000 Binary files a/app/src/main/res/drawable-de/finnmglas_theme.jpg and /dev/null differ diff --git a/app/src/main/res/drawable-fr/custom_theme.jpg b/app/src/main/res/drawable-fr/custom_theme.jpg deleted file mode 100644 index 54e79b4..0000000 Binary files a/app/src/main/res/drawable-fr/custom_theme.jpg and /dev/null differ diff --git a/app/src/main/res/drawable-fr/dark_theme.jpg b/app/src/main/res/drawable-fr/dark_theme.jpg deleted file mode 100644 index 19e8861..0000000 Binary files a/app/src/main/res/drawable-fr/dark_theme.jpg and /dev/null differ diff --git a/app/src/main/res/drawable-fr/finnmglas_theme.jpg b/app/src/main/res/drawable-fr/finnmglas_theme.jpg deleted file mode 100644 index 2f0b6f7..0000000 Binary files a/app/src/main/res/drawable-fr/finnmglas_theme.jpg and /dev/null differ diff --git a/app/src/main/res/drawable/custom_theme.jpg b/app/src/main/res/drawable/custom_theme.jpg deleted file mode 100644 index d695828..0000000 Binary files a/app/src/main/res/drawable/custom_theme.jpg and /dev/null differ diff --git a/app/src/main/res/drawable/dark_theme.jpg b/app/src/main/res/drawable/dark_theme.jpg deleted file mode 100644 index df2414a..0000000 Binary files a/app/src/main/res/drawable/dark_theme.jpg and /dev/null differ diff --git a/app/src/main/res/drawable/finnmglas_theme.jpg b/app/src/main/res/drawable/finnmglas_theme.jpg deleted file mode 100644 index 97996e1..0000000 Binary files a/app/src/main/res/drawable/finnmglas_theme.jpg and /dev/null differ diff --git a/app/src/main/res/layout/settings_actions.xml b/app/src/main/res/layout/settings_actions.xml index 02ec01d..5904e19 100644 --- a/app/src/main/res/layout/settings_actions.xml +++ b/app/src/main/res/layout/settings_actions.xml @@ -34,14 +34,14 @@ android:id="@+id/settings_actions_button_view_apps" android:layout_width="match_parent" android:layout_height="wrap_content" - android:text="@string/settings_apps" + android:text="@string/settings_apps_view_all" android:textAllCaps="false" />