ANDROID-602 Add "apptentive_" prefix to resources

apptentive · Mar 21, 2016 · 9bb41da · 9bb41da
1 parent f3b0f5b
commit 9bb41da
Show file tree

Hide file tree

Showing 11 changed files with 23 additions and 23 deletions.
diff --git a/apptentive/res/anim/slide_down_out.xml → ...ve/res/anim/apptentive_slide_down_out.xml b/apptentive/res/anim/slide_down_out.xml → ...ve/res/anim/apptentive_slide_down_out.xml
diff --git a/apptentive/res/anim/slide_up_in.xml → ...ntive/res/anim/apptentive_slide_up_in.xml b/apptentive/res/anim/slide_up_in.xml → ...ntive/res/anim/apptentive_slide_up_in.xml
diff --git a/apptentive/res/drawable/apptentive_fab_circle_mini.xml b/apptentive/res/drawable/apptentive_fab_circle_mini.xml
@@ -9,6 +9,6 @@
        android:shape="oval">
     <solid android:color="@android:color/white"/>
     <size
-        android:width="@dimen/floating_action_button_size_mini"
-        android:height="@dimen/floating_action_button_size_mini"/>
+        android:width="@dimen/apptentive_floating_action_button_size_mini"
+        android:height="@dimen/apptentive_floating_action_button_size_mini"/>
 </shape>
diff --git a/apptentive/res/drawable/apptentive_fab_circle_normal.xml b/apptentive/res/drawable/apptentive_fab_circle_normal.xml
@@ -9,6 +9,6 @@
        android:shape="oval">
     <solid android:color="@android:color/white"/>
     <size
-        android:width="@dimen/floating_action_button_size_normal"
-        android:height="@dimen/floating_action_button_size_normal"/>
+        android:width="@dimen/apptentive_floating_action_button_size_normal"
+        android:height="@dimen/apptentive_floating_action_button_size_normal"/>
 </shape>
diff --git a/apptentive/res/drawable/apptentive_fab_shadow.xml b/apptentive/res/drawable/apptentive_fab_shadow.xml
@@ -14,8 +14,8 @@
         android:endColor="#0000"
         />
     <padding
-        android:left="@dimen/floating_action_button_shadow_radius"
+        android:left="@dimen/apptentive_floating_action_button_shadow_radius"
         android:top="0dp"
-        android:right="@dimen/floating_action_button_shadow_radius"
-        android:bottom="@dimen/floating_action_button_shadow_radius"/>
+        android:right="@dimen/apptentive_floating_action_button_shadow_radius"
+        android:bottom="@dimen/apptentive_floating_action_button_shadow_radius"/>
 </shape>
diff --git a/apptentive/res/values/dimens.xml b/apptentive/res/values/dimens.xml
@@ -70,14 +70,14 @@
     <dimen name="apptentive_message_center_card_view_content_margin">16dp</dimen>
     <dimen name="apptentive_message_center_card_control_margin">8dp</dimen>
 
-    <dimen name="floating_action_button_size_normal">56dp</dimen>
-    <dimen name="floating_action_button_size_mini">40dp</dimen>
-    <dimen name="floating_action_button_elevation">4dp</dimen>
-    <dimen name="floating_action_button_shadow_radius">4dp</dimen>
-    <dimen name="floating_action_button_margin_normal">34dp</dimen>
-    <dimen name="floating_action_button_margin_normal_minus">-34dp</dimen>
-    <dimen name="floating_action_button_margin_mini">26dp</dimen>
-    <dimen name="floating_action_button_margin_mini_minus">-26dp</dimen>
+    <dimen name="apptentive_floating_action_button_size_normal">56dp</dimen>
+    <dimen name="apptentive_floating_action_button_size_mini">40dp</dimen>
+    <dimen name="apptentive_floating_action_button_elevation">4dp</dimen>
+    <dimen name="apptentive_floating_action_button_shadow_radius">4dp</dimen>
+    <dimen name="apptentive_floating_action_button_margin_normal">34dp</dimen>
+    <dimen name="apptentive_floating_action_button_margin_normal_minus">-34dp</dimen>
+    <dimen name="apptentive_floating_action_button_margin_mini">26dp</dimen>
+    <dimen name="apptentive_floating_action_button_margin_mini_minus">-26dp</dimen>
 
 
     <dimen name="apptentive_message_center_greeting_side_margin">24dp</dimen>

diff --git a/apptentive/res/values/ids.xml b/apptentive/res/values/ids.xml
@@ -7,5 +7,5 @@
 
 <resources>
     <item name="apptentive_message_center_view" type="id"/>
-    <item name="drawable_downloader" type="id" />
+    <item name="apptentive_drawable_downloader" type="id" />
 </resources>
diff --git a/apptentive/res/values/styles.xml b/apptentive/res/values/styles.xml
@@ -456,7 +456,7 @@
 
     <!-- For dialog Animation -->
     <style name="ApptentiveDialogAnimation">
-        <item name="android:windowEnterAnimation">@anim/slide_up_in</item>
-        <item name="android:windowExitAnimation">@anim/slide_down_out</item>
+        <item name="android:windowEnterAnimation">@anim/apptentive_slide_up_in</item>
+        <item name="android:windowExitAnimation">@anim/apptentive_slide_down_out</item>
     </style>
 </resources>
diff --git a/apptentive/src/com/apptentive/android/sdk/ViewActivity.java b/apptentive/src/com/apptentive/android/sdk/ViewActivity.java
@@ -282,13 +282,13 @@ protected void onRestoreInstanceState(Bundle savedInstanceState) {
 	@Override
 	public void finish() {
 		super.finish();
-		overridePendingTransition(0, R.anim.slide_down_out);
+		overridePendingTransition(0, R.anim.apptentive_slide_down_out);
 	}
 
 	@Override
 	protected void onNewIntent(Intent intent) {
 		super.onNewIntent(intent);
-		overridePendingTransition(R.anim.slide_up_in, 0);
+		overridePendingTransition(R.anim.apptentive_slide_up_in, 0);
 	}
 
 	@Override

diff --git a/apptentive/src/com/apptentive/android/sdk/util/image/ApptentiveAttachmentLoader.java b/apptentive/src/com/apptentive/android/sdk/util/image/ApptentiveAttachmentLoader.java
@@ -32,7 +32,7 @@
  */
 public class ApptentiveAttachmentLoader {
 
-	public static final int DRAWABLE_DOWNLOAD_TAG = R.id.drawable_downloader;
+	public static final int DRAWABLE_DOWNLOAD_TAG = R.id.apptentive_drawable_downloader;
 
 	private ImageMemoryCache bitmapMemoryCache;
 	private ArrayList<LoaderRequest> queuedDownLoaderRequests;

diff --git a/apptentive/src/com/apptentive/android/sdk/view/FloatingActionButton.java b/apptentive/src/com/apptentive/android/sdk/view/FloatingActionButton.java
@@ -236,7 +236,7 @@ private void initAttrs(TypedArray a) {
 
 		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
 			if (mImplicitElevation) {
-				setElevation(getResources().getDimension(R.dimen.floating_action_button_elevation));
+				setElevation(getResources().getDimension(R.dimen.apptentive_floating_action_button_elevation));
 			}
 		}
 	}
@@ -296,7 +296,7 @@ private void updateBackground(Drawable background) {
 
 		if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP) {
 			if (mImplicitElevation) {
-				setElevation(mShadow ? getResources().getDimension(R.dimen.floating_action_button_elevation) : 0f);
+				setElevation(mShadow ? getResources().getDimension(R.dimen.apptentive_floating_action_button_elevation) : 0f);
 			}
 		}