Skip to content

Commit

Permalink
Merge pull request #22 from leapfrogtechnology/LFG-187
Browse files Browse the repository at this point in the history
Lfg 187
  • Loading branch information
kusalshrestha authored Jan 10, 2018
2 parents 42838a2 + 1f1cec8 commit 2cb1330
Show file tree
Hide file tree
Showing 137 changed files with 2,511 additions and 732 deletions.
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -37,6 +37,7 @@ local.properties
android/.project
android/app/.project
android/app/bin/
Android/app/google-services.json

# node.js
#
Expand Down
4 changes: 2 additions & 2 deletions android/app/BUCK
Original file line number Diff line number Diff line change
Expand Up @@ -45,12 +45,12 @@ android_library(

android_build_config(
name = "build_config",
package = "com.leapfroggers",
package = "com.lftechnology.leapfroggers",
)

android_resource(
name = "res",
package = "com.leapfroggers",
package = "com.lftechnology.leapfroggers",
res = "src/main/res",
)

Expand Down
48 changes: 39 additions & 9 deletions android/app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -93,16 +93,20 @@ def enableSeparateBuildPerCPUArchitecture = false
*/
def enableProguardInReleaseBuilds = false

def keystorePropertiesFile = rootProject.file("./app/keystore.properties")
def keystoreProperties = new Properties()
keystoreProperties.load(new FileInputStream(keystorePropertiesFile))

android {
compileSdkVersion 25
buildToolsVersion "25.0.1"
compileSdkVersion 27
buildToolsVersion "27.0.2"

defaultConfig {
applicationId "com.leapfroggers"
applicationId "com.lftechnology.leapfroggers"
minSdkVersion 16
targetSdkVersion 22
versionCode 1
versionName "1.0"
targetSdkVersion 27
versionCode 12
versionName "4.0"
ndk {
abiFilters "armeabi-v7a", "x86"
}
Expand All @@ -115,10 +119,26 @@ android {
include "armeabi-v7a", "x86"
}
}

signingConfigs {
releaseConfig {
keyAlias keystoreProperties['keyAlias']
keyPassword keystoreProperties['keyPassword']
storeFile file(keystoreProperties['storeFile'])
storePassword keystoreProperties['storePassword']
}
}

buildTypes {
release {
minifyEnabled enableProguardInReleaseBuilds
proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
signingConfig signingConfigs.releaseConfig
}
debug {
minifyEnabled enableProguardInReleaseBuilds
proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
signingConfig signingConfigs.releaseConfig
}
}
// applicationVariants are e.g. debug, release
Expand All @@ -137,13 +157,21 @@ android {
}

dependencies {
compile project(':react-native-contacts')
compile project(':react-native-linear-gradient')
compile project(':react-native-fast-image')
compile project(':react-native-google-signin')
compile fileTree(dir: "libs", include: ["*.jar"])
compile project(':react-native-navigation')
compile project(':react-native-google-signin')
compile project(':react-native-blur')

compile fileTree(dir: "libs", include: ["*.jar"])
compile "com.android.support:appcompat-v7:23.0.1"
compile "com.android.support:appcompat-v7:27.0.2"
compile "com.facebook.react:react-native:+" // From node_modules

compile(project(":react-native-google-signin")){
exclude group: "com.google.android.gms" // very important
}
compile 'com.google.android.gms:play-services-auth:11.8.0'
}

// Run this once to be able to run the application with BUCK
Expand All @@ -152,3 +180,5 @@ task copyDownloadableDepsToLibs(type: Copy) {
from configurations.compile
into 'libs'
}

apply plugin: 'com.google.gms.google-services'
79 changes: 79 additions & 0 deletions android/app/google-services.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,79 @@
{
"project_info": {
"project_number": "757135941754",
"project_id": "primeval-shadow-91603"
},
"client": [
{
"client_info": {
"mobilesdk_app_id": "1:757135941754:android:3f78a7c51140174d",
"android_client_info": {
"package_name": "com.leapfroggers"
}
},
"oauth_client": [
{
"client_id": "757135941754-1g6qdufsfie419qnn6p7ngb93olkj4mi.apps.googleusercontent.com",
"client_type": 3
}
],
"api_key": [
{
"current_key": "AIzaSyAMq_-bkMv8TsBdfO_JFMhJykSinBfu2d0"
}
],
"services": {
"analytics_service": {
"status": 1
},
"appinvite_service": {
"status": 1,
"other_platform_oauth_client": []
},
"ads_service": {
"status": 1
}
}
},
{
"client_info": {
"mobilesdk_app_id": "1:757135941754:android:e2f96b9dc48784b9",
"android_client_info": {
"package_name": "com.lftechnology.leapfroggers"
}
},
"oauth_client": [
{
"client_id": "757135941754-j7qnv6e3ml2r8vee452ek563tqgttk7m.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
"package_name": "com.lftechnology.leapfroggers",
"certificate_hash": "6fcd74d0de23d3f16162b1808213255bc4d8d07a"
}
},
{
"client_id": "757135941754-1g6qdufsfie419qnn6p7ngb93olkj4mi.apps.googleusercontent.com",
"client_type": 3
}
],
"api_key": [
{
"current_key": "AIzaSyAMq_-bkMv8TsBdfO_JFMhJykSinBfu2d0"
}
],
"services": {
"analytics_service": {
"status": 1
},
"appinvite_service": {
"status": 1,
"other_platform_oauth_client": []
},
"ads_service": {
"status": 1
}
}
}
],
"configuration_version": "1"
}
5 changes: 5 additions & 0 deletions android/app/keystore.properties
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
# temporary data replace for production
storePassword=leapfroggers
keyPassword=leapfroggers
keyAlias=leapfroggers
storeFile=./leapfrog-keystore.jks
Binary file added android/app/leapfrog-keystore.jks
Binary file not shown.
Binary file added android/app/release/app-release.apk
Binary file not shown.
1 change: 1 addition & 0 deletions android/app/release/output.json
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":11},"path":"app-release.apk","properties":{"packageId":"com.lftechnology.leapfroggers","split":"","minSdkVersion":"16"}}]
2 changes: 1 addition & 1 deletion android/app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.leapfroggers"
package="com.lftechnology.leapfroggers"
android:versionCode="1"
android:versionName="1.0">

Expand Down
Original file line number Diff line number Diff line change
@@ -1,15 +1,12 @@
package com.leapfroggers;

import com.facebook.react.ReactActivity;
import com.reactnativenavigation.controllers.SplashActivity;
package com.lftechnology.leapfroggers;

public class MainActivity extends com.reactnativenavigation.controllers.SplashActivity {

/**
* Returns the name of the main component registered from JavaScript.
* This is used to schedule rendering of the component.
*/
@Override
// @Override
protected String getMainComponentName() {
return "Leapfroggers";
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,20 +1,17 @@
package com.leapfroggers;
package com.lftechnology.leapfroggers;

import android.app.Application;

import com.facebook.react.ReactApplication;
import com.reactnativenavigation.NavigationReactPackage;
import co.apptailor.googlesignin.RNGoogleSigninPackage;
import com.cmcewen.blurview.BlurViewPackage;
import com.facebook.react.ReactNativeHost;
import com.BV.LinearGradient.LinearGradientPackage;
import com.dylanvann.fastimage.FastImageViewPackage;
import com.facebook.react.ReactPackage;
import com.facebook.react.shell.MainReactPackage;
import com.facebook.soloader.SoLoader;
import com.reactnativenavigation.NavigationApplication;
import com.rt2zz.reactnativecontacts.ReactNativeContacts;

import java.util.Arrays;
import java.util.List;

import co.apptailor.googlesignin.RNGoogleSigninPackage;

public class MainApplication extends NavigationApplication {

@Override
Expand All @@ -28,6 +25,11 @@ protected List<ReactPackage> getPackages() {
// No need to add RnnPackage and MainReactPackage
return Arrays.<ReactPackage>asList(
// eg. new VectorIconsPackage()
new MainReactPackage(),
new ReactNativeContacts(),
new LinearGradientPackage(),
new FastImageViewPackage(),
new RNGoogleSigninPackage()
);
}

Expand Down
Binary file modified android/app/src/main/res/mipmap-hdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-mdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-xhdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified android/app/src/main/res/mipmap-xxhdpi/ic_launcher.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added android/app/src/main/res/playstore-icon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
6 changes: 4 additions & 2 deletions android/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,11 @@
buildscript {
repositories {
jcenter()
google()
}
dependencies {
classpath 'com.android.tools.build:gradle:2.2.3'

classpath 'com.android.tools.build:gradle:3.0.1'
classpath 'com.google.gms:google-services:3.0.0'
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
}
Expand All @@ -20,5 +21,6 @@ allprojects {
// All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
url "$rootDir/../node_modules/react-native/android"
}
google()
}
}
1 change: 1 addition & 0 deletions android/gradle.properties
Original file line number Diff line number Diff line change
Expand Up @@ -18,3 +18,4 @@
# org.gradle.parallel=true

android.useDeprecatedNdk=true
android.enableAapt2=false
3 changes: 2 additions & 1 deletion android/gradle/wrapper/gradle-wrapper.properties
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
#Mon Dec 11 17:54:53 NPT 2017
distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-4.1-all.zip
8 changes: 6 additions & 2 deletions android/settings.gradle
Original file line number Diff line number Diff line change
@@ -1,9 +1,13 @@
rootProject.name = 'Leapfroggers'
include ':react-native-contacts'
project(':react-native-contacts').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-contacts/android')
include ':react-native-linear-gradient'
project(':react-native-linear-gradient').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-linear-gradient/android')
include ':react-native-fast-image'
project(':react-native-fast-image').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-fast-image/android')
include ':react-native-navigation'
project(':react-native-navigation').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-navigation/android/app')
include ':react-native-google-signin'
project(':react-native-google-signin').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-google-signin/android')
include ':react-native-blur'
project(':react-native-blur').projectDir = new File(rootProject.projectDir, '../node_modules/react-native-blur/android')

include ':app'
11 changes: 11 additions & 0 deletions app/actions/departmentActions.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
import { uri } from 'App/config/uri';
import * as util from 'App/utils/dataNormalization';
import * as Resource from 'App/utils/networkResource';
import * as ActionType from 'App/constants/actionsType';

export const departmentList = (departments) => {
return {
type: ActionType.DEPARTMENT_LIST,
departments
}
}
32 changes: 32 additions & 0 deletions app/actions/employeeActions.js
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
import { uri } from 'App/config/uri';
import * as util from 'App/utils/dataNormalization';
import * as Resource from 'App/utils/networkResource';
import * as ActionType from 'App/constants/actionsType';

export const employeeList = (employees) => {
return {
type: ActionType.EMPLOYEES_LIST,
employees
}
}

export const categorizedByAlphabets = (employees) => {
return {
type: ActionType.CATEGORIZED_EMP,
categorizedEmployees: employees
}
}

export const groupEmployeesOnDepartmentBasis = (groupedEmployees) => {
return {
type: ActionType.GROUP_EMPLOYEES_DEPARTMENT_BASIS,
groupedEmployees
}
}

export const favoriteTheEmployee = (favoriteEmployee) => {
return {
type: ActionType.FAVORITE_EMPLOYEE,
favoriteEmployee: favoriteEmployee
}
}
Loading

0 comments on commit 2cb1330

Please sign in to comment.