prefix resource strings

mauron85 · Nov 20, 2018 · de241a1 · de241a1
1 parent 95379c5
commit de241a1
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 8 deletions.
diff --git a/VERSIONS.gradle b/VERSIONS.gradle
@@ -13,6 +13,7 @@ def ROBOLECTRIC_VERSION = "3.0"
 def JUNIT_VERSION = "4.12"
 def FEST_ASSERT_CORE_VERSION = "2.0M10"
 def SUPPORT_TEST_VERSION = "0.5"
+def RESOURCE_PREFIX = "mauron85_bgloc_"
 
 ext {
     hasRootProject = { ->
@@ -112,6 +113,10 @@ ext {
         return false
     }
 
+    getResourcePrefix = { ->
+        return RESOURCE_PREFIX
+    }
+
     androidLibs = [
         supportAnnotations: [group: 'com.android.support', name: 'support-annotations', version: '23.1.1'],
         supportCompat: [group: 'com.android.support', name: 'support-compat', version: getSupportLibVersion()],

diff --git a/build.gradle b/build.gradle
@@ -2,9 +2,8 @@ apply plugin: 'com.android.library'
 
 apply from: './VERSIONS.gradle'
 def applicationId = getApplicationId()
-def playServicesVersion = getPlayServicesVersion()
-def supportLibVersion = getSupportLibVersion()
 def hasGradle3Support = getGradle3Support()
+def resourcePrefix = getResourcePrefix()
 
 // https://hackernoon.com/android-how-to-add-gradle-dependencies-using-foreach-c4cbcc070458
 def oreoDependencies = [
@@ -66,8 +65,9 @@ android {
     publishNonDefault true
 
     defaultConfig {
-        resValue "string", "mauron85_bgloc_content_authority", applicationId + '.mauron85.bgloc.provider'
-        resValue "string", "mauron85_bgloc_account_type", applicationId + '.mauron85.bgloc.account'
+        resValue "string", resourcePrefix + "account_name", 'Locations'
+        resValue "string", resourcePrefix + "account_type", applicationId + '.mauron85.bgloc.account'
+        resValue "string", resourcePrefix + "content_authority", applicationId + '.mauron85.bgloc.provider'
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
         minSdkVersion project.ext.getMinSdkVersion()
         versionCode 1

diff --git a/src/main/java/com/marianhello/bgloc/ResourceResolver.java b/src/main/java/com/marianhello/bgloc/ResourceResolver.java
@@ -7,9 +7,10 @@
  */
 public class ResourceResolver {
 
-    private static final String ACCOUNT_NAME_RESOURCE = "account_name";
-    private static final String ACCOUNT_TYPE_RESOURCE = "mauron85_bgloc_account_type";
-    private static final String AUTHORITY_TYPE_RESOURCE = "mauron85_bgloc_content_authority";
+    private static final String RESOURCE_PREFIX = "mauron85_bgloc_";
+    private static final String ACCOUNT_NAME_RESOURCE = RESOURCE_PREFIX + "account_name";
+    private static final String ACCOUNT_TYPE_RESOURCE = RESOURCE_PREFIX + "account_type";
+    private static final String AUTHORITY_TYPE_RESOURCE = RESOURCE_PREFIX + "content_authority";
 
     private Context mContext;
 

diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
@@ -1,5 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <string name="app_name">app_name</string>
-    <string name="account_name">Locations</string>
 </resources>