Browse Source

Add Hack monospace font on Android

monospace font is not very good to display number

Fixes: https://github.com/lesspass/lesspass/issues/490
pull/544/head
Guillaume Vincent 4 years ago
parent
commit
2b851dbc25
9 changed files with 69 additions and 18 deletions
  1. +2
    -1
      mobile/android/app/build.gradle
  2. BIN
      mobile/android/app/src/main/assets/fonts/Hack.ttf
  3. BIN
      mobile/assets/fonts/Hack.ttf
  4. +54
    -0
      mobile/ios/LessPass.xcodeproj/project.pbxproj
  5. +1
    -13
      mobile/ios/LessPass/Info.plist
  6. +1
    -1
      mobile/package.json
  7. +7
    -0
      mobile/react-native.config.js
  8. +3
    -2
      mobile/src/auth/AuthStackScreen.js
  9. +1
    -1
      mobile/src/password/GeneratedPassword.js

+ 2
- 1
mobile/android/app/build.gradle View File

@@ -79,7 +79,8 @@ import com.android.build.OutputFile

project.ext.vectoricons = [
iconFontNames: [
"FontAwesome.ttf"
"MaterialCommunityIcons.ttf",
"FontAwesome.ttf",
]
]



BIN
mobile/android/app/src/main/assets/fonts/Hack.ttf View File


BIN
mobile/assets/fonts/Hack.ttf View File


+ 54
- 0
mobile/ios/LessPass.xcodeproj/project.pbxproj View File

@@ -20,6 +20,9 @@
2D02E4BF1E0B4AB3006451C7 /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
2DCD954D1E0B4F2C00145EB5 /* LessPassTests.m in Sources */ = {isa = PBXBuildFile; fileRef = 00E356F21AD99517003FC87E /* LessPassTests.m */; };
88B90D1D80A02D5089F827F2 /* libPods-LessPass-tvOSTests.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 39900D9E8621363EA84F648B /* libPods-LessPass-tvOSTests.a */; };
2135E9CC48DB47BCB711C12B /* Hack.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 2A7E546E77E74EF3A37A6A77 /* Hack.ttf */; };
194DA2F6EC5E4C2EB938DC30 /* FontAwesome.ttf in Resources */ = {isa = PBXBuildFile; fileRef = EB378C5D23014DA5B3142B0A /* FontAwesome.ttf */; };
825CB7C7ED5D442D8E4A7BAD /* MaterialCommunityIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 78F06CE57E5D45A389E44F31 /* MaterialCommunityIcons.ttf */; };
/* End PBXBuildFile section */

/* Begin PBXContainerItemProxy section */
@@ -67,6 +70,23 @@
ED2971642150620600B7C4FE /* JavaScriptCore.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = JavaScriptCore.framework; path = Platforms/AppleTVOS.platform/Developer/SDKs/AppleTVOS12.0.sdk/System/Library/Frameworks/JavaScriptCore.framework; sourceTree = DEVELOPER_DIR; };
F91388109829B5726913CF33 /* Pods-LessPass.debug.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-LessPass.debug.xcconfig"; path = "Target Support Files/Pods-LessPass/Pods-LessPass.debug.xcconfig"; sourceTree = "<group>"; };
FCB0DE1D8662E60C58813567 /* Pods-LessPass-tvOSTests.release.xcconfig */ = {isa = PBXFileReference; includeInIndex = 1; lastKnownFileType = text.xcconfig; name = "Pods-LessPass-tvOSTests.release.xcconfig"; path = "Target Support Files/Pods-LessPass-tvOSTests/Pods-LessPass-tvOSTests.release.xcconfig"; sourceTree = "<group>"; };
2A7E546E77E74EF3A37A6A77 /* Hack.ttf */ = {isa = PBXFileReference; name = "Hack.ttf"; path = "../assets/fonts/Hack.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
E35C5DB6546D439880DDC0A3 /* AntDesign.ttf */ = {isa = PBXFileReference; name = "AntDesign.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/AntDesign.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
83F2BD4EB33249EFB5EEECE5 /* Entypo.ttf */ = {isa = PBXFileReference; name = "Entypo.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/Entypo.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
FBC1E701A1224E37B37FF517 /* EvilIcons.ttf */ = {isa = PBXFileReference; name = "EvilIcons.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/EvilIcons.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
E4ED3E1714A4410B922B80D8 /* Feather.ttf */ = {isa = PBXFileReference; name = "Feather.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/Feather.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
EB378C5D23014DA5B3142B0A /* FontAwesome.ttf */ = {isa = PBXFileReference; name = "FontAwesome.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
43261EA585014BA2A95932A8 /* FontAwesome5_Brands.ttf */ = {isa = PBXFileReference; name = "FontAwesome5_Brands.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Brands.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
B2695404C7D54FF28AA9EDA4 /* FontAwesome5_Regular.ttf */ = {isa = PBXFileReference; name = "FontAwesome5_Regular.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Regular.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
98273DAF08E24D14A8A70EA4 /* FontAwesome5_Solid.ttf */ = {isa = PBXFileReference; name = "FontAwesome5_Solid.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/FontAwesome5_Solid.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
0589C4DD6E6749A3A5FAAC9E /* Fontisto.ttf */ = {isa = PBXFileReference; name = "Fontisto.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/Fontisto.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
831FDCC2477042F485374B48 /* Foundation.ttf */ = {isa = PBXFileReference; name = "Foundation.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/Foundation.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
494B0ECA0B614D868AE60380 /* Ionicons.ttf */ = {isa = PBXFileReference; name = "Ionicons.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/Ionicons.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
78F06CE57E5D45A389E44F31 /* MaterialCommunityIcons.ttf */ = {isa = PBXFileReference; name = "MaterialCommunityIcons.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/MaterialCommunityIcons.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
DE6D9F29DA0043679D5B7ED8 /* MaterialIcons.ttf */ = {isa = PBXFileReference; name = "MaterialIcons.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/MaterialIcons.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
EF28E64DF8244301BDD4EFAA /* Octicons.ttf */ = {isa = PBXFileReference; name = "Octicons.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/Octicons.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
17B38E9969E1460BAC777931 /* SimpleLineIcons.ttf */ = {isa = PBXFileReference; name = "SimpleLineIcons.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/SimpleLineIcons.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
6BAE87B96E2B42BC801A3EE7 /* Zocial.ttf */ = {isa = PBXFileReference; name = "Zocial.ttf"; path = "../node_modules/react-native-vector-icons/Fonts/Zocial.ttf"; sourceTree = "<group>"; fileEncoding = undefined; lastKnownFileType = unknown; explicitFileType = undefined; includeInIndex = 0; };
/* End PBXFileReference section */

/* Begin PBXFrameworksBuildPhase section */
@@ -125,6 +145,23 @@
057FF7BE84754F339DE1FDE2 /* Resources */ = {
isa = PBXGroup;
children = (
2A7E546E77E74EF3A37A6A77 /* Hack.ttf */,
E35C5DB6546D439880DDC0A3 /* AntDesign.ttf */,
83F2BD4EB33249EFB5EEECE5 /* Entypo.ttf */,
FBC1E701A1224E37B37FF517 /* EvilIcons.ttf */,
E4ED3E1714A4410B922B80D8 /* Feather.ttf */,
EB378C5D23014DA5B3142B0A /* FontAwesome.ttf */,
43261EA585014BA2A95932A8 /* FontAwesome5_Brands.ttf */,
B2695404C7D54FF28AA9EDA4 /* FontAwesome5_Regular.ttf */,
98273DAF08E24D14A8A70EA4 /* FontAwesome5_Solid.ttf */,
0589C4DD6E6749A3A5FAAC9E /* Fontisto.ttf */,
831FDCC2477042F485374B48 /* Foundation.ttf */,
494B0ECA0B614D868AE60380 /* Ionicons.ttf */,
78F06CE57E5D45A389E44F31 /* MaterialCommunityIcons.ttf */,
DE6D9F29DA0043679D5B7ED8 /* MaterialIcons.ttf */,
EF28E64DF8244301BDD4EFAA /* Octicons.ttf */,
17B38E9969E1460BAC777931 /* SimpleLineIcons.ttf */,
6BAE87B96E2B42BC801A3EE7 /* Zocial.ttf */,
);
name = Resources;
path = "";
@@ -351,6 +388,23 @@
files = (
13B07FBF1A68108700A75B9A /* Images.xcassets in Resources */,
13B07FBD1A68108700A75B9A /* LaunchScreen.xib in Resources */,
2135E9CC48DB47BCB711C12B /* Hack.ttf in Resources */,
AFEB58DFBD8D4CDCBDCD7E0D /* AntDesign.ttf in Resources */,
2AF32E509CA245BFBB1F0266 /* Entypo.ttf in Resources */,
882B5AE098A744AAA51D05E9 /* EvilIcons.ttf in Resources */,
9394DB7FE63F4086B3497538 /* Feather.ttf in Resources */,
194DA2F6EC5E4C2EB938DC30 /* FontAwesome.ttf in Resources */,
6E81B0CBC8E2418AA16F771F /* FontAwesome5_Brands.ttf in Resources */,
59A77320A7244E83926C407A /* FontAwesome5_Regular.ttf in Resources */,
D4060EE6562649E0ACB9C3E6 /* FontAwesome5_Solid.ttf in Resources */,
64749EE8044D459DB46C1E98 /* Fontisto.ttf in Resources */,
3780A17706D84E1091AD704E /* Foundation.ttf in Resources */,
FE1AAA2F3DEB46DBBE957E88 /* Ionicons.ttf in Resources */,
825CB7C7ED5D442D8E4A7BAD /* MaterialCommunityIcons.ttf in Resources */,
F10883331CFC4BE8A4D27594 /* MaterialIcons.ttf in Resources */,
137A958518AF4CEBAFB6D9AA /* Octicons.ttf in Resources */,
7DD73EBF9446463990235705 /* SimpleLineIcons.ttf in Resources */,
25DAD6D03D6946FCBD79F397 /* Zocial.ttf in Resources */,
);
runOnlyForDeploymentPostprocessing = 0;
};


+ 1
- 13
mobile/ios/LessPass/Info.plist View File

@@ -55,21 +55,9 @@
<false/>
<key>UIAppFonts</key>
<array>
<string>AntDesign.ttf</string>
<string>Entypo.ttf</string>
<string>EvilIcons.ttf</string>
<string>Feather.ttf</string>
<string>FontAwesome.ttf</string>
<string>FontAwesome5_Brands.ttf</string>
<string>FontAwesome5_Regular.ttf</string>
<string>FontAwesome5_Solid.ttf</string>
<string>Foundation.ttf</string>
<string>Ionicons.ttf</string>
<string>MaterialIcons.ttf</string>
<string>MaterialCommunityIcons.ttf</string>
<string>SimpleLineIcons.ttf</string>
<string>Octicons.ttf</string>
<string>Zocial.ttf</string>
<string>Hack.ttf</string>
</array>
</dict>
</plist>

+ 1
- 1
mobile/package.json View File

@@ -1,6 +1,6 @@
{
"name": "lesspass-mobile",
"version": "9.1.9",
"version": "9.1.10",
"description": "LessPass mobile application",
"license": "(MPL-2.0 OR GPL-3.0)",
"author": {


+ 7
- 0
mobile/react-native.config.js View File

@@ -0,0 +1,7 @@
module.exports = {
project: {
ios: {},
android: {}
},
assets: ["./assets/fonts/"]
};

+ 3
- 2
mobile/src/auth/AuthStackScreen.js View File

@@ -2,13 +2,14 @@ import React from "react";
import { createStackNavigator } from "@react-navigation/stack";
import SignInScreen from "./SignInScreen";
import SignUpScreen from "./SignUpScreen";
import routes from "../routes";

const AuthStack = createStackNavigator();

const AuthStackScreen = () => (
<AuthStack.Navigator headerMode="none">
<AuthStack.Screen name="SignIn" component={SignInScreen} />
<AuthStack.Screen name="SignUp" component={SignUpScreen} />
<AuthStack.Screen name={routes.SIGN_IN} component={SignInScreen} />
<AuthStack.Screen name={routes.SIGN_UP} component={SignUpScreen} />
</AuthStack.Navigator>
);



+ 1
- 1
mobile/src/password/GeneratedPassword.js View File

@@ -53,7 +53,7 @@ export default class GeneratedPassword extends Component {
color: Theme.colors.white,
textAlign: "center",
fontSize: 16,
fontFamily: "monospace"
fontFamily: "Hack"
}}
>
{saved && "SAVED"}


Loading…
Cancel
Save