Skip to content
This repository was archived by the owner on Jul 14, 2026. It is now read-only.

Commit 4bef7c9

Browse files
pbhatt17pbhatt17
authored
Merge pull request #125 from Zolon-DOL/master
2023 changes: Android upgrade
2 parents 230c37c + 08d80ec commit 4bef7c9

3 files changed

Lines changed: 56 additions & 15 deletions

File tree

‎app/build.gradle‎

Lines changed: 17 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,7 @@
11
apply plugin: 'com.android.application'
2-
apply plugin: 'com.google.gms.google-services'
32

43
android {
5-
compileSdkVersion 30
4+
compileSdkVersion 33
65
// buildToolsVersion "26.0.1"
76
buildToolsVersion "30.0.2"
87
// new line added fro error Execution failed for task ':app:lint'.
@@ -12,33 +11,38 @@ android {
1211
defaultConfig {
1312
applicationId "gov.dol.childlabor"
1413
minSdkVersion 16
15-
targetSdkVersion 30
14+
targetSdkVersion 33
1615
versionCode 7
1716
versionName "1.9"
1817
ndk.abiFilters 'armeabi-v7a','arm64-v8a'
18+
multiDexEnabled true
1919
}
2020
buildTypes {
2121
release {
2222
minifyEnabled false
2323
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
2424
}
25+
2526
}
2627
productFlavors {
2728
}
2829
}
2930

3031
dependencies {
31-
implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
32-
compile fileTree(include: ['*.jar'], dir: 'libs')
33-
testCompile 'junit:junit:4.12'
32+
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
33+
//implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
34+
implementation fileTree(include: ['*.jar'], dir: 'libs')
35+
testImplementation 'junit:junit:4.13.2'
3436
// compile 'com.android.support:appcompat-v7:26.1.0'
3537
// compile 'com.android.support:design:26.1.0'
36-
compile 'androidx.appcompat:appcompat:1.0.0'
37-
compile 'com.google.android.material:material:1.0.0'
38-
compile 'com.joanzapata.pdfview:android-pdfview:1.0.4@aar'
39-
compile 'se.emilsjolander:stickylistheaders:2.7.0'
40-
compile 'com.google.android.gms:play-services-analytics:8.1.0'
41-
compile 'io.karim:materialtabs:2.0.2'
42-
compile project(':MPChartLib')
38+
implementation 'androidx.appcompat:appcompat:1.6.1'
39+
implementation 'com.google.android.material:material:1.6.0'
40+
implementation 'com.joanzapata.pdfview:android-pdfview:1.0.4@aar'
41+
implementation 'se.emilsjolander:stickylistheaders:2.7.0'
42+
43+
implementation 'io.karim:materialtabs:2.0.2'
44+
implementation project(':MPChartLib')
4345
implementation 'com.google.maps.android:android-maps-utils:2.2.3'
46+
implementation 'com.google.android.gms:play-services-analytics:18.0.2'
47+
implementation 'com.android.support:multidex:1.0.3'
4448
}

‎app/src/main/AndroidManifest.xml‎

Lines changed: 35 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,18 +14,23 @@
1414
android:label="@string/app_name"
1515
android:largeHeap="true"
1616
android:supportsRtl="true"
17+
android:enabled="true"
1718
android:theme="@style/AppTheme">
1819
<activity
1920
android:name=".MainActivity"
21+
android:exported="true"
22+
android:excludeFromRecents="true"
2023
android:theme="@style/AppTheme.NoActionBar">
2124
<intent-filter>
22-
<action android:name="android.intent.action.MAIN" />
2325

24-
<category android:name="android.intent.category.LAUNCHER" />
26+
<action android:name="android.intent.action.MAIN"/>
27+
28+
<category android:name="android.intent.category.LAUNCHER"/>
2529
</intent-filter>
2630
</activity>
2731
<activity
2832
android:name=".TabbedCountryListActivity"
33+
android:exported="false"
2934
android:label="@string/title_activity_tabbed_country_list"
3035
android:parentActivityName=".MainActivity"
3136
android:theme="@style/AppTheme.NoActionBar">
@@ -35,6 +40,7 @@
3540
</activity>
3641
<activity
3742
android:name=".CountryViewActivity"
43+
android:exported="false"
3844
android:label="@string/title_activity_country_view"
3945
android:launchMode="singleTop"
4046
android:parentActivityName=".TabbedCountryListActivity"
@@ -45,6 +51,7 @@
4551
</activity>
4652
<activity
4753
android:name=".TabbedGoodListActivity"
54+
android:exported="false"
4855
android:label="@string/title_activity_tabbed_good_list"
4956
android:parentActivityName=".MainActivity"
5057
android:theme="@style/AppTheme.NoActionBar">
@@ -54,6 +61,7 @@
5461
</activity>
5562
<activity
5663
android:name=".GoodViewActivity"
64+
android:exported="false"
5765
android:label="@string/title_activity_good_view"
5866
android:parentActivityName=".TabbedGoodListActivity"
5967
android:theme="@style/AppTheme.NoActionBar">
@@ -63,6 +71,7 @@
6371
</activity>
6472
<activity
6573
android:name=".TabbedExploitationTypeListActivity"
74+
android:exported="false"
6675
android:label="@string/title_activity_tabbed_exploitation_type_list"
6776
android:parentActivityName=".MainActivity"
6877
android:theme="@style/AppTheme.NoActionBar">
@@ -72,6 +81,7 @@
7281
</activity>
7382
<activity
7483
android:name=".AboutActivity"
84+
android:exported="false"
7585
android:label="@string/title_activity_about"
7686
android:parentActivityName=".MoreInfoActivity"
7787
android:theme="@style/AppTheme.NoActionBar">
@@ -81,6 +91,7 @@
8191
</activity>
8292
<activity
8393
android:name=".MethodologyActivity"
94+
android:exported="false"
8495
android:label="@string/title_activity_methodology"
8596
android:parentActivityName=".MoreInfoActivity"
8697
android:theme="@style/AppTheme.NoActionBar">
@@ -90,6 +101,7 @@
90101
</activity>
91102
<activity
92103
android:name=".FactsheetActivity"
104+
android:exported="false"
93105
android:label="@string/title_activity_factsheet"
94106
android:parentActivityName=".MoreInfoActivity"
95107
android:theme="@style/AppTheme.NoActionBar">
@@ -99,6 +111,7 @@
99111
</activity>
100112
<activity
101113
android:name=".SuggestedActionsActivity"
114+
android:exported="false"
102115
android:label="@string/title_activity_suggested_actions"
103116
android:parentActivityName=".CountryViewActivity"
104117
android:theme="@style/AppTheme.NoActionBar">
@@ -108,6 +121,7 @@
108121
</activity>
109122
<activity
110123
android:name=".activities.IlabProjectsActivity"
124+
android:exported="false"
111125
android:label="@string/title_activity_ilab_projects"
112126
android:parentActivityName=".CountryViewActivity"
113127
android:theme="@style/AppTheme.NoActionBar">
@@ -117,6 +131,7 @@
117131
</activity>
118132
<activity
119133
android:name=".StatisticsActivity"
134+
android:exported="false"
120135
android:label="@string/title_activity_statistics"
121136
android:parentActivityName=".CountryViewActivity"
122137
android:theme="@style/AppTheme.NoActionBar">
@@ -126,6 +141,7 @@
126141
</activity>
127142
<activity
128143
android:name=".ConventionActivity"
144+
android:exported="false"
129145
android:label="@string/title_activity_convention"
130146
android:parentActivityName=".CountryViewActivity"
131147
android:theme="@style/AppTheme.NoActionBar">
@@ -135,6 +151,7 @@
135151
</activity>
136152
<activity
137153
android:name=".LegalStandardActivity"
154+
android:exported="false"
138155
android:label="@string/title_activity_legal_standard"
139156
android:parentActivityName=".CountryViewActivity"
140157
android:theme="@style/AppTheme.NoActionBar">
@@ -144,6 +161,7 @@
144161
</activity>
145162
<activity
146163
android:name=".FullReportActivity"
164+
android:exported="false"
147165
android:label="@string/title_activity_full_report"
148166
android:parentActivityName=".CountryViewActivity"
149167
android:theme="@style/AppTheme.NoActionBar">
@@ -153,6 +171,7 @@
153171
</activity>
154172
<activity
155173
android:name=".ExploitationTypeListSpinnerActivity"
174+
android:exported="false"
156175
android:label="@string/title_activity_exploitation_type_list_spinner"
157176
android:parentActivityName=".MainActivity"
158177
android:theme="@style/AppTheme.NoActionBar">
@@ -162,6 +181,7 @@
162181
</activity>
163182
<activity
164183
android:name=".TabbedGoodListSpinnerActivity"
184+
android:exported="false"
165185
android:label="@string/title_activity_tabbed_good_list_spinner"
166186
android:parentActivityName=".MainActivity"
167187
android:theme="@style/AppTheme.NoActionBar">
@@ -171,6 +191,7 @@
171191
</activity>
172192
<activity
173193
android:name=".TabbedCountryListSpinnerActivity"
194+
android:exported="false"
174195
android:label="@string/title_activity_tabbed_country_list_spinner"
175196
android:parentActivityName=".MainActivity"
176197
android:theme="@style/AppTheme.NoActionBar">
@@ -180,6 +201,7 @@
180201
</activity>
181202
<activity
182203
android:name=".MechanismActivity"
204+
android:exported="false"
183205
android:label="@string/title_activity_mechanism"
184206
android:parentActivityName=".CountryViewActivity"
185207
android:theme="@style/AppTheme.NoActionBar">
@@ -189,6 +211,7 @@
189211
</activity>
190212
<activity
191213
android:name=".BetaLegalStandardActivity"
214+
android:exported="false"
192215
android:label="@string/title_activity_beta_legal_standard"
193216
android:parentActivityName=".CountryViewActivity"
194217
android:theme="@style/AppTheme.NoActionBar">
@@ -198,6 +221,7 @@
198221
</activity>
199222
<activity
200223
android:name=".TabbedEnforcementActivity"
224+
android:exported="false"
201225
android:label="@string/title_activity_tabbed_enforcement"
202226
android:parentActivityName=".CountryViewActivity"
203227
android:theme="@style/AppTheme.NoActionBar">
@@ -207,6 +231,7 @@
207231
</activity>
208232
<activity
209233
android:name=".MoreInfoActivity"
234+
android:exported="false"
210235
android:label="@string/title_activity_more_info"
211236
android:launchMode="singleTop"
212237
android:parentActivityName=".MainActivity"
@@ -217,6 +242,7 @@
217242
</activity>
218243
<activity
219244
android:name=".ToolKitActivity"
245+
android:exported="false"
220246
android:label="Comply Chain App"
221247
android:launchMode="singleTop"
222248
android:parentActivityName=".MoreInfoActivity"
@@ -227,6 +253,7 @@
227253
</activity>
228254
<activity
229255
android:name=".MenuMain"
256+
android:exported="false"
230257
android:label="More Info"
231258
android:launchMode="singleTop"
232259
android:parentActivityName=".MainActivity"
@@ -237,6 +264,7 @@
237264
</activity>
238265
<activity
239266
android:name=".charts.HalfPieChartActivity"
267+
android:exported="false"
240268
android:label="More Info"
241269
android:launchMode="singleTop"
242270
android:parentActivityName=".MainActivity"
@@ -247,6 +275,7 @@
247275
</activity>
248276
<activity
249277
android:name=".charts.PieChartActivity"
278+
android:exported="false"
250279
android:label="More Info"
251280
android:launchMode="singleTop"
252281
android:parentActivityName=".MainActivity"
@@ -257,6 +286,7 @@
257286
</activity>
258287
<activity
259288
android:name=".charts.ChartsListActivity"
289+
android:exported="false"
260290
android:label="Data Visualizations"
261291
android:launchMode="singleTop"
262292
android:parentActivityName=".MainActivity"
@@ -267,6 +297,7 @@
267297
</activity>
268298
<activity
269299
android:name=".charts.DataVisualizationActivity"
300+
android:exported="false"
270301
android:label="Proportional Area Chart"
271302
android:launchMode="singleTop"
272303
android:parentActivityName=".MainActivity"
@@ -277,6 +308,7 @@
277308
</activity>
278309
<activity
279310
android:name=".charts.GoodsBySectorChartActivityNew"
311+
android:exported="false"
280312
android:label="Data Visualizations"
281313
android:launchMode="singleTop"
282314
android:parentActivityName=".MainActivity"
@@ -287,6 +319,7 @@
287319
</activity>
288320
<activity
289321
android:name=".charts.AssessmentLevelsChart"
322+
android:exported="false"
290323
android:label="Data Visualizations"
291324
android:launchMode="singleTop"
292325
android:parentActivityName=".MainActivity"

‎app/src/main/res/xml/global_tracker.xml‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
3+
4+
</PreferenceScreen>

0 commit comments

Comments
 (0)