Skip to content

Commit

Permalink
Merge pull request #125 from Zolon-DOL/master
Browse files Browse the repository at this point in the history 
2023 changes: Android upgrade
  • Loading branch information
@pbhatt17
pbhatt17 authored Apr 11, 2023
2 parents 230c37c + 08d80ec commit 4bef7c9
Show file tree
Hide file tree
Showing 3 changed files with 56 additions and 15 deletions.
30 changes: 17 additions & 13 deletions app/build.gradle
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
apply plugin: 'com.android.application'
apply plugin: 'com.google.gms.google-services'

android {
compileSdkVersion 30
compileSdkVersion 33
// buildToolsVersion "26.0.1"
buildToolsVersion "30.0.2"
// new line added fro error Execution failed for task ':app:lint'.
Expand All @@ -12,33 +11,38 @@ android {
defaultConfig {
applicationId "gov.dol.childlabor"
minSdkVersion 16
targetSdkVersion 30
targetSdkVersion 33
versionCode 7
versionName "1.9"
ndk.abiFilters 'armeabi-v7a','arm64-v8a'
multiDexEnabled true
}
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}

}
productFlavors {
}
}

dependencies {
implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
compile fileTree(include: ['*.jar'], dir: 'libs')
testCompile 'junit:junit:4.12'
implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
//implementation 'androidx.constraintlayout:constraintlayout:2.1.3'
implementation fileTree(include: ['*.jar'], dir: 'libs')
testImplementation 'junit:junit:4.13.2'
// compile 'com.android.support:appcompat-v7:26.1.0'
// compile 'com.android.support:design:26.1.0'
compile 'androidx.appcompat:appcompat:1.0.0'
compile 'com.google.android.material:material:1.0.0'
compile 'com.joanzapata.pdfview:android-pdfview:1.0.4@aar'
compile 'se.emilsjolander:stickylistheaders:2.7.0'
compile 'com.google.android.gms:play-services-analytics:8.1.0'
compile 'io.karim:materialtabs:2.0.2'
compile project(':MPChartLib')
implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'com.google.android.material:material:1.6.0'
implementation 'com.joanzapata.pdfview:android-pdfview:1.0.4@aar'
implementation 'se.emilsjolander:stickylistheaders:2.7.0'

implementation 'io.karim:materialtabs:2.0.2'
implementation project(':MPChartLib')
implementation 'com.google.maps.android:android-maps-utils:2.2.3'
implementation 'com.google.android.gms:play-services-analytics:18.0.2'
implementation 'com.android.support:multidex:1.0.3'
}
37 changes: 35 additions & 2 deletions app/src/main/AndroidManifest.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,23 @@
android:label="@string/app_name"
android:largeHeap="true"
android:supportsRtl="true"
android:enabled="true"
android:theme="@style/AppTheme">
<activity
android:name=".MainActivity"
android:exported="true"
android:excludeFromRecents="true"
android:theme="@style/AppTheme.NoActionBar">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
<action android:name="android.intent.action.MAIN"/>

<category android:name="android.intent.category.LAUNCHER"/>
</intent-filter>
</activity>
<activity
android:name=".TabbedCountryListActivity"
android:exported="false"
android:label="@string/title_activity_tabbed_country_list"
android:parentActivityName=".MainActivity"
android:theme="@style/AppTheme.NoActionBar">
Expand All @@ -35,6 +40,7 @@
</activity>
<activity
android:name=".CountryViewActivity"
android:exported="false"
android:label="@string/title_activity_country_view"
android:launchMode="singleTop"
android:parentActivityName=".TabbedCountryListActivity"
Expand All @@ -45,6 +51,7 @@
</activity>
<activity
android:name=".TabbedGoodListActivity"
android:exported="false"
android:label="@string/title_activity_tabbed_good_list"
android:parentActivityName=".MainActivity"
android:theme="@style/AppTheme.NoActionBar">
Expand All @@ -54,6 +61,7 @@
</activity>
<activity
android:name=".GoodViewActivity"
android:exported="false"
android:label="@string/title_activity_good_view"
android:parentActivityName=".TabbedGoodListActivity"
android:theme="@style/AppTheme.NoActionBar">
Expand All @@ -63,6 +71,7 @@
</activity>
<activity
android:name=".TabbedExploitationTypeListActivity"
android:exported="false"
android:label="@string/title_activity_tabbed_exploitation_type_list"
android:parentActivityName=".MainActivity"
android:theme="@style/AppTheme.NoActionBar">
Expand All @@ -72,6 +81,7 @@
</activity>
<activity
android:name=".AboutActivity"
android:exported="false"
android:label="@string/title_activity_about"
android:parentActivityName=".MoreInfoActivity"
android:theme="@style/AppTheme.NoActionBar">
Expand All @@ -81,6 +91,7 @@
</activity>
<activity
android:name=".MethodologyActivity"
android:exported="false"
android:label="@string/title_activity_methodology"
android:parentActivityName=".MoreInfoActivity"
android:theme="@style/AppTheme.NoActionBar">
Expand All @@ -90,6 +101,7 @@
</activity>
<activity
android:name=".FactsheetActivity"
android:exported="false"
android:label="@string/title_activity_factsheet"
android:parentActivityName=".MoreInfoActivity"
android:theme="@style/AppTheme.NoActionBar">
Expand All @@ -99,6 +111,7 @@
</activity>
<activity
android:name=".SuggestedActionsActivity"
android:exported="false"
android:label="@string/title_activity_suggested_actions"
android:parentActivityName=".CountryViewActivity"
android:theme="@style/AppTheme.NoActionBar">
Expand All @@ -108,6 +121,7 @@
</activity>
<activity
android:name=".activities.IlabProjectsActivity"
android:exported="false"
android:label="@string/title_activity_ilab_projects"
android:parentActivityName=".CountryViewActivity"
android:theme="@style/AppTheme.NoActionBar">
Expand All @@ -117,6 +131,7 @@
</activity>
<activity
android:name=".StatisticsActivity"
android:exported="false"
android:label="@string/title_activity_statistics"
android:parentActivityName=".CountryViewActivity"
android:theme="@style/AppTheme.NoActionBar">
Expand All @@ -126,6 +141,7 @@
</activity>
<activity
android:name=".ConventionActivity"
android:exported="false"
android:label="@string/title_activity_convention"
android:parentActivityName=".CountryViewActivity"
android:theme="@style/AppTheme.NoActionBar">
Expand All @@ -135,6 +151,7 @@
</activity>
<activity
android:name=".LegalStandardActivity"
android:exported="false"
android:label="@string/title_activity_legal_standard"
android:parentActivityName=".CountryViewActivity"
android:theme="@style/AppTheme.NoActionBar">
Expand All @@ -144,6 +161,7 @@
</activity>
<activity
android:name=".FullReportActivity"
android:exported="false"
android:label="@string/title_activity_full_report"
android:parentActivityName=".CountryViewActivity"
android:theme="@style/AppTheme.NoActionBar">
Expand All @@ -153,6 +171,7 @@
</activity>
<activity
android:name=".ExploitationTypeListSpinnerActivity"
android:exported="false"
android:label="@string/title_activity_exploitation_type_list_spinner"
android:parentActivityName=".MainActivity"
android:theme="@style/AppTheme.NoActionBar">
Expand All @@ -162,6 +181,7 @@
</activity>
<activity
android:name=".TabbedGoodListSpinnerActivity"
android:exported="false"
android:label="@string/title_activity_tabbed_good_list_spinner"
android:parentActivityName=".MainActivity"
android:theme="@style/AppTheme.NoActionBar">
Expand All @@ -171,6 +191,7 @@
</activity>
<activity
android:name=".TabbedCountryListSpinnerActivity"
android:exported="false"
android:label="@string/title_activity_tabbed_country_list_spinner"
android:parentActivityName=".MainActivity"
android:theme="@style/AppTheme.NoActionBar">
Expand All @@ -180,6 +201,7 @@
</activity>
<activity
android:name=".MechanismActivity"
android:exported="false"
android:label="@string/title_activity_mechanism"
android:parentActivityName=".CountryViewActivity"
android:theme="@style/AppTheme.NoActionBar">
Expand All @@ -189,6 +211,7 @@
</activity>
<activity
android:name=".BetaLegalStandardActivity"
android:exported="false"
android:label="@string/title_activity_beta_legal_standard"
android:parentActivityName=".CountryViewActivity"
android:theme="@style/AppTheme.NoActionBar">
Expand All @@ -198,6 +221,7 @@
</activity>
<activity
android:name=".TabbedEnforcementActivity"
android:exported="false"
android:label="@string/title_activity_tabbed_enforcement"
android:parentActivityName=".CountryViewActivity"
android:theme="@style/AppTheme.NoActionBar">
Expand All @@ -207,6 +231,7 @@
</activity>
<activity
android:name=".MoreInfoActivity"
android:exported="false"
android:label="@string/title_activity_more_info"
android:launchMode="singleTop"
android:parentActivityName=".MainActivity"
Expand All @@ -217,6 +242,7 @@
</activity>
<activity
android:name=".ToolKitActivity"
android:exported="false"
android:label="Comply Chain App"
android:launchMode="singleTop"
android:parentActivityName=".MoreInfoActivity"
Expand All @@ -227,6 +253,7 @@
</activity>
<activity
android:name=".MenuMain"
android:exported="false"
android:label="More Info"
android:launchMode="singleTop"
android:parentActivityName=".MainActivity"
Expand All @@ -237,6 +264,7 @@
</activity>
<activity
android:name=".charts.HalfPieChartActivity"
android:exported="false"
android:label="More Info"
android:launchMode="singleTop"
android:parentActivityName=".MainActivity"
Expand All @@ -247,6 +275,7 @@
</activity>
<activity
android:name=".charts.PieChartActivity"
android:exported="false"
android:label="More Info"
android:launchMode="singleTop"
android:parentActivityName=".MainActivity"
Expand All @@ -257,6 +286,7 @@
</activity>
<activity
android:name=".charts.ChartsListActivity"
android:exported="false"
android:label="Data Visualizations"
android:launchMode="singleTop"
android:parentActivityName=".MainActivity"
Expand All @@ -267,6 +297,7 @@
</activity>
<activity
android:name=".charts.DataVisualizationActivity"
android:exported="false"
android:label="Proportional Area Chart"
android:launchMode="singleTop"
android:parentActivityName=".MainActivity"
Expand All @@ -277,6 +308,7 @@
</activity>
<activity
android:name=".charts.GoodsBySectorChartActivityNew"
android:exported="false"
android:label="Data Visualizations"
android:launchMode="singleTop"
android:parentActivityName=".MainActivity"
Expand All @@ -287,6 +319,7 @@
</activity>
<activity
android:name=".charts.AssessmentLevelsChart"
android:exported="false"
android:label="Data Visualizations"
android:launchMode="singleTop"
android:parentActivityName=".MainActivity"
Expand Down
4 changes: 4 additions & 0 deletions app/src/main/res/xml/global_tracker.xml
View file
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
<?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">

</PreferenceScreen>

0 comments on commit 4bef7c9

Please sign in to comment.