PatchesAndForks/FossifyGalleryVisibilityPatch
1
0
Fork 0
forked from Mirrors/FossifyGallery
Code Pull requests Activity

updating commons, replace some new icons with vectors

Browse source
This commit is contained in:
tibbi 2019-08-09 11:02:20 +02:00
parent 1b5dae2e43
commit e7589591cb
18 changed files with 31 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
app/build.gradle
View file

@ -62,7 +62,7 @@ android {
} }
dependencies { dependencies {
implementation 'com.simplemobiletools:commons:5.15.24' implementation 'com.simplemobiletools:commons:5.15.25'
implementation 'com.theartofdev.edmodo:android-image-cropper:2.8.0' implementation 'com.theartofdev.edmodo:android-image-cropper:2.8.0'
implementation 'androidx.multidex:multidex:2.0.1' implementation 'androidx.multidex:multidex:2.0.1'
implementation 'it.sephiroth.android.exif:library:1.0.1' implementation 'it.sephiroth.android.exif:library:1.0.1'

8
app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/ViewPagerActivity.kt
View file

@ -620,12 +620,12 @@ class ViewPagerActivity : SimpleActivity(), ViewPager.OnPageChangeListener, View
private fun getChangeOrientationIcon(): Int { private fun getChangeOrientationIcon(): Int {
return if (mIsOrientationLocked) { return if (mIsOrientationLocked) {
if (requestedOrientation == ActivityInfo.SCREEN_ORIENTATION_PORTRAIT) { if (requestedOrientation == ActivityInfo.SCREEN_ORIENTATION_PORTRAIT) {
R.drawable.ic_orientation_portrait R.drawable.ic_orientation_portrait_vector
} else { } else {
R.drawable.ic_orientation_landscape R.drawable.ic_orientation_landscape_vector
} }
} else { } else {
R.drawable.ic_orientation_auto R.drawable.ic_orientation_auto_vector
} }
} }
@ -801,7 +801,7 @@ class ViewPagerActivity : SimpleActivity(), ViewPager.OnPageChangeListener, View
val favoriteIcon = if (medium.isFavorite) R.drawable.ic_star_on else R.drawable.ic_star_off val favoriteIcon = if (medium.isFavorite) R.drawable.ic_star_on else R.drawable.ic_star_off
bottom_favorite.setImageResource(favoriteIcon) bottom_favorite.setImageResource(favoriteIcon)
val hideIcon = if (medium.isHidden()) R.drawable.ic_unhide else R.drawable.ic_hide val hideIcon = if (medium.isHidden()) R.drawable.ic_unhide_vector else R.drawable.ic_hide
bottom_toggle_file_visibility.setImageResource(hideIcon) bottom_toggle_file_visibility.setImageResource(hideIcon)
bottom_rotate.beVisibleIf(config.visibleBottomActions and BOTTOM_ACTION_ROTATE != 0 && getCurrentMedium()?.isImage() == true) bottom_rotate.beVisibleIf(config.visibleBottomActions and BOTTOM_ACTION_ROTATE != 0 && getCurrentMedium()?.isImage() == true)

10
app/src/main/res/layout/bottom_actions.xml
View file

@ -31,7 +31,7 @@
android:background="?attr/selectableItemBackgroundBorderless" android:background="?attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/edit" android:contentDescription="@string/edit"
android:padding="@dimen/medium_margin" android:padding="@dimen/medium_margin"
android:src="@drawable/ic_edit" android:src="@drawable/ic_edit_vector"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/bottom_share" app:layout_constraintEnd_toStartOf="@+id/bottom_share"
app:layout_constraintHorizontal_bias="0.5" app:layout_constraintHorizontal_bias="0.5"
@ -61,7 +61,7 @@
android:background="?attr/selectableItemBackgroundBorderless" android:background="?attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/delete" android:contentDescription="@string/delete"
android:padding="@dimen/medium_margin" android:padding="@dimen/medium_margin"
android:src="@drawable/ic_delete" android:src="@drawable/ic_delete_vector"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/bottom_rotate" app:layout_constraintEnd_toStartOf="@+id/bottom_rotate"
app:layout_constraintHorizontal_bias="0.5" app:layout_constraintHorizontal_bias="0.5"
@ -91,7 +91,7 @@
android:background="?attr/selectableItemBackgroundBorderless" android:background="?attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/properties" android:contentDescription="@string/properties"
android:padding="@dimen/medium_margin" android:padding="@dimen/medium_margin"
android:src="@drawable/ic_properties" android:src="@drawable/ic_properties_vector"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/bottom_change_orientation" app:layout_constraintEnd_toStartOf="@+id/bottom_change_orientation"
app:layout_constraintHorizontal_bias="0.5" app:layout_constraintHorizontal_bias="0.5"
@ -106,7 +106,7 @@
android:background="?attr/selectableItemBackgroundBorderless" android:background="?attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/change_orientation" android:contentDescription="@string/change_orientation"
android:padding="@dimen/medium_margin" android:padding="@dimen/medium_margin"
android:src="@drawable/ic_orientation_auto" android:src="@drawable/ic_orientation_auto_vector"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/bottom_slideshow" app:layout_constraintEnd_toStartOf="@+id/bottom_slideshow"
app:layout_constraintHorizontal_bias="0.5" app:layout_constraintHorizontal_bias="0.5"
@ -136,7 +136,7 @@
android:background="?attr/selectableItemBackgroundBorderless" android:background="?attr/selectableItemBackgroundBorderless"
android:contentDescription="@string/show_on_map" android:contentDescription="@string/show_on_map"
android:padding="@dimen/medium_margin" android:padding="@dimen/medium_margin"
android:src="@drawable/ic_place" android:src="@drawable/ic_place_vector"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/bottom_toggle_file_visibility" app:layout_constraintEnd_toStartOf="@+id/bottom_toggle_file_visibility"
app:layout_constraintHorizontal_bias="0.5" app:layout_constraintHorizontal_bias="0.5"

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

@ -50,7 +50,7 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="bottom|end" android:layout_gravity="bottom|end"
android:layout_margin="@dimen/activity_margin" android:layout_margin="@dimen/activity_margin"
android:src="@drawable/ic_unhide" android:src="@drawable/ic_unhide_vector"
android:visibility="gone"/> android:visibility="gone"/>
</androidx.coordinatorlayout.widget.CoordinatorLayout> </androidx.coordinatorlayout.widget.CoordinatorLayout>

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

@ -25,7 +25,7 @@
android:background="@color/default_background_color" android:background="@color/default_background_color"
android:contentDescription="@string/lock_folder" android:contentDescription="@string/lock_folder"
android:padding="@dimen/lock_padding" android:padding="@dimen/lock_padding"
android:src="@drawable/ic_lock_huge" android:src="@drawable/ic_lock_vector"
android:visibility="gone"/> android:visibility="gone"/>
<ImageView <ImageView

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

@ -26,7 +26,7 @@
android:background="@color/default_background_color" android:background="@color/default_background_color"
android:contentDescription="@string/lock_folder" android:contentDescription="@string/lock_folder"
android:padding="@dimen/medium_margin" android:padding="@dimen/medium_margin"
android:src="@drawable/ic_lock_huge" android:src="@drawable/ic_lock_vector"
android:visibility="gone"/> android:visibility="gone"/>
<ImageView <ImageView

4
app/src/main/res/menu/cab_directories.xml
View file

@ -3,7 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"> xmlns:app="http://schemas.android.com/apk/res-auto">
<item <item
android:id="@+id/cab_delete" android:id="@+id/cab_delete"
android:icon="@drawable/ic_delete" android:icon="@drawable/ic_delete_vector"
android:title="@string/delete" android:title="@string/delete"
app:showAsAction="ifRoom"/> app:showAsAction="ifRoom"/>
<item <item
@ -33,7 +33,7 @@
app:showAsAction="ifRoom"/> app:showAsAction="ifRoom"/>
<item <item
android:id="@+id/cab_unhide" android:id="@+id/cab_unhide"
android:icon="@drawable/ic_unhide" android:icon="@drawable/ic_unhide_vector"
android:title="@string/unhide_folder" android:title="@string/unhide_folder"
app:showAsAction="ifRoom"/> app:showAsAction="ifRoom"/>
<item <item

2
app/src/main/res/menu/cab_hidden_folders.xml
View file

@ -3,7 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"> xmlns:app="http://schemas.android.com/apk/res-auto">
<item <item
android:id="@+id/cab_unhide" android:id="@+id/cab_unhide"
android:icon="@drawable/ic_unhide" android:icon="@drawable/ic_unhide_vector"
android:title="@string/unhide" android:title="@string/unhide"
app:showAsAction="ifRoom"/> app:showAsAction="ifRoom"/>
</menu> </menu>

6
app/src/main/res/menu/cab_media.xml
View file

@ -8,7 +8,7 @@
app:showAsAction="ifRoom"/> app:showAsAction="ifRoom"/>
<item <item
android:id="@+id/cab_delete" android:id="@+id/cab_delete"
android:icon="@drawable/ic_delete" android:icon="@drawable/ic_delete_vector"
android:title="@string/delete" android:title="@string/delete"
app:showAsAction="ifRoom"/> app:showAsAction="ifRoom"/>
<item <item
@ -50,12 +50,12 @@
app:showAsAction="ifRoom"/> app:showAsAction="ifRoom"/>
<item <item
android:id="@+id/cab_unhide" android:id="@+id/cab_unhide"
android:icon="@drawable/ic_unhide" android:icon="@drawable/ic_unhide_vector"
android:title="@string/unhide" android:title="@string/unhide"
app:showAsAction="ifRoom"/> app:showAsAction="ifRoom"/>
<item <item
android:id="@+id/cab_edit" android:id="@+id/cab_edit"
android:icon="@drawable/ic_edit" android:icon="@drawable/ic_edit_vector"
android:title="@string/edit" android:title="@string/edit"
app:showAsAction="ifRoom"/> app:showAsAction="ifRoom"/>
<item <item

2
app/src/main/res/menu/menu_add_folder.xml
View file

@ -3,7 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"> xmlns:app="http://schemas.android.com/apk/res-auto">
<item <item
android:id="@+id/add_folder" android:id="@+id/add_folder"
android:icon="@drawable/ic_plus" android:icon="@drawable/ic_plus_vector"
android:title="@string/add_folder" android:title="@string/add_folder"
app:showAsAction="ifRoom"/> app:showAsAction="ifRoom"/>
</menu> </menu>

2
app/src/main/res/menu/menu_editor.xml
View file

@ -8,7 +8,7 @@
app:showAsAction="ifRoom"/> app:showAsAction="ifRoom"/>
<item <item
android:id="@+id/edit" android:id="@+id/edit"
android:icon="@drawable/ic_edit" android:icon="@drawable/ic_edit_vector"
android:title="@string/edit_with" android:title="@string/edit_with"
app:showAsAction="ifRoom"/> app:showAsAction="ifRoom"/>
<item <item

2
app/src/main/res/menu/menu_included_folders.xml
View file

@ -3,7 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"> xmlns:app="http://schemas.android.com/apk/res-auto">
<item <item
android:id="@+id/add_folder" android:id="@+id/add_folder"
android:icon="@drawable/ic_plus" android:icon="@drawable/ic_plus_vector"
android:title="@string/add_folder" android:title="@string/add_folder"
app:showAsAction="ifRoom"/> app:showAsAction="ifRoom"/>
</menu> </menu>

2
app/src/main/res/menu/menu_main.xml
View file

@ -19,7 +19,7 @@
app:showAsAction="ifRoom"/> app:showAsAction="ifRoom"/>
<item <item
android:id="@+id/filter" android:id="@+id/filter"
android:icon="@drawable/ic_filter" android:icon="@drawable/ic_filter_vector"
android:title="@string/filter_media" android:title="@string/filter_media"
app:showAsAction="ifRoom"/> app:showAsAction="ifRoom"/>
<item <item

4
app/src/main/res/menu/menu_media.xml
View file

@ -9,7 +9,7 @@
app:showAsAction="collapseActionView|ifRoom"/> app:showAsAction="collapseActionView|ifRoom"/>
<item <item
android:id="@+id/toggle_filename" android:id="@+id/toggle_filename"
android:icon="@drawable/ic_label" android:icon="@drawable/ic_label_vector"
android:title="@string/toggle_filename" android:title="@string/toggle_filename"
app:showAsAction="ifRoom"/> app:showAsAction="ifRoom"/>
<item <item
@ -19,7 +19,7 @@
app:showAsAction="ifRoom"/> app:showAsAction="ifRoom"/>
<item <item
android:id="@+id/filter" android:id="@+id/filter"
android:icon="@drawable/ic_filter" android:icon="@drawable/ic_filter_vector"
android:title="@string/filter_media" android:title="@string/filter_media"
app:showAsAction="ifRoom"/> app:showAsAction="ifRoom"/>
<item <item

2
app/src/main/res/menu/menu_search.xml
View file

@ -9,7 +9,7 @@
app:showAsAction="collapseActionView|always"/> app:showAsAction="collapseActionView|always"/>
<item <item
android:id="@+id/toggle_filename" android:id="@+id/toggle_filename"
android:icon="@drawable/ic_label" android:icon="@drawable/ic_label_vector"
android:title="@string/toggle_filename" android:title="@string/toggle_filename"
app:showAsAction="always"/> app:showAsAction="always"/>
</menu> </menu>

2
app/src/main/res/menu/menu_video_player.xml
View file

@ -3,7 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"> xmlns:app="http://schemas.android.com/apk/res-auto">
<item <item
android:id="@+id/menu_change_orientation" android:id="@+id/menu_change_orientation"
android:icon="@drawable/ic_orientation_auto" android:icon="@drawable/ic_orientation_auto_vector"
android:title="@string/change_orientation" android:title="@string/change_orientation"
app:showAsAction="ifRoom"/> app:showAsAction="ifRoom"/>
<item <item

6
app/src/main/res/menu/menu_viewpager.xml
View file

@ -9,7 +9,7 @@
app:showAsAction="ifRoom"/> app:showAsAction="ifRoom"/>
<item <item
android:id="@+id/menu_delete" android:id="@+id/menu_delete"
android:icon="@drawable/ic_delete" android:icon="@drawable/ic_delete_vector"
android:title="@string/delete" android:title="@string/delete"
app:showAsAction="ifRoom"/> app:showAsAction="ifRoom"/>
<item <item
@ -50,7 +50,7 @@
app:showAsAction="never"/> app:showAsAction="never"/>
<item <item
android:id="@+id/menu_change_orientation" android:id="@+id/menu_change_orientation"
android:icon="@drawable/ic_orientation_auto" android:icon="@drawable/ic_orientation_auto_vector"
android:title="@string/change_orientation" android:title="@string/change_orientation"
app:showAsAction="ifRoom"> app:showAsAction="ifRoom">
<menu> <menu>
@ -87,7 +87,7 @@
app:showAsAction="never"/> app:showAsAction="never"/>
<item <item
android:id="@+id/menu_edit" android:id="@+id/menu_edit"
android:icon="@drawable/ic_edit" android:icon="@drawable/ic_edit_vector"
android:title="@string/edit" android:title="@string/edit"
app:showAsAction="ifRoom"/> app:showAsAction="ifRoom"/>
<item <item

2
app/src/main/res/menu/photo_video_menu.xml
View file

@ -13,7 +13,7 @@
app:showAsAction="ifRoom"/> app:showAsAction="ifRoom"/>
<item <item
android:id="@+id/menu_edit" android:id="@+id/menu_edit"
android:icon="@drawable/ic_edit" android:icon="@drawable/ic_edit_vector"
android:title="@string/edit" android:title="@string/edit"
app:showAsAction="ifRoom"/> app:showAsAction="ifRoom"/>
<item <item