From 2e525813f6d214ee5c24b00fcc832b27866fad96 Mon Sep 17 00:00:00 2001 From: Jeff Boek Date: Wed, 13 Feb 2019 10:58:07 -0800 Subject: [PATCH] Adds build date to the about page --- app/build.gradle | 3 +++ .../main/java/org/mozilla/fenix/settings/AboutPage.kt | 3 +++ app/src/main/res/raw/about.html | 2 ++ buildSrc/src/main/java/Config.kt | 10 ++++++++++ 4 files changed, 18 insertions(+) diff --git a/app/build.gradle b/app/build.gradle index a12c3b4aa..96c77674a 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -186,6 +186,9 @@ android.applicationVariants.all { variant -> } else { buildConfigField 'boolean', 'TELEMETRY', 'false' } + + def buildDate = Config.generateBuildDate() + buildConfigField 'String', 'BUILD_DATE', '"' + buildDate + '"' } // Normally this should use the same version as the glean dependency. But since we are currently using AC snapshots we diff --git a/app/src/main/java/org/mozilla/fenix/settings/AboutPage.kt b/app/src/main/java/org/mozilla/fenix/settings/AboutPage.kt index 250779625..6005e40cc 100644 --- a/app/src/main/java/org/mozilla/fenix/settings/AboutPage.kt +++ b/app/src/main/java/org/mozilla/fenix/settings/AboutPage.kt @@ -10,6 +10,7 @@ import android.content.Context import android.content.pm.PackageManager import androidx.annotation.RawRes import org.mozilla.fenix.R +import org.mozilla.fenix.BuildConfig.BUILD_DATE import org.mozilla.fenix.ext.replace import org.mozilla.geckoview.BuildConfig @@ -33,6 +34,8 @@ object AboutPage { // Nothing to do if we can't find the package name. } + substitutionMap["%build-date%"] = BUILD_DATE + context.resources.getString(R.string.about_content, appName).also { content -> substitutionMap["%about-content%"] = content } diff --git a/app/src/main/res/raw/about.html b/app/src/main/res/raw/about.html index 0396efb8d..fc7bb5f77 100644 --- a/app/src/main/res/raw/about.html +++ b/app/src/main/res/raw/about.html @@ -45,5 +45,7 @@ h1#wordmark {

Fenix

%about-version%

%about-content% + +

Built on: %build-date%

diff --git a/buildSrc/src/main/java/Config.kt b/buildSrc/src/main/java/Config.kt index 616695148..57c64b746 100644 --- a/buildSrc/src/main/java/Config.kt +++ b/buildSrc/src/main/java/Config.kt @@ -1,4 +1,6 @@ import java.text.SimpleDateFormat +import java.time.LocalDateTime +import java.time.format.DateTimeFormatter import java.util.Date import java.util.Locale @@ -24,4 +26,12 @@ object Config { // sections we use in the changelog (weeks). return SimpleDateFormat(".yyww", Locale.US).format(today) } + + @JvmStatic + fun generateBuildDate(): String { + val dateTime = LocalDateTime.now() + val timeFormatter = DateTimeFormatter.ofPattern("h:mm a") + + return "${dateTime.dayOfWeek.toString().toLowerCase().capitalize()} ${dateTime.monthValue}/${dateTime.dayOfMonth} @ ${timeFormatter.format(dateTime)}" + } }