Update Dependencies

Remove external Crash Logging Framework Update MaterialColors
newhinton · Dec 7, 2022 · 82c39f3 · 82c39f3
1 parent 50ba051
commit 82c39f3
Show file tree

Hide file tree

Showing 13 changed files with 128 additions and 141 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -9,12 +9,12 @@ android {
             keyAlias 'github_x0b'
         }
     }
-    compileSdkVersion 32
+    compileSdkVersion 33
     ndkVersion '25.0.8775105'
     defaultConfig {
         applicationId 'de.felixnuesse.extract'
         minSdkVersion 21
-        targetSdkVersion 32
+        targetSdkVersion 33
         versionCode 200 // last digit is reserved for ABI, only ever end on 0!
         versionName '2.0.6-dev'
         resConfigs "en", "de" // restrict to used languages
@@ -79,8 +79,8 @@ android {
         }
     }
     compileOptions {
-        sourceCompatibility JavaVersion.VERSION_1_8
-        targetCompatibility JavaVersion.VERSION_1_8
+        sourceCompatibility JavaVersion.VERSION_11
+        targetCompatibility JavaVersion.VERSION_11
     }
     kotlinOptions {
         jvmTarget = '1.8'
@@ -100,48 +100,46 @@ repositories {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlinVersion"
-    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.appcompat:appcompat:1.7.0-alpha01'
     implementation 'androidx.vectordrawable:vectordrawable:1.1.0'
     implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'androidx.core:core:1.3.2'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
-    implementation 'androidx.browser:browser:1.3.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.1.4'
+    implementation 'androidx.browser:browser:1.4.0'
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    implementation 'androidx.recyclerview:recyclerview:1.2.0'
-    implementation 'androidx.preference:preference:1.1.1'
-    implementation 'com.google.android.material:material:1.3.0'
+    implementation 'androidx.recyclerview:recyclerview:1.2.1'
     implementation 'com.github.leinardi:FloatingActionButtonSpeedDial:3.1.1'
     implementation 'org.markdownj:markdownj-core:0.4'
     implementation 'jp.wasabeef:recyclerview-animators:4.0.2'
     implementation 'com.github.GrenderG:Toasty:1.3.0'
-    // Appcenter (sourced from own sdk fork to ensure control)
-    def appCenterSdkVersion = '4.1.1'
-    implementation "com.github.x0b.appcenter-sdk-android:appcenter-analytics:${appCenterSdkVersion}"
-    implementation "com.github.x0b.appcenter-sdk-android:appcenter-crashes:${appCenterSdkVersion}"
+
+    implementation 'androidx.appcompat:appcompat:1.7.0-alpha01'
+    implementation 'com.google.android.material:material:1.7.0'
+    implementation 'androidx.preference:preference:1.2.0'
+
+
     // Thumbnails
-    implementation 'com.github.bumptech.glide:glide:4.12.0'
-    annotationProcessor 'com.github.bumptech.glide:compiler:4.12.0'
+    implementation 'com.github.bumptech.glide:glide:4.14.2'
+    annotationProcessor 'com.github.bumptech.glide:compiler:4.14.2'
     // REST Client
     implementation 'com.squareup.okhttp3:okhttp:4.9.1'
     debugImplementation 'com.squareup.okhttp3:logging-interceptor:4.9.1'
     // JSON
-    implementation 'com.fasterxml.jackson.core:jackson-core:2.12.3'
-    implementation 'com.fasterxml.jackson.core:jackson-annotations:2.12.3'
-    implementation 'com.fasterxml.jackson.core:jackson-databind:2.12.3'
+    implementation 'com.fasterxml.jackson.core:jackson-core:2.14.1'
+    implementation 'com.fasterxml.jackson.core:jackson-annotations:2.14.1'
+    implementation 'com.fasterxml.jackson.core:jackson-databind:2.14.1'
     // Timestmps
     implementation 'com.github.x0b:rfc3339parser:2.0.0'
     // SAF/WebDAV
     implementation project(':safdav')
     implementation 'org.nanohttpd:nanohttpd:2.3.1'
     // Java 8+ library support
     // TODO: replace with coreLibraryDesugar once available
-    implementation 'net.sourceforge.streamsupport:android-retrostreams:1.7.3'
-    implementation 'net.sourceforge.streamsupport:android-retrofuture:1.7.3'
+    implementation 'net.sourceforge.streamsupport:android-retrostreams:1.7.4'
+    implementation 'net.sourceforge.streamsupport:android-retrofuture:1.7.4'
     // App intro
     implementation 'com.github.AppIntro:AppIntro:6.1.0'
     // TEST
-    testImplementation 'junit:junit:4.13.1'
-    androidTestImplementation 'androidx.test:runner:1.3.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+    testImplementation 'junit:junit:4.13.2'
+    androidTestImplementation 'androidx.test:runner:1.5.1'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.5.0'
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -29,11 +29,10 @@
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
         android:theme="@style/AppTheme"
-        tools:ignore="GoogleAppIndexingWarning"
-        tools:targetApi="29">
-        <activity
-            android:name=".Activities.OnboardingActivity"
-            android:theme="@style/OnboardingTheme"></activity>
+        tools:ignore="GoogleAppIndexingWarning,MissingTvBanner"
+        tools:targetApi="33">
+        <activity android:name=".Activities.OnboardingActivity"
+            android:theme="@style/OnboardingTheme" />
         <activity
             android:name=".Activities.MainActivity"
             android:exported="true"

diff --git a/app/src/main/java/ca/pkay/rcloneexplorer/Settings/LoggingSettingsFragment.java b/app/src/main/java/ca/pkay/rcloneexplorer/Settings/LoggingSettingsFragment.java
@@ -16,8 +16,6 @@
 import android.widget.TextView;
 import android.widget.Toast;
 
-import com.microsoft.appcenter.AppCenter;
-
 import java.io.BufferedReader;
 import java.io.IOException;
 import java.io.InputStreamReader;
@@ -100,17 +98,7 @@ private void setDefaultStates() {
         useLogsSwitch.setChecked(useLogs);
         crashReportsSwitch.setChecked(crashReports);
         if (crashReports) {
-            AppCenter.getInstallId().thenAccept(uuid -> {
-                if (null == crashReportSummary || null == getContext()) {
-                    return;
-                }
-                if (null == uuid) {
-                    crashReportSummary.setText(getString(R.string.pref_crash_report_summary, getString(R.string.restart_required)));
-                } else {
-                    String userId = uuid.toString();
-                    crashReportSummary.setText(getString(R.string.pref_crash_report_summary, userId));
-                }
-            });
+
         } else {
             crashReportSummary.setText(getString(R.string.pref_crash_report_summary, "N/A"));
         }

diff --git a/app/src/main/res/drawable/nav_header_background_rounded.xml b/app/src/main/res/drawable/nav_header_background_rounded.xml
@@ -2,9 +2,10 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape android:shape="rectangle">
-            <solid android:color="@color/colorPrimary" />
+            <solid android:color="@color/seed" />
             <corners
                 android:bottomRightRadius="52dp"
+                android:topRightRadius="52dp"
                 />
         </shape>
     </item>

diff --git a/app/src/main/res/drawable/nav_item_textcolor_state.xml b/app/src/main/res/drawable/nav_item_textcolor_state.xml
@@ -1,11 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto">
     <item
-        android:color="@color/white"
+        android:color="@android:color/white"
         android:state_checked="true"
         />
     <item
-        android:color="@color/textColorSecondary"
+        android:color="@color/md_theme_light_onSecondary"
         android:state_checked="false"
         />
 </selector>
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
@@ -1,28 +1,80 @@
-<?xml version="1.0" encoding="utf-8"?>
+
 <resources>
-    <color name="colorPrimary">#4CAF50</color>
-    <color name="colorPrimaryDark">#388E3C</color>
-    <color name="colorPrimaryLight">#C8E6C9</color>
-    <color name="colorAccent">#FF9800</color>
+    <color name="seed">#4CAF50</color>
+    <color name="md_theme_light_primary">#006E1C</color>
+    <color name="md_theme_light_onPrimary">#FFFFFF</color>
+    <color name="md_theme_light_primaryContainer">#94F990</color>
+    <color name="md_theme_light_onPrimaryContainer">#002204</color>
+    <color name="md_theme_light_secondary">#52634F</color>
+    <color name="md_theme_light_onSecondary">#FFFFFF</color>
+    <color name="md_theme_light_secondaryContainer">#D5E8CF</color>
+    <color name="md_theme_light_onSecondaryContainer">#111F0F</color>
+    <color name="md_theme_light_tertiary">#38656A</color>
+    <color name="md_theme_light_onTertiary">#FFFFFF</color>
+    <color name="md_theme_light_tertiaryContainer">#BCEBF0</color>
+    <color name="md_theme_light_onTertiaryContainer">#002023</color>
+    <color name="md_theme_light_error">#BA1A1A</color>
+    <color name="md_theme_light_errorContainer">#FFDAD6</color>
+    <color name="md_theme_light_onError">#FFFFFF</color>
+    <color name="md_theme_light_onErrorContainer">#410002</color>
+    <color name="md_theme_light_background">#FCFDF6</color>
+    <color name="md_theme_light_onBackground">#1A1C19</color>
+    <color name="md_theme_light_surface">#FCFDF6</color>
+    <color name="md_theme_light_onSurface">#1A1C19</color>
+    <color name="md_theme_light_surfaceVariant">#DEE5D8</color>
+    <color name="md_theme_light_onSurfaceVariant">#424940</color>
+    <color name="md_theme_light_outline">#72796F</color>
+    <color name="md_theme_light_inverseOnSurface">#F0F1EB</color>
+    <color name="md_theme_light_inverseSurface">#2F312D</color>
+    <color name="md_theme_light_inversePrimary">#78DC77</color>
+    <color name="md_theme_light_shadow">#000000</color>
+    <color name="md_theme_light_surfaceTint">#006E1C</color>
+    <color name="md_theme_light_outlineVariant">#C2C9BD</color>
+    <color name="md_theme_light_scrim">#000000</color>
+    <color name="md_theme_dark_primary">#78DC77</color>
+    <color name="md_theme_dark_onPrimary">#00390A</color>
+    <color name="md_theme_dark_primaryContainer">#005313</color>
+    <color name="md_theme_dark_onPrimaryContainer">#94F990</color>
+    <color name="md_theme_dark_secondary">#BACCB3</color>
+    <color name="md_theme_dark_onSecondary">#253423</color>
+    <color name="md_theme_dark_secondaryContainer">#3B4B38</color>
+    <color name="md_theme_dark_onSecondaryContainer">#D5E8CF</color>
+    <color name="md_theme_dark_tertiary">#A0CFD4</color>
+    <color name="md_theme_dark_onTertiary">#00363B</color>
+    <color name="md_theme_dark_tertiaryContainer">#1F4D52</color>
+    <color name="md_theme_dark_onTertiaryContainer">#BCEBF0</color>
+    <color name="md_theme_dark_error">#FFB4AB</color>
+    <color name="md_theme_dark_errorContainer">#93000A</color>
+    <color name="md_theme_dark_onError">#690005</color>
+    <color name="md_theme_dark_onErrorContainer">#FFDAD6</color>
+    <color name="md_theme_dark_background">#1A1C19</color>
+    <color name="md_theme_dark_onBackground">#E2E3DD</color>
+    <color name="md_theme_dark_surface">#1A1C19</color>
+    <color name="md_theme_dark_onSurface">#E2E3DD</color>
+    <color name="md_theme_dark_surfaceVariant">#424940</color>
+    <color name="md_theme_dark_onSurfaceVariant">#C2C9BD</color>
+    <color name="md_theme_dark_outline">#8C9388</color>
+    <color name="md_theme_dark_inverseOnSurface">#1A1C19</color>
+    <color name="md_theme_dark_inverseSurface">#E2E3DD</color>
+    <color name="md_theme_dark_inversePrimary">#006E1C</color>
+    <color name="md_theme_dark_shadow">#000000</color>
+    <color name="md_theme_dark_surfaceTint">#78DC77</color>
+    <color name="md_theme_dark_outlineVariant">#424940</color>
+    <color name="md_theme_dark_scrim">#000000</color>
 
-    <color name="backgroundColor">#FAFAFA</color>
-    <color name="cardColor">#FFFFFF</color>
-    <color name="textColorPrimary">#5E5E5E</color>
-    <color name="textColorSecondary">#717070</color>
-    <color name="textColorTertiary">#A5A5A5</color>
-    <color name="dividerColor">#E4E4E4</color>
-    <color name="iconTint">#4A4A4A</color>
-    <color name="colorControlNormal">#757575</color>
-    <color name="colorControlActivated">?attr/colorAccent</color>
-    <color name="colorControlHighlight">#757575</color>
+    <color name="grey300">@android:color/darker_gray</color>
+    <color name="grey">@android:color/darker_gray</color>
+    <color name="white">@android:color/white</color>
+    <color name="colorPrimary">@color/seed</color>
+    <color name="colorAccent">@color/md_theme_light_secondary</color>
+    <color name="colorPrimaryDark">@color/md_theme_light_tertiary</color>
+    <color name="textColorTertiary">@color/md_theme_light_tertiary</color>
+    <color name="textColorPrimary">@color/md_theme_light_onPrimary</color>
+    <color name="textColorSecondary">@color/md_theme_light_onSecondary</color>
+    <color name="cardColor">@color/md_theme_light_primaryContainer</color>
+    <color name="backgroundColor">@color/md_theme_light_primaryContainer</color>
+    <color name="iconTint">@color/white</color>
+    <color name="dividerColor">@color/grey</color>
+    <color name="fabOverlayColor">@color/grey</color>
 
-    <color name="white">#FFFFFF</color>
-    <color name="grey">#DDDDDD</color>
-    <color name="grey300">#E0E0E0</color>
-    <color name="darkBackground">#303030</color>
-    <color name="fabOverlayColor">#99bdbdbd</color>
-
-    <color name="colorPrimaryText">#212121</color>
-    <color name="colorSecondaryText">#757575</color>
-    <color name="colorDivider">#BDBDBD</color>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -1,13 +1,5 @@
 <resources>
 
-    <!-- Base application theme. -->
-    <style name="AppTheme" parent="Theme.AppCompat.DayNight.DarkActionBar">
-        <!-- Customize your theme here. -->
-        <item name="colorPrimary">@color/colorPrimary</item>
-        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
-        <item name="colorAccent">@color/colorAccent</item>
-    </style>
-
     <style name="AppTheme.NoActionBar" parent="Theme.AppCompat.DayNight.NoActionBar">
         <item name="windowActionBar">false</item>
         <item name="windowNoTitle">true</item>

diff --git a/app/src/oss/java/ca/pkay/rcloneexplorer/util/CrashLogger.java b/app/src/oss/java/ca/pkay/rcloneexplorer/util/CrashLogger.java
@@ -8,11 +8,6 @@
 import androidx.annotation.NonNull;
 import ca.pkay.rcloneexplorer.BuildConfig;
 
-import com.microsoft.appcenter.AppCenter;
-import com.microsoft.appcenter.analytics.Analytics;
-import com.microsoft.appcenter.crashes.Crashes;
-import com.microsoft.appcenter.crashes.ingestion.models.ErrorAttachmentLog;
-
 import java.io.IOException;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -47,28 +42,22 @@ private static long l (String s) {
     public static void initCrashLogging(@NonNull Context context) {
         Context appCtx = context.getApplicationContext();
         if (appCtx instanceof Application) {
-            AppCenter.start((Application) appCtx, generateReportId(s),
-                    Analytics.class, Crashes.class);
             nativeLibraryDir = appCtx.getApplicationInfo().nativeLibraryDir;
         }
     }
 
     public static void logNonFatal(@NonNull String tag, @NonNull String message, @NonNull Throwable e) {
         HashMap<String, String> properties = new HashMap<>();
-        ArrayList<ErrorAttachmentLog> attachments = new ArrayList<>();
         properties.put("tag", tag);
         if (message.length() >= PROP_PACK_LENGTH) {
             properties.put("message", "see attachment message.txt");
-            ErrorAttachmentLog attachmentLog = ErrorAttachmentLog.attachmentWithText(message, "message.txt");
-            attachments.add(attachmentLog);
         } else {
             properties.put("message", message);
         }
         // only attach HW ABI stats for ABI errors
         if (e instanceof IOException && e.getMessage() != null && e.getMessage().contains("librclone.so")) {
             attachHwStats(properties);
         }
-        Crashes.trackError(e, properties, attachments);
     }
 
     // Occasionally, bug reports from devices with really weird device

diff --git a/build.gradle b/build.gradle
@@ -2,21 +2,25 @@
 
 buildscript {
 
-    ext.kotlinVersion = '1.3.72'
+    ext.kotlinVersion = '1.7.20'
     repositories {
         google()
         mavenCentral()
         maven { url 'https://jitpack.io' }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:4.2.1'
-        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.7.0"
+        classpath 'com.android.tools.build:gradle:7.2.2'
+        classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlinVersion"
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
     }
 }
 
+ext {
+    targetCompatibility = JavaVersion.VERSION_11
+}
+
 allprojects {
     repositories {
         google()

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,7 +1,6 @@
+#Wed Dec 07 18:53:50 CET 2022
 distributionBase=GRADLE_USER_HOME
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.6-bin.zip
 distributionPath=wrapper/dists
-zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip
-# Warning: Update checksum when updating gradle, or Android Studio will crash!
-distributionSha256Sum=b586e04868a22fd817c8971330fec37e298f3242eb85c374181b12d637f80302
+zipStoreBase=GRADLE_USER_HOME
diff --git a/rclone/build.gradle b/rclone/build.gradle
@@ -197,9 +197,5 @@ task buildAll {
     dependsOn buildx64
 }
 
-task prepareKotlinBuildScriptModel {
-    // ignore, does not build from kotlin sources
-}
-
 buildAll.mustRunAfter(buildArm, buildArm64, buildx86, buildx64)
 defaultTasks 'buildAll'