Skip to content

Commit 1cb324d

Browse files
AriesHooAriesHoo
committed
1、增加快速创建主页tab的Fragment
2、修改FastWebActivity设置弹框颜色配置 3、优化Demo展示效果
1 parent 2d3b6cd commit 1cb324d

28 files changed

+229
-109
lines changed

‎apk/sample.apk

5.26 KB
Binary file not shown.

‎app/build.gradle

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@ android {
1414
applicationId "com.aries.library.fast.demo"
1515
minSdkVersion ext.minSdkVersion
1616
targetSdkVersion ext.targetSdkVersion
17-
versionCode 210
18-
versionName "2.1.0"
17+
versionCode 211
18+
versionName "2.1.1"
1919
multiDexEnabled true
2020
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
2121
buildConfigField "String", "BASE_URL", "\"https://api.douban.com/\""
@@ -47,7 +47,8 @@ android {
4747
if (outputFile != null && outputFile.name.endsWith('.apk')) {
4848
if (variant.buildType.name.equals('release')) {
4949
def fileName = "FastLib_v${defaultConfig.versionName}_${releaseTime()}.apk"
50-
output.outputFile = new File(outputFile.parent, fileName)
50+
//output.outputFile = new File(outputFile.parent, fileName)
51+
output.outputFile = new File(outputFile.parent, "sample.apk")
5152
}
5253
}
5354
}
@@ -64,9 +65,9 @@ android {
6465
dependencies {
6566
def supportVersion = "25.3.1"
6667
compile fileTree(include: ['*.jar'], dir: 'libs')
67-
//compile project(':library')
68+
compile project(':library')
6869
//compile 'com.github.AriesHoo:FastLib:+'
69-
compile 'com.github.AriesHoo:FastLib:2.1.0'
70+
//compile 'com.github.AriesHoo:FastLib:2.1.0'
7071
apt 'com.jakewharton:butterknife-compiler:8.8.1'
7172
compile 'cn.bingoogolapple:bga-banner:2.1.7@aar'
7273
compile 'com.scwang.smartrefresh:SmartRefreshHeader:1.0.3'
@@ -83,10 +84,11 @@ dependencies {
8384
//webView库 继承FastWebActivity需要,不需要内置WebView可以不compile
8485
compile 'com.just.agentweb:agentweb:2.0.1'
8586
//常用UI控件(TitleBarView、RadiusView、UIAlertView、UIActionSheetView、UIProgressView等),快速标题栏fast_layout_title_bar,继承FastTitleXXX类需要
86-
compile 'com.github.AriesHoo:UIWidget:2.0.0'
87+
compile 'com.github.AriesHoo:UIWidget:2.0.1'
8788
//下拉刷新库注意刷新头SmartRefreshHeader版本要对应
8889
compile 'com.scwang.smartrefresh:SmartRefreshLayout:1.0.3'
8990
//图片加载
9091
compile 'com.github.bumptech.glide:glide:4.0.0'
9192
annotationProcessor 'com.github.bumptech.glide:compiler:4.0.0'
93+
9294
}

‎app/src/main/AndroidManifest.xml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,10 +10,9 @@
1010
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>
1111
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
1212
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
13-
<!--AgentWeb 是默认启动定位-->
13+
<!-- AgentWeb 是默认启动定位 -->
1414
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION"/>
1515
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION"/>
16-
1716
<uses-permission android:name="android.permission.READ_PHONE_STATE"/>
1817
<uses-permission android:name="android.permission.ACCESS_WIFI_STATE"/>
1918
<uses-permission android:name="android.permission.CHANGE_WIFI_STATE"/>
@@ -26,7 +25,8 @@
2625
android:persistent="true"
2726
android:supportsRtl="true"
2827
android:theme="@style/AppTheme">
29-
<!--android:screenOrientation="portrait"-->
28+
29+
<!-- android:screenOrientation="portrait" -->
3030
<activity
3131
android:name=".module.SplashActivity"
3232
android:configChanges="locale|layoutDirection|mcc|mnc"
@@ -43,32 +43,32 @@
4343
android:configChanges="locale|layoutDirection|mcc|mnc"
4444
android:screenOrientation="portrait"
4545
android:theme="@style/AppTheme.NotTranslucent"/>
46-
<!--应用内浏览器-->
46+
<!-- 应用内浏览器 -->
4747
<activity
4848
android:name=".module.WebViewActivity"
4949
android:configChanges="locale|layoutDirection|mcc|mnc|orientation|screenSize"
5050
android:hardwareAccelerated="true"/>
51-
<!--滑动返回Activity-微信效果-->
51+
<!-- 滑动返回Activity-微信效果 -->
5252
<activity
5353
android:name=".module.main.sample.SwipeBackActivity"
5454
android:configChanges="locale|layoutDirection|mcc|mnc"/>
55-
<!--QQ默认主题TitleBar样式-->
55+
<!-- QQ默认主题TitleBar样式 -->
5656
<activity
5757
android:name=".module.main.sample.QQTitleActivity"
5858
android:configChanges="locale|layoutDirection|mcc|mnc"/>
59-
<!--支付宝主界面效果-->
59+
<!-- 支付宝主界面效果 -->
6060
<activity
6161
android:name=".module.main.sample.ali.ALiPayMainActivity"
6262
android:configChanges="locale|layoutDirection|mcc|mnc"/>
63-
<!--腾讯新闻主界面效果-->
63+
<!-- 腾讯新闻主界面效果 -->
6464
<activity
6565
android:name=".module.main.sample.news.NewsMainActivity"
6666
android:configChanges="locale|layoutDirection|mcc|mnc"/>
67-
<!--设置页-->
67+
<!-- 设置页 -->
6868
<activity
6969
android:name=".module.mine.SettingActivity"
7070
android:configChanges="locale|layoutDirection|mcc|mnc"/>
71-
<!--第三方库-->
71+
<!-- 第三方库 -->
7272
<activity
7373
android:name=".module.mine.ThirdLibraryActivity"
7474
android:configChanges="locale|layoutDirection|mcc|mnc"/>

‎app/src/main/java/com/aries/library/fast/demo/adapter/SubjectMovieAdapter.java

Lines changed: 1 addition & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,10 @@
11
package com.aries.library.fast.demo.adapter;
22

3-
import android.os.Build;
4-
import android.support.v4.view.ViewCompat;
53
import android.view.View;
64

75
import com.aries.library.fast.demo.R;
86
import com.aries.library.fast.demo.entity.SubjectsEntity;
97
import com.aries.library.fast.manager.GlideManager;
10-
import com.aries.library.fast.util.SizeUtil;
11-
import com.aries.ui.view.radius.RadiusRelativeLayout;
12-
import com.aries.ui.view.radius.RadiusViewDelegate;
138
import com.chad.library.adapter.base.BaseQuickAdapter;
149
import com.chad.library.adapter.base.BaseViewHolder;
1510
import com.flyco.labelview.LabelView;
@@ -35,16 +30,9 @@ protected void convert(BaseViewHolder helper, SubjectsEntity item) {
3530
.setText(R.id.tv_yearMovie, "年份:" + item.year)
3631
.setText(R.id.tv_directorMovie, "导演:" + item.getDirectors())
3732
.setText(R.id.tv_castMovie, "主演:" + item.getCasts());
38-
GlideManager.loadRoundImg(item.images.large, helper.getView(R.id.iv_coverMovie));
33+
GlideManager.loadImg(item.images.large, helper.getView(R.id.iv_coverMovie));
3934
LabelView labelView = helper.getView(R.id.lv_topMovie);
4035
labelView.setText("Top" + (helper.getLayoutPosition() + 1));
4136
labelView.setVisibility(isShowTop ? View.VISIBLE : View.GONE);
42-
ViewCompat.setElevation(helper.itemView, helper.itemView.getResources().
43-
getDimensionPixelSize(R.dimen.dp_elevation));
44-
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
45-
RadiusViewDelegate delegate = ((RadiusRelativeLayout) helper.itemView).getDelegate();
46-
delegate.setStrokeWidth(SizeUtil.dp2px(1));
47-
delegate.setStrokeColor(mContext.getResources().getColor(R.color.colorLineGray));
48-
}
4937
}
5038
}

‎app/src/main/java/com/aries/library/fast/demo/adapter/WidgetAdapter.java

Lines changed: 0 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,9 @@
11
package com.aries.library.fast.demo.adapter;
22

3-
import android.os.Build;
4-
import android.support.v4.view.ViewCompat;
53
import android.view.ViewGroup;
64

75
import com.aries.library.fast.demo.R;
86
import com.aries.library.fast.demo.entity.WidgetEntity;
9-
import com.aries.library.fast.util.SizeUtil;
10-
import com.aries.ui.view.radius.RadiusRelativeLayout;
11-
import com.aries.ui.view.radius.RadiusViewDelegate;
127
import com.chad.library.adapter.base.BaseQuickAdapter;
138
import com.chad.library.adapter.base.BaseViewHolder;
149

@@ -33,12 +28,5 @@ protected void convert(BaseViewHolder helper, WidgetEntity item) {
3328
ViewGroup.MarginLayoutParams margin = (ViewGroup.MarginLayoutParams) helper.itemView.getLayoutParams();
3429
margin.setMargins(marginSize, marginSize, marginSize,
3530
helper.getLayoutPosition() == getItemCount() - 1 ? marginSize : 0);
36-
if (Build.VERSION.SDK_INT < Build.VERSION_CODES.N) {
37-
RadiusViewDelegate delegate = ((RadiusRelativeLayout) helper.itemView).getDelegate();
38-
delegate.setStrokeWidth(SizeUtil.dp2px(1));
39-
delegate.setStrokeColor(mContext.getResources().getColor(R.color.colorLineGray));
40-
}
41-
ViewCompat.setElevation(helper.itemView, helper.itemView.getResources().
42-
getDimensionPixelSize(R.dimen.dp_elevation));
4331
}
4432
}

‎app/src/main/java/com/aries/library/fast/demo/module/activity/ActivityFragment.java

Lines changed: 8 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ public void beforeSetContentView() {
6060

6161
@Override
6262
public void setTitleBar(TitleBarView titleBar) {
63-
TitleBarHelper.getInstance().setTitleBarView(titleBar,mContext,false);
63+
TitleBarHelper.getInstance().setTitleBarView(titleBar, mContext, false);
6464
isSliding = (boolean) SPUtil.get(mContext, SPConstant.SP_KEY_ACTIVITY_TAB_SLIDING, true);
6565
if (isSliding && viewSliding == null) {
6666
viewSliding = View.inflate(mContext, R.layout.layout_activity_sliding, null);
@@ -99,16 +99,17 @@ public int getContentLayout() {
9999
*/
100100
@Override
101101
public void initView(Bundle savedInstanceState) {
102-
setTab();
102+
// setTab();
103103
}
104104

105105
private void setTab() {
106106
isSliding = (boolean) SPUtil.get(mContext, SPConstant.SP_KEY_ACTIVITY_TAB_SLIDING, isSliding);
107107
vpContent.removeAllViews();
108-
listFragment.clear();
109-
listFragment.add(MovieBaseFragment.newInstance(MovieConstant.MOVIE_IN_THEATERS));
110-
listFragment.add(MovieBaseFragment.newInstance(MovieConstant.MOVIE_COMING_SOON));
111-
listFragment.add(MovieBaseFragment.newInstance(MovieConstant.MOVIE_TOP));
108+
if (listFragment.size() == 0) {
109+
listFragment.add(MovieBaseFragment.newInstance(MovieConstant.MOVIE_IN_THEATERS));
110+
listFragment.add(MovieBaseFragment.newInstance(MovieConstant.MOVIE_COMING_SOON));
111+
listFragment.add(MovieBaseFragment.newInstance(MovieConstant.MOVIE_TOP));
112+
}
112113
if (isSliding) {
113114
TabLayoutManager.getInstance().setSlidingTabData(this, mSlidingTab, vpContent,
114115
getTitles(R.array.arrays_tab_activity), listFragment);
@@ -124,12 +125,6 @@ public void loadData() {
124125
setTab();
125126
}
126127

127-
@Override
128-
protected void onVisibleChanged(boolean isVisibleToUser) {
129-
super.onVisibleChanged(isVisibleToUser);
130-
LoggerManager.d(TAG, "isVisibleToUser:" + isVisibleToUser);
131-
}
132-
133128
private List<String> getTitles(int array) {
134129
return Arrays.asList(getResources().getStringArray(array));
135130
}
@@ -138,6 +133,6 @@ private List<String> getTitles(int array) {
138133
public void refreshActivityTab(boolean isSliding) {
139134
mIsFirstShow = true;
140135
setTitleBar(mTitleBar);
141-
136+
setTab();
142137
}
143138
}

‎app/src/main/java/com/aries/library/fast/demo/module/activity/MovieBaseFragment.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ private void setBackToTop(boolean enable) {
107107
imageViewTop.setOnClickListener(new View.OnClickListener() {
108108
@Override
109109
public void onClick(View v) {
110-
mRecyclerView.scrollToPosition(0);
110+
mRecyclerView.smoothScrollToPosition(0);
111111
}
112112
});
113113
}

‎app/src/main/java/com/aries/library/fast/demo/module/main/MainActivity.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import java.util.ArrayList;
1313
import java.util.List;
1414

15-
import static com.aries.library.fast.demo.R.string.activity;
1615

1716
/**
1817
* Created: AriesHoo on 2017/9/7 10:59
@@ -30,7 +29,7 @@ public boolean isSwipeEnable() {
3029
public List<FastTabEntity> getTabList() {
3130
ArrayList<FastTabEntity> tabEntities = new ArrayList<>();
3231
tabEntities.add(new FastTabEntity(getString(R.string.home), R.drawable.ic_home_normal, R.drawable.ic_home_selected, HomeFragment.newInstance()));
33-
tabEntities.add(new FastTabEntity(getString(activity), R.drawable.ic_activity_normal, R.drawable.ic_activity_selected, ActivityFragment.newInstance()));
32+
tabEntities.add(new FastTabEntity(getString(R.string.activity), R.drawable.ic_activity_normal, R.drawable.ic_activity_selected, ActivityFragment.newInstance()));
3433
tabEntities.add(new FastTabEntity(getString(R.string.mine), R.drawable.ic_mine_normal, R.drawable.ic_mine_selected, MineFragment.newInstance()));
3534
return tabEntities;
3635
}

‎app/src/main/res/drawable-v21/ic_menu_camera.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="24dp"
3+
android:height="24dp"
4+
android:viewportHeight="24.0"
5+
android:viewportWidth="24.0">
6+
<path
7+
android:fillColor="#FF000000"
8+
android:pathData="M12,12m-3.2,0a3.2,3.2 0,1 1,6.4 0a3.2,3.2 0,1 1,-6.4 0"/>
9+
<path
10+
android:fillColor="#FF000000"
11+
android:pathData="M9,2L7.17,4H4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2V6c0,-1.1 -0.9,-2 -2,-2h-3.17L15,2H9zm3,15c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5z"/>
12+
</vector>

‎app/src/main/res/drawable-v21/ic_menu_gallery.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="24dp"
3+
android:height="24dp"
4+
android:viewportHeight="24.0"
5+
android:viewportWidth="24.0">
6+
<path
7+
android:fillColor="#FF000000"
8+
android:pathData="M22,16V4c0,-1.1 -0.9,-2 -2,-2H8c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2zm-11,-4l2.03,2.71L16,11l4,5H8l3,-4zM2,6v14c0,1.1 0.9,2 2,2h14v-2H4V6H2z"/>
9+
</vector>

‎app/src/main/res/drawable-v21/ic_menu_manage.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="24dp"
3+
android:height="24dp"
4+
android:viewportHeight="24.0"
5+
android:viewportWidth="24.0">
6+
<path
7+
android:fillColor="#FF000000"
8+
android:pathData="M22.7,19l-9.1,-9.1c0.9,-2.3 0.4,-5 -1.5,-6.9 -2,-2 -5,-2.4 -7.4,-1.3L9,6 6,9 1.6,4.7C0.4,7.1 0.9,10.1 2.9,12.1c1.9,1.9 4.6,2.4 6.9,1.5l9.1,9.1c0.4,0.4 1,0.4 1.4,0l2.3,-2.3c0.5,-0.4 0.5,-1.1 0.1,-1.4z"/>
9+
</vector>

‎app/src/main/res/drawable-v21/ic_menu_send.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="24dp"
3+
android:height="24dp"
4+
android:viewportHeight="24.0"
5+
android:viewportWidth="24.0">
6+
<path
7+
android:fillColor="#FF000000"
8+
android:pathData="M2.01,21L23,12 2.01,3 2,10l15,2 -15,2z"/>
9+
</vector>

‎app/src/main/res/drawable-v21/ic_menu_share.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="24dp"
3+
android:height="24dp"
4+
android:viewportHeight="24.0"
5+
android:viewportWidth="24.0">
6+
<path
7+
android:fillColor="#FF000000"
8+
android:pathData="M18,16.08c-0.76,0 -1.44,0.3 -1.96,0.77L8.91,12.7c0.05,-0.23 0.09,-0.46 0.09,-0.7s-0.04,-0.47 -0.09,-0.7l7.05,-4.11c0.54,0.5 1.25,0.81 2.04,0.81 1.66,0 3,-1.34 3,-3s-1.34,-3 -3,-3 -3,1.34 -3,3c0,0.24 0.04,0.47 0.09,0.7L8.04,9.81C7.5,9.31 6.79,9 6,9c-1.66,0 -3,1.34 -3,3s1.34,3 3,3c0.79,0 1.5,-0.31 2.04,-0.81l7.12,4.16c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.61 1.31,2.92 2.92,2.92 1.61,0 2.92,-1.31 2.92,-2.92s-1.31,-2.92 -2.92,-2.92z"/>
9+
</vector>

‎app/src/main/res/drawable-v21/ic_menu_slideshow.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="24dp"
3+
android:height="24dp"
4+
android:viewportHeight="24.0"
5+
android:viewportWidth="24.0">
6+
<path
7+
android:fillColor="#FF000000"
8+
android:pathData="M4,6H2v14c0,1.1 0.9,2 2,2h14v-2H4V6zm16,-4H8c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2V4c0,-1.1 -0.9,-2 -2,-2zm-8,12.5v-9l6,4.5 -6,4.5z"/>
9+
</vector>

‎app/src/main/res/drawable/ic_transition.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<vector android:height="24dp" android:viewportHeight="1024.0"
22
android:viewportWidth="1024.0" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
3-
<path android:fillColor="@color/colorTitleText" android:pathData="M541.6,625.8L86.5,625.8A85.4,85.4 0,0 0,1.1 711.1v227.6A85.4,85.4 0,0 0,86.5 1024h455.1a85.4,85.4 0,0 0,85.3 -85.3L626.9,711.1a85.4,85.4 0,0 0,-85.3 -85.3zM570,938.7a28.5,28.5 0,0 1,-28.4 28.4L86.5,967.1a28.5,28.5 0,0 1,-28.4 -28.4L58,711.1a28.5,28.5 0,0 1,28.4 -28.4h455.1a28.5,28.5 0,0 1,28.4 28.4zM927.7,446.6a28.5,28.5 0,0 0,-39.8 5.7l-62.9,83.8a28.4,28.4 0,0 0,45.5 34.2l24.6,-32.8a285.9,285.9 0,0 1,-200.3 302.9,28.4 28.4,0 0,0 16.7,54.4c157.5,-48.5 255,-200.8 240.5,-358.8L977.3,555a28.4,28.4 0,0 0,34.2 -45.5zM937.5,0L482.4,0a85.4,85.4 0,0 0,-85.3 85.3v227.6a85.4,85.4 0,0 0,85.3 85.3h455.1a85.4,85.4 0,0 0,85.3 -85.3L1022.9,85.3A85.4,85.4 0,0 0,937.5 0zM966,312.9a28.5,28.5 0,0 1,-28.4 28.4L482.4,341.3a28.5,28.5 0,0 1,-28.4 -28.4L454,85.3a28.5,28.5 0,0 1,28.4 -28.4h455.1a28.5,28.5 0,0 1,28.4 28.4zM96.3,577.4a28.5,28.5 0,0 0,17.1 5.7,27.6 27.6,0 0,0 4,-0.3 28.6,28.6 0,0 0,18.7 -11.1l62.9,-83.8a28.4,28.4 0,1 0,-45.5 -34.2l-24.6,32.8a286,286 0,0 1,200.3 -302.9,28.4 28.4,0 0,0 -16.7,-54.4c-157.5,48.5 -255,200.8 -240.5,358.8L46.7,469a28.4,28.4 0,0 0,-34.2 45.5z"/>
3+
<path android:fillColor="@color/colorTitleText" android:pathData="M516.2,28.8C252.8,28.8 39,242.5 39,505.9s213.7,477.1 477.1,477.1S993.3,769.3 993.3,505.9 779.6,28.8 516.2,28.8zM789,613.2L328.2,613.2l123.5,148.6a26.5,26.5 0,0 1,-3.4 37.5c-4.9,4.2 -11,6.1 -17.1,6.1 -7.6,0 -15.2,-3.4 -20.5,-9.9l-196.3,-236.5h574.9c14.8,0 26.9,12.1 26.9,26.9 -0.4,15.5 -12.5,27.3 -27.3,27.3zM243.3,452.1c-14.8,0 -26.9,-12.1 -26.9,-26.9 0,-14.8 12.1,-26.9 26.9,-26.9h460.8l-123.5,-148.9a26.5,26.5 0,0 1,3.4 -37.5,26.5 26.5,0 0,1 37.5,3.4l196.3,236.5 -574.5,0.4z"/>
44
</vector>

‎app/src/main/res/drawable/side_nav_bar.xml

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
<shape xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:shape="rectangle">
3+
<gradient
4+
android:angle="135"
5+
android:centerColor="#4CAF50"
6+
android:endColor="#2E7D32"
7+
android:startColor="#81C784"
8+
android:type="linear"/>
9+
</shape>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
app:sLeftBottomTextSize="14dp"
3232
app:sLeftBottomTextString="简书:"
3333
app:sLeftIconHeight="75dp"
34-
app:sLeftIconMarginLeft="16dp"
34+
app:sLeftIconMarginLeft="@dimen/dp_margin_item"
3535
app:sLeftIconRes="@drawable/fast_shape_placeholder_circle"
3636
app:sLeftIconWidth="75dp"
3737
app:sLeftMaxEms="2000"
@@ -42,7 +42,7 @@
4242
app:sLeftTopTextSize="20dp"
4343
app:sLeftTopTextString="AriesHoo"
4444
app:sLeftViewGravity="left_center"
45-
app:sLeftViewMarginLeft="16dp"
45+
app:sLeftViewMarginLeft="@dimen/dp_margin_item"
4646
app:sShapeCornersRadius="@dimen/dp_radius"
4747
app:sUseShape="true">
4848

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
xmlns:android="http://schemas.android.com/apk/res/android"
44
xmlns:app="http://schemas.android.com/apk/res-auto"
55
xmlns:tools="http://schemas.android.com/tools"
6+
android:elevation="@dimen/dp_elevation"
67
style="@style/RadiusViewItemStyle">
78

89
<ImageView

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
xmlns:android="http://schemas.android.com/apk/res/android"
44
style="@style/RadiusViewItemStyle"
55
android:layout_width="match_parent"
6+
android:elevation="@dimen/dp_elevation"
67
android:layout_height="wrap_content">
78

89
<TextView

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
app:tl_bar_stroke_color="@color/colorLineGray"
1616
app:tl_bar_stroke_width="1dp"
1717
app:tl_indicator_color="#D0D0D0"
18-
app:tl_indicator_corner_radius="6dp"
18+
app:tl_indicator_corner_radius="@dimen/dp_radius"
1919
app:tl_tab_padding="15dp"
2020
app:tl_tab_space_equal="false"
2121
app:tl_textSelectColor="@color/colorTabTextSelect"

‎app/src/main/res/values/dimens.xml

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -3,19 +3,19 @@
33
<dimen name="dp_bg_mine">200dp</dimen>
44
<dimen name="dp_banner_point">8dp</dimen>
55

6-
<dimen name="dp_margin_item">12dp</dimen>
7-
<dimen name="dp_elevation">8px</dimen>
8-
<dimen name="dp_radius">8dp</dimen>
6+
<dimen name="dp_margin_item">10dp</dimen>
7+
<dimen name="dp_elevation">6px</dimen>
8+
<dimen name="dp_radius">2dp</dimen>
99

1010
<!--以下属性为lib设置默认属性，在app设置同名属性可覆盖lib效果-->
1111

1212
<!--TitleBarView 高度-->
1313
<dimen name="dp_title_height">48dp</dimen>
1414

1515
<!--主页tab高度-->
16-
<dimen name="dp_tab_height">56dp</dimen>
16+
<dimen name="dp_tab_height">52dp</dimen>
1717
<!--主页tab icon宽高-->
18-
<dimen name="dp_tab_icon">24dp</dimen>
18+
<dimen name="dp_tab_icon">22dp</dimen>
1919
<!--主页tab 文字与icon边距-->
2020
<dimen name="dp_tab_margin">2dp</dimen>
2121
<!--主页tab文字字号-->

0 commit comments

Comments
 (0)