Skip to content

Commit e56f557

Browse files
onebillion-adminonebillion-admin
committed
Merge remote-tracking branch 'upstream/master'
2 parents f318ff4 + e1fe9b9 commit e56f557

File tree

223 files changed

+31572
-4492
lines changed

Some content is hidden

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

223 files changed

+31572
-4492
lines changed

‎.idea/encodings.xml‎

Lines changed: 0 additions & 6 deletions
This file was deleted.

‎.idea/misc.xml‎

Lines changed: 1 addition & 17 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/vcs.xml‎

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/build.gradle‎

Lines changed: 157 additions & 65 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,16 @@
1+
repositories {
2+
maven {
3+
url "https://jcenter.bintray.com"
4+
}
5+
// jcenter()
6+
}
7+
18
apply plugin: 'com.android.application'
9+
10+
211
android {
12+
signingConfigs {}
13+
/*
314
signingConfigs {
415
config {
516
keyAlias 'android'
@@ -8,9 +19,11 @@ android {
819
storePassword 'android'
920
}
1021
}
22+
*/
1123
compileSdkVersion 23
1224
buildToolsVersion '25.0.0'
1325
defaultConfig {
26+
multiDexEnabled true
1427
applicationId 'org.onebillion.onecourse'
1528
minSdkVersion 22
1629
targetSdkVersion 23
@@ -20,18 +33,23 @@ android {
2033
}
2134
buildTypes {
2235
debug {
23-
2436
debuggable true
2537
manifestPlaceholders = [
26-
appuserid : ""
38+
appuserid: ""
2739
]
28-
2940
}
3041
release {
3142
minifyEnabled false
3243
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
3344
manifestPlaceholders = [
34-
appuserid : "android.uid.system"
45+
appuserid: "android.uid.system"
46+
]
47+
}
48+
distribution {
49+
minifyEnabled false
50+
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
51+
manifestPlaceholders = [
52+
appuserid: ""
3553
]
3654
}
3755

@@ -46,144 +64,213 @@ android {
4664
// javaMaxHeapSize "8192M"
4765
// javaMaxHeapSize "4096M"
4866
javaMaxHeapSize "512M"
67+
// javaMaxHeapSize "1024M"
68+
}
69+
sourceSets {
70+
main {
71+
assets.srcDirs = ['src/main/assets', 'src/main/config', 'src/main/fonts/']
72+
}
73+
res {
74+
res.srcDirs = ['src/main/res']
75+
}
4976
}
50-
sourceSets { main { assets.srcDirs = ['src/main/assets', 'src/main/assets_obb'] } }
5177
productFlavors {
52-
pedro {
53-
minSdkVersion 22
78+
pedro_ {
79+
minSdkVersion 23
5480
applicationId 'org.onebillion.onecourse.pedro'
5581
targetSdkVersion 23
5682
versionCode 1
5783
versionName '1.0'
58-
resValue "string", "app_name", "Setup Prototype"
59-
buildConfigField 'String', 'SETTINGS_FILE', '"config/settings_pedro.plist"'
84+
resValue "string", "app_name", "Pedro"
85+
buildConfigField 'String', 'SETTINGS_FILE', '"settings_pedro.plist"'
6086
manifestPlaceholders = [
61-
appIcon: "@mipmap/judges",
87+
appIcon: "@mipmap/judges"
6288
]
6389
}
64-
judgeMenu {
65-
minSdkVersion 22
66-
applicationId 'org.onebillion.onecourse.judges'
90+
alan_ {
91+
minSdkVersion 23
92+
applicationId 'org.onebillion.onecourse.alan'
6793
targetSdkVersion 23
6894
versionCode 1
6995
versionName '1.0'
70-
resValue "string", "app_name", "onecourse - Judges"
71-
buildConfigField 'String', 'SETTINGS_FILE', '"config/settings_judge.plist"'
96+
resValue "string", "app_name", "onecourse - alan"
97+
buildConfigField 'String', 'SETTINGS_FILE', '"settingsas.plist"'
7298
manifestPlaceholders = [
73-
appIcon: "@mipmap/judges",
99+
appIcon: "@mipmap/child_ny"
74100
]
75101
}
76-
judgeMenu_test {
77-
minSdkVersion 22
102+
michal_ {
103+
minSdkVersion 23
104+
applicationId 'org.onebillion.onecourse.michal'
105+
targetSdkVersion 23
106+
versionCode 1
107+
versionName '1.0'
108+
resValue "string", "app_name", "onecourse - michal"
109+
buildConfigField 'String', 'SETTINGS_FILE', '"settings_michal.plist"'
110+
manifestPlaceholders = [
111+
appIcon: "@mipmap/child_ny"
112+
]
113+
}
114+
sw_judges_ {
115+
minSdkVersion 23
78116
applicationId 'org.onebillion.onecourse.judges'
79117
targetSdkVersion 23
80118
versionCode 1
81119
versionName '1.0'
82120
resValue "string", "app_name", "onecourse - Judges"
83-
buildConfigField 'String', 'SETTINGS_FILE', '"config/settings_judge_test.plist"'
84-
manifestPlaceholders = [
85-
appIcon: "@mipmap/judges",
86-
]
87-
}
88-
// judgeMenu_ny_ {
89-
// minSdkVersion 23
90-
// applicationId 'org.onebillion.onecourse.judges.ny'
91-
// targetSdkVersion 23
92-
// versionCode 1
93-
// versionName '1.0'
94-
// resValue "string", "app_name", "onecourse - Judges (chichewa)"
95-
// buildConfigField 'String', 'SETTINGS_FILE', '"config/settings_judge_ny.plist"'
96-
// manifestPlaceholders = [
97-
// appIcon: "@mipmap/judges_ny"
98-
// ]
99-
// }
100-
childMenu {
101-
minSdkVersion 22
121+
buildConfigField 'String', 'SETTINGS_FILE', '"settings_judges_sw.plist"'
122+
manifestPlaceholders = [
123+
appIcon: "@mipmap/judges"
124+
]
125+
}
126+
ny_judges_ {
127+
minSdkVersion 23
128+
applicationId 'org.onebillion.onecourse.judges.ny'
129+
targetSdkVersion 23
130+
versionCode 1
131+
versionName '1.0'
132+
resValue "string", "app_name", "Judges - ny"
133+
buildConfigField 'String', 'SETTINGS_FILE', '"settings_judges_ny.plist"'
134+
manifestPlaceholders = [
135+
appIcon: "@mipmap/judges"
136+
]
137+
}
138+
sw_community_ {
139+
minSdkVersion 23
102140
applicationId 'org.onebillion.onecourse.child'
103141
targetSdkVersion 23
104142
versionCode 1
105143
versionName '1.0'
106144
resValue "string", "app_name", "onecourse - Child"
107-
buildConfigField 'String', 'SETTINGS_FILE', '"config/settings_community_sw.plist"'
145+
buildConfigField 'String', 'SETTINGS_FILE', '"settings_community_sw.plist"'
108146
manifestPlaceholders = [
109147
appIcon: "@mipmap/icon_child"
110148
]
111149
}
112-
childMenuTestVersion {
113-
minSdkVersion 22
150+
sw_test_ {
151+
minSdkVersion 23
114152
applicationId 'org.onebillion.onecourse.child.test'
115153
targetSdkVersion 23
116154
versionCode 1
117155
versionName '1.0'
118-
resValue "string", "app_name", "Dev - Child"
119-
buildConfigField 'String', 'SETTINGS_FILE', '"config/settings_test_sw.plist"'
156+
resValue "string", "app_name", "Dev - sw"
157+
buildConfigField 'String', 'SETTINGS_FILE', '"settings_test_sw.plist"'
120158
manifestPlaceholders = [
121159
appIcon: "@mipmap/icon_child"
122160
]
123161
}
124-
childMenu_enGB_ {
125-
minSdkVersion 22
162+
sw_library_ {
163+
minSdkVersion 23
164+
applicationId 'org.onebillion.onecourse.child.library'
165+
targetSdkVersion 23
166+
versionCode 1
167+
versionName '1.0'
168+
resValue "string", "app_name", "Library - sw"
169+
buildConfigField 'String', 'SETTINGS_FILE', '"settings_library_sw.plist"'
170+
manifestPlaceholders = [
171+
appIcon: "@mipmap/icon_child"
172+
]
173+
}
174+
sw_playzone_ {
175+
minSdkVersion 23
176+
applicationId 'org.onebillion.onecourse.child.playzone'
177+
targetSdkVersion 23
178+
versionCode 1
179+
versionName '1.0'
180+
resValue "string", "app_name", "Playzone - sw"
181+
buildConfigField 'String', 'SETTINGS_FILE', '"settings_playzone_sw.plist"'
182+
manifestPlaceholders = [
183+
appIcon: "@mipmap/icon_child"
184+
]
185+
}
186+
sw_loop_ {
187+
minSdkVersion 23
188+
applicationId 'org.onebillion.onecourse.child.loop'
189+
targetSdkVersion 23
190+
versionCode 1
191+
versionName '1.0'
192+
resValue "string", "app_name", "Loop - sw"
193+
buildConfigField 'String', 'SETTINGS_FILE', '"settings_loop_sw.plist"'
194+
manifestPlaceholders = [
195+
appIcon: "@mipmap/icon_child"
196+
]
197+
}
198+
enGB_community_ {
199+
minSdkVersion 23
126200
applicationId 'org.onebillion.onecourse.child.en_GB'
127201
targetSdkVersion 23
128202
versionCode 1
129203
versionName '1.0'
130-
resValue "string", "app_name", "onecourse - Child (english)"
131-
buildConfigField 'String', 'SETTINGS_FILE', '"config/settings_community_enGB.plist"'
204+
resValue "string", "app_name", "onecourse - enGB"
205+
buildConfigField 'String', 'SETTINGS_FILE', '"settings_community_enGB.plist"'
132206
manifestPlaceholders = [
133207
appIcon: "@mipmap/child_en_gb"
134208
]
135209
}
136-
childMenu_enGB_TestVersion {
137-
minSdkVersion 22
210+
enGB_test_ {
211+
minSdkVersion 23
138212
applicationId 'org.onebillion.onecourse.child.en_GB.test'
139213
targetSdkVersion 23
140214
versionCode 1
141215
versionName '1.0'
142-
resValue "string", "app_name", "Dev - Child enGB"
143-
buildConfigField 'String', 'SETTINGS_FILE', '"config/settings_test_enGB.plist"'
216+
resValue "string", "app_name", "Dev - enGB"
217+
buildConfigField 'String', 'SETTINGS_FILE', '"settings_test_enGB.plist"'
144218
manifestPlaceholders = [
145219
appIcon: "@mipmap/child_en_gb"
146220
]
147221
}
148-
childMenu_ny_ {
222+
ny_community_ {
149223
minSdkVersion 23
150224
applicationId 'org.onebillion.onecourse.child.ny'
151225
targetSdkVersion 23
152226
versionCode 1
153227
versionName '1.0'
154-
resValue "string", "app_name", "onecourse - Child (chichewa)"
155-
buildConfigField 'String', 'SETTINGS_FILE', '"config/settings_child_ny.plist"'
228+
resValue "string", "app_name", "onecourse - ny"
229+
buildConfigField 'String', 'SETTINGS_FILE', '"settings_community_ny.plist"'
156230
manifestPlaceholders = [
157231
appIcon: "@mipmap/child_ny"
158232
]
159233
}
160-
alan {
161-
minSdkVersion 21
162-
applicationId 'org.onebillion.onecourse.alan'
234+
ny_test_ {
235+
minSdkVersion 23
236+
applicationId 'org.onebillion.onecourse.child.ny.test'
163237
targetSdkVersion 23
164238
versionCode 1
165239
versionName '1.0'
166-
resValue "string", "app_name", "onecourse - alan"
167-
buildConfigField 'String', 'SETTINGS_FILE', '"config/settingsas.plist"'
240+
resValue "string", "app_name", "Dev - ny"
241+
buildConfigField 'String', 'SETTINGS_FILE', '"settings_test_ny.plist"'
168242
manifestPlaceholders = [
169243
appIcon: "@mipmap/child_ny"
170244
]
171245
}
172-
wifiTestVersion {
173-
minSdkVersion 22
174-
applicationId 'org.onebillion.onecourse.wifi.test'
246+
kenya_ {
247+
minSdkVersion 23
248+
applicationId 'org.onebillion.onecourse.kenya'
175249
targetSdkVersion 23
176250
versionCode 1
177251
versionName '1.0'
178-
resValue "string", "app_name", "onecourse - wifi"
179-
buildConfigField 'String', 'SETTINGS_FILE', '"config/settings_test_wifi.plist"'
252+
resValue "string", "app_name", "Kenya dev"
253+
buildConfigField 'String', 'SETTINGS_FILE', '"settings_kenya.plist"'
180254
manifestPlaceholders = [
181-
appIcon: "@mipmap/child_en_gb"
255+
appIcon: "@mipmap/icon_child"
182256
]
183257
}
258+
259+
}
260+
261+
262+
packagingOptions {
263+
exclude 'META-INF/DEPENDENCIES.txt'
264+
exclude 'META-INF/NOTICE'
265+
exclude 'META-INF/NOTICE.txt'
266+
exclude 'META-INF/LICENSE'
267+
exclude 'META-INF/LICENSE.txt'
268+
pickFirst 'META-INF/license.txt'
184269
}
185270
}
186271

272+
273+
187274
dependencies {
188275
// compile fileTree(dir: 'libs', include: ['*.jar'])
189276
// testCompile 'junit:junit:4.12'
@@ -194,4 +281,9 @@ dependencies {
194281
//
195282
compile files('libs/commons-io-2.5.jar')
196283
compile files('libs/commons-net-3.6.jar')
197-
}
284+
285+
compile 'com.parse:parse-android:1.15.8'
286+
compile 'com.google.code.gson:gson:2.8.2'
287+
288+
289+
}

0 commit comments

Comments
 (0)