diff options
Diffstat (limited to 'OpenKeychain/src/main/res')
9 files changed, 65 insertions, 37 deletions
diff --git a/OpenKeychain/src/main/res/layout/create_key_activity.xml b/OpenKeychain/src/main/res/layout/create_key_activity.xml index c42fd4d4b..b9d5206a1 100644 --- a/OpenKeychain/src/main/res/layout/create_key_activity.xml +++ b/OpenKeychain/src/main/res/layout/create_key_activity.xml @@ -7,8 +7,14 @@ android:id="@+id/toolbar_include" layout="@layout/toolbar_standalone" /> + <!-- + fitsSystemWindows and layout_marginTop from + https://medium.com/@ngdelamo/using-drawerlayout-the-material-way-i-716bba2b5705 + --> <FrameLayout android:layout_below="@id/toolbar_include" + android:fitsSystemWindows="true" + android:layout_marginTop="-25dp" android:layout_width="match_parent" android:layout_height="match_parent"> diff --git a/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml b/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml index 026d98004..f678825aa 100644 --- a/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml +++ b/OpenKeychain/src/main/res/layout/create_key_input_fragment.xml @@ -6,7 +6,7 @@ <ScrollView android:layout_width="match_parent" android:layout_height="match_parent" - android:fillViewport="false" + android:fillViewport="true" android:layout_above="@+id/create_key_button_divider"> <LinearLayout diff --git a/OpenKeychain/src/main/res/layout/decrypt_files_activity.xml b/OpenKeychain/src/main/res/layout/decrypt_files_activity.xml index 608fce111..06c1dda7b 100644 --- a/OpenKeychain/src/main/res/layout/decrypt_files_activity.xml +++ b/OpenKeychain/src/main/res/layout/decrypt_files_activity.xml @@ -7,8 +7,14 @@ android:id="@+id/toolbar_include" layout="@layout/toolbar_standalone" /> + <!-- + fitsSystemWindows and layout_marginTop from + https://medium.com/@ngdelamo/using-drawerlayout-the-material-way-i-716bba2b5705 + --> <LinearLayout android:layout_below="@id/toolbar_include" + android:fitsSystemWindows="true" + android:layout_marginTop="-25dp" android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical"> diff --git a/OpenKeychain/src/main/res/layout/decrypt_text_activity.xml b/OpenKeychain/src/main/res/layout/decrypt_text_activity.xml index b97fc9c8e..a692b3681 100644 --- a/OpenKeychain/src/main/res/layout/decrypt_text_activity.xml +++ b/OpenKeychain/src/main/res/layout/decrypt_text_activity.xml @@ -6,9 +6,15 @@ <include android:id="@+id/toolbar_include" layout="@layout/toolbar_standalone" /> - + + <!-- + fitsSystemWindows and layout_marginTop from + https://medium.com/@ngdelamo/using-drawerlayout-the-material-way-i-716bba2b5705 + --> <LinearLayout android:layout_below="@id/toolbar_include" + android:fitsSystemWindows="true" + android:layout_marginTop="-25dp" android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical"> diff --git a/OpenKeychain/src/main/res/layout/encrypt_files_activity.xml b/OpenKeychain/src/main/res/layout/encrypt_files_activity.xml index d292b1a5b..168e6d0be 100644 --- a/OpenKeychain/src/main/res/layout/encrypt_files_activity.xml +++ b/OpenKeychain/src/main/res/layout/encrypt_files_activity.xml @@ -7,9 +7,15 @@ android:id="@+id/toolbar_include" layout="@layout/toolbar_standalone" /> + <!-- + fitsSystemWindows and layout_marginTop from + https://medium.com/@ngdelamo/using-drawerlayout-the-material-way-i-716bba2b5705 + --> <LinearLayout android:layout_below="@id/toolbar_include" android:id="@+id/content_frame" + android:fitsSystemWindows="true" + android:layout_marginTop="-25dp" android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical"> diff --git a/OpenKeychain/src/main/res/layout/encrypt_text_activity.xml b/OpenKeychain/src/main/res/layout/encrypt_text_activity.xml index 66abd03b1..fd7fd6672 100644 --- a/OpenKeychain/src/main/res/layout/encrypt_text_activity.xml +++ b/OpenKeychain/src/main/res/layout/encrypt_text_activity.xml @@ -7,9 +7,15 @@ android:id="@+id/toolbar_include" layout="@layout/toolbar_standalone" /> + <!-- + fitsSystemWindows and layout_marginTop from + https://medium.com/@ngdelamo/using-drawerlayout-the-material-way-i-716bba2b5705 + --> <LinearLayout android:layout_below="@id/toolbar_include" android:id="@+id/content_frame" + android:fitsSystemWindows="true" + android:layout_marginTop="-25dp" android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical"> diff --git a/OpenKeychain/src/main/res/layout/import_keys_activity.xml b/OpenKeychain/src/main/res/layout/import_keys_activity.xml index 93d630437..dcdd9a31a 100644 --- a/OpenKeychain/src/main/res/layout/import_keys_activity.xml +++ b/OpenKeychain/src/main/res/layout/import_keys_activity.xml @@ -7,8 +7,14 @@ android:id="@+id/toolbar_include" layout="@layout/toolbar_standalone" /> + <!-- + fitsSystemWindows and layout_marginTop from + https://medium.com/@ngdelamo/using-drawerlayout-the-material-way-i-716bba2b5705 + --> <LinearLayout android:layout_below="@id/toolbar_include" + android:fitsSystemWindows="true" + android:layout_marginTop="-25dp" android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical"> diff --git a/OpenKeychain/src/main/res/layout/import_keys_cloud_fragment.xml b/OpenKeychain/src/main/res/layout/import_keys_cloud_fragment.xml index 46ec736ca..6f52e1938 100644 --- a/OpenKeychain/src/main/res/layout/import_keys_cloud_fragment.xml +++ b/OpenKeychain/src/main/res/layout/import_keys_cloud_fragment.xml @@ -1,5 +1,4 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:custom="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical"> diff --git a/OpenKeychain/src/main/res/layout/key_list_fragment.xml b/OpenKeychain/src/main/res/layout/key_list_fragment.xml index 3c46b4f9c..2affa6e86 100644 --- a/OpenKeychain/src/main/res/layout/key_list_fragment.xml +++ b/OpenKeychain/src/main/res/layout/key_list_fragment.xml @@ -4,46 +4,39 @@ android:layout_height="match_parent" android:layout_width="match_parent"> - <org.sufficientlysecure.keychain.ui.widget.ListAwareSwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/key_list_swipe_container" + <!--rebuild functionality of ListFragment --> + <FrameLayout android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical"> - <!--rebuild functionality of ListFragment --> - <FrameLayout + android:layout_height="match_parent"> + + <se.emilsjolander.stickylistheaders.StickyListHeadersListView + android:id="@+id/key_list_list" android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="match_parent" + android:drawSelectorOnTop="true" + android:fastScrollEnabled="true" + android:paddingBottom="16dp" + android:paddingLeft="16dp" + android:paddingRight="32dp" + android:scrollbarStyle="outsideOverlay" /> - <se.emilsjolander.stickylistheaders.StickyListHeadersListView - android:id="@+id/key_list_list" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:clipToPadding="false" - android:drawSelectorOnTop="true" - android:fastScrollEnabled="true" - android:paddingBottom="16dp" - android:paddingLeft="16dp" - android:paddingRight="32dp" - android:scrollbarStyle="outsideOverlay" /> + <LinearLayout + android:id="@+id/key_list_empty" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:gravity="center" + android:orientation="vertical" + android:visibility="visible"> - <LinearLayout - android:id="@+id/key_list_empty" - android:layout_width="match_parent" - android:layout_height="match_parent" + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" android:gravity="center" - android:orientation="vertical" - android:visibility="visible"> - - <TextView - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:gravity="center" - android:text="@string/key_list_empty_text1" - android:textAppearance="?android:attr/textAppearanceLarge" /> + android:text="@string/key_list_empty_text1" + android:textAppearance="?android:attr/textAppearanceLarge" /> - </LinearLayout> - </FrameLayout> - </org.sufficientlysecure.keychain.ui.widget.ListAwareSwipeRefreshLayout> + </LinearLayout> + </FrameLayout> <com.getbase.floatingactionbutton.FloatingActionsMenu android:id="@+id/fab_main" |