diff --git a/app/mobile/android/app/src/main/assets/fonts/Roboto-Black.ttf b/app/mobile/android/app/src/main/assets/fonts/Roboto-Black.ttf new file mode 100644 index 00000000..0112e7da Binary files /dev/null and b/app/mobile/android/app/src/main/assets/fonts/Roboto-Black.ttf differ diff --git a/app/mobile/android/app/src/main/assets/fonts/Roboto-BlackItalic.ttf b/app/mobile/android/app/src/main/assets/fonts/Roboto-BlackItalic.ttf new file mode 100644 index 00000000..b2c6aca5 Binary files /dev/null and b/app/mobile/android/app/src/main/assets/fonts/Roboto-BlackItalic.ttf differ diff --git a/app/mobile/android/app/src/main/assets/fonts/Roboto-Bold.ttf b/app/mobile/android/app/src/main/assets/fonts/Roboto-Bold.ttf new file mode 100644 index 00000000..43da14d8 Binary files /dev/null and b/app/mobile/android/app/src/main/assets/fonts/Roboto-Bold.ttf differ diff --git a/app/mobile/android/app/src/main/assets/fonts/Roboto-BoldItalic.ttf b/app/mobile/android/app/src/main/assets/fonts/Roboto-BoldItalic.ttf new file mode 100644 index 00000000..bcfdab43 Binary files /dev/null and b/app/mobile/android/app/src/main/assets/fonts/Roboto-BoldItalic.ttf differ diff --git a/app/mobile/android/app/src/main/assets/fonts/Roboto-Italic.ttf b/app/mobile/android/app/src/main/assets/fonts/Roboto-Italic.ttf new file mode 100644 index 00000000..1b5eaa36 Binary files /dev/null and b/app/mobile/android/app/src/main/assets/fonts/Roboto-Italic.ttf differ diff --git a/app/mobile/android/app/src/main/assets/fonts/Roboto-Light.ttf b/app/mobile/android/app/src/main/assets/fonts/Roboto-Light.ttf new file mode 100644 index 00000000..e7307e72 Binary files /dev/null and b/app/mobile/android/app/src/main/assets/fonts/Roboto-Light.ttf differ diff --git a/app/mobile/android/app/src/main/assets/fonts/Roboto-LightItalic.ttf b/app/mobile/android/app/src/main/assets/fonts/Roboto-LightItalic.ttf new file mode 100644 index 00000000..2d277afb Binary files /dev/null and b/app/mobile/android/app/src/main/assets/fonts/Roboto-LightItalic.ttf differ diff --git a/app/mobile/android/app/src/main/assets/fonts/Roboto-Medium.ttf b/app/mobile/android/app/src/main/assets/fonts/Roboto-Medium.ttf new file mode 100644 index 00000000..ac0f908b Binary files /dev/null and b/app/mobile/android/app/src/main/assets/fonts/Roboto-Medium.ttf differ diff --git a/app/mobile/android/app/src/main/assets/fonts/Roboto-MediumItalic.ttf b/app/mobile/android/app/src/main/assets/fonts/Roboto-MediumItalic.ttf new file mode 100644 index 00000000..fc36a478 Binary files /dev/null and b/app/mobile/android/app/src/main/assets/fonts/Roboto-MediumItalic.ttf differ diff --git a/app/mobile/android/app/src/main/assets/fonts/Roboto-Regular.ttf b/app/mobile/android/app/src/main/assets/fonts/Roboto-Regular.ttf new file mode 100644 index 00000000..ddf4bfac Binary files /dev/null and b/app/mobile/android/app/src/main/assets/fonts/Roboto-Regular.ttf differ diff --git a/app/mobile/android/app/src/main/assets/fonts/Roboto-Thin.ttf b/app/mobile/android/app/src/main/assets/fonts/Roboto-Thin.ttf new file mode 100644 index 00000000..2e0dee6a Binary files /dev/null and b/app/mobile/android/app/src/main/assets/fonts/Roboto-Thin.ttf differ diff --git a/app/mobile/android/app/src/main/assets/fonts/Roboto-ThinItalic.ttf b/app/mobile/android/app/src/main/assets/fonts/Roboto-ThinItalic.ttf new file mode 100644 index 00000000..084f9c0f Binary files /dev/null and b/app/mobile/android/app/src/main/assets/fonts/Roboto-ThinItalic.ttf differ diff --git a/app/mobile/android/link-assets-manifest.json b/app/mobile/android/link-assets-manifest.json new file mode 100644 index 00000000..722c69f2 --- /dev/null +++ b/app/mobile/android/link-assets-manifest.json @@ -0,0 +1,53 @@ +{ + "migIndex": 1, + "data": [ + { + "path": "assets/fonts/Roboto-Black.ttf", + "sha1": "3f8e401d808f6ce84b542266726514ac8be73171" + }, + { + "path": "assets/fonts/Roboto-BlackItalic.ttf", + "sha1": "03d6e3747d862385dbe48e8296385b9236101a62" + }, + { + "path": "assets/fonts/Roboto-Bold.ttf", + "sha1": "62442a18a9fe9457c1afeabf683d263a691b7798" + }, + { + "path": "assets/fonts/Roboto-BoldItalic.ttf", + "sha1": "2f10ad9e8cab0880182705c4e0fbaeabae706e64" + }, + { + "path": "assets/fonts/Roboto-Italic.ttf", + "sha1": "65f3f6a7e1bd2fa6f2df35e4b07775d7f1dde4f0" + }, + { + "path": "assets/fonts/Roboto-Light.ttf", + "sha1": "18788c5d630fa695f9283f6393bfa541b2031508" + }, + { + "path": "assets/fonts/Roboto-LightItalic.ttf", + "sha1": "6e01f9df9449565697032b002706a94b51862bbe" + }, + { + "path": "assets/fonts/Roboto-Medium.ttf", + "sha1": "3c6a09fcc6a454924c81af7dff94fc6d399ed79b" + }, + { + "path": "assets/fonts/Roboto-MediumItalic.ttf", + "sha1": "b3aa2d8f16d5a331fdced82f213a052b204eaca0" + }, + { + "path": "assets/fonts/Roboto-Regular.ttf", + "sha1": "56c5c0d38bde4c1f1549dda43db37b09c608aad3" + }, + { + "path": "assets/fonts/Roboto-Thin.ttf", + "sha1": "58c733e22bceeaf9609ce578eca92ac303c6d92f" + }, + { + "path": "assets/fonts/Roboto-ThinItalic.ttf", + "sha1": "cc79d5a23bd0ec08b1d99f5390bf33cacc3082f4" + } + ] +} diff --git a/app/mobile/assets/fonts/Roboto-Black.ttf b/app/mobile/assets/fonts/Roboto-Black.ttf new file mode 100644 index 00000000..0112e7da Binary files /dev/null and b/app/mobile/assets/fonts/Roboto-Black.ttf differ diff --git a/app/mobile/assets/fonts/Roboto-BlackItalic.ttf b/app/mobile/assets/fonts/Roboto-BlackItalic.ttf new file mode 100644 index 00000000..b2c6aca5 Binary files /dev/null and b/app/mobile/assets/fonts/Roboto-BlackItalic.ttf differ diff --git a/app/mobile/assets/fonts/Roboto-Bold.ttf b/app/mobile/assets/fonts/Roboto-Bold.ttf new file mode 100644 index 00000000..43da14d8 Binary files /dev/null and b/app/mobile/assets/fonts/Roboto-Bold.ttf differ diff --git a/app/mobile/assets/fonts/Roboto-BoldItalic.ttf b/app/mobile/assets/fonts/Roboto-BoldItalic.ttf new file mode 100644 index 00000000..bcfdab43 Binary files /dev/null and b/app/mobile/assets/fonts/Roboto-BoldItalic.ttf differ diff --git a/app/mobile/assets/fonts/Roboto-Italic.ttf b/app/mobile/assets/fonts/Roboto-Italic.ttf new file mode 100644 index 00000000..1b5eaa36 Binary files /dev/null and b/app/mobile/assets/fonts/Roboto-Italic.ttf differ diff --git a/app/mobile/assets/fonts/Roboto-Light.ttf b/app/mobile/assets/fonts/Roboto-Light.ttf new file mode 100644 index 00000000..e7307e72 Binary files /dev/null and b/app/mobile/assets/fonts/Roboto-Light.ttf differ diff --git a/app/mobile/assets/fonts/Roboto-LightItalic.ttf b/app/mobile/assets/fonts/Roboto-LightItalic.ttf new file mode 100644 index 00000000..2d277afb Binary files /dev/null and b/app/mobile/assets/fonts/Roboto-LightItalic.ttf differ diff --git a/app/mobile/assets/fonts/Roboto-Medium.ttf b/app/mobile/assets/fonts/Roboto-Medium.ttf new file mode 100644 index 00000000..ac0f908b Binary files /dev/null and b/app/mobile/assets/fonts/Roboto-Medium.ttf differ diff --git a/app/mobile/assets/fonts/Roboto-MediumItalic.ttf b/app/mobile/assets/fonts/Roboto-MediumItalic.ttf new file mode 100644 index 00000000..fc36a478 Binary files /dev/null and b/app/mobile/assets/fonts/Roboto-MediumItalic.ttf differ diff --git a/app/mobile/assets/fonts/Roboto-Regular.ttf b/app/mobile/assets/fonts/Roboto-Regular.ttf new file mode 100644 index 00000000..ddf4bfac Binary files /dev/null and b/app/mobile/assets/fonts/Roboto-Regular.ttf differ diff --git a/app/mobile/assets/fonts/Roboto-Thin.ttf b/app/mobile/assets/fonts/Roboto-Thin.ttf new file mode 100644 index 00000000..2e0dee6a Binary files /dev/null and b/app/mobile/assets/fonts/Roboto-Thin.ttf differ diff --git a/app/mobile/assets/fonts/Roboto-ThinItalic.ttf b/app/mobile/assets/fonts/Roboto-ThinItalic.ttf new file mode 100644 index 00000000..084f9c0f Binary files /dev/null and b/app/mobile/assets/fonts/Roboto-ThinItalic.ttf differ diff --git a/app/mobile/ios/Databag.xcodeproj/project.pbxproj b/app/mobile/ios/Databag.xcodeproj/project.pbxproj index 63174916..c2e58688 100644 --- a/app/mobile/ios/Databag.xcodeproj/project.pbxproj +++ b/app/mobile/ios/Databag.xcodeproj/project.pbxproj @@ -18,6 +18,18 @@ 7B4A534429F39E250036F3ED /* Sharing.appex in Embed Foundation Extensions */ = {isa = PBXBuildFile; fileRef = 7B4A533A29F39E250036F3ED /* Sharing.appex */; settings = {ATTRIBUTES = (RemoveHeadersOnCopy, ); }; }; 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 */; }; + CE6E235E1381477495980CAE /* Roboto-ThinItalic.ttf in Resources */ = {isa = PBXBuildFile; fileRef = DD10764B06034C9DBFF48B6A /* Roboto-ThinItalic.ttf */; }; /* End PBXBuildFile section */ /* Begin PBXContainerItemProxy section */ @@ -76,6 +88,18 @@ 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; }; 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; }; /* End PBXFileReference section */ /* Begin PBXFrameworksBuildPhase section */ @@ -175,6 +199,7 @@ 83CBBA001A601CBA00E9B192 /* Products */, 2D16E6871FA4F8E400B85C8A /* Frameworks */, BBD78D7AC51CEA395F1C20DB /* Pods */, + 8C5722C039554D188BE6CC6B /* Resources */, ); indentWidth = 2; sourceTree = ""; @@ -202,6 +227,26 @@ path = Pods; sourceTree = ""; }; + 8C5722C039554D188BE6CC6B /* Resources */ = { + isa = "PBXGroup"; + children = ( + ECFB49329806460281EC8695 /* Roboto-Black.ttf */, + 5F30ED55DB1949EAB4C68C0E /* Roboto-BlackItalic.ttf */, + B95DE2563CFF4F6994482640 /* Roboto-Bold.ttf */, + 534B4A5F74BC47BA8A24CA77 /* Roboto-BoldItalic.ttf */, + 5B470EE70F4B40FA93CE1ED6 /* Roboto-Italic.ttf */, + 680D48DE60574F0082B2AA56 /* Roboto-Light.ttf */, + 22A26F2AA8024E1088D9E0F0 /* Roboto-LightItalic.ttf */, + D6B3F198900D438990E3E250 /* Roboto-Medium.ttf */, + F942FA23DB5E41CF8FA13489 /* Roboto-MediumItalic.ttf */, + 362E7074D5874C16A31B62FE /* Roboto-Regular.ttf */, + 81D33AA1ED5E4DA196301306 /* Roboto-Thin.ttf */, + DD10764B06034C9DBFF48B6A /* Roboto-ThinItalic.ttf */, + ); + name = Resources; + sourceTree = ""; + path = ""; + }; /* End PBXGroup section */ /* Begin PBXNativeTarget section */ @@ -325,6 +370,18 @@ 81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */, 13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */, 7B13A774299E21170048D0DD /* GoogleService-Info.plist in Resources */, + 77D8C512BFDD4D25AA7B3243 /* Roboto-Black.ttf in Resources */, + 5F9F9F136E694107B2B19B0E /* Roboto-BlackItalic.ttf in Resources */, + BA632FE7EDF5434A83315128 /* Roboto-Bold.ttf in Resources */, + 74850D4119604C1EAA6F43C4 /* Roboto-BoldItalic.ttf in Resources */, + 731523F08D314F09BFE236AD /* Roboto-Italic.ttf in Resources */, + 7DAB71C0E7784244A7F36C5E /* Roboto-Light.ttf in Resources */, + B9DCBA54B6B14C6D9EEC5E76 /* Roboto-LightItalic.ttf in Resources */, + 0165040169E94CC2BBA26B58 /* Roboto-Medium.ttf in Resources */, + 1398F2035F1B40E89A1F9387 /* Roboto-MediumItalic.ttf in Resources */, + 5BCA507BB2A348EF881A9424 /* Roboto-Regular.ttf in Resources */, + 21CC4475B2A9481CAB38378C /* Roboto-Thin.ttf in Resources */, + CE6E235E1381477495980CAE /* Roboto-ThinItalic.ttf in Resources */, ); runOnlyForDeploymentPostprocessing = 0; }; diff --git a/app/mobile/ios/Databag/Info.plist b/app/mobile/ios/Databag/Info.plist index cddec778..c85cb3a6 100644 --- a/app/mobile/ios/Databag/Info.plist +++ b/app/mobile/ios/Databag/Info.plist @@ -35,12 +35,12 @@ - NSCameraUsageDescription - Camera permission description - NSMicrophoneUsageDescription - Microphone permission description + NSCameraUsageDescription + Camera permission description + NSMicrophoneUsageDescription + Microphone permission description NSLocationWhenInUseUsageDescription - + NSPhotoLibraryUsageDescription Used to set profile image and post photos UIAppFonts @@ -61,6 +61,18 @@ Octicons.ttf SimpleLineIcons.ttf Zocial.ttf + Roboto-Black.ttf + Roboto-BlackItalic.ttf + Roboto-Bold.ttf + Roboto-BoldItalic.ttf + Roboto-Italic.ttf + Roboto-Light.ttf + Roboto-LightItalic.ttf + Roboto-Medium.ttf + Roboto-MediumItalic.ttf + Roboto-Regular.ttf + Roboto-Thin.ttf + Roboto-ThinItalic.ttf UIBackgroundModes @@ -88,19 +100,17 @@ UIViewControllerBasedStatusBarAppearance - - CFBundleURLTypes - - - CFBundleTypeRole - Editor - CFBundleURLSchemes - - org.coredb.databag - - - - - + CFBundleURLTypes + + + CFBundleTypeRole + Editor + CFBundleURLSchemes + + org.coredb.databag + + + + diff --git a/app/mobile/ios/link-assets-manifest.json b/app/mobile/ios/link-assets-manifest.json new file mode 100644 index 00000000..722c69f2 --- /dev/null +++ b/app/mobile/ios/link-assets-manifest.json @@ -0,0 +1,53 @@ +{ + "migIndex": 1, + "data": [ + { + "path": "assets/fonts/Roboto-Black.ttf", + "sha1": "3f8e401d808f6ce84b542266726514ac8be73171" + }, + { + "path": "assets/fonts/Roboto-BlackItalic.ttf", + "sha1": "03d6e3747d862385dbe48e8296385b9236101a62" + }, + { + "path": "assets/fonts/Roboto-Bold.ttf", + "sha1": "62442a18a9fe9457c1afeabf683d263a691b7798" + }, + { + "path": "assets/fonts/Roboto-BoldItalic.ttf", + "sha1": "2f10ad9e8cab0880182705c4e0fbaeabae706e64" + }, + { + "path": "assets/fonts/Roboto-Italic.ttf", + "sha1": "65f3f6a7e1bd2fa6f2df35e4b07775d7f1dde4f0" + }, + { + "path": "assets/fonts/Roboto-Light.ttf", + "sha1": "18788c5d630fa695f9283f6393bfa541b2031508" + }, + { + "path": "assets/fonts/Roboto-LightItalic.ttf", + "sha1": "6e01f9df9449565697032b002706a94b51862bbe" + }, + { + "path": "assets/fonts/Roboto-Medium.ttf", + "sha1": "3c6a09fcc6a454924c81af7dff94fc6d399ed79b" + }, + { + "path": "assets/fonts/Roboto-MediumItalic.ttf", + "sha1": "b3aa2d8f16d5a331fdced82f213a052b204eaca0" + }, + { + "path": "assets/fonts/Roboto-Regular.ttf", + "sha1": "56c5c0d38bde4c1f1549dda43db37b09c608aad3" + }, + { + "path": "assets/fonts/Roboto-Thin.ttf", + "sha1": "58c733e22bceeaf9609ce578eca92ac303c6d92f" + }, + { + "path": "assets/fonts/Roboto-ThinItalic.ttf", + "sha1": "cc79d5a23bd0ec08b1d99f5390bf33cacc3082f4" + } + ] +} diff --git a/app/mobile/react-native.config.js b/app/mobile/react-native.config.js new file mode 100644 index 00000000..87ca4051 --- /dev/null +++ b/app/mobile/react-native.config.js @@ -0,0 +1,7 @@ +module.exports = { + project: { + ios:{}, + android:{} + }, + assets:['./assets/fonts/'], +} diff --git a/app/mobile/src/constants/Strings.js b/app/mobile/src/constants/Strings.js index 06f794e7..bbdbb6ab 100644 --- a/app/mobile/src/constants/Strings.js +++ b/app/mobile/src/constants/Strings.js @@ -15,8 +15,8 @@ export function getLanguageId(language) { }; export const Strings = [ - { - visibleRegistry: 'Visible in Rengistry', + { + visibleRegistry: 'Visible in Registry', edit: 'Edit', enableNotifications: 'Enable Notifications', sealedTopics: 'Sealed Topics', @@ -31,69 +31,69 @@ export const Strings = [ messages: 'Messages', support: 'Support', blocked: 'Blocked', - actions: 'Actions', + account: 'Account', display: 'Display', - settings: 'Settings', + messaging: 'Messaging', }, { visibleRegistry: 'Visible dans le Registre', edit: 'Modifier', enableNotifications: 'Activer les Notifications', - sealedTopics: 'Sujets Sécurisés', - colorMode: 'Mode de Couleur', + sealedTopics: 'Sujets Sécurisés', + colorMode: 'Mode de Couleur', hourMode: 'Format d\'Heure', language: 'Langue', - logout: 'Se Déconnecter', + logout: 'Se Déconnecter', changeLogin: 'Changer le Mot de Passe', deleteAccount: 'Supprimer le Compte', contacts: 'Contacts', topics: 'Sujets', messages: 'Messages', support: 'Aide', - blocked: 'Supprimé', - actions: 'Actions', - display: 'Écran', - settings: 'Configuration', + blocked: 'Supprimé', + account: 'Compte', + display: 'Écran', + messaging: 'Messagerie', }, { visibleRegistry: 'Visible en el Registro', edit: 'Editar', - enableNotifications: 'Permitir Notificaciones', - sealedTopics: 'Temas Protegidos', + enableNotifications: 'Permitir Notificaciones', + sealedTopics: 'Temas Protegidos', colorMode: 'Modo de Color', hourMode: 'Formato de Hora', language: 'Idioma', - logout: 'Cerrar Sesión', - changeLogin: 'Cambiar la contraseña', + logout: 'Cerrar Sesión', + changeLogin: 'Cambiar la contraseña', deleteAccount: 'Borrar Cuenta', contacts: 'Contactos', topics: 'Temas', messages: 'Mensajes', support: 'Ayuda', blocked: 'Oculto', - actions: 'Métodos', + account: 'Cuenta', display: 'Pantalla', - settings: 'Configuración', + messaging: 'Mensajería', }, { visibleRegistry: 'Sichtbar in der Registrierung', edit: 'Bearbeiten', - enableNotifications: 'Benachrichtigungen aktivieren', + enableNotifications: 'Benachrichtigungen aktivieren', sealedTopics: 'Gesicherte Themen', colorMode: 'Farmodus', hourMode: 'Stundenformat', language: 'Sprache', logout: 'Ausloggen', changeLogin: 'Kennwort Aktualisieren', - deleteAccount: 'Konto Löschen', + deleteAccount: 'Konto Löschen', contacts: 'Kontakte', topics: 'Themen', messages: 'Mitteilungen', support: 'Helfen', blocked: 'Versteckt', - actions: 'Aktionen', + account: 'Konto', display: 'Bildschirm', - settings: 'Aufbau', + messages: 'Nachrichtenübermittlung', } ]; diff --git a/app/mobile/src/session/settings/Settings.jsx b/app/mobile/src/session/settings/Settings.jsx index 780299cb..3538b311 100644 --- a/app/mobile/src/session/settings/Settings.jsx +++ b/app/mobile/src/session/settings/Settings.jsx @@ -11,10 +11,10 @@ export function Settings() { const { state, actions } = useSettings(); return ( - + - Settings + { Strings[state.lang].messaging } @@ -28,7 +28,7 @@ export function Settings() { - + @@ -36,10 +36,10 @@ export function Settings() { { Strings[state.lang].sealedTopics } - + - Display + { Strings[state.lang].display } @@ -51,7 +51,7 @@ export function Settings() { - + @@ -62,6 +62,85 @@ export function Settings() { + { Strings[state.lang].account } + + + + + + + { Strings[state.lang].logout } + + + + + + + + + + { Strings[state.lang].changeLogin } + + + + + + + + + + { Strings[state.lang].deleteAccount } + + + + + + { Strings[state.lang].blocked } + + + + + + + { Strings[state.lang].contacts } + + + + + + + + + + { Strings[state.lang].topics } + + + + + + + + + + { Strings[state.lang].messages } + + + + + + { Strings[state.lang].support } + + + + + + + github.com/balzack/databag + + + + + ); diff --git a/app/mobile/src/session/settings/Settings.styled.js b/app/mobile/src/session/settings/Settings.styled.js index 15bd6e66..9a83785d 100644 --- a/app/mobile/src/session/settings/Settings.styled.js +++ b/app/mobile/src/session/settings/Settings.styled.js @@ -15,6 +15,7 @@ export const styles = StyleSheet.create({ label: { color: Colors.text, padding: 4, + fontFamily: 'Roboto', }, group: { backgroundColor: Colors.areaBase, @@ -53,11 +54,19 @@ export const styles = StyleSheet.create({ fontSize: 16, paddingRight: 8, color: Colors.text, + fontFamily: 'Roboto', }, optionLink: { fontSize: 16, paddingRight: 8, color: Colors.linkText, + fontFamily: 'Roboto', + }, + dangerLink: { + fontSize: 16, + paddingRight: 8, + color: Colors.dangerText, + fontFamily: 'Roboto', }, track: { false: Colors.disabledIndicator,