Move the libanki.utils.TimeUtils.getTimestamp() method to anki.utils.…

…Time Didn't made sense to have it in libanki as it was only used in the anki package.
asirrosa · Sep 20, 2023 · 17c9aaf · 17c9aaf
1 parent 6428efa
commit 17c9aaf
Show file tree

Hide file tree

Showing 4 changed files with 11 additions and 29 deletions.
diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/Whiteboard.kt b/AnkiDroid/src/main/java/com/ichi2/anki/Whiteboard.kt
@@ -33,9 +33,9 @@ import androidx.annotation.VisibleForTesting
 import androidx.core.content.edit
 import com.ichi2.anki.dialogs.WhiteBoardWidthDialog
 import com.ichi2.anki.preferences.sharedPrefs
+import com.ichi2.anki.utils.getTimestamp
 import com.ichi2.compat.CompatHelper
 import com.ichi2.libanki.utils.Time
-import com.ichi2.libanki.utils.TimeUtils
 import com.ichi2.themes.Themes.currentTheme
 import com.ichi2.utils.DisplayUtils.getDisplayDimensions
 import com.ichi2.utils.KotlinCleanup
@@ -522,7 +522,7 @@ class Whiteboard(activity: AnkiActivity, handleMultiTouch: Boolean, inverted: Bo
             canvas.drawColor(Color.WHITE)
         }
         draw(canvas)
-        val baseFileName = "Whiteboard" + TimeUtils.getTimestamp(time!!)
+        val baseFileName = "Whiteboard" + getTimestamp(time!!)
         return CompatHelper.compat.saveImage(context, bitmap, baseFileName, "jpg", Bitmap.CompressFormat.JPEG, 95)
     }
 

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/export/ActivityExportingDelegate.kt b/AnkiDroid/src/main/java/com/ichi2/anki/export/ActivityExportingDelegate.kt
@@ -38,12 +38,12 @@ import com.ichi2.anki.dialogs.ExportReadyDialog.ExportReadyDialogListener
 import com.ichi2.anki.preferences.sharedPrefs
 import com.ichi2.anki.servicelayer.ScopedStorageService
 import com.ichi2.anki.snackbar.showSnackbar
+import com.ichi2.anki.utils.getTimestamp
 import com.ichi2.annotations.NeedsTest
 import com.ichi2.compat.CompatHelper
 import com.ichi2.libanki.Collection
 import com.ichi2.libanki.DeckId
 import com.ichi2.libanki.utils.TimeManager
-import com.ichi2.libanki.utils.TimeUtils
 import timber.log.Timber
 import java.io.File
 import java.io.FileOutputStream
@@ -74,7 +74,7 @@ class ActivityExportingDelegate(private val activity: AnkiActivity, private val
     private fun getTimeStampSuffix() =
         "-" + run {
             collectionSupplier.get()
-            TimeUtils.getTimestamp(TimeManager.time)
+            getTimestamp(TimeManager.time)
         }
 
     private fun getColpkgExportName(exportDir: File): File {

diff --git a/AnkiDroid/src/main/java/com/ichi2/anki/utils/Time.kt b/AnkiDroid/src/main/java/com/ichi2/anki/utils/Time.kt
@@ -17,6 +17,9 @@ package com.ichi2.anki.utils
 
 import android.content.Context
 import com.ichi2.anki.R
+import com.ichi2.libanki.utils.Time
+import java.text.SimpleDateFormat
+import java.util.Locale
 import kotlin.math.abs
 import kotlin.math.floor
 import kotlin.math.max
@@ -209,3 +212,7 @@ fun roundedTimeSpan(context: Context, time_s: Long): String {
         )
     }
 }
+
+fun getTimestamp(time: Time): String {
+    return SimpleDateFormat("yyyyMMddHHmmss", Locale.US).format(time.currentDate)
+}
diff --git a/AnkiDroid/src/main/java/com/ichi2/libanki/utils/TimeUtils.kt b/AnkiDroid/src/main/java/com/ichi2/libanki/utils/TimeUtils.kt