moving MySquareImageView into commons

This commit is contained in:
tibbi 2022-03-18 17:33:44 +01:00
parent a39f58a6bd
commit 4a3e502484
11 changed files with 10 additions and 30 deletions

View file

@ -77,7 +77,7 @@ android {
} }
dependencies { dependencies {
implementation 'com.github.SimpleMobileTools:Simple-Commons:9c6dda3926' implementation 'com.github.SimpleMobileTools:Simple-Commons:f5664f6db4'
implementation 'com.theartofdev.edmodo:android-image-cropper:2.8.0' implementation 'com.theartofdev.edmodo:android-image-cropper:2.8.0'
implementation 'it.sephiroth.android.exif:library:1.0.1' implementation 'it.sephiroth.android.exif:library:1.0.1'
implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.24' implementation 'pl.droidsonroids.gif:android-gif-drawable:1.2.24'

View file

@ -28,6 +28,7 @@ import com.bumptech.glide.request.target.Target
import com.bumptech.glide.signature.ObjectKey import com.bumptech.glide.signature.ObjectKey
import com.simplemobiletools.commons.extensions.* import com.simplemobiletools.commons.extensions.*
import com.simplemobiletools.commons.helpers.* import com.simplemobiletools.commons.helpers.*
import com.simplemobiletools.commons.views.MySquareImageView
import com.simplemobiletools.gallery.pro.R import com.simplemobiletools.gallery.pro.R
import com.simplemobiletools.gallery.pro.activities.SettingsActivity import com.simplemobiletools.gallery.pro.activities.SettingsActivity
import com.simplemobiletools.gallery.pro.asynctasks.GetMediaAsynctask import com.simplemobiletools.gallery.pro.asynctasks.GetMediaAsynctask
@ -36,7 +37,6 @@ import com.simplemobiletools.gallery.pro.helpers.*
import com.simplemobiletools.gallery.pro.interfaces.* import com.simplemobiletools.gallery.pro.interfaces.*
import com.simplemobiletools.gallery.pro.models.* import com.simplemobiletools.gallery.pro.models.*
import com.simplemobiletools.gallery.pro.svg.SvgSoftwareLayerSetter import com.simplemobiletools.gallery.pro.svg.SvgSoftwareLayerSetter
import com.simplemobiletools.gallery.pro.views.MySquareImageView
import com.squareup.picasso.Picasso import com.squareup.picasso.Picasso
import pl.droidsonroids.gif.GifDrawable import pl.droidsonroids.gif.GifDrawable
import java.io.File import java.io.File

View file

@ -1,20 +0,0 @@
package com.simplemobiletools.gallery.pro.views
import android.content.Context
import android.util.AttributeSet
import android.widget.ImageView
class MySquareImageView : ImageView {
var isHorizontalScrolling = false
constructor(context: Context) : super(context)
constructor(context: Context, attrs: AttributeSet) : super(context, attrs)
constructor(context: Context, attrs: AttributeSet, defStyle: Int) : super(context, attrs, defStyle)
override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
val spec = if (isHorizontalScrolling) heightMeasureSpec else widthMeasureSpec
super.onMeasure(spec, spec)
}
}

View file

@ -57,7 +57,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_below="@+id/folder_picker_holder"> android:layout_below="@+id/folder_picker_holder">
<com.simplemobiletools.gallery.pro.views.MySquareImageView <com.simplemobiletools.commons.views.MySquareImageView
android:id="@+id/config_image" android:id="@+id/config_image"
android:layout_width="@dimen/widget_initial_size" android:layout_width="@dimen/widget_initial_size"
android:layout_height="@dimen/widget_initial_size" android:layout_height="@dimen/widget_initial_size"

View file

@ -9,7 +9,7 @@
android:focusable="true" android:focusable="true"
android:paddingTop="@dimen/medium_margin"> android:paddingTop="@dimen/medium_margin">
<com.simplemobiletools.gallery.pro.views.MySquareImageView <com.simplemobiletools.commons.views.MySquareImageView
android:id="@+id/dir_thumbnail" android:id="@+id/dir_thumbnail"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" /> android:layout_height="match_parent" />

View file

@ -8,7 +8,7 @@
android:focusable="true" android:focusable="true"
android:padding="1px"> android:padding="1px">
<com.simplemobiletools.gallery.pro.views.MySquareImageView <com.simplemobiletools.commons.views.MySquareImageView
android:id="@+id/dir_thumbnail" android:id="@+id/dir_thumbnail"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" /> android:layout_height="match_parent" />

View file

@ -11,7 +11,7 @@
android:paddingTop="@dimen/small_margin" android:paddingTop="@dimen/small_margin"
android:paddingBottom="@dimen/small_margin"> android:paddingBottom="@dimen/small_margin">
<com.simplemobiletools.gallery.pro.views.MySquareImageView <com.simplemobiletools.commons.views.MySquareImageView
android:id="@+id/dir_thumbnail" android:id="@+id/dir_thumbnail"
android:layout_width="@dimen/list_view_folder_thumbnail_size" android:layout_width="@dimen/list_view_folder_thumbnail_size"
android:layout_height="@dimen/list_view_folder_thumbnail_size" /> android:layout_height="@dimen/list_view_folder_thumbnail_size" />

View file

@ -7,7 +7,7 @@
android:clickable="true" android:clickable="true"
android:focusable="true"> android:focusable="true">
<com.simplemobiletools.gallery.pro.views.MySquareImageView <com.simplemobiletools.commons.views.MySquareImageView
android:id="@+id/medium_thumbnail" android:id="@+id/medium_thumbnail"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" /> android:layout_height="match_parent" />

View file

@ -12,7 +12,7 @@
android:paddingTop="@dimen/small_margin" android:paddingTop="@dimen/small_margin"
android:paddingBottom="@dimen/small_margin"> android:paddingBottom="@dimen/small_margin">
<com.simplemobiletools.gallery.pro.views.MySquareImageView <com.simplemobiletools.commons.views.MySquareImageView
android:id="@+id/medium_thumbnail" android:id="@+id/medium_thumbnail"
android:layout_width="@dimen/list_view_folder_thumbnail_size" android:layout_width="@dimen/list_view_folder_thumbnail_size"
android:layout_height="@dimen/list_view_folder_thumbnail_size" /> android:layout_height="@dimen/list_view_folder_thumbnail_size" />

View file

@ -7,7 +7,7 @@
android:clickable="true" android:clickable="true"
android:focusable="true"> android:focusable="true">
<com.simplemobiletools.gallery.pro.views.MySquareImageView <com.simplemobiletools.commons.views.MySquareImageView
android:id="@+id/medium_thumbnail" android:id="@+id/medium_thumbnail"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" /> android:layout_height="match_parent" />

View file

@ -12,7 +12,7 @@
android:paddingTop="@dimen/small_margin" android:paddingTop="@dimen/small_margin"
android:paddingBottom="@dimen/small_margin"> android:paddingBottom="@dimen/small_margin">
<com.simplemobiletools.gallery.pro.views.MySquareImageView <com.simplemobiletools.commons.views.MySquareImageView
android:id="@+id/medium_thumbnail" android:id="@+id/medium_thumbnail"
android:layout_width="@dimen/list_view_folder_thumbnail_size" android:layout_width="@dimen/list_view_folder_thumbnail_size"
android:layout_height="@dimen/list_view_folder_thumbnail_size" /> android:layout_height="@dimen/list_view_folder_thumbnail_size" />