diff options
| author | Arne Schwabe <arne@rfc2549.org> | 2024-07-29 17:21:39 +0200 |
|---|---|---|
| committer | Arne Schwabe <arne@rfc2549.org> | 2024-07-29 17:38:25 +0200 |
| commit | c2d625eef66c2ede30f0e5c8d03ca279975eefc8 (patch) | |
| tree | d5b4fc922e8136b546f3fbf5355041069f32d1e2 /main/src/ui/res/layout | |
| parent | 291acb38ddf8cf8c8f7dab2f1aad6bb860ae6109 (diff) | |
Implement enough of edge-to-edge to work well on Android V
Diffstat (limited to 'main/src/ui/res/layout')
| -rw-r--r-- | main/src/ui/res/layout/about.xml | 1 | ||||
| -rw-r--r-- | main/src/ui/res/layout/config_converter.xml | 204 | ||||
| -rw-r--r-- | main/src/ui/res/layout/faq.xml | 20 | ||||
| -rw-r--r-- | main/src/ui/res/layout/log_fragment.xml | 1 | ||||
| -rw-r--r-- | main/src/ui/res/layout/log_window.xml | 21 | ||||
| -rw-r--r-- | main/src/ui/res/layout/main_activity.xml | 47 | ||||
| -rw-r--r-- | main/src/ui/res/layout/openssl_speed.xml | 72 | ||||
| -rw-r--r-- | main/src/ui/res/layout/status_bg.xml | 5 | ||||
| -rw-r--r-- | main/src/ui/res/layout/webview_internal.xml | 36 |
9 files changed, 229 insertions, 178 deletions
diff --git a/main/src/ui/res/layout/about.xml b/main/src/ui/res/layout/about.xml index cd482996..f73768c7 100644 --- a/main/src/ui/res/layout/about.xml +++ b/main/src/ui/res/layout/about.xml @@ -9,6 +9,7 @@ android:layout_height="match_parent" android:paddingLeft="@dimen/stdpadding" android:paddingRight="@dimen/stdpadding" + android:clipToPadding="false" android:scrollbarStyle="outsideOverlay"> <LinearLayout diff --git a/main/src/ui/res/layout/config_converter.xml b/main/src/ui/res/layout/config_converter.xml index 591de858..311e7557 100644 --- a/main/src/ui/res/layout/config_converter.xml +++ b/main/src/ui/res/layout/config_converter.xml @@ -2,114 +2,124 @@ ~ Copyright (c) 2012-2016 Arne Schwabe ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt --> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:tools="http://schemas.android.com/tools" +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent"> - <ScrollView + <RelativeLayout xmlns:tools="http://schemas.android.com/tools" + android:id="@+id/root_layout_config_converter" android:layout_width="match_parent" - android:layout_height="match_parent" - android:layout_margin="@dimen/stdpadding" - android:orientation="vertical"> + android:layout_height="match_parent"> - - <LinearLayout - android:id="@+id/config_convert_root" + <ScrollView android:layout_width="match_parent" - android:layout_height="wrap_content" + android:layout_height="match_parent" + android:layout_margin="@dimen/stdpadding" android:orientation="vertical"> - <TextView - android:id="@+id/profilename_label" - style="@style/item" - android:labelFor="@id/profilename" - android:text="@string/profilename" - android:textAppearance="?android:attr/textAppearanceSmall" - android:visibility="gone" /> - - <EditText - android:id="@+id/profilename" - style="@style/item" - android:inputType="text" - android:visibility="gone" /> - - <TextView - android:layout_marginTop="@dimen/stdpadding" - android:id="@+id/compatmode_label" - style="@style/item" - android:text="@string/compat_mode_label" - android:textAppearance="?android:attr/textAppearanceSmall" - android:visibility="gone" - tools:visibility="visible" /> - - <Spinner - android:id="@+id/compatmode" - style="@style/item" - android:entries="@array/compat_mode" - android:prompt="@string/compatmode" - android:visibility="gone" - tools:visibility="visible" /> - - <TextView - android:layout_marginTop="@dimen/stdpadding" - android:id="@+id/tls_profile_label" - style="@style/item" - android:text="@string/tls_profile" - android:textAppearance="?android:attr/textAppearanceSmall" - android:visibility="gone" - tools:visibility="visible" /> - <Spinner - android:id="@+id/tls_profile" - style="@style/item" - android:entries="@array/tls_profile_entries" - android:prompt="@string/compatmode" - android:visibility="gone" - tools:visibility="visible" /> - <TextView - android:id="@+id/files_missing_hint" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:text="@string/files_missing_hint" - android:visibility="gone" - tools:visibilty="visible" /> - <TextView - android:id="@+id/permssion_hint" + <LinearLayout + android:id="@+id/config_convert_root" android:layout_width="match_parent" android:layout_height="wrap_content" - android:padding="5dp" - android:text="@string/query_permissions_sdcard" - android:textStyle="bold" - android:visibility="gone" - tools:visibility="visible" /> - - <CheckBox - android:layout_marginTop="@dimen/stdpadding" - android:id="@+id/importpkcs12" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:checked="true" - android:text="@string/importpkcs12fromconfig" - android:visibility="gone" - tools:visibilty="visible" /> - - <TextView - android:id="@+id/textView" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_margin="10dp" - android:text="@string/import_log" - android:textAppearance="?android:attr/textAppearanceMedium" /> + android:orientation="vertical"> + + <TextView + android:id="@+id/profilename_label" + style="@style/item" + android:labelFor="@id/profilename" + android:text="@string/profilename" + android:textAppearance="?android:attr/textAppearanceSmall" + android:visibility="gone" /> + + <EditText + android:id="@+id/profilename" + style="@style/item" + android:inputType="text" + android:visibility="gone" /> + + <TextView + android:id="@+id/compatmode_label" + style="@style/item" + android:layout_marginTop="@dimen/stdpadding" + android:text="@string/compat_mode_label" + android:textAppearance="?android:attr/textAppearanceSmall" + android:visibility="gone" + tools:visibility="visible" /> + + <Spinner + android:id="@+id/compatmode" + style="@style/item" + android:entries="@array/compat_mode" + android:prompt="@string/compatmode" + android:visibility="gone" + tools:visibility="visible" /> + + <TextView + android:id="@+id/tls_profile_label" + style="@style/item" + android:layout_marginTop="@dimen/stdpadding" + android:text="@string/tls_profile" + android:textAppearance="?android:attr/textAppearanceSmall" + android:visibility="gone" + tools:visibility="visible" /> + + <Spinner + android:id="@+id/tls_profile" + style="@style/item" + android:entries="@array/tls_profile_entries" + android:prompt="@string/compatmode" + android:visibility="gone" + tools:visibility="visible" /> + + <TextView + android:id="@+id/files_missing_hint" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:text="@string/files_missing_hint" + android:visibility="gone" + tools:visibilty="visible" /> + + <TextView + android:id="@+id/permssion_hint" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:padding="5dp" + android:text="@string/query_permissions_sdcard" + android:textStyle="bold" + android:visibility="gone" + tools:visibility="visible" /> + + <CheckBox + android:id="@+id/importpkcs12" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_marginTop="@dimen/stdpadding" + android:checked="true" + android:text="@string/importpkcs12fromconfig" + android:visibility="gone" + tools:visibilty="visible" /> + + <TextView + android:id="@+id/textView" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_margin="10dp" + android:text="@string/import_log" + android:textAppearance="?android:attr/textAppearanceMedium" /> + + <Space + android:id="@+id/fab_footerspace" + android:layout_width="40dp" + android:layout_height="@dimen/round_button_diameter" + android:visibility="gone" /> + </LinearLayout> + + </ScrollView> - <Space - android:id="@+id/fab_footerspace" - android:layout_width="40dp" - android:layout_height="@dimen/round_button_diameter" - android:visibility="gone" /> - </LinearLayout> + <include layout="@layout/save_fab" /> - </ScrollView> + </RelativeLayout> - <include layout="@layout/save_fab" /> -</RelativeLayout> + <include layout="@layout/status_bg" /> +</FrameLayout> diff --git a/main/src/ui/res/layout/faq.xml b/main/src/ui/res/layout/faq.xml index 8cb79649..46b56e58 100644 --- a/main/src/ui/res/layout/faq.xml +++ b/main/src/ui/res/layout/faq.xml @@ -1,15 +1,15 @@ -<?xml version="1.0" encoding="utf-8"?> -<!-- +<?xml version="1.0" encoding="utf-8"?><!-- ~ Copyright (c) 2012-2016 Arne Schwabe ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt --> <androidx.recyclerview.widget.RecyclerView xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/faq_recycler_view" - android:paddingLeft="@dimen/stdpadding" - android:paddingRight="@dimen/stdpadding" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:verticalSpacing="@dimen/stdpadding" - android:horizontalSpacing="@dimen/stdpadding" - />
\ No newline at end of file + xmlns:app="http://schemas.android.com/apk/res-auto" + android:id="@+id/faq_recycler_view" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:clipToPadding="false" + android:horizontalSpacing="@dimen/stdpadding" + android:paddingLeft="@dimen/stdpadding" + android:paddingRight="@dimen/stdpadding" + android:verticalSpacing="@dimen/stdpadding" />
\ No newline at end of file diff --git a/main/src/ui/res/layout/log_fragment.xml b/main/src/ui/res/layout/log_fragment.xml index df87d1c1..bac1fe94 100644 --- a/main/src/ui/res/layout/log_fragment.xml +++ b/main/src/ui/res/layout/log_fragment.xml @@ -35,6 +35,7 @@ /> <ListView + android:clipToPadding="false" android:id="@android:id/list" android:transcriptMode="normal" android:layout_width="fill_parent" diff --git a/main/src/ui/res/layout/log_window.xml b/main/src/ui/res/layout/log_window.xml index 7c25dcfa..ffebc474 100644 --- a/main/src/ui/res/layout/log_window.xml +++ b/main/src/ui/res/layout/log_window.xml @@ -4,9 +4,18 @@ --> <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:tools="http://schemas.android.com/tools" - android:id="@+id/container" - android:layout_width="match_parent" - android:layout_height="match_parent" - tools:context=".LogWindow" - tools:ignore="MergeRootFrame" />
\ No newline at end of file + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent" + tools:ignore="MergeRootFrame"> + + + <FrameLayout + android:id="@+id/container" + tools:context=".LogWindow" + android:layout_width="match_parent" + android:layout_height="match_parent" /> + + + <include layout="@layout/status_bg" /> +</FrameLayout>
\ No newline at end of file diff --git a/main/src/ui/res/layout/main_activity.xml b/main/src/ui/res/layout/main_activity.xml index edc64ece..6e0a3de9 100644 --- a/main/src/ui/res/layout/main_activity.xml +++ b/main/src/ui/res/layout/main_activity.xml @@ -2,29 +2,40 @@ ~ Copyright (c) 2012-2016 Arne Schwabe ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt --> - -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical"> + android:layout_height="match_parent"> - <com.google.android.material.tabs.TabLayout - android:id="@+id/tab_layout" - style="@style/blinkt.tabLayout" - app:tabMaxWidth="0dp" + <LinearLayout + android:id="@+id/root_linear_layout" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_gravity="top" - app:tabMode="scrollable" + android:layout_height="match_parent" + android:orientation="vertical"> - /> - <androidx.viewpager2.widget.ViewPager2 - android:id="@+id/pager" - android:layout_width="match_parent" - android:layout_height="0dp" - android:layout_weight="3"/> + <com.google.android.material.tabs.TabLayout + android:id="@+id/tab_layout" + style="@style/blinkt.tabLayout" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="top" + app:tabMaxWidth="0dp" + app:tabMode="scrollable" /> + + <androidx.viewpager2.widget.ViewPager2 + android:id="@+id/pager" + android:layout_width="match_parent" + android:layout_height="0dp" + android:layout_weight="3" /> + </LinearLayout> + + + <View + android:id="@+id/statusbar_background" + android:background="@color/primary_dark" + android:layout_width="match_parent" + android:layout_height="0dp" /> -</LinearLayout> +</FrameLayout>
\ No newline at end of file diff --git a/main/src/ui/res/layout/openssl_speed.xml b/main/src/ui/res/layout/openssl_speed.xml index c23d3567..d19b88d2 100644 --- a/main/src/ui/res/layout/openssl_speed.xml +++ b/main/src/ui/res/layout/openssl_speed.xml @@ -2,39 +2,47 @@ ~ Copyright (c) 2012-2017 Arne Schwabe ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt --> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical"> - <LinearLayout +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" - android:layout_height="wrap_content" - android:orientation="horizontal"> - - - - <EditText - android:id="@+id/ciphername" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_weight="1" - android:ems="10" - android:text="@string/default_cipherlist_test" - android:hint="@string/openssl_cipher_name" - android:inputType="textPersonName" /> - - <Button - android:id="@+id/testSpecific" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_weight="1" - android:text="@string/test_algoirhtms" /> - </LinearLayout> + android:layout_height="match_parent"> - <ListView - android:id="@+id/results" - android:layout_width="match_parent" - android:layout_height="match_parent" /> + <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:id="@+id/speed_root" + android:orientation="vertical"> + + <LinearLayout + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="horizontal"> + + + <EditText + android:id="@+id/ciphername" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="1" + android:ems="10" + android:hint="@string/openssl_cipher_name" + android:inputType="textPersonName" + android:text="@string/default_cipherlist_test" /> + + <Button + android:id="@+id/testSpecific" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_weight="1" + android:text="@string/test_algoirhtms" /> + </LinearLayout> + + <ListView + android:id="@+id/results" + android:layout_width="match_parent" + android:layout_height="match_parent" /> + + </LinearLayout> -</LinearLayout> + <include layout="@layout/status_bg" /> +</FrameLayout> diff --git a/main/src/ui/res/layout/status_bg.xml b/main/src/ui/res/layout/status_bg.xml new file mode 100644 index 00000000..3754664b --- /dev/null +++ b/main/src/ui/res/layout/status_bg.xml @@ -0,0 +1,5 @@ +<View xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/statusbar_background" + android:layout_width="match_parent" + android:layout_height="0dp" + android:background="@color/primary_dark" /> diff --git a/main/src/ui/res/layout/webview_internal.xml b/main/src/ui/res/layout/webview_internal.xml index f1bf17c8..740589e1 100644 --- a/main/src/ui/res/layout/webview_internal.xml +++ b/main/src/ui/res/layout/webview_internal.xml @@ -2,23 +2,29 @@ ~ Copyright (c) 2012-2020 Arne Schwabe ~ Distributed under the GNU GPL v2 with additional terms. For full terms see the file doc/LICENSE.txt --> - -<LinearLayout android:layout_height="match_parent" +<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" - xmlns:tools="http://schemas.android.com/tools" - android:orientation="vertical" - xmlns:android="http://schemas.android.com/apk/res/android"> - - <TextView - android:id="@+id/url_textview" - android:layout_width="match_parent" - android:layout_height="wrap_content" - tools:text="https://foo.bar.baz" /> + android:layout_height="match_parent"> - <WebView - android:id="@+id/internal_webview" + <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:id="@+id/webview_root" android:layout_width="match_parent" android:layout_height="match_parent" - /> + android:orientation="vertical"> + + <TextView + android:id="@+id/url_textview" + android:layout_width="match_parent" + android:layout_height="wrap_content" + tools:text="https://foo.bar.baz" /> + + <WebView + android:id="@+id/internal_webview" + android:layout_width="match_parent" + android:layout_height="match_parent" /> + + </LinearLayout> -</LinearLayout> + <include layout="@layout/status_bg" /> +</FrameLayout> |
