Merge branch 'master' into 2402-rethink-course-details-layout

open-learning-exchange · Oct 5, 2023 · 54d1f04 · 54d1f04
2 parents 9b2339d + 108f7a4
commit 54d1f04
Show file tree

Hide file tree

Showing 110 changed files with 2,742 additions and 1,888 deletions.
diff --git a/.github/dependabot.yml b/.github/dependabot.yml
@@ -8,8 +8,9 @@ updates:
   - package-ecosystem: "github-actions"
     directory: "/"
     schedule:
-      interval: "weekly"
+      interval: "daily"
   - package-ecosystem: "gradle"
     directory: "/"
     schedule:
-      interval: "weekly"
+      interval: "daily"
+    open-pull-requests-limit: 13
diff --git a/.github/workflows/android-build.yml b/.github/workflows/android-build.yml
@@ -16,7 +16,7 @@ jobs:
       BUILD_TOOLS_VERSION: "30.0.2"
 
     steps:
-      - uses: actions/checkout@v3
+      - uses: actions/checkout@v4
       - name: setup JDK 17
         uses: actions/setup-java@v3
         with:

diff --git a/.github/workflows/android-release.yml b/.github/workflows/android-release.yml
@@ -17,7 +17,7 @@ jobs:
 
     steps:
       - name: checkout repository code
-        uses: actions/checkout@v3
+        uses: actions/checkout@v4
 
       - name: set more env
         run: echo "BRANCHNAME="${GITHUB_REF##*/} >> $GITHUB_ENV
@@ -45,8 +45,8 @@ jobs:
           ./gradlew assembleRelease bundleRelease
           ls -alR app/build/outputs
           mkdir -p sign
-          cp app/build/outputs/bundle/release/app-release.aab sign/myPlanet.aab
-          cp app/build/outputs/apk/release/myPlanet-build.apk sign/myPlanet.apk
+          cp app/build/outputs/bundle/release/app-release.aab sign/.
+          cp app/build/outputs/apk/release/app-release-unsigned.apk sign/.
 
       - name: sign release APK and AAB
         uses: dogi/[email protected]
@@ -57,20 +57,18 @@ jobs:
           keyStorePassword: ${{ secrets.KEY_STORE_PASSWORD }}
           keyPassword: ${{ secrets.KEY_PASSWORD }}
 
-      - name: copy builds to directory and generate sha256
+      - name: copy builds to output and generate sha256
         run: |
           mkdir -p output
-          cd output
-          cp ../sign/myPlanet.* .
-          cp ../app/build/outputs/apk/release/myPlanet-build.apk .
-          sha256sum myPlanet.apk > myPlanet.apk.sha256
-          sha256sum myPlanet.aab > myPlanet.aab.sha256
-          cd -
+          cp sign/app-release-unsigned-signed.apk output/myPlanet.apk
+          cp sign/app-release.aab output/myPlanet.aab
+          sha256sum output/myPlanet.apk > output/myPlanet.apk.sha256
+          sha256sum output/myPlanet.aab > output/myPlanet.aab.sha256
           ls -alR output
 
-      - name: publish to playstore
+      - name: publish AAB to playstore
         if: github.ref == 'refs/heads/master'
-        uses: r0adkll/[email protected].1
+        uses: r0adkll/[email protected].2
         with:
           serviceAccountJsonPlainText: ${{ secrets.SERVICE_ACCOUNT_JSON }}
           packageName: org.ole.planet.myplanet
@@ -79,7 +77,7 @@ jobs:
           releaseName: "${{ env.ANDROID_VERSION_CODE }} (${{ env.ANDROID_VERSION_NAME }})"
           status: completed
 
-      - name: rename APK/AAB with version and branch for artifact
+      - name: rename APK and AAB with version and branch for artifact
         if: github.ref != 'refs/heads/master'
         run: |
           mv output/myPlanet.apk output/myPlanet-${{ env.ANDROID_VERSION_NAME }}-${{ env.BRANCHNAME }}.apk
@@ -88,15 +86,15 @@ jobs:
           mv output/myPlanet.aab.sha256 output/myPlanet-${{ env.ANDROID_VERSION_NAME }}-${{ env.BRANCHNAME }}.aab.sha256
           ls -alR output
 
-      - name: upload APK/AAB as build artifact
+      - name: upload APK and AAB as build artifact
         if: github.ref != 'refs/heads/master'
         uses: actions/upload-artifact@v3
         with:
           name: myPlanet-${{ env.ANDROID_VERSION_NAME }}-${{ env.BRANCHNAME }}
           path: output/*
           retention-days: 9
 
-      - name: release signed APK and AAB on GitHub
+      - name: release APK and AAB on GitHub
         if: github.ref == 'refs/heads/master'
         uses: svenstaro/upload-release-action@v2
         with:

diff --git a/.gitignore b/.gitignore
@@ -48,3 +48,6 @@ assets
 
 # Android Studio captures folder
 captures
+
+# version.xml out of build.gradle
+app/src/main/res/values/versions.xml
diff --git a/app/build.gradle b/app/build.gradle
@@ -5,25 +5,20 @@ apply plugin: 'kotlin-android-extensions'
 apply plugin: 'dagger.hilt.android.plugin'
 apply plugin: 'realm-android'
 android {
-    compileSdkVersion 33
+    compileSdkVersion 34
     defaultConfig {
         applicationId "org.ole.planet.myplanet"
-        minSdkVersion 19
-        targetSdkVersion 33
+        minSdkVersion 21
+        targetSdkVersion 34
         versionCode 1082
         versionName "0.10.82"
         ndkVersion '21.3.6528147'
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
         multiDexEnabled true
-        applicationVariants.all { variant ->
-            variant.outputs.all { output ->
-                outputFileName = new File("myPlanet-build.apk")
-            }
-        }
     }
     configurations.all {
-        resolutionStrategy.force 'com.google.android.material:material:1.0.0'
+        resolutionStrategy.force 'com.google.android.material:material:1.9.0'
     }
     buildTypes {
         release {
@@ -35,40 +30,54 @@ android {
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
-
     packagingOptions {
-        exclude 'META-INF/DEPENDENCIES'
-        exclude 'META-INF/LICENSE'
-        exclude 'META-INF/LICENSE.txt'
-        exclude 'META-INF/license.txt'
-        exclude 'META-INF/NOTICE'
-        exclude 'META-INF/NOTICE.txt'
-        exclude 'META-INF/notice.txt'
-        exclude 'META-INF/ASL2.0'
+        resources {
+            excludes += [
+                'META-INF/DEPENDENCIES',
+                'META-INF/LICENSE',
+                'META-INF/LICENSE.txt',
+                'META-INF/license.txt',
+                'META-INF/NOTICE',
+                'META-INF/NOTICE.txt',
+                'META-INF/notice.txt',
+                'META-INF/ASL2.0'
+            ]
+        }
     }
 
-    lintOptions {
-        abortOnError false
-    }
     compileOptions {
         targetCompatibility JavaVersion.VERSION_11
         sourceCompatibility JavaVersion.VERSION_11
     }
 
-    namespace 'org.ole.planet.myplanet'
-    lint {
+    lintOptions {
         abortOnError false
     }
+
+    namespace 'org.ole.planet.myplanet'
 
     buildFeatures {
         viewBinding = true
     }
 }
 
+task generateVersionsXml {
+    def versionName = android.defaultConfig.versionName
+    doLast {
+        def versionsXmlFile = file('src/main/res/values/versions.xml')
+        versionsXmlFile.text = """<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="app_version">$versionName</string>
+</resources>"""
+    }
+}
+preBuild.dependsOn generateVersionsXml
+
 repositories {
     mavenCentral()
     jcenter()
     maven { url "https://jitpack.io" }
+    maven { url "https://oss.sonatype.org/content/repositories/snapshots" }
 }
 
 dependencies {
@@ -77,14 +86,13 @@ dependencies {
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'androidx.multidex:multidex:2.0.1'
     implementation 'com.afollestad.material-dialogs:commons:0.9.6.0'
-    implementation 'com.google.code.gson:gson:2.10'
-    implementation 'org.codehaus.jackson:jackson-mapper-asl:1.5.0'
+    implementation 'com.google.code.gson:gson:2.10.1'
     implementation('com.mikepenz:materialdrawer:6.1.1@aar') {
         transitive = true
     }
     implementation 'androidx.appcompat:appcompat:1.6.1'
-    implementation 'androidx.recyclerview:recyclerview:1.3.0'
-    implementation 'androidx.annotation:annotation:1.6.0'
+    implementation 'androidx.recyclerview:recyclerview:1.3.1'
+    implementation 'androidx.annotation:annotation:1.7.0'
     implementation 'com.google.android.material:material:1.9.0'
     implementation 'androidx.exifinterface:exifinterface:1.3.6'
     implementation 'com.mikepenz:google-material-typeface:3.0.1.1.original@aar'
@@ -96,41 +104,38 @@ dependencies {
     implementation 'com.github.jeancsanchez:jcplayer:2.7.2'
 
     implementation "com.google.dagger:hilt-android:2.44"
-    kapt "com.google.dagger:hilt-android-compiler:2.44"
+    kapt "com.google.dagger:hilt-android-compiler:2.48.1"
 
     implementation 'com.mikepenz:crossfader:1.5.1@aar'
     implementation 'com.mikepenz:crossfadedrawerlayout:1.0.1@aar'
     implementation 'com.github.barteksc:android-pdf-viewer:3.2.0-beta.1'
-    implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.12'
+    implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.28'
     implementation 'com.google.android:flexbox:1.0.0'
-    implementation 'com.squareup.picasso:picasso:2.71828'
-    implementation 'com.firebase:firebase-jobdispatcher:0.8.5'
+    implementation 'com.firebase:firebase-jobdispatcher:0.8.6'
     implementation 'androidx.cardview:cardview:1.0.0'
     implementation 'com.squareup.retrofit2:retrofit:2.9.0'
     implementation 'com.squareup.retrofit2:converter-gson:2.9.0'
-    implementation 'de.rtner:PBKDF2:1.1.2'
+    implementation 'de.rtner:PBKDF2:1.1.4'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     testImplementation 'junit:junit:4.13.2'
-    implementation 'com.github.bumptech.glide:glide:4.13.0'
-    kapt 'com.github.bumptech.glide:compiler:4.13.0'
-    implementation 'com.github.tiagohm.MarkdownView:library:0.19.0'
-    implementation 'com.github.tiagohm.MarkdownView:emoji:0.19.0'
-    implementation 'com.opencsv:opencsv:3.9'
+    implementation 'com.github.bumptech.glide:glide:4.16.0'
+    kapt 'com.github.bumptech.glide:compiler:4.16.0'
+    implementation 'com.opencsv:opencsv:5.8'
     implementation 'com.google.android.exoplayer:exoplayer:2.7.2'
     implementation 'de.hdodenhof:circleimageview:3.1.0'
-    implementation 'org.osmdroid:osmdroid-android:6.1.0'
+    implementation 'org.osmdroid:osmdroid-android:6.1.17'
     implementation 'com.github.clans:fab:1.6.4'
     implementation 'com.borax12.materialdaterangepicker:library:2.0'
-    implementation 'com.nex3z:toggle-button-group:1.1.9'
+    implementation 'com.nex3z:toggle-button-group:1.2.3'
     implementation 'com.sa90.materialarcmenu:library:2.0.0'
     implementation project(':library')
     implementation 'org.jetbrains:annotations:24.0.1'
-    implementation 'com.github.kizitonwose:CalendarView:0.3.1'
+    implementation 'com.github.kizitonwose:CalendarView:1.1.0'
     implementation "io.noties.markwon:editor:4.6.2"
-    implementation "androidx.core:core-ktx:1.10.1"
+    implementation "androidx.core:core-ktx:1.12.0"
     implementation "com.github.VaibhavLakhera:Circular-Progress-View:0.1.2"
     implementation 'com.github.PhilJay:MPAndroidChart:v3.1.0'
-    implementation 'com.applandeo:material-calendar-view:1.4.0'
+    implementation 'com.applandeo:material-calendar-view:1.7.0'
     implementation "androidx.work:work-runtime:2.8.1"
     implementation(platform("org.jetbrains.kotlin:kotlin-bom:1.8.0"))
 }

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    package="org.ole.planet.myplanet">
+    xmlns:tools="http://schemas.android.com/tools">
 
     <uses-feature
         android:name="android.hardware.camera"
@@ -55,12 +54,6 @@
             android:name=".ui.news.NewsDetailActivity"
             android:label="@string/title_activity_news_detail"
             android:theme="@style/MyMaterialTheme.NoActionBar" />
-        <activity
-            android:name=".ui.dashboard.AboutActivity"
-            android:theme="@style/AppTheme" />
-        <activity
-            android:name=".ui.dashboard.DisclaimerActivity"
-            android:theme="@style/AppTheme" />
         <activity
             android:name=".ui.myhealth.AddMyHealthActivity"
             android:theme="@style/AppTheme" />

diff --git a/app/src/main/java/org/ole/planet/myplanet/MainApplication.java b/app/src/main/java/org/ole/planet/myplanet/MainApplication.java
@@ -19,7 +19,6 @@
 import com.firebase.jobdispatcher.Lifetime;
 import com.firebase.jobdispatcher.RetryStrategy;
 import com.firebase.jobdispatcher.Trigger;
-import com.jakewharton.threetenabp.AndroidThreeTen;
 
 import org.ole.planet.myplanet.callback.TeamPageListener;
 import org.ole.planet.myplanet.datamanager.DatabaseService;
@@ -65,7 +64,6 @@ public void onCreate() {
         StrictMode.VmPolicy.Builder builder = new StrictMode.VmPolicy.Builder();
         StrictMode.setVmPolicy(builder.build());
         builder.detectFileUriExposure();
-        AndroidThreeTen.init(this);
 
         // Set up auto-sync using WorkManager
         if (preferences.getBoolean("autoSync", false) && preferences.contains("autoSyncInterval")) {

diff --git a/app/src/main/java/org/ole/planet/myplanet/base/BaseAdapterWithTag.java b/app/src/main/java/org/ole/planet/myplanet/base/BaseAdapterWithTag.java