Merge branch 'digital-ocean-dns' into refactoring

analysis_options.yaml

@@ -31,7 +31,6 @@ linter:
     avoid_print: false  # Uncomment to disable the `avoid_print` rule
     prefer_single_quotes: true  # Uncomment to enable the `prefer_single_quotes` rule
     always_use_package_imports: true
-    invariant_booleans: true
     no_adjacent_strings_in_list: true
     unnecessary_statements: true
     always_declare_return_types: true

assets/translations/en.json

@@ -197,9 +197,6 @@
         "migration_done": "Finish"
     },
     "not_ready_card": {
-        "begin": "Please finish application setup using ",
-        "insertion": "Setup Wizard",
-        "end": " for further work",
         "in_menu": "Server is not set up yet. Please finish setup using setup wizard for further work."
     },
     "service_page": {

assets/translations/ru.json

@@ -197,9 +197,6 @@
         "migration_done": "Завершить"
     },
     "not_ready_card": {
-        "begin": "Завершите настройку приложения используя ",
-        "insertion": "Мастер Настройки",
-        "end": " для продолжения работы",
         "in_menu": "Сервер ещё не настроен, воспользуйтесь мастером подключения."
     },
     "service_page": {

assets/translations/uk.json

@@ -299,9 +299,6 @@
         "data_migration_notice": "Під час переносу всі послуги будуть вимкнені."
     },
     "not_ready_card": {
-        "begin": "Будь ласка, завершіть налаштування програми ",
-        "insertion": "Майстер налаштувань",
-        "end": " Для подальшої роботи",
         "in_menu": "Сервер ще не налаштовано. Будь ласка, завершіть налаштування за допомогою майстра налаштування для подальшої роботи."
     },
     "service_page": {

fastlane/metadata/android/en-US/changelogs/0.8.0.txt

@@ -31,3 +31,7 @@ For developers:
 - App now only uses GraphQL API to communicate with the server. All REST API calls have been removed.
 - Server can now be deployed with staging ACME certificates
 - Language assets have been reorganized
+
+Translations:
+- Added translation for Ukrainian
+- Also activated unfinished translations for German, French, Spanish, Czech, Polish, Thai

ios/Flutter/Debug.xcconfig

@@ -1 +1,2 @@
+#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
 #include "Generated.xcconfig"

ios/Flutter/Release.xcconfig

@@ -1 +1,2 @@
+#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
 #include "Generated.xcconfig"

ios/Podfile

@@ -0,0 +1,41 @@
+# Uncomment this line to define a global platform for your project
+# platform :ios, '11.0'
+
+# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
+ENV['COCOAPODS_DISABLE_STATS'] = 'true'
+
+project 'Runner', {
+  'Debug' => :debug,
+  'Profile' => :release,
+  'Release' => :release,
+}
+
+def flutter_root
+  generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'Generated.xcconfig'), __FILE__)
+  unless File.exist?(generated_xcode_build_settings_path)
+    raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure flutter pub get is executed first"
+  end
+
+  File.foreach(generated_xcode_build_settings_path) do |line|
+    matches = line.match(/FLUTTER_ROOT\=(.*)/)
+    return matches[1].strip if matches
+  end
+  raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Generated.xcconfig, then run flutter pub get"
+end
+
+require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root)
+
+flutter_ios_podfile_setup
+
+target 'Runner' do
+  use_frameworks!
+  use_modular_headers!
+
+  flutter_install_all_ios_pods File.dirname(File.realpath(__FILE__))
+end
+
+post_install do |installer|
+  installer.pods_project.targets.each do |target|
+    flutter_additional_ios_build_settings(target)
+  end
+end

ios/Podfile.lock

@@ -0,0 +1,83 @@
+PODS:
+  - connectivity_plus (0.0.1):
+    - Flutter
+    - ReachabilitySwift
+  - device_info_plus (0.0.1):
+    - Flutter
+  - Flutter (1.0.0)
+  - flutter_secure_storage (6.0.0):
+    - Flutter
+  - local_auth_ios (0.0.1):
+    - Flutter
+  - package_info (0.0.1):
+    - Flutter
+  - path_provider_ios (0.0.1):
+    - Flutter
+  - ReachabilitySwift (5.0.0)
+  - share_plus (0.0.1):
+    - Flutter
+  - shared_preferences_ios (0.0.1):
+    - Flutter
+  - url_launcher_ios (0.0.1):
+    - Flutter
+  - wakelock (0.0.1):
+    - Flutter
+
+DEPENDENCIES:
+  - connectivity_plus (from `.symlinks/plugins/connectivity_plus/ios`)
+  - device_info_plus (from `.symlinks/plugins/device_info_plus/ios`)
+  - Flutter (from `Flutter`)
+  - flutter_secure_storage (from `.symlinks/plugins/flutter_secure_storage/ios`)
+  - local_auth_ios (from `.symlinks/plugins/local_auth_ios/ios`)
+  - package_info (from `.symlinks/plugins/package_info/ios`)
+  - path_provider_ios (from `.symlinks/plugins/path_provider_ios/ios`)
+  - share_plus (from `.symlinks/plugins/share_plus/ios`)
+  - shared_preferences_ios (from `.symlinks/plugins/shared_preferences_ios/ios`)
+  - url_launcher_ios (from `.symlinks/plugins/url_launcher_ios/ios`)
+  - wakelock (from `.symlinks/plugins/wakelock/ios`)
+
+SPEC REPOS:
+  trunk:
+    - ReachabilitySwift
+
+EXTERNAL SOURCES:
+  connectivity_plus:
+    :path: ".symlinks/plugins/connectivity_plus/ios"
+  device_info_plus:
+    :path: ".symlinks/plugins/device_info_plus/ios"
+  Flutter:
+    :path: Flutter
+  flutter_secure_storage:
+    :path: ".symlinks/plugins/flutter_secure_storage/ios"
+  local_auth_ios:
+    :path: ".symlinks/plugins/local_auth_ios/ios"
+  package_info:
+    :path: ".symlinks/plugins/package_info/ios"
+  path_provider_ios:
+    :path: ".symlinks/plugins/path_provider_ios/ios"
+  share_plus:
+    :path: ".symlinks/plugins/share_plus/ios"
+  shared_preferences_ios:
+    :path: ".symlinks/plugins/shared_preferences_ios/ios"
+  url_launcher_ios:
+    :path: ".symlinks/plugins/url_launcher_ios/ios"
+  wakelock:
+    :path: ".symlinks/plugins/wakelock/ios"
+
+SPEC CHECKSUMS:
+  connectivity_plus: 413a8857dd5d9f1c399a39130850d02fe0feaf7e
+  device_info_plus: e5c5da33f982a436e103237c0c85f9031142abed
+  Flutter: f04841e97a9d0b0a8025694d0796dd46242b2854
+  flutter_secure_storage: 23fc622d89d073675f2eaa109381aefbcf5a49be
+  local_auth_ios: 0d333dde7780f669e66f19d2ff6005f3ea84008d
+  package_info: 873975fc26034f0b863a300ad47e7f1ac6c7ec62
+  path_provider_ios: 14f3d2fd28c4fdb42f44e0f751d12861c43cee02
+  ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825
+  share_plus: 056a1e8ac890df3e33cb503afffaf1e9b4fbae68
+  shared_preferences_ios: 548a61f8053b9b8a49ac19c1ffbc8b92c50d68ad
+  url_launcher_ios: 839c58cdb4279282219f5e248c3321761ff3c4de
+  wakelock: d0fc7c864128eac40eba1617cb5264d9c940b46f
+
+PODFILE CHECKSUM: ef19549a9bc3046e7bb7d2fab4d021637c0c58a3
+
+COCOAPODS: 1.11.3

ios/Runner.xcodeproj/project.pbxproj

@@ -3,11 +3,12 @@
 	archiveVersion = 1;
 	classes = {
 	};
-	objectVersion = 50;
+	objectVersion = 51;
 	objects = {
 
 /* Begin PBXBuildFile section */
 		1498D2341E8E89220040F4C2 /* GeneratedPluginRegistrant.m in Sources */ = {isa = PBXBuildFile; fileRef = 1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */; };
+		157C97814E2B6EE2FC34CDB1 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 257F298CD626562B3A0BE8BC /* Pods_Runner.framework */; };
 		3B3967161E833CAA004F5970 /* AppFrameworkInfo.plist in Resources */ = {isa = PBXBuildFile; fileRef = 3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */; };
 		74858FAF1ED2DC5600515810 /* AppDelegate.swift in Sources */ = {isa = PBXBuildFile; fileRef = 74858FAE1ED2DC5600515810 /* AppDelegate.swift */; };
 		97C146FC1CF9000F007C117D /* Main.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 97C146FA1CF9000F007C117D /* Main.storyboard */; };
@@ -31,10 +32,15 @@
 /* Begin PBXFileReference section */
 		1498D2321E8E86230040F4C2 /* GeneratedPluginRegistrant.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GeneratedPluginRegistrant.h; sourceTree = "<group>"; };
 		1498D2331E8E89220040F4C2 /* GeneratedPluginRegistrant.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = GeneratedPluginRegistrant.m; sourceTree = "<group>"; };
+		257F298CD626562B3A0BE8BC /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		32ED047D2988556F00CEC6F8 /* Runner.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Runner.entitlements; sourceTree = "<group>"; };
+		32ED047E298857FA00CEC6F8 /* lib */ = {isa = PBXFileReference; lastKnownFileType = folder; name = lib; path = ../lib; sourceTree = "<group>"; };
 		3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = AppFrameworkInfo.plist; path = Flutter/AppFrameworkInfo.plist; sourceTree = "<group>"; };
 		74858FAD1ED2DC5600515810 /* Runner-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "Runner-Bridging-Header.h"; sourceTree = "<group>"; };
 		74858FAE1ED2DC5600515810 /* AppDelegate.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
+		76C01250B18E06E028B2A21D /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
 		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; name = Release.xcconfig; path = Flutter/Release.xcconfig; sourceTree = "<group>"; };
+		88863573AD2094F1791C05BE /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
 		9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Debug.xcconfig; path = Flutter/Debug.xcconfig; sourceTree = "<group>"; };
 		9740EEB31CF90195004384FC /* Generated.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; name = Generated.xcconfig; path = Flutter/Generated.xcconfig; sourceTree = "<group>"; };
 		97C146EE1CF9000F007C117D /* Runner.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = Runner.app; sourceTree = BUILT_PRODUCTS_DIR; };
@@ -42,6 +48,7 @@
 		97C146FD1CF9000F007C117D /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; path = Assets.xcassets; sourceTree = "<group>"; };
 		97C147001CF9000F007C117D /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.storyboard; name = Base; path = Base.lproj/LaunchScreen.storyboard; sourceTree = "<group>"; };
 		97C147021CF9000F007C117D /* Info.plist */ = {isa = PBXFileReference; lastKnownFileType = text.plist.xml; path = Info.plist; sourceTree = "<group>"; };
+		FAE3312046B1506D10D287F2 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -49,15 +56,25 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				157C97814E2B6EE2FC34CDB1 /* Pods_Runner.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		1725124A7D564E6014199E7A /* Frameworks */ = {
+			isa = PBXGroup;
+			children = (
+				257F298CD626562B3A0BE8BC /* Pods_Runner.framework */,
+			);
+			name = Frameworks;
+			sourceTree = "<group>";
+		};
 		9740EEB11CF90186004384FC /* Flutter */ = {
 			isa = PBXGroup;
 			children = (
+				32ED047E298857FA00CEC6F8 /* lib */,
 				3B3967151E833CAA004F5970 /* AppFrameworkInfo.plist */,
 				9740EEB21CF90195004384FC /* Debug.xcconfig */,
 				7AFA3C8E1D35360C0083082E /* Release.xcconfig */,
@@ -72,6 +89,8 @@
 				9740EEB11CF90186004384FC /* Flutter */,
 				97C146F01CF9000F007C117D /* Runner */,
 				97C146EF1CF9000F007C117D /* Products */,
+				BAF4554E70AEB98F4DF5B768 /* Pods */,
+				1725124A7D564E6014199E7A /* Frameworks */,
 			);
 			sourceTree = "<group>";
 		};
@@ -86,6 +105,7 @@
 		97C146F01CF9000F007C117D /* Runner */ = {
 			isa = PBXGroup;
 			children = (
+				32ED047D2988556F00CEC6F8 /* Runner.entitlements */,
 				97C146FA1CF9000F007C117D /* Main.storyboard */,
 				97C146FD1CF9000F007C117D /* Assets.xcassets */,
 				97C146FF1CF9000F007C117D /* LaunchScreen.storyboard */,
@@ -98,6 +118,16 @@
 			path = Runner;
 			sourceTree = "<group>";
 		};
+		BAF4554E70AEB98F4DF5B768 /* Pods */ = {
+			isa = PBXGroup;
+			children = (
+				FAE3312046B1506D10D287F2 /* Pods-Runner.debug.xcconfig */,
+				88863573AD2094F1791C05BE /* Pods-Runner.release.xcconfig */,
+				76C01250B18E06E028B2A21D /* Pods-Runner.profile.xcconfig */,
+			);
+			path = Pods;
+			sourceTree = "<group>";
+		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
@@ -105,12 +135,14 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 97C147051CF9000F007C117D /* Build configuration list for PBXNativeTarget "Runner" */;
 			buildPhases = (
+				70552AB84A03C7D8459451CE /* [CP] Check Pods Manifest.lock */,
 				9740EEB61CF901F6004384FC /* Run Script */,
 				97C146EA1CF9000F007C117D /* Sources */,
 				97C146EB1CF9000F007C117D /* Frameworks */,
 				97C146EC1CF9000F007C117D /* Resources */,
 				9705A1C41CF9048500538489 /* Embed Frameworks */,
 				3B06AD1E1E4923F5004D2608 /* Thin Binary */,
+				C3CADDF8A29BE6F206C19D86 /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -183,6 +215,28 @@
 			shellPath = /bin/sh;
 			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" embed_and_thin";
 		};
+		70552AB84A03C7D8459451CE /* [CP] Check Pods Manifest.lock */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			showEnvVarsInLog = 0;
+		};
 		9740EEB61CF901F6004384FC /* Run Script */ = {
 			isa = PBXShellScriptBuildPhase;
 			buildActionMask = 2147483647;
@@ -197,6 +251,23 @@
 			shellPath = /bin/sh;
 			shellScript = "/bin/sh \"$FLUTTER_ROOT/packages/flutter_tools/bin/xcode_backend.sh\" build";
 		};
+		C3CADDF8A29BE6F206C19D86 /* [CP] Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
+			);
+			name = "[CP] Embed Pods Frameworks";
+			outputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
@@ -287,7 +358,9 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				DEVELOPMENT_TEAM = 46723VZHWZ;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -415,7 +488,9 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				DEVELOPMENT_TEAM = 46723VZHWZ;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (
@@ -437,7 +512,9 @@
 			buildSettings = {
 				ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
 				CLANG_ENABLE_MODULES = YES;
+				CODE_SIGN_ENTITLEMENTS = Runner/Runner.entitlements;
 				CURRENT_PROJECT_VERSION = "$(FLUTTER_BUILD_NUMBER)";
+				DEVELOPMENT_TEAM = 46723VZHWZ;
 				ENABLE_BITCODE = NO;
 				INFOPLIST_FILE = Runner/Info.plist;
 				LD_RUNPATH_SEARCH_PATHS = (

ios/Runner.xcworkspace/contents.xcworkspacedata

@@ -4,4 +4,7 @@
    <FileRef
       location = "group:Runner.xcodeproj">
    </FileRef>
+   <FileRef
+      location = "group:Pods/Pods.xcodeproj">
+   </FileRef>
 </Workspace>

ios/Runner/Runner.entitlements

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE plist PUBLIC "-//Apple//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
+<plist version="1.0">
+<dict>
+	<key>keychain-access-groups</key>
+	<array>
+		<string>$(AppIdentifierPrefix)*</string>
+	</array>
+</dict>
+</plist>

lib/config/brand_theme.dart

@@ -1,88 +1,3 @@
 import 'package:flutter/material.dart';
-import 'package:selfprivacy/config/text_themes.dart';
-
-import 'package:selfprivacy/config/brand_colors.dart';
-
-final ThemeData lightTheme = ThemeData(
-  useMaterial3: true,
-  primaryColor: BrandColors.primary,
-  fontFamily: 'Inter',
-  brightness: Brightness.light,
-  scaffoldBackgroundColor: BrandColors.scaffoldBackground,
-  inputDecorationTheme: const InputDecorationTheme(
-    border: InputBorder.none,
-    contentPadding: EdgeInsets.all(16),
-    enabledBorder: OutlineInputBorder(
-      borderRadius: BorderRadius.all(Radius.circular(4)),
-      borderSide: BorderSide(color: BrandColors.inputInactive),
-    ),
-    focusedBorder: OutlineInputBorder(
-      borderRadius: BorderRadius.all(Radius.circular(4)),
-      borderSide: BorderSide(color: BrandColors.blue),
-    ),
-    errorBorder: OutlineInputBorder(
-      borderRadius: BorderRadius.all(Radius.circular(4)),
-      borderSide: BorderSide(
-        width: 1,
-        color: BrandColors.red1,
-      ),
-    ),
-    focusedErrorBorder: OutlineInputBorder(
-      borderRadius: BorderRadius.all(Radius.circular(4)),
-      borderSide: BorderSide(
-        width: 1,
-        color: BrandColors.red1,
-      ),
-    ),
-    errorStyle: TextStyle(
-      fontSize: 12,
-      color: BrandColors.red1,
-    ),
-  ),
-  listTileTheme: const ListTileThemeData(
-    minLeadingWidth: 24.0,
-  ),
-  textTheme: TextTheme(
-    headline1: headline1Style,
-    headline2: headline2Style,
-    headline3: headline3Style,
-    headline4: headline4Style,
-    bodyText1: body1Style,
-    subtitle1: const TextStyle(fontSize: 15, height: 1.6), // text input style
-  ),
-);
-
-ThemeData darkTheme = lightTheme.copyWith(
-  brightness: Brightness.dark,
-  scaffoldBackgroundColor: const Color(0xFF202120),
-  iconTheme: const IconThemeData(color: BrandColors.gray3),
-  cardColor: BrandColors.gray1,
-  dialogBackgroundColor: const Color(0xFF202120),
-  textTheme: TextTheme(
-    headline1: headline1Style.copyWith(color: BrandColors.white),
-    headline2: headline2Style.copyWith(color: BrandColors.white),
-    headline3: headline3Style.copyWith(color: BrandColors.white),
-    headline4: headline4Style.copyWith(color: BrandColors.white),
-    bodyText1: body1Style.copyWith(color: BrandColors.white),
-    subtitle1: const TextStyle(fontSize: 15, height: 1.6), // text input style
-  ),
-  inputDecorationTheme: const InputDecorationTheme(
-    labelStyle: TextStyle(color: BrandColors.white),
-    hintStyle: TextStyle(color: BrandColors.white),
-    border: OutlineInputBorder(
-      borderSide: BorderSide(
-        color: BrandColors.white,
-      ),
-    ),
-    enabledBorder: OutlineInputBorder(
-      borderSide: BorderSide(
-        color: BrandColors.white,
-      ),
-    ),
-  ),
-);
-
-const EdgeInsets paddingH15V30 =
-    EdgeInsets.symmetric(horizontal: 15, vertical: 30);
 
 const EdgeInsets paddingH15V0 = EdgeInsets.symmetric(horizontal: 15);

lib/config/localization.dart

@@ -10,7 +10,17 @@ class Localization extends StatelessWidget {
   final Widget? child;
   @override
   Widget build(final BuildContext context) => EasyLocalization(
-        supportedLocales: const [Locale('ru'), Locale('en')],
+        supportedLocales: const [
+          Locale('ru'),
+          Locale('en'),
+          Locale('uk'),
+          Locale('de'),
+          Locale('fr'),
+          Locale('es'),
+          Locale('cs'),
+          Locale('pl'),
+          Locale('th'),
+        ],
         path: 'assets/translations',
         fallbackLocale: const Locale('en'),
         useFallbackTranslations: true,

lib/ui/components/brand_button/brand_button.dart

@@ -1,5 +1,4 @@
 import 'package:flutter/material.dart';
-import 'package:selfprivacy/ui/components/brand_button/filled_button.dart';
 import 'package:selfprivacy/ui/components/brand_text/brand_text.dart';
 
 enum BrandButtonTypes { rised, text, iconText }
@@ -20,9 +19,29 @@ class BrandButton {
       ),
       child: FilledButton(
         key: key,
-        title: text,
         onPressed: onPressed,
-        child: child,
+        child: child ?? Text(text ?? ''),
+      ),
+    );
+  }
+
+  static ConstrainedBox filled({
+    required final VoidCallback? onPressed,
+    final Key? key,
+    final String? text,
+    final Widget? child,
+  }) {
+    assert(text == null || child == null, 'required title or child');
+    assert(text != null || child != null, 'required title or child');
+    return ConstrainedBox(
+      constraints: const BoxConstraints(
+        minHeight: 40,
+        minWidth: double.infinity,
+      ),
+      child: FilledButton(
+        key: key,
+        onPressed: onPressed,
+        child: child ?? Text(text ?? ''),
       ),
     );
   }

lib/ui/components/brand_button/filled_button.dart

@@ -1,41 +0,0 @@
-import 'package:flutter/material.dart';
-
-class FilledButton extends StatelessWidget {
-  const FilledButton({
-    super.key,
-    this.onPressed,
-    this.title,
-    this.child,
-    this.disabled = false,
-  });
-
-  final VoidCallback? onPressed;
-  final String? title;
-  final Widget? child;
-  final bool disabled;
-
-  @override
-  Widget build(final BuildContext context) {
-    final ButtonStyle enabledStyle = ElevatedButton.styleFrom(
-      foregroundColor: Theme.of(context).colorScheme.onPrimary,
-      backgroundColor: Theme.of(context).colorScheme.primary,
-    ).copyWith(elevation: ButtonStyleButton.allOrNull(0.0));
-
-    final ButtonStyle disabledStyle = ElevatedButton.styleFrom(
-      foregroundColor: Theme.of(context).colorScheme.onSurface.withAlpha(30),
-      backgroundColor: Theme.of(context).colorScheme.onSurface.withAlpha(98),
-    ).copyWith(elevation: ButtonStyleButton.allOrNull(0.0));
-
-    return ConstrainedBox(
-      constraints: const BoxConstraints(
-        minHeight: 40,
-        minWidth: double.infinity,
-      ),
-      child: ElevatedButton(
-        onPressed: onPressed,
-        style: disabled ? disabledStyle : enabledStyle,
-        child: child ?? Text(title ?? ''),
-      ),
-    );
-  }
-}

lib/ui/components/brand_button/outlined_button.dart

@@ -25,7 +25,7 @@ class BrandOutlinedButton extends StatelessWidget {
           child: child ??
               Text(
                 title ?? '',
-                style: Theme.of(context).textTheme.button?.copyWith(
+                style: Theme.of(context).textTheme.labelLarge?.copyWith(
                       color: Theme.of(context).colorScheme.primary,
                     ),
               ),

lib/ui/components/not_ready_card/not_ready_card.dart

@@ -1,6 +1,5 @@
 import 'package:flutter/material.dart';
-import 'package:selfprivacy/config/brand_colors.dart';
+import 'package:selfprivacy/ui/components/brand_cards/filled_card.dart';
-import 'package:selfprivacy/config/text_themes.dart';
 import 'package:selfprivacy/ui/pages/setup/initializing/initializing.dart';
 import 'package:selfprivacy/utils/route_transitions/basic.dart';
 import 'package:easy_localization/easy_localization.dart';
@@ -9,45 +8,26 @@ class NotReadyCard extends StatelessWidget {
   const NotReadyCard({super.key});
 
   @override
-  Widget build(final BuildContext context) => Container(
+  Widget build(final BuildContext context) => FilledCard(
-        padding: const EdgeInsets.symmetric(horizontal: 15, vertical: 10),
+        tertiary: true,
-        decoration: BoxDecoration(
+        child: ListTile(
-          borderRadius: BorderRadius.circular(15),
+          contentPadding:
-          color: BrandColors.gray6,
+              const EdgeInsets.symmetric(horizontal: 16, vertical: 8),
-        ),
-        child: RichText(
-          text: TextSpan(
-            children: [
-              TextSpan(
-                text: 'not_ready_card.begin'.tr(),
-                style: const TextStyle(color: BrandColors.white),
-              ),
-              WidgetSpan(
-                child: Padding(
-                  padding: const EdgeInsets.only(bottom: 0.5),
-                  child: GestureDetector(
           onTap: () => Navigator.of(context).push(
             materialRoute(
               const InitializingPage(),
             ),
           ),
-                    child: Text(
+          title: Text(
-                      'not_ready_card.insertion'.tr(),
+            'not_ready_card.in_menu'.tr(),
-                      style: body1Style.copyWith(
+            style: Theme.of(context).textTheme.titleSmall?.copyWith(
-                        color: Colors.white,
+                  color: Theme.of(context).colorScheme.onTertiaryContainer,
-                        fontWeight: FontWeight.bold,
-                        decoration: TextDecoration.underline,
-                        // height: 1.1,
                 ),
           ),
-                  ),
+          trailing: Icon(
-                ),
+            Icons.arrow_forward_ios_outlined,
-              ),
+            size: 16,
-              TextSpan(
+            color: Theme.of(context).colorScheme.onTertiaryContainer,
-                text: 'not_ready_card.end'.tr(),
-                style: const TextStyle(color: BrandColors.white),
-              ),
-            ],
           ),
         ),
       );

lib/ui/pages/backup_details/backup_details.dart

@@ -76,7 +76,7 @@ class _BackupDetailsState extends State<BackupDetails>
                     ),
                     title: Text(
                       'backup.create_new'.tr(),
-                      style: Theme.of(context).textTheme.headline6,
+                      style: Theme.of(context).textTheme.titleLarge,
                     ),
                   ),
                 if (backupStatus == BackupStatusEnum.backingUp)
@@ -85,7 +85,7 @@ class _BackupDetailsState extends State<BackupDetails>
                       'backup.creating'.tr(
                         args: [(backupProgress * 100).round().toString()],
                       ),
-                      style: Theme.of(context).textTheme.headline6,
+                      style: Theme.of(context).textTheme.titleLarge,
                     ),
                     subtitle: LinearProgressIndicator(
                       value: backupProgress,
@@ -98,7 +98,7 @@ class _BackupDetailsState extends State<BackupDetails>
                       'backup.restoring'.tr(
                         args: [(backupProgress * 100).round().toString()],
                       ),
-                      style: Theme.of(context).textTheme.headline6,
+                      style: Theme.of(context).textTheme.titleLarge,
                     ),
                     subtitle: LinearProgressIndicator(
                       backgroundColor: Colors.grey.withOpacity(0.2),
@@ -112,7 +112,7 @@ class _BackupDetailsState extends State<BackupDetails>
                     ),
                     title: Text(
                       'backup.error_pending'.tr(),
-                      style: Theme.of(context).textTheme.headline6,
+                      style: Theme.of(context).textTheme.titleLarge,
                     ),
                   ),
               ],
@@ -134,7 +134,7 @@ class _BackupDetailsState extends State<BackupDetails>
                   ),
                   title: Text(
                     'backup.restore'.tr(),
-                    style: Theme.of(context).textTheme.headline6,
+                    style: Theme.of(context).textTheme.titleLarge,
                   ),
                 ),
                 const Divider(

lib/ui/pages/devices/new_device.dart

@@ -3,7 +3,7 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:selfprivacy/logic/cubit/devices/devices_cubit.dart';
 import 'package:selfprivacy/logic/cubit/server_installation/server_installation_cubit.dart';
-import 'package:selfprivacy/ui/components/brand_button/filled_button.dart';
+import 'package:selfprivacy/ui/components/brand_button/brand_button.dart';
 import 'package:selfprivacy/ui/components/brand_hero_screen/brand_hero_screen.dart';
 
 class NewDeviceScreen extends StatelessWidget {
@@ -71,7 +71,7 @@ class _KeyDisplay extends StatelessWidget {
             ],
           ),
           const SizedBox(height: 16),
-          FilledButton(
+          BrandButton.filled(
             child: Text(
               'basis.done'.tr(),
             ),

lib/ui/pages/onboarding/onboarding.dart

@@ -21,8 +21,7 @@ class _OnboardingPageState extends State<OnboardingPage> {
   }
 
   @override
-  Widget build(final BuildContext context) => SafeArea(
+  Widget build(final BuildContext context) => Scaffold(
-        child: Scaffold(
     body: PageView(
       controller: pageController,
       children: [
@@ -30,7 +29,6 @@ class _OnboardingPageState extends State<OnboardingPage> {
         _withPadding(secondPage()),
       ],
     ),
-        ),
   );
 
   Widget _withPadding(final Widget child) => Padding(
@@ -45,7 +43,9 @@ class _OnboardingPageState extends State<OnboardingPage> {
           maxHeight: MediaQuery.of(context).size.height,
         ),
         child: Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Expanded(
+              child: ListView(
                 children: [
                   const SizedBox(height: 30),
                   Text(
@@ -57,9 +57,8 @@ class _OnboardingPageState extends State<OnboardingPage> {
                     'onboarding.page1_text'.tr(),
                     style: Theme.of(context).textTheme.bodyMedium,
                   ),
-            const SizedBox(height: 16),
+                  const SizedBox(height: 32),
-            Flexible(
+                  Center(
-              child: Center(
                     child: Image.asset(
                       _fileName(
                         context: context,
@@ -69,6 +68,8 @@ class _OnboardingPageState extends State<OnboardingPage> {
                       ),
                     ),
                   ),
+                ],
+              ),
             ),
             BrandButton.rised(
               onPressed: () {
@@ -90,7 +91,9 @@ class _OnboardingPageState extends State<OnboardingPage> {
           maxHeight: MediaQuery.of(context).size.height,
         ),
         child: Column(
-          crossAxisAlignment: CrossAxisAlignment.start,
+          children: [
+            Expanded(
+              child: ListView(
                 children: [
                   const SizedBox(height: 30),
                   Text(
@@ -133,6 +136,9 @@ class _OnboardingPageState extends State<OnboardingPage> {
                     style: Theme.of(context).textTheme.bodyMedium,
                   ),
                   const SizedBox(height: 16),
+                ],
+              ),
+            ),
             BrandButton.rised(
               onPressed: () {
                 context.read<AppSettingsCubit>().turnOffOnboarding();

lib/ui/pages/providers/providers.dart

@@ -72,7 +72,7 @@ class _ProvidersPageState extends State<ProvidersPage> {
         children: [
           if (!isReady) ...[
             const NotReadyCard(),
-            const SizedBox(height: 24),
+            const SizedBox(height: 16),
           ],
           _Card(
             state: getServerStatus(),

lib/ui/pages/recovery_key/recovery_key.dart

@@ -7,7 +7,6 @@ import 'package:selfprivacy/logic/common_enum/common_enum.dart';
 import 'package:selfprivacy/logic/cubit/recovery_key/recovery_key_cubit.dart';
 import 'package:selfprivacy/logic/cubit/server_installation/server_installation_cubit.dart';
 import 'package:selfprivacy/ui/components/brand_button/brand_button.dart';
-import 'package:selfprivacy/ui/components/brand_button/filled_button.dart';
 import 'package:selfprivacy/ui/components/brand_cards/filled_card.dart';
 import 'package:selfprivacy/ui/components/brand_hero_screen/brand_hero_screen.dart';
 import 'package:selfprivacy/ui/pages/recovery_key/recovery_key_receiving.dart';
@@ -104,8 +103,8 @@ class _RecoveryKeyContentState extends State<RecoveryKeyContent> {
             },
           ),
         if (!_isConfigurationVisible && !keyStatus.isValid && keyStatus.exists)
-          FilledButton(
+          BrandButton.filled(
-            title: 'recovery_key.key_replace_button'.tr(),
+            child: Text('recovery_key.key_replace_button'.tr()),
             onPressed: () {
               setState(() {
                 _isConfigurationVisible = true;
@@ -393,12 +392,11 @@ class _RecoveryKeyConfigurationState extends State<RecoveryKeyConfiguration> {
           secondChild: Container(),
         ),
         const SizedBox(height: 16),
-        FilledButton(
+        BrandButton.filled(
-          title: 'recovery_key.key_receive_button'.tr(),
+          onPressed: !_isAmountError && !_isExpirationError && !_isLoading
-          disabled: _isAmountError || _isExpirationError || _isLoading,
-          onPressed: !_isAmountError && !_isExpirationError
               ? _generateRecoveryToken
               : null,
+          child: Text('recovery_key.key_receive_button'.tr()),
         ),
       ],
     );

lib/ui/pages/recovery_key/recovery_key_receiving.dart

@@ -1,6 +1,6 @@
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
-import 'package:selfprivacy/ui/components/brand_button/filled_button.dart';
+import 'package:selfprivacy/ui/components/brand_button/brand_button.dart';
 import 'package:selfprivacy/ui/components/brand_hero_screen/brand_hero_screen.dart';
 import 'package:selfprivacy/ui/components/info_box/info_box.dart';
 
@@ -33,8 +33,8 @@ class RecoveryKeyReceiving extends StatelessWidget {
             text: 'recovery_key.key_receiving_info'.tr(),
           ),
           const SizedBox(height: 16),
-          FilledButton(
+          BrandButton.filled(
-            title: 'recovery_key.key_receiving_done'.tr(),
+            child: Text('recovery_key.key_receiving_done'.tr()),
             onPressed: () {
               Navigator.of(context).popUntil((final route) => route.isFirst);
             },

lib/ui/pages/root_route.dart

@@ -52,8 +52,7 @@ class _RootPageState extends State<RootPage> with TickerProviderStateMixin {
     final bool isReady = context.watch<ServerInstallationCubit>().state
         is ServerInstallationFinished;
 
-    return SafeArea(
+    return Provider<ChangeTab>(
-      child: Provider<ChangeTab>(
       create: (final _) => ChangeTab(tabController.animateTo),
       child: Scaffold(
         body: TabBarView(
@@ -86,7 +85,6 @@ class _RootPageState extends State<RootPage> with TickerProviderStateMixin {
               )
             : null,
       ),
-      ),
     );
   }
 }

lib/ui/pages/server_storage/binds_migration/migration_process_page.dart

@@ -2,7 +2,7 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:selfprivacy/logic/cubit/server_jobs/server_jobs_cubit.dart';
 import 'package:selfprivacy/logic/models/json/server_job.dart';
-import 'package:selfprivacy/ui/components/brand_button/filled_button.dart';
+import 'package:selfprivacy/ui/components/brand_button/brand_button.dart';
 import 'package:selfprivacy/ui/components/brand_hero_screen/brand_hero_screen.dart';
 import 'package:selfprivacy/ui/components/brand_linear_indicator/brand_linear_indicator.dart';
 import 'package:selfprivacy/ui/pages/root_route.dart';
@@ -50,8 +50,8 @@ class _MigrationProcessPageState extends State<MigrationProcessPage> {
           ),
         if (job.finishedAt != null) const SizedBox(height: 16),
         if (job.finishedAt != null)
-          FilledButton(
+          BrandButton.filled(
-            title: 'storage.migration_done'.tr(),
+            child: Text('storage.migration_done'.tr()),
             onPressed: () {
               Navigator.of(context).pushAndRemoveUntil(
                 materialRoute(const RootPage()),

lib/ui/pages/server_storage/binds_migration/services_migration.dart

@@ -5,7 +5,7 @@ import 'package:selfprivacy/logic/cubit/services/services_cubit.dart';
 import 'package:selfprivacy/logic/models/disk_size.dart';
 import 'package:selfprivacy/logic/models/service.dart';
 import 'package:selfprivacy/ui/components/brand_bottom_sheet/brand_bottom_sheet.dart';
-import 'package:selfprivacy/ui/components/brand_button/filled_button.dart';
+import 'package:selfprivacy/ui/components/brand_button/brand_button.dart';
 import 'package:selfprivacy/ui/components/brand_header/brand_header.dart';
 import 'package:selfprivacy/ui/components/info_box/info_box.dart';
 import 'package:selfprivacy/logic/models/disk_status.dart';
@@ -163,8 +163,8 @@ class _ServicesMigrationPageState extends State<ServicesMigrationPage> {
               ),
             ),
             const SizedBox(height: 16),
-            FilledButton(
+            BrandButton.filled(
-              title: 'storage.start_migration_button'.tr(),
+              child: Text('storage.start_migration_button'.tr()),
               onPressed: () {
                 if (widget.isMigration) {
                   context.read<ServerJobsCubit>().migrateToBinds(

lib/ui/pages/server_storage/extending_volume.dart

@@ -5,7 +5,7 @@ import 'package:selfprivacy/logic/cubit/provider_volumes/provider_volume_cubit.d
 import 'package:selfprivacy/logic/cubit/server_volumes/server_volume_cubit.dart';
 import 'package:selfprivacy/logic/models/disk_size.dart';
 import 'package:selfprivacy/logic/models/price.dart';
-import 'package:selfprivacy/ui/components/brand_button/filled_button.dart';
+import 'package:selfprivacy/ui/components/brand_button/brand_button.dart';
 import 'package:selfprivacy/ui/components/brand_hero_screen/brand_hero_screen.dart';
 import 'package:selfprivacy/logic/models/disk_status.dart';
 import 'package:selfprivacy/ui/pages/root_route.dart';
@@ -146,9 +146,8 @@ class _ExtendingVolumePageState extends State<ExtendingVolumePage> {
                 },
               ),
               const SizedBox(height: 16),
-              FilledButton(
+              BrandButton.filled(
-                title: 'storage.extend_volume_button.title'.tr(),
+                onPressed: _isError || isAlreadyResizing
-                onPressed: _isError
                     ? null
                     : () {
                         context.read<ApiProviderVolumeCubit>().resizeVolume(
@@ -161,7 +160,7 @@ class _ExtendingVolumePageState extends State<ExtendingVolumePage> {
                           (final predicate) => false,
                         );
                       },
-                disabled: _isError || isAlreadyResizing,
+                child: Text('storage.extend_volume_button.title'.tr()),
               ),
               const SizedBox(height: 16),
               const Divider(

lib/ui/pages/services/service_page.dart

@@ -9,7 +9,7 @@ import 'package:selfprivacy/logic/models/service.dart';
 import 'package:selfprivacy/ui/components/brand_cards/filled_card.dart';
 import 'package:selfprivacy/ui/components/brand_hero_screen/brand_hero_screen.dart';
 import 'package:selfprivacy/ui/pages/server_storage/binds_migration/services_migration.dart';
-import 'package:selfprivacy/utils/network_utils.dart';
+import 'package:selfprivacy/utils/launch_url.dart';
 import 'package:selfprivacy/utils/route_transitions/basic.dart';
 
 class ServicePage extends StatefulWidget {

lib/ui/pages/services/services.dart

@@ -12,7 +12,7 @@ import 'package:selfprivacy/ui/components/icon_status_mask/icon_status_mask.dart
 import 'package:selfprivacy/ui/components/not_ready_card/not_ready_card.dart';
 import 'package:easy_localization/easy_localization.dart';
 import 'package:selfprivacy/ui/pages/services/service_page.dart';
-import 'package:selfprivacy/utils/network_utils.dart';
+import 'package:selfprivacy/utils/launch_url.dart';
 import 'package:selfprivacy/utils/route_transitions/basic.dart';
 import 'package:selfprivacy/utils/ui_helpers.dart';
 

lib/ui/pages/setup/initializing/dns_provider_picker.dart

@@ -6,8 +6,8 @@ import 'package:selfprivacy/config/brand_theme.dart';
 import 'package:selfprivacy/logic/cubit/app_config_dependent/authentication_dependend_cubit.dart';
 import 'package:selfprivacy/logic/cubit/forms/setup/initializing/dns_provider_form_cubit.dart';
 import 'package:selfprivacy/logic/models/hive/server_domain.dart';
+import 'package:selfprivacy/ui/components/brand_button/brand_button.dart';
 import 'package:selfprivacy/ui/components/brand_bottom_sheet/brand_bottom_sheet.dart';
-import 'package:selfprivacy/ui/components/brand_button/filled_button.dart';
 import 'package:selfprivacy/ui/components/brand_button/outlined_button.dart';
 import 'package:selfprivacy/ui/components/brand_cards/outlined_card.dart';
 import 'package:selfprivacy/ui/components/brand_md/brand_md.dart';
@@ -119,8 +119,8 @@ class ProviderInputDataPage extends StatelessWidget {
             ),
           ),
           const SizedBox(height: 32),
-          FilledButton(
+          BrandButton.rised(
-            title: 'basis.connect'.tr(),
+            text: 'basis.connect'.tr(),
             onPressed: () => providerCubit.trySubmit(),
           ),
           const SizedBox(height: 10),
@@ -223,8 +223,8 @@ class ProviderSelectionPage extends StatelessWidget {
                       style: Theme.of(context).textTheme.bodySmall,
                     ),
                     const SizedBox(height: 16),
-                    FilledButton(
+                    BrandButton.rised(
-                      title: 'basis.select'.tr(),
+                      text: 'basis.select'.tr(),
                       onPressed: () {
                         serverInstallationCubit
                             .setDnsProviderType(DnsProviderType.cloudflare);
@@ -288,8 +288,8 @@ class ProviderSelectionPage extends StatelessWidget {
                       style: Theme.of(context).textTheme.bodySmall,
                     ),
                     const SizedBox(height: 16),
-                    FilledButton(
+                    BrandButton.rised(
-                      title: 'basis.select'.tr(),
+                      text: 'basis.select'.tr(),
                       onPressed: () {
                         serverInstallationCubit
                             .setDnsProviderType(DnsProviderType.digitalOcean);

lib/ui/pages/setup/initializing/initializing.dart

@@ -68,6 +68,9 @@ class InitializingPage extends StatelessWidget {
                   },
                 )
             ],
+            title: Text(
+              'more_page.configuration_wizard'.tr(),
+            ),
             bottom: PreferredSize(
               preferredSize: const Size.fromHeight(28),
               child: Padding(

lib/ui/pages/setup/initializing/server_provider_picker.dart

@@ -7,12 +7,12 @@ import 'package:selfprivacy/logic/cubit/app_config_dependent/authentication_depe
 import 'package:selfprivacy/logic/cubit/forms/setup/initializing/server_provider_form_cubit.dart';
 import 'package:selfprivacy/logic/models/hive/server_details.dart';
 import 'package:selfprivacy/ui/components/brand_bottom_sheet/brand_bottom_sheet.dart';
-import 'package:selfprivacy/ui/components/brand_button/filled_button.dart';
+import 'package:selfprivacy/ui/components/brand_button/brand_button.dart';
 import 'package:selfprivacy/ui/components/brand_button/outlined_button.dart';
 import 'package:selfprivacy/ui/components/brand_cards/outlined_card.dart';
 import 'package:selfprivacy/ui/components/brand_md/brand_md.dart';
 import 'package:selfprivacy/ui/components/info_box/info_box.dart';
-import 'package:selfprivacy/utils/network_utils.dart';
+import 'package:selfprivacy/utils/launch_url.dart';
 
 class ServerProviderPicker extends StatefulWidget {
   const ServerProviderPicker({
@@ -120,8 +120,8 @@ class ProviderInputDataPage extends StatelessWidget {
             ),
           ),
           const SizedBox(height: 32),
-          FilledButton(
+          BrandButton.filled(
-            title: 'basis.connect'.tr(),
+            child: Text('basis.connect'.tr()),
             onPressed: () => providerCubit.trySubmit(),
           ),
           const SizedBox(height: 10),
@@ -238,8 +238,8 @@ class ProviderSelectionPage extends StatelessWidget {
                       style: Theme.of(context).textTheme.bodySmall,
                     ),
                     const SizedBox(height: 16),
-                    FilledButton(
+                    BrandButton.filled(
-                      title: 'basis.select'.tr(),
+                      child: Text('basis.select'.tr()),
                       onPressed: () {
                         serverInstallationCubit
                             .setServerProviderType(ServerProviderType.hetzner);
@@ -312,8 +312,8 @@ class ProviderSelectionPage extends StatelessWidget {
                       style: Theme.of(context).textTheme.bodySmall,
                     ),
                     const SizedBox(height: 16),
-                    FilledButton(
+                    BrandButton.filled(
-                      title: 'basis.select'.tr(),
+                      child: Text('basis.select'.tr()),
                       onPressed: () {
                         serverInstallationCubit.setServerProviderType(
                             ServerProviderType.digitalOcean);

lib/ui/pages/setup/recovering/recover_by_new_device_key.dart

@@ -1,7 +1,7 @@
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:selfprivacy/logic/cubit/forms/setup/recovering/recovery_device_form_cubit.dart';
-import 'package:selfprivacy/ui/components/brand_button/filled_button.dart';
+import 'package:selfprivacy/ui/components/brand_button/brand_button.dart';
 import 'package:selfprivacy/ui/components/brand_hero_screen/brand_hero_screen.dart';
 import 'package:selfprivacy/utils/route_transitions/basic.dart';
 import 'package:cubit_form/cubit_form.dart';
@@ -20,8 +20,8 @@ class RecoverByNewDeviceKeyInstruction extends StatelessWidget {
         onBackButtonPressed:
             context.read<ServerInstallationCubit>().revertRecoveryStep,
         children: [
-          FilledButton(
+          BrandButton.filled(
-            title: 'recovering.method_device_button'.tr(),
+            child: Text('recovering.method_device_button'.tr()),
             onPressed: () => Navigator.of(context)
                 .push(materialRoute(const RecoverByNewDeviceKeyInput())),
           )
@@ -73,11 +73,11 @@ class RecoverByNewDeviceKeyInput extends StatelessWidget {
                 ),
                 const SizedBox(height: 16),
                 FilledButton(
-                  title: 'basis.continue'.tr(),
                   onPressed: formCubitState.isSubmitting
                       ? null
                       : () =>
                           context.read<RecoveryDeviceFormCubit>().trySubmit(),
+                  child: Text('basis.continue'.tr()),
                 )
               ],
             );

lib/ui/pages/setup/recovering/recover_by_old_token.dart

@@ -1,7 +1,7 @@
 import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:selfprivacy/logic/cubit/forms/setup/recovering/recovery_device_form_cubit.dart';
-import 'package:selfprivacy/ui/components/brand_button/filled_button.dart';
+import 'package:selfprivacy/ui/components/brand_button/brand_button.dart';
 import 'package:selfprivacy/ui/components/brand_hero_screen/brand_hero_screen.dart';
 import 'package:selfprivacy/ui/components/brand_md/brand_md.dart';
 import 'package:cubit_form/cubit_form.dart';
@@ -35,8 +35,8 @@ class RecoverByOldTokenInstruction extends StatelessWidget {
               fileName: instructionFilename,
             ),
             const SizedBox(height: 16),
-            FilledButton(
+            BrandButton.filled(
-              title: 'recovering.method_device_button'.tr(),
+              child: Text('recovering.method_device_button'.tr()),
               onPressed: () => context
                   .read<ServerInstallationCubit>()
                   .selectRecoveryMethod(ServerRecoveryMethods.oldToken),
@@ -82,11 +82,11 @@ class RecoverByOldToken extends StatelessWidget {
                 ),
               ),
               const SizedBox(height: 16),
-              FilledButton(
+              BrandButton.filled(
-                title: 'basis.continue'.tr(),
                 onPressed: formCubitState.isSubmitting
                     ? null
                     : () => context.read<RecoveryDeviceFormCubit>().trySubmit(),
+                child: Text('basis.continue'.tr()),
               )
             ],
           );

lib/ui/pages/setup/recovering/recover_by_recovery_key.dart

@@ -4,7 +4,7 @@ import 'package:flutter/material.dart';
 import 'package:selfprivacy/logic/cubit/forms/factories/field_cubit_factory.dart';
 import 'package:selfprivacy/logic/cubit/forms/setup/recovering/recovery_device_form_cubit.dart';
 import 'package:selfprivacy/logic/cubit/server_installation/server_installation_cubit.dart';
-import 'package:selfprivacy/ui/components/brand_button/filled_button.dart';
+import 'package:selfprivacy/ui/components/brand_button/brand_button.dart';
 import 'package:selfprivacy/ui/components/brand_hero_screen/brand_hero_screen.dart';
 
 class RecoverByRecoveryKey extends StatelessWidget {
@@ -43,11 +43,11 @@ class RecoverByRecoveryKey extends StatelessWidget {
                 ),
               ),
               const SizedBox(height: 16),
-              FilledButton(
+              BrandButton.filled(
-                title: 'basis.continue'.tr(),
                 onPressed: formCubitState.isSubmitting
                     ? null
                     : () => context.read<RecoveryDeviceFormCubit>().trySubmit(),
+                child: Text('basis.continue'.tr()),
               )
             ],
           );

lib/ui/pages/setup/recovering/recovery_confirm_server.dart

@@ -2,7 +2,6 @@ import 'package:easy_localization/easy_localization.dart';
 import 'package:flutter/material.dart';
 import 'package:selfprivacy/logic/cubit/app_config_dependent/authentication_dependend_cubit.dart';
 import 'package:selfprivacy/logic/models/server_basic_info.dart';
-import 'package:selfprivacy/ui/components/brand_button/filled_button.dart';
 import 'package:selfprivacy/ui/components/brand_button/brand_button.dart';
 import 'package:selfprivacy/ui/components/brand_cards/filled_card.dart';
 import 'package:selfprivacy/ui/components/brand_hero_screen/brand_hero_screen.dart';
@@ -70,7 +69,7 @@ class _RecoveryConfirmServerState extends State<RecoveryConfirmServer> {
                       Center(
                         child: Text(
                           'recovering.no_servers'.tr(),
-                          style: Theme.of(context).textTheme.headline6,
+                          style: Theme.of(context).textTheme.titleLarge,
                         ),
                       ),
                   ],
@@ -97,8 +96,8 @@ class _RecoveryConfirmServerState extends State<RecoveryConfirmServer> {
             server: server,
           ),
           const SizedBox(height: 16),
-          FilledButton(
+          BrandButton.filled(
-            title: 'recovering.confirm_server_accept'.tr(),
+            child: Text('recovering.confirm_server_accept'.tr()),
             onPressed: () => _showConfirmationDialog(context, server),
           ),
           const SizedBox(height: 16),

lib/ui/pages/setup/recovering/recovery_routing.dart

@@ -4,7 +4,7 @@ import 'package:flutter/material.dart';
 import 'package:selfprivacy/logic/cubit/server_installation/server_installation_cubit.dart';
 import 'package:selfprivacy/logic/cubit/forms/factories/field_cubit_factory.dart';
 import 'package:selfprivacy/logic/cubit/forms/setup/recovering/recovery_domain_form_cubit.dart';
-import 'package:selfprivacy/ui/components/brand_button/filled_button.dart';
+import 'package:selfprivacy/ui/components/brand_button/brand_button.dart';
 import 'package:selfprivacy/ui/components/brand_hero_screen/brand_hero_screen.dart';
 import 'package:selfprivacy/ui/pages/root_route.dart';
 import 'package:selfprivacy/ui/pages/setup/recovering/recover_by_old_token.dart';
@@ -126,12 +126,12 @@ class SelectDomainToRecover extends StatelessWidget {
                   ),
                 ),
                 const SizedBox(height: 16),
-                FilledButton(
+                BrandButton.filled(
-                  title: 'basis.continue'.tr(),
                   onPressed: formCubitState.isSubmitting
                       ? null
                       : () =>
                           context.read<RecoveryDomainFormCubit>().trySubmit(),
+                  child: Text('basis.continue'.tr()),
                 )
               ],
             ),

lib/ui/pages/setup/recovering/recovery_server_provider_connected.dart

@@ -3,7 +3,6 @@ import 'package:flutter/material.dart';
 import 'package:selfprivacy/config/brand_theme.dart';
 import 'package:selfprivacy/logic/cubit/forms/setup/initializing/server_provider_form_cubit.dart';
 import 'package:selfprivacy/ui/components/brand_bottom_sheet/brand_bottom_sheet.dart';
-import 'package:selfprivacy/ui/components/brand_button/filled_button.dart';
 import 'package:selfprivacy/ui/components/brand_button/brand_button.dart';
 import 'package:selfprivacy/ui/components/brand_hero_screen/brand_hero_screen.dart';
 import 'package:cubit_form/cubit_form.dart';
@@ -46,11 +45,11 @@ class RecoveryServerProviderConnected extends StatelessWidget {
                 ),
               ),
               const SizedBox(height: 16),
-              FilledButton(
+              BrandButton.filled(
-                title: 'basis.continue'.tr(),
                 onPressed: formCubitState.isSubmitting
                     ? null
                     : () => context.read<ServerProviderFormCubit>().trySubmit(),
+                child: Text('basis.continue'.tr()),
               ),
               const SizedBox(height: 16),
               BrandButton.text(

lib/utils/launch_url.dart

@@ -0,0 +1,13 @@
+import 'package:url_launcher/url_launcher.dart';
+
+void launchURL(final url) async {
+  try {
+    final Uri uri = Uri.parse(url);
+    await launchUrl(
+      uri,
+      mode: LaunchMode.externalApplication,
+    );
+  } catch (e) {
+    print(e);
+  }
+}

macos/Flutter/Flutter-Debug.xcconfig

@@ -1 +1,2 @@
+#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"
 #include "ephemeral/Flutter-Generated.xcconfig"

macos/Flutter/Flutter-Release.xcconfig

@@ -1 +1,2 @@
+#include? "Pods/Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"
 #include "ephemeral/Flutter-Generated.xcconfig"

macos/Flutter/GeneratedPluginRegistrant.swift

@@ -5,14 +5,14 @@
 import FlutterMacOS
 import Foundation
 
-import connectivity_plus_macos
+import connectivity_plus
-import device_info_plus_macos
+import device_info_plus
 import dynamic_color
 import flutter_secure_storage_macos
 import package_info
-import path_provider_macos
+import path_provider_foundation
-import share_plus_macos
+import share_plus
-import shared_preferences_macos
+import shared_preferences_foundation
 import url_launcher_macos
 import wakelock_macos
 
@@ -20,7 +20,7 @@ func RegisterGeneratedPlugins(registry: FlutterPluginRegistry) {
   ConnectivityPlugin.register(with: registry.registrar(forPlugin: "ConnectivityPlugin"))
   DeviceInfoPlusMacosPlugin.register(with: registry.registrar(forPlugin: "DeviceInfoPlusMacosPlugin"))
   DynamicColorPlugin.register(with: registry.registrar(forPlugin: "DynamicColorPlugin"))
-  FlutterSecureStorageMacosPlugin.register(with: registry.registrar(forPlugin: "FlutterSecureStorageMacosPlugin"))
+  FlutterSecureStoragePlugin.register(with: registry.registrar(forPlugin: "FlutterSecureStoragePlugin"))
   FLTPackageInfoPlugin.register(with: registry.registrar(forPlugin: "FLTPackageInfoPlugin"))
   PathProviderPlugin.register(with: registry.registrar(forPlugin: "PathProviderPlugin"))
   SharePlusMacosPlugin.register(with: registry.registrar(forPlugin: "SharePlusMacosPlugin"))

macos/Podfile

@@ -0,0 +1,43 @@
+platform :osx, '10.13'
+
+# CocoaPods analytics sends network stats synchronously affecting flutter build latency.
+ENV['COCOAPODS_DISABLE_STATS'] = 'true'
+
+project 'Runner', {
+  'Debug' => :debug,
+  'Profile' => :release,
+  'Release' => :release,
+}
+
+def flutter_root
+  generated_xcode_build_settings_path = File.expand_path(File.join('..', 'Flutter', 'ephemeral', 'Flutter-Generated.xcconfig'), __FILE__)
+  unless File.exist?(generated_xcode_build_settings_path)
+    raise "#{generated_xcode_build_settings_path} must exist. If you're running pod install manually, make sure \"flutter pub get\" is executed first"
+  end
+
+  File.foreach(generated_xcode_build_settings_path) do |line|
+    matches = line.match(/FLUTTER_ROOT\=(.*)/)
+    return matches[1].strip if matches
+  end
+  raise "FLUTTER_ROOT not found in #{generated_xcode_build_settings_path}. Try deleting Flutter-Generated.xcconfig, then run \"flutter pub get\""
+end
+
+require File.expand_path(File.join('packages', 'flutter_tools', 'bin', 'podhelper'), flutter_root)
+
+flutter_macos_podfile_setup
+
+target 'Runner' do
+  use_frameworks!
+  use_modular_headers!
+
+  flutter_install_all_macos_pods File.dirname(File.realpath(__FILE__))
+end
+
+post_install do |installer|
+  installer.pods_project.targets.each do |target|
+    flutter_additional_macos_build_settings(target)
+    target.build_configurations.each do |config|
+      config.build_settings['MACOSX_DEPLOYMENT_TARGET'] = '10.13'
+    end
+  end
+end

macos/Podfile.lock

@@ -0,0 +1,83 @@
+PODS:
+  - connectivity_plus_macos (0.0.1):
+    - FlutterMacOS
+    - ReachabilitySwift
+  - device_info_plus_macos (0.0.1):
+    - FlutterMacOS
+  - dynamic_color (0.0.2):
+    - FlutterMacOS
+  - flutter_secure_storage_macos (6.1.1):
+    - FlutterMacOS
+  - FlutterMacOS (1.0.0)
+  - package_info (0.0.1):
+    - FlutterMacOS
+  - path_provider_macos (0.0.1):
+    - FlutterMacOS
+  - ReachabilitySwift (5.0.0)
+  - share_plus_macos (0.0.1):
+    - FlutterMacOS
+  - shared_preferences_macos (0.0.1):
+    - FlutterMacOS
+  - url_launcher_macos (0.0.1):
+    - FlutterMacOS
+  - wakelock_macos (0.0.1):
+    - FlutterMacOS
+
+DEPENDENCIES:
+  - connectivity_plus_macos (from `Flutter/ephemeral/.symlinks/plugins/connectivity_plus_macos/macos`)
+  - device_info_plus_macos (from `Flutter/ephemeral/.symlinks/plugins/device_info_plus_macos/macos`)
+  - dynamic_color (from `Flutter/ephemeral/.symlinks/plugins/dynamic_color/macos`)
+  - flutter_secure_storage_macos (from `Flutter/ephemeral/.symlinks/plugins/flutter_secure_storage_macos/macos`)
+  - FlutterMacOS (from `Flutter/ephemeral`)
+  - package_info (from `Flutter/ephemeral/.symlinks/plugins/package_info/macos`)
+  - path_provider_macos (from `Flutter/ephemeral/.symlinks/plugins/path_provider_macos/macos`)
+  - share_plus_macos (from `Flutter/ephemeral/.symlinks/plugins/share_plus_macos/macos`)
+  - shared_preferences_macos (from `Flutter/ephemeral/.symlinks/plugins/shared_preferences_macos/macos`)
+  - url_launcher_macos (from `Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos`)
+  - wakelock_macos (from `Flutter/ephemeral/.symlinks/plugins/wakelock_macos/macos`)
+
+SPEC REPOS:
+  trunk:
+    - ReachabilitySwift
+
+EXTERNAL SOURCES:
+  connectivity_plus_macos:
+    :path: Flutter/ephemeral/.symlinks/plugins/connectivity_plus_macos/macos
+  device_info_plus_macos:
+    :path: Flutter/ephemeral/.symlinks/plugins/device_info_plus_macos/macos
+  dynamic_color:
+    :path: Flutter/ephemeral/.symlinks/plugins/dynamic_color/macos
+  flutter_secure_storage_macos:
+    :path: Flutter/ephemeral/.symlinks/plugins/flutter_secure_storage_macos/macos
+  FlutterMacOS:
+    :path: Flutter/ephemeral
+  package_info:
+    :path: Flutter/ephemeral/.symlinks/plugins/package_info/macos
+  path_provider_macos:
+    :path: Flutter/ephemeral/.symlinks/plugins/path_provider_macos/macos
+  share_plus_macos:
+    :path: Flutter/ephemeral/.symlinks/plugins/share_plus_macos/macos
+  shared_preferences_macos:
+    :path: Flutter/ephemeral/.symlinks/plugins/shared_preferences_macos/macos
+  url_launcher_macos:
+    :path: Flutter/ephemeral/.symlinks/plugins/url_launcher_macos/macos
+  wakelock_macos:
+    :path: Flutter/ephemeral/.symlinks/plugins/wakelock_macos/macos
+
+SPEC CHECKSUMS:
+  connectivity_plus_macos: f6e86fd000e971d361e54b5afcadc8c8fa773308
+  device_info_plus_macos: 1ad388a1ef433505c4038e7dd9605aadd1e2e9c7
+  dynamic_color: 394d6a888650f8534e029b27d2f8bc5c64e44008
+  flutter_secure_storage_macos: 75c8cadfdba05ca007c0fa4ea0c16e5cf85e521b
+  FlutterMacOS: ae6af50a8ea7d6103d888583d46bd8328a7e9811
+  package_info: 6eba2fd8d3371dda2d85c8db6fe97488f24b74b2
+  path_provider_macos: 3c0c3b4b0d4a76d2bf989a913c2de869c5641a19
+  ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825
+  share_plus_macos: 853ee48e7dce06b633998ca0735d482dd671ade4
+  shared_preferences_macos: a64dc611287ed6cbe28fd1297898db1336975727
+  url_launcher_macos: 597e05b8e514239626bcf4a850fcf9ef5c856ec3
+  wakelock_macos: bc3f2a9bd8d2e6c89fee1e1822e7ddac3bd004a9
+
+PODFILE CHECKSUM: 69608711ca93a0af5aac7e2f834b34cf2422afce
+
+COCOAPODS: 1.11.3

macos/Runner.xcodeproj/project.pbxproj

@@ -26,6 +26,7 @@
 		33CC10F32044A3C60003C045 /* Assets.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F22044A3C60003C045 /* Assets.xcassets */; };
 		33CC10F62044A3C60003C045 /* MainMenu.xib in Resources */ = {isa = PBXBuildFile; fileRef = 33CC10F42044A3C60003C045 /* MainMenu.xib */; };
 		33CC11132044BFA00003C045 /* MainFlutterWindow.swift in Sources */ = {isa = PBXBuildFile; fileRef = 33CC11122044BFA00003C045 /* MainFlutterWindow.swift */; };
+		CE333BC2BFA23F98DF817C09 /* Pods_Runner.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 0609448D29F0321D616C7454 /* Pods_Runner.framework */; };
 /* End PBXBuildFile section */
 
 /* Begin PBXContainerItemProxy section */
@@ -52,9 +53,11 @@
 /* End PBXCopyFilesBuildPhase section */
 
 /* Begin PBXFileReference section */
+		0609448D29F0321D616C7454 /* Pods_Runner.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Runner.framework; sourceTree = BUILT_PRODUCTS_DIR; };
+		0DE40E103CF4B2BD09F1A074 /* Pods-Runner.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.debug.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.debug.xcconfig"; sourceTree = "<group>"; };
 		333000ED22D3DE5D00554162 /* Warnings.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Warnings.xcconfig; sourceTree = "<group>"; };
 		335BBD1A22A9A15E00E9071D /* GeneratedPluginRegistrant.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = GeneratedPluginRegistrant.swift; sourceTree = "<group>"; };
-		33CC10ED2044A3C60003C045 /* selfprivacy.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = "selfprivacy.app"; sourceTree = BUILT_PRODUCTS_DIR; };
+		33CC10ED2044A3C60003C045 /* selfprivacy.app */ = {isa = PBXFileReference; explicitFileType = wrapper.application; includeInIndex = 0; path = selfprivacy.app; sourceTree = BUILT_PRODUCTS_DIR; };
 		33CC10F02044A3C60003C045 /* AppDelegate.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = AppDelegate.swift; sourceTree = "<group>"; };
 		33CC10F22044A3C60003C045 /* Assets.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Assets.xcassets; path = Runner/Assets.xcassets; sourceTree = "<group>"; };
 		33CC10F52044A3C60003C045 /* Base */ = {isa = PBXFileReference; lastKnownFileType = file.xib; name = Base; path = Base.lproj/MainMenu.xib; sourceTree = "<group>"; };
@@ -66,8 +69,10 @@
 		33E51913231747F40026EE4D /* DebugProfile.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = DebugProfile.entitlements; sourceTree = "<group>"; };
 		33E51914231749380026EE4D /* Release.entitlements */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.entitlements; path = Release.entitlements; sourceTree = "<group>"; };
 		33E5194F232828860026EE4D /* AppInfo.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = AppInfo.xcconfig; sourceTree = "<group>"; };
+		481A265FF1547C7E1F902035 /* Pods-Runner.profile.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.profile.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.profile.xcconfig"; sourceTree = "<group>"; };
 		7AFA3C8E1D35360C0083082E /* Release.xcconfig */ = {isa = PBXFileReference; lastKnownFileType = text.xcconfig; path = Release.xcconfig; sourceTree = "<group>"; };
 		9740EEB21CF90195004384FC /* Debug.xcconfig */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.xcconfig; path = Debug.xcconfig; sourceTree = "<group>"; };
+		DCFB3422A901A681B822A004 /* Pods-Runner.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Runner.release.xcconfig"; path = "Target Support Files/Pods-Runner/Pods-Runner.release.xcconfig"; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
 /* Begin PBXFrameworksBuildPhase section */
@@ -75,12 +80,23 @@
 			isa = PBXFrameworksBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
+				CE333BC2BFA23F98DF817C09 /* Pods_Runner.framework in Frameworks */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
 /* End PBXFrameworksBuildPhase section */
 
 /* Begin PBXGroup section */
+		32F2223E51A4F9B1A6E798D8 /* Pods */ = {
+			isa = PBXGroup;
+			children = (
+				0DE40E103CF4B2BD09F1A074 /* Pods-Runner.debug.xcconfig */,
+				DCFB3422A901A681B822A004 /* Pods-Runner.release.xcconfig */,
+				481A265FF1547C7E1F902035 /* Pods-Runner.profile.xcconfig */,
+			);
+			path = Pods;
+			sourceTree = "<group>";
+		};
 		33BA886A226E78AF003329D5 /* Configs */ = {
 			isa = PBXGroup;
 			children = (
@@ -99,6 +115,7 @@
 				33CEB47122A05771004F2AC0 /* Flutter */,
 				33CC10EE2044A3C60003C045 /* Products */,
 				D73912EC22F37F3D000D13A0 /* Frameworks */,
+				32F2223E51A4F9B1A6E798D8 /* Pods */,
 			);
 			sourceTree = "<group>";
 		};
@@ -148,6 +165,7 @@
 		D73912EC22F37F3D000D13A0 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
+				0609448D29F0321D616C7454 /* Pods_Runner.framework */,
 			);
 			name = Frameworks;
 			sourceTree = "<group>";
@@ -159,11 +177,13 @@
 			isa = PBXNativeTarget;
 			buildConfigurationList = 33CC10FB2044A3C60003C045 /* Build configuration list for PBXNativeTarget "Runner" */;
 			buildPhases = (
+				C9AFDA92EDCDEAF3FC96A0A3 /* [CP] Check Pods Manifest.lock */,
 				33CC10E92044A3C60003C045 /* Sources */,
 				33CC10EA2044A3C60003C045 /* Frameworks */,
 				33CC10EB2044A3C60003C045 /* Resources */,
 				33CC110E2044A8840003C045 /* Bundle Framework */,
 				3399D490228B24CF009A79C7 /* ShellScript */,
+				B270A3A9AFF6A3D0E129954A /* [CP] Embed Pods Frameworks */,
 			);
 			buildRules = (
 			);
@@ -270,6 +290,45 @@
 			shellPath = /bin/sh;
 			shellScript = "\"$FLUTTER_ROOT\"/packages/flutter_tools/bin/macos_assemble.sh && touch Flutter/ephemeral/tripwire";
 		};
+		B270A3A9AFF6A3D0E129954A /* [CP] Embed Pods Frameworks */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-input-files.xcfilelist",
+			);
+			name = "[CP] Embed Pods Frameworks";
+			outputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks-${CONFIGURATION}-output-files.xcfilelist",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-Runner/Pods-Runner-frameworks.sh\"\n";
+			showEnvVarsInLog = 0;
+		};
+		C9AFDA92EDCDEAF3FC96A0A3 /* [CP] Check Pods Manifest.lock */ = {
+			isa = PBXShellScriptBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+			);
+			inputFileListPaths = (
+			);
+			inputPaths = (
+				"${PODS_PODFILE_DIR_PATH}/Podfile.lock",
+				"${PODS_ROOT}/Manifest.lock",
+			);
+			name = "[CP] Check Pods Manifest.lock";
+			outputFileListPaths = (
+			);
+			outputPaths = (
+				"$(DERIVED_FILE_DIR)/Pods-Runner-checkManifestLockResult.txt",
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+			shellPath = /bin/sh;
+			shellScript = "diff \"${PODS_PODFILE_DIR_PATH}/Podfile.lock\" \"${PODS_ROOT}/Manifest.lock\" > /dev/null\nif [ $? != 0 ] ; then\n    # print error to STDERR\n    echo \"error: The sandbox is not in sync with the Podfile.lock. Run 'pod install' or update your CocoaPods installation.\" >&2\n    exit 1\nfi\n# This output is used by Xcode 'outputs' to avoid re-running this script phase.\necho \"SUCCESS\" > \"${SCRIPT_OUTPUT_FILE_0}\"\n";
+			showEnvVarsInLog = 0;
+		};
 /* End PBXShellScriptBuildPhase section */
 
 /* Begin PBXSourcesBuildPhase section */
@@ -344,7 +403,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.11;
+				MACOSX_DEPLOYMENT_TARGET = 10.13;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = macosx;
 				SWIFT_COMPILATION_MODE = wholemodule;
@@ -361,11 +420,16 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
+				DEVELOPMENT_TEAM = 46723VZHWZ;
 				INFOPLIST_FILE = Runner/Info.plist;
+				INFOPLIST_KEY_CFBundleDisplayName = SelfPrivacy;
+				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
+				MACOSX_DEPLOYMENT_TARGET = 10.13;
+				MARKETING_VERSION = 0.8.0;
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_VERSION = 5.0;
 			};
@@ -423,7 +487,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.11;
+				MACOSX_DEPLOYMENT_TARGET = 10.13;
 				MTL_ENABLE_DEBUG_INFO = YES;
 				ONLY_ACTIVE_ARCH = YES;
 				SDKROOT = macosx;
@@ -470,7 +534,7 @@
 				GCC_WARN_UNINITIALIZED_AUTOS = YES_AGGRESSIVE;
 				GCC_WARN_UNUSED_FUNCTION = YES;
 				GCC_WARN_UNUSED_VARIABLE = YES;
-				MACOSX_DEPLOYMENT_TARGET = 10.11;
+				MACOSX_DEPLOYMENT_TARGET = 10.13;
 				MTL_ENABLE_DEBUG_INFO = NO;
 				SDKROOT = macosx;
 				SWIFT_COMPILATION_MODE = wholemodule;
@@ -487,11 +551,16 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/DebugProfile.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
+				DEVELOPMENT_TEAM = 46723VZHWZ;
 				INFOPLIST_FILE = Runner/Info.plist;
+				INFOPLIST_KEY_CFBundleDisplayName = SelfPrivacy;
+				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
+				MACOSX_DEPLOYMENT_TARGET = 10.13;
+				MARKETING_VERSION = 0.8.0;
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
@@ -507,11 +576,16 @@
 				CODE_SIGN_ENTITLEMENTS = Runner/Release.entitlements;
 				CODE_SIGN_STYLE = Automatic;
 				COMBINE_HIDPI_IMAGES = YES;
+				DEVELOPMENT_TEAM = 46723VZHWZ;
 				INFOPLIST_FILE = Runner/Info.plist;
+				INFOPLIST_KEY_CFBundleDisplayName = SelfPrivacy;
+				INFOPLIST_KEY_LSApplicationCategoryType = "public.app-category.utilities";
 				LD_RUNPATH_SEARCH_PATHS = (
 					"$(inherited)",
 					"@executable_path/../Frameworks",
 				);
+				MACOSX_DEPLOYMENT_TARGET = 10.13;
+				MARKETING_VERSION = 0.8.0;
 				PROVISIONING_PROFILE_SPECIFIER = "";
 				SWIFT_VERSION = 5.0;
 			};

macos/Runner.xcworkspace/contents.xcworkspacedata

@@ -4,4 +4,7 @@
    <FileRef
       location = "group:Runner.xcodeproj">
    </FileRef>
+   <FileRef
+      location = "group:Pods/Pods.xcodeproj">
+   </FileRef>
 </Workspace>

macos/Runner/DebugProfile.entitlements

@@ -6,7 +6,13 @@
 	<true/>
 	<key>com.apple.security.cs.allow-jit</key>
 	<true/>
+	<key>com.apple.security.network.client</key>
+	<true/>
 	<key>com.apple.security.network.server</key>
 	<true/>
+	<key>keychain-access-groups</key>
+	<array>
+		<string>$(AppIdentifierPrefix)*</string>
+	</array>
 </dict>
 </plist>

macos/Runner/Release.entitlements

@@ -4,5 +4,13 @@
 <dict>
 	<key>com.apple.security.app-sandbox</key>
 	<true/>
+	<key>com.apple.security.network.client</key>
+	<true/>
+	<key>com.apple.security.network.server</key>
+	<true/>
+	<key>keychain-access-groups</key>
+	<array>
+		<string>$(AppIdentifierPrefix)*</string>
+	</array>
 </dict>
 </plist>

pubspec.yaml

@@ -4,58 +4,58 @@ publish_to: 'none'
 version: 0.8.0+17
 
 environment:
-  sdk: '>=2.17.0 <3.0.0'
+  sdk: '>=2.19.0 <3.0.0'
-  flutter: ">=3.0.0"
+  flutter: ">=3.7.0"
 
 dependencies:
   auto_size_text: ^3.0.0
-  basic_utils: ^4.2.0
+  basic_utils: ^5.4.2
   crypt: ^4.2.1
   cubit_form: ^2.0.1
-  device_info_plus: ^4.0.1
+  device_info_plus: ^8.0.0
   dio: ^4.0.4
-  dynamic_color: ^1.5.4
+  dynamic_color: ^1.6.2
-  easy_localization: ^3.0.0
+  easy_localization: ^3.0.1
   either_option: ^2.0.1-dev.1
-  equatable: ^2.0.3
+  equatable: ^2.0.5
   fl_chart: ^0.50.1
   flutter:
     sdk: flutter
-  flutter_bloc: ^8.0.1
+  flutter_bloc: ^8.1.1
-  flutter_markdown: ^0.6.9
+  flutter_markdown: ^0.6.13+1
-  flutter_secure_storage: ^5.0.2
+  flutter_secure_storage: ^7.0.1
-  flutter_svg: ^1.1.4
+  flutter_svg: ^2.0.0+1
   get_it: ^7.2.0
-  gql: ^0.13.1
+  gql: ^0.14.0
-  graphql: ^5.1.1
+  graphql: ^5.1.2
-  graphql_codegen: ^0.10.2
+  graphql_codegen: ^0.12.0-beta.7
-  graphql_flutter: ^5.1.0
+  graphql_flutter: ^5.1.2
   hive: ^2.2.3
   hive_flutter: ^1.1.0
   http: ^0.13.5
   intl: ^0.17.0
-  ionicons: ^0.1.2
+  ionicons: ^0.2.2
-  json_annotation: ^4.6.0
+  json_annotation: ^4.8.0
-  local_auth: ^2.0.2
+  local_auth: ^2.1.3
-  material_color_utilities: ^0.1.5
+  material_color_utilities: ^0.2.0
-  modal_bottom_sheet: ^2.0.1
+  modal_bottom_sheet: ^3.0.0-pre
   nanoid: ^1.0.0
   package_info: ^2.0.2
   pretty_dio_logger: ^1.2.0-beta-1
-  provider: ^6.0.2
+  provider: ^6.0.5
-  pub_semver: ^2.1.1
+  pub_semver: ^2.1.3
-  share_plus: ^4.0.4
+  share_plus: ^6.3.0
-  timezone: ^0.8.0
+  timezone: ^0.9.1
-  url_launcher: ^6.0.20
+  url_launcher: ^6.1.8
-  wakelock: ^0.6.1+1
+  wakelock: ^0.6.2
 
 dev_dependencies:
   flutter_test:
     sdk: flutter
-  build_runner: ^2.2.0
+  build_runner: ^2.3.3
   flutter_launcher_icons: ^0.9.2
-  hive_generator: ^1.1.3
+  hive_generator: ^2.0.0
-  json_serializable: ^6.3.1
+  json_serializable: ^6.6.1
   flutter_lints: ^2.0.1
 
 flutter_icons:

windows/flutter/generated_plugin_registrant.cc

@@ -6,9 +6,11 @@
 
 #include "generated_plugin_registrant.h"
 
-#include <connectivity_plus_windows/connectivity_plus_windows_plugin.h>
+#include <connectivity_plus/connectivity_plus_windows_plugin.h>
 #include <dynamic_color/dynamic_color_plugin_c_api.h>
 #include <flutter_secure_storage_windows/flutter_secure_storage_windows_plugin.h>
+#include <local_auth_windows/local_auth_plugin.h>
+#include <share_plus/share_plus_windows_plugin_c_api.h>
 #include <url_launcher_windows/url_launcher_windows.h>
 
 void RegisterPlugins(flutter::PluginRegistry* registry) {
@@ -18,6 +20,10 @@ void RegisterPlugins(flutter::PluginRegistry* registry) {
       registry->GetRegistrarForPlugin("DynamicColorPluginCApi"));
   FlutterSecureStorageWindowsPluginRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("FlutterSecureStorageWindowsPlugin"));
+  LocalAuthPluginRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("LocalAuthPlugin"));
+  SharePlusWindowsPluginCApiRegisterWithRegistrar(
+      registry->GetRegistrarForPlugin("SharePlusWindowsPluginCApi"));
   UrlLauncherWindowsRegisterWithRegistrar(
       registry->GetRegistrarForPlugin("UrlLauncherWindows"));
 }

windows/flutter/generated_plugins.cmake

@@ -3,9 +3,11 @@
 #
 
 list(APPEND FLUTTER_PLUGIN_LIST
-  connectivity_plus_windows
+  connectivity_plus
   dynamic_color
   flutter_secure_storage_windows
+  local_auth_windows
+  share_plus
   url_launcher_windows
 )