From 09658e1a4b6d07d32f1410aea4a32df689fa2f79 Mon Sep 17 00:00:00 2001 From: Allen Date: Fri, 9 Feb 2018 12:38:41 +0800 Subject: [PATCH] 1.Receive advice https://github.com/CymChad/BaseRecyclerViewAdapterHelper/issues/2012 --- app/src/main/AndroidManifest.xml | 2 +- app/src/main/res/layout/loading_view.xml | 2 +- app/src/main/res/layout/view_load_more.xml | 8 ++++---- .../adapter/base/loadmore/SimpleLoadMoreView.java | 2 +- ..._loading.png => brvah_sample_footer_loading.png} | Bin ...xml => brvah_sample_footer_loading_progress.xml} | 2 +- ...load_more.xml => brvah_quick_view_load_more.xml} | 6 +++--- library/src/main/res/values-en/strings.xml | 6 +++--- library/src/main/res/values/strings.xml | 8 ++++---- 9 files changed, 18 insertions(+), 18 deletions(-) rename library/src/main/res/drawable/{sample_footer_loading.png => brvah_sample_footer_loading.png} (100%) mode change 100755 => 100644 rename library/src/main/res/drawable/{sample_footer_loading_progress.xml => brvah_sample_footer_loading_progress.xml} (83%) mode change 100755 => 100644 rename library/src/main/res/layout/{quick_view_load_more.xml => brvah_quick_view_load_more.xml} (92%) mode change 100755 => 100644 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index a1b6bf0c1..b429d8241 100644 --- 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"> diff --git a/app/src/main/res/layout/loading_view.xml b/app/src/main/res/layout/loading_view.xml index 634a40f43..04ba87727 100644 --- 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"/> \ No newline at end of file diff --git a/app/src/main/res/layout/view_load_more.xml b/app/src/main/res/layout/view_load_more.xml index d19d86947..de58442e9 100644 --- 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"/> @@ -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"/> @@ -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"/> \ No newline at end of file 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 index f51594a21..730f65cfd 100644 --- 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/library/src/main/res/drawable/sample_footer_loading.png b/library/src/main/res/drawable/brvah_sample_footer_loading.png old mode 100755 new mode 100644 similarity index 100% rename from library/src/main/res/drawable/sample_footer_loading.png rename to library/src/main/res/drawable/brvah_sample_footer_loading.png diff --git a/library/src/main/res/drawable/sample_footer_loading_progress.xml b/library/src/main/res/drawable/brvah_sample_footer_loading_progress.xml old mode 100755 new mode 100644 similarity index 83% rename from library/src/main/res/drawable/sample_footer_loading_progress.xml rename to library/src/main/res/drawable/brvah_sample_footer_loading_progress.xml index 1b4c51044..7143fc5c3 --- a/library/src/main/res/drawable/sample_footer_loading_progress.xml +++ b/library/src/main/res/drawable/brvah_sample_footer_loading_progress.xml @@ -3,7 +3,7 @@ @@ -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"/> @@ -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"/> \ No newline at end of file diff --git a/library/src/main/res/values-en/strings.xml b/library/src/main/res/values-en/strings.xml index e80a6c3d8..e0b74061f 100644 --- a/library/src/main/res/values-en/strings.xml +++ b/library/src/main/res/values-en/strings.xml @@ -1,5 +1,5 @@ - Loading... - load more failed - No more data + Loading... + load more failed + No more data diff --git a/library/src/main/res/values/strings.xml b/library/src/main/res/values/strings.xml index e75309ced..1203d59da 100644 --- a/library/src/main/res/values/strings.xml +++ b/library/src/main/res/values/strings.xml @@ -1,6 +1,6 @@ - Library - 正在加载中... - 加载失败，请点我重试 - 没有更多数据 + Library + 正在加载中... + 加载失败，请点我重试 + 没有更多数据