mirror of
https://github.com/FossifyOrg/Gallery.git
synced 2024-11-26 22:47:59 +01:00
showd fastscroller bubble at horizontal scrolling tii
This commit is contained in:
parent
fbcee2c7a0
commit
0285b97a17
9 changed files with 21 additions and 33 deletions
|
@ -43,7 +43,7 @@ ext {
|
||||||
}
|
}
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
implementation 'com.simplemobiletools:commons:3.1.7'
|
implementation 'com.simplemobiletools:commons:3.1.9'
|
||||||
implementation 'com.davemorrissey.labs:subsampling-scale-image-view:3.8.0'
|
implementation 'com.davemorrissey.labs:subsampling-scale-image-view:3.8.0'
|
||||||
implementation 'com.theartofdev.edmodo:android-image-cropper:2.4.0'
|
implementation 'com.theartofdev.edmodo:android-image-cropper:2.4.0'
|
||||||
implementation 'com.android.support:multidex:1.0.2'
|
implementation 'com.android.support:multidex:1.0.2'
|
||||||
|
|
|
@ -583,7 +583,10 @@ class MainActivity : SimpleActivity(), DirectoryAdapter.DirOperationsListener {
|
||||||
directories_horizontal_fastscroller.beVisibleIf(allowHorizontalScroll)
|
directories_horizontal_fastscroller.beVisibleIf(allowHorizontalScroll)
|
||||||
|
|
||||||
if (allowHorizontalScroll) {
|
if (allowHorizontalScroll) {
|
||||||
directories_horizontal_fastscroller.setViews(directories_grid, directories_refresh_layout)
|
directories_horizontal_fastscroller.allowBubbleDisplay = config.showInfoBubble
|
||||||
|
directories_horizontal_fastscroller.setViews(directories_grid, directories_refresh_layout) {
|
||||||
|
directories_horizontal_fastscroller.updateBubbleText(mDirs[it].getBubbleText())
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
directories_vertical_fastscroller.allowBubbleDisplay = config.showInfoBubble
|
directories_vertical_fastscroller.allowBubbleDisplay = config.showInfoBubble
|
||||||
directories_vertical_fastscroller.setViews(directories_grid, directories_refresh_layout) {
|
directories_vertical_fastscroller.setViews(directories_grid, directories_refresh_layout) {
|
||||||
|
|
|
@ -203,7 +203,10 @@ class MediaActivity : SimpleActivity(), MediaAdapter.MediaOperationsListener {
|
||||||
media_horizontal_fastscroller.beVisibleIf(allowHorizontalScroll)
|
media_horizontal_fastscroller.beVisibleIf(allowHorizontalScroll)
|
||||||
|
|
||||||
if (allowHorizontalScroll) {
|
if (allowHorizontalScroll) {
|
||||||
media_horizontal_fastscroller.setViews(media_grid, media_refresh_layout)
|
media_horizontal_fastscroller.allowBubbleDisplay = config.showInfoBubble
|
||||||
|
media_horizontal_fastscroller.setViews(media_grid, media_refresh_layout) {
|
||||||
|
media_horizontal_fastscroller.updateBubbleText(mMedia[it].getBubbleText())
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
media_vertical_fastscroller.allowBubbleDisplay = config.showInfoBubble
|
media_vertical_fastscroller.allowBubbleDisplay = config.showInfoBubble
|
||||||
media_vertical_fastscroller.setViews(media_grid, media_refresh_layout) {
|
media_vertical_fastscroller.setViews(media_grid, media_refresh_layout) {
|
||||||
|
|
|
@ -84,7 +84,10 @@ class PickDirectoryDialog(val activity: BaseSimpleActivity, val sourcePath: Stri
|
||||||
directories_horizontal_fastscroller.beVisibleIf(scrollHorizontally)
|
directories_horizontal_fastscroller.beVisibleIf(scrollHorizontally)
|
||||||
|
|
||||||
if (scrollHorizontally) {
|
if (scrollHorizontally) {
|
||||||
directories_horizontal_fastscroller.setViews(directories_grid)
|
directories_horizontal_fastscroller.allowBubbleDisplay = activity.config.showInfoBubble
|
||||||
|
directories_horizontal_fastscroller.setViews(directories_grid) {
|
||||||
|
directories_horizontal_fastscroller.updateBubbleText(dirs[it].getBubbleText())
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
directories_vertical_fastscroller.allowBubbleDisplay = activity.config.showInfoBubble
|
directories_vertical_fastscroller.allowBubbleDisplay = activity.config.showInfoBubble
|
||||||
directories_vertical_fastscroller.setViews(directories_grid) {
|
directories_vertical_fastscroller.setViews(directories_grid) {
|
||||||
|
|
|
@ -74,7 +74,10 @@ class PickMediumDialog(val activity: BaseSimpleActivity, val path: String, val c
|
||||||
media_horizontal_fastscroller.beVisibleIf(scrollHorizontally)
|
media_horizontal_fastscroller.beVisibleIf(scrollHorizontally)
|
||||||
|
|
||||||
if (scrollHorizontally) {
|
if (scrollHorizontally) {
|
||||||
media_horizontal_fastscroller.setViews(media_grid)
|
media_horizontal_fastscroller.allowBubbleDisplay = activity.config.showInfoBubble
|
||||||
|
media_horizontal_fastscroller.setViews(media_grid) {
|
||||||
|
media_horizontal_fastscroller.updateBubbleText(media[it].getBubbleText())
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
media_vertical_fastscroller.allowBubbleDisplay = activity.config.showInfoBubble
|
media_vertical_fastscroller.allowBubbleDisplay = activity.config.showInfoBubble
|
||||||
media_vertical_fastscroller.setViews(media_grid) {
|
media_vertical_fastscroller.setViews(media_grid) {
|
||||||
|
|
|
@ -63,13 +63,7 @@
|
||||||
android:layout_alignParentStart="true"
|
android:layout_alignParentStart="true"
|
||||||
android:paddingTop="@dimen/normal_margin">
|
android:paddingTop="@dimen/normal_margin">
|
||||||
|
|
||||||
<ImageView
|
<include layout="@layout/fastscroller_handle_horizontal"/>
|
||||||
android:id="@+id/fastscroller_handle_horizontal"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_gravity="bottom"
|
|
||||||
android:alpha="0"
|
|
||||||
android:background="@drawable/fastscroller_handle_horizontal"/>
|
|
||||||
|
|
||||||
</com.simplemobiletools.commons.views.FastScroller>
|
</com.simplemobiletools.commons.views.FastScroller>
|
||||||
</RelativeLayout>
|
</RelativeLayout>
|
||||||
|
|
|
@ -63,13 +63,7 @@
|
||||||
android:layout_alignParentStart="true"
|
android:layout_alignParentStart="true"
|
||||||
android:paddingTop="@dimen/normal_margin">
|
android:paddingTop="@dimen/normal_margin">
|
||||||
|
|
||||||
<ImageView
|
<include layout="@layout/fastscroller_handle_horizontal"/>
|
||||||
android:id="@+id/fastscroller_handle_horizontal"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_gravity="bottom"
|
|
||||||
android:alpha="0"
|
|
||||||
android:background="@drawable/fastscroller_handle_horizontal"/>
|
|
||||||
|
|
||||||
</com.simplemobiletools.commons.views.FastScroller>
|
</com.simplemobiletools.commons.views.FastScroller>
|
||||||
</RelativeLayout>
|
</RelativeLayout>
|
||||||
|
|
|
@ -37,13 +37,7 @@
|
||||||
android:layout_alignParentStart="true"
|
android:layout_alignParentStart="true"
|
||||||
android:paddingTop="@dimen/normal_margin">
|
android:paddingTop="@dimen/normal_margin">
|
||||||
|
|
||||||
<ImageView
|
<include layout="@layout/fastscroller_handle_horizontal"/>
|
||||||
android:id="@+id/fastscroller_handle_horizontal"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_gravity="bottom"
|
|
||||||
android:alpha="0"
|
|
||||||
android:background="@drawable/fastscroller_handle_horizontal"/>
|
|
||||||
|
|
||||||
</com.simplemobiletools.commons.views.FastScroller>
|
</com.simplemobiletools.commons.views.FastScroller>
|
||||||
</RelativeLayout>
|
</RelativeLayout>
|
||||||
|
|
|
@ -36,13 +36,7 @@
|
||||||
android:layout_alignParentStart="true"
|
android:layout_alignParentStart="true"
|
||||||
android:paddingTop="@dimen/normal_margin">
|
android:paddingTop="@dimen/normal_margin">
|
||||||
|
|
||||||
<ImageView
|
<include layout="@layout/fastscroller_handle_horizontal"/>
|
||||||
android:id="@+id/fastscroller_handle_horizontal"
|
|
||||||
android:layout_width="wrap_content"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_gravity="bottom"
|
|
||||||
android:alpha="0"
|
|
||||||
android:background="@drawable/fastscroller_handle_horizontal"/>
|
|
||||||
|
|
||||||
</com.simplemobiletools.commons.views.FastScroller>
|
</com.simplemobiletools.commons.views.FastScroller>
|
||||||
</RelativeLayout>
|
</RelativeLayout>
|
||||||
|
|
Loading…
Reference in a new issue