diff --git a/app/mobile/ios/Databag.xcodeproj/project.pbxproj b/app/mobile/ios/Databag.xcodeproj/project.pbxproj index c2e58688..49fc8aa5 100644 --- a/app/mobile/ios/Databag.xcodeproj/project.pbxproj +++ b/app/mobile/ios/Databag.xcodeproj/project.pbxproj @@ -8,27 +8,27 @@ /* Begin PBXBuildFile section */ 00E356F31AD99517003FC87E /* DatabagTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* DatabagTests.m */; }; + 0165040169E94CC2BBA26B58 /* Roboto-Medium.ttf in Resources */ = {isa = PBXBuildFile; fileRef = D6B3F198900D438990E3E250 /* Roboto-Medium.ttf */; }; + 1398F2035F1B40E89A1F9387 /* Roboto-MediumItalic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = F942FA23DB5E41CF8FA13489 /* Roboto-MediumItalic.ttf */; }; 13B07FBC1A68108700A75B9A /* AppDelegate.mm in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB01A68108700A75B9A /* AppDelegate.mm */; }; 13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; }; 13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; }; + 21CC4475B2A9481CAB38378C /* Roboto-Thin.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 81D33AA1ED5E4DA196301306 /* Roboto-Thin.ttf */; }; 46D8108CBA031189090AFC14 /* Pods_Databag_DatabagTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 1181227D40684F18A9414840 /* Pods_Databag_DatabagTests.framework */; }; + 5BCA507BB2A348EF881A9424 /* Roboto-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 362E7074D5874C16A31B62FE /* Roboto-Regular.ttf */; }; + 5F9F9F136E694107B2B19B0E /* Roboto-BlackItalic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 5F30ED55DB1949EAB4C68C0E /* Roboto-BlackItalic.ttf */; }; + 731523F08D314F09BFE236AD /* Roboto-Italic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 5B470EE70F4B40FA93CE1ED6 /* Roboto-Italic.ttf */; }; + 74850D4119604C1EAA6F43C4 /* Roboto-BoldItalic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 534B4A5F74BC47BA8A24CA77 /* Roboto-BoldItalic.ttf */; }; + 77D8C512BFDD4D25AA7B3243 /* Roboto-Black.ttf in Resources */ = {isa = PBXBuildFile; fileRef = ECFB49329806460281EC8695 /* Roboto-Black.ttf */; }; 7B13A774299E21170048D0DD /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 7B13A773299E21170048D0DD /* GoogleService-Info.plist */; }; 7B4A533D29F39E250036F3ED /* ShareViewController.swift in Sources */ = {isa = PBXBuildFile; fileRef = 7B4A533C29F39E250036F3ED /* ShareViewController.swift */; }; 7B4A534029F39E250036F3ED /* MainInterface.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 7B4A533E29F39E250036F3ED /* MainInterface.storyboard */; }; 7B4A534429F39E250036F3ED /* Sharing.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = 7B4A533A29F39E250036F3ED /* Sharing.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; + 7DAB71C0E7784244A7F36C5E /* Roboto-Light.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 680D48DE60574F0082B2AA56 /* Roboto-Light.ttf */; }; 81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; }; A0B1EC4533FCFC5940B5FD7F /* Pods_Databag.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 9462C028F47F083241BB7941 /* Pods_Databag.framework */; }; - 77D8C512BFDD4D25AA7B3243 /* Roboto-Black.ttf in Resources */ = {isa = PBXBuildFile; fileRef = ECFB49329806460281EC8695 /* Roboto-Black.ttf */; }; - 5F9F9F136E694107B2B19B0E /* Roboto-BlackItalic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 5F30ED55DB1949EAB4C68C0E /* Roboto-BlackItalic.ttf */; }; - BA632FE7EDF5434A83315128 /* Roboto-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = B95DE2563CFF4F6994482640 /* Roboto-Bold.ttf */; }; - 74850D4119604C1EAA6F43C4 /* Roboto-BoldItalic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 534B4A5F74BC47BA8A24CA77 /* Roboto-BoldItalic.ttf */; }; - 731523F08D314F09BFE236AD /* Roboto-Italic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 5B470EE70F4B40FA93CE1ED6 /* Roboto-Italic.ttf */; }; - 7DAB71C0E7784244A7F36C5E /* Roboto-Light.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 680D48DE60574F0082B2AA56 /* Roboto-Light.ttf */; }; B9DCBA54B6B14C6D9EEC5E76 /* Roboto-LightItalic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 22A26F2AA8024E1088D9E0F0 /* Roboto-LightItalic.ttf */; }; - 0165040169E94CC2BBA26B58 /* Roboto-Medium.ttf in Resources */ = {isa = PBXBuildFile; fileRef = D6B3F198900D438990E3E250 /* Roboto-Medium.ttf */; }; - 1398F2035F1B40E89A1F9387 /* Roboto-MediumItalic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = F942FA23DB5E41CF8FA13489 /* Roboto-MediumItalic.ttf */; }; - 5BCA507BB2A348EF881A9424 /* Roboto-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 362E7074D5874C16A31B62FE /* Roboto-Regular.ttf */; }; - 21CC4475B2A9481CAB38378C /* Roboto-Thin.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 81D33AA1ED5E4DA196301306 /* Roboto-Thin.ttf */; }; + BA632FE7EDF5434A83315128 /* Roboto-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = B95DE2563CFF4F6994482640 /* Roboto-Bold.ttf */; }; CE6E235E1381477495980CAE /* Roboto-ThinItalic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = DD10764B06034C9DBFF48B6A /* Roboto-ThinItalic.ttf */; }; /* End PBXBuildFile section */ @@ -74,9 +74,15 @@ 13B07FB51A68108700A75B9A /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = Databag/Images.xcassets; sourceTree = ""; }; 13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = Databag/Info.plist; sourceTree = ""; }; 13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = Databag/main.m; sourceTree = ""; }; + 22A26F2AA8024E1088D9E0F0 /* Roboto-LightItalic.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "Roboto-LightItalic.ttf"; path = "../assets/fonts/Roboto-LightItalic.ttf"; sourceTree = ""; }; + 362E7074D5874C16A31B62FE /* Roboto-Regular.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "Roboto-Regular.ttf"; path = "../assets/fonts/Roboto-Regular.ttf"; sourceTree = ""; }; 3B4392A12AC88292D35C810B /* Pods-Databag.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Databag.debug.xcconfig"; path = "Target Support Files/Pods-Databag/Pods-Databag.debug.xcconfig"; sourceTree = ""; }; + 534B4A5F74BC47BA8A24CA77 /* Roboto-BoldItalic.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "Roboto-BoldItalic.ttf"; path = "../assets/fonts/Roboto-BoldItalic.ttf"; sourceTree = ""; }; 5709B34CF0A7D63546082F79 /* Pods-Databag.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Databag.release.xcconfig"; path = "Target Support Files/Pods-Databag/Pods-Databag.release.xcconfig"; sourceTree = ""; }; + 5B470EE70F4B40FA93CE1ED6 /* Roboto-Italic.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "Roboto-Italic.ttf"; path = "../assets/fonts/Roboto-Italic.ttf"; sourceTree = ""; }; 5B7EB9410499542E8C5724F5 /* Pods-Databag-DatabagTests.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Databag-DatabagTests.debug.xcconfig"; path = "Target Support Files/Pods-Databag-DatabagTests/Pods-Databag-DatabagTests.debug.xcconfig"; sourceTree = ""; }; + 5F30ED55DB1949EAB4C68C0E /* Roboto-BlackItalic.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "Roboto-BlackItalic.ttf"; path = "../assets/fonts/Roboto-BlackItalic.ttf"; sourceTree = ""; }; + 680D48DE60574F0082B2AA56 /* Roboto-Light.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "Roboto-Light.ttf"; path = "../assets/fonts/Roboto-Light.ttf"; sourceTree = ""; }; 7B13A773299E21170048D0DD /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = ""; }; 7B4A533A29F39E250036F3ED /* Sharing.appex */ = {isa = PBXFileReference; explicitFileType = "wrapper.app-extension"; includeInIndex = 0; path = Sharing.appex; sourceTree = BUILT_PRODUCTS_DIR; }; 7B4A533C29F39E250036F3ED /* ShareViewController.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = ShareViewController.swift; sourceTree = ""; }; @@ -85,21 +91,15 @@ 7B4A534929F39ED90036F3ED /* Sharing.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; path = Sharing.entitlements; sourceTree = ""; }; 7B6135A429B68A7B0094A6E7 /* Databag.entitlements */ = {isa = PBXFileReference; lastKnownFileType = text.plist.entitlements; name = Databag.entitlements; path = Databag/Databag.entitlements; sourceTree = ""; }; 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = Databag/LaunchScreen.storyboard; sourceTree = ""; }; + 81D33AA1ED5E4DA196301306 /* Roboto-Thin.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "Roboto-Thin.ttf"; path = "../assets/fonts/Roboto-Thin.ttf"; sourceTree = ""; }; 89C6BE57DB24E9ADA2F236DE /* Pods-Databag-DatabagTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-Databag-DatabagTests.release.xcconfig"; path = "Target Support Files/Pods-Databag-DatabagTests/Pods-Databag-DatabagTests.release.xcconfig"; sourceTree = ""; }; 9462C028F47F083241BB7941 /* Pods_Databag.framework */ = {isa = PBXFileReference; explicitFileType = wrapper.framework; includeInIndex = 0; path = Pods_Databag.framework; sourceTree = BUILT_PRODUCTS_DIR; }; + B95DE2563CFF4F6994482640 /* Roboto-Bold.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "Roboto-Bold.ttf"; path = "../assets/fonts/Roboto-Bold.ttf"; sourceTree = ""; }; + D6B3F198900D438990E3E250 /* Roboto-Medium.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "Roboto-Medium.ttf"; path = "../assets/fonts/Roboto-Medium.ttf"; sourceTree = ""; }; + DD10764B06034C9DBFF48B6A /* Roboto-ThinItalic.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "Roboto-ThinItalic.ttf"; path = "../assets/fonts/Roboto-ThinItalic.ttf"; sourceTree = ""; }; + ECFB49329806460281EC8695 /* Roboto-Black.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "Roboto-Black.ttf"; path = "../assets/fonts/Roboto-Black.ttf"; sourceTree = ""; }; ED297162215061F000B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = System/Library/Frameworks/JavaScriptCore.framework; sourceTree = SDKROOT; }; - ECFB49329806460281EC8695 /* Roboto-Black.ttf */ = {isa = PBXFileReference; name = "Roboto-Black.ttf"; path = "../assets/fonts/Roboto-Black.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; - 5F30ED55DB1949EAB4C68C0E /* Roboto-BlackItalic.ttf */ = {isa = PBXFileReference; name = "Roboto-BlackItalic.ttf"; path = "../assets/fonts/Roboto-BlackItalic.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; - B95DE2563CFF4F6994482640 /* Roboto-Bold.ttf */ = {isa = PBXFileReference; name = "Roboto-Bold.ttf"; path = "../assets/fonts/Roboto-Bold.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; - 534B4A5F74BC47BA8A24CA77 /* Roboto-BoldItalic.ttf */ = {isa = PBXFileReference; name = "Roboto-BoldItalic.ttf"; path = "../assets/fonts/Roboto-BoldItalic.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; - 5B470EE70F4B40FA93CE1ED6 /* Roboto-Italic.ttf */ = {isa = PBXFileReference; name = "Roboto-Italic.ttf"; path = "../assets/fonts/Roboto-Italic.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; - 680D48DE60574F0082B2AA56 /* Roboto-Light.ttf */ = {isa = PBXFileReference; name = "Roboto-Light.ttf"; path = "../assets/fonts/Roboto-Light.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; - 22A26F2AA8024E1088D9E0F0 /* Roboto-LightItalic.ttf */ = {isa = PBXFileReference; name = "Roboto-LightItalic.ttf"; path = "../assets/fonts/Roboto-LightItalic.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; - D6B3F198900D438990E3E250 /* Roboto-Medium.ttf */ = {isa = PBXFileReference; name = "Roboto-Medium.ttf"; path = "../assets/fonts/Roboto-Medium.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; - F942FA23DB5E41CF8FA13489 /* Roboto-MediumItalic.ttf */ = {isa = PBXFileReference; name = "Roboto-MediumItalic.ttf"; path = "../assets/fonts/Roboto-MediumItalic.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; - 362E7074D5874C16A31B62FE /* Roboto-Regular.ttf */ = {isa = PBXFileReference; name = "Roboto-Regular.ttf"; path = "../assets/fonts/Roboto-Regular.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; - 81D33AA1ED5E4DA196301306 /* Roboto-Thin.ttf */ = {isa = PBXFileReference; name = "Roboto-Thin.ttf"; path = "../assets/fonts/Roboto-Thin.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; - DD10764B06034C9DBFF48B6A /* Roboto-ThinItalic.ttf */ = {isa = PBXFileReference; name = "Roboto-ThinItalic.ttf"; path = "../assets/fonts/Roboto-ThinItalic.ttf"; sourceTree = ""; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; }; + F942FA23DB5E41CF8FA13489 /* Roboto-MediumItalic.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = undefined; includeInIndex = 0; lastKnownFileType = unknown; name = "Roboto-MediumItalic.ttf"; path = "../assets/fonts/Roboto-MediumItalic.ttf"; sourceTree = ""; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -216,19 +216,8 @@ name = Products; sourceTree = ""; }; - BBD78D7AC51CEA395F1C20DB /* Pods */ = { - isa = PBXGroup; - children = ( - 3B4392A12AC88292D35C810B /* Pods-Databag.debug.xcconfig */, - 5709B34CF0A7D63546082F79 /* Pods-Databag.release.xcconfig */, - 5B7EB9410499542E8C5724F5 /* Pods-Databag-DatabagTests.debug.xcconfig */, - 89C6BE57DB24E9ADA2F236DE /* Pods-Databag-DatabagTests.release.xcconfig */, - ); - path = Pods; - sourceTree = ""; - }; 8C5722C039554D188BE6CC6B /* Resources */ = { - isa = "PBXGroup"; + isa = PBXGroup; children = ( ECFB49329806460281EC8695 /* Roboto-Black.ttf */, 5F30ED55DB1949EAB4C68C0E /* Roboto-BlackItalic.ttf */, @@ -244,8 +233,19 @@ DD10764B06034C9DBFF48B6A /* Roboto-ThinItalic.ttf */, ); name = Resources; - sourceTree = ""; path = ""; + sourceTree = ""; + }; + BBD78D7AC51CEA395F1C20DB /* Pods */ = { + isa = PBXGroup; + children = ( + 3B4392A12AC88292D35C810B /* Pods-Databag.debug.xcconfig */, + 5709B34CF0A7D63546082F79 /* Pods-Databag.release.xcconfig */, + 5B7EB9410499542E8C5724F5 /* Pods-Databag-DatabagTests.debug.xcconfig */, + 89C6BE57DB24E9ADA2F236DE /* Pods-Databag-DatabagTests.release.xcconfig */, + ); + path = Pods; + sourceTree = ""; }; /* End PBXGroup section */ diff --git a/app/mobile/ios/Podfile.lock b/app/mobile/ios/Podfile.lock index 128543a7..51e6a7f9 100644 --- a/app/mobile/ios/Podfile.lock +++ b/app/mobile/ios/Podfile.lock @@ -330,10 +330,14 @@ PODS: - React-jsinspector (0.71.3) - React-logger (0.71.3): - glog + - react-native-blur (4.3.2): + - React-Core - react-native-create-thumbnail (1.6.4): - React-Core - react-native-document-picker (8.2.1): - React-Core + - react-native-floating-label-input (1.4.2): + - React-Core - react-native-image-resizer (3.0.5): - React-Core - react-native-keep-awake (1.2.0): @@ -543,8 +547,10 @@ DEPENDENCIES: - React-jsiexecutor (from `../node_modules/react-native/ReactCommon/jsiexecutor`) - React-jsinspector (from `../node_modules/react-native/ReactCommon/jsinspector`) - React-logger (from `../node_modules/react-native/ReactCommon/logger`) + - "react-native-blur (from `../node_modules/@react-native-community/blur`)" - react-native-create-thumbnail (from `../node_modules/react-native-create-thumbnail`) - react-native-document-picker (from `../node_modules/react-native-document-picker`) + - react-native-floating-label-input (from `../node_modules/react-native-floating-label-input`) - "react-native-image-resizer (from `../node_modules/@bam.tech/react-native-image-resizer`)" - "react-native-keep-awake (from `../node_modules/@sayem314/react-native-keep-awake`)" - react-native-receive-sharing-intent (from `../node_modules/react-native-receive-sharing-intent`) @@ -644,10 +650,14 @@ EXTERNAL SOURCES: :path: "../node_modules/react-native/ReactCommon/jsinspector" React-logger: :path: "../node_modules/react-native/ReactCommon/logger" + react-native-blur: + :path: "../node_modules/@react-native-community/blur" react-native-create-thumbnail: :path: "../node_modules/react-native-create-thumbnail" react-native-document-picker: :path: "../node_modules/react-native-document-picker" + react-native-floating-label-input: + :path: "../node_modules/react-native-floating-label-input" react-native-image-resizer: :path: "../node_modules/@bam.tech/react-native-image-resizer" react-native-keep-awake: @@ -758,8 +768,10 @@ SPEC CHECKSUMS: React-jsiexecutor: 515b703d23ffadeac7687bc2d12fb08b90f0aaa1 React-jsinspector: 9f7c9137605e72ca0343db4cea88006cb94856dd React-logger: 957e5dc96d9dbffc6e0f15e0ee4d2b42829ff207 + react-native-blur: cfdad7b3c01d725ab62a8a729f42ea463998afa2 react-native-create-thumbnail: e022bcdcba8a0b4529a50d3fa1a832ec921be39d react-native-document-picker: 69ca2094d8780cfc1e7e613894d15290fdc54bba + react-native-floating-label-input: 70b2864337fa690c6d71d75dad66d8ec1d6bf162 react-native-image-resizer: 00ceb0e05586c7aadf061eea676957a6c2ec60fa react-native-keep-awake: caee3ff89eaa21dfe29010f0d143566874a04441 react-native-receive-sharing-intent: 62ab28c50e6ae56d32b9e841d7452091312a0bc7 diff --git a/app/mobile/package.json b/app/mobile/package.json index 35196e40..580768e6 100644 --- a/app/mobile/package.json +++ b/app/mobile/package.json @@ -13,6 +13,7 @@ "@bam.tech/react-native-image-resizer": "^3.0.5", "@braintree/sanitize-url": "^6.0.2", "@react-native-clipboard/clipboard": "^1.11.1", + "@react-native-community/blur": "^4.3.2", "@react-native-firebase/app": "^17.2.0", "@react-native-firebase/messaging": "^17.2.0", "@react-navigation/bottom-tabs": "^6.5.5", @@ -32,6 +33,7 @@ "react-native-device-info": "^10.4.0", "react-native-document-picker": "^8.1.3", "react-native-fast-image": "^8.6.3", + "react-native-floating-label-input": "^1.4.2", "react-native-fs": "^2.20.0", "react-native-gesture-handler": "^2.9.0", "react-native-image-crop-picker": "^0.39.0", diff --git a/app/mobile/src/constants/Colors.js b/app/mobile/src/constants/Colors.js index 3a601893..4d461655 100644 --- a/app/mobile/src/constants/Colors.js +++ b/app/mobile/src/constants/Colors.js @@ -1,6 +1,7 @@ import { Appearance } from 'react-native' const LightColors = { + theme: 'light', tabBar: '#448866', activeTabIcon: '#ffffff', idleTabIcon: '#cccccc', @@ -47,6 +48,7 @@ const LightColors = { }; const DarkColors = { + theme: 'dark', tabBar: '#111111', activeTabIcon: '#dddddd', idleTabIcon: '#aaaaaa', @@ -62,7 +64,7 @@ const DarkColors = { text: '#ffffff', screenBase: '#333333', areaBase: '#555555', - modalBase: '#333333', + modalBase: '#111111', modalOverlay: 'rgba(88,88,88,0.8)', headerBar: '#555555', primaryButton: '#448866', @@ -73,9 +75,9 @@ const DarkColors = { disabledButtonText: '#eeeeee', dangerButton: '#ff5555', dangerButtonText: '#ffffff', - inputBase: '#ffffff', - inputPlaceholder: '#888888', - inputText: '#444444', + inputBase: '#333333', + inputPlaceholder: '#aaaaaa', + inputText: '#eeeeee', connectedIndicator: '#00cc00', connectingIndicator: '#0000cc', requestedIndicator: '#00bbbb', @@ -97,6 +99,7 @@ function getColor(label) { } export const Colors = { + theme: getColor('theme'), tabBar: getColor('tabBar'), activeTabIcon: getColor('activeTabIcon'), idleTabIcon: getColor('idleTabIcon'), diff --git a/app/mobile/src/session/settings/Settings.jsx b/app/mobile/src/session/settings/Settings.jsx index 8b6943a1..4baa8ba2 100644 --- a/app/mobile/src/session/settings/Settings.jsx +++ b/app/mobile/src/session/settings/Settings.jsx @@ -6,6 +6,8 @@ import { styles } from './Settings.styled'; import { useSettings } from './useSettings.hook'; import MatIcons from 'react-native-vector-icons/MaterialCommunityIcons'; import Colors from 'constants/Colors'; +import { BlurView } from "@react-native-community/blur"; +import { FloatingLabelInput } from 'react-native-floating-label-input'; export function Settings() { @@ -269,7 +271,7 @@ export function Settings() { supportedOrientations={['portrait', 'landscape']} onRequestClose={actions.hideEditSeal} > - + @@ -342,16 +344,18 @@ export function Settings() { )} - { state.sealPassword && ( - sealAction(actions.unlockKey)}> - { state.strings.unlock } - - )} - { !state.sealPassword && ( - - { state.strings.unlock } - - )} + + { state.sealPassword && ( + sealAction(actions.unlockKey)}> + { state.strings.unlock } + + )} + { !state.sealPassword && ( + + { state.strings.unlock } + + )} + { state.strings.removeSeal } @@ -453,7 +457,7 @@ export function Settings() { )} - + - + { state.strings.loggingOut } @@ -475,7 +479,7 @@ export function Settings() { - + - + @@ -496,55 +500,51 @@ export function Settings() { - - { !state.validated && ( - - - - )} - { state.validated && state.available && ( - - - - )} - { state.validated && !state.available && ( - - - - )} + - - { state.hidePassword && ( - - - - )} - { !state.hidePassword && ( - - - - )} + } + customHidePasswordComponent={} + /> + - - { state.hideConfirm && ( - - - - )} - { !state.hideConfirm && ( - - - - )} + } + customHidePasswordComponent={} + /> @@ -560,7 +560,7 @@ export function Settings() { )} - + - + @@ -598,7 +598,7 @@ export function Settings() { )} - + diff --git a/app/mobile/src/session/settings/Settings.styled.js b/app/mobile/src/session/settings/Settings.styled.js index a0c27792..4d9d71a5 100644 --- a/app/mobile/src/session/settings/Settings.styled.js +++ b/app/mobile/src/session/settings/Settings.styled.js @@ -117,7 +117,6 @@ export const styles = StyleSheet.create({ height: '100%', alignItems: 'center', justifyContent: 'center', - backgroundColor: Colors.modalOverlay, }, modalContainer: { backgroundColor: Colors.modalBase, @@ -158,8 +157,10 @@ export const styles = StyleSheet.create({ paddingBottom: 16, }, modalInput: { - marginRight: 32, - marginLeft: 32, + marginRight: 16, + marginLeft: 16, + marginTop: 8, + marginBottom: 8, display: 'flex', alignItems: 'center', justifyContent: 'center', @@ -183,13 +184,14 @@ export const styles = StyleSheet.create({ borderRadius: 4, margin: 4, backgroundColor: Colors.inputBase, + color: Colors.inputText, }, inputVisibility: { position: 'absolute', right: 16, }, enabledButton: { - marginTop: 32, + marginTop: 8, marginBottom: 16, paddingTop: 8, paddingBottom: 8, @@ -204,7 +206,7 @@ export const styles = StyleSheet.create({ }, disabledButton: { marginTop: 8, - marginBottom: 8, + marginBottom: 16, paddingTop: 8, paddingBottom: 8, paddingLeft: 32, @@ -218,7 +220,7 @@ export const styles = StyleSheet.create({ }, dangerButton: { marginTop: 8, - marginBottom: 8, + marginBottom: 16, paddingTop: 8, paddingBottom: 8, paddingLeft: 32, @@ -231,7 +233,9 @@ export const styles = StyleSheet.create({ fontFamily: 'Roboto', }, cancelButton: { - margin: 8, + marginTop: 8, + marginBottom: 16, + marginRight: 16, paddingTop: 8, paddingBottom: 8, paddingLeft: 32, @@ -240,7 +244,8 @@ export const styles = StyleSheet.create({ backgroundColor: Colors.cancelButton, }, promptButton: { - margin: 8, + marginTop: 8, + marginBottom: 16, paddingTop: 8, paddingBottom: 8, paddingLeft: 32, @@ -253,5 +258,24 @@ export const styles = StyleSheet.create({ flexDirection: 'row', padding: 8, }, + floatingInput: { + color: Colors.inputText, + paddingTop: 12, + }, + floatingLabel: { + color: Colors.text, + }, + floatingCustomLabel: { + colorFocused: Colors.inputPlaceholder, + colorBlurred: Colors.inputPlaceholder, + fontSizeFocused: 12, + paddingTop: 4, + }, + floatingContainer: { + paddingHorizontal: 12, + backgroundColor: Colors.inputBase, + borderRadius: 8, + height: 52, + }, }); diff --git a/app/mobile/src/session/settings/useSettings.hook.js b/app/mobile/src/session/settings/useSettings.hook.js index 77ffb693..2765c6cd 100644 --- a/app/mobile/src/session/settings/useSettings.hook.js +++ b/app/mobile/src/session/settings/useSettings.hook.js @@ -95,7 +95,7 @@ export function useSettings() { await account.actions.setNotifications(flag); }, showLogin: () => { - updateState({ login: true, username: state.handle, password: null, confirm: null, validated: true }); + updateState({ login: true, username: state.handle, password: '', confirm: '', validated: true }); }, hideLogin: () => { updateState({ login: false }); @@ -110,7 +110,10 @@ export function useSettings() { clearTimeout(debounce.current); checking.current = username; updateState({ username, validated: false }); - if (state.handle === username) { + if (!username) { + updateState({ available: false, validated: false }); + } + else if (state.handle === username) { updateState({ available: true, validated: true }); } else { diff --git a/app/mobile/yarn.lock b/app/mobile/yarn.lock index 85ab67d4..30fb14b2 100644 --- a/app/mobile/yarn.lock +++ b/app/mobile/yarn.lock @@ -1560,6 +1560,11 @@ resolved "https://registry.yarnpkg.com/@react-native-clipboard/clipboard/-/clipboard-1.11.2.tgz#e826d0336b34e67294aaffa6878308900bc7d197" integrity sha512-bHyZVW62TuleiZsXNHS1Pv16fWc0fh8O9WvBzl4h2fykqZRW9a+Pv/RGTH56E3X2PqzHP38K5go8zmCZUoIsoQ== +"@react-native-community/blur@^4.3.2": + version "4.3.2" + resolved "https://registry.yarnpkg.com/@react-native-community/blur/-/blur-4.3.2.tgz#185a2c7dd03ba168cc95069bc4742e9505fd6c6c" + integrity sha512-0ID+pyZKdC4RdgC7HePxUQ6JmsbNrgz03u+6SgqYpmBoK/rE+7JffqIw7IEsfoKitLEcRNLGekIBsfwCqiEkew== + "@react-native-community/cli-clean@^10.1.1": version "10.1.1" resolved "https://registry.yarnpkg.com/@react-native-community/cli-clean/-/cli-clean-10.1.1.tgz#4c73ce93a63a24d70c0089d4025daac8184ff504" @@ -2187,11 +2192,6 @@ abort-controller@^3.0.0: dependencies: event-target-shim "^5.0.0" -abs-svg-path@^0.1.1: - version "0.1.1" - resolved "https://registry.yarnpkg.com/abs-svg-path/-/abs-svg-path-0.1.1.tgz#df601c8e8d2ba10d4a76d625e236a9a39c2723bf" - integrity sha512-d8XPSGjfyzlXC3Xx891DJRyZfqk5JU0BJrDQcsWomFIV1/BIzPW5HDH5iDdWpqWaav0YVIEzT1RHTwWr0FFshA== - absolute-path@^0.0.0: version "0.0.0" resolved "https://registry.yarnpkg.com/absolute-path/-/absolute-path-0.0.0.tgz#a78762fbdadfb5297be99b15d35a785b2f095bf7" @@ -5963,13 +5963,6 @@ normalize-path@^3.0.0: resolved "https://registry.yarnpkg.com/normalize-path/-/normalize-path-3.0.0.tgz#0dcd69ff23a1c9b11fd0978316644a0388216a65" integrity sha512-6eZs5Ls3WtCisHWp9S2GUy8dqkpGi4BVSz3GaqiE6ezub0512ESztXUwUB6C6IKbQkY2Pnb/mD4WYojCRwcwLA== -normalize-svg-path@^1.0.1: - version "1.1.0" - resolved "https://registry.yarnpkg.com/normalize-svg-path/-/normalize-svg-path-1.1.0.tgz#0e614eca23c39f0cffe821d6be6cd17e569a766c" - integrity sha512-r9KHKG2UUeB5LoTouwDzBy2VxXlHsiM6fyLQvnJa0S5hrhzqElH/CH7TUGhT1fVvIYBIKf3OpY4YJ4CK+iaqHg== - dependencies: - svg-arc-to-cubic-bezier "^3.0.0" - npm-run-path@^2.0.0: version "2.0.2" resolved "https://registry.yarnpkg.com/npm-run-path/-/npm-run-path-2.0.2.tgz#35a9232dfa35d7067b4cb2ddf2357b1871536c5f" @@ -6237,11 +6230,6 @@ parse-json@^5.2.0: json-parse-even-better-errors "^2.3.0" lines-and-columns "^1.1.6" -parse-svg-path@^0.1.2: - version "0.1.2" - resolved "https://registry.yarnpkg.com/parse-svg-path/-/parse-svg-path-0.1.2.tgz#7a7ec0d1eb06fa5325c7d3e009b859a09b5d49eb" - integrity sha512-JyPSBnkTJ0AI8GGJLfMXvKq42cj5c006fnLz6fXy6zfoVjJizi8BNTpu8on8ziI1cKy9d9DGNuY17Ce7wuejpQ== - parseurl@~1.3.3: version "1.3.3" resolved "https://registry.yarnpkg.com/parseurl/-/parseurl-1.3.3.tgz#9da19e7bee8d12dff0513ed5b76957793bc2e8d4" @@ -6471,13 +6459,6 @@ react-is@^17.0.1: resolved "https://registry.yarnpkg.com/react-is/-/react-is-17.0.2.tgz#e691d4a8e9c789365655539ab372762b0efb54f0" integrity sha512-w2GsyukL62IJnlaff/nRegPQR94C/XXamvMWmSHRJ4y7Ts/4ocGRmTHvOs8PSE6pB3dWOrD/nueuU5sduBsQ4w== -react-native-awesome-gallery@^0.3.5: - version "0.3.5" - resolved "https://registry.yarnpkg.com/react-native-awesome-gallery/-/react-native-awesome-gallery-0.3.5.tgz#58b8fe3573a7154b5530aa7d2cdd9aa4ad348d66" - integrity sha512-oMY0to9mLYyUK7F4ibx5S/GUiB83m3hqpM8THlGulCGr6QcVfX6ZJklNHYYaWCziBIavjXY6Igyq39WrrQOhhw== - dependencies: - react-native-redash "^16.0.8" - react-native-base64@^0.2.1: version "0.2.1" resolved "https://registry.yarnpkg.com/react-native-base64/-/react-native-base64-0.2.1.tgz#3d0e73a649c4c0129f7b7695d3912456aebae847" @@ -6520,6 +6501,11 @@ react-native-fast-image@^8.6.3: resolved "https://registry.yarnpkg.com/react-native-fast-image/-/react-native-fast-image-8.6.3.tgz#6edc3f9190092a909d636d93eecbcc54a8822255" integrity sha512-Sdw4ESidXCXOmQ9EcYguNY2swyoWmx53kym2zRsvi+VeFCHEdkO+WG1DK+6W81juot40bbfLNhkc63QnWtesNg== +react-native-floating-label-input@^1.4.2: + version "1.4.2" + resolved "https://registry.yarnpkg.com/react-native-floating-label-input/-/react-native-floating-label-input-1.4.2.tgz#4db85aca6ef8509f0c4fb369b55b1fd1915ebe1e" + integrity sha512-fHN+gQC+ghZgRuB+gJfNNo5IJRDy0grOia0gJpEmXbx9YqPud6nonQYunGWaHc9/b9GpL5n1q4VgWvZDTV+QLQ== + react-native-fs@^2.20.0: version "2.20.0" resolved "https://registry.yarnpkg.com/react-native-fs/-/react-native-fs-2.20.0.tgz#05a9362b473bfc0910772c0acbb73a78dbc810f6" @@ -6576,15 +6562,6 @@ react-native-receive-sharing-intent@^2.0.0: resolved "https://registry.yarnpkg.com/react-native-receive-sharing-intent/-/react-native-receive-sharing-intent-2.0.0.tgz#0d835387976e2343f85f0172522e83233a09c0d9" integrity sha512-JFSO8mZm/hU0EJQYhC5z2m1iiMwJhD9CQ/hYQ8t1UQ9mQynoS/yo+hjX2T6hFXa8mtzlwO/BFwKZjBaVNPdWuw== -react-native-redash@^16.0.8: - version "16.3.0" - resolved "https://registry.yarnpkg.com/react-native-redash/-/react-native-redash-16.3.0.tgz#a9112ff1b0e0b506a2e2ae50967597e73b69d343" - integrity sha512-dhmeYbQ/usGzxZSGZmzmRuIFF2LrtJUKqgseKgf9Jdj0JQ7VM20m/LqTg60+wjxeiyAh2D/vKsQ2U7rMkuoplQ== - dependencies: - abs-svg-path "^0.1.1" - normalize-svg-path "^1.0.1" - parse-svg-path "^0.1.2" - react-native-rsa-native@^2.0.5: version "2.0.5" resolved "https://registry.yarnpkg.com/react-native-rsa-native/-/react-native-rsa-native-2.0.5.tgz#7db4aef49405bb5b5bcaea12b9dfd1b251c690ab" @@ -7469,11 +7446,6 @@ supports-preserve-symlinks-flag@^1.0.0: resolved "https://registry.yarnpkg.com/supports-preserve-symlinks-flag/-/supports-preserve-symlinks-flag-1.0.0.tgz#6eda4bd344a3c94aea376d4cc31bc77311039e09" integrity sha512-ot0WnXS9fgdkgIcePe6RHNk1WA8+muPa6cSjeR3V8K27q9BB1rTE3R1p7Hv0z1ZyAc8s6Vvv8DIyWf681MAt0w== -svg-arc-to-cubic-bezier@^3.0.0: - version "3.2.0" - resolved "https://registry.yarnpkg.com/svg-arc-to-cubic-bezier/-/svg-arc-to-cubic-bezier-3.2.0.tgz#390c450035ae1c4a0104d90650304c3bc814abe6" - integrity sha512-djbJ/vZKZO+gPoSDThGNpKDO+o+bAeA4XQKovvkNCqnIS2t+S4qnLAGQhyyrulhCFRl1WWzAp0wUDV8PpTVU3g== - tar@6.1.11: version "6.1.11" resolved "https://registry.yarnpkg.com/tar/-/tar-6.1.11.tgz#6760a38f003afa1b2ffd0ffe9e9abbd0eab3d621"