Skip to content

Commit 93c0a76

Browse files
BlankjBlankj
committed
see 11/28 log
1 parent 272a8fb commit 93c0a76

File tree

36 files changed

+589
-197
lines changed

36 files changed

+589
-197
lines changed

‎README-CN.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@
5151

5252
[frame]: https://raw.githubusercontent.com/Blankj/AndroidUtilCode/master/art/auc_frame_cn.png
5353

54-
[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.25.9-brightgreen.svg
54+
[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.26.0-brightgreen.svg
5555
[auc]: https://github.com/Blankj/AndroidUtilCode
5656

5757
[apiSvg]: https://img.shields.io/badge/API-14+-brightgreen.svg

‎README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,7 @@ If this project helps you a lot and you want to support the project's developmen
5151

5252
[frame]: https://raw.githubusercontent.com/Blankj/AndroidUtilCode/master/art/auc_frame.png
5353

54-
[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.25.9-brightgreen.svg
54+
[aucSvg]: https://img.shields.io/badge/AndroidUtilCode-v1.26.0-brightgreen.svg
5555
[auc]: https://github.com/Blankj/AndroidUtilCode
5656

5757
[apiSvg]: https://img.shields.io/badge/API-14+-brightgreen.svg

‎buildSrc/src/main/groovy/Config.groovy

+2-2
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ class Config {
1515
static minSdkVersion = 14
1616
static targetSdkVersion = 28
1717
static versionCode = 1_026_000
18-
static versionName = '1.26.0'// E.g. 1.9.72 => 1,009,072
18+
static versionName = '1.26.0-alpha1'// E.g. 1.9.72 => 1,009,072
1919

2020
// lib version
2121
static kotlin_version = '1.3.50'
@@ -44,7 +44,7 @@ class Config {
4444
lib_utildebug : new DepConfig(true, true, ":lib:utildebug", "com.blankj:utildebug:1.25.10-alpha5"),
4545
lib_utildebug_no_op : new DepConfig(true, true, ":lib:utildebug-no-op", "com.blankj:utildebug-no-op:1.25.10-alpha5"),
4646
/*Never delete this line*/
47-
plugin_gradle : new DepConfig(pluginPath: "com.android.tools.build:gradle:3.5.2"),
47+
plugin_gradle : new DepConfig(pluginPath: "com.android.tools.build:gradle:3.4.2"),
4848
plugin_kotlin : new DepConfig(pluginPath: "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"),
4949
plugin_maven : new DepConfig(pluginPath: "com.github.dcendents:android-maven-gradle-plugin:2.1", pluginId: "com.github.dcendents.android-maven"),// 上传到 maven
5050
plugin_bintray : new DepConfig(pluginPath: "com.jfrog.bintray.gradle:gradle-bintray-plugin:1.8.4", pluginId: "com.jfrog.bintray"),// 上传到 bintray

‎buildSrc/src/main/groovy/TaskDurationUtils.groovy

+1-1
Original file line numberDiff line numberDiff line change
@@ -69,7 +69,7 @@ class TaskDurationUtils {
6969
sb.append(String.format("%7sms %s\n", it.exeDuration, it.task.path))
7070
}
7171
def content = sb.toString()
72-
GLog.d(content)
72+
// GLog.d(content)
7373
File file = new File(grd.rootProject.buildDir.getAbsolutePath(),
7474
"build_time_records_" + new SimpleDateFormat("yyyy-MM-dd-HH-mm-ss").format(new Date()) + ".txt")
7575
file.getParentFile().mkdirs()

‎feature/utilcode/pkg/src/main/AndroidManifest.xml

+4
Original file line numberDiff line numberDiff line change
@@ -183,6 +183,10 @@
183183
android:name="activity_meta_data"
184184
android:value="ActivityMetaData" />
185185
</activity>
186+
<activity
187+
android:name=".feature.mvp.MvpActivity"
188+
android:configChanges="orientation|keyboardHidden|screenSize"
189+
android:launchMode="singleTop" />
186190
<activity
187191
android:name=".feature.network.NetworkActivity"
188192
android:configChanges="orientation|keyboardHidden|screenSize"

‎feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/UtilCodeApiImpl.java

-1
Original file line numberDiff line numberDiff line change
@@ -28,5 +28,4 @@ public void testCallback(Callback callback) {
2828
callback.call();
2929
}
3030
}
31-
3231
}

‎feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/CoreUtilActivity.kt

+4
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import com.blankj.utilcode.pkg.feature.language.LanguageActivity
2424
import com.blankj.utilcode.pkg.feature.log.LogActivity
2525
import com.blankj.utilcode.pkg.feature.messenger.MessengerActivity
2626
import com.blankj.utilcode.pkg.feature.metaData.MetaDataActivity
27+
import com.blankj.utilcode.pkg.feature.mvp.MvpActivity
2728
import com.blankj.utilcode.pkg.feature.network.NetworkActivity
2829
import com.blankj.utilcode.pkg.feature.notification.NotificationActivity
2930
import com.blankj.utilcode.pkg.feature.path.PathActivity
@@ -123,6 +124,9 @@ class CoreUtilActivity : CommonActivity() {
123124
CommonItemClick(R.string.demo_meta_data, true) {
124125
MetaDataActivity.start(this)
125126
},
127+
CommonItemClick(R.string.demo_mvp, true) {
128+
MvpActivity.start(this)
129+
},
126130
CommonItemClick(R.string.demo_network, true) {
127131
NetworkActivity.start(this)
128132
},

‎feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/mvp/IMvp.java

+28
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
package com.blankj.utilcode.pkg.feature.mvp;
2+
3+
import com.blankj.utilcode.util.Utils;
4+
5+
/**
6+
* <pre>
7+
* author: blankj
8+
* blog : http://blankj.com
9+
* time : 2019/11/26
10+
* desc :
11+
* </pre>
12+
*/
13+
public interface IMvp {
14+
15+
interface View {
16+
void setLoadingVisible(boolean visible);
17+
18+
void showMsg(CharSequence msg);
19+
}
20+
21+
interface Presenter {
22+
void updateMsg();
23+
}
24+
25+
interface Model {
26+
void requestUpdateMsg(final Utils.Func1<Void, String> func1);
27+
}
28+
}

‎feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/mvp/MvpActivity.java

+22
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,11 @@
11
package com.blankj.utilcode.pkg.feature.mvp;
22

3+
import android.content.Context;
4+
import android.content.Intent;
5+
import android.os.Bundle;
6+
import android.support.annotation.Nullable;
7+
import android.view.View;
8+
39
import com.blankj.common.activity.CommonActivity;
410
import com.blankj.utilcode.pkg.R;
511

@@ -13,8 +19,24 @@
1319
*/
1420
public class MvpActivity extends CommonActivity {
1521

22+
public static void start(Context context) {
23+
Intent starter = new Intent(context, MvpActivity.class);
24+
context.startActivity(starter);
25+
}
26+
1627
@Override
1728
public int bindTitleRes() {
1829
return R.string.demo_mvp;
1930
}
31+
32+
@Override
33+
public int bindLayout() {
34+
return R.layout.mvp_activity;
35+
}
36+
37+
@Override
38+
public void initView(@Nullable Bundle savedInstanceState, @Nullable View contentView) {
39+
super.initView(savedInstanceState, contentView);
40+
new MvpView(this).addPresenter(new MvpPresenter());
41+
}
2042
}

‎feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/mvp/MvpModel.java

+44
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
package com.blankj.utilcode.pkg.feature.mvp;
2+
3+
import com.blankj.base.mvp.BaseModel;
4+
import com.blankj.utilcode.util.ThreadUtils;
5+
import com.blankj.utilcode.util.Utils;
6+
7+
/**
8+
* <pre>
9+
* author: blankj
10+
* blog : http://blankj.com
11+
* time : 2019/11/26
12+
* desc :
13+
* </pre>
14+
*/
15+
public class MvpModel extends BaseModel implements IMvp.Model {
16+
17+
private int index;
18+
19+
@Override
20+
public void onCreateModel() {
21+
index = 0;
22+
}
23+
24+
@Override
25+
public void onDestroyModel() {
26+
27+
}
28+
29+
@Override
30+
public void requestUpdateMsg(final Utils.Func1<Void, String> func1) {
31+
ThreadUtils.executeByCached(addAutoDestroyTask(new ThreadUtils.SimpleTask<String>() {
32+
@Override
33+
public String doInBackground() throws Throwable {
34+
Thread.sleep(1000);
35+
return "msg: " + index++;
36+
}
37+
38+
@Override
39+
public void onSuccess(String result) {
40+
func1.call(result);
41+
}
42+
}));
43+
}
44+
}

‎feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/mvp/MvpPresenter.java

+33
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,33 @@
1+
package com.blankj.utilcode.pkg.feature.mvp;
2+
3+
import com.blankj.base.mvp.BasePresenter;
4+
import com.blankj.utilcode.util.Utils;
5+
6+
/**
7+
* <pre>
8+
* author: blankj
9+
* blog : http://blankj.com
10+
* time : 2019/11/26
11+
* desc :
12+
* </pre>
13+
*/
14+
public class MvpPresenter extends BasePresenter<MvpView>
15+
implements IMvp.Presenter {
16+
17+
@Override
18+
public void onAttachView() {
19+
}
20+
21+
@Override
22+
public void updateMsg() {
23+
getView().setLoadingVisible(true);
24+
getModel(MvpModel.class).requestUpdateMsg(new Utils.Func1<Void, String>() {
25+
@Override
26+
public Void call(String param) {
27+
getView().showMsg(param);
28+
getView().setLoadingVisible(false);
29+
return null;
30+
}
31+
});
32+
}
33+
}

‎feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/mvp/MvpView.java

+61
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
package com.blankj.utilcode.pkg.feature.mvp;
2+
3+
import android.support.v4.app.FragmentActivity;
4+
import android.view.View;
5+
import android.widget.TextView;
6+
7+
import com.blankj.base.mvp.BaseView;
8+
import com.blankj.utilcode.pkg.R;
9+
import com.blankj.utilcode.util.ClickUtils;
10+
import com.blankj.utilcode.util.ToastUtils;
11+
12+
/**
13+
* <pre>
14+
* author: blankj
15+
* blog : http://blankj.com
16+
* time : 2019/11/26
17+
* desc :
18+
* </pre>
19+
*/
20+
public class MvpView extends BaseView<MvpView>
21+
implements IMvp.View {
22+
23+
private TextView mvpTv;
24+
25+
public MvpView(FragmentActivity activity) {
26+
super(activity);
27+
mvpTv = activity.findViewById(R.id.mvpUpdateTv);
28+
ClickUtils.applyPressedBgDark(mvpTv);
29+
mvpTv.setOnClickListener(new View.OnClickListener() {
30+
@Override
31+
public void onClick(View v) {
32+
getPresenter(MvpPresenter.class).updateMsg();
33+
}
34+
});
35+
}
36+
37+
@Override
38+
public void setLoadingVisible(boolean visible) {
39+
final MvpActivity activity = getActivity();
40+
if (visible) {
41+
activity.showLoading(new Runnable() {
42+
@Override
43+
public void run() {
44+
activity.finish();
45+
}
46+
});
47+
} else {
48+
activity.dismissLoading();
49+
}
50+
}
51+
52+
@Override
53+
public void showMsg(CharSequence msg) {
54+
ToastUtils.showLong(msg);
55+
}
56+
57+
@Override
58+
public void onDestroyView() {
59+
60+
}
61+
}

‎feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/shadow/ShadowActivity.kt

+19
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,15 @@ package com.blankj.utilcode.pkg.feature.shadow
22

33
import android.content.Context
44
import android.content.Intent
5+
import android.graphics.Color
6+
import android.os.Bundle
7+
import android.view.View
58
import com.blankj.common.activity.CommonActivity
69
import com.blankj.utilcode.pkg.R
10+
import com.blankj.utilcode.util.ShadowUtils
11+
import com.blankj.utilcode.util.ShadowUtils.Config
12+
import com.blankj.utilcode.util.SizeUtils
13+
import kotlinx.android.synthetic.main.shadow_activity.*
714

815
/**
916
* ```
@@ -25,4 +32,16 @@ class ShadowActivity : CommonActivity() {
2532
override fun bindTitleRes(): Int {
2633
return R.string.demo_shadow
2734
}
35+
36+
override fun bindLayout(): Int {
37+
return R.layout.shadow_activity
38+
}
39+
40+
override fun initView(savedInstanceState: Bundle?, contentView: View?) {
41+
super.initView(savedInstanceState, contentView)
42+
ShadowUtils.apply(shadowRectView, Config().setShadowRadius(0.01f).setShadowColor(Color.BLUE, Color.GREEN))
43+
ShadowUtils.apply(shadowRoundRectView, Config().setShadowRadius(
44+
SizeUtils.dp2px(16f).toFloat()).setShadowColor(Color.RED, Color.BLUE))
45+
ShadowUtils.apply(shadowCircleView, Config().setCircle().setShadowColor(Color.GREEN, Color.BLUE))
46+
}
2847
}

‎feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/span/SpanActivity.kt

+14-14
Original file line numberDiff line numberDiff line change
@@ -110,33 +110,33 @@ class SpanActivity : CommonActivity() {
110110
.appendLine("阴影效果").setFontSize(64, true).setBackgroundColor(Color.BLACK).setShadow(24f, 8f, 8f, Color.WHITE)
111111

112112
.append("小图").setBackgroundColor(Color.GREEN)
113-
.appendImage(R.drawable.span_shape_block_low, SpanUtils.ALIGN_TOP)
113+
.appendImage(R.drawable.span_block_low, SpanUtils.ALIGN_TOP)
114114
.append("顶部").setBackgroundColor(Color.GREEN)
115-
.appendImage(R.drawable.span_shape_block_low, SpanUtils.ALIGN_CENTER)
115+
.appendImage(R.drawable.span_block_low, SpanUtils.ALIGN_CENTER)
116116
.append("居中").setBackgroundColor(Color.GREEN)
117-
.appendImage(R.drawable.span_shape_block_low, SpanUtils.ALIGN_BASELINE)
117+
.appendImage(R.drawable.span_block_low, SpanUtils.ALIGN_BASELINE)
118118
.append("底部").setBackgroundColor(Color.GREEN)
119-
.appendImage(R.drawable.span_shape_block_low, SpanUtils.ALIGN_BOTTOM)
119+
.appendImage(R.drawable.span_block_low, SpanUtils.ALIGN_BOTTOM)
120120
.appendLine("对齐").setBackgroundColor(Color.GREEN)
121-
.appendImage(R.drawable.span_shape_block_high, SpanUtils.ALIGN_TOP)
121+
.appendImage(R.drawable.span_block_high, SpanUtils.ALIGN_TOP)
122122
.append("大图").setBackgroundColor(Color.LTGRAY)
123-
.appendImage(R.drawable.span_shape_block_high, SpanUtils.ALIGN_TOP)
123+
.appendImage(R.drawable.span_block_high, SpanUtils.ALIGN_TOP)
124124
.append("顶部").setBackgroundColor(Color.LTGRAY)
125-
.appendImage(R.drawable.span_shape_block_high, SpanUtils.ALIGN_TOP)
125+
.appendImage(R.drawable.span_block_high, SpanUtils.ALIGN_TOP)
126126
.appendLine("对齐").setBackgroundColor(Color.LTGRAY)
127127

128-
.appendImage(R.drawable.span_shape_block_high, SpanUtils.ALIGN_CENTER)
128+
.appendImage(R.drawable.span_block_high, SpanUtils.ALIGN_CENTER)
129129
.append("大图").setBackgroundColor(Color.GREEN)
130-
.appendImage(R.drawable.span_shape_block_high, SpanUtils.ALIGN_CENTER)
130+
.appendImage(R.drawable.span_block_high, SpanUtils.ALIGN_CENTER)
131131
.append("居中").setBackgroundColor(Color.GREEN)
132-
.appendImage(R.drawable.span_shape_block_high, SpanUtils.ALIGN_CENTER)
132+
.appendImage(R.drawable.span_block_high, SpanUtils.ALIGN_CENTER)
133133
.appendLine("对齐").setBackgroundColor(Color.GREEN)
134134

135-
.appendImage(R.drawable.span_shape_block_high, SpanUtils.ALIGN_BOTTOM)
135+
.appendImage(R.drawable.span_block_high, SpanUtils.ALIGN_BOTTOM)
136136
.append("大图").setBackgroundColor(Color.LTGRAY)
137-
.appendImage(R.drawable.span_shape_block_high, SpanUtils.ALIGN_BOTTOM)
137+
.appendImage(R.drawable.span_block_high, SpanUtils.ALIGN_BOTTOM)
138138
.append("底部").setBackgroundColor(Color.LTGRAY)
139-
.appendImage(R.drawable.span_shape_block_high, SpanUtils.ALIGN_BOTTOM)
139+
.appendImage(R.drawable.span_block_high, SpanUtils.ALIGN_BOTTOM)
140140
.appendLine("对齐").setBackgroundColor(Color.LTGRAY)
141141

142142
.append("测试空格").appendSpace(30, Color.LTGRAY).appendSpace(50, Color.GREEN).appendSpace(100).appendSpace(30, Color.LTGRAY).appendSpace(50, Color.GREEN)
@@ -201,7 +201,7 @@ class SpanActivity : CommonActivity() {
201201
// printer
202202
mForegroundAlphaColorSpanGroup.alpha = animation.animatedValue as Float
203203

204-
// update
204+
// showMsg
205205
spanAboutAnimTv.text = animSsb
206206
}
207207

‎feature/utilcode/pkg/src/main/java/com/blankj/utilcode/pkg/feature/toast/ToastActivity.kt

+1-1
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@ class ToastActivity : CommonActivity() {
5757
},
5858
CommonItemClick(R.string.toast_show_bg_resource) {
5959
resetToast()
60-
ToastUtils.setBgResource(R.drawable.toast_shape_round_rect)
60+
ToastUtils.setBgResource(R.drawable.toast_round_rect)
6161
ToastUtils.showLong(R.string.toast_custom_bg)
6262
},
6363
CommonItemClick(R.string.toast_show_span) {

‎feature/utilcode/pkg/src/main/res/drawable/shadow_circle.xml

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<shape xmlns:android="http://schemas.android.com/apk/res/android"
3+
android:shape="oval">
4+
5+
<solid android:color="@color/colorAccent" />
6+
7+
</shape>

0 commit comments

Comments
 (0)