diff --git a/app/release/output-metadata.json b/app/release/output-metadata.json index 69f1038..1f3011b 100644 --- a/app/release/output-metadata.json +++ b/app/release/output-metadata.json @@ -11,8 +11,8 @@ "type": "SINGLE", "filters": [], "attributes": [], - "versionCode": 12, - "versionName": "v1.6.0", + "versionCode": 13, + "versionName": "j-alpha-0.1", "outputFile": "app-release.apk" } ], diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index fb56c05..2d7a33d 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -5,7 +5,8 @@ - + 2 } } -} \ No newline at end of file +} diff --git a/app/src/main/java/de/jrpie/android/launcher/list/apps/ListFragmentApps.kt b/app/src/main/java/de/jrpie/android/launcher/list/apps/ListFragmentApps.kt index bc7b8db..3b1f5f7 100644 --- a/app/src/main/java/de/jrpie/android/launcher/list/apps/ListFragmentApps.kt +++ b/app/src/main/java/de/jrpie/android/launcher/list/apps/ListFragmentApps.kt @@ -33,9 +33,6 @@ class ListFragmentApps : Fragment(), UIObject { } override fun applyTheme() { - list_apps_container.setBackgroundColor(dominantColor) - list_apps_searchview.setBackgroundColor(dominantColor) - list_apps_searchbar.setBackgroundColor(dominantColor) } override fun setOnClicks() { } @@ -70,4 +67,4 @@ class ListFragmentApps : Fragment(), UIObject { openSoftKeyboard(context!!, list_apps_searchview) } } -} \ No newline at end of file +} diff --git a/app/src/main/java/de/jrpie/android/launcher/list/other/ListFragmentOther.kt b/app/src/main/java/de/jrpie/android/launcher/list/other/ListFragmentOther.kt index f8ca74c..b55e1c0 100644 --- a/app/src/main/java/de/jrpie/android/launcher/list/other/ListFragmentOther.kt +++ b/app/src/main/java/de/jrpie/android/launcher/list/other/ListFragmentOther.kt @@ -27,10 +27,6 @@ class ListFragmentOther : Fragment() { } override fun onStart() { - if (getSavedTheme(context!!) == "custom") { - list_other_container.setBackgroundColor(dominantColor) - } - // set up the list / recycler val viewManager = LinearLayoutManager(context) val viewAdapter = de.jrpie.android.launcher.list.other.OtherRecyclerAdapter(activity!!) @@ -44,4 +40,4 @@ class ListFragmentOther : Fragment() { super.onStart() } -} \ No newline at end of file +} diff --git a/app/src/main/java/de/jrpie/android/launcher/settings/SettingsActivity.kt b/app/src/main/java/de/jrpie/android/launcher/settings/SettingsActivity.kt index 7f759df..35ffa58 100644 --- a/app/src/main/java/de/jrpie/android/launcher/settings/SettingsActivity.kt +++ b/app/src/main/java/de/jrpie/android/launcher/settings/SettingsActivity.kt @@ -60,8 +60,7 @@ class SettingsActivity: AppCompatActivity(), UIObject { } override fun applyTheme() { - settings_container.setBackgroundColor(dominantColor) - settings_appbar.setBackgroundColor(dominantColor) + // settings_appbar.setBackgroundColor(dominantColor) settings_system.setTextColor(vibrantColor) settings_close.setTextColor(vibrantColor) @@ -109,4 +108,4 @@ class SettingsSectionsPagerAdapter(private val context: Context, fm: FragmentMan } override fun getCount(): Int { return 3 } -} \ No newline at end of file +} diff --git a/app/src/main/java/de/jrpie/android/launcher/settings/actions/SettingsFragmentActions.kt b/app/src/main/java/de/jrpie/android/launcher/settings/actions/SettingsFragmentActions.kt index 6ce2897..8cd25dc 100644 --- a/app/src/main/java/de/jrpie/android/launcher/settings/actions/SettingsFragmentActions.kt +++ b/app/src/main/java/de/jrpie/android/launcher/settings/actions/SettingsFragmentActions.kt @@ -38,8 +38,6 @@ class SettingsFragmentActions : Fragment(), UIObject { } override fun applyTheme() { - settings_actions_container.setBackgroundColor(dominantColor) - setButtonColor(settings_actions_button_view_apps, vibrantColor) setButtonColor(settings_actions_button_install_apps, vibrantColor) } @@ -66,4 +64,4 @@ class SettingsFragmentActions : Fragment(), UIObject { } } } -} \ No newline at end of file +} diff --git a/app/src/main/java/de/jrpie/android/launcher/settings/launcher/SettingsFragmentLauncher.kt b/app/src/main/java/de/jrpie/android/launcher/settings/launcher/SettingsFragmentLauncher.kt index 200ee28..885a589 100644 --- a/app/src/main/java/de/jrpie/android/launcher/settings/launcher/SettingsFragmentLauncher.kt +++ b/app/src/main/java/de/jrpie/android/launcher/settings/launcher/SettingsFragmentLauncher.kt @@ -8,6 +8,7 @@ import android.graphics.PorterDuff import android.os.Build import android.os.Bundle import android.provider.MediaStore +import android.text.TextUtils import android.util.DisplayMetrics import android.view.LayoutInflater import android.view.View @@ -44,71 +45,6 @@ class SettingsFragmentLauncher : Fragment(), UIObject { super.onStart() } - override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { - - when (requestCode) { - REQUEST_PERMISSION_STORAGE -> letUserPickImage() - REQUEST_PICK_IMAGE -> handlePickedImage(resultCode, data) - else -> super.onActivityResult(requestCode, resultCode, data) - } - } - - private fun letUserPickImage(crop: Boolean = false) { - val intent = Intent() - intent.type = "image/*" - intent.action = Intent.ACTION_PICK // other option: Intent.ACTION_GET_CONTENT - - if (crop) { // crop to for the target devices screen - intent.putExtra("crop", "true") - val displayMetrics = DisplayMetrics() - activity!!.windowManager.defaultDisplay.getMetrics(displayMetrics) - intent.putExtra("aspectX", displayMetrics.widthPixels) - intent.putExtra("aspectY", displayMetrics.heightPixels) - } - - intendedSettingsPause = true - startActivityForResult(intent, REQUEST_PICK_IMAGE) - } - - private fun handlePickedImage(resultCode: Int, data: Intent?) { - if (resultCode == AppCompatActivity.RESULT_OK) { - if (data == null) return - - val imageUri = data.data - background = MediaStore.Images.Media.getBitmap(context!!.contentResolver, imageUri) - - Palette.Builder(background!!).generate { - it?.let { palette -> - dominantColor = palette.getDominantColor(ContextCompat.getColor(context!!, R.color.darkTheme_accent_color)) - vibrantColor = palette.getVibrantColor(ContextCompat.getColor(context!!, R.color.darkTheme_accent_color)) - - // never let dominantColor equal vibrantColor - if(dominantColor == vibrantColor) { - vibrantColor = - manipulateColor( - vibrantColor, - 1.2F - ) - dominantColor = - manipulateColor( - dominantColor, - 0.8F - ) - } - - /* Save image Uri as string */ - launcherPreferences.edit() - .putString(PREF_WALLPAPER, imageUri.toString()) - .putInt(PREF_DOMINANT, dominantColor) - .putInt(PREF_VIBRANT, vibrantColor) - .apply() - - intendedSettingsPause = true - activity!!.recreate() - } - } - } - } override fun applyTheme() { @@ -118,14 +54,20 @@ class SettingsFragmentLauncher : Fragment(), UIObject { setSwitchColor(settings_launcher_switch_auto_keyboard, vibrantColor) setSwitchColor(settings_launcher_switch_enable_double, vibrantColor) - settings_launcher_container.setBackgroundColor(dominantColor) - setButtonColor(settings_theme_custom_button_select, vibrantColor) + setButtonColor(settings_launcher_button_choose_wallpaper, vibrantColor) settings_seekbar_sensitivity.progressDrawable.setColorFilter(vibrantColor, PorterDuff.Mode.SRC_IN); } override fun setOnClicks() { - settings_theme_custom_button_select.setOnClickListener { resetToCustomTheme(activity!!) } + settings_launcher_button_choose_wallpaper.setOnClickListener { + // https://github.com/LineageOS/android_packages_apps_Trebuchet/blob/6caab89b21b2b91f0a439e1fd8c4510dcb255819/src/com/android/launcher3/views/OptionsPopupView.java#L271 + val intent = Intent(Intent.ACTION_SET_WALLPAPER) + //.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK) + .putExtra("com.android.wallpaper.LAUNCH_SOURCE", "app_launched_launcher") + .putExtra("com.android.launcher3.WALLPAPER_FLAVOR", "focus_wallpaper") + startActivity(intent); + } settings_launcher_switch_screen_timeout.isChecked = launcherPreferences.getBoolean(PREF_SCREEN_TIMEOUT_DISABLED, false) settings_launcher_switch_screen_timeout.setOnCheckedChangeListener { _, isChecked -> // Toggle screen timeout @@ -185,27 +127,9 @@ class SettingsFragmentLauncher : Fragment(), UIObject { 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 - ) // Load values into the date-format spinner val staticAdapter = ArrayAdapter.createFromResource( @@ -238,7 +162,6 @@ class SettingsFragmentLauncher : Fragment(), UIObject { val themeInt = when (getSavedTheme(activity!!)) { "finn" -> 0 "dark" -> 1 - "custom" -> 2 else -> 0 }; @@ -249,7 +172,6 @@ class SettingsFragmentLauncher : Fragment(), UIObject { 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<*>?) { } @@ -257,4 +179,4 @@ class SettingsFragmentLauncher : Fragment(), UIObject { settings_seekbar_sensitivity.progress = launcherPreferences.getInt(PREF_SLIDE_SENSITIVITY, 2) * 4 / 100 } -} \ No newline at end of file +} diff --git a/app/src/main/java/de/jrpie/android/launcher/settings/meta/SettingsFragmentMeta.kt b/app/src/main/java/de/jrpie/android/launcher/settings/meta/SettingsFragmentMeta.kt index fef959a..1ea8d76 100644 --- a/app/src/main/java/de/jrpie/android/launcher/settings/meta/SettingsFragmentMeta.kt +++ b/app/src/main/java/de/jrpie/android/launcher/settings/meta/SettingsFragmentMeta.kt @@ -59,8 +59,6 @@ class SettingsFragmentMeta : Fragment(), UIObject { } override fun applyTheme() { - settings_meta_container.setBackgroundColor(dominantColor) - setButtonColor(settings_meta_button_select_launcher, vibrantColor) setButtonColor(settings_meta_button_view_tutorial, vibrantColor) setButtonColor(settings_meta_button_reset_settings, vibrantColor) @@ -152,4 +150,4 @@ class SettingsFragmentMeta : Fragment(), UIObject { } } -} \ No newline at end of file +} diff --git a/app/src/main/java/de/jrpie/android/launcher/tutorial/TutorialActivity.kt b/app/src/main/java/de/jrpie/android/launcher/tutorial/TutorialActivity.kt index 4e70720..7c0760a 100644 --- a/app/src/main/java/de/jrpie/android/launcher/tutorial/TutorialActivity.kt +++ b/app/src/main/java/de/jrpie/android/launcher/tutorial/TutorialActivity.kt @@ -30,9 +30,8 @@ class TutorialActivity: AppCompatActivity(), UIObject { setContentView(R.layout.tutorial) // Check if the app was started before - if (launcherPreferences.getBoolean(PREF_STARTED, false)) - tutorial_appbar.visibility = View.VISIBLE - else resetSettings(this) + if (!launcherPreferences.getBoolean(PREF_STARTED, false)) + resetSettings(this) loadSettings() @@ -49,16 +48,6 @@ class TutorialActivity: AppCompatActivity(), UIObject { super.onStart() } - override fun applyTheme() { - tutorial_appbar.setBackgroundColor(dominantColor) - tutorial_container.setBackgroundColor(dominantColor) - tutorial_close.setTextColor(vibrantColor) - } - - override fun setOnClicks() { - tutorial_close.setOnClickListener() { finish() } - } - override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { when (requestCode) { REQUEST_CHOOSE_APP -> saveListActivityChoice(data) @@ -97,4 +86,4 @@ class TutorialSectionsPagerAdapter(private val context: Context, fm: FragmentMan /* We don't use titles here, as we have the dots */ override fun getPageTitle(position: Int): CharSequence? { return "" } override fun getCount(): Int { return 5 } -} \ No newline at end of file +} diff --git a/app/src/main/java/de/jrpie/android/launcher/tutorial/tabs/TutorialFragmentConcept.kt b/app/src/main/java/de/jrpie/android/launcher/tutorial/tabs/TutorialFragmentConcept.kt index 881bd30..8a9a53a 100644 --- a/app/src/main/java/de/jrpie/android/launcher/tutorial/tabs/TutorialFragmentConcept.kt +++ b/app/src/main/java/de/jrpie/android/launcher/tutorial/tabs/TutorialFragmentConcept.kt @@ -27,7 +27,4 @@ class TutorialFragmentConcept(): Fragment(), UIObject { super.onStart() } - override fun applyTheme() { - tutorial_concept_container.setBackgroundColor(dominantColor) - } -} \ No newline at end of file +} diff --git a/app/src/main/java/de/jrpie/android/launcher/tutorial/tabs/TutorialFragmentFinish.kt b/app/src/main/java/de/jrpie/android/launcher/tutorial/tabs/TutorialFragmentFinish.kt index 64553fc..6d53052 100644 --- a/app/src/main/java/de/jrpie/android/launcher/tutorial/tabs/TutorialFragmentFinish.kt +++ b/app/src/main/java/de/jrpie/android/launcher/tutorial/tabs/TutorialFragmentFinish.kt @@ -29,7 +29,6 @@ class TutorialFragmentFinish(): Fragment(), UIObject { } override fun applyTheme() { - tutorial_finish_container.setBackgroundColor(dominantColor) setButtonColor(tutorial_finish_button_start, vibrantColor) tutorial_finish_button_start.blink() } @@ -49,4 +48,4 @@ class TutorialFragmentFinish(): Fragment(), UIObject { } activity!!.finish() } -} \ No newline at end of file +} diff --git a/app/src/main/java/de/jrpie/android/launcher/tutorial/tabs/TutorialFragmentSetup.kt b/app/src/main/java/de/jrpie/android/launcher/tutorial/tabs/TutorialFragmentSetup.kt index ebae407..f79435f 100644 --- a/app/src/main/java/de/jrpie/android/launcher/tutorial/tabs/TutorialFragmentSetup.kt +++ b/app/src/main/java/de/jrpie/android/launcher/tutorial/tabs/TutorialFragmentSetup.kt @@ -27,7 +27,4 @@ class TutorialFragmentSetup(): Fragment(), UIObject { super.onStart() } - override fun applyTheme() { - tutorial_setup_container.setBackgroundColor(dominantColor) - } -} \ No newline at end of file +} diff --git a/app/src/main/java/de/jrpie/android/launcher/tutorial/tabs/TutorialFragmentStart.kt b/app/src/main/java/de/jrpie/android/launcher/tutorial/tabs/TutorialFragmentStart.kt index 35810df..1a25c2a 100644 --- a/app/src/main/java/de/jrpie/android/launcher/tutorial/tabs/TutorialFragmentStart.kt +++ b/app/src/main/java/de/jrpie/android/launcher/tutorial/tabs/TutorialFragmentStart.kt @@ -28,17 +28,9 @@ class TutorialFragmentStart(): Fragment(), UIObject { } override fun applyTheme() { - tutorial_start_container.setBackgroundColor(dominantColor) - // set icons - val rightIcon = getString(R.string.fas_angle_double_right) - - tutorial_start_icon_right.text = rightIcon.repeat(3) tutorial_start_icon_right.setTextColor(vibrantColor) tutorial_start_icon_right.blink() - tutorial_start_icon_right_2.text = rightIcon.repeat(3) - tutorial_start_icon_right_2.setTextColor(vibrantColor) - tutorial_start_icon_right_2.blink() } } \ No newline at end of file diff --git a/app/src/main/java/de/jrpie/android/launcher/tutorial/tabs/TutorialFragmentUsage.kt b/app/src/main/java/de/jrpie/android/launcher/tutorial/tabs/TutorialFragmentUsage.kt index 4a3f0f7..60bbe86 100644 --- a/app/src/main/java/de/jrpie/android/launcher/tutorial/tabs/TutorialFragmentUsage.kt +++ b/app/src/main/java/de/jrpie/android/launcher/tutorial/tabs/TutorialFragmentUsage.kt @@ -27,7 +27,4 @@ class TutorialFragmentUsage(): Fragment(), UIObject { super.onStart() } - override fun applyTheme() { - tutorial_usage_container.setBackgroundColor(dominantColor) - } -} \ No newline at end of file +} diff --git a/app/src/main/res/layout/list.xml b/app/src/main/res/layout/list.xml index fc059df..b87a9fd 100644 --- a/app/src/main/res/layout/list.xml +++ b/app/src/main/res/layout/list.xml @@ -7,7 +7,6 @@ android:id="@+id/list_container" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="?attr/colorPrimary" tools:context=".list.ListActivity"> diff --git a/app/src/main/res/layout/list_apps.xml b/app/src/main/res/layout/list_apps.xml index cf950c8..1645307 100644 --- a/app/src/main/res/layout/list_apps.xml +++ b/app/src/main/res/layout/list_apps.xml @@ -12,6 +12,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:gravity="center" + android:background="@null" + android:elevation="0dp" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toTopOf="parent"> diff --git a/app/src/main/res/layout/settings.xml b/app/src/main/res/layout/settings.xml index 0a6d39b..15a396c 100644 --- a/app/src/main/res/layout/settings.xml +++ b/app/src/main/res/layout/settings.xml @@ -11,6 +11,8 @@ diff --git a/app/src/main/res/layout/settings_actions.xml b/app/src/main/res/layout/settings_actions.xml index bbbfc8e..09875b3 100644 --- a/app/src/main/res/layout/settings_actions.xml +++ b/app/src/main/res/layout/settings_actions.xml @@ -4,7 +4,6 @@ android:id="@+id/settings_actions_container" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="?attr/colorPrimary" android:paddingLeft="32sp" android:paddingTop="16sp" android:paddingRight="32sp"> diff --git a/app/src/main/res/layout/settings_launcher.xml b/app/src/main/res/layout/settings_launcher.xml index d690387..ee0cc3e 100644 --- a/app/src/main/res/layout/settings_launcher.xml +++ b/app/src/main/res/layout/settings_launcher.xml @@ -9,7 +9,6 @@ android:id="@+id/settings_launcher_container" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="?attr/colorPrimary" android:gravity="center|top" android:orientation="vertical" android:paddingLeft="32sp" @@ -49,7 +48,7 @@ android:text="@string/settings_launcher_time_format" android:textSize="16sp" /> - @@ -76,7 +75,7 @@ android:text="@string/settings_launcher_theme" android:textSize="16sp" /> - @@ -96,7 +95,7 @@ android:orientation="horizontal">