diff --git a/android/app/src/main/assets/fonts/Gilroy-Bold.ttf b/android/app/src/main/assets/fonts/Gilroy-Bold.ttf new file mode 100644 index 00000000..9cf55b7e Binary files /dev/null and b/android/app/src/main/assets/fonts/Gilroy-Bold.ttf differ diff --git a/android/app/src/main/assets/fonts/Gilroy-Medium.ttf b/android/app/src/main/assets/fonts/Gilroy-Medium.ttf new file mode 100644 index 00000000..c9ebeb55 Binary files /dev/null and b/android/app/src/main/assets/fonts/Gilroy-Medium.ttf differ diff --git a/android/app/src/main/assets/fonts/Gilroy-Regular.ttf b/android/app/src/main/assets/fonts/Gilroy-Regular.ttf new file mode 100644 index 00000000..586e79a4 Binary files /dev/null and b/android/app/src/main/assets/fonts/Gilroy-Regular.ttf differ diff --git a/android/app/src/main/assets/fonts/Gilroy-Semibold.ttf b/android/app/src/main/assets/fonts/Gilroy-Semibold.ttf new file mode 100644 index 00000000..82684695 Binary files /dev/null and b/android/app/src/main/assets/fonts/Gilroy-Semibold.ttf differ diff --git a/android/app/src/main/res/font/gilroy.xml b/android/app/src/main/res/font/gilroy.xml new file mode 100644 index 00000000..3c1bd594 --- /dev/null +++ b/android/app/src/main/res/font/gilroy.xml @@ -0,0 +1,37 @@ + + + + + + + + + + \ No newline at end of file diff --git a/android/app/src/main/res/font/gilroy_bold.ttf b/android/app/src/main/res/font/gilroy_bold.ttf new file mode 100644 index 00000000..9cf55b7e Binary files /dev/null and b/android/app/src/main/res/font/gilroy_bold.ttf differ diff --git a/android/app/src/main/res/font/gilroy_medium.ttf b/android/app/src/main/res/font/gilroy_medium.ttf new file mode 100644 index 00000000..c9ebeb55 Binary files /dev/null and b/android/app/src/main/res/font/gilroy_medium.ttf differ diff --git a/android/app/src/main/res/font/gilroy_regular.ttf b/android/app/src/main/res/font/gilroy_regular.ttf new file mode 100644 index 00000000..586e79a4 Binary files /dev/null and b/android/app/src/main/res/font/gilroy_regular.ttf differ diff --git a/android/app/src/main/res/font/gilroy_semibold.ttf b/android/app/src/main/res/font/gilroy_semibold.ttf new file mode 100644 index 00000000..82684695 Binary files /dev/null and b/android/app/src/main/res/font/gilroy_semibold.ttf differ diff --git a/ios/taskme.xcodeproj/project.pbxproj b/ios/taskme.xcodeproj/project.pbxproj index 4b0adccd..04ad464c 100644 --- a/ios/taskme.xcodeproj/project.pbxproj +++ b/ios/taskme.xcodeproj/project.pbxproj @@ -12,6 +12,10 @@ 13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */ = {isa = PBXBuildFile; fileRef = 13B07FB51A68108700A75B9A /* Images.xcassets */; }; 13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; }; 1CEA5DFB26FCA6F700BCC3E1 /* File.swift in Sources */ = {isa = PBXBuildFile; fileRef = 1CEA5DFA26FCA6F700BCC3E1 /* File.swift */; }; + 2987B7362760E7DD00D6426B /* Gilroy-Bold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 2987B7322760E7DD00D6426B /* Gilroy-Bold.ttf */; }; + 2987B7372760E7DD00D6426B /* Gilroy-Regular.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 2987B7332760E7DD00D6426B /* Gilroy-Regular.ttf */; }; + 2987B7382760E7DD00D6426B /* Gilroy-Medium.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 2987B7342760E7DD00D6426B /* Gilroy-Medium.ttf */; }; + 2987B7392760E7DD00D6426B /* Gilroy-Semibold.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 2987B7352760E7DD00D6426B /* Gilroy-Semibold.ttf */; }; 5244945D26B7EA27006A5FAB /* fontello.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 5244945C26B7EA27006A5FAB /* fontello.ttf */; }; 6F69E8F66337833783B2D5E0 /* libPods-taskme.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 0B6C30F16A8285D307DEBF8A /* libPods-taskme.a */; }; 81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */ = {isa = PBXBuildFile; fileRef = 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */; }; @@ -41,6 +45,10 @@ 13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = taskme/main.m; sourceTree = ""; }; 1CEA5DF926FCA6F600BCC3E1 /* taskme-Bridging-Header.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = "taskme-Bridging-Header.h"; sourceTree = ""; }; 1CEA5DFA26FCA6F700BCC3E1 /* File.swift */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.swift; path = File.swift; sourceTree = ""; }; + 2987B7322760E7DD00D6426B /* Gilroy-Bold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Gilroy-Bold.ttf"; path = "../src/assets/fonts/Gilroy-Bold.ttf"; sourceTree = ""; }; + 2987B7332760E7DD00D6426B /* Gilroy-Regular.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Gilroy-Regular.ttf"; path = "../src/assets/fonts/Gilroy-Regular.ttf"; sourceTree = ""; }; + 2987B7342760E7DD00D6426B /* Gilroy-Medium.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Gilroy-Medium.ttf"; path = "../src/assets/fonts/Gilroy-Medium.ttf"; sourceTree = ""; }; + 2987B7352760E7DD00D6426B /* Gilroy-Semibold.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = "Gilroy-Semibold.ttf"; path = "../src/assets/fonts/Gilroy-Semibold.ttf"; sourceTree = ""; }; 5244945C26B7EA27006A5FAB /* fontello.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = fontello.ttf; path = ../src/assets/fonts/fontello.ttf; sourceTree = ""; }; 60559287623ADE493014FD74 /* libPods-taskme-taskmeTests.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = "libPods-taskme-taskmeTests.a"; sourceTree = BUILT_PRODUCTS_DIR; }; 81AB9BB72411601600AC10FF /* LaunchScreen.storyboard */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = file.storyboard; name = LaunchScreen.storyboard; path = taskme/LaunchScreen.storyboard; sourceTree = ""; }; @@ -123,6 +131,10 @@ 83CBB9F61A601CBA00E9B192 = { isa = PBXGroup; children = ( + 2987B7322760E7DD00D6426B /* Gilroy-Bold.ttf */, + 2987B7342760E7DD00D6426B /* Gilroy-Medium.ttf */, + 2987B7332760E7DD00D6426B /* Gilroy-Regular.ttf */, + 2987B7352760E7DD00D6426B /* Gilroy-Semibold.ttf */, 5244945C26B7EA27006A5FAB /* fontello.ttf */, 13B07FAE1A68108700A75B9A /* taskme */, 832341AE1AAA6A7D00B99B32 /* Libraries */, @@ -130,6 +142,7 @@ 83CBBA001A601CBA00E9B192 /* Products */, 2D16E6871FA4F8E400B85C8A /* Frameworks */, B362F9321C4BC54C6EBF6F61 /* Pods */, + 3410F3470FC048E0A263B862 /* Resources */, ); indentWidth = 2; sourceTree = ""; @@ -253,6 +266,10 @@ isa = PBXResourcesBuildPhase; buildActionMask = 2147483647; files = ( + 2987B7362760E7DD00D6426B /* Gilroy-Bold.ttf in Resources */, + 2987B7372760E7DD00D6426B /* Gilroy-Regular.ttf in Resources */, + 2987B7382760E7DD00D6426B /* Gilroy-Medium.ttf in Resources */, + 2987B7392760E7DD00D6426B /* Gilroy-Semibold.ttf in Resources */, 81AB9BB82411601600AC10FF /* LaunchScreen.storyboard in Resources */, 13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */, 5244945D26B7EA27006A5FAB /* fontello.ttf in Resources */, diff --git a/ios/taskme/Info.plist b/ios/taskme/Info.plist index b85c3b13..896bb97d 100644 --- a/ios/taskme/Info.plist +++ b/ios/taskme/Info.plist @@ -40,12 +40,16 @@ NSCameraUsageDescription Потрібно надати доступ до камери NSLocationWhenInUseUsageDescription - + NSPhotoLibraryUsageDescription Потрібно надати доступ до галереї UIAppFonts fontello.ttf + Gilroy-Regular.ttf + Gilroy-Medium.ttf + Gilroy-Bold.ttf + Gilroy-Semibold.ttf UILaunchStoryboardName LaunchScreen diff --git a/react-native.config.js b/react-native.config.js new file mode 100644 index 00000000..e03af245 --- /dev/null +++ b/react-native.config.js @@ -0,0 +1,3 @@ +module.exports = { + assets: ['./src/assets/fonts'], +} \ No newline at end of file diff --git a/src/assets/fonts/Gilroy-Bold.ttf b/src/assets/fonts/Gilroy-Bold.ttf new file mode 100644 index 00000000..9cf55b7e Binary files /dev/null and b/src/assets/fonts/Gilroy-Bold.ttf differ diff --git a/src/assets/fonts/Gilroy-Medium.ttf b/src/assets/fonts/Gilroy-Medium.ttf new file mode 100644 index 00000000..c9ebeb55 Binary files /dev/null and b/src/assets/fonts/Gilroy-Medium.ttf differ diff --git a/src/assets/fonts/Gilroy-Regular.ttf b/src/assets/fonts/Gilroy-Regular.ttf new file mode 100644 index 00000000..586e79a4 Binary files /dev/null and b/src/assets/fonts/Gilroy-Regular.ttf differ diff --git a/src/assets/fonts/Gilroy-Semibold.ttf b/src/assets/fonts/Gilroy-Semibold.ttf new file mode 100644 index 00000000..82684695 Binary files /dev/null and b/src/assets/fonts/Gilroy-Semibold.ttf differ diff --git a/src/config/fonts.ts b/src/config/fonts.ts index 7f497b41..9b41c974 100644 --- a/src/config/fonts.ts +++ b/src/config/fonts.ts @@ -1,7 +1,7 @@ export const fonts = { Gilroy: { 700: 'Gilroy-Bold', - 600: 'Gilroy-DemiBold', + 600: 'Gilroy-Semibold', 500: 'Gilroy-Medium', 400: 'Gilroy-Regular', }, diff --git a/src/modules/settings/components/setting-item.component.tsx b/src/modules/settings/components/setting-item.component.tsx index 4154f0d3..fe1ca492 100644 --- a/src/modules/settings/components/setting-item.component.tsx +++ b/src/modules/settings/components/setting-item.component.tsx @@ -1,4 +1,4 @@ -import { $size, IconComponent } from '@/shared' +import { $size, IconComponent, Txt } from '@/shared' import { useTheme } from '@/shared/hooks/use-theme.hook' import { PartialTheme } from '@/shared/themes/interfaces' import React, { FC, useMemo } from 'react' @@ -74,7 +74,7 @@ export const SettingItem: FC = props => { size={$size(22)} style={styles.icon} /> - {props.title} + {props.title} {renderAdditionalIcon} diff --git a/src/shared/components/elements/txt.component.tsx b/src/shared/components/elements/txt.component.tsx index 2c4b1152..604e97b3 100644 --- a/src/shared/components/elements/txt.component.tsx +++ b/src/shared/components/elements/txt.component.tsx @@ -3,7 +3,7 @@ import _ from 'lodash' import { Text, TextProps, TextStyle } from 'react-native' import { config } from '@/config' -// import {getFont} from '@/shared/helpers'; +import {getFont} from '@/shared/helpers'; interface TxtProps extends TextProps { /** @@ -24,10 +24,10 @@ interface TxtProps extends TextProps { export const Txt = (props: TxtProps) => { const customStyle: TextStyle = { - // fontFamily: getFont( - // _.defaultTo(props.font, 'Gilroy'), - // _.defaultTo(props.weight, '400'), - // ), + fontFamily: getFont( + _.defaultTo(props.font, 'Gilroy'), + _.defaultTo(props.weight, '400'), + ), } return diff --git a/src/shared/components/headers/primary-header.component.tsx b/src/shared/components/headers/primary-header.component.tsx index ce78a88e..3c180a00 100644 --- a/src/shared/components/headers/primary-header.component.tsx +++ b/src/shared/components/headers/primary-header.component.tsx @@ -68,7 +68,7 @@ const createStyles = (theme: PartialTheme) => }, title: { fontSize: $size(17, 15), - fontWeight: isAndroid('bold', '600'), + fontWeight: isAndroid('bold', '700'), color: theme.$textPrimary, flex: 1, textAlign: 'center',