diff --git a/app/build.gradle b/app/build.gradle
index 406d87e4..00f4b1c9 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -31,6 +31,9 @@ android {
versionCode applicationVersionCode
versionName applicationVersionName
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+ vectorDrawables {
+ useSupportLibrary true
+ }
}
signingConfigs {
release {
@@ -59,14 +62,25 @@ android {
targetCompatibility JavaVersion.VERSION_1_8
sourceCompatibility JavaVersion.VERSION_1_8
}
+ kotlinOptions {
+ jvmTarget = '1.8'
+ useIR = true
+ }
+ packagingOptions {
+ resources {
+ excludes += '/META-INF/{AL2.0,LGPL2.1}'
+ }
+ }
}
dependencies {
implementation "org.jetbrains:annotations:19.0.0"
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:$kotlin_version"
- api "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.3.2"
- api "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.3.8"
+ api "org.jetbrains.kotlinx:kotlinx-coroutines-android:1.5.2"
+ api "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.5.2"
+
+ implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.3.1'
//Local Files
implementation fileTree(include: ["*.jar"], dir: "libs")
@@ -83,7 +97,7 @@ dependencies {
implementation "androidx.appcompat:appcompat:1.3.1"
implementation "androidx.core:core-ktx:1.6.0"
implementation "androidx.annotation:annotation:1.2.0"
- implementation "androidx.constraintlayout:constraintlayout:2.1.0"
+ implementation "androidx.constraintlayout:constraintlayout:2.1.1"
implementation "androidx.preference:preference-ktx:1.1.1"
implementation "androidx.gridlayout:gridlayout:1.0.0"
implementation "androidx.browser:browser:1.3.0"
@@ -133,7 +147,7 @@ dependencies {
implementation "com.jakewharton:butterknife:10.2.3"
kapt "com.jakewharton:butterknife-compiler:10.2.3"
- implementation ("com.alibaba.android:vlayout:1.2.8@aar") {
+ implementation ("com.alibaba.android:vlayout:1.2.31@aar") {
transitive = true
}
}
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index d441700f..7170f246 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -130,16 +130,15 @@
android:windowSoftInputMode="adjustResize" />
+ android:exported="false"
+ android:process=":oksign" />
-
-
-
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/drawable/splash.xml b/app/src/main/res/drawable/splash.xml
index ed33036a..ac26df20 100644
--- a/app/src/main/res/drawable/splash.xml
+++ b/app/src/main/res/drawable/splash.xml
@@ -4,11 +4,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
-
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_photo_view.xml b/app/src/main/res/layout/activity_photo_view.xml
index de3f3775..85baf842 100644
--- a/app/src/main/res/layout/activity_photo_view.xml
+++ b/app/src/main/res/layout/activity_photo_view.xml
@@ -21,7 +21,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="bottom"
- app:backgroundTint="@color/transparent"
+ android:background="@drawable/bg_photo_view_bottom_bar"
+ app:backgroundTint="@color/black_trans"
app:elevation="0dp"
app:hideOnScroll="true"
app:menu="@menu/menu_photo_view"
diff --git a/build.gradle b/build.gradle
index 83af0d60..d5674a6e 100644
--- a/build.gradle
+++ b/build.gradle
@@ -4,7 +4,7 @@ buildscript {
ext {
glide_version = "4.12.0"
retrofit_version = "2.9.0"
- kotlin_version = '1.5.21'
+ kotlin_version = '1.5.31'
}
repositories {
google()
@@ -12,7 +12,7 @@ buildscript {
maven { url "https://maven.aliyun.com/repository/public" }
}
dependencies {
- classpath 'com.android.tools.build:gradle:7.0.1'
+ classpath 'com.android.tools.build:gradle:7.0.3'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}