From 095afb278971fd33c202bb32ba0c38f85c48711f Mon Sep 17 00:00:00 2001 From: MatthewTighe Date: Mon, 11 Apr 2022 10:47:59 -0700 Subject: [PATCH] [fenix] for https://github.com/mozilla-mobile/fenix/issues/24718: add two remote firefox wallpapers --- .../src/main/java/org/mozilla/fenix/wallpapers/Wallpaper.kt | 10 ++++++++++ .../main/java/org/mozilla/fenix/wallpapers/WallpaperManager.kt | 6 ++++++ 2 files changed, 16 insertions(+) diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/wallpapers/Wallpaper.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/wallpapers/Wallpaper.kt index 21efbb073058..28a77b73f1fe 100644 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/wallpapers/Wallpaper.kt +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/wallpapers/Wallpaper.kt @@ -58,6 +58,16 @@ sealed class Wallpaper { ) : Remote() { override val remoteParentDirName: String = "house" } + + /** + * Wallpapers that are original Firefox creations. + */ + data class Firefox( + override val name: String, + ) : Remote() { + override val expirationDate: Date? = null + override val remoteParentDirName: String = "firefox" + } } companion object { diff --git a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/wallpapers/WallpaperManager.kt b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/wallpapers/WallpaperManager.kt index 0f4ef755b8ef..718db876ba64 100644 --- a/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/wallpapers/WallpaperManager.kt +++ b/mobile/android/fenix/app/src/main/java/org/mozilla/fenix/wallpapers/WallpaperManager.kt @@ -243,6 +243,12 @@ class WallpaperManager( Wallpaper.Remote.House( "mei", ), + Wallpaper.Remote.Firefox( + "twilight-hills" + ), + Wallpaper.Remote.Firefox( + "beach-vibe" + ), ) private val availableWallpapers = listOf(defaultWallpaper) + localWallpapers + remoteWallpapers private const val ANIMATION_DELAY_MS = 1500L -- 2.11.4.GIT