mirror of
https://github.com/FossifyOrg/Gallery.git
synced 2024-11-23 04:57:59 +01:00
remove the Replace Deep Zoomable images... option
This commit is contained in:
parent
8868b73d28
commit
2d3cc070ae
6 changed files with 0 additions and 52 deletions
|
@ -68,7 +68,6 @@ class SettingsActivity : SimpleActivity() {
|
||||||
setupEnablePullToRefresh()
|
setupEnablePullToRefresh()
|
||||||
setupOneFingerZoom()
|
setupOneFingerZoom()
|
||||||
setupAllowInstantChange()
|
setupAllowInstantChange()
|
||||||
setupReplaceZoomableImages()
|
|
||||||
setupShowExtendedDetails()
|
setupShowExtendedDetails()
|
||||||
setupHideExtendedDetails()
|
setupHideExtendedDetails()
|
||||||
setupManageExtendedDetails()
|
setupManageExtendedDetails()
|
||||||
|
@ -351,14 +350,6 @@ class SettingsActivity : SimpleActivity() {
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun setupReplaceZoomableImages() {
|
|
||||||
settings_replace_zoomable_images.isChecked = config.replaceZoomableImages
|
|
||||||
settings_replace_zoomable_images_holder.setOnClickListener {
|
|
||||||
settings_replace_zoomable_images.toggle()
|
|
||||||
config.replaceZoomableImages = settings_replace_zoomable_images.isChecked
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun setupShowExtendedDetails() {
|
private fun setupShowExtendedDetails() {
|
||||||
settings_show_extended_details.isChecked = config.showExtendedDetails
|
settings_show_extended_details.isChecked = config.showExtendedDetails
|
||||||
settings_show_extended_details_holder.setOnClickListener {
|
settings_show_extended_details_holder.setOnClickListener {
|
||||||
|
|
|
@ -70,7 +70,6 @@ class ViewPagerActivity : SimpleActivity(), ViewPager.OnPageChangeListener, View
|
||||||
private var mAreSlideShowMediaVisible = false
|
private var mAreSlideShowMediaVisible = false
|
||||||
private var mIsOrientationLocked = false
|
private var mIsOrientationLocked = false
|
||||||
|
|
||||||
private var mStoredReplaceZoomableImages = false
|
|
||||||
private var mMediaFiles = ArrayList<Medium>()
|
private var mMediaFiles = ArrayList<Medium>()
|
||||||
private var mFavoritePaths = ArrayList<String>()
|
private var mFavoritePaths = ArrayList<String>()
|
||||||
|
|
||||||
|
@ -93,7 +92,6 @@ class ViewPagerActivity : SimpleActivity(), ViewPager.OnPageChangeListener, View
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
storeStateVariables()
|
|
||||||
initFavorites()
|
initFavorites()
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -113,11 +111,6 @@ class ViewPagerActivity : SimpleActivity(), ViewPager.OnPageChangeListener, View
|
||||||
setTranslucentNavigation()
|
setTranslucentNavigation()
|
||||||
}
|
}
|
||||||
|
|
||||||
if (mStoredReplaceZoomableImages != config.replaceZoomableImages) {
|
|
||||||
mPrevHashcode = 0
|
|
||||||
refreshViewPager()
|
|
||||||
}
|
|
||||||
|
|
||||||
initBottomActions()
|
initBottomActions()
|
||||||
supportActionBar?.setBackgroundDrawable(resources.getDrawable(R.drawable.actionbar_gradient_background))
|
supportActionBar?.setBackgroundDrawable(resources.getDrawable(R.drawable.actionbar_gradient_background))
|
||||||
|
|
||||||
|
@ -138,7 +131,6 @@ class ViewPagerActivity : SimpleActivity(), ViewPager.OnPageChangeListener, View
|
||||||
override fun onPause() {
|
override fun onPause() {
|
||||||
super.onPause()
|
super.onPause()
|
||||||
stopSlideshow()
|
stopSlideshow()
|
||||||
storeStateVariables()
|
|
||||||
}
|
}
|
||||||
|
|
||||||
override fun onDestroy() {
|
override fun onDestroy() {
|
||||||
|
@ -357,12 +349,6 @@ class ViewPagerActivity : SimpleActivity(), ViewPager.OnPageChangeListener, View
|
||||||
return true
|
return true
|
||||||
}
|
}
|
||||||
|
|
||||||
private fun storeStateVariables() {
|
|
||||||
config.apply {
|
|
||||||
mStoredReplaceZoomableImages = replaceZoomableImages
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
private fun updatePagerItems(media: MutableList<Medium>) {
|
private fun updatePagerItems(media: MutableList<Medium>) {
|
||||||
val pagerAdapter = MyPagerAdapter(this, supportFragmentManager, media)
|
val pagerAdapter = MyPagerAdapter(this, supportFragmentManager, media)
|
||||||
if (!isActivityDestroyed()) {
|
if (!isActivityDestroyed()) {
|
||||||
|
|
|
@ -73,7 +73,6 @@ fun SimpleActivity.launchAbout() {
|
||||||
FAQItem(R.string.faq_6_title, R.string.faq_6_text),
|
FAQItem(R.string.faq_6_title, R.string.faq_6_text),
|
||||||
FAQItem(R.string.faq_7_title, R.string.faq_7_text),
|
FAQItem(R.string.faq_7_title, R.string.faq_7_text),
|
||||||
FAQItem(R.string.faq_8_title, R.string.faq_8_text),
|
FAQItem(R.string.faq_8_title, R.string.faq_8_text),
|
||||||
FAQItem(R.string.faq_9_title, R.string.faq_9_text),
|
|
||||||
FAQItem(R.string.faq_10_title, R.string.faq_10_text),
|
FAQItem(R.string.faq_10_title, R.string.faq_10_text),
|
||||||
FAQItem(R.string.faq_11_title, R.string.faq_11_text),
|
FAQItem(R.string.faq_11_title, R.string.faq_11_text),
|
||||||
FAQItem(R.string.faq_12_title, R.string.faq_12_text),
|
FAQItem(R.string.faq_12_title, R.string.faq_12_text),
|
||||||
|
|
|
@ -189,10 +189,6 @@ class Config(context: Context) : BaseConfig(context) {
|
||||||
get() = prefs.getBoolean(ALLOW_INSTANT_CHANGE, false)
|
get() = prefs.getBoolean(ALLOW_INSTANT_CHANGE, false)
|
||||||
set(allowInstantChange) = prefs.edit().putBoolean(ALLOW_INSTANT_CHANGE, allowInstantChange).apply()
|
set(allowInstantChange) = prefs.edit().putBoolean(ALLOW_INSTANT_CHANGE, allowInstantChange).apply()
|
||||||
|
|
||||||
var replaceZoomableImages: Boolean
|
|
||||||
get() = prefs.getBoolean(REPLACE_ZOOMABLE_IMAGES, false)
|
|
||||||
set(replaceZoomableImages) = prefs.edit().putBoolean(REPLACE_ZOOMABLE_IMAGES, replaceZoomableImages).apply()
|
|
||||||
|
|
||||||
private fun getDirectoryColumnsField(): String {
|
private fun getDirectoryColumnsField(): String {
|
||||||
val isPortrait = context.resources.configuration.orientation == Configuration.ORIENTATION_PORTRAIT
|
val isPortrait = context.resources.configuration.orientation == Configuration.ORIENTATION_PORTRAIT
|
||||||
return if (isPortrait) {
|
return if (isPortrait) {
|
||||||
|
|
|
@ -45,7 +45,6 @@ const val EXTENDED_DETAILS = "extended_details"
|
||||||
const val HIDE_EXTENDED_DETAILS = "hide_extended_details"
|
const val HIDE_EXTENDED_DETAILS = "hide_extended_details"
|
||||||
const val ONE_FINGER_ZOOM = "one_finger_zoom"
|
const val ONE_FINGER_ZOOM = "one_finger_zoom"
|
||||||
const val ALLOW_INSTANT_CHANGE = "allow_instant_change"
|
const val ALLOW_INSTANT_CHANGE = "allow_instant_change"
|
||||||
const val REPLACE_ZOOMABLE_IMAGES = "replace_zoomable_images"
|
|
||||||
const val DO_EXTRA_CHECK = "do_extra_check"
|
const val DO_EXTRA_CHECK = "do_extra_check"
|
||||||
const val WAS_NEW_APP_SHOWN = "was_new_app_shown_clock"
|
const val WAS_NEW_APP_SHOWN = "was_new_app_shown_clock"
|
||||||
const val LAST_FILEPICKER_PATH = "last_filepicker_path"
|
const val LAST_FILEPICKER_PATH = "last_filepicker_path"
|
||||||
|
|
|
@ -625,29 +625,6 @@
|
||||||
|
|
||||||
</RelativeLayout>
|
</RelativeLayout>
|
||||||
|
|
||||||
<RelativeLayout
|
|
||||||
android:id="@+id/settings_replace_zoomable_images_holder"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:layout_marginTop="@dimen/medium_margin"
|
|
||||||
android:background="?attr/selectableItemBackground"
|
|
||||||
android:paddingBottom="@dimen/activity_margin"
|
|
||||||
android:paddingLeft="@dimen/normal_margin"
|
|
||||||
android:paddingRight="@dimen/normal_margin"
|
|
||||||
android:paddingTop="@dimen/activity_margin">
|
|
||||||
|
|
||||||
<com.simplemobiletools.commons.views.MySwitchCompat
|
|
||||||
android:id="@+id/settings_replace_zoomable_images"
|
|
||||||
android:layout_width="match_parent"
|
|
||||||
android:layout_height="wrap_content"
|
|
||||||
android:background="@null"
|
|
||||||
android:clickable="false"
|
|
||||||
android:paddingLeft="@dimen/medium_margin"
|
|
||||||
android:paddingStart="@dimen/medium_margin"
|
|
||||||
android:text="@string/replace_zoomable_images"/>
|
|
||||||
|
|
||||||
</RelativeLayout>
|
|
||||||
|
|
||||||
<RelativeLayout
|
<RelativeLayout
|
||||||
android:id="@+id/settings_allow_photo_gestures_holder"
|
android:id="@+id/settings_allow_photo_gestures_holder"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
|
|
Loading…
Reference in a new issue