diff --git a/src/java/JavaFileStorage/app/build.gradle b/src/java/JavaFileStorage/app/build.gradle
index b9a0c720..04d45c93 100644
--- a/src/java/JavaFileStorage/app/build.gradle
+++ b/src/java/JavaFileStorage/app/build.gradle
@@ -6,8 +6,8 @@ android {
defaultConfig {
minSdkVersion 21
- targetSdkVersion 33
- compileSdk 34
+ targetSdkVersion 35
+ compileSdk 35
}
buildTypes {
release {
diff --git a/src/java/JavaFileStorage/gradle.properties b/src/java/JavaFileStorage/gradle.properties
index 5e2afb41..0ba7acf7 100644
--- a/src/java/JavaFileStorage/gradle.properties
+++ b/src/java/JavaFileStorage/gradle.properties
@@ -1,2 +1,3 @@
org.gradle.jvmargs=-Xmx1536m
android.useAndroidX=true
+android.jetifier.ignorelist = jsch-2.27.2.jar
\ No newline at end of file
diff --git a/src/java/JavaFileStorageTest-AS/app/build.gradle b/src/java/JavaFileStorageTest-AS/app/build.gradle
index 5df7e157..68d9e4fc 100644
--- a/src/java/JavaFileStorageTest-AS/app/build.gradle
+++ b/src/java/JavaFileStorageTest-AS/app/build.gradle
@@ -3,12 +3,12 @@ apply plugin: 'com.android.application'
android {
namespace "com.crocoapps.javafilestoragetest2"
- compileSdkVersion 33
+ compileSdkVersion 35
defaultConfig {
applicationId "com.crocoapps.javafilestoragetest2"
minSdkVersion 21
- targetSdkVersion 33
+ targetSdkVersion 35
versionCode 1
versionName "1.0"
multiDexEnabled true
@@ -35,6 +35,7 @@ dependencies {
implementation project(':android-filechooser')
implementation project(':JavaFileStorage')
implementation "androidx.annotation:annotation:1.5.0"
+ implementation "com.google.android.material:material:1.12.0"
}
configurations {
diff --git a/src/java/JavaFileStorageTest-AS/app/src/main/java/com/crocoapps/javafilestoragetest2/MainActivity.java b/src/java/JavaFileStorageTest-AS/app/src/main/java/com/crocoapps/javafilestoragetest2/MainActivity.java
index 5e8fcc35..8583ebca 100644
--- a/src/java/JavaFileStorageTest-AS/app/src/main/java/com/crocoapps/javafilestoragetest2/MainActivity.java
+++ b/src/java/JavaFileStorageTest-AS/app/src/main/java/com/crocoapps/javafilestoragetest2/MainActivity.java
@@ -547,8 +547,8 @@ public class MainActivity extends Activity implements JavaFileStorage.FileStorag
//storageToTest = new SkyDriveFileStorage("000000004010C234", appContext);
- //storageToTest = new GoogleDriveAppDataFileStorage();
- storageToTest = new WebDavStorage(new ICertificateErrorHandler() {
+ storageToTest = new GoogleDriveAppDataFileStorage();
+ /*storageToTest = new WebDavStorage(new ICertificateErrorHandler() {
@Override
public boolean onValidationError(String error) {
return false;
@@ -558,7 +558,7 @@ public class MainActivity extends Activity implements JavaFileStorage.FileStorag
public boolean alwaysFailOnValidationError() {
return false;
}
- }, 64*1024);
+ }, 64*1024);*/
//storageToTest = new DropboxV2Storage(ctx,"4ybka4p4a1027n6", "1z5lv528un9nre8", !simulateRestart);
//storageToTest = new DropboxFileStorage(ctx,"4ybka4p4a1027n6", "1z5lv528un9nre8", !simulateRestart);
diff --git a/src/java/android-filechooser-AS/app/build.gradle b/src/java/android-filechooser-AS/app/build.gradle
index febbfce0..fc58ef1d 100644
--- a/src/java/android-filechooser-AS/app/build.gradle
+++ b/src/java/android-filechooser-AS/app/build.gradle
@@ -4,11 +4,11 @@ android {
namespace 'group.pals.android.lib.ui.filechooser'
- compileSdkVersion 33
+ compileSdkVersion 35
defaultConfig {
minSdkVersion 16
- targetSdkVersion 33
+ targetSdkVersion 35
}
buildTypes {
@@ -30,4 +30,5 @@ android {
dependencies {
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+ implementation "com.google.android.material:material:1.12.0"
}
diff --git a/src/java/android-filechooser-AS/app/src/main/java/group/pals/android/lib/ui/filechooser/FileChooserActivity.java b/src/java/android-filechooser-AS/app/src/main/java/group/pals/android/lib/ui/filechooser/FileChooserActivity.java
index 1f590c3e..b36303f6 100644
--- a/src/java/android-filechooser-AS/app/src/main/java/group/pals/android/lib/ui/filechooser/FileChooserActivity.java
+++ b/src/java/android-filechooser-AS/app/src/main/java/group/pals/android/lib/ui/filechooser/FileChooserActivity.java
@@ -20,6 +20,8 @@ import android.content.Context;
import android.content.res.Configuration;
import android.net.Uri;
import android.os.Bundle;
+
+import androidx.core.view.WindowCompat;
import androidx.fragment.app.FragmentActivity;
import android.util.Log;
import android.view.KeyEvent;
@@ -242,6 +244,7 @@ public class FileChooserActivity extends FragmentActivity {
R.style.Afc_Theme_Dark));
super.onCreate(savedInstanceState);
+
setContentView(R.layout.afc_activity_filechooser);
Ui.adjustDialogSizeForLargeScreen(getWindow());
diff --git a/src/java/android-filechooser-AS/app/src/main/java/group/pals/android/lib/ui/filechooser/FragmentFiles.java b/src/java/android-filechooser-AS/app/src/main/java/group/pals/android/lib/ui/filechooser/FragmentFiles.java
index 1aeeb04d..650d5ed4 100644
--- a/src/java/android-filechooser-AS/app/src/main/java/group/pals/android/lib/ui/filechooser/FragmentFiles.java
+++ b/src/java/android-filechooser-AS/app/src/main/java/group/pals/android/lib/ui/filechooser/FragmentFiles.java
@@ -49,6 +49,10 @@ import android.net.Uri;
import android.os.Build;
import android.os.Bundle;
import android.os.Handler;
+
+import androidx.core.graphics.Insets;
+import androidx.core.view.ViewCompat;
+import androidx.core.view.WindowInsetsCompat;
import androidx.fragment.app.Fragment;
import androidx.loader.app.LoaderManager;
import androidx.loader.content.CursorLoader;
@@ -324,6 +328,19 @@ public class FragmentFiles extends Fragment implements
* INIT CONTROLS
*/
+ ViewCompat.setOnApplyWindowInsetsListener(rootView, (v, windowInsets) -> {
+ Insets systemBarsInsets = windowInsets.getInsets(WindowInsetsCompat.Type.systemBars() | WindowInsetsCompat.Type.navigationBars() | WindowInsetsCompat.Type.ime());
+
+
+ v.setPadding(
+ systemBarsInsets.left,
+ systemBarsInsets.top,
+ systemBarsInsets.right,
+ systemBarsInsets.bottom
+ );
+
+ return WindowInsetsCompat.CONSUMED;
+ });
return rootView;
}// onCreateView()
diff --git a/src/java/android-filechooser-AS/app/src/main/res/drawable/afc_selector_button_ok_saveas_dark.xml b/src/java/android-filechooser-AS/app/src/main/res/drawable/afc_selector_button_ok_saveas_dark.xml
index 96189b83..805588b4 100644
--- a/src/java/android-filechooser-AS/app/src/main/res/drawable/afc_selector_button_ok_saveas_dark.xml
+++ b/src/java/android-filechooser-AS/app/src/main/res/drawable/afc_selector_button_ok_saveas_dark.xml
@@ -8,8 +8,6 @@
-