Browse Source

improved widget

Signed-off-by: Marino Faggiana <marino@marinofaggiana.com>
Marino Faggiana 2 years ago
parent
commit
b297af273c

+ 1 - 1
Nextcloud.xcodeproj/project.pbxproj

@@ -1383,9 +1383,9 @@
 			isa = PBXGroup;
 			children = (
 				F7346E2228B0FEBA006CE2D2 /* Assets.xcassets */,
-				F77ED59628C9CEEE00E24ED0 /* Toolbar */,
 				F72EA95528B7BAD100C88F0C /* Dashboard */,
 				F72EA95628B7BAE700C88F0C /* Nextcloud */,
+				F77ED59628C9CEEE00E24ED0 /* Toolbar */,
 				F7346E2028B0FA3A006CE2D2 /* Widget-Brinding-header.h */,
 				F7346E1528B0EF5C006CE2D2 /* Widget.swift */,
 			);

+ 1 - 1
Widget/Toolbar/ToolbarWidgetView.swift

@@ -105,7 +105,7 @@ struct ToolbarWidgetView: View {
                         .padding(.trailing, 13.0)
                 }
                 .frame(maxWidth: geo.size.width - 5, maxHeight: geo.size.height - 2, alignment: .bottomTrailing)
-            }
+            }.background(ContainerRelativeShape().fill(Color.init(.sRGB, red: 0.89, green: 0.89, blue: 0.89, opacity: 0.75)))
         }
     }
 }

+ 5 - 5
Widget/Widget.swift

@@ -29,9 +29,9 @@ struct NextcloudWidgetBundle: WidgetBundle {
 
     @WidgetBundleBuilder
     var body: some Widget {
-        ToolbarWidget()
-        NextcloudWidget()
         DashboardWidget()
+        NextcloudWidget()
+        ToolbarWidget()
     }
 }
 
@@ -43,7 +43,7 @@ struct DashboardWidget: Widget {
             DashboardWidgetView(entry: entry)
         }
         .supportedFamilies([.systemLarge])
-        .configurationDisplayName("Dashboard")
+        .configurationDisplayName(NCBrandOptions.shared.brand + " Dashboard")
         .description(NSLocalizedString("_description_dashboardwidget_", comment: ""))
     }
 }
@@ -56,7 +56,7 @@ struct NextcloudWidget: Widget {
             NextcloudWidgetView(entry: entry)
         }
         .supportedFamilies([.systemLarge])
-        .configurationDisplayName(NCBrandOptions.shared.brand)
+        .configurationDisplayName(NCBrandOptions.shared.brand + " Widget")
         .description(NSLocalizedString("_description_nextcloudwidget_", comment: ""))
     }
 }
@@ -69,7 +69,7 @@ struct ToolbarWidget: Widget {
             ToolbarWidgetView(entry: entry)
         }
         .supportedFamilies([.systemMedium])
-        .configurationDisplayName("Toolbar")
+        .configurationDisplayName(NCBrandOptions.shared.brand + " Toolbar")
         .description(NSLocalizedString("_description_toolbarwidget_", comment: ""))
     }
 }

+ 4 - 0
iOSClient/Supporting Files/en.lproj/Localizable.strings

@@ -885,6 +885,10 @@
 "_select_color_"            = "Select the color";
 "_change_color_"            = "Change color";
 
+"_description_dashboardwidget_" = "";
+"_description_nextcloudwidget_" = "";
+"_description_toolbarwidget_"   = "";
+
 // Video
 "_select_trace_"            = "Select the trace";
 "_video_processing_"        = "Video processing";