Mirrors/FossifyGallery
2
0
Fork 1
mirror of https://github.com/FossifyOrg/Gallery.git synced 2025-02-18 19:54:22 +01:00
Code Issues Projects Releases Packages Wiki Activity

couple edits to the exclude/include icon

Browse source
This commit is contained in:
tibbi 2017-03-18 18:34:46 +01:00
parent 4ee604962f
commit fc1fd0f505
9 changed files with 11 additions and 16 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/src/main/kotlin/com/simplemobiletools/gallery/activities/ExcludedFoldersActivity.kt
View file

@ -32,7 +32,6 @@ class ExcludedFoldersActivity : SimpleActivity() {
} }
managed_folders_icon.apply { managed_folders_icon.apply {
setColorFilter(config.textColor, PorterDuff.Mode.SRC_IN) setColorFilter(config.textColor, PorterDuff.Mode.SRC_IN)
alpha = 0.7f
setOnClickListener { setOnClickListener {
config.removeExcludedFolder(folder) config.removeExcludedFolder(folder)
updateExcludedFolders() updateExcludedFolders()

1
app/src/main/kotlin/com/simplemobiletools/gallery/activities/IncludedFoldersActivity.kt
View file

@ -33,7 +33,6 @@ class IncludedFoldersActivity : SimpleActivity() {
} }
managed_folders_icon.apply { managed_folders_icon.apply {
setColorFilter(config.textColor, PorterDuff.Mode.SRC_IN) setColorFilter(config.textColor, PorterDuff.Mode.SRC_IN)
alpha = 0.7f
setOnClickListener { setOnClickListener {
config.removeIncludedFolder(folder) config.removeIncludedFolder(folder)
updateIncludedFolders() updateIncludedFolders()

4
app/src/main/kotlin/com/simplemobiletools/gallery/extensions/activity.kt
View file

@ -22,7 +22,7 @@ import com.simplemobiletools.gallery.helpers.NOMEDIA
import com.simplemobiletools.gallery.helpers.REQUEST_EDIT_IMAGE import com.simplemobiletools.gallery.helpers.REQUEST_EDIT_IMAGE
import com.simplemobiletools.gallery.helpers.REQUEST_SET_WALLPAPER import com.simplemobiletools.gallery.helpers.REQUEST_SET_WALLPAPER
import com.simplemobiletools.gallery.models.Medium import com.simplemobiletools.gallery.models.Medium
import com.simplemobiletools.gallery.views.MyImageView import com.simplemobiletools.gallery.views.MySquareImageView
import com.squareup.picasso.Picasso import com.squareup.picasso.Picasso
import java.io.File import java.io.File
import java.util.* import java.util.*
@ -186,7 +186,7 @@ fun SimpleActivity.removeNoMedia(path: String, callback: () -> Unit) {
} }
} }
fun Activity.loadImage(path: String, size: Int, target: MyImageView) { fun Activity.loadImage(path: String, size: Int, target: MySquareImageView) {
if (path.isImageFast()) { if (path.isImageFast()) {
Picasso.with(this) Picasso.with(this)
.load("file:$path") .load("file:$path")

11
app/src/main/kotlin/com/simplemobiletools/gallery/views/MyImageView.kt → app/src/main/kotlin/com/simplemobiletools/gallery/views/MySquareImageView.kt
View file

@ -4,16 +4,13 @@ import android.content.Context
import android.util.AttributeSet import android.util.AttributeSet
import android.widget.ImageView import android.widget.ImageView
class MyImageView : ImageView { class MySquareImageView : ImageView {
constructor(context: Context) : super(context) { constructor(context: Context) : super(context)
}
constructor(context: Context, attrs: AttributeSet) : super(context, attrs) { constructor(context: Context, attrs: AttributeSet) : super(context, attrs)
}
constructor(context: Context, attrs: AttributeSet, defStyle: Int) : super(context, attrs, defStyle) { constructor(context: Context, attrs: AttributeSet, defStyle: Int) : super(context, attrs, defStyle)
}
override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) { override fun onMeasure(widthMeasureSpec: Int, heightMeasureSpec: Int) {
super.onMeasure(widthMeasureSpec, heightMeasureSpec) super.onMeasure(widthMeasureSpec, heightMeasureSpec)

2
app/src/main/res/layout-v23/directory_tmb.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<com.simplemobiletools.gallery.views.MyImageView <com.simplemobiletools.gallery.views.MySquareImageView
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/dir_thumbnail" android:id="@+id/dir_thumbnail"
android:layout_width="match_parent" android:layout_width="match_parent"

2
app/src/main/res/layout-v23/photo_video_tmb.xml
View file

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<com.simplemobiletools.gallery.views.MyImageView <com.simplemobiletools.gallery.views.MySquareImageView
xmlns:android="http://schemas.android.com/apk/res/android" xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/medium_thumbnail" android:id="@+id/medium_thumbnail"
android:layout_width="match_parent" android:layout_width="match_parent"

2
app/src/main/res/layout/directory_tmb.xml
View file

@ -7,7 +7,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<com.simplemobiletools.gallery.views.MyImageView <com.simplemobiletools.gallery.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"/>

2
app/src/main/res/layout/item_manage_folder.xml
View file

@ -16,7 +16,7 @@
android:layout_toLeftOf="@+id/managed_folders_icon" android:layout_toLeftOf="@+id/managed_folders_icon"
android:layout_toStartOf="@+id/managed_folders_icon"/> android:layout_toStartOf="@+id/managed_folders_icon"/>
<com.simplemobiletools.gallery.views.MyImageView <ImageView
android:id="@+id/managed_folders_icon" android:id="@+id/managed_folders_icon"
style="@style/MyBorderlessBackgroundStyle" style="@style/MyBorderlessBackgroundStyle"
android:layout_width="@dimen/exclude_folder_img_size" android:layout_width="@dimen/exclude_folder_img_size"

2
app/src/main/res/layout/photo_video_tmb.xml
View file

@ -7,7 +7,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent">
<com.simplemobiletools.gallery.views.MyImageView <com.simplemobiletools.gallery.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"/>