Skip to content

Commit

Permalink
Implement transaction screen
Browse files Browse the repository at this point in the history
Fix transaction screen amount layout, and begin transactions loop in bottom half

Initial ScrollView functionality working

Switch out ScrollView for ListView for performance reasons

Remove dummy array (commented), and switch this.state.dataSource to this.props.dataSource

Implement layout for transactions area, pending date-grouping

Layout of transaction page provisionally complete (pending approval), logic still pending

Additional refinement of Transactions list including sorting and grouping by date

Implement initial camera / send scene

Fix listView issue on Android, moved dataSource for rows from props to state

Slightly modify default values for transactionList

Search bar implemented *but issue with component disappearing on search toggle*

Re-implement basic search input layout for transaction list

Fix rendering and conditional issues for search bar in transactionList

Remove unused react-native-pull module reference

Merge in Redux implementation from Art, except Container because of routing issues

Transactions and Contacts with images join functioning correctly, although issue with 'sampleTransactionsWithImages' variable

Enable React-Native-Contacts for use within TransactionList

Add conditional for transaction image (from contacts) based on transaction hasThumbnail and thumbnailPath flags
  • Loading branch information
Kylan Hurt committed Apr 10, 2017
1 parent 6c51777 commit 37ec1c0
Show file tree
Hide file tree
Showing 144 changed files with 9,061 additions and 1,200 deletions.
2 changes: 1 addition & 1 deletion .buckconfig
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@

[android]
target = Google Inc.:Google APIs:25
target = Google Inc.:Google APIs:23

[maven_repositories]
central = https://repo1.maven.org/maven2
41 changes: 11 additions & 30 deletions .flowconfig
Original file line number Diff line number Diff line change
@@ -1,36 +1,19 @@
[ignore]

# We fork some components by platform.
; We fork some components by platform
.*/*[.]android.js

# Ignore templates with `@flow` in header
.*/local-cli/generator.*

# Ignore malformed json
.*/node_modules/y18n/test/.*\.json

# Ignore the website subdir
<PROJECT_ROOT>/website/.*

# Ignore BUCK generated dirs
; Ignore "BUCK" generated dirs
<PROJECT_ROOT>/\.buckd/

# Ignore unexpected extra @providesModule
.*/node_modules/commoner/test/source/widget/share.js
; Ignore unexpected extra "@providesModule"
.*/node_modules/.*/node_modules/fbjs/.*

# Ignore duplicate module providers
# For RN Apps installed via npm, "Libraries" folder is inside node_modules/react-native but in the source repo it is in the root
; Ignore duplicate module providers
; For RN Apps installed via npm, "Libraries" folder is inside
; "node_modules/react-native" but in the source repo it is in the root
.*/Libraries/react-native/React.js
.*/Libraries/react-native/ReactNative.js
.*/node_modules/jest-runtime/build/__tests__/.*
.*/node_modules/react-native/Libraries/Components/StaticContainer.js

# Ignore failing node modules
.*/node_modules/findup/test/fixture/*
.*/node_modules/react-native-experimental-navigation/*
.*/node_modules/native-base/*
.*/node_modules/react-native/*
[include]

[libs]
Expand All @@ -39,27 +22,25 @@ node_modules/react-native/flow
flow/

[options]
module.system=haste
emoji=true

esproposal.class_static_fields=enable
esproposal.class_instance_fields=enable
module.system=haste

experimental.strict_type_args=true

munge_underscores=true

module.name_mapper='^image![a-zA-Z0-9$_-]+$' -> 'GlobalImageStub'
module.name_mapper='^[./a-zA-Z0-9$_-]+\.\(bmp\|gif\|jpg\|jpeg\|png\|psd\|svg\|webp\|m4v\|mov\|mp4\|mpeg\|mpg\|webm\|aac\|aiff\|caf\|m4a\|mp3\|wav\|html\|pdf\)$' -> 'RelativeImageStub'

suppress_type=$FlowIssue
suppress_type=$FlowFixMe
suppress_type=$FixMe

suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(3[0-3]\\|[1-2][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(3[0-3]\\|1[0-9]\\|[1-2][0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
suppress_comment=\\(.\\|\n\\)*\\$FlowFixMe\\($\\|[^(]\\|(\\(>=0\\.\\(3[0-8]\\|[1-2][0-9]\\|[0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)
suppress_comment=\\(.\\|\n\\)*\\$FlowIssue\\((\\(>=0\\.\\(3[0-8]\\|1[0-9]\\|[1-2][0-9]\\).[0-9]\\)? *\\(site=[a-z,_]*react_native[a-z,_]*\\)?)\\)?:? #[0-9]+
suppress_comment=\\(.\\|\n\\)*\\$FlowFixedInNextDeploy

unsafe.enable_getters_and_setters=true

[version]
^0.37.4
^0.38.0
23 changes: 15 additions & 8 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -22,25 +22,32 @@ DerivedData
*.xcuserstate
project.xcworkspace

# iOS
ios/Archives
ios/main.jsbundle*

# Android/IJ
# Android/IntelliJ
#
*.iml
build/
.idea
.gradle
local.properties
*.iml

# node.js
#
node_modules/
npm-debug.log
yarn-error.log

# BUCK
buck-out/
\.buckd/
android/app/libs
*.keystore
yarn.lock

# fastlane
#
# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
# screenshots whenever they are needed.
# For more information about the recommended setup visit:
# https://github.com/fastlane/fastlane/blob/master/fastlane/docs/Gitignore.md

fastlane/report.xml
fastlane/Preview.html
fastlane/screenshots
64 changes: 0 additions & 64 deletions README.md

This file was deleted.

12 changes: 12 additions & 0 deletions __tests__/index.android.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import 'react-native';
import React from 'react';
import Index from '../index.android.js';

// Note: test renderer must be required after react-native.
import renderer from 'react-test-renderer';

it('renders correctly', () => {
const tree = renderer.create(
<Index />
);
});
12 changes: 12 additions & 0 deletions __tests__/index.ios.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,12 @@
import 'react-native';
import React from 'react';
import Index from '../index.ios.js';

// Note: test renderer must be required after react-native.
import renderer from 'react-test-renderer';

it('renders correctly', () => {
const tree = renderer.create(
<Index />
);
});
4 changes: 2 additions & 2 deletions android/app/BUCK
Original file line number Diff line number Diff line change
Expand Up @@ -46,13 +46,13 @@ android_library(

android_build_config(
name = 'build_config',
package = 'com.airbitz_ui',
package = 'com.bug_test',
)

android_resource(
name = 'res',
res = 'src/main/res',
package = 'com.airbitz_ui',
package = 'com.bug_test',
)

android_binary(
Expand Down
26 changes: 10 additions & 16 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -83,27 +83,19 @@ def enableSeparateBuildPerCPUArchitecture = false
def enableProguardInReleaseBuilds = false

android {
compileSdkVersion 25
buildToolsVersion "25.0.1"
compileSdkVersion 23
buildToolsVersion "23.0.1"

defaultConfig {
applicationId "com.airbitz.react"
applicationId "com.bug_test"
minSdkVersion 16
targetSdkVersion 25
versionCode 99999
versionName "99.99.99"
targetSdkVersion 22
versionCode 1
versionName "1.0"
ndk {
abiFilters "armeabi-v7a", "x86"
}
}
signingConfigs {
release {
storeFile file(MYAPP_RELEASE_STORE_FILE)
storePassword MYAPP_RELEASE_STORE_PASSWORD
keyAlias MYAPP_RELEASE_KEY_ALIAS
keyPassword MYAPP_RELEASE_KEY_PASSWORD
}
}
splits {
abi {
reset()
Expand All @@ -116,7 +108,6 @@ android {
release {
minifyEnabled enableProguardInReleaseBuilds
proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
signingConfig signingConfigs.release
}
}
// applicationVariants are e.g. debug, release
Expand All @@ -135,6 +126,7 @@ android {
}

dependencies {
compile project(':react-native-camera')
compile project(':react-native-material-kit')
compile project(':react-native-udp')
compile project(':react-native-tcp')
Expand All @@ -145,8 +137,10 @@ dependencies {
compile project(':react-native-fs')
compile project(':react-native-device-info')
compile fileTree(dir: "libs", include: ["*.jar"])
compile "com.android.support:appcompat-v7:25.0.1"
compile project(':react-native-contacts')
compile "com.android.support:appcompat-v7:23.0.1"
compile "com.facebook.react:react-native:+" // From node_modules

}

// Run this once to be able to run the application with BUCK
Expand Down
Binary file removed android/app/my-release-key.keystore
Binary file not shown.
16 changes: 11 additions & 5 deletions android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,16 +1,21 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.airbitz_ui"
package="com.bug_test"
android:versionCode="1"
android:versionName="1.0">

<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.SYSTEM_ALERT_WINDOW"/>
<uses-permission android:name="android.permission.READ_CONTACTS"/>
<uses-permission android:name="android.permission.CAMERA"/>
<uses-permission android:name="android.permission.RECORD_AUDIO"/>
<uses-permission android:name="android.permission.RECORD_VIDEO"/>
<uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.READ_PROFILE" />
<uses-permission android:name="android.permission.READ_CONTACTS" />
<uses-permission android:name="android.permission.WRITE_CONTACTS" />

<uses-sdk
android:minSdkVersion="16"
android:targetSdkVersion="25" />
android:targetSdkVersion="22" />

<application
android:name=".MainApplication"
Expand All @@ -21,7 +26,8 @@
<activity
android:name=".MainActivity"
android:label="@string/app_name"
android:configChanges="keyboard|keyboardHidden|orientation|screenSize">
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" />
Expand Down
54 changes: 0 additions & 54 deletions android/app/src/main/assets/disclaimer.html

This file was deleted.

Binary file removed android/app/src/main/assets/fonts/Lato-Black.ttf
Binary file not shown.
Binary file not shown.
Binary file removed android/app/src/main/assets/fonts/Lato-Bold.ttf
Binary file not shown.
Binary file not shown.
Binary file removed android/app/src/main/assets/fonts/Lato-Hairline.ttf
Binary file not shown.
Binary file not shown.
Binary file removed android/app/src/main/assets/fonts/Lato-Italic.ttf
Binary file not shown.
Binary file removed android/app/src/main/assets/fonts/Lato-Light.ttf
Binary file not shown.
Binary file not shown.
Binary file removed android/app/src/main/assets/fonts/Lato-Regular.ttf
Binary file not shown.
Binary file not shown.
Binary file modified android/app/src/main/assets/fonts/Octicons.ttf
Binary file not shown.
Empty file modified android/app/src/main/assets/fonts/Roboto.ttf
100755 → 100644
Empty file.
Empty file modified android/app/src/main/assets/fonts/Roboto_medium.ttf
100755 → 100644
Empty file.
Binary file not shown.
Binary file not shown.
Binary file added android/app/src/main/assets/fonts/Rubik-Bold.ttf
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed android/app/src/main/assets/fonts/lato.ttf
Binary file not shown.
Binary file removed android/app/src/main/assets/fonts/lato_bold.ttf
Binary file not shown.
Binary file not shown.
Loading

0 comments on commit 37ec1c0

Please sign in to comment.