Skip to content

Commit ad5b6b6

Browse files
authored
Merge pull request #565 from synonymdev/fix/widgets-polish
fix: polish widget edit & preview screens
2 parents 86107e0 + d3f30fa commit ad5b6b6

23 files changed

Lines changed: 10 additions & 62 deletions

Bitkit/Components/Widgets/BaseWidget.swift

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -85,7 +85,6 @@ struct BaseWidget<Content: View>: View {
8585
@EnvironmentObject private var navigation: NavigationViewModel
8686
@EnvironmentObject private var widgets: WidgetsViewModel
8787
@EnvironmentObject private var currency: CurrencyViewModel
88-
@EnvironmentObject private var settings: SettingsViewModel
8988

9089
/// Widget metadata computed from type
9190
private var metadata: WidgetMetadata {
@@ -127,7 +126,7 @@ struct BaseWidget<Content: View>: View {
127126
var body: some View {
128127
Button {} label: {
129128
VStack(spacing: 0) {
130-
if type == .suggestions ? isEditing : (settings.showWidgetTitles || isEditing) {
129+
if isEditing {
131130
HStack {
132131
HStack(spacing: 16) {
133132
Image(metadata.icon)
@@ -185,12 +184,6 @@ struct BaseWidget<Content: View>: View {
185184
}
186185
}
187186
}
188-
189-
// Add spacer only when showing title and not editing
190-
if settings.showWidgetTitles && !isEditing {
191-
Spacer()
192-
.frame(height: 16)
193-
}
194187
}
195188

196189
// Widget content (only shown when not editing)

Bitkit/Models/SettingsBackupConfig.swift

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@ enum SettingsBackupConfig {
4545
"addressTypesToMonitor": .string(optional: true),
4646
"enableQuickpay": .bool,
4747
"showWidgets": .bool,
48-
"showWidgetTitles": .bool,
4948
"swipeBalanceToHide": .bool,
5049
"hideBalance": .bool,
5150
"hideBalanceOnOpen": .bool,

Bitkit/Resources/Localization/ar.lproj/Localizable.strings

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
"widgets__widget__edit" = "موجز الأداة";
3535
"widgets__widget__edit_default" = "افتراضي";
3636
"widgets__widget__edit_custom" = "مخصص";
37-
"widgets__widget__edit_description" = "يرجى اختيار الحقول التي تريد عرضها في أداة {name}.";
3837
"widgets__widget__source" = "المصدر";
3938
"widgets__add" = "إضافة أداة";
4039
"widgets__delete__title" = "حذف الأداة؟";

Bitkit/Resources/Localization/ca.lproj/Localizable.strings

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -551,7 +551,6 @@
551551
"settings__general__language_other" = "Idioma de la interfície";
552552
"settings__widgets__nav_title" = "Ginys";
553553
"settings__widgets__showWidgets" = "Ginys";
554-
"settings__widgets__showWidgetTitles" = "Mostra títols dels ginys";
555554
"settings__notifications__nav_title" = "Pagaments en segon pla";
556555
"settings__notifications__intro__title" = "Rep pagaments\n<accent>passivament</accent>";
557556
"settings__notifications__intro__text" = "Activa les notificacions per rebre pagaments, fins i tot quan l\'aplicació Bitkit està tancada.";
@@ -984,7 +983,6 @@
984983
"widgets__widget__edit" = "Feed del giny";
985984
"widgets__widget__edit_default" = "Predeterminat";
986985
"widgets__widget__edit_custom" = "Personalitzat";
987-
"widgets__widget__edit_description" = "Si us plau, selecciona quins camps vols mostrar al giny {name}.";
988986
"widgets__widget__source" = "Font";
989987
"widgets__add" = "Afegir giny";
990988
"widgets__delete__title" = "Eliminar giny?";

Bitkit/Resources/Localization/cs.lproj/Localizable.strings

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -619,7 +619,6 @@
619619
"settings__general__language_other" = "Jazyk rozhraní";
620620
"settings__widgets__nav_title" = "Widgety";
621621
"settings__widgets__showWidgets" = "Widgety";
622-
"settings__widgets__showWidgetTitles" = "Zobrazit názvy widgetů";
623622
"settings__notifications__nav_title" = "Platby na pozadí";
624623
"settings__notifications__intro__title" = "Přijímat platby\n<accent>pasivně</accent>";
625624
"settings__notifications__intro__text" = "Zapněte oznámení, abyste mohli přijímat platby, i když je vaše aplikace Bitkit zavřená.";
@@ -1142,7 +1141,6 @@
11421141
"widgets__widget__edit" = "Widget Feed";
11431142
"widgets__widget__edit_default" = "Výchozí";
11441143
"widgets__widget__edit_custom" = "Vlastní";
1145-
"widgets__widget__edit_description" = "Vyberte, která pole chcete zobrazit ve widgetu {name}.";
11461144
"widgets__widget__source" = "Zdroj";
11471145
"widgets__add" = "Přidat widget";
11481146
"widgets__delete__title" = "Smazat Widget?";

Bitkit/Resources/Localization/de.lproj/Localizable.strings

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -617,7 +617,6 @@
617617
"settings__general__language_other" = "Oberflächensprache";
618618
"settings__widgets__nav_title" = "Widgets";
619619
"settings__widgets__showWidgets" = "Widgets";
620-
"settings__widgets__showWidgetTitles" = "Titel anzeigen";
621620
"settings__notifications__nav_title" = "Hintergrundzahlungen";
622621
"settings__notifications__intro__title" = "Passiv\n<accent>bezahlt werden</accent>";
623622
"settings__notifications__intro__text" = "Aktiviere Benachrichtigungen, um Zahlungen zu erhalten, auch wenn Bitkit geschlossen ist.";
@@ -1138,7 +1137,6 @@
11381137
"widgets__widget__edit" = "Widget Feed";
11391138
"widgets__widget__edit_default" = "Standard";
11401139
"widgets__widget__edit_custom" = "Benutzerdefiniert";
1141-
"widgets__widget__edit_description" = "Bitte wähle die Felder aus, die du im {name} Widget anzeigen möchtest.";
11421140
"widgets__widget__source" = "Quelle";
11431141
"widgets__add" = "Widget hinzufügen";
11441142
"widgets__delete__title" = "Widget löschen?";

Bitkit/Resources/Localization/el.lproj/Localizable.strings

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -499,7 +499,6 @@
499499
"settings__general__language_other" = "Γλώσσα διεπαφής";
500500
"settings__widgets__nav_title" = "Widgets";
501501
"settings__widgets__showWidgets" = "Widgets";
502-
"settings__widgets__showWidgetTitles" = "Εμφάνιση Τίτλων Widget";
503502
"settings__notifications__nav_title" = "Πληρωμές Παρασκηνίου";
504503
"settings__notifications__intro__title" = "Λάβετε Πληρωμή\n<accent>Παθητικά</accent>";
505504
"settings__notifications__intro__text" = "Ενεργοποιήστε τις ειδοποιήσεις για να λαμβάνετε πληρωμές, ακόμα και όταν η εφαρμογή Bitkit είναι κλειστή.";
@@ -846,7 +845,6 @@
846845
"widgets__widget__edit" = "Ροή Widget";
847846
"widgets__widget__edit_default" = "Προεπιλεγμένο";
848847
"widgets__widget__edit_custom" = "Προσαρμοσμένο";
849-
"widgets__widget__edit_description" = "Παρακαλώ επιλέξτε ποια πεδία θέλετε να εμφανίζονται στο widget {name}.";
850848
"widgets__widget__source" = "Πηγή";
851849
"widgets__add" = "Προσθήκη Widget";
852850
"widgets__delete__title" = "Διαγραφή Widget;";

Bitkit/Resources/Localization/en.lproj/Localizable.strings

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -669,7 +669,6 @@
669669
"settings__widgets__section_display" = "Display";
670670
"settings__widgets__section_reset" = "Reset To Defaults";
671671
"settings__widgets__showWidgets" = "Show Widgets";
672-
"settings__widgets__showWidgetTitles" = "Show Widget Titles";
673672
"settings__widgets__reset_widgets" = "Reset Widgets";
674673
"settings__widgets__reset_widgets_dialog_title" = "Reset Widgets?";
675674
"settings__widgets__reset_widgets_dialog_description" = "Are you sure you want to reset the widgets? The default widget set with default configurations will be displayed.";
@@ -1383,7 +1382,6 @@
13831382
"widgets__widget__edit" = "Widget Feed";
13841383
"widgets__widget__edit_default" = "Default";
13851384
"widgets__widget__edit_custom" = "Custom";
1386-
"widgets__widget__edit_description" = "Please choose the fields you would like to see in the {name} widget.";
13871385
"widgets__widget__source" = "Source";
13881386
"widgets__add" = "Add Widget";
13891387
"widgets__list__button" = "Enable In Settings";

Bitkit/Resources/Localization/es-419.lproj/Localizable.strings

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -626,7 +626,6 @@
626626
"settings__general__language_other" = "Lenguaje de interfaz";
627627
"settings__widgets__nav_title" = "Widgets";
628628
"settings__widgets__showWidgets" = "Widgets";
629-
"settings__widgets__showWidgetTitles" = "Mostrar títulos de widgets";
630629
"settings__notifications__nav_title" = "Pagos en segundo plano";
631630
"settings__notifications__intro__title" = "Cobrar\n<accent>Pasivamente</accent>";
632631
"settings__notifications__intro__text" = "Active las notificaciones para cobrar, incluso cuando su aplicación Bitkit esté cerrada.";
@@ -1154,7 +1153,6 @@
11541153
"widgets__widget__edit" = "Feed de widgets";
11551154
"widgets__widget__edit_default" = "Default";
11561155
"widgets__widget__edit_custom" = "personalizado";
1157-
"widgets__widget__edit_description" = "Seleccione los campos que desea mostrar en el widget {name}.";
11581156
"widgets__widget__source" = "Fuente";
11591157
"widgets__add" = "Añadir Widget";
11601158
"widgets__delete__title" = "¿Borrar Widget?";

Bitkit/Resources/Localization/es.lproj/Localizable.strings

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -566,7 +566,6 @@
566566
"settings__general__language_other" = "Idioma de la interfaz";
567567
"settings__widgets__nav_title" = "Widgets";
568568
"settings__widgets__showWidgets" = "Widgets";
569-
"settings__widgets__showWidgetTitles" = "Mostrar Títulos de Widgets";
570569
"settings__notifications__nav_title" = "Pagos en Segundo Plano";
571570
"settings__notifications__intro__title" = "Recibe Pagos\n<accent>Pasivamente</accent>";
572571
"settings__notifications__intro__text" = "Activa las notificaciones para recibir pagos, incluso cuando tu app Bitkit esté cerrada.";
@@ -1013,7 +1012,6 @@
10131012
"widgets__widget__edit" = "Feed del Widget";
10141013
"widgets__widget__edit_default" = "Predeterminado";
10151014
"widgets__widget__edit_custom" = "Personalizar";
1016-
"widgets__widget__edit_description" = "Por favor, seleccione cuales campos quiere mostrar en el widget {name}.";
10171015
"widgets__widget__source" = "Fuente";
10181016
"widgets__add" = "Añadir Widget";
10191017
"widgets__delete__title" = "¿Borrar Widget?";

0 commit comments

Comments
 (0)