diff options
Diffstat (limited to 'app/src/main/res/layout')
| -rw-r--r-- | app/src/main/res/layout/activity_image.xml | 57 | ||||
| -rw-r--r-- | app/src/main/res/layout/activity_image_textless.xml | 19 |
2 files changed, 45 insertions, 31 deletions
diff --git a/app/src/main/res/layout/activity_image.xml b/app/src/main/res/layout/activity_image.xml index 4e6d4ce1..85837fc3 100644 --- a/app/src/main/res/layout/activity_image.xml +++ b/app/src/main/res/layout/activity_image.xml @@ -12,31 +12,6 @@ android:layout_height="wrap_content" android:layout_gravity="center" /> - <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"> - - <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" /> - - <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.sothree.slidinguppanel.SlidingUpPanelLayout> - <com.google.android.material.floatingactionbutton.FloatingActionButton android:id="@+id/image_fab" android:layout_width="wrap_content" @@ -45,4 +20,36 @@ android:layout_margin="@dimen/kau_fab_margin" android:visibility="invisible" /> + <com.pitchedapps.frost.views.DragFrame + android:id="@+id/image_drag" + 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"> + + <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.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.sothree.slidinguppanel.SlidingUpPanelLayout> + + </com.pitchedapps.frost.views.DragFrame> + </androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/activity_image_textless.xml b/app/src/main/res/layout/activity_image_textless.xml index e047b23d..41fd43a2 100644 --- a/app/src/main/res/layout/activity_image_textless.xml +++ b/app/src/main/res/layout/activity_image_textless.xml @@ -11,13 +11,20 @@ android:layout_height="wrap_content" android:layout_gravity="center" /> - <com.davemorrissey.labs.subscaleview.SubsamplingScaleImageView - android:id="@+id/image_photo" + <com.pitchedapps.frost.views.DragFrame + android:id="@+id/image_drag" android:layout_width="match_parent" - android:layout_height="match_parent" - android:alpha="0" - android:scaleX="0.9" - android:scaleY="0.9" /> + 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" |