diff options
author | Renard1911 | 2016-04-11 17:52:55 -0300 |
---|---|---|
committer | Renard1911 | 2016-04-11 17:52:55 -0300 |
commit | c94f0e1d27f0a92a17b2e65363bdce6461249d95 (patch) | |
tree | 6990d471d884ad87a2be9234e40fd2a91f6bb827 /app/src/main/res/layout | |
parent | 0f3adf23154e6d7e0eaced70a31676d71bef8e34 (diff) | |
parent | 90ee611af8ba4c38e70f27eb0df55e9134ad625c (diff) | |
download | BaiApp-1.6.0.tar.gz BaiApp-1.6.0.tar.xz BaiApp-1.6.0.zip |
Merge pull request #1 from Renard1911/devv1.6.0
Dev
Diffstat (limited to 'app/src/main/res/layout')
-rw-r--r-- | app/src/main/res/layout/activity_response.xml | 1 | ||||
-rw-r--r-- | app/src/main/res/layout/activity_viewer.xml | 20 | ||||
-rw-r--r-- | app/src/main/res/layout/fragment_fragment_image.xml | 42 | ||||
-rw-r--r-- | app/src/main/res/layout/fragment_fragment_thread_list.xml | 1 |
4 files changed, 51 insertions, 13 deletions
diff --git a/app/src/main/res/layout/activity_response.xml b/app/src/main/res/layout/activity_response.xml index bfd143e..15d35eb 100644 --- a/app/src/main/res/layout/activity_response.xml +++ b/app/src/main/res/layout/activity_response.xml @@ -1,7 +1,6 @@ <?xml version="1.0" encoding="utf-8"?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools" - xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" android:paddingBottom="@dimen/activity_vertical_margin" diff --git a/app/src/main/res/layout/activity_viewer.xml b/app/src/main/res/layout/activity_viewer.xml index b66e66b..7febe39 100644 --- a/app/src/main/res/layout/activity_viewer.xml +++ b/app/src/main/res/layout/activity_viewer.xml @@ -4,21 +4,19 @@ android:layout_width="match_parent" android:layout_height="match_parent" tools:context="org.bienvenidoainternet.baiparser.ViewerActivity"> - - <com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView - android:id="@+id/imageView" - android:layout_width="match_parent" - android:layout_height="match_parent"/> - <pl.droidsonroids.gif.GifImageView - android:id="@+id/gifView" - android:layout_width="match_parent" - android:layout_height="match_parent"/> - <ProgressBar style="?android:attr/progressBarStyleHorizontal" android:layout_width="match_parent" android:layout_height="wrap_content" android:id="@+id/downloadProgressBar" android:layout_alignParentTop="true" - android:layout_centerHorizontal="true" /> + android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" /> + <android.support.v4.view.ViewPager + android:id="@+id/imagePager" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:layout_below="@+id/downloadProgressBar" + android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" /> </RelativeLayout> diff --git a/app/src/main/res/layout/fragment_fragment_image.xml b/app/src/main/res/layout/fragment_fragment_image.xml new file mode 100644 index 0000000..5d44190 --- /dev/null +++ b/app/src/main/res/layout/fragment_fragment_image.xml @@ -0,0 +1,42 @@ +<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" + tools:context="layout.FragmentImage" + android:orientation="vertical"> + + <RelativeLayout + android:orientation="horizontal" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:id="@+id/layoutOpenBrowser"> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textAppearance="?android:attr/textAppearanceMedium" + android:text="No se puede visualizar este archivo." + android:layout_centerVertical="true" + android:layout_centerHorizontal="true" + android:id="@+id/textView2" + android:textColor="#ff0000" /> + + <Button + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text="Abrir en el navegador" + android:id="@+id/btnLaunchBrowser" + android:layout_below="@+id/textView2" + android:layout_centerHorizontal="true" /> + </RelativeLayout> + + <com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView + android:id="@+id/imageView" + android:layout_width="match_parent" + android:layout_height="match_parent"/> + <pl.droidsonroids.gif.GifImageView + android:id="@+id/gifView" + android:layout_width="match_parent" + android:layout_height="match_parent"/> + +</LinearLayout> diff --git a/app/src/main/res/layout/fragment_fragment_thread_list.xml b/app/src/main/res/layout/fragment_fragment_thread_list.xml index af88df4..477c236 100644 --- a/app/src/main/res/layout/fragment_fragment_thread_list.xml +++ b/app/src/main/res/layout/fragment_fragment_thread_list.xml @@ -1,5 +1,4 @@ <RelativeLayout 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:layout_alignParentTop="true" |