Skip to content

Commit f4b65ea

Browse files
goweiigoweii
committed
修复一些BUG，修复app模块属性名报错
1 parent 17f8047 commit f4b65ea

File tree

10 files changed

+55
-25
lines changed

10 files changed

+55
-25
lines changed

‎.idea/codeStyles/Project.xml‎

Lines changed: 24 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/misc.xml‎

Lines changed: 9 additions & 3 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎actionbarex/src/main/java/per/goweii/actionbarex/ActionBarCommon.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -136,7 +136,7 @@ protected void initAttrs(AttributeSet attrs) {
136136

137137
@Override
138138
protected View inflateTitleBar() {
139-
titleBarChild = (RelativeLayout) inflate(getContext(), R.layout.title_bar_simple, null);
139+
titleBarChild = (RelativeLayout) inflate(getContext(), R.layout.action_bar_title_bar_common, null);
140140

141141
leftIconView = titleBarChild.findViewById(R.id.iv_left);
142142
leftTextView = titleBarChild.findViewById(R.id.tv_left);
@@ -187,7 +187,7 @@ public void onClick(View v) {
187187

188188
if (rightIconRes > 0) {
189189
rightIconView.setVisibility(VISIBLE);
190-
leftIconView.setPadding(rightIconPadding, rightIconPadding, rightIconPadding, rightIconPadding);
190+
rightIconView.setPadding(rightIconPadding, rightIconPadding, rightIconPadding, rightIconPadding);
191191
rightIconView.setImageResource(rightIconRes);
192192
rightIconView.setColorFilter(rightIconColor);
193193
} else {

‎actionbarex/src/main/java/per/goweii/actionbarex/ActionBarSearch.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@ protected void initAttrs(AttributeSet attrs) {
143143

144144
@Override
145145
protected View inflateTitleBar() {
146-
titleBarChild = (RelativeLayout) inflate(getContext(), R.layout.title_bar_search, null);
146+
titleBarChild = (RelativeLayout) inflate(getContext(), R.layout.action_bar_title_bar_search, null);
147147

148148
leftIconView = titleBarChild.findViewById(R.id.iv_left);
149149
leftTextView = titleBarChild.findViewById(R.id.tv_left);

actionbarex/src/main/res/layout/title_bar_simple.xml renamed to actionbarex/src/main/res/layout/action_bar_title_bar_common.xml

File renamed without changes.

actionbarex/src/main/res/layout/title_bar_search.xml renamed to actionbarex/src/main/res/layout/action_bar_title_bar_search.xml

File renamed without changes.

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

Lines changed: 16 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@
2626
app:ab_statusBarColor="@color/transparent"
2727
app:ab_statusBarMode="dark"
2828
app:ab_titleBarHeight="48dp"
29-
app:abc_leftImageColor="@color/black"
30-
app:abc_leftImageRes="@mipmap/back"
31-
app:abc_rightImageColor="@color/black"
32-
app:abc_rightImageRes="@mipmap/search"
29+
app:abc_leftIconColor="@color/black"
30+
app:abc_leftIconRes="@mipmap/back"
31+
app:abc_rightIconColor="@color/black"
32+
app:abc_rightIconRes="@mipmap/search"
3333
app:abc_titleText="这个标题有点长我试试长标题什么样子" />
3434

3535
<per.goweii.actionbarex.ActionBarCommon
@@ -68,10 +68,10 @@
6868
app:abc_leftText="返回"
6969
app:abc_leftTextPaddingLeft="0dp"
7070
app:abc_leftTextPaddingRight="0dp"
71-
app:abc_leftImageColor="@color/black"
72-
app:abc_leftImageRes="@mipmap/back"
73-
app:abc_rightImageColor="@color/black"
74-
app:abc_rightImageRes="@mipmap/search"
71+
app:abc_leftIconColor="@color/black"
72+
app:abc_leftIconRes="@mipmap/back"
73+
app:abc_rightIconColor="@color/black"
74+
app:abc_rightIconRes="@mipmap/search"
7575
app:abc_rightText="确定"
7676
app:abc_rightTextPaddingLeft="0dp"
7777
app:abc_rightTextPaddingRight="0dp"
@@ -91,10 +91,10 @@
9191
app:ab_statusBarColor="@color/transparent"
9292
app:ab_statusBarMode="dark"
9393
app:ab_titleBarHeight="48dp"
94-
app:abs_leftImageColor="@color/black"
95-
app:abs_leftImageRes="@mipmap/back"
96-
app:abs_rightImageColor="@color/black"
97-
app:abs_rightImageRes="@mipmap/search"
94+
app:abs_leftIconColor="@color/black"
95+
app:abs_leftIconRes="@mipmap/back"
96+
app:abs_rightIconColor="@color/black"
97+
app:abs_rightIconRes="@mipmap/search"
9898
app:abs_titleHintColor="#aaaaaa"
9999
app:abs_titleHintText="这是一个搜索框..."
100100
app:abs_titleTextColor="#232323"
@@ -113,10 +113,10 @@
113113
app:ab_statusBarColor="@color/transparent"
114114
app:ab_statusBarMode="dark"
115115
app:ab_titleBarHeight="48dp"
116-
app:abs_leftImageColor="@color/black"
117-
app:abs_leftImageRes="@mipmap/back"
118-
app:abs_rightImageColor="@color/black"
119-
app:abs_rightImageRes="@mipmap/search"
116+
app:abs_leftIconColor="@color/black"
117+
app:abs_leftIconRes="@mipmap/back"
118+
app:abs_rightIconColor="@color/black"
119+
app:abs_rightIconRes="@mipmap/search"
120120
app:abs_titleHintColor="#aaaaaa"
121121
app:abs_titleHintText="这是一个搜索框..."
122122
app:abs_titleTextColor="#232323"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@
1414
android:layout_height="wrap_content"
1515
android:background="@drawable/title_bar_custom_bg"
1616
app:ab_autoImmersion="true"
17-
app:abc_leftImageRes="@mipmap/back"
17+
app:abc_leftIconRes="@mipmap/back"
1818
app:abc_rightText="切换"
1919
app:abc_rightTextColor="@color/white"
2020
app:abc_titleText="第一个Fragment"

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616
app:ab_statusBarMode="light"
1717
app:ab_autoImmersion="true"
1818
app:ab_titleBarHeight="48dp"
19-
app:abc_leftImageRes="@mipmap/back"
19+
app:abc_leftIconRes="@mipmap/back"
2020
app:abc_titleText="第二个Fragment"
2121
app:abc_rightText="切换"
2222
app:abc_rightTextColor="@color/white"

‎build.gradle‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,9 +17,9 @@ buildscript {
1717

1818
allprojects {
1919
repositories {
20+
maven { url 'https://www.jitpack.io' }
2021
google()
2122
jcenter()
22-
maven { url 'https://www.jitpack.io' }
2323
}
2424
}
2525

0 commit comments

Comments
 (0)