Merge pull request #3 from telerik/kkotorov/fix-for-high-resolution-android-devices

Fix for taking screenshots on high resolution Android devices

src/android/FeedbackLib/res/drawable-hdpi/comment_indicator.xml

@@ -15,4 +15,4 @@
             <solid android:color="#E5FFFFFF"  />
         </shape>
     </item>
-</layer-list><!-- From: file:/C:/workFeedback/Android/Feedback/src/main/res/drawable-hdpi/comment_indicator.xml -->
+</layer-list><!-- From: file:/C:/_J/jobs/Android_2016q2_Upload/workspace/Feedback/src/main/res/drawable-hdpi/comment_indicator.xml -->

src/android/FeedbackLib/res/drawable-hdpi/done_button.xml

@@ -6,4 +6,4 @@
             android:gravity="center"
             android:src="@drawable/ic_done" />
     </item>
-</layer-list><!-- From: file:/C:/workFeedback/Android/Feedback/src/main/res/drawable-hdpi/done_button.xml -->
+</layer-list><!-- From: file:/C:/_J/jobs/Android_2016q2_Upload/workspace/Feedback/src/main/res/drawable-hdpi/done_button.xml -->

src/android/FeedbackLib/res/drawable-hdpi/feedback_prompt_background.xml

@@ -7,4 +7,4 @@
             <corners android:radius="8dp"/>
         </shape>
     </item>
-</layer-list><!-- From: file:/C:/workFeedback/Android/Feedback/src/main/res/drawable-hdpi/feedback_prompt_background.xml -->
+</layer-list><!-- From: file:/C:/_J/jobs/Android_2016q2_Upload/workspace/Feedback/src/main/res/drawable-hdpi/feedback_prompt_background.xml -->

src/android/FeedbackLib/res/layout/activity_edit_details.xml

@@ -8,7 +8,7 @@
 
     <EditText
         android:id="@+id/txtAuthorName"
-        android:hint="Name"
+        android:hint="@string/feedback_author_name_hint"
         android:inputType="textPersonName"
         android:layout_width="match_parent"
         android:layout_height="wrap_content" />
@@ -20,4 +20,4 @@
         android:layout_height="wrap_content" />
 
 </LinearLayout>
-<!-- From: file:/C:/workFeedback/Android/Feedback/src/main/res/layout/activity_edit_details.xml -->
+<!-- From: file:/C:/_J/jobs/Android_2016q2_Upload/workspace/Feedback/src/main/res/layout/activity_edit_details.xml -->

src/android/FeedbackLib/res/layout/activity_send_feedback.xml

@@ -77,7 +77,7 @@
                         android:layout_height="wrap_content"
                         android:layout_gravity="bottom"
                         android:layout_weight="1"
-                        android:hint="Your feedback" />
+                        android:hint="@string/send_feedback_activity_feedback_hint" />
 
                     <View
                         android:layout_width="1dp"
@@ -102,13 +102,14 @@
             android:id="@+id/progressBar"
             android:layout_width="match_parent"
             android:layout_height="match_parent"
-            android:background="@color/white">
+            android:background="@color/progress_bar_background">
+
             <ProgressBar
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_gravity="center"/>
+                android:layout_gravity="center" />
         </FrameLayout>
 
     </FrameLayout>
 </LinearLayout>
-<!-- From: file:/C:/Program%20Files%20(x86)/Jenkins/jobs/BuildAll_master/workspace/Feedback/src/main/res/layout/activity_send_feedback.xml -->
+<!-- From: file:/C:/_J/jobs/Android_2016q2_Upload/workspace/Feedback/src/main/res/layout/activity_send_feedback.xml -->

src/android/FeedbackLib/res/layout/activity_view_feedback.xml

@@ -12,4 +12,4 @@
     </android.support.v4.view.ViewPager>
 
 </LinearLayout>
-<!-- From: file:/C:/Program%20Files%20(x86)/Jenkins/jobs/BuildAll_master/workspace/Feedback/src/main/res/layout/activity_view_feedback.xml -->
+<!-- From: file:/C:/_J/jobs/Android_2016q2_Upload/workspace/Feedback/src/main/res/layout/activity_view_feedback.xml -->

src/android/FeedbackLib/res/layout/activity_view_feedback_item.xml

@@ -46,7 +46,7 @@
                     android:id="@+id/txtFeedbackText"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:textColor="#FF838383"
+                    android:textColor="@color/view_feedback_item_text_color"
                     android:textSize="18sp" />
 
                 <FrameLayout
@@ -103,7 +103,7 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_gravity="bottom"
-        android:background="#C8FFFFFF"
+        android:background="@color/view_feedback_item_comments_background"
         android:orientation="vertical">
 
         <View
@@ -124,7 +124,7 @@
                 android:layout_height="wrap_content"
                 android:layout_gravity="bottom"
                 android:layout_weight="1"
-                android:hint="Your comment" />
+                android:hint="@string/feedback_your_comment_hint" />
 
             <View
                 android:layout_width="1dp"
@@ -142,4 +142,4 @@
 
         </LinearLayout>
     </LinearLayout>
-</FrameLayout><!-- From: file:/C:/Program%20Files%20(x86)/Jenkins/jobs/BuildAll_master/workspace/Feedback/src/main/res/layout/activity_view_feedback_item.xml -->
+</FrameLayout><!-- From: file:/C:/_J/jobs/Android_2016q2_Upload/workspace/Feedback/src/main/res/layout/activity_view_feedback_item.xml -->

src/android/FeedbackLib/res/layout/feedback_comment.xml

@@ -18,7 +18,7 @@
             android:id="@+id/txtAuthor"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="Anonymous"
+            android:text="@string/feedback_author_anonymous"
             android:textColor="@color/grey_text_color"
             android:textSize="14sp"
             android:textStyle="bold" />
@@ -42,4 +42,4 @@
         android:layout_height="1dp"
         android:layout_gravity="top"
         android:background="@color/light_grey" />
-</LinearLayout><!-- From: file:/C:/Program%20Files%20(x86)/Jenkins/jobs/BuildAll_master/workspace/Feedback/src/main/res/layout/feedback_comment.xml -->
+</LinearLayout><!-- From: file:/C:/_J/jobs/Android_2016q2_Upload/workspace/Feedback/src/main/res/layout/feedback_comment.xml -->

src/android/FeedbackLib/res/layout/feedback_indicator.xml

@@ -4,4 +4,4 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:background="@drawable/comment_indicator"/>
-<!-- From: file:/C:/Program%20Files%20(x86)/Jenkins/jobs/BuildAll_master/workspace/Feedback/src/main/res/layout/feedback_indicator.xml -->
+<!-- From: file:/C:/_J/jobs/Android_2016q2_Upload/workspace/Feedback/src/main/res/layout/feedback_indicator.xml -->

src/android/FeedbackLib/res/layout/feedback_item.xml

@@ -33,7 +33,7 @@
             android:layout_gravity="left"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:textColor="#FF33B5E5"
+            android:textColor="@color/light_blue"
             android:textSize="14sp" />
 
         <TextView
@@ -47,4 +47,4 @@
 
     </FrameLayout>
 
-</LinearLayout><!-- From: file:/C:/Program%20Files%20(x86)/Jenkins/jobs/BuildAll_master/workspace/Feedback/src/main/res/layout/feedback_item.xml -->
+</LinearLayout><!-- From: file:/C:/_J/jobs/Android_2016q2_Upload/workspace/Feedback/src/main/res/layout/feedback_item.xml -->

src/android/FeedbackLib/res/layout/fragment_feedback_items.xml

@@ -31,4 +31,4 @@
 
     </ListView>
 
-</FrameLayout><!-- From: file:/C:/Program%20Files%20(x86)/Jenkins/jobs/BuildAll_master/workspace/Feedback/src/main/res/layout/fragment_feedback_items.xml -->
+</FrameLayout><!-- From: file:/C:/_J/jobs/Android_2016q2_Upload/workspace/Feedback/src/main/res/layout/fragment_feedback_items.xml -->

src/android/FeedbackLib/res/layout/list_progress_indicator.xml

@@ -7,4 +7,4 @@
     android:layout_gravity="center"
     android:layout_width="wrap_content"
     android:layout_height="wrap_content" />
-</LinearLayout><!-- From: file:/C:/Program%20Files%20(x86)/Jenkins/jobs/BuildAll_master/workspace/Feedback/src/main/res/layout/list_progress_indicator.xml -->
+</LinearLayout><!-- From: file:/C:/_J/jobs/Android_2016q2_Upload/workspace/Feedback/src/main/res/layout/list_progress_indicator.xml -->

src/android/FeedbackLib/res/layout/main_menu_content.xml

@@ -11,16 +11,17 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:textSize="18sp"
-        android:text="Send feedback"
+        android:text="@string/title_activity_send_feedback"
         android:layout_margin="16dp"
         android:textColor="@color/light_blue" />
+
     <View
         android:background="@color/light_blue"
         android:layout_width="match_parent"
-        android:layout_height="2dp"/>
+        android:layout_height="2dp" />
 
     <ListView
         android:id="@+id/menuList"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content"/>
-</LinearLayout><!-- From: file:/C:/Program%20Files%20(x86)/Jenkins/jobs/BuildAll_master/workspace/Feedback/src/main/res/layout/main_menu_content.xml -->
+        android:layout_height="wrap_content" />
+</LinearLayout><!-- From: file:/C:/_J/jobs/Android_2016q2_Upload/workspace/Feedback/src/main/res/layout/main_menu_content.xml -->

src/android/FeedbackLib/res/layout/main_menu_list_item.xml

@@ -23,4 +23,4 @@
         android:layout_width="wrap_content"
         android:layout_height="wrap_content" />
 
-</LinearLayout><!-- From: file:/C:/Program%20Files%20(x86)/Jenkins/jobs/BuildAll_master/workspace/Feedback/src/main/res/layout/main_menu_list_item.xml -->
+</LinearLayout><!-- From: file:/C:/_J/jobs/Android_2016q2_Upload/workspace/Feedback/src/main/res/layout/main_menu_list_item.xml -->

src/android/FeedbackLib/res/layout/popup_edit_details.xml

@@ -6,4 +6,4 @@
     android:orientation="vertical">
 
     <include layout="@layout/activity_edit_details" />
-</LinearLayout><!-- From: file:/C:/Program%20Files%20(x86)/Jenkins/jobs/BuildAll_master/workspace/Feedback/src/main/res/layout/popup_edit_details.xml -->
+</LinearLayout><!-- From: file:/C:/_J/jobs/Android_2016q2_Upload/workspace/Feedback/src/main/res/layout/popup_edit_details.xml -->

src/android/FeedbackLib/res/menu/edit_details.xml

@@ -7,4 +7,4 @@
         android:orderInCategory="100"
         app:showAsAction="never" />
 </menu>
-<!-- From: file:/C:/Program%20Files%20(x86)/Jenkins/jobs/BuildAll_master/workspace/Feedback/src/main/res/menu/edit_details.xml -->
+<!-- From: file:/C:/_J/jobs/Android_2016q2_Upload/workspace/Feedback/src/main/res/menu/edit_details.xml -->

src/android/FeedbackLib/res/menu/send_feedback_activity_menu.xml

@@ -3,7 +3,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:feedback="http://schemas.android.com/apk/res-auto" >
     <item android:id="@+id/action_send"
-        android:title="Send"
+        android:title="@string/feedback_send_title"
         android:icon="@drawable/ic_send"
         feedback:showAsAction="always"/>
-</menu><!-- From: file:/C:/Program%20Files%20(x86)/Jenkins/jobs/BuildAll_master/workspace/Feedback/src/main/res/menu/send_feedback_activity_menu.xml -->
+</menu><!-- From: file:/C:/_J/jobs/Android_2016q2_Upload/workspace/Feedback/src/main/res/menu/send_feedback_activity_menu.xml -->

src/android/FeedbackLib/res/menu/view_feedback_items_activity_menu.xml

@@ -3,7 +3,7 @@
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:feedback="http://schemas.android.com/apk/res-auto" >
     <item android:id="@+id/action_refresh"
-        android:title="Refresh"
+        android:title="@string/feedback_refresh_title"
         android:icon="@drawable/ic_feedback_sync"
         feedback:showAsAction="always"/>
-</menu><!-- From: file:/C:/Program%20Files%20(x86)/Jenkins/jobs/BuildAll_master/workspace/Feedback/src/main/res/menu/view_feedback_items_activity_menu.xml -->
+</menu><!-- From: file:/C:/_J/jobs/Android_2016q2_Upload/workspace/Feedback/src/main/res/menu/view_feedback_items_activity_menu.xml -->

src/android/FeedbackLib/res/values-v21/values-v21.xml

@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- From: file:/C:/_J/jobs/Android_2016q2_Upload/workspace/Feedback/src/main/res/values-v21/themes.xml -->
+    <eat-comment/>
+    <style name="AppCompatTheme" parent="Base.V21.Theme.AppCompat.Light">
+    </style>
+</resources>

src/android/FeedbackLib/res/values-w820dp-v13/values.xml

@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<resources>
-
-    <!-- From: file:/C:/Program%20Files%20(x86)/Jenkins/jobs/BuildAll_master/workspace/Feedback/src/main/res/values-w820dp/dimens.xml -->
-    <eat-comment />
-
-    <dimen name="activity_horizontal_margin">64dp</dimen>
-
-</resources>

src/android/FeedbackLib/res/values-w820dp/values-w820dp.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- From: file:/C:/_J/jobs/Android_2016q2_Upload/workspace/Feedback/src/main/res/values-w820dp/dimens.xml -->
+    <eat-comment/>
+    <dimen name="activity_horizontal_margin">64dp</dimen>
+</resources>

src/android/FeedbackLib/res/values/values.xml

@@ -1,27 +1,23 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-
-    <!-- From: file:/C:/Program%20Files%20(x86)/Jenkins/jobs/BuildAll_master/workspace/Feedback/src/main/res/values/colors.xml -->
-    <eat-comment />
-	
-	<color name="white">#FFFFFFFF</color>
+    <!-- From: file:/C:/_J/jobs/Android_2016q2_Upload/workspace/Feedback/src/main/res/values/colors.xml -->
+    <eat-comment/>
     <color name="dark_grey_text_color">#FF838383</color>
     <color name="grey_text_color">#C4C4C4</color>
     <color name="light_blue">#33B5E5</color>
     <color name="light_grey">#FFE5E5E5</color>
+    <color name="progress_bar_background">#FFFFFFFF</color>
     <color name="status_open_color">#FF8ABD00</color>
     <color name="status_resolved_color">#FFFF9105</color>
     <color name="text_editor_background">#D9FFFFFF</color>
-    <!-- From: file:/C:/Program%20Files%20(x86)/Jenkins/jobs/BuildAll_master/workspace/Feedback/src/main/res/values/dimens.xml -->
-    <eat-comment />
-
-    <dimen name="activity_horizontal_margin">16dp</dimen>
-    <dimen name="activity_vertical_margin">16dp</dimen>
+    <color name="view_feedback_item_comments_background">#C8FFFFFF</color>
+    <color name="view_feedback_item_text_color">#FF838383</color>
+    <!-- From: file:/C:/_J/jobs/Android_2016q2_Upload/workspace/Feedback/src/main/res/values/dimens.xml -->
+    <eat-comment/>
     <dimen name="feedback_indicator_size">32dp</dimen>
     <dimen name="pager_tab_strip_padding">16dp</dimen>
-    <!-- From: file:/C:/Program%20Files%20(x86)/Jenkins/jobs/BuildAll_master/workspace/Feedback/src/main/res/values/strings.xml -->
-    <eat-comment />
-
+    <!-- From: file:/C:/_J/jobs/Android_2016q2_Upload/workspace/Feedback/src/main/res/values/strings.xml -->
+    <eat-comment/>
     <string name="action_edit_settings">Settings</string>
     <string name="action_send_feedback">Send feedback</string>
     <string name="action_settings">Settings</string>
@@ -31,8 +27,29 @@
     <string name="date_time_format_string">yyyy-MM-dd\'T\'HH:mm:ss.SSS\'Z\'</string>
     <string name="date_time_label_format_string">MMMM dd, yyyy h:mm a</string>
     <string name="edit_settings_desc">"Edit your name that will appear along with your feedback."</string>
+    <string name="feedback_activity_multiple_comments_label_format">%d Comments</string>
+    <string name="feedback_activity_single_comment_label_format">%d Comment</string>
+    <string name="feedback_add_comment_reminder">Please add your comment before sending.</string>
+    <string name="feedback_author_anonymous">Anonymous</string>
+    <string name="feedback_author_name_hint">Name</string>
+    <string name="feedback_button_text_anonymous">Send anonymously</string>
+    <string name="feedback_comment_not_sent">Error sending comment.</string>
+    <string name="feedback_comment_sent">Comment sent.</string>
+    <string name="feedback_comments_not_retrieved">Could not retrieve comments.</string>
+    <string name="feedback_continue_info">Continue</string>
+    <string name="feedback_multiple_comments_label_format">%d COMMENTS</string>
+    <string name="feedback_no_data_ready">There is no feedback data ready to be sent.</string>
+    <string name="feedback_not_retrieved">Could not retrieve feedback.</string>
+    <string name="feedback_not_sent">Could not send feedback.</string>
+    <string name="feedback_refresh_title">Refresh</string>
+    <string name="feedback_screenshot_load_error">Error loading screenshot.</string>
+    <string name="feedback_send_title">Send</string>
+    <string name="feedback_sent">Feedback sent.</string>
+    <string name="feedback_single_comment_label_format">%d COMMENT</string>
+    <string name="feedback_your_comment_hint">Your comment</string>
     <string name="label_comments_cap">COMMENTS</string>
     <string name="no_feedback_items_text">There are currently no items in this category. Try sending us feedback via the \'Send feedback\' button.</string>
+    <string name="send_feedback_activity_feedback_hint">Your feedback</string>
     <string name="send_feedback_desc">"Submit your feedback about the app."</string>
     <string name="status_open">Open</string>
     <string name="status_resolved">Resolved</string>
@@ -41,9 +58,11 @@
     <string name="title_activity_view_feedback">Your feedback</string>
     <string name="title_activity_view_item_feedback">Edit feedback</string>
     <string name="view_feedback_desc">"See what's happening with the feedback you've already sent us."</string>
-    <!-- From: file:/C:/Program%20Files%20(x86)/Jenkins/jobs/BuildAll_master/workspace/Feedback/src/main/res/values/themes.xml -->
-    <eat-comment />
-
-    <style name="AppCompatTheme" parent="Theme.AppCompat.Light"></style>
-
-</resources>
+    <string name="view_feedback_tab_all">ALL</string>
+    <string name="view_feedback_tab_open">OPEN</string>
+    <string name="view_feedback_tab_resolved">RESOLVED</string>
+    <!-- From: file:/C:/_J/jobs/Android_2016q2_Upload/workspace/Feedback/src/main/res/values/themes.xml -->
+    <eat-comment/>
+    <style name="AppCompatTheme" parent="Theme.AppCompat.Light">
+    </style>
+</resources>