Commit 8a29f340 authored by Gilbert Ndresaj's avatar Gilbert Ndresaj

XML Clean

parent 04c1d4c5
This diff is collapsed.
This diff is collapsed.
......@@ -87,8 +87,7 @@
android:layout_alignParentEnd="true"
android:layout_gravity="bottom|end"
android:theme="@style/ThemeOverlay.AppCompat.Light"
app:layout_behavior="org.horaapps.leafpic.views.FabScrollBehaviour"
/>
app:layout_behavior="org.horaapps.leafpic.views.FabScrollBehaviour" />
</android.support.design.widget.CoordinatorLayout>
<include
android:id="@+id/drawer_items"
......
......@@ -19,31 +19,30 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:keepScreenOn="true">
<include
android:id="@+id/toolbar"
layout="@layout/toolbar"
android:windowActionBarOverlay="true"
/>
<org.horaapps.leafpic.views.videoplayer.CustomExoPlayerView
android:id="@+id/player_view"
android:focusable="true"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#88000000"
android:orientation="vertical">
<LinearLayout android:id="@+id/controls_root"
<include
android:id="@+id/toolbar"
layout="@layout/toolbar"
android:windowActionBarOverlay="true" />
<org.horaapps.leafpic.views.videoplayer.CustomExoPlayerView
android:id="@+id/player_view"
android:focusable="true"
android:layout_width="match_parent"
android:layout_height="match_parent"/>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:visibility="gone">
<Button android:id="@+id/retry_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/retry"
android:visibility="gone"/>
android:background="#88000000"
android:orientation="vertical">
<LinearLayout android:id="@+id/controls_root"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:visibility="gone">
<Button android:id="@+id/retry_button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/retry"
android:visibility="gone"/>
</LinearLayout>
</LinearLayout>
</LinearLayout>
</FrameLayout>
......@@ -28,8 +28,7 @@
android:layout_height="wrap_content"
android:orientation="horizontal"
android:background="@drawable/ripple"
android:clickable="true"
>
android:clickable="true">
<com.mikepenz.iconics.view.IconicsImageView
android:id="@+id/active_security_icon"
android:layout_width="@dimen/icon_width_height"
......@@ -37,8 +36,7 @@
android:layout_gravity="center_vertical"
app:iiv_icon="gmd-lock"
android:layout_marginLeft="@dimen/big_spacing"
android:layout_marginRight="@dimen/big_spacing"
/>
android:layout_marginRight="@dimen/big_spacing" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -46,8 +44,7 @@
android:orientation="horizontal"
android:paddingTop="@dimen/medium_spacing"
android:paddingRight="@dimen/medium_spacing"
android:paddingBottom="@dimen/medium_spacing"
>
android:paddingBottom="@dimen/medium_spacing">
<TextView
android:id="@+id/active_security_item_title"
android:layout_width="wrap_content"
......@@ -56,8 +53,7 @@
android:layout_gravity="center_vertical"
android:layout_centerVertical="true"
android:textColor="@color/md_dark_background"
android:textSize="@dimen/medium_text"
/>
android:textSize="@dimen/medium_text" />
<android.support.v7.widget.SwitchCompat
android:id="@+id/active_security_switch"
android:layout_width="wrap_content"
......@@ -66,8 +62,7 @@
android:button="@null"
android:hapticFeedbackEnabled="true"
android:layout_centerVertical="true"
android:layout_alignParentEnd="true"
/>
android:layout_alignParentEnd="true" />
</RelativeLayout>
</LinearLayout>
<!--USE FINGERPRINT-->
......@@ -145,8 +140,7 @@
android:layout_height="wrap_content"
android:orientation="horizontal"
android:background="@drawable/ripple"
android:clickable="true"
>
android:clickable="true">
<com.mikepenz.iconics.view.IconicsImageView
android:id="@+id/security_body_apply_hidden_icon"
android:layout_width="@dimen/icon_width_height"
......@@ -154,8 +148,7 @@
android:layout_gravity="center_vertical"
app:iiv_icon="faw-low-vision"
android:layout_marginLeft="@dimen/big_spacing"
android:layout_marginRight="@dimen/big_spacing"
/>
android:layout_marginRight="@dimen/big_spacing" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -163,8 +156,7 @@
android:orientation="horizontal"
android:paddingTop="@dimen/medium_spacing"
android:paddingRight="@dimen/medium_spacing"
android:paddingBottom="@dimen/medium_spacing"
>
android:paddingBottom="@dimen/medium_spacing">
<TextView
android:id="@+id/security_body_apply_hidden_title"
android:layout_width="wrap_content"
......@@ -173,8 +165,7 @@
android:layout_centerVertical="true"
android:text="@string/hidden_folder"
android:textColor="@color/md_dark_background"
android:textSize="@dimen/medium_text"
/>
android:textSize="@dimen/medium_text" />
<android.support.v7.widget.SwitchCompat
android:id="@+id/security_body_apply_hidden_switch"
android:layout_width="wrap_content"
......@@ -183,8 +174,7 @@
android:button="@null"
android:hapticFeedbackEnabled="true"
android:layout_centerVertical="true"
android:layout_alignParentEnd="true"
/>
android:layout_alignParentEnd="true" />
</RelativeLayout>
</LinearLayout>
<!--DELETE ACTION-->
......@@ -195,8 +185,7 @@
android:layout_height="wrap_content"
android:orientation="horizontal"
android:background="@drawable/ripple"
android:clickable="true"
>
android:clickable="true">
<com.mikepenz.iconics.view.IconicsImageView
android:id="@+id/security_body_apply_delete_icon"
android:layout_width="@dimen/icon_width_height"
......@@ -205,8 +194,7 @@
android:gravity="center_vertical"
app:iiv_icon="gmd-delete"
android:layout_marginLeft="@dimen/big_spacing"
android:layout_marginRight="@dimen/big_spacing"
/>
android:layout_marginRight="@dimen/big_spacing" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -214,16 +202,14 @@
android:orientation="horizontal"
android:paddingTop="@dimen/medium_spacing"
android:paddingRight="@dimen/medium_spacing"
android:paddingBottom="@dimen/medium_spacing"
>
android:paddingBottom="@dimen/medium_spacing">
<TextView
android:id="@+id/security_body_apply_delete_title"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/delete"
android:textColor="@color/md_dark_background"
android:textSize="@dimen/medium_text"
/>
android:textSize="@dimen/medium_text" />
<android.support.v7.widget.SwitchCompat
android:id="@+id/security_body_apply_delete_switch"
android:layout_width="wrap_content"
......@@ -232,8 +218,7 @@
android:button="@null"
android:hapticFeedbackEnabled="true"
android:layout_centerVertical="true"
android:layout_alignParentEnd="true"
/>
android:layout_alignParentEnd="true" />
</RelativeLayout>
</LinearLayout>
</LinearLayout>
......
......@@ -13,7 +13,6 @@
android:background="@color/md_dark_appbar"
android:windowActionBarOverlay="true"
/>
<org.horaapps.leafpic.views.HackyViewPager
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/photos_pager"
......
......@@ -10,24 +10,20 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_centerInParent="true"
>
android:layout_centerInParent="true">
<ImageView
android:id="@+id/imgLogo"
android:layout_width="175dp"
android:layout_height="175dp"
android:src="@drawable/leaf_pic"
android:scaleType="fitXY"
/>
android:scaleType="fitXY" />
<ProgressBar
android:id="@+id/progress_splash"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:paddingTop="40dp"
/>
android:paddingTop="40dp" />
</LinearLayout>
<!--
<TextView
android:id="@+id/txtLogo"
......
......@@ -12,8 +12,7 @@
android:id="@+id/toolbar"
layout="@layout/toolbar"
android:background="@color/md_dark_appbar"
android:windowActionBarOverlay="true"
/>
android:windowActionBarOverlay="true" />
<RelativeLayout
android:id="@+id/rl_ea"
android:layout_width="match_parent"
......@@ -23,8 +22,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scrollbars="vertical"
android:scrollbarThumbVertical="@drawable/ic_scrollbar"
/>
android:scrollbarThumbVertical="@drawable/ic_scrollbar" />
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -34,8 +32,7 @@
android:visibility="invisible"
android:textSize="@dimen/sub_big_text"
android:gravity="center"
android:layout_centerInParent="true"
/>
android:layout_centerInParent="true" />
</RelativeLayout>
</LinearLayout>
</android.support.design.widget.CoordinatorLayout>
\ No newline at end of file
......@@ -13,74 +13,68 @@
android:id="@+id/cont"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<org.horaapps.leafpic.views.SquareRelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/header_album_card"
>
<com.mikepenz.iconics.view.IconicsImageView
android:id="@+id/selected_icon"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:layout_gravity="center"
android:elevation="10dp"
android:visibility="gone"
app:iiv_color="@color/md_white_1000"
app:iiv_icon="gmd-check"
tools:targetApi="lollipop" />
<org.horaapps.leafpic.views.SquareImageView
android:id="@+id/album_preview"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:scaleType="centerCrop"
/>
<LinearLayout
android:id="@+id/linear_card_text"
android:layout_width="match_parent"
<org.horaapps.leafpic.views.SquareRelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_alignParentStart="true"
android:orientation="horizontal"
android:padding="@dimen/small_spacing">
android:id="@+id/header_album_card"
>
<com.mikepenz.iconics.view.IconicsImageView
android:id="@+id/selected_icon"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:layout_gravity="center"
android:elevation="@dimen/icon_elevation"
android:visibility="gone"
app:iiv_color="@color/md_white_1000"
app:iiv_icon="gmd-check"
tools:targetApi="lollipop" />
<org.horaapps.leafpic.views.SquareImageView
android:id="@+id/album_preview"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:scaleType="centerCrop" />
<LinearLayout
android:layout_width="wrap_content"
android:id="@+id/linear_card_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/ll_n_media"
android:orientation="horizontal">
<TextView
android:id="@+id/album_photos_count"
android:layout_alignParentBottom="true"
android:layout_alignParentStart="true"
android:orientation="horizontal"
android:padding="@dimen/small_spacing">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxLines="1"
android:paddingEnd="4dp"
android:textColor="@android:color/white"
android:textSize="14sp"
/>
android:id="@+id/ll_n_media"
android:orientation="horizontal">
<TextView
android:id="@+id/album_photos_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxLines="1"
android:paddingEnd="4dp"
android:textColor="@android:color/white"
android:textSize="@dimen/sub_medium_text" />
<TextView
android:id="@+id/album_media_label"
android:layout_width="match_parent"
android:text="@string/media"
android:layout_height="wrap_content"
android:maxLines="1"
android:visibility="gone"
android:textColor="@android:color/white"
android:textSize="@dimen/sub_medium_text" />
</LinearLayout>
<TextView
android:id="@+id/album_media_label"
android:layout_width="match_parent"
android:text="@string/media"
android:paddingLeft="@dimen/sub_small_spacing"
android:id="@+id/album_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxLines="1"
android:visibility="gone"
android:textColor="@android:color/white"
android:textSize="14sp"
/>
android:textSize="@dimen/medium_text" />
</LinearLayout>
<TextView
android:paddingLeft="@dimen/sub_small_spacing"
android:id="@+id/album_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxLines="1"
android:textColor="@android:color/white"
android:textSize="16sp"
/>
</LinearLayout>
</org.horaapps.leafpic.views.SquareRelativeLayout>
</org.horaapps.leafpic.views.SquareRelativeLayout>
</LinearLayout>
</android.support.v7.widget.CardView>
......@@ -13,75 +13,69 @@
android:id="@+id/cont"
android:layout_width="wrap_content"
android:layout_height="wrap_content">
<org.horaapps.leafpic.views.SquareRelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/header_album_card"
>
<com.mikepenz.iconics.view.IconicsImageView
android:id="@+id/selected_icon"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:layout_gravity="center"
android:elevation="10dp"
android:visibility="gone"
app:iiv_color="@color/md_white_1000"
app:iiv_icon="gmd-check"
tools:targetApi="lollipop" />
<org.horaapps.leafpic.views.SquareImageView
android:id="@+id/album_preview"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:scaleType="centerCrop"
/>
<LinearLayout
android:id="@+id/linear_card_text"
android:layout_width="match_parent"
<org.horaapps.leafpic.views.SquareRelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_alignParentStart="true"
android:orientation="vertical"
android:paddingLeft="@dimen/sub_medium_spacing"
android:paddingRight="@dimen/sub_medium_spacing"
android:paddingBottom="@dimen/small_spacing"
android:paddingTop="@dimen/small_spacing"
android:id="@+id/header_album_card"
>
<TextView
android:id="@+id/album_name"
<com.mikepenz.iconics.view.IconicsImageView
android:id="@+id/selected_icon"
android:layout_width="40dp"
android:layout_height="40dp"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:layout_gravity="center"
android:elevation="@dimen/icon_elevation"
android:visibility="gone"
app:iiv_color="@color/md_white_1000"
app:iiv_icon="gmd-check"
tools:targetApi="lollipop" />
<org.horaapps.leafpic.views.SquareImageView
android:id="@+id/album_preview"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:maxLines="1"
android:textColor="@android:color/white"
android:textSize="16sp"
/>
android:scaleType="centerCrop" />
<LinearLayout
android:id="@+id/linear_card_text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/ll_n_media"
android:orientation="horizontal">
android:layout_alignParentBottom="true"
android:layout_alignParentStart="true"
android:orientation="vertical"
android:paddingLeft="@dimen/sub_medium_spacing"
android:paddingRight="@dimen/sub_medium_spacing"
android:paddingBottom="@dimen/small_spacing"
android:paddingTop="@dimen/small_spacing">
<TextView
android:id="@+id/album_photos_count"
android:layout_width="wrap_content"
android:id="@+id/album_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:maxLines="1"
android:paddingEnd="4dp"
android:textColor="@android:color/white"
android:textSize="14sp"
/>
<TextView
android:id="@+id/album_media_label"
android:layout_width="wrap_content"
android:text="@string/media"
android:textSize="@dimen/medium_text" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:maxLines="1"
android:textColor="@android:color/white"
android:textSize="14sp"
/>
android:id="@+id/ll_n_media"
android:orientation="horizontal">
<TextView
android:id="@+id/album_photos_count"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:maxLines="1"
android:paddingEnd="4dp"
android:textColor="@android:color/white"
android:textSize="@dimen/sub_medium_text" />
<TextView
android:id="@+id/album_media_label"
android:layout_width="wrap_content"
android:text="@string/media"
android:layout_height="wrap_content"
android:maxLines="1"
android:textColor="@android:color/white"
android:textSize="@dimen/sub_medium_text" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
</org.horaapps.leafpic.views.SquareRelativeLayout>
</org.horaapps.leafpic.views.SquareRelativeLayout>
</LinearLayout>
</android.support.v7.widget.CardView>
......@@ -27,25 +27,22 @@
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:layout_gravity="center"
android:elevation="10dp"
android:elevation="@dimen/icon_elevation"
android:visibility="gone"
app:iiv_color="@color/md_white_1000"
app:iiv_icon="gmd-check"
tools:targetApi="lollipop" />
<org.horaapps.leafpic.views.SquareImageView
android:id="@+id/album_preview"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:scaleType="centerCrop"
/>
android:scaleType="centerCrop" />
</org.horaapps.leafpic.views.SquareRelativeLayout>
<View
android:id="@+id/album_card_divider"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_below="@id/header_album_card"
/>
android:layout_below="@id/header_album_card" />
<LinearLayout
android:id="@+id/linear_card_text"
android:layout_width="match_parent"
......@@ -57,17 +54,14 @@
android:paddingLeft="@dimen/sub_medium_spacing"
android:paddingRight="@dimen/sub_medium_spacing"
android:paddingBottom="@dimen/small_spacing"
android:paddingTop="@dimen/small_spacing"
>
android:paddingTop="@dimen/small_spacing">
<TextView
android:id="@+id/album_name"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:maxLines="1"
android:textColor="@android:color/white"
android:textSize="16sp"
/>
android:textSize="@dimen/medium_text" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
......@@ -80,8 +74,7 @@
android:paddingEnd="4dp"
android:maxLines="1"
android:textColor="@android:color/white"
android:textSize="14sp"
/>
android:textSize="@dimen/sub_medium_text" />
<TextView
android:id="@+id/album_media_label"
android:layout_width="wrap_content"
......@@ -89,10 +82,8 @@
android:layout_height="wrap_content"
android:maxLines="1"
android:textColor="@android:color/white"
android:textSize="14sp"
/>
android:textSize="@dimen/sub_medium_text" />
</LinearLayout>
</LinearLayout>
</RelativeLayout>
</LinearLayout>
......
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="wrap_content">
<LinearLayout
android:id="@+id/linear_card_excluded"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
android:weightSum="10"
android:paddingTop="5dp"
android:foreground="@drawable/ripple"
android:clickable="true"
android:paddingBottom="5dp"
>
<com.mikepenz.iconics.view.IconicsImageView
android:id="@+id/folder_icon"
android:layout_height="20dp"
android:layout_width="0dp"
android:layout_gravity="center_vertical"
android:layout_weight="2"
app:iiv_icon="gmd-folder"
/>
<LinearLayout
android:layout_height="wrap_content"
android:layout_width="0dp"
android:orientation="vertical"
android:layout_weight="6"
>
<TextView
android:id="@+id/folder_name"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/md_dark_background"
android:textSize="16sp"
/>
<TextView
android:id="@+id/folder_path"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/md_grey_400"
android:textSize="14sp"
/>
</LinearLayout>
<com.mikepenz.iconics.view.IconicsImageView
android:id="@+id/tracked_status"
android:layout_height="16dp"
android:layout_width="0dp"
android:layout_gravity="center_vertical"
android:layout_weight="2"
app:iiv_icon="gmd-close"
android:clickable="true"
android:background="@drawable/ripple"
/>
</LinearLayout>
</FrameLayout>
\ No newline at end of file
......@@ -7,14 +7,12 @@
android:layout_width="wrap_content"
android:foreground="@drawable/ripple"
android:layout_height="wrap_content">
<ImageView
android:id="@+id/photo_preview"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:scaleType="centerCrop"
/>
<TextView
android:id="@+id/photo_path"
android:layout_width="match_parent"
......@@ -26,33 +24,28 @@
android:textSize="@dimen/medium_small_text"
android:maxLines="1"
android:layout_alignParentBottom="true"
tools:targetApi="lollipop"
/>
tools:targetApi="lollipop" />
<com.mikepenz.iconics.view.IconicsImageView
android:id="@+id/gif_icon"
android:layout_width="16dp"
android:layout_height="16dp"
android:layout_width="@dimen/icon_sub_width_height"
android:layout_height="@dimen/icon_sub_width_height"
android:layout_marginBottom="2dp"
android:layout_marginStart="4dp"
android:layout_alignParentBottom="true"
android:layout_alignParentStart="true"
android:visibility="gone"
android:elevation="10dp"
android:elevation="@dimen/icon_elevation"
app:iiv_color="@color/md_white_1000"
app:iiv_icon="gmd-gif"
tools:targetApi="lollipop"
/>
tools:targetApi="lollipop" />
<com.mikepenz.iconics.view.IconicsImageView
android:id="@+id/icon"
android:layout_width="26dp"
android:layout_height="26dp"
android:elevation="10dp"
android:elevation="@dimen/icon_elevation"
android:visibility="gone"
android:layout_centerInParent="true"
app:iiv_color="@color/md_white_1000"
app:iiv_icon="gmd-play-circle-filled"
tools:targetApi="lollipop"
/>
tools:targetApi="lollipop" />
</org.horaapps.leafpic.views.SquareRelativeLayout>
......@@ -5,12 +5,11 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">