diff options
Diffstat (limited to 'app/src/main/res/layout/activity_media.xml')
-rw-r--r-- | app/src/main/res/layout/activity_media.xml | 168 |
1 files changed, 97 insertions, 71 deletions
diff --git a/app/src/main/res/layout/activity_media.xml b/app/src/main/res/layout/activity_media.xml index d26d17748..f0783d9cc 100644 --- a/app/src/main/res/layout/activity_media.xml +++ b/app/src/main/res/layout/activity_media.xml @@ -24,7 +24,6 @@ app:isSwipeFromEdge="true" app:maskAlpha="125" app:swipeBackFactor="0.5"> - <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" @@ -32,7 +31,6 @@ android:id="@+id/main_container_media"> - <!-- Main Loader --> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:id="@+id/loader" @@ -82,6 +80,7 @@ android:id="@+id/media_picture" android:layout_width="match_parent" android:layout_height="match_parent" + android:adjustViewBounds="true" /> <TextView android:visibility="gone" @@ -89,7 +88,7 @@ android:id="@+id/media_description" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginBottom="20dip" + android:layout_marginBottom="62dp" android:layout_gravity="center_horizontal|bottom" android:padding="12dp" android:background="#AA000000" @@ -103,84 +102,110 @@ android:layout_width="match_parent" android:layout_height="match_parent" /> - <ImageView - android:visibility="gone" - android:layout_margin="5dp" - android:src="@drawable/ic_first_page" - android:id="@+id/media_prev" - android:layout_centerVertical="true" - android:layout_alignParentStart="true" - android:layout_alignParentLeft="true" - android:layout_width="20dp" - android:layout_height="20dp" - android:contentDescription="@string/previous" /> - <ImageView - android:visibility="gone" - android:layout_margin="5dp" - android:id="@+id/media_next" - android:src="@drawable/ic_last_page" - android:layout_centerVertical="true" - android:layout_alignParentEnd="true" - android:layout_alignParentRight="true" - android:layout_width="20dp" - android:layout_height="20dp" - android:contentDescription="@string/next" /> - - - <ImageButton - android:id="@+id/media_close" - android:layout_alignParentTop="true" - android:layout_alignParentLeft="true" - android:layout_alignParentStart="true" - app:layout_anchorGravity="top|left" - android:layout_marginStart="10dp" - android:background="@color/transparent" - android:layout_marginLeft="10dp" - android:layout_marginTop="5dp" - android:layout_width="wrap_content" + <RelativeLayout + android:layout_width="match_parent" android:layout_height="wrap_content" - android:src="@drawable/ic_close" - android:contentDescription="@string/close" - /> - + android:background="@color/transparent_grey" + android:id="@+id/action_bar_container" + android:paddingTop="16dp"> + <ImageButton + android:id="@+id/media_close" + android:layout_width="35dp" + android:layout_height="35dp" + android:layout_alignParentStart="true" + android:layout_alignParentLeft="true" + android:layout_alignParentTop="true" + android:layout_marginStart="10dp" + android:layout_marginLeft="10dp" + android:layout_marginTop="8dp" + android:layout_marginBottom="8dp" + android:background="@color/transparent" + android:contentDescription="@string/close" + android:scaleType="fitXY" + android:src="@drawable/ic_close" + app:layout_anchorGravity="top|left" /> - <LinearLayout - android:layout_alignParentTop="true" - android:layout_alignParentRight="true" - android:layout_alignParentEnd="true" - app:layout_anchorGravity="top|left" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:orientation="horizontal"> - <ImageButton - android:id="@+id/media_share" + <LinearLayout + android:layout_alignParentTop="true" + android:layout_alignParentRight="true" + android:layout_alignParentEnd="true" app:layout_anchorGravity="top|left" - android:layout_marginStart="10dp" - android:background="@color/transparent" - android:layout_marginLeft="10dp" - android:layout_marginTop="5dp" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:src="@drawable/ic_share_media" - android:contentDescription="@string/share" - /> + android:orientation="horizontal"> + + <ImageButton + android:id="@+id/media_save" + android:scaleType="fitXY" + android:layout_marginStart="20dp" + android:background="@color/transparent" + android:layout_marginLeft="20dp" + android:layout_marginTop="8dp" + android:layout_marginBottom="8dp" + android:layout_width="30dp" + android:layout_height="30dp" + android:src="@drawable/ic_save_white" + android:contentDescription="@string/download" + /> + + <ImageButton + android:id="@+id/media_share" + app:layout_anchorGravity="top|left" + android:layout_marginStart="10dp" + android:background="@color/transparent" + android:layout_marginLeft="10dp" + android:layout_marginTop="8dp" + android:layout_marginBottom="8dp" + android:layout_marginRight="15dp" + android:layout_marginEnd="10dp" + android:layout_width="30dp" + android:layout_height="30dp" + android:src="@drawable/ic_share_media" + android:scaleType="fitXY" + android:contentDescription="@string/share" + /> + </LinearLayout> + </RelativeLayout> - <ImageButton - android:id="@+id/media_save" - android:layout_marginStart="20dp" - android:background="@color/transparent" - android:layout_marginLeft="20dp" - android:layout_marginTop="5dp" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:src="@drawable/ic_save_white" - android:contentDescription="@string/download" - /> - </LinearLayout> + <ImageView + android:id="@+id/media_prev" + android:layout_width="30dp" + android:layout_height="50dp" + android:layout_alignParentStart="true" + android:layout_alignParentLeft="true" + android:layout_centerVertical="true" + android:layout_marginStart="5dp" + android:layout_marginLeft="5dp" + android:layout_marginTop="5dp" + android:layout_marginEnd="5dp" + android:layout_marginRight="5dp" + android:layout_marginBottom="5dp" + android:background="@color/transparent_grey" + android:tint="@color/white" + android:contentDescription="@string/previous" + android:src="@drawable/ic_first_page" + android:visibility="gone" /> + <ImageView + android:id="@+id/media_next" + android:layout_width="30dp" + android:layout_height="50dp" + android:layout_alignParentEnd="true" + android:layout_alignParentRight="true" + android:layout_centerVertical="true" + android:layout_marginStart="5dp" + android:layout_marginLeft="5dp" + android:layout_marginTop="5dp" + android:layout_marginEnd="5dp" + android:layout_marginRight="5dp" + android:layout_marginBottom="5dp" + android:background="@color/transparent_grey" + android:contentDescription="@string/next" + android:src="@drawable/ic_last_page" + android:visibility="gone" /> <TextView @@ -191,6 +216,7 @@ android:text="@string/media_ready" android:gravity="center" android:textSize="14sp" + android:layout_alignBottom="@+id/media_picture_container" android:layout_marginBottom="40dp" android:layout_width="match_parent" |