use system wallpaper

This commit is contained in:
Josia Pietsch 2024-07-05 04:36:30 +02:00
parent 7c945aa6c2
commit acacc1d6cd
Signed by: jrpie
GPG key ID: E70B571D66986A2D
51 changed files with 93 additions and 259 deletions

View file

@ -11,8 +11,8 @@
"type": "SINGLE", "type": "SINGLE",
"filters": [], "filters": [],
"attributes": [], "attributes": [],
"versionCode": 12, "versionCode": 13,
"versionName": "v1.6.0", "versionName": "j-alpha-0.1",
"outputFile": "app-release.apk" "outputFile": "app-release.apk"
} }
], ],

View file

@ -5,7 +5,8 @@
<uses-permission android:name="android.permission.REQUEST_DELETE_PACKAGES" /> <uses-permission android:name="android.permission.REQUEST_DELETE_PACKAGES" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" /> <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.QUERY_ALL_PACKAGES" /> <uses-permission android:name="android.permission.QUERY_ALL_PACKAGES"
tools:ignore="QueryAllPackagesPermission" />
<application <application

View file

@ -67,7 +67,6 @@ val ACTIONS = listOf(
const val PREF_DOMINANT = "custom_dominant" const val PREF_DOMINANT = "custom_dominant"
const val PREF_VIBRANT = "custom_vibrant" const val PREF_VIBRANT = "custom_vibrant"
const val PREF_WALLPAPER = "background_uri"
const val PREF_THEME = "theme" const val PREF_THEME = "theme"
const val PREF_SCREEN_TIMEOUT_DISABLED = "disableTimeout" const val PREF_SCREEN_TIMEOUT_DISABLED = "disableTimeout"
@ -362,7 +361,6 @@ fun resetToDefaultTheme(activity: Activity) {
vibrantColor = activity.resources.getColor(R.color.finnmglasTheme_accent_color) vibrantColor = activity.resources.getColor(R.color.finnmglasTheme_accent_color)
launcherPreferences.edit() launcherPreferences.edit()
.putString(PREF_WALLPAPER, "")
.putInt(PREF_DOMINANT, dominantColor) .putInt(PREF_DOMINANT, dominantColor)
.putInt(PREF_VIBRANT, vibrantColor) .putInt(PREF_VIBRANT, vibrantColor)
.apply() .apply()
@ -379,7 +377,6 @@ fun resetToDarkTheme(activity: Activity) {
vibrantColor = activity.resources.getColor(R.color.darkTheme_accent_color) vibrantColor = activity.resources.getColor(R.color.darkTheme_accent_color)
launcherPreferences.edit() launcherPreferences.edit()
.putString(PREF_WALLPAPER, "")
.putInt(PREF_DOMINANT, dominantColor) .putInt(PREF_DOMINANT, dominantColor)
.putInt(PREF_VIBRANT, vibrantColor) .putInt(PREF_VIBRANT, vibrantColor)
.apply() .apply()
@ -466,7 +463,6 @@ fun resetSettings(context: Context) {
vibrantColor = context.resources.getColor(R.color.finnmglasTheme_accent_color) vibrantColor = context.resources.getColor(R.color.finnmglasTheme_accent_color)
editor editor
.putString(PREF_WALLPAPER, "")
.putInt(PREF_DOMINANT, dominantColor) .putInt(PREF_DOMINANT, dominantColor)
.putInt(PREF_VIBRANT, vibrantColor) .putInt(PREF_VIBRANT, vibrantColor)
.putString(PREF_THEME, "finn") .putString(PREF_THEME, "finn")

View file

@ -46,7 +46,6 @@ class HomeActivity: UIObject, AppCompatActivity(),
override fun onCreate(savedInstanceState: Bundle?) { override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState) super.onCreate(savedInstanceState)
this.setTheme(android.R.style.Theme_Wallpaper_NoTitleBar_Fullscreen)
// Initialise globals // Initialise globals
launcherPreferences = this.getSharedPreferences( launcherPreferences = this.getSharedPreferences(
getString(R.string.preference_file_key), Context.MODE_PRIVATE) getString(R.string.preference_file_key), Context.MODE_PRIVATE)
@ -211,25 +210,6 @@ class HomeActivity: UIObject, AppCompatActivity(),
return if (mDetector.onTouchEvent(event)) { false } else { super.onTouchEvent(event) } return if (mDetector.onTouchEvent(event)) { false } else { super.onTouchEvent(event) }
} }
override fun applyTheme() {
// home_container.setBackgroundColor(dominantColor)
/*if (launcherPreferences.getString(PREF_WALLPAPER, "") != "") {
try {
background = MediaStore.Images.Media.getBitmap(
this.contentResolver, Uri.parse(
launcherPreferences.getString(PREF_WALLPAPER, "")
)
)
} catch (e: Exception) { }
// Background image was deleted or something unexpected happened
if (background == null) resetToDefaultTheme(this)
}*/
}
override fun setOnClicks() { override fun setOnClicks() {
home_upper_view.setOnClickListener() { home_upper_view.setOnClickListener() {

View file

@ -76,8 +76,6 @@ class ListActivity : AppCompatActivity(), UIObject {
} }
override fun applyTheme() { override fun applyTheme() {
list_container.setBackgroundColor(dominantColor)
list_appbar.setBackgroundColor(dominantColor)
list_close.setTextColor(vibrantColor) list_close.setTextColor(vibrantColor)
list_tabs.setSelectedTabIndicatorColor(vibrantColor) list_tabs.setSelectedTabIndicatorColor(vibrantColor)

View file

@ -33,9 +33,6 @@ class ListFragmentApps : Fragment(), UIObject {
} }
override fun applyTheme() { override fun applyTheme() {
list_apps_container.setBackgroundColor(dominantColor)
list_apps_searchview.setBackgroundColor(dominantColor)
list_apps_searchbar.setBackgroundColor(dominantColor)
} }
override fun setOnClicks() { } override fun setOnClicks() { }

View file

@ -27,10 +27,6 @@ class ListFragmentOther : Fragment() {
} }
override fun onStart() { override fun onStart() {
if (getSavedTheme(context!!) == "custom") {
list_other_container.setBackgroundColor(dominantColor)
}
// set up the list / recycler // set up the list / recycler
val viewManager = LinearLayoutManager(context) val viewManager = LinearLayoutManager(context)
val viewAdapter = de.jrpie.android.launcher.list.other.OtherRecyclerAdapter(activity!!) val viewAdapter = de.jrpie.android.launcher.list.other.OtherRecyclerAdapter(activity!!)

View file

@ -60,8 +60,7 @@ class SettingsActivity: AppCompatActivity(), UIObject {
} }
override fun applyTheme() { override fun applyTheme() {
settings_container.setBackgroundColor(dominantColor) // settings_appbar.setBackgroundColor(dominantColor)
settings_appbar.setBackgroundColor(dominantColor)
settings_system.setTextColor(vibrantColor) settings_system.setTextColor(vibrantColor)
settings_close.setTextColor(vibrantColor) settings_close.setTextColor(vibrantColor)

View file

@ -38,8 +38,6 @@ class SettingsFragmentActions : Fragment(), UIObject {
} }
override fun applyTheme() { override fun applyTheme() {
settings_actions_container.setBackgroundColor(dominantColor)
setButtonColor(settings_actions_button_view_apps, vibrantColor) setButtonColor(settings_actions_button_view_apps, vibrantColor)
setButtonColor(settings_actions_button_install_apps, vibrantColor) setButtonColor(settings_actions_button_install_apps, vibrantColor)
} }

View file

@ -8,6 +8,7 @@ import android.graphics.PorterDuff
import android.os.Build import android.os.Build
import android.os.Bundle import android.os.Bundle
import android.provider.MediaStore import android.provider.MediaStore
import android.text.TextUtils
import android.util.DisplayMetrics import android.util.DisplayMetrics
import android.view.LayoutInflater import android.view.LayoutInflater
import android.view.View import android.view.View
@ -44,71 +45,6 @@ class SettingsFragmentLauncher : Fragment(), UIObject {
super<UIObject>.onStart() super<UIObject>.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() { override fun applyTheme() {
@ -118,14 +54,20 @@ class SettingsFragmentLauncher : Fragment(), UIObject {
setSwitchColor(settings_launcher_switch_auto_keyboard, vibrantColor) setSwitchColor(settings_launcher_switch_auto_keyboard, vibrantColor)
setSwitchColor(settings_launcher_switch_enable_double, vibrantColor) setSwitchColor(settings_launcher_switch_enable_double, vibrantColor)
settings_launcher_container.setBackgroundColor(dominantColor) setButtonColor(settings_launcher_button_choose_wallpaper, vibrantColor)
setButtonColor(settings_theme_custom_button_select, vibrantColor)
settings_seekbar_sensitivity.progressDrawable.setColorFilter(vibrantColor, PorterDuff.Mode.SRC_IN); settings_seekbar_sensitivity.progressDrawable.setColorFilter(vibrantColor, PorterDuff.Mode.SRC_IN);
} }
override fun setOnClicks() { 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.isChecked = launcherPreferences.getBoolean(PREF_SCREEN_TIMEOUT_DISABLED, false)
settings_launcher_switch_screen_timeout.setOnCheckedChangeListener { _, isChecked -> // Toggle screen timeout settings_launcher_switch_screen_timeout.setOnCheckedChangeListener { _, isChecked -> // Toggle screen timeout
@ -185,27 +127,9 @@ class SettingsFragmentLauncher : Fragment(), UIObject {
intendedSettingsPause = true intendedSettingsPause = true
saveTheme("custom") // TODO: Fix the bug this creates (displays custom theme without chosen img) 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() { 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 // Load values into the date-format spinner
val staticAdapter = ArrayAdapter.createFromResource( val staticAdapter = ArrayAdapter.createFromResource(
@ -238,7 +162,6 @@ class SettingsFragmentLauncher : Fragment(), UIObject {
val themeInt = when (getSavedTheme(activity!!)) { val themeInt = when (getSavedTheme(activity!!)) {
"finn" -> 0 "finn" -> 0
"dark" -> 1 "dark" -> 1
"custom" -> 2
else -> 0 else -> 0
}; };
@ -249,7 +172,6 @@ class SettingsFragmentLauncher : Fragment(), UIObject {
when (position) { when (position) {
0 -> if (getSavedTheme(activity!!) != "finn") resetToDefaultTheme(activity!!) 0 -> if (getSavedTheme(activity!!) != "finn") resetToDefaultTheme(activity!!)
1 -> if (getSavedTheme(activity!!) != "dark") resetToDarkTheme(activity!!) 1 -> if (getSavedTheme(activity!!) != "dark") resetToDarkTheme(activity!!)
2 -> if (getSavedTheme(activity!!) != "custom") resetToCustomTheme(activity!!)
} }
} }
override fun onNothingSelected(parent: AdapterView<*>?) { } override fun onNothingSelected(parent: AdapterView<*>?) { }

View file

@ -59,8 +59,6 @@ class SettingsFragmentMeta : Fragment(), UIObject {
} }
override fun applyTheme() { override fun applyTheme() {
settings_meta_container.setBackgroundColor(dominantColor)
setButtonColor(settings_meta_button_select_launcher, vibrantColor) setButtonColor(settings_meta_button_select_launcher, vibrantColor)
setButtonColor(settings_meta_button_view_tutorial, vibrantColor) setButtonColor(settings_meta_button_view_tutorial, vibrantColor)
setButtonColor(settings_meta_button_reset_settings, vibrantColor) setButtonColor(settings_meta_button_reset_settings, vibrantColor)

View file

@ -30,9 +30,8 @@ class TutorialActivity: AppCompatActivity(), UIObject {
setContentView(R.layout.tutorial) setContentView(R.layout.tutorial)
// Check if the app was started before // Check if the app was started before
if (launcherPreferences.getBoolean(PREF_STARTED, false)) if (!launcherPreferences.getBoolean(PREF_STARTED, false))
tutorial_appbar.visibility = View.VISIBLE resetSettings(this)
else resetSettings(this)
loadSettings() loadSettings()
@ -49,16 +48,6 @@ class TutorialActivity: AppCompatActivity(), UIObject {
super<UIObject>.onStart() super<UIObject>.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?) { override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) {
when (requestCode) { when (requestCode) {
REQUEST_CHOOSE_APP -> saveListActivityChoice(data) REQUEST_CHOOSE_APP -> saveListActivityChoice(data)

View file

@ -27,7 +27,4 @@ class TutorialFragmentConcept(): Fragment(), UIObject {
super<UIObject>.onStart() super<UIObject>.onStart()
} }
override fun applyTheme() {
tutorial_concept_container.setBackgroundColor(dominantColor)
}
} }

View file

@ -29,7 +29,6 @@ class TutorialFragmentFinish(): Fragment(), UIObject {
} }
override fun applyTheme() { override fun applyTheme() {
tutorial_finish_container.setBackgroundColor(dominantColor)
setButtonColor(tutorial_finish_button_start, vibrantColor) setButtonColor(tutorial_finish_button_start, vibrantColor)
tutorial_finish_button_start.blink() tutorial_finish_button_start.blink()
} }

View file

@ -27,7 +27,4 @@ class TutorialFragmentSetup(): Fragment(), UIObject {
super<UIObject>.onStart() super<UIObject>.onStart()
} }
override fun applyTheme() {
tutorial_setup_container.setBackgroundColor(dominantColor)
}
} }

View file

@ -28,17 +28,9 @@ class TutorialFragmentStart(): Fragment(), UIObject {
} }
override fun applyTheme() { 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.setTextColor(vibrantColor)
tutorial_start_icon_right.blink() 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()
} }
} }

View file

@ -27,7 +27,4 @@ class TutorialFragmentUsage(): Fragment(), UIObject {
super<UIObject>.onStart() super<UIObject>.onStart()
} }
override fun applyTheme() {
tutorial_usage_container.setBackgroundColor(dominantColor)
}
} }

View file

@ -7,7 +7,6 @@
android:id="@+id/list_container" android:id="@+id/list_container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="?attr/colorPrimary"
tools:context=".list.ListActivity"> tools:context=".list.ListActivity">
<com.google.android.material.appbar.AppBarLayout <com.google.android.material.appbar.AppBarLayout
@ -15,6 +14,10 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center" android:gravity="center"
android:background="@null"
android:elevation="0dp"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"> app:layout_constraintTop_toTopOf="parent">

View file

@ -12,6 +12,8 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:gravity="center" android:gravity="center"
android:background="@null"
android:elevation="0dp"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"> app:layout_constraintTop_toTopOf="parent">

View file

@ -11,6 +11,8 @@
<com.google.android.material.appbar.AppBarLayout <com.google.android.material.appbar.AppBarLayout
android:id="@+id/settings_appbar" android:id="@+id/settings_appbar"
android:background="@null"
android:elevation="0dp"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">

View file

@ -4,7 +4,6 @@
android:id="@+id/settings_actions_container" android:id="@+id/settings_actions_container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="?attr/colorPrimary"
android:paddingLeft="32sp" android:paddingLeft="32sp"
android:paddingTop="16sp" android:paddingTop="16sp"
android:paddingRight="32sp"> android:paddingRight="32sp">

View file

@ -9,7 +9,6 @@
android:id="@+id/settings_launcher_container" android:id="@+id/settings_launcher_container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="?attr/colorPrimary"
android:gravity="center|top" android:gravity="center|top"
android:orientation="vertical" android:orientation="vertical"
android:paddingLeft="32sp" android:paddingLeft="32sp"
@ -49,7 +48,7 @@
android:text="@string/settings_launcher_time_format" android:text="@string/settings_launcher_time_format"
android:textSize="16sp" /> android:textSize="16sp" />
<Space <android.widget.Space
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" /> android:layout_weight="1" />
@ -76,7 +75,7 @@
android:text="@string/settings_launcher_theme" android:text="@string/settings_launcher_theme"
android:textSize="16sp" /> android:textSize="16sp" />
<Space <android.widget.Space
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" /> android:layout_weight="1" />
@ -96,7 +95,7 @@
android:orientation="horizontal"> android:orientation="horizontal">
<Button <Button
android:id="@+id/settings_theme_custom_button_select" android:id="@+id/settings_launcher_button_choose_wallpaper"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/settings_launcher_choose_wallpaper" android:text="@string/settings_launcher_choose_wallpaper"
@ -136,7 +135,7 @@
android:text="@string/settings_launcher_disable_timeout" android:text="@string/settings_launcher_disable_timeout"
android:textSize="16sp" /> android:textSize="16sp" />
<Space <android.widget.Space
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" /> android:layout_weight="1" />
@ -165,7 +164,7 @@
android:text="@string/settings_launcher_full_screen" android:text="@string/settings_launcher_full_screen"
android:textSize="16sp" /> android:textSize="16sp" />
<Space <android.widget.Space
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" /> android:layout_weight="1" />
@ -236,7 +235,7 @@
android:text="@string/settings_launcher_auto_launch" android:text="@string/settings_launcher_auto_launch"
android:textSize="16sp" /> android:textSize="16sp" />
<Space <android.widget.Space
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" /> android:layout_weight="1" />
@ -265,7 +264,7 @@
android:text="@string/settings_launcher_auto_keyboard" android:text="@string/settings_launcher_auto_keyboard"
android:textSize="16sp" /> android:textSize="16sp" />
<Space <android.widget.Space
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" /> android:layout_weight="1" />
@ -294,7 +293,7 @@
android:text="@string/settings_launcher_enable_double" android:text="@string/settings_launcher_enable_double"
android:textSize="16sp" /> android:textSize="16sp" />
<Space <android.widget.Space
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" /> android:layout_weight="1" />

View file

@ -6,7 +6,6 @@
android:id="@+id/settings_meta_container" android:id="@+id/settings_meta_container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="?attr/colorPrimary"
android:gravity="center|top" android:gravity="center|top"
android:orientation="vertical" android:orientation="vertical"
android:paddingLeft="32sp" android:paddingLeft="32sp"

View file

@ -7,65 +7,20 @@
android:id="@+id/tutorial_container" android:id="@+id/tutorial_container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="?attr/colorPrimary"
tools:context=".tutorial.TutorialActivity"> tools:context=".tutorial.TutorialActivity">
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/tutorial_appbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:gravity="center"
android:visibility="gone"
custom:layout_constraintEnd_toEndOf="parent"
custom:layout_constraintStart_toStartOf="parent"
custom:layout_constraintTop_toTopOf="parent">
<androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent"
android:layout_height="match_parent">
<TextView
android:id="@+id/tutorial_heading"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:minHeight="?actionBarSize"
android:padding="@dimen/appbar_padding"
android:text="@string/tutorial_title"
android:textAppearance="@style/TextAppearance.Widget.AppCompat.Toolbar.Title"
custom:layout_constraintEnd_toEndOf="parent"
custom:layout_constraintStart_toStartOf="parent"
custom:layout_constraintTop_toTopOf="parent" />
<de.jrpie.android.launcher.libraries.FontAwesome
android:id="@+id/tutorial_close"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginEnd="8dp"
android:layout_marginRight="8dp"
android:gravity="center"
android:includeFontPadding="true"
android:paddingLeft="16sp"
android:paddingRight="16sp"
android:text="@string/fa_close_window"
android:textColor="?attr/colorAccent"
android:textSize="22sp"
custom:layout_constraintBottom_toBottomOf="parent"
custom:layout_constraintEnd_toEndOf="parent"
custom:layout_constraintTop_toTopOf="parent"
custom:type="solid" />
</androidx.constraintlayout.widget.ConstraintLayout>
</com.google.android.material.appbar.AppBarLayout>
<androidx.viewpager.widget.ViewPager <androidx.viewpager.widget.ViewPager
android:id="@+id/tutorial_viewpager" android:id="@+id/tutorial_viewpager"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="0dp" android:layout_height="0dp"
app:layout_behavior="@string/appbar_scrolling_view_behavior" app:layout_behavior="@string/appbar_scrolling_view_behavior"
app:layout_constraintBottom_toTopOf="@id/tutorial_tabs" app:layout_constraintBottom_toTopOf="@+id/tutorial_tabs"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintHorizontal_bias="0.0"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tutorial_appbar" /> app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.0" />
<com.google.android.material.tabs.TabLayout <com.google.android.material.tabs.TabLayout
android:id="@+id/tutorial_tabs" android:id="@+id/tutorial_tabs"

View file

@ -8,7 +8,6 @@
android:paddingRight="32sp" android:paddingRight="32sp"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="?attr/colorPrimary"
tools:context=".tutorial.tabs.TutorialFragmentConcept"> tools:context=".tutorial.tabs.TutorialFragmentConcept">
<TextView <TextView

View file

@ -9,7 +9,6 @@
android:paddingRight="32sp" android:paddingRight="32sp"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="?attr/colorPrimary"
tools:context=".tutorial.tabs.TutorialFragmentFinish"> tools:context=".tutorial.tabs.TutorialFragmentFinish">
<TextView <TextView

View file

@ -6,7 +6,6 @@
android:id="@+id/tutorial_setup_container" android:id="@+id/tutorial_setup_container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="?attr/colorPrimary"
android:paddingLeft="32sp" android:paddingLeft="32sp"
android:paddingRight="32sp" android:paddingRight="32sp"
tools:context=".tutorial.tabs.TutorialFragmentSetup"> tools:context=".tutorial.tabs.TutorialFragmentSetup">

View file

@ -8,20 +8,8 @@
android:paddingRight="32sp" android:paddingRight="32sp"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="?attr/colorPrimary"
tools:context=".tutorial.tabs.TutorialFragmentStart"> tools:context=".tutorial.tabs.TutorialFragmentStart">
<de.jrpie.android.launcher.libraries.FontAwesome
android:id="@+id/tutorial_start_icon_right_2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/fas_angle_double_right"
android:textSize="64sp"
app:layout_constraintBottom_toTopOf="@id/tutorial_start_text"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
<TextView <TextView
android:id="@+id/tutorial_start_text" android:id="@+id/tutorial_start_text"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@ -34,11 +22,11 @@
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" /> app:layout_constraintTop_toTopOf="parent" />
<de.jrpie.android.launcher.libraries.FontAwesome <TextView
android:id="@+id/tutorial_start_icon_right" android:id="@+id/tutorial_start_icon_right"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:text="@string/fas_angle_double_right" android:text=">>>>>>"
android:textSize="64sp" android:textSize="64sp"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"

View file

@ -5,7 +5,6 @@
android:id="@+id/tutorial_usage_container" android:id="@+id/tutorial_usage_container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:background="?attr/colorPrimary"
android:paddingLeft="32sp" android:paddingLeft="32sp"
android:paddingRight="32sp" android:paddingRight="32sp"
tools:context=".tutorial.tabs.TutorialFragmentUsage"> tools:context=".tutorial.tabs.TutorialFragmentUsage">

Binary file not shown.

Before

Width:  |  Height:  |  Size: 3.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 16 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.2 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.1 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 2.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 5.6 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 27 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 7.8 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 10 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 58 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 14 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 17 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 101 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 22 KiB

View file

@ -67,7 +67,6 @@
<string-array name="settings_launcher_theme_spinner_items"> <string-array name="settings_launcher_theme_spinner_items">
<item>Standard</item> <item>Standard</item>
<item>Dunkel</item> <item>Dunkel</item>
<item>Hintergrund</item>
</string-array> </string-array>
<string name="settings_launcher_choose_wallpaper">Hintergrund auswählen</string> <string name="settings_launcher_choose_wallpaper">Hintergrund auswählen</string>

View file

@ -91,7 +91,6 @@
<string-array name="settings_launcher_theme_spinner_items"> <string-array name="settings_launcher_theme_spinner_items">
<item>Normal</item> <item>Normal</item>
<item>Oscuro</item> <item>Oscuro</item>
<item>Fondo de pantalla</item>
</string-array> </string-array>
<string name="settings_launcher_choose_wallpaper">Seleccionar fondo de pantalla</string> <string name="settings_launcher_choose_wallpaper">Seleccionar fondo de pantalla</string>

View file

@ -67,7 +67,6 @@
<string-array name="settings_launcher_theme_spinner_items"> <string-array name="settings_launcher_theme_spinner_items">
<item>Défaut</item> <item>Défaut</item>
<item>Noir</item> <item>Noir</item>
<item>Image de fond</item>
</string-array> </string-array>
<string name="settings_launcher_choose_wallpaper">Choisir un image</string> <string name="settings_launcher_choose_wallpaper">Choisir un image</string>

View file

@ -0,0 +1,32 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="baseTheme" parent="Theme.AppCompat.Light.NoActionBar">
<item name="colorPrimary">@color/finnmglasTheme_background_color</item>
<item name="colorPrimaryDark">@color/finnmglasTheme_background_color</item>
<item name="android:colorBackground">@color/finnmglasTheme_background_color</item>
<item name="android:statusBarColor">@android:color/transparent</item>
<item name="android:windowBackground">@android:color/transparent</item>
<item name="android:windowShowWallpaper">true</item>
<item name="colorAccent">#555</item>
<item name="android:textColor">#ffffff</item>
<item name="android:textColorSecondary">@color/finnmglasTheme_text_color</item>
<item name="android:textColorPrimary">@color/finnmglasTheme_text_color</item>
<item name="android:textColorHint">#555</item>
<item name="android:fontFamily">@font/hack</item>
<item name="android:buttonStyle">@style/Widget.AppCompat.Button.Colored</item>
<item name="colorButtonNormal">#555</item>
<item name="android:popupMenuStyle">@style/PopupMenuCustom</item>
<item name="android:windowDisablePreview">true</item>
<item name="android:windowAnimationStyle">@style/WindowFadeTransition</item>
</style>
</resources>

View file

@ -22,7 +22,7 @@
<string name="fas_forward" translatable="false">&#xf051;</string> <string name="fas_forward" translatable="false">&#xf051;</string>
<string name="fas_angle_double_left" translatable="false">&#xf100;</string> <string name="fas_angle_double_left" translatable="false">&#xf100;</string>
<string name="fas_angle_double_right" translatable="false">&#xf101;</string> <string name="fas_angle_double_right" translatable="false">">>"</string>
<string name="fas_angle_double_up" translatable="false">&#xf102;</string> <string name="fas_angle_double_up" translatable="false">&#xf102;</string>
<string name="fas_angle_double_down" translatable="false">&#xf103;</string> <string name="fas_angle_double_down" translatable="false">&#xf103;</string>
<string name="fas_store" translatable="false">&#xf54e;</string> <string name="fas_store" translatable="false">&#xf54e;</string>

View file

@ -89,7 +89,6 @@
<string-array name="settings_launcher_theme_spinner_items"> <string-array name="settings_launcher_theme_spinner_items">
<item>Default</item> <item>Default</item>
<item>Dark</item> <item>Dark</item>
<item>Wallpaper</item>
</string-array> </string-array>
<string name="settings_launcher_choose_wallpaper">Choose a wallpaper</string> <string name="settings_launcher_choose_wallpaper">Choose a wallpaper</string>
@ -128,7 +127,7 @@
<string name="settings_meta_report_bug_link" translatable="false">https://github.com/jrpie/Launcher/issues/new</string> <string name="settings_meta_report_bug_link" translatable="false">https://github.com/jrpie/Launcher/issues/new</string>
<string name="settings_meta_fork_contact">Contact the developer of the fork</string> <string name="settings_meta_fork_contact">Contact the developer of the fork</string>
<string name="settings_meta_fork_contact_url">https://jrpie.de/contact/</string> <string name="settings_meta_fork_contact_url" translatable="false">https://s.jrpie.de/contact/</string>
<string name="settings_meta_contact">Contact the original developer</string> <string name="settings_meta_contact">Contact the original developer</string>
<string name="settings_meta_contact_url">https://www.finnmglas.com/contact/</string> <string name="settings_meta_contact_url">https://www.finnmglas.com/contact/</string>

View file

@ -13,6 +13,11 @@
<item name="colorPrimaryDark">@color/finnmglasTheme_background_color</item> <item name="colorPrimaryDark">@color/finnmglasTheme_background_color</item>
<item name="android:colorBackground">@color/finnmglasTheme_background_color</item> <item name="android:colorBackground">@color/finnmglasTheme_background_color</item>
<item name="android:statusBarColor">@null</item>
<item name="android:windowBackground">@android:color/transparent</item>
<item name="android:windowShowWallpaper">true</item>
<item name="colorAccent">#555</item> <item name="colorAccent">#555</item>
<item name="android:textColor">#ffffff</item> <item name="android:textColor">#ffffff</item>
@ -27,10 +32,12 @@
<item name="android:popupMenuStyle">@style/PopupMenuCustom</item> <item name="android:popupMenuStyle">@style/PopupMenuCustom</item>
<item name="android:windowDisablePreview">true</item> <item name="android:windowDisablePreview">true</item>
<item name="android:windowAnimationStyle">@style/WindowFadeTransition</item> <item name="android:windowAnimationStyle">@style/WindowFadeTransition</item>
</style> </style>
<style name="PopupMenuCustom" parent="@android:style/Widget.PopupMenu"> <style name="PopupMenuCustom" parent="@android:style/Widget.PopupMenu">
<item name="android:popupBackground">#252827</item> <item name="android:popupBackground">#252827</item>
</style> </style>