Merge pull request #2014 from AllenCoder/master

1.Receive advice
CymChad · Feb 9, 2018 · 9fbbedc · 9fbbedc
2 parents fba8750 + 09658e1
commit 9fbbedc
Show file tree

Hide file tree

Showing 9 changed files with 18 additions and 18 deletions.
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -8,7 +8,7 @@
         android:name=".MyApplication"
         android:allowBackup="true"
         android:icon="@mipmap/logo"
-        android:label="@string/app_name"
+        android:label="@string/brvah_app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
         <activity android:name=".PullToRefreshUseActivity" />

diff --git a/app/src/main/res/layout/loading_view.xml b/app/src/main/res/layout/loading_view.xml
@@ -22,7 +22,7 @@
             android:layout_marginLeft="8dp"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:text="@string/loading"
+            android:text="@string/brvah_loading"
             android:textColor="@color/txt_color"/>
     </LinearLayout>
 </LinearLayout>
diff --git a/app/src/main/res/layout/view_load_more.xml b/app/src/main/res/layout/view_load_more.xml
@@ -17,14 +17,14 @@
             android:layout_height="wrap_content"
             style="?android:attr/progressBarStyleSmall"
             android:layout_marginRight="@dimen/dp_4"
-            android:indeterminateDrawable="@drawable/sample_footer_loading_progress"/>
+            android:indeterminateDrawable="@drawable/brvah_sample_footer_loading_progress"/>
 
         <TextView
             android:id="@+id/loading_text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="@dimen/dp_4"
-            android:text="@string/loading"
+            android:text="@string/brvah_loading"
             android:textColor="#0dddb8"
             android:textSize="@dimen/sp_14"/>
     </LinearLayout>
@@ -42,7 +42,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center"
             android:textColor="#0dddb8"
-            android:text="@string/load_failed"/>
+            android:text="@string/brvah_load_failed"/>
 
     </FrameLayout>
 
@@ -56,7 +56,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:text="@string/load_end"
+            android:text="@string/brvah_load_end"
             android:textColor="@android:color/darker_gray"/>
     </FrameLayout>
 </FrameLayout>
diff --git a/library/src/main/java/com/chad/library/adapter/base/loadmore/SimpleLoadMoreView.java b/library/src/main/java/com/chad/library/adapter/base/loadmore/SimpleLoadMoreView.java
@@ -11,7 +11,7 @@ public final class SimpleLoadMoreView extends LoadMoreView {
 
     @Override
     public int getLayoutId() {
-        return R.layout.quick_view_load_more;
+        return R.layout.brvah_quick_view_load_more;
     }
 
     @Override

diff --git a/...in/res/drawable/sample_footer_loading.png → .../drawable/brvah_sample_footer_loading.png b/...in/res/drawable/sample_footer_loading.png → .../drawable/brvah_sample_footer_loading.png
diff --git a/...awable/sample_footer_loading_progress.xml → .../brvah_sample_footer_loading_progress.xml b/...awable/sample_footer_loading_progress.xml → .../brvah_sample_footer_loading_progress.xml
@@ -3,7 +3,7 @@
 
     <item>
         <rotate
-            android:drawable="@drawable/sample_footer_loading"
+            android:drawable="@drawable/brvah_sample_footer_loading"
             android:duration="500"
             android:fromDegrees="0.0"
             android:pivotX="50.0%"

diff --git a/.../main/res/layout/quick_view_load_more.xml → ...res/layout/brvah_quick_view_load_more.xml b/.../main/res/layout/quick_view_load_more.xml → ...res/layout/brvah_quick_view_load_more.xml
@@ -23,7 +23,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginLeft="@dimen/dp_4"
-            android:text="@string/loading"
+            android:text="@string/brvah_loading"
             android:textColor="@android:color/black"
             android:textSize="@dimen/sp_14"/>
     </LinearLayout>
@@ -40,7 +40,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:text="@string/load_failed"/>
+            android:text="@string/brvah_load_failed"/>
 
     </FrameLayout>
 
@@ -54,7 +54,7 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center"
-            android:text="@string/load_end"
+            android:text="@string/brvah_load_end"
             android:textColor="@android:color/darker_gray"/>
     </FrameLayout>
 </FrameLayout>
diff --git a/library/src/main/res/values-en/strings.xml b/library/src/main/res/values-en/strings.xml
@@ -1,5 +1,5 @@
 <resources>
-    <string name="loading">Loading...</string>
-    <string name="load_failed">load more failed</string>
-    <string name="load_end">No more data</string>
+    <string name="brvah_loading">Loading...</string>
+    <string name="brvah_load_failed">load more failed</string>
+    <string name="brvah_load_end">No more data</string>
 </resources>
diff --git a/library/src/main/res/values/strings.xml b/library/src/main/res/values/strings.xml
@@ -1,6 +1,6 @@
 <resources>
-    <string name="app_name">Library</string>
-    <string name="loading">正在加载中...</string>
-    <string name="load_failed">加载失败，请点我重试</string>
-    <string name="load_end">没有更多数据</string>
+    <string name="brvah_app_name">Library</string>
+    <string name="brvah_loading">正在加载中...</string>
+    <string name="brvah_load_failed">加载失败，请点我重试</string>
+    <string name="brvah_load_end">没有更多数据</string>
 </resources>