From d38b3d96d5a745ba92d76d02fbac069b66399eb1 Mon Sep 17 00:00:00 2001 From: Daniel Kao Date: Thu, 2 Jun 2022 00:50:31 +0800 Subject: [PATCH] ver: upgrade lib version --- app/build.gradle | 7 +++---- .../java/de/baumann/browser/activity/BrowserActivity.kt | 1 + .../view/viewControllers/TouchAreaViewController.kt | 1 + build.gradle | 6 +++--- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 91e0d18d2..0421ac170 100755 --- a/app/build.gradle +++ b/app/build.gradle @@ -75,11 +75,10 @@ dependencies { implementation 'androidx.appcompat:appcompat:1.4.1' implementation 'androidx.constraintlayout:constraintlayout:2.1.4' - def room_version = "2.3.0" - implementation "androidx.room:room-runtime:$room_version" - implementation "androidx.room:room-ktx:$room_version" + implementation "androidx.room:room-runtime:2.4.2" + implementation "androidx.room:room-ktx:2.4.2" kapt 'org.xerial:sqlite-jdbc:3.36.0.2' - kapt "androidx.room:room-compiler:$room_version" + kapt "androidx.room:room-compiler:2.4.2" implementation 'androidx.lifecycle:lifecycle-runtime-ktx:2.4.1' implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.4.1' diff --git a/app/src/main/java/de/baumann/browser/activity/BrowserActivity.kt b/app/src/main/java/de/baumann/browser/activity/BrowserActivity.kt index 1e0240261..dc534f328 100755 --- a/app/src/main/java/de/baumann/browser/activity/BrowserActivity.kt +++ b/app/src/main/java/de/baumann/browser/activity/BrowserActivity.kt @@ -1008,6 +1008,7 @@ open class BrowserActivity : ComponentActivity(), BrowserController, OnClickList addRule(RelativeLayout.ALIGN_BOTTOM, R.id.main_content) } } + FabPosition.NotShow -> {} } ViewUnit.expandViewTouchArea(fabImageButtonNav, 20.dp(this)) diff --git a/app/src/main/java/de/baumann/browser/view/viewControllers/TouchAreaViewController.kt b/app/src/main/java/de/baumann/browser/view/viewControllers/TouchAreaViewController.kt index 005ab645f..e987fe651 100644 --- a/app/src/main/java/de/baumann/browser/view/viewControllers/TouchAreaViewController.kt +++ b/app/src/main/java/de/baumann/browser/view/viewControllers/TouchAreaViewController.kt @@ -121,6 +121,7 @@ class TouchAreaViewController( touchAreaPageDown = rootView.findViewById(R.id.touch_area_right_2) touchAreaDragCustomize = rootView.findViewById(R.id.touch_area_right_drag) } + TouchAreaType.LongLeftRight -> {} } with(touchAreaPageUp) { diff --git a/build.gradle b/build.gradle index ea39009c8..ebdd19481 100755 --- a/build.gradle +++ b/build.gradle @@ -1,14 +1,14 @@ // Top-level build file where you can add configuration options common to all sub-projects/modules. buildscript { - ext.kotlin_version = '1.5.10' + ext.kotlin_version = '1.6.21' repositories { google() gradlePluginPortal() } dependencies { - classpath 'com.android.tools.build:gradle:7.2.0' - classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.31" + classpath 'com.android.tools.build:gradle:7.2.1' + classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.6.21" } }