ANDROID-603 Add "apptentive_" prefix to icons

apptentive · Mar 22, 2016 · 0e4c5e5 · 0e4c5e5
1 parent cd325eb
commit 0e4c5e5
Show file tree

Hide file tree

Showing 14 changed files with 7 additions and 7 deletions.
diff --git a/apptentive/res/drawable-hdpi/ic_edit.png → .../res/drawable-hdpi/apptentive_ic_edit.png b/apptentive/res/drawable-hdpi/ic_edit.png → .../res/drawable-hdpi/apptentive_ic_edit.png
diff --git a/...roid_textfield_activated_holo_light.9.png → ...tive_textfield_activated_holo_light.9.png b/...roid_textfield_activated_holo_light.9.png → ...tive_textfield_activated_holo_light.9.png
diff --git a/apptentive/res/drawable-mdpi/ic_edit.png → .../res/drawable-mdpi/apptentive_ic_edit.png b/apptentive/res/drawable-mdpi/ic_edit.png → .../res/drawable-mdpi/apptentive_ic_edit.png
diff --git a/...roid_textfield_activated_holo_light.9.png → ...tive_textfield_activated_holo_light.9.png b/...roid_textfield_activated_holo_light.9.png → ...tive_textfield_activated_holo_light.9.png
diff --git a/apptentive/res/drawable-xhdpi/avatar.jpeg → .../drawable-xhdpi/apptentive_ic_avatar.jpeg b/apptentive/res/drawable-xhdpi/avatar.jpeg → .../drawable-xhdpi/apptentive_ic_avatar.jpeg
diff --git a/apptentive/res/drawable-xhdpi/ic_edit.png → ...res/drawable-xhdpi/apptentive_ic_edit.png b/apptentive/res/drawable-xhdpi/ic_edit.png → ...res/drawable-xhdpi/apptentive_ic_edit.png
diff --git a/...roid_textfield_activated_holo_light.9.png → ...tive_textfield_activated_holo_light.9.png b/...roid_textfield_activated_holo_light.9.png → ...tive_textfield_activated_holo_light.9.png
diff --git a/apptentive/res/drawable-xxhdpi/ic_edit.png → ...es/drawable-xxhdpi/apptentive_ic_edit.png b/apptentive/res/drawable-xxhdpi/ic_edit.png → ...es/drawable-xxhdpi/apptentive_ic_edit.png
diff --git a/apptentive/res/layout/apptentive_message_center.xml b/apptentive/res/layout/apptentive_message_center.xml
@@ -83,5 +83,5 @@
                                                           android:layout_alignParentRight="true"
                                                           android:layout_marginBottom="@dimen/apptentive_message_center_fab_height"
                                                           android:layout_marginRight="@dimen/apptentive_message_center_fab_right"
-                                                          android:src="@drawable/ic_edit"/>
+                                                          android:src="@drawable/apptentive_ic_edit"/>
 </RelativeLayout>
diff --git a/apptentive/res/layout/apptentive_message_center_greeting.xml b/apptentive/res/layout/apptentive_message_center_greeting.xml
@@ -23,7 +23,7 @@
                                                                                    android:layout_centerVertical="true"
                                                                                    style="?attr/apptentiveAvatarViewGreetingStyle"
                                                                                    android:gravity="center_vertical"
-                                                                                   android:src="@drawable/avatar"/>
+                                                                                   android:src="@drawable/apptentive_ic_avatar"/>
         <LinearLayout android:id="@+id/greeting_content"
                       android:layout_width="wrap_content"
                       android:layout_height="wrap_content"

diff --git a/apptentive/res/layout/apptentive_notification_toast.xml b/apptentive/res/layout/apptentive_notification_toast.xml
@@ -18,7 +18,7 @@
                                                                                android:paddingLeft="11dp"
                                                                                android:paddingRight="11dp"
                                                                                android:paddingBottom="13dp"
-                                                                               android:src="@drawable/avatar"/>
+                                                                               android:src="@drawable/apptentive_ic_avatar"/>
     <TextView android:id="@+id/toast_title"
               android:layout_width="wrap_content"
               android:layout_height="wrap_content"

diff --git a/apptentive/res/layout/apptentive_survey_question_singleline.xml b/apptentive/res/layout/apptentive_survey_question_singleline.xml
@@ -20,6 +20,6 @@
               android:textColor="@color/apptentive_survey_answer_text"
               android:textSize="@dimen/apptentive_text_small"
               android:hint="@string/apptentive_survey_singleline_hint"
-              android:background="@drawable/android_textfield_activated_holo_light"
+              android:background="@drawable/apptentive_textfield_activated_holo_light"
               android:saveEnabled="false"/>
 </LinearLayout>
diff --git a/apptentive/res/values/styles.xml b/apptentive/res/values/styles.xml
@@ -318,7 +318,7 @@
     </style>
 
     <style name="ApptentiveTheme.TextAppearence.EditText.ApptentiveInteraction">
-        <item name="android:background">@drawable/android_textfield_activated_holo_light</item>
+        <item name="android:background">@drawable/apptentive_textfield_activated_holo_light</item>
         <item name="android:textSize">@dimen/apptentive_dialog_edittext</item>
         <item name="android:textCursorDrawable">@null</item>
     </style>
@@ -385,7 +385,7 @@
     </style>
 
     <style name="ApptentiveAvatarView">
-        <item name="android:src">@drawable/avatar</item>
+        <item name="android:src">@drawable/apptentive_ic_avatar</item>
     </style>
 
     <style name="ApptentiveAvatarView.Greeting">

diff --git a/apptentive/src/com/apptentive/android/sdk/module/messagecenter/MessageManager.java b/apptentive/src/com/apptentive/android/sdk/module/messagecenter/MessageManager.java
@@ -428,7 +428,7 @@ private static void showUnreadMessageToastNotification(final CompoundMessage app
 					final ApptentiveToastNotification.Builder builder = new ApptentiveToastNotification.Builder(foreground);
 					builder.setContentTitle(foreground.getResources().getString(R.string.apptentive_message_center_title))
 							.setDefaults(Notification.DEFAULT_SOUND | Notification.DEFAULT_LIGHTS)
-							.setSmallIcon(R.drawable.avatar).setContentText(apptentiveMsg.getBody())
+							.setSmallIcon(R.drawable.apptentive_ic_avatar).setContentText(apptentiveMsg.getBody())
 							.setContentIntent(pendingIntent)
 							.setFullScreenIntent(pendingIntent, false);
 					foreground.runOnUiThread(new Runnable() {