diff options
author | Christian Schneppe <christian@pix-art.de> | 2018-04-11 21:43:38 +0200 |
---|---|---|
committer | Christian Schneppe <christian@pix-art.de> | 2018-04-11 21:43:38 +0200 |
commit | 1046acb3e192c940dc99ebb564ec2756493ec987 (patch) | |
tree | 5448f272fd7a0ca261785686ac66dfaf39f1c518 /src/main/res/layout/activity_about.xml | |
parent | 551f63b73c170a309108c7d3dc8839e6ada86596 (diff) |
replace deprecated action bar with toolbar
* replace deprecated action bar with toolbar
* add toolbar support in each activity
* remove redundant themes made earlier
* add configure action bar method in xmpp activity
* remove android namespace from actionmodeoverlay
* solve bug of scrolling toolbar
Diffstat (limited to 'src/main/res/layout/activity_about.xml')
-rw-r--r-- | src/main/res/layout/activity_about.xml | 102 |
1 files changed, 54 insertions, 48 deletions
diff --git a/src/main/res/layout/activity_about.xml b/src/main/res/layout/activity_about.xml index b4f022726..2ff11dc00 100644 --- a/src/main/res/layout/activity_about.xml +++ b/src/main/res/layout/activity_about.xml @@ -1,61 +1,67 @@ -<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" +<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" android:background="?attr/color_background_secondary" + android:orientation="vertical" tools:context="${applicationId}.ui.AboutActivity"> + <include layout="@layout/toolbar" /> - <RelativeLayout + <ScrollView android:layout_width="match_parent" - android:layout_height="wrap_content"> + android:layout_height="match_parent"> - <android.support.v7.widget.CardView - android:id="@+id/LogoLayout" + <RelativeLayout android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginBottom="@dimen/activity_vertical_margin" - android:layout_marginLeft="@dimen/activity_horizontal_margin" - android:layout_marginRight="@dimen/activity_horizontal_margin" - android:layout_marginTop="@dimen/activity_vertical_margin"> - - <ImageView - android:id="@+id/logo" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentTop="true" - android:layout_gravity="center_horizontal" - android:padding="8dp" - android:src="@drawable/main_logo" /> - </android.support.v7.widget.CardView> - - <android.support.v7.widget.CardView - android:id="@+id/aboutLayout" - android:layout_below="@+id/LogoLayout" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_marginBottom="@dimen/activity_vertical_margin" - android:layout_marginLeft="@dimen/activity_horizontal_margin" - android:layout_marginRight="@dimen/activity_horizontal_margin" - android:layout_marginTop="@dimen/activity_vertical_margin"> - - <TextView - android:id="@+id/aboutmessage" - android:layout_width="wrap_content" + android:layout_height="wrap_content"> + + <android.support.v7.widget.CardView + android:id="@+id/LogoLayout" + android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginBottom="@dimen/activity_vertical_margin" android:layout_marginLeft="@dimen/activity_horizontal_margin" android:layout_marginRight="@dimen/activity_horizontal_margin" - android:layout_marginTop="@dimen/activity_vertical_margin" - android:autoLink="web" - android:fontFamily="monospace" - android:linksClickable="true" - android:paddingBottom="@dimen/activity_vertical_margin" - android:text="@string/pref_about_message" - android:textColor="@color/black87" - android:textSize="?attr/TextSizeBody" - android:typeface="monospace" /> - - </android.support.v7.widget.CardView> - </RelativeLayout> - -</ScrollView> + android:layout_marginTop="@dimen/activity_vertical_margin"> + + <ImageView + android:id="@+id/logo" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentTop="true" + android:layout_gravity="center_horizontal" + android:padding="8dp" + android:src="@drawable/main_logo" /> + </android.support.v7.widget.CardView> + + <android.support.v7.widget.CardView + android:id="@+id/aboutLayout" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_below="@+id/LogoLayout" + android:layout_marginBottom="@dimen/activity_vertical_margin" + android:layout_marginLeft="@dimen/activity_horizontal_margin" + android:layout_marginRight="@dimen/activity_horizontal_margin" + android:layout_marginTop="@dimen/activity_vertical_margin"> + + <TextView + android:id="@+id/aboutmessage" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_marginLeft="@dimen/activity_horizontal_margin" + android:layout_marginRight="@dimen/activity_horizontal_margin" + android:layout_marginTop="@dimen/activity_vertical_margin" + android:autoLink="web" + android:fontFamily="monospace" + android:linksClickable="true" + android:paddingBottom="@dimen/activity_vertical_margin" + android:text="@string/pref_about_message" + android:textColor="@color/black87" + android:textSize="?attr/TextSizeBody" + android:typeface="monospace" /> + + </android.support.v7.widget.CardView> + </RelativeLayout> + </ScrollView> +</LinearLayout> |