Skip to content

Commit 7313fe2

Browse files
auserauser
committed
Updated font sizing on row
1 parent 619c634 commit 7313fe2

File tree

6 files changed

+38
-18
lines changed

6 files changed

+38
-18
lines changed

‎android/app/src/main/java/com/firestackapp/MainApplication.java‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55

66
import com.facebook.react.ReactApplication;
77
import io.fullstack.firestack.FirestackPackage;
8-
import io.fullstack.firestack.FirestackPackage;
98
import com.oblador.vectoricons.VectorIconsPackage;
109
import com.facebook.react.ReactInstanceManager;
1110
import com.facebook.react.ReactNativeHost;

‎app/components/Navigation/Navigator.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -137,7 +137,7 @@ export class FirestackNavigator extends React.Component {
137137

138138
_configureTransition() {
139139
const easing = Easing.inOut(Easing.ease);
140-
return {easing, duration: 200}
140+
return {easing, duration: 250}
141141
}
142142

143143
_back() {

‎app/styles/app.js‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,11 @@ export const appStyles = StyleSheet.create({
2626
row: {
2727
flexDirection: 'row',
2828
justifyContent: 'center',
29-
padding: 10,
29+
padding: 20,
3030
backgroundColor: '#F6F6F6',
31+
},
32+
rowText: {
33+
fontSize: 18
3134
}
3235
});
3336

‎app/views/Database/index.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ export class Database extends React.Component {
4141
console.log(rowData)
4242
return (
4343
<View style={[appStyles.row]}>
44-
<Text>{rowData.title}</Text>
44+
<Text style={[appStyles.rowText]}>{rowData.title}</Text>
4545
</View>
4646
)
4747
}

‎app/views/Home.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -96,7 +96,7 @@ export class Home extends React.Component {
9696
this._pressRow(rowData.key);
9797
}}>
9898
<View style={appStyles.row}>
99-
<Text>{rowData.title}</Text>
99+
<Text style={[appStyles.rowText]}>{rowData.title}</Text>
100100
</View>
101101
</TouchableHighlight>
102102
)

‎ios/FirestackApp.xcodeproj/project.pbxproj‎

Lines changed: 31 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424
13B07FC11A68108700A75B9A /* main.m in Sources */ = {isa = PBXBuildFile; fileRef = 13B07FB71A68108700A75B9A /* main.m */; };
2525
140ED2AC1D01E1AD002B40FF /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 146834041AC3E56700842450 /* libReact.a */; };
2626
146834051AC3E58100842450 /* libReact.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 146834041AC3E56700842450 /* libReact.a */; };
27-
2AC2C756775A49C9B7FF6EA5 /* libFirestack.a in Frameworks */ = {isa = PBXBuildFile; fileRef = BEE13425CD6E49D0900EBD53 /* libFirestack.a */; };
27+
27BAD3309C6D4DD689FFEC89 /* libFirestack.a in Frameworks */ = {isa = PBXBuildFile; fileRef = 28F0687C340F491AB8953018 /* libFirestack.a */; };
2828
4F2EB34B0265421E9DC9F64D /* FontAwesome.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 03F453DB070844839A1D0615 /* FontAwesome.ttf */; };
2929
5A23F9EA4D9B4B3E9DC07A5D /* Entypo.ttf in Resources */ = {isa = PBXBuildFile; fileRef = B14D251F8788439EBDFC19D6 /* Entypo.ttf */; };
3030
77979D8511B14C88B2EF35BB /* EvilIcons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = F0F6BD6002274B96B0321DBF /* EvilIcons.ttf */; };
@@ -33,6 +33,7 @@
3333
8E1FEFA56A3C48EB835E0EC3 /* Zocial.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 621F832D582B499B8F88D567 /* Zocial.ttf */; };
3434
9D3926C57AE14398ABB13FA6 /* Octicons.ttf in Resources */ = {isa = PBXBuildFile; fileRef = CB14CE3DFE5744D4A678C73E /* Octicons.ttf */; };
3535
D99ACF771D8E206300D391A9 /* GoogleService-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = D99ACF761D8E206300D391A9 /* GoogleService-Info.plist */; };
36+
D9B634BD1D95F52A00ECD35A /* libFirestack.a in Embed Firestack */ = {isa = PBXBuildFile; fileRef = D9B634B11D95F4CA00ECD35A /* libFirestack.a */; settings = {ATTRIBUTES = (CodeSignOnCopy, ); }; };
3637
F4431358485C40019FF20AE7 /* Foundation.ttf in Resources */ = {isa = PBXBuildFile; fileRef = 947FF5EAE6D9457D8D9A4EA2 /* Foundation.ttf */; };
3738
/* End PBXBuildFile section */
3839

@@ -121,15 +122,29 @@
121122
remoteGlobalIDString = 5DBEB1501B18CEA900B34395;
122123
remoteInfo = RNVectorIcons;
123124
};
124-
D99ACF961D8E26FF00D391A9 /* PBXContainerItemProxy */ = {
125+
D9B634B01D95F4CA00ECD35A /* PBXContainerItemProxy */ = {
125126
isa = PBXContainerItemProxy;
126-
containerPortal = 609352A4E3FA47DFA08B1151 /* Firestack.xcodeproj */;
127+
containerPortal = D6CE8D93C673465E8516CC55 /* Firestack.xcodeproj */;
127128
proxyType = 2;
128129
remoteGlobalIDString = 134814201AA4EA6300B7C361;
129130
remoteInfo = Firestack;
130131
};
131132
/* End PBXContainerItemProxy section */
132133

134+
/* Begin PBXCopyFilesBuildPhase section */
135+
D9B634881D95EE4D00ECD35A /* Embed Firestack */ = {
136+
isa = PBXCopyFilesBuildPhase;
137+
buildActionMask = 2147483647;
138+
dstPath = "";
139+
dstSubfolderSpec = 10;
140+
files = (
141+
D9B634BD1D95F52A00ECD35A /* libFirestack.a in Embed Firestack */,
142+
);
143+
name = "Embed Firestack";
144+
runOnlyForDeploymentPostprocessing = 0;
145+
};
146+
/* End PBXCopyFilesBuildPhase section */
147+
133148
/* Begin PBXFileReference section */
134149
008F07F21AC5B25A0029DE68 /* main.jsbundle */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text; path = main.jsbundle; sourceTree = "<group>"; };
135150
00C302A71ABCB8CE00DB3ED1 /* RCTActionSheet.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTActionSheet.xcodeproj; path = "../node_modules/react-native/Libraries/ActionSheetIOS/RCTActionSheet.xcodeproj"; sourceTree = "<group>"; };
@@ -151,18 +166,18 @@
151166
13B07FB61A68108700A75B9A /* Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; name = Info.plist; path = FirestackApp/Info.plist; sourceTree = "<group>"; };
152167
13B07FB71A68108700A75B9A /* main.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; name = main.m; path = FirestackApp/main.m; sourceTree = "<group>"; };
153168
146833FF1AC3E56700842450 /* React.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = React.xcodeproj; path = "../node_modules/react-native/React/React.xcodeproj"; sourceTree = "<group>"; };
169+
28F0687C340F491AB8953018 /* libFirestack.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 0; includeInIndex = 0; lastKnownFileType = archive.ar; path = libFirestack.a; sourceTree = "<group>"; };
154170
3988AE0934704FD0ADAC9CE5 /* Ionicons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 0; includeInIndex = 0; lastKnownFileType = unknown; name = Ionicons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Ionicons.ttf"; sourceTree = "<group>"; };
155171
43A9680A7D7B4D12ADED1B46 /* libRNVectorIcons.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 0; includeInIndex = 0; lastKnownFileType = archive.ar; path = libRNVectorIcons.a; sourceTree = "<group>"; };
156172
5D4DBCF5A4BA4854BBD023F0 /* RNVectorIcons.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 0; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = RNVectorIcons.xcodeproj; path = "../node_modules/react-native-vector-icons/RNVectorIcons.xcodeproj"; sourceTree = "<group>"; };
157-
609352A4E3FA47DFA08B1151 /* Firestack.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 0; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = Firestack.xcodeproj; path = "../node_modules/react-native-firestack/ios/Firestack.xcodeproj"; sourceTree = "<group>"; };
158173
60D4DC9214BF416BB25A04F5 /* MaterialIcons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 0; includeInIndex = 0; lastKnownFileType = unknown; name = MaterialIcons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/MaterialIcons.ttf"; sourceTree = "<group>"; };
159174
621F832D582B499B8F88D567 /* Zocial.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 0; includeInIndex = 0; lastKnownFileType = unknown; name = Zocial.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Zocial.ttf"; sourceTree = "<group>"; };
160175
78C398B01ACF4ADC00677621 /* RCTLinking.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTLinking.xcodeproj; path = "../node_modules/react-native/Libraries/LinkingIOS/RCTLinking.xcodeproj"; sourceTree = "<group>"; };
161176
832341B01AAA6A8300B99B32 /* RCTText.xcodeproj */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.pb-project"; name = RCTText.xcodeproj; path = "../node_modules/react-native/Libraries/Text/RCTText.xcodeproj"; sourceTree = "<group>"; };
162177
947FF5EAE6D9457D8D9A4EA2 /* Foundation.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 0; includeInIndex = 0; lastKnownFileType = unknown; name = Foundation.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Foundation.ttf"; sourceTree = "<group>"; };
163178
B14D251F8788439EBDFC19D6 /* Entypo.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 0; includeInIndex = 0; lastKnownFileType = unknown; name = Entypo.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Entypo.ttf"; sourceTree = "<group>"; };
164-
BEE13425CD6E49D0900EBD53 /* libFirestack.a */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 0; includeInIndex = 0; lastKnownFileType = archive.ar; path = libFirestack.a; sourceTree = "<group>"; };
165179
CB14CE3DFE5744D4A678C73E /* Octicons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 0; includeInIndex = 0; lastKnownFileType = unknown; name = Octicons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/Octicons.ttf"; sourceTree = "<group>"; };
180+
D6CE8D93C673465E8516CC55 /* Firestack.xcodeproj */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 0; includeInIndex = 0; lastKnownFileType = "wrapper.pb-project"; name = Firestack.xcodeproj; path = "../node_modules/react-native-firestack/ios/Firestack.xcodeproj"; sourceTree = "<group>"; };
166181
D99ACF761D8E206300D391A9 /* GoogleService-Info.plist */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = text.plist.xml; path = "GoogleService-Info.plist"; sourceTree = "<group>"; };
167182
F0F6BD6002274B96B0321DBF /* EvilIcons.ttf */ = {isa = PBXFileReference; explicitFileType = undefined; fileEncoding = 0; includeInIndex = 0; lastKnownFileType = unknown; name = EvilIcons.ttf; path = "../node_modules/react-native-vector-icons/Fonts/EvilIcons.ttf"; sourceTree = "<group>"; };
168183
/* End PBXFileReference section */
@@ -191,7 +206,7 @@
191206
00C302EA1ABCBA2D00DB3ED1 /* libRCTVibration.a in Frameworks */,
192207
139FDEF61B0652A700C62182 /* libRCTWebSocket.a in Frameworks */,
193208
0F87A14A55B94CA79AA8234E /* libRNVectorIcons.a in Frameworks */,
194-
2AC2C756775A49C9B7FF6EA5 /* libFirestack.a in Frameworks */,
209+
27BAD3309C6D4DD689FFEC89 /* libFirestack.a in Frameworks */,
195210
);
196211
runOnlyForDeploymentPostprocessing = 0;
197212
};
@@ -315,7 +330,7 @@
315330
00C302DF1ABCB9EE00DB3ED1 /* RCTVibration.xcodeproj */,
316331
139FDEE61B06529A00C62182 /* RCTWebSocket.xcodeproj */,
317332
5D4DBCF5A4BA4854BBD023F0 /* RNVectorIcons.xcodeproj */,
318-
609352A4E3FA47DFA08B1151 /* Firestack.xcodeproj */,
333+
D6CE8D93C673465E8516CC55 /* Firestack.xcodeproj */,
319334
);
320335
name = Libraries;
321336
sourceTree = "<group>";
@@ -374,10 +389,10 @@
374389
name = Products;
375390
sourceTree = "<group>";
376391
};
377-
D99ACF931D8E26FF00D391A9 /* Products */ = {
392+
D9B634AD1D95F4CA00ECD35A /* Products */ = {
378393
isa = PBXGroup;
379394
children = (
380-
D99ACF971D8E26FF00D391A9 /* libFirestack.a */,
395+
D9B634B11D95F4CA00ECD35A /* libFirestack.a */,
381396
);
382397
name = Products;
383398
sourceTree = "<group>";
@@ -411,6 +426,7 @@
411426
13B07F8C1A680F5B00A75B9A /* Frameworks */,
412427
13B07F8E1A680F5B00A75B9A /* Resources */,
413428
00DD1BFF1BD5951E006B06BC /* Bundle React Native code and images */,
429+
D9B634881D95EE4D00ECD35A /* Embed Firestack */,
414430
);
415431
buildRules = (
416432
);
@@ -449,8 +465,8 @@
449465
projectDirPath = "";
450466
projectReferences = (
451467
{
452-
ProductGroup = D99ACF931D8E26FF00D391A9 /* Products */;
453-
ProjectRef = 609352A4E3FA47DFA08B1151 /* Firestack.xcodeproj */;
468+
ProductGroup = D9B634AD1D95F4CA00ECD35A /* Products */;
469+
ProjectRef = D6CE8D93C673465E8516CC55 /* Firestack.xcodeproj */;
454470
},
455471
{
456472
ProductGroup = 00C302A81ABCB8CE00DB3ED1 /* Products */;
@@ -583,11 +599,11 @@
583599
remoteRef = D99ACF581D8E202600D391A9 /* PBXContainerItemProxy */;
584600
sourceTree = BUILT_PRODUCTS_DIR;
585601
};
586-
D99ACF971D8E26FF00D391A9 /* libFirestack.a */ = {
602+
D9B634B11D95F4CA00ECD35A /* libFirestack.a */ = {
587603
isa = PBXReferenceProxy;
588604
fileType = archive.ar;
589605
path = libFirestack.a;
590-
remoteRef = D99ACF961D8E26FF00D391A9 /* PBXContainerItemProxy */;
606+
remoteRef = D9B634B01D95F4CA00ECD35A /* PBXContainerItemProxy */;
591607
sourceTree = BUILT_PRODUCTS_DIR;
592608
};
593609
/* End PBXReferenceProxy section */
@@ -720,6 +736,7 @@
720736
buildSettings = {
721737
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
722738
DEAD_CODE_STRIPPING = NO;
739+
ENABLE_BITCODE = NO;
723740
HEADER_SEARCH_PATHS = (
724741
"$(inherited)",
725742
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
@@ -744,6 +761,7 @@
744761
isa = XCBuildConfiguration;
745762
buildSettings = {
746763
ASSETCATALOG_COMPILER_APPICON_NAME = AppIcon;
764+
ENABLE_BITCODE = NO;
747765
HEADER_SEARCH_PATHS = (
748766
"$(inherited)",
749767
/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,

0 commit comments

Comments
 (0)