Mirrors/FossifyGallery
2
0
Fork 1
mirror of https://github.com/FossifyOrg/Gallery.git synced 2024-11-23 04:57:59 +01:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'master' into fix/editor-sdk30+

Browse source
This commit is contained in:
Paul 2022-04-09 23:42:17 +01:00 committed by GitHub
commit 0e6b935fc5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
28 changed files with 164 additions and 63 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

46
app/src/main/AndroidManifest.xml
View file

@ -39,10 +39,12 @@
<activity
android:name=".activities.SplashActivity"
android:exported="false"
android:theme="@style/SplashTheme" />
<activity
android:name=".activities.MainActivity"
android:exported="true"
android:resizeableActivity="true">
<meta-data
@ -78,6 +80,7 @@
<activity
android:name=".activities.MediaActivity"
android:exported="false"
android:parentActivityName=".activities.MainActivity">
<meta-data
@ -92,6 +95,7 @@
<activity
android:name=".activities.SearchActivity"
android:exported="false"
android:label="@string/search"
android:parentActivityName=".activities.MainActivity"
android:resizeableActivity="true">
@ -108,6 +112,7 @@
<activity
android:name=".activities.ViewPagerActivity"
android:configChanges="orientation|keyboardHidden|screenSize"
android:exported="true"
android:parentActivityName=".activities.MediaActivity">
<intent-filter>
@ -123,16 +128,19 @@
<activity
android:name="com.simplemobiletools.commons.activities.AboutActivity"
android:exported="false"
android:label="@string/about"
android:parentActivityName=".activities.MainActivity" />
<activity
android:name="com.simplemobiletools.commons.activities.CustomizationActivity"
android:exported="false"
android:label="@string/customize_colors"
android:parentActivityName=".activities.SettingsActivity" />
<activity
android:name=".activities.SettingsActivity"
android:exported="true"
android:label="@string/settings"
android:parentActivityName=".activities.MainActivity">
@ -144,41 +152,49 @@
<activity
android:name=".activities.PhotoVideoActivity"
android:configChanges="orientation|keyboardHidden|screenSize" />
android:configChanges="orientation|keyboardHidden|screenSize"
android:exported="false" />
<activity
android:name=".activities.VideoPlayerActivity"
android:configChanges="orientation|keyboardHidden|screenSize"
android:exported="false"
android:parentActivityName=".activities.MediaActivity" />
<activity
android:name=".activities.PanoramaPhotoActivity"
android:configChanges="orientation|keyboardHidden|screenSize"
android:exported="false"
android:theme="@style/FullScreenTheme" />
<activity
android:name=".activities.PanoramaVideoActivity"
android:configChanges="orientation|keyboardHidden|screenSize"
android:exported="false"
android:theme="@style/FullScreenTheme" />
<activity
android:name=".activities.IncludedFoldersActivity"
android:exported="false"
android:label="@string/include_folders"
android:parentActivityName=".activities.SettingsActivity" />
<activity
android:name=".activities.ExcludedFoldersActivity"
android:exported="false"
android:label="@string/excluded_folders"
android:parentActivityName=".activities.SettingsActivity" />
<activity
android:name=".activities.HiddenFoldersActivity"
android:exported="false"
android:label="@string/hidden_folders"
android:parentActivityName=".activities.SettingsActivity" />
<activity
android:name=".activities.PhotoActivity"
android:configChanges="orientation|keyboardHidden|screenSize">
android:configChanges="orientation|keyboardHidden|screenSize"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.VIEW" />
@ -191,7 +207,8 @@
<activity
android:name=".activities.VideoActivity"
android:configChanges="orientation|keyboardHidden|screenSize">
android:configChanges="orientation|keyboardHidden|screenSize"
android:exported="true">
<intent-filter>
<action android:name="android.intent.action.VIEW" />
@ -204,6 +221,7 @@
<activity
android:name=".activities.EditActivity"
android:exported="true"
android:label="@string/editor">
<intent-filter android:name="foss-editor">
@ -230,6 +248,7 @@
<activity
android:name=".activities.SetWallpaperActivity"
android:exported="true"
android:label="@string/simple_wallpaper">
<intent-filter>
<action android:name="android.intent.action.ATTACH_DATA" />
@ -248,6 +267,7 @@
<activity
android:name=".activities.WidgetConfigureActivity"
android:exported="true"
android:screenOrientation="portrait"
android:theme="@style/MyWidgetConfigTheme">
<intent-filter>
@ -275,6 +295,7 @@
<receiver
android:name=".helpers.MyWidgetProvider"
android:exported="true"
android:icon="@drawable/img_widget_preview">
<intent-filter>
<action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
@ -303,6 +324,7 @@
<activity-alias
android:name=".activities.SplashActivity.Red"
android:enabled="false"
android:exported="true"
android:icon="@mipmap/ic_launcher_red"
android:roundIcon="@mipmap/ic_launcher_red"
android:targetActivity=".activities.SplashActivity">
@ -316,6 +338,7 @@
<activity-alias
android:name=".activities.SplashActivity.Pink"
android:enabled="false"
android:exported="true"
android:icon="@mipmap/ic_launcher_pink"
android:roundIcon="@mipmap/ic_launcher_pink"
android:targetActivity=".activities.SplashActivity">
@ -329,6 +352,7 @@
<activity-alias
android:name=".activities.SplashActivity.Purple"
android:enabled="false"
android:exported="true"
android:icon="@mipmap/ic_launcher_purple"
android:roundIcon="@mipmap/ic_launcher_purple"
android:targetActivity=".activities.SplashActivity">
@ -342,6 +366,7 @@
<activity-alias
android:name=".activities.SplashActivity.Deep_purple"
android:enabled="false"
android:exported="true"
android:icon="@mipmap/ic_launcher_deep_purple"
android:roundIcon="@mipmap/ic_launcher_deep_purple"
android:targetActivity=".activities.SplashActivity">
@ -355,6 +380,7 @@
<activity-alias
android:name=".activities.SplashActivity.Indigo"
android:enabled="false"
android:exported="true"
android:icon="@mipmap/ic_launcher_indigo"
android:roundIcon="@mipmap/ic_launcher_indigo"
android:targetActivity=".activities.SplashActivity">
@ -368,6 +394,7 @@
<activity-alias
android:name=".activities.SplashActivity.Blue"
android:enabled="false"
android:exported="true"
android:icon="@mipmap/ic_launcher_blue"
android:roundIcon="@mipmap/ic_launcher_blue"
android:targetActivity=".activities.SplashActivity">
@ -381,6 +408,7 @@
<activity-alias
android:name=".activities.SplashActivity.Light_blue"
android:enabled="false"
android:exported="true"
android:icon="@mipmap/ic_launcher_light_blue"
android:roundIcon="@mipmap/ic_launcher_light_blue"
android:targetActivity=".activities.SplashActivity">
@ -394,6 +422,7 @@
<activity-alias
android:name=".activities.SplashActivity.Cyan"
android:enabled="false"
android:exported="true"
android:icon="@mipmap/ic_launcher_cyan"
android:roundIcon="@mipmap/ic_launcher_cyan"
android:targetActivity=".activities.SplashActivity">
@ -407,6 +436,7 @@
<activity-alias
android:name=".activities.SplashActivity.Teal"
android:enabled="false"
android:exported="true"
android:icon="@mipmap/ic_launcher_teal"
android:roundIcon="@mipmap/ic_launcher_teal"
android:targetActivity=".activities.SplashActivity">
@ -420,6 +450,7 @@
<activity-alias
android:name=".activities.SplashActivity.Green"
android:enabled="false"
android:exported="true"
android:icon="@mipmap/ic_launcher_green"
android:roundIcon="@mipmap/ic_launcher_green"
android:targetActivity=".activities.SplashActivity">
@ -433,6 +464,7 @@
<activity-alias
android:name=".activities.SplashActivity.Light_green"
android:enabled="false"
android:exported="true"
android:icon="@mipmap/ic_launcher_light_green"
android:roundIcon="@mipmap/ic_launcher_light_green"
android:targetActivity=".activities.SplashActivity">
@ -446,6 +478,7 @@
<activity-alias
android:name=".activities.SplashActivity.Lime"
android:enabled="false"
android:exported="true"
android:icon="@mipmap/ic_launcher_lime"
android:roundIcon="@mipmap/ic_launcher_lime"
android:targetActivity=".activities.SplashActivity">
@ -459,6 +492,7 @@
<activity-alias
android:name=".activities.SplashActivity.Yellow"
android:enabled="false"
android:exported="true"
android:icon="@mipmap/ic_launcher_yellow"
android:roundIcon="@mipmap/ic_launcher_yellow"
android:targetActivity=".activities.SplashActivity">
@ -472,6 +506,7 @@
<activity-alias
android:name=".activities.SplashActivity.Amber"
android:enabled="false"
android:exported="true"
android:icon="@mipmap/ic_launcher_amber"
android:roundIcon="@mipmap/ic_launcher_amber"
android:targetActivity=".activities.SplashActivity">
@ -485,6 +520,7 @@
<activity-alias
android:name=".activities.SplashActivity.Orange"
android:enabled="true"
android:exported="true"
android:icon="@mipmap/ic_launcher"
android:roundIcon="@mipmap/ic_launcher"
android:targetActivity=".activities.SplashActivity">
@ -497,6 +533,7 @@
<activity-alias
android:name=".activities.SplashActivity.Deep_orange"
android:enabled="false"
android:exported="true"
android:icon="@mipmap/ic_launcher_deep_orange"
android:roundIcon="@mipmap/ic_launcher_deep_orange"
android:targetActivity=".activities.SplashActivity">
@ -510,6 +547,7 @@
<activity-alias
android:name=".activities.SplashActivity.Brown"
android:enabled="false"
android:exported="true"
android:icon="@mipmap/ic_launcher_brown"
android:roundIcon="@mipmap/ic_launcher_brown"
android:targetActivity=".activities.SplashActivity">
@ -523,6 +561,7 @@
<activity-alias
android:name=".activities.SplashActivity.Blue_grey"
android:enabled="false"
android:exported="true"
android:icon="@mipmap/ic_launcher_blue_grey"
android:roundIcon="@mipmap/ic_launcher_blue_grey"
android:targetActivity=".activities.SplashActivity">
@ -536,6 +575,7 @@
<activity-alias
android:name=".activities.SplashActivity.Grey_black"
android:enabled="false"
android:exported="true"
android:icon="@mipmap/ic_launcher_grey_black"
android:roundIcon="@mipmap/ic_launcher_grey_black"
android:targetActivity=".activities.SplashActivity">

2
app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/EditActivity.kt
View file

@ -114,7 +114,7 @@ class EditActivity : SimpleActivity(), CropImageView.OnCropImageCompleteListener
override fun onResume() {
super.onResume()
isEditingWithThirdParty = false
bottom_draw_width.setColors(config.textColor, getProperPrimaryColor(), config.backgroundColor)
bottom_draw_width.setColors(getProperTextColor(), getProperPrimaryColor(), getProperBackgroundColor())
}
override fun onStop() {

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

@ -5,6 +5,7 @@ import android.view.Menu
import android.view.MenuItem
import com.simplemobiletools.commons.dialogs.FilePickerDialog
import com.simplemobiletools.commons.extensions.beVisibleIf
import com.simplemobiletools.commons.extensions.getProperTextColor
import com.simplemobiletools.commons.extensions.internalStoragePath
import com.simplemobiletools.commons.helpers.isRPlus
import com.simplemobiletools.commons.interfaces.RefreshRecyclerViewListener
@ -26,7 +27,7 @@ class ExcludedFoldersActivity : SimpleActivity(), RefreshRecyclerViewListener {
var placeholderText = getString(R.string.excluded_activity_placeholder)
manage_folders_placeholder.apply {
beVisibleIf(folders.isEmpty())
setTextColor(config.textColor)
setTextColor(getProperTextColor())
if (isRPlus()) {
placeholderText = placeholderText.substringBefore("\n")

3
app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/HiddenFoldersActivity.kt
View file

@ -5,6 +5,7 @@ import android.view.Menu
import android.view.MenuItem
import com.simplemobiletools.commons.dialogs.FilePickerDialog
import com.simplemobiletools.commons.extensions.beVisibleIf
import com.simplemobiletools.commons.extensions.getProperTextColor
import com.simplemobiletools.commons.helpers.ensureBackgroundThread
import com.simplemobiletools.commons.interfaces.RefreshRecyclerViewListener
import com.simplemobiletools.gallery.pro.R
@ -27,7 +28,7 @@ class HiddenFoldersActivity : SimpleActivity(), RefreshRecyclerViewListener {
manage_folders_placeholder.apply {
text = getString(R.string.hidden_folders_placeholder)
beVisibleIf(it.isEmpty())
setTextColor(config.textColor)
setTextColor(getProperTextColor())
}
val adapter = ManageHiddenFoldersAdapter(this, it, this, manage_folders_list) {}

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

@ -4,6 +4,7 @@ import android.os.Bundle
import android.view.Menu
import android.view.MenuItem
import com.simplemobiletools.commons.extensions.beVisibleIf
import com.simplemobiletools.commons.extensions.getProperTextColor
import com.simplemobiletools.commons.interfaces.RefreshRecyclerViewListener
import com.simplemobiletools.gallery.pro.R
import com.simplemobiletools.gallery.pro.adapters.ManageFoldersAdapter
@ -23,7 +24,7 @@ class IncludedFoldersActivity : SimpleActivity(), RefreshRecyclerViewListener {
manage_folders_placeholder.apply {
text = getString(R.string.included_activity_placeholder)
beVisibleIf(folders.isEmpty())
setTextColor(config.textColor)
setTextColor(getProperTextColor())
}
val adapter = ManageFoldersAdapter(this, folders, false, this, manage_folders_list) {}

14
app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/MainActivity.kt
View file

@ -43,8 +43,6 @@ import com.simplemobiletools.gallery.pro.models.Directory
import com.simplemobiletools.gallery.pro.models.Medium
import kotlinx.android.synthetic.main.activity_main.*
import java.io.*
import java.util.*
import kotlin.collections.ArrayList
class MainActivity : SimpleActivity(), DirectoryOperationsListener {
private val PICK_MEDIA = 2
@ -180,13 +178,13 @@ class MainActivity : SimpleActivity(), DirectoryOperationsListener {
getDirectories()
}
if (mStoredTextColor != config.textColor) {
getRecyclerAdapter()?.updateTextColor(config.textColor)
if (mStoredTextColor != getProperTextColor()) {
getRecyclerAdapter()?.updateTextColor(getProperTextColor())
}
val primaryColor = getProperPrimaryColor()
if (mStoredPrimaryColor != primaryColor) {
getRecyclerAdapter()?.updatePrimaryColor(config.primaryColor)
getRecyclerAdapter()?.updatePrimaryColor(primaryColor)
}
val styleString = "${config.folderStyle}${config.showFolderMediaCount}${config.limitFolderTitle}"
@ -201,7 +199,7 @@ class MainActivity : SimpleActivity(), DirectoryOperationsListener {
timeFormat = getTimeFormat()
}
directories_empty_placeholder.setTextColor(config.textColor)
directories_empty_placeholder.setTextColor(getProperTextColor())
directories_empty_placeholder_2.setTextColor(primaryColor)
directories_switch_searching.setTextColor(primaryColor)
directories_switch_searching.underlineText()
@ -334,14 +332,14 @@ class MainActivity : SimpleActivity(), DirectoryOperationsListener {
private fun getRecyclerAdapter() = directories_grid.adapter as? DirectoryAdapter
private fun storeStateVariables() {
mStoredTextColor = getProperTextColor()
mStoredPrimaryColor = getProperPrimaryColor()
config.apply {
mStoredAnimateGifs = animateGifs
mStoredCropThumbnails = cropThumbnails
mStoredScrollHorizontally = scrollHorizontally
mStoredTextColor = textColor
mStoredStyleString = "$folderStyle$showFolderMediaCount$limitFolderTitle"
}
mStoredPrimaryColor = getProperPrimaryColor()
}
private fun setupSearch(menu: Menu) {

14
app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/MediaActivity.kt
View file

@ -44,8 +44,6 @@ import com.simplemobiletools.gallery.pro.models.ThumbnailSection
import kotlinx.android.synthetic.main.activity_media.*
import java.io.File
import java.io.IOException
import java.util.*
import kotlin.collections.ArrayList
class MediaActivity : SimpleActivity(), MediaOperationsListener {
private val LAST_MEDIA_CHECK_PERIOD = 3000L
@ -141,13 +139,13 @@ class MediaActivity : SimpleActivity(), MediaOperationsListener {
getMediaAdapter()?.updateShowFileTypes(config.showThumbnailFileTypes)
}
if (mStoredTextColor != config.textColor) {
getMediaAdapter()?.updateTextColor(config.textColor)
if (mStoredTextColor != getProperTextColor()) {
getMediaAdapter()?.updateTextColor(getProperTextColor())
}
val primaryColor = getProperPrimaryColor()
if (mStoredPrimaryColor != primaryColor) {
getMediaAdapter()?.updatePrimaryColor(config.primaryColor)
getMediaAdapter()?.updatePrimaryColor(primaryColor)
}
if (
@ -166,7 +164,7 @@ class MediaActivity : SimpleActivity(), MediaOperationsListener {
timeFormat = getTimeFormat()
}
media_empty_text_placeholder.setTextColor(config.textColor)
media_empty_text_placeholder.setTextColor(getProperTextColor())
media_empty_text_placeholder_2.setTextColor(getProperPrimaryColor())
if (!mIsSearchOpen) {
@ -301,18 +299,18 @@ class MediaActivity : SimpleActivity(), MediaOperationsListener {
}
private fun storeStateVariables() {
mStoredTextColor = getProperTextColor()
mStoredPrimaryColor = getProperPrimaryColor()
config.apply {
mStoredAnimateGifs = animateGifs
mStoredCropThumbnails = cropThumbnails
mStoredScrollHorizontally = scrollHorizontally
mStoredShowFileTypes = showThumbnailFileTypes
mStoredMarkFavoriteItems = markFavoriteItems
mStoredTextColor = textColor
mStoredThumbnailSpacing = thumbnailSpacing
mStoredRoundedCorners = fileRoundedCorners
mShowAll = showAll
}
mStoredPrimaryColor = getProperPrimaryColor()
}
private fun setupSearch(menu: Menu) {

2
app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/PhotoVideoActivity.kt
View file

@ -38,7 +38,6 @@ open class PhotoVideoActivity : SimpleActivity(), ViewPagerFragment.FragmentList
public override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.fragment_holder)
if (checkAppSideloading()) {
return
}
@ -173,6 +172,7 @@ open class PhotoVideoActivity : SimpleActivity(), ViewPagerFragment.FragmentList
}
}
top_shadow.layoutParams.height = statusBarHeight + actionBarHeight
checkNotchSupport()
showSystemUI(true)
val bundle = Bundle()

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

@ -21,11 +21,13 @@ import com.simplemobiletools.gallery.pro.R
import com.simplemobiletools.gallery.pro.adapters.MediaAdapter
import com.simplemobiletools.gallery.pro.asynctasks.GetMediaAsynctask
import com.simplemobiletools.gallery.pro.extensions.*
import com.simplemobiletools.gallery.pro.helpers.*
import com.simplemobiletools.gallery.pro.helpers.GridSpacingItemDecoration
import com.simplemobiletools.gallery.pro.helpers.MediaFetcher
import com.simplemobiletools.gallery.pro.helpers.PATH
import com.simplemobiletools.gallery.pro.helpers.SHOW_ALL
import com.simplemobiletools.gallery.pro.interfaces.MediaOperationsListener
import com.simplemobiletools.gallery.pro.models.Medium
import com.simplemobiletools.gallery.pro.models.ThumbnailItem
import kotlinx.android.synthetic.main.activity_main.*
import kotlinx.android.synthetic.main.activity_search.*
import java.io.File
@ -40,7 +42,7 @@ class SearchActivity : SimpleActivity(), MediaOperationsListener {
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_search)
media_empty_text_placeholder.setTextColor(config.textColor)
media_empty_text_placeholder.setTextColor(getProperTextColor())
getAllMedia()
media_fastscroller.updateColors(getProperPrimaryColor())
}

2
app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/SettingsActivity.kt
View file

@ -123,7 +123,7 @@ class SettingsActivity : SimpleActivity() {
settings_recycle_bin_holder,
settings_migrating_holder
).forEach {
it.background.applyColorFilter(baseConfig.backgroundColor.getContrastColor())
it.background.applyColorFilter(getProperBackgroundColor().getContrastColor())
}
}

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

@ -61,7 +61,6 @@ import kotlinx.android.synthetic.main.activity_medium.*
import kotlinx.android.synthetic.main.bottom_actions.*
import java.io.File
import java.io.OutputStream
import java.util.*
class ViewPagerActivity : SimpleActivity(), ViewPager.OnPageChangeListener, ViewPagerFragment.FragmentListener {
private val REQUEST_VIEW_VIDEO = 1
@ -91,7 +90,7 @@ class ViewPagerActivity : SimpleActivity(), ViewPager.OnPageChangeListener, View
super.onCreate(savedInstanceState)
setContentView(R.layout.activity_medium)
window.decorView.setBackgroundColor(config.backgroundColor)
window.decorView.setBackgroundColor(getProperBackgroundColor())
top_shadow.layoutParams.height = statusBarHeight + actionBarHeight
checkNotchSupport()
(MediaActivity.mMedia.clone() as ArrayList<ThumbnailItem>).filter { it is Medium }.mapTo(mMediaFiles) { it as Medium }
@ -223,7 +222,7 @@ class ViewPagerActivity : SimpleActivity(), ViewPager.OnPageChangeListener, View
updateBottomActionIcons(currentMedium)
}
updateMenuItemColors(menu, baseColor = Color.BLACK)
updateMenuItemColors(menu, forceWhiteIcons = true)
return true
}

2
app/src/main/kotlin/com/simplemobiletools/gallery/pro/activities/WidgetConfigureActivity.kt
View file

@ -56,7 +56,7 @@ class WidgetConfigureActivity : SimpleActivity() {
}
updateTextColors(folder_picker_holder)
folder_picker_holder.background = ColorDrawable(config.backgroundColor)
folder_picker_holder.background = ColorDrawable(getProperBackgroundColor())
getCachedDirectories(false, false) {
mDirectories = it

8
app/src/main/kotlin/com/simplemobiletools/gallery/pro/adapters/DirectoryAdapter.kt
View file

@ -5,14 +5,12 @@ import android.content.pm.ShortcutInfo
import android.content.pm.ShortcutManager
import android.graphics.drawable.ColorDrawable
import android.graphics.drawable.Icon
import android.os.Build
import android.text.TextUtils
import android.view.Menu
import android.view.MotionEvent
import android.view.View
import android.view.ViewGroup
import android.widget.RelativeLayout
import androidx.annotation.RequiresApi
import androidx.recyclerview.widget.ItemTouchHelper
import androidx.recyclerview.widget.RecyclerView
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
@ -52,8 +50,6 @@ import kotlinx.android.synthetic.main.directory_item_list.view.dir_holder
import kotlinx.android.synthetic.main.directory_item_list.view.photo_cnt
import java.io.File
import java.util.*
import kotlin.collections.ArrayList
import kotlin.collections.HashMap
class DirectoryAdapter(
activity: BaseSimpleActivity, var dirs: ArrayList<Directory>, val listener: DirectoryOperationsListener?, recyclerView: MyRecyclerView,
@ -789,8 +785,8 @@ class DirectoryAdapter(
if (lockedFolderPaths.contains(directory.path)) {
dir_lock.beVisible()
dir_lock.background = ColorDrawable(config.backgroundColor)
dir_lock.applyColorFilter(config.backgroundColor.getContrastColor())
dir_lock.background = ColorDrawable(context.getProperBackgroundColor())
dir_lock.applyColorFilter(context.getProperBackgroundColor().getContrastColor())
} else {
dir_lock.beGone()
val roundedCorners = when {

4
app/src/main/kotlin/com/simplemobiletools/gallery/pro/adapters/ManageFoldersAdapter.kt
View file

@ -5,12 +5,12 @@ import android.view.View
import android.view.ViewGroup
import com.simplemobiletools.commons.activities.BaseSimpleActivity
import com.simplemobiletools.commons.adapters.MyRecyclerViewAdapter
import com.simplemobiletools.commons.extensions.getProperTextColor
import com.simplemobiletools.commons.interfaces.RefreshRecyclerViewListener
import com.simplemobiletools.commons.views.MyRecyclerView
import com.simplemobiletools.gallery.pro.R
import com.simplemobiletools.gallery.pro.extensions.config
import kotlinx.android.synthetic.main.item_manage_folder.view.*
import java.util.*
class ManageFoldersAdapter(
activity: BaseSimpleActivity, var folders: ArrayList<String>, val isShowingExcludedFolders: Boolean, val listener: RefreshRecyclerViewListener?,
@ -64,7 +64,7 @@ class ManageFoldersAdapter(
manage_folder_holder?.isSelected = selectedKeys.contains(folder.hashCode())
manage_folder_title.apply {
text = folder
setTextColor(config.textColor)
setTextColor(context.getProperTextColor())
}
}
}

3
app/src/main/kotlin/com/simplemobiletools/gallery/pro/adapters/ManageHiddenFoldersAdapter.kt
View file

@ -5,6 +5,7 @@ import android.view.View
import android.view.ViewGroup
import com.simplemobiletools.commons.activities.BaseSimpleActivity
import com.simplemobiletools.commons.adapters.MyRecyclerViewAdapter
import com.simplemobiletools.commons.extensions.getProperTextColor
import com.simplemobiletools.commons.extensions.isPathOnSD
import com.simplemobiletools.commons.interfaces.RefreshRecyclerViewListener
import com.simplemobiletools.commons.views.MyRecyclerView
@ -66,7 +67,7 @@ class ManageHiddenFoldersAdapter(
manage_folder_holder?.isSelected = selectedKeys.contains(folder.hashCode())
manage_folder_title.apply {
text = folder
setTextColor(config.textColor)
setTextColor(context.getProperTextColor())
}
}
}

5
app/src/main/kotlin/com/simplemobiletools/gallery/pro/dialogs/ChangeFolderThumbnailStyleDialog.kt
View file

@ -11,6 +11,7 @@ import com.bumptech.glide.request.RequestOptions
import com.simplemobiletools.commons.activities.BaseSimpleActivity
import com.simplemobiletools.commons.extensions.beGone
import com.simplemobiletools.commons.extensions.beVisible
import com.simplemobiletools.commons.extensions.getProperTextColor
import com.simplemobiletools.commons.extensions.setupDialogStuff
import com.simplemobiletools.gallery.pro.R
import com.simplemobiletools.gallery.pro.extensions.config
@ -106,8 +107,8 @@ class ChangeFolderThumbnailStyleDialog(val activity: BaseSimpleActivity, val cal
if (useRoundedCornersLayout) {
val cornerRadius = resources.getDimension(R.dimen.rounded_corner_radius_big).toInt()
builder = builder.transform(CenterCrop(), RoundedCorners(cornerRadius))
dir_name.setTextColor(activity.config.textColor)
photo_cnt.setTextColor(activity.config.textColor)
dir_name.setTextColor(activity.getProperTextColor())
photo_cnt.setTextColor(activity.getProperTextColor())
}
builder.into(dir_thumbnail)

15
app/src/main/kotlin/com/simplemobiletools/gallery/pro/fragments/PhotoFragment.kt
View file

@ -19,7 +19,10 @@ import android.view.MotionEvent
import android.view.View
import android.view.ViewGroup
import android.widget.RelativeLayout
import androidx.exifinterface.media.ExifInterface.*
import androidx.exifinterface.media.ExifInterface.ORIENTATION_ROTATE_180
import androidx.exifinterface.media.ExifInterface.ORIENTATION_ROTATE_270
import androidx.exifinterface.media.ExifInterface.ORIENTATION_ROTATE_90
import androidx.exifinterface.media.ExifInterface.TAG_ORIENTATION
import com.alexvasilkov.gestures.GestureController
import com.alexvasilkov.gestures.State
import com.bumptech.glide.Glide
@ -61,7 +64,6 @@ import org.apache.sanselan.formats.jpeg.JpegImageParser
import pl.droidsonroids.gif.InputSource
import java.io.File
import java.io.FileOutputStream
import java.util.*
import kotlin.math.ceil
class PhotoFragment : ViewPagerFragment() {
@ -673,7 +675,14 @@ class PhotoFragment : ViewPagerFragment() {
onImageEventListener = object : SubsamplingScaleImageView.OnImageEventListener {
override fun onReady() {
background = ColorDrawable(if (config.blackBackground) Color.BLACK else config.backgroundColor)
background = ColorDrawable(
if (config.blackBackground) {
Color.BLACK
} else {
context.getProperBackgroundColor()
}
)
val useWidth = if (mImageOrientation == ORIENTATION_ROTATE_90 || mImageOrientation == ORIENTATION_ROTATE_270) sHeight else sWidth
val useHeight = if (mImageOrientation == ORIENTATION_ROTATE_90 || mImageOrientation == ORIENTATION_ROTATE_270) sWidth else sHeight
doubleTapZoomScale = getDoubleTapZoomScale(useWidth, useHeight)

2
app/src/main/kotlin/com/simplemobiletools/gallery/pro/helpers/MyWidgetProvider.kt
View file

@ -29,7 +29,7 @@ class MyWidgetProvider : AppWidgetProvider() {
putExtra(DIRECTORY, widget.folderPath)
}
val pendingIntent = PendingIntent.getActivity(context, widget.widgetId, intent, PendingIntent.FLAG_UPDATE_CURRENT)
val pendingIntent = PendingIntent.getActivity(context, widget.widgetId, intent, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE)
views.setOnClickPendingIntent(id, pendingIntent)
}

5
app/src/main/kotlin/com/simplemobiletools/gallery/pro/views/EditorDrawCanvas.kt
View file

@ -5,10 +5,9 @@ import android.graphics.*
import android.util.AttributeSet
import android.view.MotionEvent
import android.view.View
import com.simplemobiletools.commons.extensions.getProperPrimaryColor
import com.simplemobiletools.gallery.pro.R
import com.simplemobiletools.gallery.pro.extensions.config
import com.simplemobiletools.gallery.pro.models.PaintOptions
import java.util.*
class EditorDrawCanvas(context: Context, attrs: AttributeSet) : View(context, attrs) {
private var mCurX = 0f
@ -26,7 +25,7 @@ class EditorDrawCanvas(context: Context, attrs: AttributeSet) : View(context, at
private var backgroundBitmap: Bitmap? = null
init {
mColor = context.config.primaryColor
mColor = context.getProperPrimaryColor()
mPaint.apply {
color = mColor
style = Paint.Style.STROKE

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

@ -53,38 +53,47 @@
app:showAsAction="ifRoom" />
<item
android:id="@+id/cab_copy_to"
android:showAsAction="never"
android:title="@string/copy_to"
app:showAsAction="never" />
<item
android:id="@+id/cab_move_to"
android:showAsAction="never"
android:title="@string/move_to"
app:showAsAction="never" />
<item
android:id="@+id/cab_create_shortcut"
android:showAsAction="never"
android:title="@string/create_shortcut"
app:showAsAction="never" />
<item
android:id="@+id/cab_empty_recycle_bin"
android:showAsAction="never"
android:title="@string/empty_recycle_bin"
app:showAsAction="never" />
<item
android:id="@+id/cab_empty_disable_recycle_bin"
android:showAsAction="never"
android:title="@string/empty_and_disable_recycle_bin"
app:showAsAction="never" />
<item
android:id="@+id/cab_exclude"
android:showAsAction="never"
android:title="@string/exclude"
app:showAsAction="never" />
<item
android:id="@+id/cab_lock"
android:showAsAction="never"
android:title="@string/lock_folder"
app:showAsAction="never" />
<item
android:id="@+id/cab_unlock"
android:showAsAction="never"
android:title="@string/unlock_folder"
app:showAsAction="never" />
<item
android:id="@+id/cab_change_cover_image"
android:showAsAction="never"
android:title="@string/change_cover_image"
app:showAsAction="never">
<menu>

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

@ -55,22 +55,27 @@
app:showAsAction="ifRoom" />
<item
android:id="@+id/cab_copy_to"
android:showAsAction="never"
android:title="@string/copy_to"
app:showAsAction="never" />
<item
android:id="@+id/cab_move_to"
android:showAsAction="never"
android:title="@string/move_to"
app:showAsAction="never" />
<item
android:id="@+id/cab_create_shortcut"
android:showAsAction="never"
android:title="@string/create_shortcut"
app:showAsAction="never" />
<item
android:id="@+id/cab_open_with"
android:showAsAction="never"
android:title="@string/open_with"
app:showAsAction="never" />
<item
android:id="@+id/cab_set_as"
android:showAsAction="never"
android:title="@string/set_as"
app:showAsAction="never" />
<item
@ -90,10 +95,12 @@
app:showAsAction="ifRoom" />
<item
android:id="@+id/cab_restore_recycle_bin_files"
android:showAsAction="never"
android:title="@string/restore_selected_files"
app:showAsAction="never" />
<item
android:id="@+id/cab_fix_date_taken"
android:showAsAction="never"
android:title="@string/fix_date_taken"
app:showAsAction="never" />
<item

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

@ -24,42 +24,52 @@
app:showAsAction="ifRoom" />
<item
android:id="@+id/change_view_type"
android:showAsAction="never"
android:title="@string/change_view_type"
app:showAsAction="never" />
<item
android:id="@+id/temporarily_show_hidden"
android:showAsAction="never"
android:title="@string/temporarily_show_hidden"
app:showAsAction="never" />
<item
android:id="@+id/stop_showing_hidden"
android:showAsAction="never"
android:title="@string/stop_showing_hidden"
app:showAsAction="never" />
<item
android:id="@+id/show_all"
android:showAsAction="never"
android:title="@string/show_all"
app:showAsAction="never" />
<item
android:id="@+id/show_the_recycle_bin"
android:showAsAction="never"
android:title="@string/show_the_recycle_bin"
app:showAsAction="never" />
<item
android:id="@+id/hide_the_recycle_bin"
android:showAsAction="never"
android:title="@string/hide_the_recycle_bin"
app:showAsAction="never" />
<item
android:id="@+id/set_as_default_folder"
android:showAsAction="never"
android:title="@string/set_as_default_folder"
app:showAsAction="never" />
<item
android:id="@+id/create_new_folder"
android:showAsAction="never"
android:title="@string/create_new_folder"
app:showAsAction="never" />
<item
android:id="@+id/increase_column_count"
android:showAsAction="never"
android:title="@string/increase_column_count"
app:showAsAction="never" />
<item
android:id="@+id/reduce_column_count"
android:showAsAction="never"
android:title="@string/reduce_column_count"
app:showAsAction="never" />
<item

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

@ -3,10 +3,12 @@
xmlns:app="http://schemas.android.com/apk/res-auto">
<item
android:id="@+id/temporarily_show_hidden"
android:showAsAction="never"
android:title="@string/temporarily_show_hidden"
app:showAsAction="never" />
<item
android:id="@+id/stop_showing_hidden"
android:showAsAction="never"
android:title="@string/stop_showing_hidden"
app:showAsAction="never" />
</menu>

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

@ -24,30 +24,37 @@
app:showAsAction="ifRoom" />
<item
android:id="@+id/change_view_type"
android:showAsAction="never"
android:title="@string/change_view_type"
app:showAsAction="never" />
<item
android:id="@+id/temporarily_show_hidden"
android:showAsAction="never"
android:title="@string/temporarily_show_hidden"
app:showAsAction="never" />
<item
android:id="@+id/stop_showing_hidden"
android:showAsAction="never"
android:title="@string/stop_showing_hidden"
app:showAsAction="never" />
<item
android:id="@+id/empty_recycle_bin"
android:showAsAction="never"
android:title="@string/empty_recycle_bin"
app:showAsAction="never" />
<item
android:id="@+id/empty_disable_recycle_bin"
android:showAsAction="never"
android:title="@string/empty_and_disable_recycle_bin"
app:showAsAction="never" />
<item
android:id="@+id/restore_all_files"
android:showAsAction="never"
android:title="@string/restore_all_files"
app:showAsAction="never" />
<item
android:id="@+id/folder_view"
android:showAsAction="never"
android:title="@string/folder_view"
app:showAsAction="never" />
<item
@ -57,30 +64,37 @@
app:showAsAction="ifRoom" />
<item
android:id="@+id/group"
android:showAsAction="never"
android:title="@string/group_by"
app:showAsAction="never" />
<item
android:id="@+id/set_as_default_folder"
android:showAsAction="never"
android:title="@string/set_as_default_folder"
app:showAsAction="never" />
<item
android:id="@+id/unset_as_default_folder"
android:showAsAction="never"
android:title="@string/unset_as_default_folder"
app:showAsAction="never" />
<item
android:id="@+id/create_new_folder"
android:showAsAction="never"
android:title="@string/create_new_folder"
app:showAsAction="never" />
<item
android:id="@+id/increase_column_count"
android:showAsAction="never"
android:title="@string/increase_column_count"
app:showAsAction="never" />
<item
android:id="@+id/reduce_column_count"
android:showAsAction="never"
android:title="@string/reduce_column_count"
app:showAsAction="never" />
<item
android:id="@+id/slideshow"
android:showAsAction="never"
android:title="@string/slideshow"
app:showAsAction="never" />
<item

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

@ -13,6 +13,7 @@
app:showAsAction="ifRoom" />
<item
android:id="@+id/menu_open_with"
android:showAsAction="never"
android:title="@string/open_with"
app:showAsAction="never" />
</menu>

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

@ -56,18 +56,22 @@
app:showAsAction="ifRoom" />
<item
android:id="@+id/menu_copy_to"
android:showAsAction="never"
android:title="@string/copy_to"
app:showAsAction="never" />
<item
android:id="@+id/menu_move_to"
android:showAsAction="never"
android:title="@string/move_to"
app:showAsAction="never" />
<item
android:id="@+id/menu_create_shortcut"
android:showAsAction="never"
android:title="@string/create_shortcut"
app:showAsAction="never" />
<item
android:id="@+id/menu_open_with"
android:showAsAction="never"
android:title="@string/open_with"
app:showAsAction="never" />
<item
@ -92,6 +96,7 @@
app:showAsAction="ifRoom" />
<item
android:id="@+id/menu_restore_file"
android:showAsAction="never"
android:title="@string/restore_this_file"
app:showAsAction="never" />
<item
@ -113,14 +118,17 @@
</item>
<item
android:id="@+id/menu_print"
android:showAsAction="never"
android:title="@string/print"
app:showAsAction="never" />
<item
android:id="@+id/menu_resize"
android:showAsAction="never"
android:title="@string/resize"
app:showAsAction="never" />
<item
android:id="@+id/menu_show_on_map"
android:showAsAction="never"
android:title="@string/show_on_map"
app:showAsAction="never" />
<item

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

@ -23,10 +23,12 @@
app:showAsAction="ifRoom" />
<item
android:id="@+id/menu_open_with"
android:showAsAction="never"
android:title="@string/open_with"
app:showAsAction="never" />
<item
android:id="@+id/menu_show_on_map"
android:showAsAction="never"
android:title="@string/show_on_map"
app:showAsAction="never" />
</menu>

8
app/src/proprietary/AndroidManifest.xml
View file

@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest
xmlns:android="http://schemas.android.com/apk/res/android"
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.simplemobiletools.gallery.pro"
android:installLocation="auto">
@ -10,7 +9,8 @@
android:theme="@style/AppTheme">
<activity
android:name=".activities.EditActivity">
android:name=".activities.EditActivity"
android:exported="true">
<intent-filter
android:name="foss-editor"
@ -26,6 +26,7 @@
<activity
android:name=".activities.NewPhotoEditActivity"
android:exported="true"
android:label="@string/editor">
<intent-filter>
@ -39,6 +40,7 @@
<activity
android:name=".activities.NewVideoEditActivity"
android:exported="true"
android:label="@string/editor">
<intent-filter>