Skip to content

Commit 2cb1330

Browse files
Merge pull request #22 from leapfrogtechnology/LFG-187
Lfg 187
2 parents 42838a2 + 1f1cec8 commit 2cb1330

File tree

137 files changed

+2511
-732
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

137 files changed

+2511
-732
lines changed

.gitignore

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ local.properties
3737
android/.project
3838
android/app/.project
3939
android/app/bin/
40+
Android/app/google-services.json
4041

4142
# node.js
4243
#

android/app/BUCK

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,12 @@ android_library(
4545

4646
android_build_config(
4747
name = "build_config",
48-
package = "com.leapfroggers",
48+
package = "com.lftechnology.leapfroggers",
4949
)
5050

5151
android_resource(
5252
name = "res",
53-
package = "com.leapfroggers",
53+
package = "com.lftechnology.leapfroggers",
5454
res = "src/main/res",
5555
)
5656

android/app/build.gradle

Lines changed: 39 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -93,16 +93,20 @@ def enableSeparateBuildPerCPUArchitecture = false
9393
*/
9494
def enableProguardInReleaseBuilds = false
9595

96+
def keystorePropertiesFile = rootProject.file("./app/keystore.properties")
97+
def keystoreProperties = new Properties()
98+
keystoreProperties.load(new FileInputStream(keystorePropertiesFile))
99+
96100
android {
97-
compileSdkVersion 25
98-
buildToolsVersion "25.0.1"
101+
compileSdkVersion 27
102+
buildToolsVersion "27.0.2"
99103

100104
defaultConfig {
101-
applicationId "com.leapfroggers"
105+
applicationId "com.lftechnology.leapfroggers"
102106
minSdkVersion 16
103-
targetSdkVersion 22
104-
versionCode 1
105-
versionName "1.0"
107+
targetSdkVersion 27
108+
versionCode 12
109+
versionName "4.0"
106110
ndk {
107111
abiFilters "armeabi-v7a", "x86"
108112
}
@@ -115,10 +119,26 @@ android {
115119
include "armeabi-v7a", "x86"
116120
}
117121
}
122+
123+
signingConfigs {
124+
releaseConfig {
125+
keyAlias keystoreProperties['keyAlias']
126+
keyPassword keystoreProperties['keyPassword']
127+
storeFile file(keystoreProperties['storeFile'])
128+
storePassword keystoreProperties['storePassword']
129+
}
130+
}
131+
118132
buildTypes {
119133
release {
120134
minifyEnabled enableProguardInReleaseBuilds
121135
proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
136+
signingConfig signingConfigs.releaseConfig
137+
}
138+
debug {
139+
minifyEnabled enableProguardInReleaseBuilds
140+
proguardFiles getDefaultProguardFile("proguard-android.txt"), "proguard-rules.pro"
141+
signingConfig signingConfigs.releaseConfig
122142
}
123143
}
124144
// applicationVariants are e.g. debug, release
@@ -137,13 +157,21 @@ android {
137157
}
138158

139159
dependencies {
160+
compile project(':react-native-contacts')
161+
compile project(':react-native-linear-gradient')
162+
compile project(':react-native-fast-image')
163+
compile project(':react-native-google-signin')
140164
compile fileTree(dir: "libs", include: ["*.jar"])
141165
compile project(':react-native-navigation')
142-
compile project(':react-native-google-signin')
143-
compile project(':react-native-blur')
166+
144167
compile fileTree(dir: "libs", include: ["*.jar"])
145-
compile "com.android.support:appcompat-v7:23.0.1"
168+
compile "com.android.support:appcompat-v7:27.0.2"
146169
compile "com.facebook.react:react-native:+" // From node_modules
170+
171+
compile(project(":react-native-google-signin")){
172+
exclude group: "com.google.android.gms" // very important
173+
}
174+
compile 'com.google.android.gms:play-services-auth:11.8.0'
147175
}
148176

149177
// Run this once to be able to run the application with BUCK
@@ -152,3 +180,5 @@ task copyDownloadableDepsToLibs(type: Copy) {
152180
from configurations.compile
153181
into 'libs'
154182
}
183+
184+
apply plugin: 'com.google.gms.google-services'

android/app/google-services.json

Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
{
2+
"project_info": {
3+
"project_number": "757135941754",
4+
"project_id": "primeval-shadow-91603"
5+
},
6+
"client": [
7+
{
8+
"client_info": {
9+
"mobilesdk_app_id": "1:757135941754:android:3f78a7c51140174d",
10+
"android_client_info": {
11+
"package_name": "com.leapfroggers"
12+
}
13+
},
14+
"oauth_client": [
15+
{
16+
"client_id": "757135941754-1g6qdufsfie419qnn6p7ngb93olkj4mi.apps.googleusercontent.com",
17+
"client_type": 3
18+
}
19+
],
20+
"api_key": [
21+
{
22+
"current_key": "AIzaSyAMq_-bkMv8TsBdfO_JFMhJykSinBfu2d0"
23+
}
24+
],
25+
"services": {
26+
"analytics_service": {
27+
"status": 1
28+
},
29+
"appinvite_service": {
30+
"status": 1,
31+
"other_platform_oauth_client": []
32+
},
33+
"ads_service": {
34+
"status": 1
35+
}
36+
}
37+
},
38+
{
39+
"client_info": {
40+
"mobilesdk_app_id": "1:757135941754:android:e2f96b9dc48784b9",
41+
"android_client_info": {
42+
"package_name": "com.lftechnology.leapfroggers"
43+
}
44+
},
45+
"oauth_client": [
46+
{
47+
"client_id": "757135941754-j7qnv6e3ml2r8vee452ek563tqgttk7m.apps.googleusercontent.com",
48+
"client_type": 1,
49+
"android_info": {
50+
"package_name": "com.lftechnology.leapfroggers",
51+
"certificate_hash": "6fcd74d0de23d3f16162b1808213255bc4d8d07a"
52+
}
53+
},
54+
{
55+
"client_id": "757135941754-1g6qdufsfie419qnn6p7ngb93olkj4mi.apps.googleusercontent.com",
56+
"client_type": 3
57+
}
58+
],
59+
"api_key": [
60+
{
61+
"current_key": "AIzaSyAMq_-bkMv8TsBdfO_JFMhJykSinBfu2d0"
62+
}
63+
],
64+
"services": {
65+
"analytics_service": {
66+
"status": 1
67+
},
68+
"appinvite_service": {
69+
"status": 1,
70+
"other_platform_oauth_client": []
71+
},
72+
"ads_service": {
73+
"status": 1
74+
}
75+
}
76+
}
77+
],
78+
"configuration_version": "1"
79+
}

android/app/keystore.properties

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
# temporary data replace for production
2+
storePassword=leapfroggers
3+
keyPassword=leapfroggers
4+
keyAlias=leapfroggers
5+
storeFile=./leapfrog-keystore.jks

android/app/leapfrog-keystore.jks

2.2 KB
Binary file not shown.

android/app/release/app-release.apk

8.76 MB
Binary file not shown.

android/app/release/output.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
[{"outputType":{"type":"APK"},"apkInfo":{"type":"MAIN","splits":[],"versionCode":11},"path":"app-release.apk","properties":{"packageId":"com.lftechnology.leapfroggers","split":"","minSdkVersion":"16"}}]

android/app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="com.leapfroggers"
2+
package="com.lftechnology.leapfroggers"
33
android:versionCode="1"
44
android:versionName="1.0">
55

android/app/src/main/java/com/leapfroggers/MainActivity.java renamed to android/app/src/main/java/com/lftechnology/leapfroggers/MainActivity.java

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,12 @@
1-
package com.leapfroggers;
2-
3-
import com.facebook.react.ReactActivity;
4-
import com.reactnativenavigation.controllers.SplashActivity;
1+
package com.lftechnology.leapfroggers;
52

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

85
/**
96
* Returns the name of the main component registered from JavaScript.
107
* This is used to schedule rendering of the component.
118
*/
12-
@Override
9+
// @Override
1310
protected String getMainComponentName() {
1411
return "Leapfroggers";
1512
}

0 commit comments

Comments
 (0)