Pixelfed
/
PixelDroid-App-Android
mirror of https://gitlab.shinice.net/pixeldroid/PixelDroid
1
0
Fork 0
Code Issues Releases Wiki Activity

Update dependencies

This commit is contained in:
Matthieu 2021-10-08 00:30:31 +02:00
parent f3e76fd2a2
commit bfba41c4f8
7 changed files with 1764 additions and 289 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
app/build.gradle
View File

@ -13,8 +13,8 @@ jacoco.toolVersion = "0.8.7"
android {
compileSdkVersion 30
buildToolsVersion '30.0.3'
compileSdkVersion 31
buildToolsVersion '31.0.0'
compileOptions {
coreLibraryDesugaringEnabled true
sourceCompatibility JavaVersion.VERSION_1_8
@ -27,7 +27,7 @@ android {
defaultConfig {
applicationId "org.pixeldroid.app"
minSdkVersion 23
targetSdkVersion 30
targetSdkVersion 31
versionCode 4
versionName "1.0.beta4"
@ -126,18 +126,17 @@ dependencies {
implementation 'androidx.gridlayout:gridlayout:1.0.0'
implementation "androidx.activity:activity-ktx:1.3.1"
implementation 'androidx.fragment:fragment-ktx:1.3.6'
implementation "androidx.work:work-runtime-ktx:2.6.0"
implementation 'androidx.work:work-testing:2.6.0'
implementation 'androidx.work:work-runtime-ktx:2.7.0'
// Use the most recent version of CameraX
def cameraX_version = '1.0.1'
def cameraX_version = '1.0.2'
implementation "androidx.camera:camera-core:${cameraX_version}"
implementation "androidx.camera:camera-camera2:${cameraX_version}"
// CameraX Lifecycle library
implementation "androidx.camera:camera-lifecycle:$cameraX_version"
// CameraX View class
implementation 'androidx.camera:camera-view:1.0.0-alpha28'
implementation 'androidx.camera:camera-view:1.0.0-alpha30'
def room_version = "2.3.0"
implementation "androidx.room:room-runtime:$room_version"
@ -153,11 +152,11 @@ dependencies {
implementation 'com.google.android.material:material:1.4.0'
//Dagger (dependency injection)
implementation 'com.google.dagger:dagger-android:2.38.1'
implementation 'com.google.dagger:dagger-android-support:2.38.1'
implementation 'com.google.dagger:dagger-android:2.39.1'
implementation 'com.google.dagger:dagger-android-support:2.39.1'
// if you use the support libraries
kapt 'com.google.dagger:dagger-android-processor:2.38.1'
kapt 'com.google.dagger:dagger-compiler:2.38.1'
kapt 'com.google.dagger:dagger-android-processor:2.39.1'
kapt 'com.google.dagger:dagger-compiler:2.39.1'
implementation 'com.squareup.okhttp3:okhttp:4.9.1'
implementation 'com.squareup.retrofit2:retrofit:2.9.0'
@ -184,15 +183,15 @@ dependencies {
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'com.mikepenz:materialdrawer:8.4.3'
implementation 'com.mikepenz:materialdrawer:8.4.4'
// Add for NavController support
implementation 'com.mikepenz:materialdrawer-nav:8.4.2'
implementation 'com.mikepenz:materialdrawer-nav:8.4.4'
//iconics
implementation 'com.mikepenz:iconics-core:5.3.1'
implementation 'com.mikepenz:iconics-core:5.3.2'
implementation 'com.mikepenz:materialdrawer-iconics:8.4.2'
implementation 'com.mikepenz:iconics-views:5.3.1'
implementation 'com.mikepenz:google-material-typeface:4.0.0.1-kotlin@aar'
implementation 'com.mikepenz:iconics-views:5.3.2'
implementation 'com.mikepenz:google-material-typeface:4.0.0.2-kotlin@aar'
implementation 'com.karumi:dexter:6.2.3'
@ -205,15 +204,10 @@ dependencies {
* Not in release, so not mentioned in licenses list
*/
// debugImplementation required vs testImplementation: https://issuetracker.google.com/issues/128612536
//noinspection FragmentGradleConfiguration
stagingImplementation('androidx.fragment:fragment-testing:1.3.6') {
exclude group:'androidx.test', module:'monitor'
}
//stagingImplementation 'com.squareup.leakcanary:leakcanary-android:2.7'
testImplementation 'com.github.tomakehurst:wiremock-jre8:2.27.2'
androidTestImplementation 'androidx.work:work-testing:2.7.0'
testImplementation 'com.github.tomakehurst:wiremock-jre8:2.31.0'
testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0"
testImplementation 'junit:junit:4.13.2'
testImplementation "androidx.room:room-testing:$room_version"

6
app/licenses.yml
View File

@ -544,12 +544,6 @@
license: The Apache Software License, Version 2.0
licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
url: https://developer.android.com/topic/libraries/architecture/index.html
- artifact: androidx.work:work-testing:+
name: work-testing
copyrightHolder: Google Inc.
license: The Apache Software License, Version 2.0
licenseUrl: http://www.apache.org/licenses/LICENSE-2.0.txt
url: https://developer.android.com/jetpack/androidx/releases/work#2.6.0
- artifact: androidx.work:work-runtime-ktx:+
name: work-runtime-ktx
copyrightHolder: Google Inc.

4
app/src/androidTest/java/org/pixeldroid/app/CameraTest.kt
View File

@ -1,5 +1,5 @@
package org.pixeldroid.app
/*
import android.Manifest
import android.content.Context
import android.content.Intent
@ -109,4 +109,4 @@ class CameraTest {
assert(!fragment.isHidden)
}
}
}
}*/

17
app/src/main/AndroidManifest.xml
View File

@ -6,7 +6,6 @@
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<uses-permission android:name="android.permission.CAMERA" />
<uses-feature
@ -33,7 +32,8 @@
android:name=".postCreation.PostCreationActivity"
android:screenOrientation="sensorPortrait"
android:theme="@style/AppTheme.NoActionBar"
tools:ignore="LockedOrientationActivity" >
tools:ignore="LockedOrientationActivity"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.SEND" />
<category android:name="android.intent.category.DEFAULT" />
@ -72,7 +72,8 @@
android:screenOrientation="sensorPortrait"
android:theme="@style/AppTheme.Launcher"
android:windowSoftInputMode="adjustPan"
tools:ignore="LockedOrientationActivity">
tools:ignore="LockedOrientationActivity"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
@ -88,7 +89,8 @@
android:screenOrientation="sensorPortrait"
android:theme="@style/AppTheme.NoActionBar"
android:windowSoftInputMode="adjustResize"
tools:ignore="LockedOrientationActivity">
tools:ignore="LockedOrientationActivity"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.VIEW" />
@ -104,12 +106,14 @@
android:name="com.yalantis.ucrop.UCropActivity"
android:screenOrientation="sensorPortrait"
android:theme="@style/AppTheme.NoActionBar"
tools:ignore="LockedOrientationActivity" />
tools:ignore="LockedOrientationActivity"
android:exported="true"/>
<activity
android:name=".searchDiscover.SearchActivity"
android:launchMode="singleTop"
android:screenOrientation="sensorPortrait"
tools:ignore="LockedOrientationActivity">
tools:ignore="LockedOrientationActivity"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.SEARCH" />
</intent-filter>
@ -138,6 +142,7 @@
android:name="android.support.FILE_PROVIDER_PATHS"
android:resource="@xml/file_paths" />
</provider>
</application>
</manifest>

1978
app/src/main/assets/licenses.html generated
View File

File diff suppressed because it is too large Load Diff

6
app/src/main/java/org/pixeldroid/app/utils/api/objects/Status.kt
View File

@ -120,12 +120,12 @@ open class Status(
while (downloading) {
val cursor: Cursor = downloadManager.query(query)
cursor.moveToFirst()
if (cursor.getInt(cursor.getColumnIndex(DownloadManager.COLUMN_STATUS))
if (cursor.getInt(cursor.getColumnIndexOrThrow(DownloadManager.COLUMN_STATUS))
== DownloadManager.STATUS_SUCCESSFUL
) {
downloading = false
}
val status = cursor.getInt(cursor.getColumnIndex(DownloadManager.COLUMN_STATUS))
val status = cursor.getInt(cursor.getColumnIndexOrThrow(DownloadManager.COLUMN_STATUS))
if (!share) {
msg = when (status) {
DownloadManager.STATUS_FAILED ->
@ -145,7 +145,7 @@ open class Status(
val ext = url.substringAfterLast(".", "*")
val path = cursor.getString(
cursor.getColumnIndex(DownloadManager.COLUMN_LOCAL_URI)
cursor.getColumnIndexOrThrow(DownloadManager.COLUMN_LOCAL_URI)
)
val file = path.toUri()

2
build.gradle
View File

@ -1,7 +1,7 @@
// Top-level build file where you can add configuration options common to all sub-projects/modules.
buildscript {
ext.kotlin_version = '1.5.30'
ext.kotlin_version = '1.5.31'
repositories {
google()
mavenCentral()