qwe/keepass2android
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix display issues with edge-to-edge when choosing file location; make file chooser look more modern

Browse Source
This commit is contained in:
Philipp Crocoll
2025-08-12 17:23:13 +02:00
parent 93d1eb9141
commit 4cfdcb0f95
28 changed files with 164 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/java/JavaFileStorage/app/build.gradle
View File

@@ -6,8 +6,8 @@ android {
defaultConfig {
minSdkVersion 21
targetSdkVersion 33
compileSdk 34
targetSdkVersion 35
compileSdk 35
}
buildTypes {
release {

1
src/java/JavaFileStorage/gradle.properties
View File

@@ -1,2 +1,3 @@
org.gradle.jvmargs=-Xmx1536m
android.useAndroidX=true
android.jetifier.ignorelist = jsch-2.27.2.jar

5
src/java/JavaFileStorageTest-AS/app/build.gradle
View File

@@ -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 {

6
src/java/JavaFileStorageTest-AS/app/src/main/java/com/crocoapps/javafilestoragetest2/MainActivity.java
View File

@@ -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);

5
src/java/android-filechooser-AS/app/build.gradle
View File

@@ -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"
}

3
src/java/android-filechooser-AS/app/src/main/java/group/pals/android/lib/ui/filechooser/FileChooserActivity.java
View File

@@ -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());

17
src/java/android-filechooser-AS/app/src/main/java/group/pals/android/lib/ui/filechooser/FragmentFiles.java
View File

@@ -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()

4
src/java/android-filechooser-AS/app/src/main/res/drawable/afc_selector_button_ok_saveas_dark.xml
View File

@@ -8,8 +8,6 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/afc_ic_button_ok_saveas_light_pressed" android:state_pressed="true"/>
<item android:drawable="@drawable/afc_ic_button_ok_saveas_light_focused" android:state_focused="true"/>
<item android:drawable="@drawable/afc_ic_button_ok_saveas_light"/>
<item android:drawable="@drawable/save_icon"/>
</selector>

4
src/java/android-filechooser-AS/app/src/main/res/drawable/afc_selector_button_ok_saveas_light.xml
View File

@@ -8,8 +8,6 @@
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/afc_ic_button_ok_saveas_dark_pressed" android:state_pressed="true"/>
<item android:drawable="@drawable/afc_ic_button_ok_saveas_dark_focused" android:state_focused="true"/>
<item android:drawable="@drawable/afc_ic_button_ok_saveas_dark"/>
<item android:drawable="@drawable/save_icon"/>
</selector>

16
src/java/android-filechooser-AS/app/src/main/res/drawable/afc_selector_main_button_navi_left.xml Normal file
View File

@@ -0,0 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (c) 2012 Hai Bison
See the file LICENSE at the root directory of this project for copying
permission.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<!-- Disabled -->
<item android:state_enabled="false"
android:drawable="@drawable/baseline_chevron_left_24_alpha30" />
<!-- Default -->
<item android:drawable="@drawable/baseline_chevron_left_24" />
</selector>

15
src/java/android-filechooser-AS/app/src/main/res/drawable/afc_selector_main_button_navi_left_dark.xml
View File

@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (c) 2012 Hai Bison
See the file LICENSE at the root directory of this project for copying
permission.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/afc_main_button_navi_left_pressed_dark" android:state_pressed="true"/> <!-- pressed -->
<item android:drawable="@drawable/afc_main_button_navi_left_disabled_dark" android:state_enabled="false"/> <!-- enabled -->
<item android:drawable="@drawable/afc_main_button_navi_left_dark"/> <!-- default -->
</selector>

15
src/java/android-filechooser-AS/app/src/main/res/drawable/afc_selector_main_button_navi_left_light.xml
View File

@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (c) 2012 Hai Bison
See the file LICENSE at the root directory of this project for copying
permission.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/afc_main_button_navi_left_pressed_light" android:state_pressed="true"/> <!-- pressed -->
<item android:drawable="@drawable/afc_main_button_navi_left_disabled_light" android:state_enabled="false"/> <!-- enabled -->
<item android:drawable="@drawable/afc_main_button_navi_left_light"/> <!-- default -->
</selector>

10
src/java/android-filechooser-AS/app/src/main/res/drawable/afc_selector_main_button_navi_right.xml Normal file
View File

@@ -0,0 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<!-- Disabled -->
<item android:state_enabled="false"
android:drawable="@drawable/baseline_chevron_right_24_alpha30" />
<!-- Default -->
<item android:drawable="@drawable/baseline_chevron_right_24" />
</selector>

15
src/java/android-filechooser-AS/app/src/main/res/drawable/afc_selector_main_button_navi_right_dark.xml
View File

@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (c) 2012 Hai Bison
See the file LICENSE at the root directory of this project for copying
permission.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/afc_main_button_navi_right_pressed_dark" android:state_pressed="true"/> <!-- pressed -->
<item android:drawable="@drawable/afc_main_button_navi_right_disabled_dark" android:state_enabled="false"/> <!-- enabled -->
<item android:drawable="@drawable/afc_main_button_navi_right_dark"/> <!-- default -->
</selector>

15
src/java/android-filechooser-AS/app/src/main/res/drawable/afc_selector_main_button_navi_right_light.xml
View File

@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (c) 2012 Hai Bison
See the file LICENSE at the root directory of this project for copying
permission.
-->
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item android:drawable="@drawable/afc_main_button_navi_right_pressed_light" android:state_pressed="true"/> <!-- pressed -->
<item android:drawable="@drawable/afc_main_button_navi_right_disabled_light" android:state_enabled="false"/> <!-- enabled -->
<item android:drawable="@drawable/afc_main_button_navi_right_light"/> <!-- default -->
</selector>

8
src/java/android-filechooser-AS/app/src/main/res/drawable/baseline_chevron_left_24.xml Normal file
View File

@@ -0,0 +1,8 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:height="36dp" android:tint="?attr/colorOnSurface"
android:viewportHeight="24" android:viewportWidth="24"
android:width="36dp">
<path android:fillColor="@android:color/white" android:pathData="M15.41,7.41L14,6l-6,6 6,6 1.41,-1.41L10.83,12z"/>
</vector>

8
src/java/android-filechooser-AS/app/src/main/res/drawable/baseline_chevron_left_24_alpha30.xml Normal file
View File

@@ -0,0 +1,8 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:height="36dp" android:tint="?attr/colorOnSurface"
android:viewportHeight="24" android:viewportWidth="24"
android:width="36dp">
<path android:fillColor="@android:color/white" android:fillAlpha="0.3" android:pathData="M15.41,7.41L14,6l-6,6 6,6 1.41,-1.41L10.83,12z"/>
</vector>

8
src/java/android-filechooser-AS/app/src/main/res/drawable/baseline_chevron_right_24.xml Normal file
View File

@@ -0,0 +1,8 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:height="36dp" android:tint="?attr/colorOnSurface"
android:viewportHeight="24" android:viewportWidth="24"
android:width="36dp">
<path android:fillColor="@android:color/white" android:pathData="M10,6L8.59,7.41 13.17,12l-4.58,4.59L10,18l6,-6z"/>
</vector>

8
src/java/android-filechooser-AS/app/src/main/res/drawable/baseline_chevron_right_24_alpha30.xml Normal file
View File

@@ -0,0 +1,8 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:height="36dp" android:tint="?attr/colorOnSurface"
android:viewportHeight="24" android:viewportWidth="24"
android:width="36dp">
<path android:fillColor="@android:color/white" android:fillAlpha="0.3" android:pathData="M10,6L8.59,7.41 13.17,12l-4.58,4.59L10,18l6,-6z"/>
</vector>

8
src/java/android-filechooser-AS/app/src/main/res/drawable/save_icon.xml Normal file
View File

@@ -0,0 +1,8 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:height="36dp" android:tint="?attr/colorOnSurface"
android:viewportHeight="24" android:viewportWidth="24"
android:width="36dp">
<path android:fillColor="@android:color/white" android:pathData="M17 3H5c-1.11 0-2 .9-2 2v14c0 1.1.89 2 2 2h14c1.1 0 2-.9 2-2V7l-4-4zm-5 16c-1.66 0-3-1.34-3-3s1.34-3 3-3 3 1.34 3 3-1.34 3-3 3zm3-10H5V5h10v4z"/>
</vector>

11
src/java/android-filechooser-AS/app/src/main/res/layout/afc_file_item.xml
View File

@@ -42,9 +42,9 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginBottom="@dimen/afc_2dp"
android:layout_marginTop="@dimen/afc_5dp"
android:layout_marginBottom="@dimen/afc_5dp"
android:layout_marginRight="@dimen/afc_5dp"
android:layout_marginTop="@dimen/afc_2dp"
android:layout_weight="0.1"
android:orientation="vertical" >
@@ -55,8 +55,8 @@
android:ellipsize="middle"
android:maxLines="3"
android:singleLine="false"
android:textAppearance="?android:attr/textAppearanceMedium"
android:textIsSelectable="false" />
android:textIsSelectable="false"
android:textAppearance="@style/TextAppearance.Material3.BodyLarge"/>
<TextView
android:id="@+id/afc_textview_file_info"
@@ -66,7 +66,8 @@
android:ellipsize="end"
android:gravity="right"
android:singleLine="true"
android:textIsSelectable="false" />
android:textIsSelectable="false"
android:textAppearance="@style/TextAppearance.Material3.BodySmall" />
</LinearLayout>
<CheckBox

17
src/java/android-filechooser-AS/app/src/main/res/layout/afc_fragment_files.xml
View File

@@ -8,7 +8,7 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent" >
android:layout_height="match_parent">
<RelativeLayout
android:id="@+id/afc_viewgroup_header"
@@ -47,21 +47,14 @@
android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:orientation="horizontal"
android:showDividers="middle" />
/>
</HorizontalScrollView>
<View
android:id="@+id/afc_header_view_divider"
android:layout_width="match_parent"
android:layout_height="@dimen/afc_viewgroup_button_locations_bottom_divider_height"
android:layout_below="@id/afc_view_locations_container"
android:background="@color/afc_border_line_dark" />
<TextView
android:id="@+id/afc_textview_full_dir_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@id/afc_header_view_divider"
android:layout_below="@id/afc_view_locations_container"
android:layout_centerHorizontal="true"
android:ellipsize="start"
android:gravity="center"
@@ -122,10 +115,6 @@
android:orientation="vertical"
android:visibility="gone" >
<View
android:id="@+id/afc_footer_view_divider"
android:layout_width="match_parent"
android:layout_height="@dimen/afc_viewgroup_button_locations_bottom_divider_height" />
<LinearLayout
android:id="@+id/afc_viewgroup_footer"

2
src/java/android-filechooser-AS/app/src/main/res/layout/afc_listview_files.xml
View File

@@ -9,6 +9,8 @@
<ListView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:divider="@null"
android:dividerHeight="0dp"
android:fastScrollEnabled="true" >
</ListView>

21
src/java/android-filechooser-AS/app/src/main/res/values-v30/themes.xml Normal file
View File

@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<resources xmlns:android="http://schemas.android.com/apk/res/android">
<style name="Afc.BaseTheme.Dark" parent="Theme.Material3.Dark.NoActionBar">
<item name="android:windowLightStatusBar">false</item>
</style>
<style name="Afc.BaseThemeHelper.Dark" parent="Theme.Material3.Dark.NoActionBar">
<item name="android:windowLightStatusBar">false</item>
</style>
<style name="Afc.BaseThemeHelper.Light" parent="Theme.Material3.Light.NoActionBar">
<item name="android:windowLightStatusBar">true</item>
</style>
<style name="Afc.BaseTheme.Light" parent="Theme.Material3.Light.NoActionBar">
<item name="android:windowLightStatusBar">true</item>
</style>
</resources>

40
src/java/android-filechooser-AS/app/src/main/res/values/themes.xml
View File

@@ -1,63 +1,55 @@
<?xml version="1.0" encoding="utf-8"?>
<!--
Copyright (c) 2012 Hai Bison
See the file LICENSE at the root directory of this project for copying
permission.
-->
<resources xmlns:android="http://schemas.android.com/apk/res/android">
<style name="AOSP_DialogWindowTitle">
<style name="AOSP_DialogWindowTitle">
<item name="android:maxLines">1</item>
<item name="android:scrollHorizontally">true</item>
<item name="android:textAppearance">@android:style/TextAppearance.DialogWindowTitle</item>
</style>
<style name="afc_main_button_navi">
<style name="afc_main_button_navi">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:adjustViewBounds">true</item>
<item name="android:scaleType">center</item>
<item name="android:layout_marginLeft">@dimen/afc_5dp</item>
<item name="android:layout_marginTop">@dimen/afc_5dp</item>
<item name="android:layout_gravity">center</item>
<item name="android:layout_gravity">center</item>
<item name="android:minHeight">@dimen/afc_button_navigators_min_height</item>
</style>
<style name="afc_main_button_navi_left" parent="@style/afc_main_button_navi">
<item name="android:src">?attr/afc_selector_main_button_navi_left</item>
</style>
</style>
<style name="afc_main_button_navi_right" parent="@style/afc_main_button_navi">
<item name="android:src">?attr/afc_selector_main_button_navi_right</item>
<item name="android:layout_marginRight">@dimen/afc_5dp</item>
</style>
<style name="afc_action_navi">
<style name="afc_action_navi">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:adjustViewBounds">true</item>
<item name="android:scaleType">center</item>
<item name="android:background">?attr/afc_selector_image_button</item>
<item name="android:background">?attr/afc_selector_image_button</item>
<item name="android:layout_margin">@dimen/afc_2dp</item>
<item name="android:layout_gravity">center</item>
<item name="android:layout_gravity">center</item>
</style>
<style name="afc_action_navi_left" parent="@style/afc_action_navi">
<item name="android:src">?attr/afc_selector_action_navi_left_foreground</item>
</style>
</style>
<style name="afc_action_navi_right" parent="@style/afc_action_navi">
<item name="android:src">?attr/afc_selector_action_navi_right_foreground</item>
</style>
</style>
<style name="afc_base_button_location" parent="@android:style/Widget.TextView"></style>
<style name="afc_button_location" parent="@style/afc_base_button_location">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">match_parent</item>
<item name="android:layout_gravity">center_vertical</item>
<item name="android:layout_gravity">center_vertical</item>
<item name="android:background">?attr/afc_selector_button_location</item>
<item name="android:layout_margin">@dimen/afc_5dp</item>
<item name="android:ellipsize">end</item>
@@ -65,11 +57,11 @@
<item name="android:minWidth">@dimen/afc_button_location_min_width</item>
<item name="android:padding">@dimen/afc_5dp</item>
<item name="android:singleLine">true</item>
<item name="android:gravity">center</item>
<item name="android:gravity">center</item>
<item name="android:textAppearance">?android:attr/textAppearanceMedium</item>
</style>
<style name="afc_widget_search_view_button_search">
<style name="afc_widget_search_view_button_search">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:background">?attr/afc_selector_image_button</item>
@@ -80,10 +72,10 @@
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:background">@null</item>
<item name="android:src">?attr/afc_ic_widget_search_view_action_clear</item>
<item name="android:src">?attr/afc_ic_widget_search_view_action_clear</item>
</style>
<style name="afc_button_sort" parent="@android:style/Widget.ImageButton">
<style name="afc_button_sort" parent="@android:style/Widget.ImageButton">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:layout_gravity">center</item>
@@ -91,11 +83,11 @@
<item name="android:padding">@dimen/afc_5dp</item>
</style>
<style name="afc_home_button_navigators" parent="@android:style/Widget.TextView">
<style name="afc_home_button_navigators" parent="@android:style/Widget.TextView">
<item name="android:layout_width">wrap_content</item>
<item name="android:layout_height">wrap_content</item>
<item name="android:gravity">center</item>
<item name="android:background">?attr/afc_selector_button_location</item>
<item name="android:background">?attr/afc_selector_button_location</item>
<item name="android:layout_margin">@dimen/afc_2dp</item>
<item name="android:layout_gravity">center_vertical</item>
<item name="android:textAppearance">?android:attr/textAppearanceMedium</item>

20
src/java/android-filechooser-AS/app/src/main/res/values/themes_dark.xml
View File

@@ -16,7 +16,7 @@
- Actual themes which extend BaseThemeHelpers: contain customizations that are the same for all API levels.
-->
<style name="Afc.BaseTheme.Dark" parent="@android:style/Theme"></style>
<style name="Afc.BaseTheme.Dark" parent="Theme.Material3.Dark.NoActionBar"></style>
<style name="Afc.BaseThemeHelper.Dark" parent="@style/Afc.BaseTheme.Dark">
<item name="afc_ic_menu_home">@drawable/afc_ic_menu_home</item>
@@ -39,15 +39,13 @@
<item name="afc_ic_widget_search_view_action_clear">@drawable/afc_ic_action_clear_dark</item>
</style>
<style name="Afc.BaseTheme.Dialog.Dark" parent="@android:style/Theme" />
<style name="Afc.BaseTheme.Dialog.Dark" parent="Theme.Material3.Dark.NoActionBar" />
<style name="Afc.BaseThemeHelper.Dialog.Dark" parent="@style/Afc.BaseTheme.Dialog.Dark">
<!-- AOSP -->
<item name="android:windowFrame">@null</item>
<item name="android:windowTitleStyle">@style/AOSP_DialogWindowTitle</item>
<item name="android:windowBackground">@drawable/aosp_dialog_full_holo_dark</item>
<item name="android:windowIsFloating">true</item>
<item name="android:windowContentOverlay">@null</item>
<item name="android:windowAnimationStyle">@android:style/Animation.Dialog</item>
@@ -81,10 +79,6 @@
<style name="Afc.Theme.Dark" parent="@style/Afc.BaseThemeHelper.Dark">
<!-- AOSP -->
<item name="android:windowBackground">@drawable/aosp_background_holo_dark</item>
<!-- android-filechooser -->
<item name="afc_theme_dialog">@style/Afc.Theme.Dialog.Dark</item>
@@ -93,9 +87,9 @@
<item name="afc_badge_file_provider_localfile">@drawable/afc_badge_file_provider_localfile_light</item>
<item name="afc_selector_image_button">@drawable/afc_selector_image_button_dark</item>
<item name="afc_selector_button_location">@drawable/afc_selector_button_location_dark</item>
<item name="afc_selector_main_button_navi_left">@drawable/afc_selector_main_button_navi_left_dark</item>
<item name="afc_selector_main_button_navi_right">@drawable/afc_selector_main_button_navi_right_dark</item>
<item name="afc_selector_button_ok_saveas">@drawable/afc_selector_button_ok_saveas_dark</item>
<item name="afc_selector_main_button_navi_left">@drawable/afc_selector_main_button_navi_left</item>
<item name="afc_selector_main_button_navi_right">@drawable/afc_selector_main_button_navi_right</item>
<item name="afc_selector_button_ok_saveas">@drawable/save_icon</item>
<item name="afc_selector_action_navi_left_foreground">@drawable/afc_selector_action_navi_left_dark_foreground</item>
<item name="afc_selector_action_navi_right_foreground">@drawable/afc_selector_action_navi_right_dark_foreground</item>
<item name="afc_color_listview_cache_hint">@color/afc_listview_cache_hint_dark</item>
@@ -109,8 +103,8 @@
<item name="afc_badge_file_provider_localfile">@drawable/afc_badge_file_provider_localfile_light</item>
<item name="afc_selector_image_button">@drawable/afc_selector_image_button_dark</item>
<item name="afc_selector_button_location">@drawable/afc_selector_button_location_dark</item>
<item name="afc_selector_main_button_navi_left">@drawable/afc_selector_main_button_navi_left_dark</item>
<item name="afc_selector_main_button_navi_right">@drawable/afc_selector_main_button_navi_right_dark</item>
<item name="afc_selector_main_button_navi_left">@drawable/afc_selector_main_button_navi_left</item>
<item name="afc_selector_main_button_navi_right">@drawable/afc_selector_main_button_navi_right</item>
<item name="afc_selector_button_ok_saveas">@drawable/afc_selector_button_ok_saveas_dark</item>
<item name="afc_selector_action_navi_left_foreground">@drawable/afc_selector_action_navi_left_dark_foreground</item>
<item name="afc_selector_action_navi_right_foreground">@drawable/afc_selector_action_navi_right_dark_foreground</item>

20
src/java/android-filechooser-AS/app/src/main/res/values/themes_light.xml
View File

@@ -16,9 +16,11 @@
- Actual themes which extend BaseThemeHelpers: contain customizations that are the same for all API levels.
-->
<style name="Afc.BaseTheme.Light" parent="@android:style/Theme.Light"></style>
<style name="Afc.BaseTheme.Light" parent="Theme.Material3.Light.NoActionBar">
<style name="Afc.BaseThemeHelper.Light" parent="@style/Afc.BaseTheme.Light">
</style>
<style name="Afc.BaseThemeHelper.Light" parent="Theme.Material3.Light.NoActionBar">
<item name="afc_ic_menu_home">@drawable/afc_ic_menu_home</item>
<item name="afc_ic_menu_gridview">@drawable/afc_ic_menu_gridview</item>
<item name="afc_ic_menu_listview">@drawable/afc_ic_menu_listview</item>
@@ -46,7 +48,6 @@
<item name="android:windowFrame">@null</item>
<item name="android:windowTitleStyle">@style/AOSP_DialogWindowTitle</item>
<item name="android:windowBackground">@drawable/aosp_dialog_full_holo_light</item>
<item name="android:windowIsFloating">true</item>
<item name="android:windowContentOverlay">@null</item>
<item name="android:windowAnimationStyle">@android:style/Animation.Dialog</item>
@@ -78,11 +79,6 @@
</style>
<style name="Afc.Theme.Light" parent="@style/Afc.BaseThemeHelper.Light">
<!-- AOSP -->
<item name="android:windowBackground">@drawable/aosp_background_holo_light</item>
<!-- android-filechooser -->
<item name="afc_theme_dialog">@style/Afc.Theme.Dialog.Light</item>
@@ -92,8 +88,8 @@
<item name="afc_badge_file_provider_localfile">@drawable/afc_badge_file_provider_localfile_dark</item>
<item name="afc_selector_image_button">@drawable/afc_selector_image_button_light</item>
<item name="afc_selector_button_location">@drawable/afc_selector_button_location_light</item>
<item name="afc_selector_main_button_navi_left">@drawable/afc_selector_main_button_navi_left_light</item>
<item name="afc_selector_main_button_navi_right">@drawable/afc_selector_main_button_navi_right_light</item>
<item name="afc_selector_main_button_navi_left">@drawable/afc_selector_main_button_navi_left</item>
<item name="afc_selector_main_button_navi_right">@drawable/afc_selector_main_button_navi_right</item>
<item name="afc_selector_button_ok_saveas">@drawable/afc_selector_button_ok_saveas_light</item>
<item name="afc_selector_action_navi_left_foreground">@drawable/afc_selector_action_navi_left_light_foreground</item>
<item name="afc_selector_action_navi_right_foreground">@drawable/afc_selector_action_navi_right_light_foreground</item>
@@ -120,8 +116,8 @@
<item name="afc_badge_file_provider_localfile">@drawable/afc_badge_file_provider_localfile_dark</item>
<item name="afc_selector_image_button">@drawable/afc_selector_image_button_light</item>
<item name="afc_selector_button_location">@drawable/afc_selector_button_location_light</item>
<item name="afc_selector_main_button_navi_left">@drawable/afc_selector_main_button_navi_left_light</item>
<item name="afc_selector_main_button_navi_right">@drawable/afc_selector_main_button_navi_right_light</item>
<item name="afc_selector_main_button_navi_left">@drawable/afc_selector_main_button_navi_left</item>
<item name="afc_selector_main_button_navi_right">@drawable/afc_selector_main_button_navi_right</item>
<item name="afc_selector_button_ok_saveas">@drawable/afc_selector_button_ok_saveas_light</item>
<item name="afc_selector_action_navi_left_foreground">@drawable/afc_selector_action_navi_left_light_foreground</item>
<item name="afc_selector_action_navi_right_foreground">@drawable/afc_selector_action_navi_right_light_foreground</item>

1
src/keepass2android-app/Resources/layout/create_database.xml
View File

@@ -3,6 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:fitsSystemWindows="true"
android:id="@+id/root"
android:layout_margin="12dip">
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"