Merge branch 'add-configure-fade-times-feature'

theothernt · Jul 17, 2024 · 8570a4c · 8570a4c
2 parents 96e5e75 + 6c04a2c
commit 8570a4c
Show file tree

Hide file tree

Showing 7 changed files with 98 additions and 2 deletions.
diff --git a/app/src/main/java/com/neilturner/aerialviews/models/prefs/GeneralPrefs.kt b/app/src/main/java/com/neilturner/aerialviews/models/prefs/GeneralPrefs.kt
@@ -77,6 +77,10 @@ object GeneralPrefs : KotprefModel() {
  var showTopGradient by booleanPref(false, "gradient_top_show")
  var showBottomGradient by booleanPref(true, "gradient_bottom_show")
 
+ // Transitions
+ var fadeInDuration by stringPref("600", "fade_in_duration")
+ var fadeOutDuration by stringPref("800", "fade_out_duration")
+
  // Typeface (for whole app)
  var fontTypeface by stringPref("open-sans", "font_typeface")
 

diff --git a/app/src/main/java/com/neilturner/aerialviews/ui/core/ScreenController.kt b/app/src/main/java/com/neilturner/aerialviews/ui/core/ScreenController.kt
@@ -310,8 +310,8 @@ class ScreenController(private val context: Context) :
  private const val TAG = "VideoController"
  const val LOADING_FADE_OUT: Long = 300
  const val LOADING_DELAY: Long = 400
- const val ITEM_FADE_IN: Long = 800
- const val ITEM_FADE_OUT: Long = 1000
  const val ERROR_DELAY: Long = 2000
+ val ITEM_FADE_IN = GeneralPrefs.fadeInDuration.toLong()
+ val ITEM_FADE_OUT = GeneralPrefs.fadeOutDuration.toLong()
  }
 }
diff --git a/app/src/main/java/com/neilturner/aerialviews/ui/settings/AppearanceTransitionsFragment.kt b/app/src/main/java/com/neilturner/aerialviews/ui/settings/AppearanceTransitionsFragment.kt
@@ -0,0 +1,24 @@
+package com.neilturner.aerialviews.ui.settings
+
+import android.os.Bundle
+import androidx.preference.PreferenceFragmentCompat
+import com.neilturner.aerialviews.R
+import com.neilturner.aerialviews.utils.LoggingHelper
+
+class AppearanceTransitionsFragment : PreferenceFragmentCompat() {
+ override fun onCreatePreferences(
+ savedInstanceState: Bundle?,
+ rootKey: String?,
+ ) {
+ setPreferencesFromResource(R.xml.settings_appearance_transitions, rootKey)
+ }
+
+ override fun onResume() {
+ super.onResume()
+ LoggingHelper.logScreenView("Transitions", TAG)
+ }
+
+ companion object {
+ private const val TAG = "TransitionsFragment"
+ }
+}
diff --git a/app/src/main/res/values/arrays.xml b/app/src/main/res/values/arrays.xml
@@ -424,4 +424,34 @@
  </string-array>
  <string name="webdav_scheme_default" translatable="false">HTTP</string>
 
+ <!-- Duration timings -->
+ <string-array name="duration_entries">
+ <item>Disabled</item>
+ <item>200ms</item>
+ <item>400ms</item>
+ <item>600ms</item>
+ <item>800ms</item>
+ <item>1000ms</item>
+ <item>1200ms</item>
+ <item>1400ms</item>
+ <item>1600ms</item>
+ <item>1800ms</item>
+ <item>2000ms</item>
+ </string-array>
+ <string-array name="duration_values" translatable="false">
+ <item>0</item>
+ <item>200</item>
+ <item>400</item>
+ <item>600</item>
+ <item>800</item>
+ <item>1000</item>
+ <item>1200</item>
+ <item>1400</item>
+ <item>1600</item>
+ <item>1800</item>
+ <item>2000</item>
+ </string-array>
+ <string name="duration_fade_in_default" translatable="false">600</string>
+ <string name="duration_fade_out_default" translatable="false">800</string>
+
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -268,6 +268,9 @@
  <string name="appearance_gradient_title">Gradients</string>
  <string name="appearance_gradient_summary">Display gradients behind overlays making them easier to see</string>
 
+ <string name="appearance_transitions_title">Transitions</string>
+ <string name="appearance_transitions_summary">Configure the transitions between videos &amp; photos</string>
+
  <string name="appearance_startup_title">Startup</string>
  <string name="appearance_startup_summary">Change what you see while the app is loading</string>
 
@@ -305,6 +308,13 @@
  <string name="appearance_gradient_bottom_title">Show bottom gradient</string>
  <string name="appearance_gradient_bottom_summary">Display a gradient behind overlays at the bottom of the screen making them easier to see</string>
 
+ <!-- Main / Settings / Appearance / Transitions -->
+ <string name="category_transitions">Transitions</string>
+
+ <string name="appearance_fade_in_title">Video/Photo Fade In</string>
+ <string name="appearance_fade_out_title">Video/Photo Fade Out</string>
+
+
  <!-- Main / Settings / Appearance / Clock -->
  <string name="category_clock">Clock</string>
  <string name="appearance_clock_format_title">Clock format</string>

diff --git a/app/src/main/res/xml/settings_appearance.xml b/app/src/main/res/xml/settings_appearance.xml
@@ -58,6 +58,11 @@
  app:summary="@string/appearance_gradient_summary"
  app:fragment="com.neilturner.aerialviews.ui.settings.AppearanceGradientFragment"/>
 
+ <Preference
+ app:title="@string/appearance_transitions_title"
+ app:summary="@string/appearance_transitions_summary"
+ app:fragment="com.neilturner.aerialviews.ui.settings.AppearanceTransitionsFragment"/>
+
  <Preference
  app:title="@string/appearance_startup_title"
  app:summary="@string/appearance_startup_summary"

diff --git a/app/src/main/res/xml/settings_appearance_transitions.xml b/app/src/main/res/xml/settings_appearance_transitions.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<PreferenceScreen
+ xmlns:app="http:https://schemas.android.com/apk/res-auto">
+
+ <PreferenceCategory app:title="@string/category_transitions">
+ <ListPreference
+ app:defaultValue="@string/duration_fade_in_default"
+ app:entries="@array/duration_entries"
+ app:entryValues="@array/duration_values"
+ app:key="fade_in_duration"
+ app:title="@string/appearance_fade_in_title"
+ app:useSimpleSummaryProvider="true" />
+
+ <ListPreference
+ app:defaultValue="@string/duration_fade_out_default"
+ app:entries="@array/duration_entries"
+ app:entryValues="@array/duration_values"
+ app:key="fade_out_duration"
+ app:title="@string/appearance_fade_out_title"
+ app:useSimpleSummaryProvider="true" />
+
+ </PreferenceCategory>
+</PreferenceScreen>