Fakultas Ilmu Komputer UI

Commit f1da1096 authored by angelin depthios's avatar angelin depthios
Browse files

Merge branch 'styling-update' into 'master'

Refactor: Styling update

See merge request !167
parents 2e78fe93 81fa4cbc
Pipeline #88973 passed with stage
in 9 minutes and 56 seconds
......@@ -47,7 +47,9 @@ const styles = StyleSheet.create({
listContainerSelected: {
alignItems: "flex-start",
flexDirection: "row",
backgroundColor: "#ABB",
backgroundColor: Colors.BlueBackground,
padding: 8,
borderRadius: 8,
},
text: {
fontSize: 16,
......
......@@ -7,7 +7,11 @@ enum Blacks {
BLACK_1 = "#F0F0F0",
}
const BLUE = "#0791F9";
enum Blue {
BLUE_2 = "#0791F9",
BLUE_1 = "#EAF2FC",
}
const WHITE = "#FFF";
const RED = "#BE321E";
const YELLOW = "#F6DB00";
......@@ -27,7 +31,7 @@ export default {
active: {
bg: WHITE,
text: Blacks.BLACK_5,
border: BLUE,
border: Blue.BLUE_2,
},
disabled: {
bg: Blacks.BLACK_2,
......@@ -36,13 +40,13 @@ export default {
},
button: {
primary: {
bg: BLUE,
bg: Blue.BLUE_2,
text: WHITE,
},
secondary: {
bg: WHITE,
text: BLUE,
border: BLUE,
text: Blue.BLUE_2,
border: Blue.BLUE_2,
},
warning: {
bg: RED,
......@@ -56,15 +60,16 @@ export default {
disabled: Blacks.BLACK_3,
line: Blacks.BLACK_2,
bg: Blacks.BLACK_1,
link: BLUE,
link: Blue.BLUE_2,
white: WHITE,
},
icon: {
tab: {
active: BLUE,
active: Blue.BLUE_2,
inactive: Blacks.BLACK_3,
},
star: YELLOW,
},
background: WHITE,
BlueBackground: Blue.BLUE_1,
};
......@@ -4,6 +4,7 @@ import * as SplashScreen from "expo-splash-screen";
import * as React from "react";
import firebase from "firebase";
import FirebaseConfig from "../../config/firebase";
import { setCustomText } from "react-native-global-props";
export default function useCachedResources() {
const [isLoadingComplete, setLoadingComplete] = React.useState(false);
......@@ -17,8 +18,15 @@ export default function useCachedResources() {
// Load fonts
await Font.loadAsync({
...FontAwesome.font,
"space-mono": require("../../assets/fonts/SpaceMono-Regular.ttf"),
"Helvetica-Neue": require("../../assets/fonts/HelveticaNeue.ttf"),
});
const customTextProps = {
style: {
fontFamily: "Helvetica-Neue",
},
};
// eslint-disable-next-line @typescript-eslint/no-unsafe-call
setCustomText(customTextProps);
if (firebase.apps.length === 0) {
firebase.initializeApp(FirebaseConfig);
}
......
......@@ -8414,6 +8414,11 @@ react-native-get-random-values@~1.7.0:
dependencies:
fast-base64-decode "^1.0.0"
react-native-global-props@^1.1.5:
version "1.1.5"
resolved "https://registry.yarnpkg.com/react-native-global-props/-/react-native-global-props-1.1.5.tgz#443e0ffc89d5402fa20ebedf37bcbca6d861c34d"
integrity sha512-QDeAdRel6zyJfbgyFxZi9QXZe78OdlANxJae0rJn76uTqdt/A+iWBVjJy3NmaN/fpKy0uV0HhW6Hu4xM0QCisQ==
react-native-iphone-x-helper@^1.3.1:
version "1.3.1"
resolved "https://registry.yarnpkg.com/react-native-iphone-x-helper/-/react-native-iphone-x-helper-1.3.1.tgz#20c603e9a0e765fd6f97396638bdeb0e5a60b010"
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment