diff options
| author | Vincent Breitmoser <valodim@mugenguild.com> | 2015-09-02 04:13:32 +0200 |
|---|---|---|
| committer | Vincent Breitmoser <valodim@mugenguild.com> | 2015-09-02 04:14:45 +0200 |
| commit | 2cda48642722069c7e26d0a25d196e8a41128290 (patch) | |
| tree | 29bf478f9bf25bb2a7c2026ec2a3b8c8d0acfe79 /OpenKeychain/src/main/res/layout | |
| parent | 87f7fe65a8ddf9f9f2f9881c0f2ef8f5d0e8c9f1 (diff) | |
| download | open-keychain-2cda48642722069c7e26d0a25d196e8a41128290.tar.gz open-keychain-2cda48642722069c7e26d0a25d196e8a41128290.tar.bz2 open-keychain-2cda48642722069c7e26d0a25d196e8a41128290.zip | |
linked: use webview instead of app, and some minor layoutings
Diffstat (limited to 'OpenKeychain/src/main/res/layout')
3 files changed, 22 insertions, 13 deletions
diff --git a/OpenKeychain/src/main/res/layout/linked_create_github_fragment.xml b/OpenKeychain/src/main/res/layout/linked_create_github_fragment.xml index 276aaff54..e15f29eb8 100644 --- a/OpenKeychain/src/main/res/layout/linked_create_github_fragment.xml +++ b/OpenKeychain/src/main/res/layout/linked_create_github_fragment.xml @@ -1,7 +1,8 @@ <?xml version="1.0" encoding="UTF-8"?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="wrap_content" - android:layout_height="match_parent"> + android:layout_height="match_parent" + xmlns:custom="http://schemas.android.com/apk/res-auto"> <ScrollView android:layout_width="match_parent" @@ -122,14 +123,16 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:id="@+id/button_container" - android:outAnimation="@anim/fade_out"> + android:layout_marginTop="16dp" + android:layout_marginBottom="16dp" + android:inAnimation="@anim/fade_in" + android:outAnimation="@anim/fade_out" + custom:initialView="2"> <Button android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center_horizontal" - android:layout_marginTop="16dp" - android:layout_marginBottom="16dp" style="?android:buttonBarButtonStyle" android:drawableLeft="@drawable/link_24dp" android:drawableStart="@drawable/link_24dp" @@ -142,6 +145,8 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" /> + <include layout="@layout/linked_id_item" /> + </org.sufficientlysecure.keychain.ui.widget.ToolableViewAnimator> </LinearLayout> diff --git a/OpenKeychain/src/main/res/layout/loader_layout.xml b/OpenKeychain/src/main/res/layout/loader_layout.xml index 61dd48635..6f94384dc 100644 --- a/OpenKeychain/src/main/res/layout/loader_layout.xml +++ b/OpenKeychain/src/main/res/layout/loader_layout.xml @@ -4,7 +4,6 @@ android:layout_height="match_parent" android:orientation="vertical"> - <!--rebuild functionality of ListFragment --> <LinearLayout android:id="@+id/loader_progress" android:orientation="vertical" @@ -15,15 +14,8 @@ <ProgressBar style="?android:attr/progressBarStyleLarge" android:layout_width="wrap_content" - android:layout_height="wrap_content" /> - - <TextView - android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textAppearance="?android:attr/textAppearanceSmall" - android:text="" - android:paddingTop="4dip" - android:singleLine="true" /> + android:gravity="center" /> </LinearLayout> diff --git a/OpenKeychain/src/main/res/layout/oauth_webview.xml b/OpenKeychain/src/main/res/layout/oauth_webview.xml new file mode 100644 index 000000000..f00fdfd17 --- /dev/null +++ b/OpenKeychain/src/main/res/layout/oauth_webview.xml @@ -0,0 +1,12 @@ +<?xml version="1.0" encoding="utf-8"?> +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:orientation="vertical" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <WebView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:id="@+id/web_view"/> + +</LinearLayout>
\ No newline at end of file |