Skip to content

Commit 9fbbedc

Browse files
AllenCoderAllenCoder
authored
Merge pull request CymChad#2014 from AllenCoder/master
1.Receive advice
2 parents fba8750 + 09658e1 commit 9fbbedc

File tree

9 files changed

+18
-18
lines changed

9 files changed

+18
-18
lines changed

‎app/src/main/AndroidManifest.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
android:name=".MyApplication"
99
android:allowBackup="true"
1010
android:icon="@mipmap/logo"
11-
android:label="@string/app_name"
11+
android:label="@string/brvah_app_name"
1212
android:supportsRtl="true"
1313
android:theme="@style/AppTheme">
1414
<activity android:name=".PullToRefreshUseActivity" />

‎app/src/main/res/layout/loading_view.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
android:layout_marginLeft="8dp"
2323
android:layout_width="wrap_content"
2424
android:layout_height="wrap_content"
25-
android:text="@string/loading"
25+
android:text="@string/brvah_loading"
2626
android:textColor="@color/txt_color"/>
2727
</LinearLayout>
2828
</LinearLayout>

‎app/src/main/res/layout/view_load_more.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -17,14 +17,14 @@
1717
android:layout_height="wrap_content"
1818
style="?android:attr/progressBarStyleSmall"
1919
android:layout_marginRight="@dimen/dp_4"
20-
android:indeterminateDrawable="@drawable/sample_footer_loading_progress"/>
20+
android:indeterminateDrawable="@drawable/brvah_sample_footer_loading_progress"/>
2121

2222
<TextView
2323
android:id="@+id/loading_text"
2424
android:layout_width="wrap_content"
2525
android:layout_height="wrap_content"
2626
android:layout_marginLeft="@dimen/dp_4"
27-
android:text="@string/loading"
27+
android:text="@string/brvah_loading"
2828
android:textColor="#0dddb8"
2929
android:textSize="@dimen/sp_14"/>
3030
</LinearLayout>
@@ -42,7 +42,7 @@
4242
android:layout_height="wrap_content"
4343
android:layout_gravity="center"
4444
android:textColor="#0dddb8"
45-
android:text="@string/load_failed"/>
45+
android:text="@string/brvah_load_failed"/>
4646

4747
</FrameLayout>
4848

@@ -56,7 +56,7 @@
5656
android:layout_width="wrap_content"
5757
android:layout_height="wrap_content"
5858
android:layout_gravity="center"
59-
android:text="@string/load_end"
59+
android:text="@string/brvah_load_end"
6060
android:textColor="@android:color/darker_gray"/>
6161
</FrameLayout>
6262
</FrameLayout>

‎library/src/main/java/com/chad/library/adapter/base/loadmore/SimpleLoadMoreView.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ public final class SimpleLoadMoreView extends LoadMoreView {
1111

1212
@Override
1313
public int getLayoutId() {
14-
return R.layout.quick_view_load_more;
14+
return R.layout.brvah_quick_view_load_more;
1515
}
1616

1717
@Override

‎library/src/main/res/drawable/sample_footer_loading.png renamed to ‎library/src/main/res/drawable/brvah_sample_footer_loading.png

File renamed without changes.

‎library/src/main/res/drawable/sample_footer_loading_progress.xml renamed to ‎library/src/main/res/drawable/brvah_sample_footer_loading_progress.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33

44
<item>
55
<rotate
6-
android:drawable="@drawable/sample_footer_loading"
6+
android:drawable="@drawable/brvah_sample_footer_loading"
77
android:duration="500"
88
android:fromDegrees="0.0"
99
android:pivotX="50.0%"

‎library/src/main/res/layout/quick_view_load_more.xml renamed to ‎library/src/main/res/layout/brvah_quick_view_load_more.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
android:layout_width="wrap_content"
2424
android:layout_height="wrap_content"
2525
android:layout_marginLeft="@dimen/dp_4"
26-
android:text="@string/loading"
26+
android:text="@string/brvah_loading"
2727
android:textColor="@android:color/black"
2828
android:textSize="@dimen/sp_14"/>
2929
</LinearLayout>
@@ -40,7 +40,7 @@
4040
android:layout_width="wrap_content"
4141
android:layout_height="wrap_content"
4242
android:layout_gravity="center"
43-
android:text="@string/load_failed"/>
43+
android:text="@string/brvah_load_failed"/>
4444

4545
</FrameLayout>
4646

@@ -54,7 +54,7 @@
5454
android:layout_width="wrap_content"
5555
android:layout_height="wrap_content"
5656
android:layout_gravity="center"
57-
android:text="@string/load_end"
57+
android:text="@string/brvah_load_end"
5858
android:textColor="@android:color/darker_gray"/>
5959
</FrameLayout>
6060
</FrameLayout>

‎library/src/main/res/values-en/strings.xml

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<resources>
2-
<string name="loading">Loading...</string>
3-
<string name="load_failed">load more failed</string>
4-
<string name="load_end">No more data</string>
2+
<string name="brvah_loading">Loading...</string>
3+
<string name="brvah_load_failed">load more failed</string>
4+
<string name="brvah_load_end">No more data</string>
55
</resources>

‎library/src/main/res/values/strings.xml

+4-4
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
<resources>
2-
<string name="app_name">Library</string>
3-
<string name="loading">正在加载中...</string>
4-
<string name="load_failed">加载失败，请点我重试</string>
5-
<string name="load_end">没有更多数据</string>
2+
<string name="brvah_app_name">Library</string>
3+
<string name="brvah_loading">正在加载中...</string>
4+
<string name="brvah_load_failed">加载失败，请点我重试</string>
5+
<string name="brvah_load_end">没有更多数据</string>
66
</resources>

0 commit comments

Comments
 (0)