fix dialog layout
Project: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/repo Commit: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/commit/12e19785 Tree: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/tree/12e19785 Diff: http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/diff/12e19785 Branch: refs/heads/master Commit: 12e19785e6939a560645920cfaf62636dd6392a9 Parents: f0ffb61 Author: Sagar <[email protected]> Authored: Mon Jun 6 01:58:55 2016 +0530 Committer: Sagar <[email protected]> Committed: Mon Jun 6 01:58:55 2016 +0530 ---------------------------------------------------------------------- app/src/main/res/drawable/dialog_button.xml | 14 ++++++++++++ .../layout/detail_annoucement_dialog_layout.xml | 23 +++++++++----------- app/src/main/res/values/colors.xml | 1 + 3 files changed, 25 insertions(+), 13 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/12e19785/app/src/main/res/drawable/dialog_button.xml ---------------------------------------------------------------------- diff --git a/app/src/main/res/drawable/dialog_button.xml b/app/src/main/res/drawable/dialog_button.xml new file mode 100644 index 0000000..4123c10 --- /dev/null +++ b/app/src/main/res/drawable/dialog_button.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8"?> +<selector xmlns:android="http://schemas.android.com/apk/res/android";> + <item + android:state_focused="true" + android:state_pressed="true" + android:drawable="@color/button_click_background" /> + + <item + android:state_focused="false" + android:state_pressed="true" + android:drawable="@color/button_click_background" /> + + <item android:drawable="@android:color/white" /> +</selector> \ No newline at end of file http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/12e19785/app/src/main/res/layout/detail_annoucement_dialog_layout.xml ---------------------------------------------------------------------- diff --git a/app/src/main/res/layout/detail_annoucement_dialog_layout.xml b/app/src/main/res/layout/detail_annoucement_dialog_layout.xml index ed9ba1c..237f342 100644 --- a/app/src/main/res/layout/detail_annoucement_dialog_layout.xml +++ b/app/src/main/res/layout/detail_annoucement_dialog_layout.xml @@ -16,18 +16,24 @@ android:text="Title" android:textColor="@android:color/black" android:textSize="20sp" /> - + <TextView + android:id="@+id/tvDialogAuthor" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="Author" + android:textSize="15sp" /> <WebView android:id="@+id/wvDialogText" android:layout_width="match_parent" - android:layout_height="wrap_content" /> + android:layout_height="wrap_content" + android:layout_weight="1"/> <RelativeLayout android:id="@+id/RelativeLayout01" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:paddingBottom="24dp" + android:paddingBottom="8dp" android:paddingTop="4dp"> <TextView @@ -39,15 +45,6 @@ android:text="Date" android:textSize="15sp" /> - <TextView - android:id="@+id/tvDialogAuthor" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentEnd="true" - android:layout_alignParentRight="true" - android:text="Author" - android:textSize="15sp" /> - <Button android:id="@+id/bDialogOK" android:layout_width="wrap_content" @@ -56,7 +53,7 @@ android:layout_alignParentRight="true" android:layout_below="@id/tvDialogDate" android:layout_margin="8dp" - android:background="@android:color/white" + android:background="@drawable/dialog_button" android:text="OK" android:textColor="@color/colorPrimary" /> </RelativeLayout> http://git-wip-us.apache.org/repos/asf/incubator-taverna-mobile/blob/12e19785/app/src/main/res/values/colors.xml ---------------------------------------------------------------------- diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 0b130f0..1b5c131 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -4,4 +4,5 @@ <color name="colorPrimaryDark">#2196F3</color> <color name="colorAccent">#FF4081</color> <color name="window_background">#FFF5F5F5</color> + <color name="button_click_background">#e0e0e0</color> </resources> \ No newline at end of file
