Move constants to their own file

Automattic · Jan 19, 2024 · 79beb10 · 79beb10
1 parent b2de8a5
commit 79beb10
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 4 deletions.
diff --git a/gravatar/src/main/java/com/gravatar/GravatarApi.kt b/gravatar/src/main/java/com/gravatar/GravatarApi.kt
@@ -3,6 +3,7 @@ package com.gravatar
 import android.os.Handler
 import android.os.Looper
 import android.util.Log
+import com.gravatar.GravatarConstants.GRAVATAR_API_BASE_URL
 import okhttp3.MultipartBody
 import okhttp3.OkHttpClient
 import okhttp3.RequestBody.Companion.asRequestBody
@@ -22,12 +23,11 @@ class GravatarApi(okHttpClient: OkHttpClient? = null) {
         retrofit =
             Retrofit.Builder().apply {
                 okHttpClient?.let { client(it) }
-                baseUrl(API_BASE_URL)
+                baseUrl(GRAVATAR_API_BASE_URL)
             }.build()
     }
 
     private companion object {
-        const val API_BASE_URL = "https://api.gravatar.com/v1/"
         const val LOG_TAG = "Gravatar"
     }
 

diff --git a/gravatar/src/main/java/com/gravatar/GravatarConstants.kt b/gravatar/src/main/java/com/gravatar/GravatarConstants.kt
@@ -0,0 +1,11 @@
+package com.gravatar
+
+object GravatarConstants {
+    // Gravatar image / avatar
+    const val GRAVATAR_IMAGE_BASE_URL = "https://www.gravatar.com/"
+    const val GRAVATAR_IMAGE_HOST = "www.gravatar.com"
+    const val GRAVATAR_IMAGE_PATH = "avatar"
+
+    // Gravatar API
+    const val GRAVATAR_API_BASE_URL = "https://api.gravatar.com/v1/"
+}
diff --git a/gravatar/src/main/java/com/gravatar/GravatarUtils.kt b/gravatar/src/main/java/com/gravatar/GravatarUtils.kt
@@ -1,6 +1,8 @@
 package com.gravatar
 
 import android.net.Uri
+import com.gravatar.GravatarConstants.GRAVATAR_IMAGE_HOST
+import com.gravatar.GravatarConstants.GRAVATAR_IMAGE_PATH
 import java.security.MessageDigest
 
 private fun ByteArray.toHex(): String {
@@ -30,8 +32,8 @@ fun emailAddressToGravatarUri(
 ): Uri {
     return Uri.Builder()
         .scheme("https")
-        .authority("www.gravatar.com")
-        .appendPath("avatar")
+        .authority(GRAVATAR_IMAGE_HOST)
+        .appendPath(GRAVATAR_IMAGE_PATH)
         .appendPath(emailAddressToGravatarHash(email))
         .apply {
             defaultAvatarImage?.let { appendQueryParameter("d", it.style) }