From dca211813234c09feef59ca2c7b657e18bba999f Mon Sep 17 00:00:00 2001 From: DHD2280 Date: Thu, 1 Aug 2024 13:00:58 +0200 Subject: [PATCH 1/4] ToastFrame: If item size is odd, last item will be centered --- .../drdisagree/iconify/ui/fragments/ToastFrame.kt | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/app/src/main/java/com/drdisagree/iconify/ui/fragments/ToastFrame.kt b/app/src/main/java/com/drdisagree/iconify/ui/fragments/ToastFrame.kt index aad818c6b..df48b9637 100644 --- a/app/src/main/java/com/drdisagree/iconify/ui/fragments/ToastFrame.kt +++ b/app/src/main/java/com/drdisagree/iconify/ui/fragments/ToastFrame.kt @@ -9,6 +9,7 @@ import android.view.View import android.view.ViewGroup import android.widget.Toast import androidx.recyclerview.widget.GridLayoutManager +import androidx.recyclerview.widget.GridLayoutManager.SpanSizeLookup import com.drdisagree.iconify.Iconify.Companion.appContext import com.drdisagree.iconify.Iconify.Companion.appContextLocale import com.drdisagree.iconify.R @@ -54,7 +55,19 @@ class ToastFrame : BaseFragment() { loadingDialog = LoadingDialog(requireContext()) // Toast Frame style - binding.toastStylesContainer.setLayoutManager(GridLayoutManager(requireContext(), 2)) + val gridLayout = GridLayoutManager(requireContext(), 2) + gridLayout.spanSizeLookup = object : SpanSizeLookup() { + override fun getSpanSize(position: Int): Int { + val lastIndex = binding.toastStylesContainer.adapter?.itemCount?.minus(1) ?: 0 + + return if (position == lastIndex && lastIndex % gridLayout.spanCount == 0) { + 2 + } else { + 1 + } + } + } + binding.toastStylesContainer.setLayoutManager(gridLayout) binding.toastStylesContainer.setAdapter(initToastFrameItems()) binding.toastStylesContainer.setHasFixedSize(true) From c757f4e4bcfac7fb77451186afe85da76c808ed0 Mon Sep 17 00:00:00 2001 From: DHD2280 Date: Thu, 1 Aug 2024 13:15:13 +0200 Subject: [PATCH 2/4] Use String format for Style name --- .../iconify/ui/adapters/ToastAdapter.kt | 2 +- .../iconify/ui/fragments/ToastFrame.kt | 24 ++++++++--------- .../ui/fragments/XposedBackgroundChip.kt | 27 ++++++++++--------- .../iconify/ui/models/ToastModel.kt | 2 +- app/src/main/res/values-af-rZA/strings.xml | 26 +----------------- app/src/main/res/values-ar-rSA/strings.xml | 26 +----------------- app/src/main/res/values-ca-rES/strings.xml | 26 +----------------- app/src/main/res/values-cs-rCZ/strings.xml | 26 +----------------- app/src/main/res/values-da-rDK/strings.xml | 26 +----------------- app/src/main/res/values-de-rDE/strings.xml | 26 +----------------- app/src/main/res/values-el-rGR/strings.xml | 26 +----------------- app/src/main/res/values-es-rES/strings.xml | 26 +----------------- app/src/main/res/values-fa-rIR/strings.xml | 26 +----------------- app/src/main/res/values-fi-rFI/strings.xml | 26 +----------------- app/src/main/res/values-fr-rFR/strings.xml | 26 +----------------- app/src/main/res/values-hu-rHU/strings.xml | 26 +----------------- app/src/main/res/values-in-rID/strings.xml | 26 +----------------- app/src/main/res/values-it-rIT/strings.xml | 26 +----------------- app/src/main/res/values-iw-rIL/strings.xml | 26 +----------------- app/src/main/res/values-ja-rJP/strings.xml | 26 +----------------- app/src/main/res/values-ko-rKR/strings.xml | 26 +----------------- app/src/main/res/values-nl-rNL/strings.xml | 26 +----------------- app/src/main/res/values-no-rNO/strings.xml | 26 +----------------- app/src/main/res/values-pl-rPL/strings.xml | 26 +----------------- app/src/main/res/values-pt-rBR/strings.xml | 26 +----------------- app/src/main/res/values-pt-rPT/strings.xml | 26 +----------------- app/src/main/res/values-ro-rRO/strings.xml | 26 +----------------- app/src/main/res/values-ru-rRU/strings.xml | 26 +----------------- app/src/main/res/values-sr-rSP/strings.xml | 26 +----------------- app/src/main/res/values-sv-rSE/strings.xml | 26 +----------------- app/src/main/res/values-tr-rTR/strings.xml | 26 +----------------- app/src/main/res/values-uk-rUA/strings.xml | 26 +----------------- app/src/main/res/values-vi-rVN/strings.xml | 26 +----------------- app/src/main/res/values-zh-rCN/strings.xml | 26 +----------------- app/src/main/res/values-zh-rTW/strings.xml | 26 +----------------- app/src/main/res/values/strings.xml | 26 +----------------- 36 files changed, 60 insertions(+), 827 deletions(-) diff --git a/app/src/main/java/com/drdisagree/iconify/ui/adapters/ToastAdapter.kt b/app/src/main/java/com/drdisagree/iconify/ui/adapters/ToastAdapter.kt index 7ecd32940..4fb815bba 100644 --- a/app/src/main/java/com/drdisagree/iconify/ui/adapters/ToastAdapter.kt +++ b/app/src/main/java/com/drdisagree/iconify/ui/adapters/ToastAdapter.kt @@ -34,7 +34,7 @@ class ToastAdapter ( override fun onBindViewHolder(holder: ViewHolder, position: Int) { val model = itemList[holder.bindingAdapterPosition] - holder.binding.styleName.text = appContextLocale.resources.getString(model.title) + holder.binding.styleName.text = model.title holder.binding.toastContainer.background = ContextCompat.getDrawable(appContext, model.style) if (model.selected) { holder.binding.styleName.setTextColor( diff --git a/app/src/main/java/com/drdisagree/iconify/ui/fragments/ToastFrame.kt b/app/src/main/java/com/drdisagree/iconify/ui/fragments/ToastFrame.kt index df48b9637..2206ea75d 100644 --- a/app/src/main/java/com/drdisagree/iconify/ui/fragments/ToastFrame.kt +++ b/app/src/main/java/com/drdisagree/iconify/ui/fragments/ToastFrame.kt @@ -77,18 +77,18 @@ class ToastFrame : BaseFragment() { private fun initToastFrameItems(): ToastAdapter { val selectedStyle = getInt(SELECTED_TOAST_FRAME, -1) val toastFrameStyle = ArrayList().apply { - add(ToastModel(R.drawable.toast_frame_style_1, R.string.style_0)) - add(ToastModel(R.drawable.toast_frame_style_1, R.string.style_1)) - add(ToastModel(R.drawable.toast_frame_style_2, R.string.style_2)) - add(ToastModel(R.drawable.toast_frame_style_3, R.string.style_3)) - add(ToastModel(R.drawable.toast_frame_style_4, R.string.style_4)) - add(ToastModel(R.drawable.toast_frame_style_5, R.string.style_5)) - add(ToastModel(R.drawable.toast_frame_style_6, R.string.style_6)) - add(ToastModel(R.drawable.toast_frame_style_7, R.string.style_7)) - add(ToastModel(R.drawable.toast_frame_style_8, R.string.style_8)) - add(ToastModel(R.drawable.toast_frame_style_9, R.string.style_9)) - add(ToastModel(R.drawable.toast_frame_style_10, R.string.style_10)) - add(ToastModel(R.drawable.toast_frame_style_11, R.string.style_11)) + add(ToastModel(R.drawable.toast_frame_style_1, appContextLocale.resources.getString(R.string.style_0))) + add(ToastModel(R.drawable.toast_frame_style_1, String.format(appContextLocale.resources.getString(R.string.style), 1))) + add(ToastModel(R.drawable.toast_frame_style_2, String.format(appContextLocale.resources.getString(R.string.style), 2))) + add(ToastModel(R.drawable.toast_frame_style_3, String.format(appContextLocale.resources.getString(R.string.style), 3))) + add(ToastModel(R.drawable.toast_frame_style_4, String.format(appContextLocale.resources.getString(R.string.style), 4))) + add(ToastModel(R.drawable.toast_frame_style_5, String.format(appContextLocale.resources.getString(R.string.style), 5))) + add(ToastModel(R.drawable.toast_frame_style_6, String.format(appContextLocale.resources.getString(R.string.style), 6))) + add(ToastModel(R.drawable.toast_frame_style_7, String.format(appContextLocale.resources.getString(R.string.style), 7))) + add(ToastModel(R.drawable.toast_frame_style_8, String.format(appContextLocale.resources.getString(R.string.style), 8))) + add(ToastModel(R.drawable.toast_frame_style_9, String.format(appContextLocale.resources.getString(R.string.style), 9))) + add(ToastModel(R.drawable.toast_frame_style_10, String.format(appContextLocale.resources.getString(R.string.style), 10))) + add(ToastModel(R.drawable.toast_frame_style_11, String.format(appContextLocale.resources.getString(R.string.style), 11))) } return ToastAdapter( diff --git a/app/src/main/java/com/drdisagree/iconify/ui/fragments/XposedBackgroundChip.kt b/app/src/main/java/com/drdisagree/iconify/ui/fragments/XposedBackgroundChip.kt index 83ffa918e..f24dc02c7 100644 --- a/app/src/main/java/com/drdisagree/iconify/ui/fragments/XposedBackgroundChip.kt +++ b/app/src/main/java/com/drdisagree/iconify/ui/fragments/XposedBackgroundChip.kt @@ -14,6 +14,7 @@ import android.widget.LinearLayout import android.widget.TextView import androidx.core.content.ContextCompat import com.drdisagree.iconify.Iconify.Companion.appContext +import com.drdisagree.iconify.Iconify.Companion.appContextLocale import com.drdisagree.iconify.R import com.drdisagree.iconify.common.Const.SWITCH_ANIMATION_DELAY import com.drdisagree.iconify.common.Preferences.CHIP_QSSTATUSICONS_STYLE @@ -127,13 +128,13 @@ class XposedBackgroundChip : BaseFragment() { private fun initStatusBarChipStyles(): ArrayList> { val statusBarChipStyle = ArrayList>().apply { - add(arrayOf(R.drawable.chip_status_bar_1, R.string.style_1)) - add(arrayOf(R.drawable.chip_status_bar_2, R.string.style_2)) - add(arrayOf(R.drawable.chip_status_bar_3, R.string.style_3)) - add(arrayOf(R.drawable.chip_status_bar_4, R.string.style_4)) - add(arrayOf(R.drawable.chip_status_bar_5, R.string.style_5)) - add(arrayOf(R.drawable.chip_status_bar_6, R.string.style_6)) - add(arrayOf(R.drawable.chip_status_bar_7, R.string.style_7)) + add(arrayOf(R.drawable.chip_status_bar_1, String.format(appContextLocale.resources.getString(R.string.style), 1))) + add(arrayOf(R.drawable.chip_status_bar_2, String.format(appContextLocale.resources.getString(R.string.style), 2))) + add(arrayOf(R.drawable.chip_status_bar_3, String.format(appContextLocale.resources.getString(R.string.style), 3))) + add(arrayOf(R.drawable.chip_status_bar_4, String.format(appContextLocale.resources.getString(R.string.style), 4))) + add(arrayOf(R.drawable.chip_status_bar_5, String.format(appContextLocale.resources.getString(R.string.style), 5))) + add(arrayOf(R.drawable.chip_status_bar_6, String.format(appContextLocale.resources.getString(R.string.style), 6))) + add(arrayOf(R.drawable.chip_status_bar_7, String.format(appContextLocale.resources.getString(R.string.style), 7))) } return statusBarChipStyle @@ -141,12 +142,12 @@ class XposedBackgroundChip : BaseFragment() { private fun initStatusIconsChipStyles(): ArrayList> { val statusIconsChipStyle = ArrayList>().apply { - add(arrayOf(R.drawable.chip_status_icons_1, R.string.style_1)) - add(arrayOf(R.drawable.chip_status_icons_2, R.string.style_2)) - add(arrayOf(R.drawable.chip_status_icons_3, R.string.style_3)) - add(arrayOf(R.drawable.chip_status_icons_4, R.string.style_4)) - add(arrayOf(R.drawable.chip_status_icons_5, R.string.style_5)) - add(arrayOf(R.drawable.chip_status_icons_6, R.string.style_6)) + add(arrayOf(R.drawable.chip_status_icons_1, String.format(appContextLocale.resources.getString(R.string.style), 1))) + add(arrayOf(R.drawable.chip_status_icons_2, String.format(appContextLocale.resources.getString(R.string.style), 2))) + add(arrayOf(R.drawable.chip_status_icons_3, String.format(appContextLocale.resources.getString(R.string.style), 3))) + add(arrayOf(R.drawable.chip_status_icons_4, String.format(appContextLocale.resources.getString(R.string.style), 4))) + add(arrayOf(R.drawable.chip_status_icons_5, String.format(appContextLocale.resources.getString(R.string.style), 5))) + add(arrayOf(R.drawable.chip_status_icons_6, String.format(appContextLocale.resources.getString(R.string.style), 6))) } return statusIconsChipStyle diff --git a/app/src/main/java/com/drdisagree/iconify/ui/models/ToastModel.kt b/app/src/main/java/com/drdisagree/iconify/ui/models/ToastModel.kt index 71a493925..45b1669a0 100644 --- a/app/src/main/java/com/drdisagree/iconify/ui/models/ToastModel.kt +++ b/app/src/main/java/com/drdisagree/iconify/ui/models/ToastModel.kt @@ -2,6 +2,6 @@ package com.drdisagree.iconify.ui.models class ToastModel ( var style: Int, - var title: Int, + var title: String, var selected: Boolean = false ) diff --git a/app/src/main/res/values-af-rZA/strings.xml b/app/src/main/res/values-af-rZA/strings.xml index 80bcc3fbc..c6f35a7c3 100644 --- a/app/src/main/res/values-af-rZA/strings.xml +++ b/app/src/main/res/values-af-rZA/strings.xml @@ -761,31 +761,7 @@ Saved settings successfully None - Style 1 - Style 2 - Style 3 - Style 4 - Style 5 - Style 6 - Style 7 - Style 8 - Style 9 - Style 10 - Style 11 - Style 12 - Style 13 - Style 14 - Style 15 - Style 16 - Style 17 - Style 18 - Style 19 - Style 20 - Style 21 - Style 22 - Style 23 - Style 24 - Style 25 + Style %d Continue Restart diff --git a/app/src/main/res/values-ar-rSA/strings.xml b/app/src/main/res/values-ar-rSA/strings.xml index a8cbc5551..37e13e181 100644 --- a/app/src/main/res/values-ar-rSA/strings.xml +++ b/app/src/main/res/values-ar-rSA/strings.xml @@ -761,31 +761,7 @@ تم حفظ الإعدادات بنجاح لا شيء - النمط 1 - النمط 2 - النمط 3 - النمط 4 - النمط 5 - النمط 6 - النمط 7 - النمط 8 - النمط 9 - النمط 10 - النمط 11 - النمط 12 - النمط 13 - النمط 14 - النمط 15 - النمط 16 - النمط 17 - النمط 18 - النمط 19 - النمط 20 - النمط 21 - النمط 22 - النمط 23 - النمط 24 - النمط 25 + النمط %d استمر إعداة تشغيل diff --git a/app/src/main/res/values-ca-rES/strings.xml b/app/src/main/res/values-ca-rES/strings.xml index 80bcc3fbc..c6f35a7c3 100644 --- a/app/src/main/res/values-ca-rES/strings.xml +++ b/app/src/main/res/values-ca-rES/strings.xml @@ -761,31 +761,7 @@ Saved settings successfully None - Style 1 - Style 2 - Style 3 - Style 4 - Style 5 - Style 6 - Style 7 - Style 8 - Style 9 - Style 10 - Style 11 - Style 12 - Style 13 - Style 14 - Style 15 - Style 16 - Style 17 - Style 18 - Style 19 - Style 20 - Style 21 - Style 22 - Style 23 - Style 24 - Style 25 + Style %d Continue Restart diff --git a/app/src/main/res/values-cs-rCZ/strings.xml b/app/src/main/res/values-cs-rCZ/strings.xml index a52bf2aed..397e011c6 100644 --- a/app/src/main/res/values-cs-rCZ/strings.xml +++ b/app/src/main/res/values-cs-rCZ/strings.xml @@ -761,31 +761,7 @@ Saved settings successfully None - Style 1 - Style 2 - Style 3 - Style 4 - Style 5 - Style 6 - Style 7 - Style 8 - Style 9 - Style 10 - Style 11 - Style 12 - Style 13 - Style 14 - Style 15 - Style 16 - Style 17 - Style 18 - Style 19 - Style 20 - Style 21 - Style 22 - Style 23 - Style 24 - Style 25 + Style %d Continue Restart diff --git a/app/src/main/res/values-da-rDK/strings.xml b/app/src/main/res/values-da-rDK/strings.xml index 80bcc3fbc..c6f35a7c3 100644 --- a/app/src/main/res/values-da-rDK/strings.xml +++ b/app/src/main/res/values-da-rDK/strings.xml @@ -761,31 +761,7 @@ Saved settings successfully None - Style 1 - Style 2 - Style 3 - Style 4 - Style 5 - Style 6 - Style 7 - Style 8 - Style 9 - Style 10 - Style 11 - Style 12 - Style 13 - Style 14 - Style 15 - Style 16 - Style 17 - Style 18 - Style 19 - Style 20 - Style 21 - Style 22 - Style 23 - Style 24 - Style 25 + Style %d Continue Restart diff --git a/app/src/main/res/values-de-rDE/strings.xml b/app/src/main/res/values-de-rDE/strings.xml index dfed9b7c3..bdbfc9b0f 100644 --- a/app/src/main/res/values-de-rDE/strings.xml +++ b/app/src/main/res/values-de-rDE/strings.xml @@ -762,31 +762,7 @@ transparent machen Einstellungen Speichern erfolgreich Nichts - Stil 1 - Stil 2 - Stil 3 - Stil 4 - Stil 5 - Stil 6 - Stil 7 - Stil 8 - Stil 9 - Stil 10 - Stil 11 - Stil 12 - Stil 13 - Stil 14 - Stil 15 - Stil 16 - Stil 17 - Stil 18 - Stil 19 - Stil 20 - Stil 21 - Stil 22 - Stil 23 - Stil 24 - Stil 25 + Stil %d Weiter Neustart diff --git a/app/src/main/res/values-el-rGR/strings.xml b/app/src/main/res/values-el-rGR/strings.xml index 01b7cbae0..896b087ca 100644 --- a/app/src/main/res/values-el-rGR/strings.xml +++ b/app/src/main/res/values-el-rGR/strings.xml @@ -761,31 +761,7 @@ Saved settings successfully None - Style 1 - Style 2 - Style 3 - Style 4 - Style 5 - Style 6 - Style 7 - Style 8 - Style 9 - Style 10 - Style 11 - Style 12 - Style 13 - Style 14 - Style 15 - Style 16 - Style 17 - Style 18 - Style 19 - Style 20 - Style 21 - Style 22 - Style 23 - Style 24 - Style 25 + Style %d Continue Restart diff --git a/app/src/main/res/values-es-rES/strings.xml b/app/src/main/res/values-es-rES/strings.xml index 91ed07c5e..1e4bc4252 100644 --- a/app/src/main/res/values-es-rES/strings.xml +++ b/app/src/main/res/values-es-rES/strings.xml @@ -761,31 +761,7 @@ Configuración guardada con éxito Ninguno - Estilo 1 - Estilo 2 - Estilo 3 - Estilo 4 - Estilo 5 - Estilo 6 - Estilo 7 - Estilo 8 - Estilo 9 - Estilo 10 - Estilo 11 - Estilo 12 - Estilo 13 - Estilo 14 - Estilo 15 - Estilo 16 - Estilo 17 - Estilo 18 - Estilo 19 - Estilo 20 - Estilo 21 - Estilo 22 - Estilo 23 - Estilo 24 - Estilo 25 + Estilo %d CONTINUAR Reiniciar diff --git a/app/src/main/res/values-fa-rIR/strings.xml b/app/src/main/res/values-fa-rIR/strings.xml index 7f81cd56a..c06095108 100644 --- a/app/src/main/res/values-fa-rIR/strings.xml +++ b/app/src/main/res/values-fa-rIR/strings.xml @@ -761,31 +761,7 @@ پشتیبان گیری از تنظیمات با موفقیت انجام شد None - Style 1 - Style 2 - Style 3 - Style 4 - Style 5 - Style 6 - Style 7 - Style 8 - Style 9 - Style 10 - Style 11 - Style 12 - Style 13 - Style 14 - Style 15 - Style 16 - Style 17 - Style 18 - Style 19 - Style 20 - Style 21 - Style 22 - Style 23 - Style 24 - Style 25 + Style %d ادامه دادن ریستارت diff --git a/app/src/main/res/values-fi-rFI/strings.xml b/app/src/main/res/values-fi-rFI/strings.xml index 80bcc3fbc..c6f35a7c3 100644 --- a/app/src/main/res/values-fi-rFI/strings.xml +++ b/app/src/main/res/values-fi-rFI/strings.xml @@ -761,31 +761,7 @@ Saved settings successfully None - Style 1 - Style 2 - Style 3 - Style 4 - Style 5 - Style 6 - Style 7 - Style 8 - Style 9 - Style 10 - Style 11 - Style 12 - Style 13 - Style 14 - Style 15 - Style 16 - Style 17 - Style 18 - Style 19 - Style 20 - Style 21 - Style 22 - Style 23 - Style 24 - Style 25 + Style %d Continue Restart diff --git a/app/src/main/res/values-fr-rFR/strings.xml b/app/src/main/res/values-fr-rFR/strings.xml index 2c1bcf9b7..36cd43219 100644 --- a/app/src/main/res/values-fr-rFR/strings.xml +++ b/app/src/main/res/values-fr-rFR/strings.xml @@ -761,31 +761,7 @@ Saved settings successfully None - Style 1 - Style 2 - Style 3 - Style 4 - Style 5 - Style 6 - Style 7 - Style 8 - Style 9 - Style 10 - Style 11 - Style 12 - Style 13 - Style 14 - Style 15 - Style 16 - Style 17 - Style 18 - Style 19 - Style 20 - Style 21 - Style 22 - Style 23 - Style 24 - Style 25 + Style %d CONTINUER Redémarrer diff --git a/app/src/main/res/values-hu-rHU/strings.xml b/app/src/main/res/values-hu-rHU/strings.xml index 3eb2852a5..fa9014f5c 100644 --- a/app/src/main/res/values-hu-rHU/strings.xml +++ b/app/src/main/res/values-hu-rHU/strings.xml @@ -761,31 +761,7 @@ A beállítások mentése sikeres volt Nincs - 1.stílus - 2.stílus - 3.stílus - 4.stílus - 5.stílus - 6.stílus - 7.stílus - 8.stílus - 9.stílus - 10.stílus - 11.stílus - 12.stílus - 13.stílus - 14.stílus - 15.stílus - 16.stílus - 17.stílus - 18.stílus - 19.stílus - 20.stílus - 21.stílus - 22.stílus - 23.stílus - 24.stílus - 25.stílus + %d.stílus Folytatás Újraindítás diff --git a/app/src/main/res/values-in-rID/strings.xml b/app/src/main/res/values-in-rID/strings.xml index 325b6fc54..94e8b04a9 100644 --- a/app/src/main/res/values-in-rID/strings.xml +++ b/app/src/main/res/values-in-rID/strings.xml @@ -761,31 +761,7 @@ Pengaturan berhasil disimpan None - Style 1 - Style 2 - Style 3 - Style 4 - Style 5 - Style 6 - Style 7 - Style 8 - Style 9 - Style 10 - Style 11 - Style 12 - Style 13 - Style 14 - Style 15 - Style 16 - Style 17 - Style 18 - Style 19 - Style 20 - Style 21 - Style 22 - Style 23 - Style 24 - Style 25 + Style %d LANJUTKAN Restart diff --git a/app/src/main/res/values-it-rIT/strings.xml b/app/src/main/res/values-it-rIT/strings.xml index d73b84ee6..8140fa36c 100644 --- a/app/src/main/res/values-it-rIT/strings.xml +++ b/app/src/main/res/values-it-rIT/strings.xml @@ -761,31 +761,7 @@ Impostazioni salvate con successo Nessuno - Stile 1 - Stile 2 - Stile 3 - Stile 4 - Stile 5 - Stile 6 - Stile 7 - Stile 8 - Stile 9 - Stile 10 - Stile 11 - Stile 12 - Stile 13 - Stile 14 - Stile 15 - Stile 16 - Stile 17 - Stile 18 - Stile 19 - Stile 20 - Stile 21 - Stile 22 - Stile 23 - Stile 24 - Stile 25 + Stile %d Continua Riavvia diff --git a/app/src/main/res/values-iw-rIL/strings.xml b/app/src/main/res/values-iw-rIL/strings.xml index fa1c8701f..d7e1391a5 100644 --- a/app/src/main/res/values-iw-rIL/strings.xml +++ b/app/src/main/res/values-iw-rIL/strings.xml @@ -711,31 +711,7 @@ Saved settings successfully None - Style 1 - Style 2 - Style 3 - Style 4 - Style 5 - Style 6 - Style 7 - Style 8 - Style 9 - Style 10 - Style 11 - Style 12 - Style 13 - Style 14 - Style 15 - Style 16 - Style 17 - Style 18 - Style 19 - Style 20 - Style 21 - Style 22 - Style 23 - Style 24 - Style 25 + Style %d Continue Restart diff --git a/app/src/main/res/values-ja-rJP/strings.xml b/app/src/main/res/values-ja-rJP/strings.xml index a539ea81f..4cc6cb49c 100644 --- a/app/src/main/res/values-ja-rJP/strings.xml +++ b/app/src/main/res/values-ja-rJP/strings.xml @@ -761,31 +761,7 @@ 設定の保存が完了しました なし - スタイル 1 - スタイル 2 - スタイル 3 - スタイル 4 - スタイル 5 - スタイル 6 - スタイル 7 - スタイル 8 - スタイル 9 - スタイル 10 - スタイル 11 - スタイル 12 - スタイル 13 - スタイル 14 - スタイル 15 - スタイル 16 - スタイル 17 - スタイル 18 - スタイル 19 - スタイル 20 - スタイル 21 - スタイル 22 - スタイル 23 - スタイル 24 - スタイル 25 + スタイル %d 続ける 再起動 diff --git a/app/src/main/res/values-ko-rKR/strings.xml b/app/src/main/res/values-ko-rKR/strings.xml index 4d21ff0cc..7ec205c1b 100644 --- a/app/src/main/res/values-ko-rKR/strings.xml +++ b/app/src/main/res/values-ko-rKR/strings.xml @@ -761,31 +761,7 @@ Saved settings successfully None - Style 1 - Style 2 - Style 3 - Style 4 - Style 5 - Style 6 - Style 7 - Style 8 - Style 9 - Style 10 - Style 11 - Style 12 - Style 13 - Style 14 - Style 15 - Style 16 - Style 17 - Style 18 - Style 19 - Style 20 - Style 21 - Style 22 - Style 23 - Style 24 - Style 25 + Style %d Continue Restart diff --git a/app/src/main/res/values-nl-rNL/strings.xml b/app/src/main/res/values-nl-rNL/strings.xml index 80bcc3fbc..c6f35a7c3 100644 --- a/app/src/main/res/values-nl-rNL/strings.xml +++ b/app/src/main/res/values-nl-rNL/strings.xml @@ -761,31 +761,7 @@ Saved settings successfully None - Style 1 - Style 2 - Style 3 - Style 4 - Style 5 - Style 6 - Style 7 - Style 8 - Style 9 - Style 10 - Style 11 - Style 12 - Style 13 - Style 14 - Style 15 - Style 16 - Style 17 - Style 18 - Style 19 - Style 20 - Style 21 - Style 22 - Style 23 - Style 24 - Style 25 + Style %d Continue Restart diff --git a/app/src/main/res/values-no-rNO/strings.xml b/app/src/main/res/values-no-rNO/strings.xml index 80bcc3fbc..c6f35a7c3 100644 --- a/app/src/main/res/values-no-rNO/strings.xml +++ b/app/src/main/res/values-no-rNO/strings.xml @@ -761,31 +761,7 @@ Saved settings successfully None - Style 1 - Style 2 - Style 3 - Style 4 - Style 5 - Style 6 - Style 7 - Style 8 - Style 9 - Style 10 - Style 11 - Style 12 - Style 13 - Style 14 - Style 15 - Style 16 - Style 17 - Style 18 - Style 19 - Style 20 - Style 21 - Style 22 - Style 23 - Style 24 - Style 25 + Style %d Continue Restart diff --git a/app/src/main/res/values-pl-rPL/strings.xml b/app/src/main/res/values-pl-rPL/strings.xml index b67847330..dfe3fa716 100644 --- a/app/src/main/res/values-pl-rPL/strings.xml +++ b/app/src/main/res/values-pl-rPL/strings.xml @@ -761,31 +761,7 @@ Ustawienia wyeksportowane pomyślnie Brak - Styl 1 - Styl 2 - Styl 3 - Styl 4 - Styl 5 - Styl 6 - Styl 7 - Styl 8 - Styl 9 - Styl 10 - Styl 11 - Styl 12 - Styl 13 - Styl 14 - Styl 15 - Styl 16 - Styl 17 - Styl 18 - Styl 19 - Styl 20 - Styl 21 - Styl 22 - Styl 23 - Styl 24 - Styl 25 + Styl %d Kontynuuj Zrestartuj diff --git a/app/src/main/res/values-pt-rBR/strings.xml b/app/src/main/res/values-pt-rBR/strings.xml index ff6644563..38c0a92c4 100644 --- a/app/src/main/res/values-pt-rBR/strings.xml +++ b/app/src/main/res/values-pt-rBR/strings.xml @@ -761,31 +761,7 @@ Configurações salvas com sucesso Nenhum - Estilo 1 - Estilo 2 - Estilo 3 - Estilo 4 - Estilo 5 - Estilo 6 - Estilo 7 - Estilo 8 - Estilo 9 - Estilo 10 - Estilo 11 - Estilo 12 - Estilo 13 - Estilo 14 - Estilo 15 - Estilo 16 - Estilo 17 - Estilo 18 - Estilo 19 - Estilo 20 - Estilo 21 - Estilo 22 - Estilo 23 - Estilo 24 - Estilo 25 + Estilo %d Continuar Reiniciar diff --git a/app/src/main/res/values-pt-rPT/strings.xml b/app/src/main/res/values-pt-rPT/strings.xml index 9f4acfd04..582e7b126 100644 --- a/app/src/main/res/values-pt-rPT/strings.xml +++ b/app/src/main/res/values-pt-rPT/strings.xml @@ -761,31 +761,7 @@ Definições guardadas com sucesso Nenhum - Estilo 1 - Estilo 2 - Estilo 3 - Estilo 4 - Estilo 5 - Estilo 6 - Estilo 7 - Estilo 8 - Estilo 9 - Estilo 10 - Style 11 - Style 12 - Style 13 - Style 14 - Style 15 - Style 16 - Style 17 - Style 18 - Style 19 - Style 20 - Style 21 - Style 22 - Style 23 - Style 24 - Style 25 + Estilo %d CONTINUAR Reiniciar diff --git a/app/src/main/res/values-ro-rRO/strings.xml b/app/src/main/res/values-ro-rRO/strings.xml index 80bcc3fbc..c6f35a7c3 100644 --- a/app/src/main/res/values-ro-rRO/strings.xml +++ b/app/src/main/res/values-ro-rRO/strings.xml @@ -761,31 +761,7 @@ Saved settings successfully None - Style 1 - Style 2 - Style 3 - Style 4 - Style 5 - Style 6 - Style 7 - Style 8 - Style 9 - Style 10 - Style 11 - Style 12 - Style 13 - Style 14 - Style 15 - Style 16 - Style 17 - Style 18 - Style 19 - Style 20 - Style 21 - Style 22 - Style 23 - Style 24 - Style 25 + Style %d Continue Restart diff --git a/app/src/main/res/values-ru-rRU/strings.xml b/app/src/main/res/values-ru-rRU/strings.xml index 2aecbabec..fff11a9d0 100644 --- a/app/src/main/res/values-ru-rRU/strings.xml +++ b/app/src/main/res/values-ru-rRU/strings.xml @@ -761,31 +761,7 @@ Настройки успешно сохранены Нет - Стиль 1 - Стиль 2 - Стиль 3 - Стиль 4 - Стиль 5 - Стиль 6 - Стиль 7 - Стиль 8 - Стиль 8 - Стиль 10 - Стиль 11 - Стиль 12 - Стиль 13 - Стиль 14 - Стиль 15 - Стиль 16 - Стиль 17 - Стиль 18 - Стиль 19 - Стиль 20 - Стиль 21 - Стиль 22 - Стиль 23 - Стиль 24 - Стиль 25 + Стиль %d ПРОДОЛЖИТЬ Перезапуск diff --git a/app/src/main/res/values-sr-rSP/strings.xml b/app/src/main/res/values-sr-rSP/strings.xml index 80bcc3fbc..c6f35a7c3 100644 --- a/app/src/main/res/values-sr-rSP/strings.xml +++ b/app/src/main/res/values-sr-rSP/strings.xml @@ -761,31 +761,7 @@ Saved settings successfully None - Style 1 - Style 2 - Style 3 - Style 4 - Style 5 - Style 6 - Style 7 - Style 8 - Style 9 - Style 10 - Style 11 - Style 12 - Style 13 - Style 14 - Style 15 - Style 16 - Style 17 - Style 18 - Style 19 - Style 20 - Style 21 - Style 22 - Style 23 - Style 24 - Style 25 + Style %d Continue Restart diff --git a/app/src/main/res/values-sv-rSE/strings.xml b/app/src/main/res/values-sv-rSE/strings.xml index a14c4d4dd..758e6ce54 100644 --- a/app/src/main/res/values-sv-rSE/strings.xml +++ b/app/src/main/res/values-sv-rSE/strings.xml @@ -761,31 +761,7 @@ Saved settings successfully None - Style 1 - Style 2 - Style 3 - Style 4 - Style 5 - Style 6 - Style 7 - Style 8 - Style 9 - Style 10 - Style 11 - Style 12 - Style 13 - Style 14 - Style 15 - Style 16 - Style 17 - Style 18 - Style 19 - Style 20 - Style 21 - Style 22 - Style 23 - Style 24 - Style 25 + Style %d Continue Restart diff --git a/app/src/main/res/values-tr-rTR/strings.xml b/app/src/main/res/values-tr-rTR/strings.xml index 89def1833..6e4abef72 100644 --- a/app/src/main/res/values-tr-rTR/strings.xml +++ b/app/src/main/res/values-tr-rTR/strings.xml @@ -761,31 +761,7 @@ Ayarlar başarıyla kaydedildi Yok - Stil 1 - Stil 2 - Stil 3 - Stil 4 - Stil 5 - Stil 6 - Stil 7 - Stil 8 - Stil 9 - Stil 10 - Stil 11 - Stil 12 - Stil 13 - Stil 14 - Stil 15 - Stil 16 - Stil 17 - Stil 18 - Stil 19 - Stil 20 - Stil 21 - Stil 22 - Stil 23 - Stil 24 - Stil 25 + Stil %d Devam et Yeniden Başlat diff --git a/app/src/main/res/values-uk-rUA/strings.xml b/app/src/main/res/values-uk-rUA/strings.xml index 80bcc3fbc..c6f35a7c3 100644 --- a/app/src/main/res/values-uk-rUA/strings.xml +++ b/app/src/main/res/values-uk-rUA/strings.xml @@ -761,31 +761,7 @@ Saved settings successfully None - Style 1 - Style 2 - Style 3 - Style 4 - Style 5 - Style 6 - Style 7 - Style 8 - Style 9 - Style 10 - Style 11 - Style 12 - Style 13 - Style 14 - Style 15 - Style 16 - Style 17 - Style 18 - Style 19 - Style 20 - Style 21 - Style 22 - Style 23 - Style 24 - Style 25 + Style %d Continue Restart diff --git a/app/src/main/res/values-vi-rVN/strings.xml b/app/src/main/res/values-vi-rVN/strings.xml index ecb11b338..e039a2151 100644 --- a/app/src/main/res/values-vi-rVN/strings.xml +++ b/app/src/main/res/values-vi-rVN/strings.xml @@ -761,31 +761,7 @@ Đã lưu cài đặt thành công Không có - Kiểu 1 - kiểu 2 - kiểu 3 - Kiểu 4 - Kiểu 5 - Kiểu 6 - Kiểu 7 - Kiểu 8 - Kiểu 9 - Kiểu 10 - Style 11 - Style 12 - Style 13 - Style 14 - Style 15 - Style 16 - Style 17 - Style 18 - Style 19 - Style 20 - Style 21 - Style 22 - Style 23 - Style 24 - Style 25 + kiểu %d TIẾP TỤC Khởi động lại diff --git a/app/src/main/res/values-zh-rCN/strings.xml b/app/src/main/res/values-zh-rCN/strings.xml index f5d9aa4b9..ba96b9e1a 100644 --- a/app/src/main/res/values-zh-rCN/strings.xml +++ b/app/src/main/res/values-zh-rCN/strings.xml @@ -761,31 +761,7 @@ 成功保存了设置 无 - 样式 1 - 样式 2 - 样式 3 - 样式 4 - 样式 5 - 样式 6 - 样式 7 - 样式 8 - 样式 9 - 样式 10 - 样式 11 - 样式 12 - 样式 13 - 样式 14 - 样式 15 - 样式 16 - 样式 17 - 样式 18 - 样式 19 - 样式 20 - 样式 21 - 样式 22 - 样式 23 - 样式 24 - 样式 25 + 样式 %d 继续 重启 diff --git a/app/src/main/res/values-zh-rTW/strings.xml b/app/src/main/res/values-zh-rTW/strings.xml index 303f1d254..15af9182b 100644 --- a/app/src/main/res/values-zh-rTW/strings.xml +++ b/app/src/main/res/values-zh-rTW/strings.xml @@ -761,31 +761,7 @@ 成功存儲了設定 無 - 樣式 1 - 樣式 2 - 樣式 3 - 樣式 4 - 樣式 5 - 樣式 6 - 樣式 7 - 樣式 8 - 樣式 9 - 樣式 10 - 樣式 11 - 樣式 12 - 樣式 13 - 樣式 14 - 樣式 15 - 樣式 16 - 樣式 17 - 樣式 18 - 樣式 19 - 樣式 20 - 樣式 21 - 樣式 22 - 樣式 23 - 樣式 24 - 樣式 25 + 樣式 %d 繼續 重新啓動 diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 1b4375130..c43362478 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -817,31 +817,7 @@ None - Style 1 - Style 2 - Style 3 - Style 4 - Style 5 - Style 6 - Style 7 - Style 8 - Style 9 - Style 10 - Style 11 - Style 12 - Style 13 - Style 14 - Style 15 - Style 16 - Style 17 - Style 18 - Style 19 - Style 20 - Style 21 - Style 22 - Style 23 - Style 24 - Style 25 + Style %d Continue From d0b43257146e5a32bf0c6e3fe530aa12b8af82dd Mon Sep 17 00:00:00 2001 From: DHD2280 Date: Thu, 1 Aug 2024 20:40:41 +0200 Subject: [PATCH 3/4] Added Toast Style 12 --- .../TSTFRM12/res/drawable/toast_frame.xml | 34 +++++++++++++++++++ .../res/drawable/toast_frame_material.xml | 34 +++++++++++++++++++ .../TSTFRM12/res/values-night/colors.xml | 6 ++++ .../android/TSTFRM12/res/values/colors.xml | 6 ++++ .../iconify/ui/fragments/ToastFrame.kt | 1 + .../toast_frame_style_12.xml | 34 +++++++++++++++++++ .../res/drawable-v24/toast_frame_style_12.xml | 34 +++++++++++++++++++ 7 files changed, 149 insertions(+) create mode 100644 app/src/main/assets/CompileOnDemand/android/TSTFRM12/res/drawable/toast_frame.xml create mode 100644 app/src/main/assets/CompileOnDemand/android/TSTFRM12/res/drawable/toast_frame_material.xml create mode 100644 app/src/main/assets/CompileOnDemand/android/TSTFRM12/res/values-night/colors.xml create mode 100644 app/src/main/assets/CompileOnDemand/android/TSTFRM12/res/values/colors.xml create mode 100644 app/src/main/res/drawable-night-v24/toast_frame_style_12.xml create mode 100644 app/src/main/res/drawable-v24/toast_frame_style_12.xml diff --git a/app/src/main/assets/CompileOnDemand/android/TSTFRM12/res/drawable/toast_frame.xml b/app/src/main/assets/CompileOnDemand/android/TSTFRM12/res/drawable/toast_frame.xml new file mode 100644 index 000000000..e15325f98 --- /dev/null +++ b/app/src/main/assets/CompileOnDemand/android/TSTFRM12/res/drawable/toast_frame.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/assets/CompileOnDemand/android/TSTFRM12/res/drawable/toast_frame_material.xml b/app/src/main/assets/CompileOnDemand/android/TSTFRM12/res/drawable/toast_frame_material.xml new file mode 100644 index 000000000..e15325f98 --- /dev/null +++ b/app/src/main/assets/CompileOnDemand/android/TSTFRM12/res/drawable/toast_frame_material.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/assets/CompileOnDemand/android/TSTFRM12/res/values-night/colors.xml b/app/src/main/assets/CompileOnDemand/android/TSTFRM12/res/values-night/colors.xml new file mode 100644 index 000000000..e05ab934e --- /dev/null +++ b/app/src/main/assets/CompileOnDemand/android/TSTFRM12/res/values-night/colors.xml @@ -0,0 +1,6 @@ + + + + @android:color/system_neutral2_800 + + \ No newline at end of file diff --git a/app/src/main/assets/CompileOnDemand/android/TSTFRM12/res/values/colors.xml b/app/src/main/assets/CompileOnDemand/android/TSTFRM12/res/values/colors.xml new file mode 100644 index 000000000..b3ee65f40 --- /dev/null +++ b/app/src/main/assets/CompileOnDemand/android/TSTFRM12/res/values/colors.xml @@ -0,0 +1,6 @@ + + + + @android:color/system_neutral1_50 + + \ No newline at end of file diff --git a/app/src/main/java/com/drdisagree/iconify/ui/fragments/ToastFrame.kt b/app/src/main/java/com/drdisagree/iconify/ui/fragments/ToastFrame.kt index 2206ea75d..52754d273 100644 --- a/app/src/main/java/com/drdisagree/iconify/ui/fragments/ToastFrame.kt +++ b/app/src/main/java/com/drdisagree/iconify/ui/fragments/ToastFrame.kt @@ -89,6 +89,7 @@ class ToastFrame : BaseFragment() { add(ToastModel(R.drawable.toast_frame_style_9, String.format(appContextLocale.resources.getString(R.string.style), 9))) add(ToastModel(R.drawable.toast_frame_style_10, String.format(appContextLocale.resources.getString(R.string.style), 10))) add(ToastModel(R.drawable.toast_frame_style_11, String.format(appContextLocale.resources.getString(R.string.style), 11))) + add(ToastModel(R.drawable.toast_frame_style_12, String.format(appContextLocale.resources.getString(R.string.style), 12))) } return ToastAdapter( diff --git a/app/src/main/res/drawable-night-v24/toast_frame_style_12.xml b/app/src/main/res/drawable-night-v24/toast_frame_style_12.xml new file mode 100644 index 000000000..94791838d --- /dev/null +++ b/app/src/main/res/drawable-night-v24/toast_frame_style_12.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable-v24/toast_frame_style_12.xml b/app/src/main/res/drawable-v24/toast_frame_style_12.xml new file mode 100644 index 000000000..55573847d --- /dev/null +++ b/app/src/main/res/drawable-v24/toast_frame_style_12.xml @@ -0,0 +1,34 @@ + + + + + + + + + + + + + + + + + + + From 0e90c2bb5ee20e27c289ee6b322d293f7d289b61 Mon Sep 17 00:00:00 2001 From: DHD2280 Date: Fri, 2 Aug 2024 14:23:26 +0200 Subject: [PATCH 4/4] Improved Toast 12 Preview --- .../main/res/drawable-night-v24/toast_frame_style_12.xml | 8 ++++---- app/src/main/res/drawable-v24/toast_frame_style_12.xml | 8 ++++---- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/app/src/main/res/drawable-night-v24/toast_frame_style_12.xml b/app/src/main/res/drawable-night-v24/toast_frame_style_12.xml index 94791838d..7e0ed0367 100644 --- a/app/src/main/res/drawable-night-v24/toast_frame_style_12.xml +++ b/app/src/main/res/drawable-night-v24/toast_frame_style_12.xml @@ -23,10 +23,10 @@ + android:bottomLeftRadius="10dp" + android:bottomRightRadius="20dp" + android:topLeftRadius="20dp" + android:topRightRadius="10dp" /> diff --git a/app/src/main/res/drawable-v24/toast_frame_style_12.xml b/app/src/main/res/drawable-v24/toast_frame_style_12.xml index 55573847d..a76a7f88b 100644 --- a/app/src/main/res/drawable-v24/toast_frame_style_12.xml +++ b/app/src/main/res/drawable-v24/toast_frame_style_12.xml @@ -23,10 +23,10 @@ + android:bottomLeftRadius="10dp" + android:bottomRightRadius="20dp" + android:topLeftRadius="20dp" + android:topRightRadius="10dp" />