cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Material Design: Full screen dialogs

Browse Source
This commit is contained in:
Dominik Schürmann
2015-01-26 00:50:35 +01:00
parent b4781343d9
commit e4e2d647c8
57 changed files with 209 additions and 273 deletions
Download Patch File Download Diff File Expand all files Collapse all files

26
OpenKeychain/src/main/res/layout/actionbar_custom_view_done.xml
View File

@@ -1,26 +0,0 @@
<!--
Copyright 2013 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:dividerPadding="12dp"
android:orientation="horizontal"
android:showDividers="end" >
<include layout="@layout/actionbar_include_done_button" />
</LinearLayout>

28
OpenKeychain/src/main/res/layout/actionbar_custom_view_done_cancel.xml
View File

@@ -1,28 +0,0 @@
<!--
Copyright 2013 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:dividerPadding="12dp"
android:orientation="horizontal"
android:showDividers="middle">
<include layout="@layout/actionbar_include_cancel_button" />
<include layout="@layout/actionbar_include_done_button" />
</LinearLayout>

2
OpenKeychain/src/main/res/layout/foldable_linearlayout.xml
View File

@@ -17,7 +17,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginRight="10dp"
android:src="@drawable/ic_action_expand"/>
android:src="@drawable/ic_expand_more_black_24dp"/>
<TextView
android:id="@+id/foldableText"

10
OpenKeychain/src/main/res/layout/full_screen_dialog.xml Normal file
View File

@@ -0,0 +1,10 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:dividerPadding="12dp"
android:orientation="horizontal"
android:showDividers="middle">
<include layout="@layout/full_screen_dialog_done_button" />
</LinearLayout>

12
OpenKeychain/src/main/res/layout/full_screen_dialog_2.xml Normal file
View File

@@ -0,0 +1,12 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:dividerPadding="12dp"
android:orientation="horizontal"
android:showDividers="middle">
<include layout="@layout/full_screen_dialog_2_cancel_button" />
<include layout="@layout/full_screen_dialog_2_done_button" />
</LinearLayout>

20
OpenKeychain/src/main/res/layout/actionbar_include_cancel_button.xml → OpenKeychain/src/main/res/layout/full_screen_dialog_2_cancel_button.xml
View File

@@ -1,19 +1,3 @@
<!--
Copyright 2013 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/actionbar_cancel"
style="@style/Widget.AppCompat.ActionButton"
@@ -30,12 +14,14 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:drawableLeft="@drawable/ic_action_cancel"
android:drawableLeft="@drawable/ic_close_white_24dp"
android:drawablePadding="8dp"
android:gravity="center_vertical"
android:paddingRight="20dp"
android:filterTouchesWhenObscured="true"
style="@style/Widget.AppCompat.Light.ActionBar.TabText"
android:textAllCaps="true"
android:textSize="14sp"
android:text="Cancel (set in-code!)" />
</FrameLayout>

20
OpenKeychain/src/main/res/layout/actionbar_include_done_button.xml → OpenKeychain/src/main/res/layout/full_screen_dialog_2_done_button.xml
View File

@@ -1,19 +1,3 @@
<!--
Copyright 2013 The Android Open Source Project
Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at
http://www.apache.org/licenses/LICENSE-2.0
Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.
-->
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/actionbar_done"
style="@style/Widget.AppCompat.ActionButton"
@@ -30,12 +14,14 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:drawableLeft="@drawable/ic_action_done"
android:drawableLeft="@drawable/ic_check_white_24dp"
android:drawablePadding="8dp"
android:gravity="center_vertical"
android:paddingRight="20dp"
android:filterTouchesWhenObscured="true"
style="@style/Widget.AppCompat.Light.ActionBar.TabText"
android:textAllCaps="true"
android:textSize="14sp"
android:text="Done (set in-code!)" />
</FrameLayout>

25
OpenKeychain/src/main/res/layout/full_screen_dialog_done_button.xml Normal file
View File

@@ -0,0 +1,25 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/full_screen_dialog_done"
style="@style/Widget.AppCompat.ActionButton"
android:layout_width="wrap_content"
android:layout_height="match_parent">
<!--
android:filterTouchesWhenObscured="true" to prevent Touch-Event Hijacking
https://blog.lookout.com/blog/2010/12/09/android-touch-event-hijacking/
-->
<TextView
android:id="@+id/full_screen_dialog_done_text"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="center"
android:gravity="center_vertical"
android:paddingRight="16dp"
android:paddingEnd="16dp"
style="@style/Widget.AppCompat.Light.ActionBar.TabText"
android:textAllCaps="true"
android:textSize="14sp"
android:filterTouchesWhenObscured="true"
android:text="Done (set in-code!)" />
</FrameLayout>

10
OpenKeychain/src/main/res/layout/full_screen_dialog_old.xml Normal file
View File

@@ -0,0 +1,10 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:dividerPadding="12dp"
android:orientation="horizontal"
android:showDividers="end" >
<include layout="@layout/full_screen_dialog_2_done_button" />
</LinearLayout>