Merge branch 'androidx_up' into android_x

Author: rosuH

build.gradle

@@ -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.4.10"
+    ext.kotlin_version="1.4.20"
     repositories {
         google()
         jcenter()

filepicker/build.gradle

@@ -44,9 +44,6 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:${kotlin_version}"
     implementation 'androidx.appcompat:appcompat:1.2.0'
     implementation 'androidx.recyclerview:recyclerview:1.1.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.1'
-    implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0'
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    implementation "androidx.swiperefreshlayout:swiperefreshlayout:1.1.0"
 }

filepicker/src/main/AndroidManifest.xml

@@ -5,6 +5,7 @@
     <application>
         <activity
             android:name=".FilePickerActivity"
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar"
             android:configChanges="orientation|screenSize" />
     </application>
 </manifest>

filepicker/src/main/res/layout/main_activity_for_file_picker.xml

@@ -46,9 +46,9 @@
             android:textAllCaps="false"
             android:textColor="?android:attr/textColorPrimary" />
 
-        <ImageButton
+        <ImageView
             android:id="@+id/btn_go_back_file_picker"
-            style="@android:style/Widget.Holo.Button.Borderless"
+            style="@style/Widget.AppCompat.ActionButton"
             android:layout_width="54dp"
             android:layout_height="48dp"
             android:layout_alignParentStart="true"
@@ -69,6 +69,7 @@
             android:layout_toEndOf="@id/btn_go_back_file_picker"
             android:layout_toRightOf="@id/btn_go_back_file_picker"
             android:maxLines="1"
+            tools:text="1*"
             android:textColor="?android:attr/textColor"
             android:textSize="16sp" />
     </RelativeLayout>
@@ -96,6 +97,7 @@
         android:layout_width="match_parent"
         android:layout_height="48dp"
         android:overScrollMode="never"
+        android:elevation="1dp"
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toBottomOf="@+id/ll_tool_bar_file_picker" />
 </androidx.constraintlayout.widget.ConstraintLayout>

sample/build.gradle

@@ -35,7 +35,7 @@ dependencies {
 //    implementation 'com.squareup.picasso:picasso:2.5.2'
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
     implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.1'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
     testImplementation 'junit:junit:4.12'
     androidTestImplementation 'androidx.test.ext:junit:1.1.1'
     androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0'