Skip to content

Commit 3c6fa6b

Browse files
BlankjBlankj
committed
see 09/03 log
1 parent 0dc2c95 commit 3c6fa6b

File tree

28 files changed

+974
-924
lines changed

28 files changed

+974
-924
lines changed

‎README-CN.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141

4242
[logo]: https://raw.githubusercontent.com/Blankj/AndroidUtilCode/master/art/logo.png
4343

44-
[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.19.4-brightgreen.svg
44+
[aucsvg]: https://img.shields.io/badge/AndroidUtilCode-v1.20.0-brightgreen.svg
4545
[auc]: https://github.com/Blankj/AndroidUtilCode
4646

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

‎app/src/main/AndroidManifest.xml

Lines changed: 17 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -122,13 +122,25 @@
122122
android:launchMode="singleTop" />
123123
<activity
124124
android:name=".feature.core.keyboard.KeyboardActivity"
125-
android:launchMode="singleTop" />
125+
android:launchMode="singleTop"
126+
android:windowSoftInputMode="stateHidden" />
126127
<activity
127128
android:name=".feature.core.log.LogActivity"
128129
android:launchMode="singleTop" />
130+
131+
<activity
132+
android:name=".feature.core.meta_data.MetaDataActivity"
133+
android:launchMode="singleTop">
134+
<meta-data
135+
android:name="activity_meta_data"
136+
android:value="ActivityMetaData" />
137+
</activity>
129138
<activity
130139
android:name=".feature.core.network.NetworkActivity"
131140
android:launchMode="singleTop" />
141+
<activity
142+
android:name=".feature.core.path.PathActivity"
143+
android:launchMode="singleTop" />
132144
<activity
133145
android:name=".feature.core.permission.PermissionActivity"
134146
android:launchMode="singleTop" />
@@ -166,6 +178,10 @@
166178
android:name=".feature.core.toast.ToastActivity"
167179
android:launchMode="singleTop" />
168180

181+
<meta-data
182+
android:name="app_meta_data"
183+
android:value="AppMetaData" />
184+
169185
<!-- sub -->
170186
<activity
171187
android:name=".feature.sub.SubUtilActivity"
@@ -184,22 +200,11 @@
184200
android:name=".feature.sub.location.LocationService"
185201
android:launchMode="singleTop" />
186202

187-
<activity
188-
android:name=".feature.sub.meta_data.MetaDataActivity"
189-
android:launchMode="singleTop">
190-
<meta-data
191-
android:name="activity_meta_data"
192-
android:value="activity" />
193-
</activity>
194203
<activity
195204
android:name=".feature.sub.pinyin.PinyinActivity"
196205
android:launchMode="singleTop"
197206
android:screenOrientation="landscape" />
198207

199-
<meta-data
200-
android:name="app_meta_data"
201-
android:value="1234" />
202-
203208
</application>
204209

205210
</manifest>

‎app/src/main/java/com/blankj/androidutilcode/MainActivity.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
import com.blankj.androidutilcode.feature.core.CoreUtilActivity;
1313
import com.blankj.androidutilcode.feature.sub.SubUtilActivity;
1414
import com.blankj.utilcode.util.BarUtils;
15-
import com.blankj.utilcode.util.ScreenUtils;
1615

1716
/**
1817
* <pre>

‎app/src/main/java/com/blankj/androidutilcode/feature/core/CoreUtilActivity.java

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@
1717
import com.blankj.androidutilcode.feature.core.image.ImageActivity;
1818
import com.blankj.androidutilcode.feature.core.keyboard.KeyboardActivity;
1919
import com.blankj.androidutilcode.feature.core.log.LogActivity;
20+
import com.blankj.androidutilcode.feature.core.meta_data.MetaDataActivity;
2021
import com.blankj.androidutilcode.feature.core.network.NetworkActivity;
22+
import com.blankj.androidutilcode.feature.core.path.PathActivity;
2123
import com.blankj.androidutilcode.feature.core.permission.PermissionActivity;
2224
import com.blankj.androidutilcode.feature.core.phone.PhoneActivity;
2325
import com.blankj.androidutilcode.feature.core.process.ProcessActivity;
@@ -43,7 +45,7 @@ public class CoreUtilActivity extends BaseBackActivity {
4345

4446
public static void start(Context context) {
4547
Intent starter = new Intent(context, CoreUtilActivity.class);
46-
context.startActivity(starter.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK));
48+
context.startActivity(starter);
4749
}
4850

4951
@Override
@@ -116,10 +118,18 @@ public void logClick(View view) {
116118
LogActivity.start(this);
117119
}
118120

121+
public void metaDataClick(View view) {
122+
MetaDataActivity.start(this);
123+
}
124+
119125
public void networkClick(View view) {
120126
NetworkActivity.start(this);
121127
}
122128

129+
public void pathClick(View view) {
130+
PathActivity.start(this);
131+
}
132+
123133
public void permissionClick(View view) {
124134
PermissionActivity.start(this);
125135
}

‎app/src/main/java/com/blankj/androidutilcode/feature/core/keyboard/KeyboardActivity.java

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,11 @@
1111

1212
import com.blankj.androidutilcode.R;
1313
import com.blankj.androidutilcode.base.BaseActivity;
14+
import com.blankj.androidutilcode.base.BaseBackActivity;
1415
import com.blankj.androidutilcode.helper.DialogHelper;
16+
import com.blankj.utilcode.util.BarUtils;
1517
import com.blankj.utilcode.util.KeyboardUtils;
18+
import com.blankj.utilcode.util.ScreenUtils;
1619
import com.blankj.utilcode.util.SpanUtils;
1720

1821
/**
@@ -23,7 +26,7 @@
2326
* desc : demo about KeyboardUtils
2427
* </pre>
2528
*/
26-
public class KeyboardActivity extends BaseActivity{
29+
public class KeyboardActivity extends BaseBackActivity {
2730

2831
public static void start(Context context) {
2932
Intent starter = new Intent(context, KeyboardActivity.class);
@@ -41,7 +44,7 @@ public void initData(@Nullable Bundle bundle) {
4144

4245
@Override
4346
public int bindLayout() {
44-
return R.layout.activity_keyboard1;
47+
return R.layout.activity_keyboard;
4548
}
4649

4750
@Override

‎app/src/main/java/com/blankj/androidutilcode/feature/sub/meta_data/MetaDataActivity.java renamed to ‎app/src/main/java/com/blankj/androidutilcode/feature/core/meta_data/MetaDataActivity.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.blankj.androidutilcode.feature.sub.meta_data;
1+
package com.blankj.androidutilcode.feature.core.meta_data;
22

33
import android.content.Context;
44
import android.content.Intent;
@@ -9,15 +9,15 @@
99

1010
import com.blankj.androidutilcode.R;
1111
import com.blankj.androidutilcode.base.BaseBackActivity;
12-
import com.blankj.subutil.util.MetaDataUtils;
12+
import com.blankj.utilcode.util.MetaDataUtils;
1313
import com.blankj.utilcode.util.SpanUtils;
1414

1515
/**
1616
* <pre>
1717
* author: Blankj
1818
* blog : http://blankj.com
1919
* time : 2018/05/15
20-
* desc :
20+
* desc : demo about MetaDataUtils
2121
* </pre>
2222
*/
2323
public class MetaDataActivity extends BaseBackActivity {

‎app/src/main/java/com/blankj/androidutilcode/feature/core/path/PathActivity.java

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
package com.blankj.androidutilcode.feature.core.path;
2+
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+
import android.widget.TextView;
9+
10+
import com.blankj.androidutilcode.R;
11+
import com.blankj.androidutilcode.base.BaseBackActivity;
12+
import com.blankj.utilcode.util.SpanUtils;
13+
14+
/**
15+
* <pre>
16+
* author: Blankj
17+
* blog : http://blankj.com
18+
* time : 2016/10/13
19+
* desc : demo about PathUtils
20+
* </pre>
21+
*/
22+
public class PathActivity extends BaseBackActivity {
23+
24+
public static void start(Context context) {
25+
Intent starter = new Intent(context, PathActivity.class);
26+
context.startActivity(starter);
27+
}
28+
29+
@Override
30+
public void initData(@Nullable Bundle bundle) {
31+
32+
}
33+
34+
@Override
35+
public int bindLayout() {
36+
return R.layout.activity_path;
37+
}
38+
39+
@Override
40+
public void initView(Bundle savedInstanceState, View contentView) {
41+
getToolBar().setTitle(getString(R.string.demo_path));
42+
43+
TextView tvAboutMetaData = findViewById(R.id.tv_about_path);
44+
tvAboutMetaData.setText(new SpanUtils()
45+
// .appendLine("getRootPath: " + PathUtils.getRootPath())
46+
.append("")
47+
.create());
48+
}
49+
50+
@Override
51+
public void doBusiness() {
52+
53+
}
54+
55+
@Override
56+
public void onWidgetClick(View view) {
57+
58+
}
59+
}

‎app/src/main/java/com/blankj/androidutilcode/feature/sub/SubUtilActivity.java

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@
1111
import com.blankj.androidutilcode.feature.sub.brightness.BrightnessActivity;
1212
import com.blankj.androidutilcode.feature.sub.flashlight.FlashlightActivity;
1313
import com.blankj.androidutilcode.feature.sub.location.LocationActivity;
14-
import com.blankj.androidutilcode.feature.sub.meta_data.MetaDataActivity;
1514
import com.blankj.androidutilcode.feature.sub.pinyin.PinyinActivity;
1615

1716
/**
@@ -66,10 +65,6 @@ public void locationClick(View view) {
6665
LocationActivity.start(this);
6766
}
6867

69-
public void metaDataClick(View view) {
70-
MetaDataActivity.start(this);
71-
}
72-
7368
public void pinyinClick(View view) {
7469
PinyinActivity.start(this);
7570
}

‎app/src/main/res_core/layout/activity_keyboard.xml

Lines changed: 18 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -48,23 +48,20 @@
4848
android:id="@+id/et_input"
4949
android:layout_width="match_parent"
5050
android:layout_height="match_parent"
51-
android:layout_gravity="bottom"
5251
android:inputType="text" />
5352

5453

5554
<EditText
5655
android:id="@+id/et_input1"
5756
android:layout_width="match_parent"
5857
android:layout_height="match_parent"
59-
android:layout_gravity="bottom"
6058
android:inputType="text" />
6159

6260

6361
<EditText
6462
android:id="@+id/et_input2"
6563
android:layout_width="match_parent"
6664
android:layout_height="match_parent"
67-
android:layout_gravity="bottom"
6865
android:inputType="text" />
6966

7067

@@ -80,51 +77,62 @@
8077
android:id="@+id/et_input4"
8178
android:layout_width="match_parent"
8279
android:layout_height="match_parent"
83-
android:layout_gravity="bottom"
8480
android:inputType="text" />
8581

8682

8783
<EditText
8884
android:id="@+id/et_input5"
8985
android:layout_width="match_parent"
9086
android:layout_height="match_parent"
91-
android:layout_gravity="bottom"
9287
android:inputType="text" />
9388

9489

9590
<EditText
9691
android:id="@+id/et_input6"
9792
android:layout_width="match_parent"
9893
android:layout_height="match_parent"
99-
android:layout_gravity="bottom"
10094
android:inputType="text" />
10195

10296
<EditText
10397
android:id="@+id/et_input7"
10498
android:layout_width="match_parent"
10599
android:layout_height="match_parent"
106-
android:layout_gravity="bottom"
107100
android:inputType="text" />
108101

109102
<EditText
110103
android:id="@+id/et_input8"
111104
android:layout_width="match_parent"
112105
android:layout_height="match_parent"
113-
android:layout_gravity="bottom"
114106
android:inputType="text" />
115107

116108
<EditText
117109
android:id="@+id/et_input9"
118110
android:layout_width="match_parent"
119111
android:layout_height="match_parent"
120-
android:layout_gravity="bottom"
121112
android:inputType="text" />
122113

123114
<EditText
124115
android:id="@+id/et_input10"
125116
android:layout_width="match_parent"
126117
android:layout_height="match_parent"
127-
android:layout_gravity="bottom"
118+
android:inputType="text" />
119+
120+
<EditText
121+
android:id="@+id/et_input11"
122+
android:layout_width="match_parent"
123+
android:layout_height="match_parent"
124+
android:inputType="text" />
125+
126+
<EditText
127+
android:id="@+id/et_input12"
128+
android:layout_width="match_parent"
129+
android:layout_height="match_parent"
130+
android:inputType="text" />
131+
132+
<EditText
133+
android:id="@+id/et_input13"
134+
android:layout_width="match_parent"
135+
android:layout_height="match_parent"
128136
android:inputType="text" />
129137

130138
</LinearLayout>

‎app/src/main/res_core/layout/activity_path.xml

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<LinearLayout
3+
xmlns:android="http://schemas.android.com/apk/res/android"
4+
android:layout_width="match_parent"
5+
android:layout_height="wrap_content"
6+
android:gravity="center_horizontal"
7+
android:orientation="vertical"
8+
android:padding="@dimen/spacing_16">
9+
10+
<TextView
11+
android:id="@+id/tv_about_path"
12+
style="@style/TextStyle"
13+
android:layout_width="match_parent"
14+
android:layout_height="wrap_content" />
15+
</LinearLayout>

‎app/src/main/res_core/layout/activity_util_core.xml

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -78,13 +78,27 @@
7878
android:onClick="logClick"
7979
android:text="@string/demo_log" />
8080

81+
<Button
82+
style="@style/WideBtnStyle"
83+
android:layout_width="match_parent"
84+
android:layout_height="wrap_content"
85+
android:onClick="metaDataClick"
86+
android:text="@string/demo_meta_data" />
87+
8188
<Button
8289
style="@style/WideBtnStyle"
8390
android:layout_width="match_parent"
8491
android:layout_height="wrap_content"
8592
android:onClick="networkClick"
8693
android:text="@string/demo_network" />
8794

95+
<!--<Button-->
96+
<!--style="@style/WideBtnStyle"-->
97+
<!--android:layout_width="match_parent"-->
98+
<!--android:layout_height="wrap_content"-->
99+
<!--android:onClick="pathClick"-->
100+
<!--android:text="@string/demo_path" />-->
101+
88102
<Button
89103
style="@style/WideBtnStyle"
90104
android:layout_width="match_parent"

‎app/src/main/res_core/values/strings.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,9 @@
1010
<string name="demo_image">ImageUtils Demo</string>
1111
<string name="demo_keyboard">KeyboardUtils Demo</string>
1212
<string name="demo_log">LogUtils Demo</string>
13+
<string name="demo_meta_data">MetaData Demo</string>
1314
<string name="demo_network">NetworkUtils Demo</string>
15+
<string name="demo_path">Path Demo</string>
1416
<string name="demo_permission">PermissionUtils Demo</string>
1517
<string name="demo_phone">PhoneUtils Demo</string>
1618
<string name="demo_process">ProcessUtils Demo</string>

0 commit comments

Comments
 (0)