Skip to content

Commit 0284c0e

Browse files
jeremyfelderjeremyfelder
committed
Got cell to start working with progress bar. Need to look into why js and js.map files are being created by tsc. Need to work on SectionList
1 parent 2b10e28 commit 0284c0e

File tree

8 files changed

+141
-76
lines changed

8 files changed

+141
-76
lines changed

‎src/App.tsx

-2
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,6 @@ import { StatusBar } from 'react-native';
55
import { SafeAreaProvider } from 'react-native-safe-area-context';
66
import MainTabNavigator from './navigation/MainTabNavigator';
77

8-
declare var global: {HermesInternal: null | {}};
9-
108
function App () {
119
return (
1210
<SafeAreaProvider>

‎src/assets/images.js

+1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
const Images = {
2+
// @ts-ignore
23
testImage: require('./imgs/testImage.jpg'),
34
}
45

‎src/components/cell.tsx

+33-12
Original file line numberDiff line numberDiff line change
@@ -1,18 +1,29 @@
1+
import * as React from 'react';
12
import { View, StyleSheet, Image, Text } from "react-native";
23
import { TouchableHighlight } from "react-native-gesture-handler";
3-
import { Colors } from '@assets/index';
4+
import { Colors } from '../assets/';
45
import * as Progress from 'react-native-progress';
56

6-
77
export default function Cell (props: any) {
8-
const { bookImage, title, percentFinished} = props
8+
const { bookImage, title, percentFinished, onPress } = props
99
return (
10-
<TouchableHighlight>
10+
<TouchableHighlight
11+
disabled={!onPress}
12+
onPress={onPress}
13+
>
1114
<View style={styles.container}>
12-
<Image source={bookImage}/>
13-
<View style={styles.textContainer}>
15+
<Image style={styles.icon} source={bookImage}/>
16+
<View style={styles.middleContainer}>
1417
<Text style={styles.text}>{title}</Text>
15-
<Progress.Bar progress={percentFinished} unfilledColor={Colors.lightgrey} color={Colors.green}/>
18+
<Progress.Bar
19+
style={styles.progressBar}
20+
progress={percentFinished}
21+
unfilledColor={Colors.black}
22+
color={Colors.green}
23+
borderWidth={0}
24+
// width={null}
25+
height={10}
26+
borderRadius={6}/>
1627
</View>
1728
</View>
1829
</TouchableHighlight>
@@ -21,16 +32,26 @@ export default function Cell (props: any) {
2132

2233
const styles = StyleSheet.create({
2334
container: {
24-
flex: 1,
35+
height: 70,
2536
flexDirection: 'row',
37+
justifyContent: 'flex-start',
2638
alignItems: 'center',
27-
backgroundColor: Colors.black
39+
backgroundColor: Colors.whitesmoke
40+
},
41+
icon: {
42+
marginLeft: 16,
43+
width: 50,
44+
height: '80%'
2845
},
29-
textContainer: {
30-
46+
middleContainer: {
47+
marginLeft: 16,
48+
height: '80%',
49+
justifyContent: 'flex-end'
3150
},
3251
text: {
33-
52+
fontSize: 20,
53+
textAlign: 'left',
54+
paddingBottom: 10
3455
},
3556
progressBar: {
3657

‎src/navigation/MainTabNavigator.tsx

+1-1
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@ const TabStack = createBottomTabNavigator();
99
export default function MainTabNavigator () {
1010
return (
1111
<TabStack.Navigator>
12-
<TabStack.Screen name="Book Lists" component={ BookListsStack } />
1312
<TabStack.Screen name="Stats" component={ StatsStack } />
13+
<TabStack.Screen name="Book Lists" component={ BookListsStack } />
1414
<TabStack.Screen name="Account" component={ AccountStack } />
1515
</TabStack.Navigator>
1616
)

‎src/screens/summaries.tsx

+13-4
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
import * as React from 'react';
22
import Cell from '../components/cell';
3+
//@ts-ignore
34
import { SectionList, Text, View, StyleSheet } from "react-native";
4-
import { Images } from '@assets/index';
5-
import { Colors } from '@assets/index';
5+
import { Images } from '../assets';
6+
import { Colors } from '../assets';
67

78
export default function Summaries (props: any) {
89
// const renderSectionSeparator = (title: string) => {
@@ -11,21 +12,29 @@ export default function Summaries (props: any) {
1112
// )
1213
// }
1314

15+
const onPress = () => {
16+
17+
}
18+
1419
return (
1520
// <SectionList
1621
// sections={props.data}
1722
// SectionSeparatorComponent={({ section: { title } }) => renderSectionSeparator(title)}
1823
// stickySectionHeadersEnabled
1924
// />
2025
<View style={styles.container}>
21-
<Cell bookImage={Images.testImage} title={"Test Title"} percentFinished={50}/>
26+
<Cell
27+
bookImage={Images.testImage}
28+
title={"Give and Take"}
29+
percentFinished={0.5}
30+
onPress={onPress}/>
2231
</View>
2332
)
2433
}
2534

2635
const styles = StyleSheet.create({
2736
container: {
2837
flex: 1,
29-
backgroundColor: Colors.whitesmoke
38+
backgroundColor: Colors.white
3039
}
3140
});

‎src/utilities.ts

+4-2
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,11 @@
11
import { Platform } from "react-native";
22
import DeviceInfo from 'react-native-device-info';
33

4-
4+
//@ts-ignore
55
const isAndroid = Platform.OS === "android"
6+
//@ts-ignore
67
const isIOS = Platform.OS === "ios"
7-
8+
//@ts-ignore
89
const semanticVersion = DeviceInfo.getReadableVersion().split(".", 3).join(".")
10+
//@ts-ignore
911
const isCharging = () => DeviceInfo.isBatteryCharging()

‎tsconfig.json

+28-55
Original file line numberDiff line numberDiff line change
@@ -1,64 +1,37 @@
11
{
22
"compilerOptions": {
3-
/* Basic Options */
4-
"target": "esnext", /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017','ES2018' or 'ESNEXT'. */
5-
"module": "commonjs", /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */
6-
"lib": ["es6"], /* Specify library files to be included in the compilation. */
7-
"allowJs": true, /* Allow javascript files to be compiled. */
8-
"checkJs": true, /* Report errors in .js files. */
9-
"jsx": "react-native", /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */
10-
// "declaration": true, /* Generates corresponding '.d.ts' file. */
11-
"sourceMap": true, /* Generates corresponding '.map' file. */
12-
// "outFile": "./", /* Concatenate and emit output to single file. */
13-
"outDir": "./build", /* Redirect output structure to the directory. */
14-
// "rootDir": "./", /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
15-
// "removeComments": true, /* Do not emit comments to output. */
16-
// "noEmit": true, /* Do not emit outputs. */
17-
// "incremental": true, /* Enable incremental compilation */
18-
// "importHelpers": true, /* Import emit helpers from 'tslib'. */
19-
// "downlevelIteration": true, /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */
20-
"isolatedModules": true, /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */
21-
22-
/* Strict Type-Checking Options */
23-
"strict": true, /* Enable all strict type-checking options. */
24-
// "noImplicitAny": true, /* Raise error on expressions and declarations with an implied 'any' type. */
25-
// "strictNullChecks": true, /* Enable strict null checks. */
26-
// "strictFunctionTypes": true, /* Enable strict checking of function types. */
27-
// "strictPropertyInitialization": true, /* Enable strict checking of property initialization in classes. */
28-
// "noImplicitThis": true, /* Raise error on 'this' expressions with an implied 'any' type. */
29-
// "alwaysStrict": true, /* Parse in strict mode and emit "use strict" for each source file. */
30-
31-
/* Additional Checks */
32-
// "noUnusedLocals": true, /* Report errors on unused locals. */
33-
// "noUnusedParameters": true, /* Report errors on unused parameters. */
34-
// "noImplicitReturns": true, /* Report error when not all code paths in function return a value. */
35-
// "noFallthroughCasesInSwitch": true, /* Report errors for fallthrough cases in switch statement. */
36-
37-
/* Module Resolution Options */
38-
"moduleResolution": "node", /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
39-
"baseUrl": "./", /* Base directory to resolve non-absolute module names. */
3+
"target": "es6",
4+
"module": "commonjs",
5+
"lib": [
6+
"es2017"
7+
],
8+
"allowJs": true,
9+
"checkJs": true,
10+
"jsx": "react-native",
11+
"sourceMap": true,
12+
"outDir": "./build",
13+
"rootDir": "./",
14+
"strict": true,
15+
"moduleResolution": "node",
16+
"baseUrl": "./",
4017
"paths": {
4118
"@assets/*": ["src/assets/*"],
4219
"@components/*": ["src/components/*"],
43-
}, /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
44-
// "rootDirs": [], /* List of root folders whose combined content represents the structure of the project at runtime. */
45-
// "typeRoots": [], /* List of folders to include type definitions from. */
46-
// "types": [], /* Type declaration files to be included in compilation. */
47-
"allowSyntheticDefaultImports": true, /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
48-
"esModuleInterop": true /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
49-
// "preserveSymlinks": true, /* Do not resolve the real path of symlinks. */
50-
51-
/* Source Map Options */
52-
// "sourceRoot": "./", /* Specify the location where debugger should locate TypeScript files instead of source locations. */
53-
// "mapRoot": "./", /* Specify the location where debugger should locate map files instead of generated locations. */
54-
// "inlineSourceMap": true, /* Emit a single file with source maps instead of having a separate file. */
55-
// "inlineSources": true, /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */
56-
57-
/* Experimental Options */
58-
// "experimentalDecorators": true, /* Enables experimental support for ES7 decorators. */
59-
// "emitDecoratorMetadata": true, /* Enables experimental support for emitting type metadata for decorators. */
20+
},
21+
"experimentalDecorators": true,
22+
"emitDecoratorMetadata": true,
23+
"allowSyntheticDefaultImports": true,
24+
"esModuleInterop": true,
25+
"skipLibCheck": true,
26+
"declaration": true,
27+
"noUnusedLocals": true,
28+
"resolveJsonModule": true,
6029
},
6130
"exclude": [
62-
"node_modules", "babel.config.js", "metro.config.js", "jest.config.js"
31+
"node_modules",
32+
"babel.config.js",
33+
"metro.config.js",
34+
"jest.config.js",
35+
"build"
6336
]
6437
}

‎tslint.json

+61
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
{
2+
"rules": {
3+
"class-name": true,
4+
"comment-format": [
5+
true,
6+
"check-space"
7+
],
8+
"indent": [
9+
true,
10+
"spaces"
11+
],
12+
"no-duplicate-variable": true,
13+
"no-eval": true,
14+
"no-internal-module": true,
15+
"no-trailing-whitespace": true,
16+
"no-var-keyword": true,
17+
"one-line": [
18+
true,
19+
"check-open-brace",
20+
"check-whitespace"
21+
],
22+
"quotemark": [
23+
true,
24+
"single"
25+
],
26+
"semicolon": [
27+
true,
28+
"always"
29+
],
30+
"triple-equals": [
31+
true,
32+
"allow-null-check"
33+
],
34+
"typedef-whitespace": [
35+
true,
36+
{
37+
"call-signature": "nospace",
38+
"index-signature": "nospace",
39+
"parameter": "nospace",
40+
"property-declaration": "nospace",
41+
"variable-declaration": "nospace"
42+
}
43+
],
44+
"variable-name": [
45+
true,
46+
"ban-keywords"
47+
],
48+
"whitespace": [
49+
true,
50+
"check-branch",
51+
"check-decl",
52+
"check-operator",
53+
"check-separator",
54+
"check-type"
55+
],
56+
"member-access": [
57+
"check-accessor"
58+
],
59+
"no-unused-variable": [true]
60+
}
61+
}

0 commit comments

Comments
 (0)