From 9bb41daae1b9212c842e877ee1f5d064d95d66d7 Mon Sep 17 00:00:00 2001 From: Barry Li Date: Mon, 21 Mar 2016 15:10:31 -0700 Subject: [PATCH] ANDROID-602 Add "apptentive_" prefix to resources --- ...own_out.xml => apptentive_slide_down_out.xml} | 0 ...lide_up_in.xml => apptentive_slide_up_in.xml} | 0 .../res/drawable/apptentive_fab_circle_mini.xml | 4 ++-- .../drawable/apptentive_fab_circle_normal.xml | 4 ++-- .../res/drawable/apptentive_fab_shadow.xml | 6 +++--- apptentive/res/values/dimens.xml | 16 ++++++++-------- apptentive/res/values/ids.xml | 2 +- apptentive/res/values/styles.xml | 4 ++-- .../com/apptentive/android/sdk/ViewActivity.java | 4 ++-- .../util/image/ApptentiveAttachmentLoader.java | 2 +- .../android/sdk/view/FloatingActionButton.java | 4 ++-- 11 files changed, 23 insertions(+), 23 deletions(-) rename apptentive/res/anim/{slide_down_out.xml => apptentive_slide_down_out.xml} (100%) rename apptentive/res/anim/{slide_up_in.xml => apptentive_slide_up_in.xml} (100%) diff --git a/apptentive/res/anim/slide_down_out.xml b/apptentive/res/anim/apptentive_slide_down_out.xml similarity index 100% rename from apptentive/res/anim/slide_down_out.xml rename to apptentive/res/anim/apptentive_slide_down_out.xml diff --git a/apptentive/res/anim/slide_up_in.xml b/apptentive/res/anim/apptentive_slide_up_in.xml similarity index 100% rename from apptentive/res/anim/slide_up_in.xml rename to apptentive/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 index 8a104ad93..893880460 100644 --- 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"> + android:width="@dimen/apptentive_floating_action_button_size_mini" + android:height="@dimen/apptentive_floating_action_button_size_mini"/> \ No newline at end of file diff --git a/apptentive/res/drawable/apptentive_fab_circle_normal.xml b/apptentive/res/drawable/apptentive_fab_circle_normal.xml index 141b53009..9dd79e89e 100644 --- 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"> + android:width="@dimen/apptentive_floating_action_button_size_normal" + android:height="@dimen/apptentive_floating_action_button_size_normal"/> \ No newline at end of file diff --git a/apptentive/res/drawable/apptentive_fab_shadow.xml b/apptentive/res/drawable/apptentive_fab_shadow.xml index d91c096e6..f308e5f82 100644 --- a/apptentive/res/drawable/apptentive_fab_shadow.xml +++ b/apptentive/res/drawable/apptentive_fab_shadow.xml @@ -14,8 +14,8 @@ android:endColor="#0000" /> + android:right="@dimen/apptentive_floating_action_button_shadow_radius" + android:bottom="@dimen/apptentive_floating_action_button_shadow_radius"/> \ No newline at end of file diff --git a/apptentive/res/values/dimens.xml b/apptentive/res/values/dimens.xml index f04e6b162..8ec9bbc9c 100644 --- a/apptentive/res/values/dimens.xml +++ b/apptentive/res/values/dimens.xml @@ -70,14 +70,14 @@ 16dp 8dp - 56dp - 40dp - 4dp - 4dp - 34dp - -34dp - 26dp - -26dp + 56dp + 40dp + 4dp + 4dp + 34dp + -34dp + 26dp + -26dp 24dp diff --git a/apptentive/res/values/ids.xml b/apptentive/res/values/ids.xml index ceca7ad02..2d8f78197 100644 --- a/apptentive/res/values/ids.xml +++ b/apptentive/res/values/ids.xml @@ -7,5 +7,5 @@ - + \ No newline at end of file diff --git a/apptentive/res/values/styles.xml b/apptentive/res/values/styles.xml index 47e6951a6..5899fde4c 100644 --- a/apptentive/res/values/styles.xml +++ b/apptentive/res/values/styles.xml @@ -456,7 +456,7 @@ \ No newline at end of file diff --git a/apptentive/src/com/apptentive/android/sdk/ViewActivity.java b/apptentive/src/com/apptentive/android/sdk/ViewActivity.java index 5a7569cee..55d6bc7e9 100644 --- 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 index ff0393109..79ab6e053 100644 --- 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 queuedDownLoaderRequests; diff --git a/apptentive/src/com/apptentive/android/sdk/view/FloatingActionButton.java b/apptentive/src/com/apptentive/android/sdk/view/FloatingActionButton.java index 0e053f3c5..98d0fd317 100644 --- 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); } }