shihaam/GitNex
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'remotes/main/master' into self-signed

Browse Source 
# Conflicts:
#	app/build.gradle
#	app/src/main/AndroidManifest.xml
#	app/src/main/res/values/strings.xml
This commit is contained in:
anonTree1417
2020-03-31 20:20:18 +02:00
parent d2190ad189 39ad052ad5
commit 5ee872dc6e
92 changed files with 1220 additions and 125 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
app/build.gradle
View File

@@ -33,14 +33,15 @@ configurations {
dependencies {
def lifecycle_version = "2.2.0"
final def markwon_version = '4.2.1'
def markwon_version = "4.2.1"
def fastadapter = "3.3.1"
implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation "androidx.appcompat:appcompat:1.1.0"
implementation "com.google.android.material:material:1.2.0-alpha05"
implementation "androidx.constraintlayout:constraintlayout:1.1.3"
implementation "androidx.legacy:legacy-support-v4:1.0.0"
testImplementation 'junit:junit:4.13'
testImplementation "junit:junit:4.13"
androidTestImplementation "androidx.test:runner:1.2.0"
androidTestImplementation "androidx.test.espresso:espresso-core:3.2.0"
implementation "com.github.vihtarb:tooltip:0.2.0"
@@ -79,5 +80,9 @@ dependencies {
implementation "com.github.chrisbanes:PhotoView:2.3.0"
implementation "com.pddstudio:highlightjs-android:1.5.0"
implementation "com.github.barteksc:android-pdf-viewer:3.2.0-beta.1"
//noinspection GradleDependency
implementation "com.mikepenz:fastadapter:$fastadapter"
implementation "com.mikepenz:fastadapter-commons:$fastadapter"
implementation "com.mikepenz:fastadapter-extensions:$fastadapter"
implementation 'org.conscrypt:conscrypt-android:2.2.1'
}