diff options
Diffstat (limited to 'app/src/main/res')
| -rw-r--r-- | app/src/main/res/layout/activity_image.xml | 76 | ||||
| -rw-r--r-- | app/src/main/res/layout/activity_image_textless.xml | 37 |
2 files changed, 36 insertions, 77 deletions
diff --git a/app/src/main/res/layout/activity_image.xml b/app/src/main/res/layout/activity_image.xml index 85837fc3..2bf68056 100644 --- a/app/src/main/res/layout/activity_image.xml +++ b/app/src/main/res/layout/activity_image.xml @@ -1,44 +1,23 @@ <?xml version="1.0" encoding="utf-8"?> -<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto" - android:id="@+id/image_container" - android:layout_width="match_parent" - android:layout_height="match_parent"> - - <ProgressBar - android:id="@+id/image_progress" - style="?android:attr/progressBarStyleLarge" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center" /> - - <com.google.android.material.floatingactionbutton.FloatingActionButton - android:id="@+id/image_fab" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="end|bottom" - android:layout_margin="@dimen/kau_fab_margin" - android:visibility="invisible" /> - - <com.pitchedapps.frost.views.DragFrame - android:id="@+id/image_drag" +<layout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:app="http://schemas.android.com/apk/res-auto"> + + <androidx.coordinatorlayout.widget.CoordinatorLayout + android:id="@+id/image_container" android:layout_width="match_parent" android:layout_height="match_parent"> - <com.sothree.slidinguppanel.SlidingUpPanelLayout - android:id="@+id/image_panel" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:gravity="bottom" - app:umanoPanelHeight="44dp" - app:umanoShadowHeight="0dp"> + <ProgressBar + android:id="@+id/image_progress" + style="?android:attr/progressBarStyleLarge" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="center" /> - <TextView - android:id="@+id/image_text" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:alpha="0.5" - android:padding="@dimen/kau_padding_normal" /> + <com.pitchedapps.frost.views.DragFrame + android:id="@+id/image_drag" + android:layout_width="match_parent" + android:layout_height="match_parent"> <com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView android:id="@+id/image_photo" @@ -48,8 +27,25 @@ android:scaleX="0.9" android:scaleY="0.9" /> - </com.sothree.slidinguppanel.SlidingUpPanelLayout> - - </com.pitchedapps.frost.views.DragFrame> + </com.pitchedapps.frost.views.DragFrame> -</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file + <TextView + android:id="@+id/image_text" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:alpha="0.5" + android:padding="@dimen/kau_padding_normal" + app:behavior_peekHeight="44dp" + app:layout_behavior="@string/bottom_sheet_behavior" /> + + <com.google.android.material.floatingactionbutton.FloatingActionButton + android:id="@+id/image_fab" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_gravity="end|bottom" + android:layout_margin="@dimen/kau_fab_margin" + android:visibility="invisible" /> + + </androidx.coordinatorlayout.widget.CoordinatorLayout> + +</layout> diff --git a/app/src/main/res/layout/activity_image_textless.xml b/app/src/main/res/layout/activity_image_textless.xml deleted file mode 100644 index 41fd43a2..00000000 --- a/app/src/main/res/layout/activity_image_textless.xml +++ /dev/null @@ -1,37 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:id="@+id/image_container" - android:layout_width="match_parent" - android:layout_height="match_parent"> - - <ProgressBar - android:id="@+id/image_progress" - style="?android:attr/progressBarStyleLarge" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="center" /> - - <com.pitchedapps.frost.views.DragFrame - android:id="@+id/image_drag" - android:layout_width="match_parent" - android:layout_height="match_parent"> - - <com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView - android:id="@+id/image_photo" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:alpha="0" - android:scaleX="0.9" - android:scaleY="0.9" /> - - </com.pitchedapps.frost.views.DragFrame> - - <com.google.android.material.floatingactionbutton.FloatingActionButton - android:id="@+id/image_fab" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_gravity="end|bottom" - android:layout_margin="@dimen/kau_fab_margin" - android:visibility="invisible" /> - -</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file |