add font 字体包

Author: TrustDec

android/app/src/main/AndroidManifest.xml

@@ -1,34 +1,30 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+<manifest
+    xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.awesomeproject"
     android:versionCode="1"
     android:versionName="1.0.0">
-
     <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
+    <uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW" />
 
-    <uses-sdk
-        android:minSdkVersion="16"
-        android:targetSdkVersion="22" />
+    <uses-sdk android:minSdkVersion="16" android:targetSdkVersion="22" />
 
     <application
-      android:name=".MainApplication"
-      android:allowBackup="true"
-      android:label="@string/app_name"
-      android:icon="@mipmap/ic_launcher"
-      android:theme="@style/AppTheme">
-      <activity
-        android:name=".MainActivity"
+        android:name=".MainApplication"
+        android:allowBackup="true"
         android:label="@string/app_name"
-        android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
-        android:windowSoftInputMode="adjustResize">
-        <intent-filter>
-            <action android:name="android.intent.action.MAIN" />
-            <category android:name="android.intent.category.LAUNCHER" />
-        </intent-filter>
-      </activity>
-      <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
+        android:icon="@mipmap/ic_launcher"
+        android:theme="@style/AppTheme">
+        <activity
+            android:name=".MainActivity"
+            android:label="@string/app_name"
+            android:configChanges="keyboard|keyboardHidden|orientation|screenSize"
+            android:windowSoftInputMode="adjustResize">
+            <intent-filter>
+                <action android:name="android.intent.action.MAIN" />
+                <category android:name="android.intent.category.LAUNCHER" />
+            </intent-filter>
+        </activity>
+        <activity android:name="com.facebook.react.devsupport.DevSettingsActivity" />
         <meta-data android:name="android.max_aspect" android:value="2.1" />
-
     </application>
-
-</manifest>
+</manifest>;

android/app/src/main/res/values/strings.xml

@@ -1,4 +1,4 @@
 <resources>
-    <string moduleConfig="true" name="reactNativeCodePush_androidDeploymentKey"></string>
+    <string moduleConfig="true" name="reactNativeCodePush_androidDeploymentKey" />
     <string name="app_name">Trust</string>
-</resources>
+</resources>;

ios/AwesomeProject.xcodeproj/project.pbxproj

@@ -35,6 +35,7 @@
 		C1595B622081115F000EE772 /* libSplashScreen.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C153C8C9208085FD00AE197D /* libSplashScreen.a */; };
 		C1595B6320811929000EE772 /* libBVLinearGradient.a in Frameworks */ = {isa = PBXBuildFile; fileRef = C107CD232062369C0092BDCC /* libBVLinearGradient.a */; };
 		C1595C5D20814891000EE772 /* TZImagePickerController.bundle in Resources */ = {isa = PBXBuildFile; fileRef = C1595C5C20814891000EE772 /* TZImagePickerController.bundle */; };
+		C1D609A3209178F800B46958 /* Michroma.ttf in Resources */ = {isa = PBXBuildFile; fileRef = C1D60974209178D700B46958 /* Michroma.ttf */; };
 		DF73FDB979234C9F8479AB88 /* FontAwesome.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 6EBED712511344E5ADA8565A /* FontAwesome.ttf */; };
 		EFDCC6BF420E4F7BB42F02AE /* Ionicons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = FC133623B92A41C8B4630EF6 /* Ionicons.ttf */; };
 		FD30C84063F94E01930DABE1 /* EvilIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = A696A4AB6E5349809FFEF8EA /* EvilIcons.ttf */; };
@@ -414,6 +415,7 @@
 		C107CD0E20615D840092BDCC /* Images.xcassets */ = {isa = PBXFileReference; lastKnownFileType = folder.assetcatalog; name = Images.xcassets; path = AwesomeProject/Images.xcassets; sourceTree = "<group>"; };
 		C1595C5C20814891000EE772 /* TZImagePickerController.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = TZImagePickerController.bundle; path = "../node_modules/react-native-syan-image-picker/ios/TZImagePickerController/TZImagePickerController.bundle"; sourceTree = "<group>"; };
 		C1595C5E20814AB7000EE772 /* zh-Hans */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "zh-Hans"; path = "zh-Hans.lproj/LaunchScreen.strings"; sourceTree = "<group>"; };
+		C1D60974209178D700B46958 /* Michroma.ttf */ = {isa = PBXFileReference; lastKnownFileType = file; name = Michroma.ttf; path = "../../../../Downloads/AssetLibrary-master/Fonts/File/Michroma/Michroma.ttf"; sourceTree = "<group>"; };
 		CB85E3A3243D4DC5B0D07790 /* MaterialIcons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = unknown; name = MaterialIcons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/MaterialIcons.ttf"; sourceTree = "<group>"; };
 		CEC7DE2E2DE348A1888A445C /* libRNSyanImagePicker.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNSyanImagePicker.a; sourceTree = "<group>"; };
 		D053671C50B94A0C87A949B0 /* libBVLinearGradient.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 9; includeInIndex = 0; lastKnownFileType = archive.ar; path = libBVLinearGradient.a; sourceTree = "<group>"; };
@@ -659,6 +661,7 @@
 		83CBB9F61A601CBA00E9B192 = {
 			isa = PBXGroup;
 			children = (
+				C1D60974209178D700B46958 /* Michroma.ttf */,
 				C1595C5C20814891000EE772 /* TZImagePickerController.bundle */,
 				13B07FAE1A68108700A75B9A /* AwesomeProject */,
 				832341AE1AAA6A7D00B99B32 /* Libraries */,
@@ -1251,6 +1254,7 @@
 				985627163E6C4FA89355A04D /* Foundation.ttf in Resources */,
 				EFDCC6BF420E4F7BB42F02AE /* Ionicons.ttf in Resources */,
 				AF5D140310384696A649676C /* MaterialCommunityIcons.ttf in Resources */,
+				C1D609A3209178F800B46958 /* Michroma.ttf in Resources */,
 				C107CD0F20615D840092BDCC /* Images.xcassets in Resources */,
 				9427BD1F746A43A3945E717B /* MaterialIcons.ttf in Resources */,
 				93BDEE8256F34A1688C90530 /* SimpleLineIcons.ttf in Resources */,

ios/AwesomeProject.xcodeproj/xcshareddata/xcschemes/AwesomeProject.xcscheme

@@ -80,7 +80,7 @@
       </AdditionalOptions>
    </TestAction>
    <LaunchAction
-      buildConfiguration = "Debug"
+      buildConfiguration = "Release"
       selectedDebuggerIdentifier = ""
       selectedLauncherIdentifier = "Xcode.IDEFoundation.Launcher.PosixSpawn"
       launchStyle = "0"

ios/AwesomeProject/AppDelegate.m

@@ -17,19 +17,26 @@ @implementation AppDelegate
 - (BOOL)application:(UIApplication *)application didFinishLaunchingWithOptions:(NSDictionary *)launchOptions
 {
   NSURL *jsCodeLocation;
+  for(NSString* family in [UIFont familyNames])
+  {
+    NSLog(@"%@", family);
+    for(NSString* name in [UIFont fontNamesForFamilyName: family]){
+      NSLog(@" %@", name);
+    }
+  }
+  
+#ifdef DEBUG
+  jsCodeLocation = [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index" fallbackResource:nil];
+#else
+  jsCodeLocation = [CodePush bundleURL];
+#endif
 
-    #ifdef DEBUG
-        jsCodeLocation = [[RCTBundleURLProvider sharedSettings] jsBundleURLForBundleRoot:@"index" fallbackResource:nil];
-    #else
-        jsCodeLocation = [CodePush bundleURL];
-    #endif
-
   RCTRootView *rootView = [[RCTRootView alloc] initWithBundleURL:jsCodeLocation
                                                       moduleName:@"AwesomeProject"
                                                initialProperties:nil
                                                    launchOptions:launchOptions];
   rootView.backgroundColor = [[UIColor alloc] initWithRed:1.0f green:1.0f blue:1.0f alpha:1];
-
+  
   self.window = [[UIWindow alloc] initWithFrame:[UIScreen mainScreen].bounds];
   UIViewController *rootViewController = [UIViewController new];
   rootViewController.view = rootView;

ios/AwesomeProject/Info.plist

@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>1.0.6</string>
+	<string>1.0.7</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
@@ -64,6 +64,7 @@
 		<string>Octicons.ttf</string>
 		<string>SimpleLineIcons.ttf</string>
 		<string>Zocial.ttf</string>
+		<string>Michroma.ttf</string>
 	</array>
 	<key>UIRequiredDeviceCapabilities</key>
 	<array>

src/page/Login/index.js

@@ -72,7 +72,6 @@ class LoginScreen extends Component<Props, State> {
                         <Text style={styles.buttonTitle}>登录</Text>
                     </TouchableOpacity>
                 </View>
-
                 <InputAccessoryView nativeID={inputAccessoryViewID} backgroundColor="#fffffff7">
                     <View style={styles.textInputContainer}>
                         <Button onPress={() => alert(1)} title="Send" />
@@ -103,7 +102,8 @@ const styles = StyleSheet.create({
     },
     buttonTitle: {
         color: '#fff',
-        fontSize: 17
+        fontSize: 17,
+        fontFamily: 'PingFangTC-Medium'
     },
     textInputContainer: {
         flexDirection: 'row'
@@ -115,7 +115,8 @@ const styles = StyleSheet.create({
         borderColor: 'rgba(255,255,255,.5)',
         borderRadius: 6,
         color: '#f1f1f1',
-        fontSize: 16.5
+        fontSize: 16.5,
+        fontFamily: 'PingFangTC-Medium'
     },
     text: {
         padding: 10,

src/page/Root.js

@@ -88,14 +88,14 @@ class LoginScreenView extends Component {
             Alert.alert('温馨提示', '用户名或密码不能为空！');
         } else {
             this.refs.modal.open(); //loading 状态
-            /*this.props.actions.login({ phone: this.state.phone, password: this.state.password }); //dispath 登陆
+            this.props.actions.login({ phone: this.state.phone, password: this.state.password }); //dispath 登陆
             const resetAction = NavigationActions.reset({
                 index: 0,
                 actions: [NavigationActions.navigate({ routeName: 'NavigationBar' })]
             });
-            LayoutAnimation.configureNext(customAnimationConfig);
+            //LayoutAnimation.configureNext(customAnimationConfig);
             this.props.navigation.dispatch(resetAction);
-            console.log(this.props);*/
+            console.log(this.props);
         }
     };
     onCheckForUpdate = () => {