Skip to content

Commit 18395d7

Browse files
author
Blankj
committed
see 03/18 log
1 parent 0851fca commit 18395d7

File tree

103 files changed

+679
-912
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

103 files changed

+679
-912
lines changed

launcher/app/src/main/AndroidManifest.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,9 @@
1111

1212
<activity
1313
android:name="com.blankj.launcher.pkg.MainActivity"
14+
android:configChanges="orientation|keyboardHidden|screenSize"
1415
android:screenOrientation="user"
15-
android:windowSoftInputMode="stateHidden|adjustPan">
16+
android:windowSoftInputMode="stateHidden">
1617
<intent-filter>
1718
<action android:name="android.intent.action.MAIN" />
1819
<action android:name="android.intent.action.VIEW" />

launcher/pkg/src/main/AndroidManifest.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@
44
<application>
55
<activity
66
android:name=".MainActivity"
7+
android:configChanges="orientation|keyboardHidden|screenSize"
78
android:screenOrientation="user"
8-
android:windowSoftInputMode="stateHidden|adjustPan" />
9+
android:windowSoftInputMode="stateHidden" />
910
</application>
1011

1112
</manifest>

launcher/pkg/src/main/java/com/blankj/launcher/pkg/MainActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ class MainActivity : BaseDrawerActivity() {
3030

3131
private var view: ImageView? = null
3232

33-
override fun initView(savedInstanceState: Bundle?, contentView: View) {
33+
override fun initView(savedInstanceState: Bundle?, contentView: View?) {
3434
launcherMainCtl.setExpandedTitleColor(Color.TRANSPARENT)
3535
setSupportActionBar(launcherMainToolbar)
3636
val toggle = ActionBarDrawerToggle(this,

launcher/pkg/src/main/java/com/blankj/launcher/pkg/SplashActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ class SplashActivity : BaseActivity() {
1717
TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
1818
}
1919

20-
override fun initView(savedInstanceState: Bundle?, contentView: View) {
20+
override fun initView(savedInstanceState: Bundle?, contentView: View?) {
2121
TODO("not implemented") //To change body of created functions use File | Settings | File Templates.
2222
}
2323

lib/base/src/main/java/com/blankj/lib/base/BaseActivity.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -50,6 +50,7 @@ protected void onCreate(Bundle savedInstanceState) {
5050
super.onCreate(savedInstanceState);
5151
initData(getIntent().getExtras());
5252
setRootLayout(bindLayout());
53+
findViewById(android.R.id.content).setBackgroundColor(getResources().getColor(R.color.mediumGray));
5354
initView(savedInstanceState, mContentView);
5455
doBusiness();
5556

lib/base/src/main/java/com/blankj/lib/base/IBaseView.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ public interface IBaseView extends View.OnClickListener {
2323

2424
void setRootLayout(@LayoutRes int layoutId);
2525

26-
void initView(@Nullable Bundle savedInstanceState, View contentView);
26+
void initView(@Nullable Bundle savedInstanceState, @Nullable View contentView);
2727

2828
void doBusiness();
2929

Lines changed: 66 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,66 @@
1+
package com.blankj.lib.base.rv;
2+
3+
import android.content.Context;
4+
import android.support.annotation.NonNull;
5+
import android.support.v7.widget.RecyclerView;
6+
import android.view.LayoutInflater;
7+
import android.view.View;
8+
import android.view.ViewGroup;
9+
10+
import java.util.List;
11+
12+
/**
13+
* <pre>
14+
* author: Blankj
15+
* blog : http://blankj.com
16+
* time : 2017/08/22
17+
* desc :
18+
* </pre>
19+
*/
20+
public class BaseAdapter<Cell extends BaseCell> extends RecyclerView.Adapter<BaseViewHolder> {
21+
22+
public List<Cell> mData;
23+
public Context mContext;
24+
public LayoutInflater mInflater;
25+
26+
public void setData(@NonNull final List<Cell> data) {
27+
mData = data;
28+
}
29+
30+
public List<Cell> getData() {
31+
return mData;
32+
}
33+
34+
@Override
35+
public final int getItemViewType(int position) {
36+
return mData.get(position).viewType;
37+
}
38+
39+
@NonNull
40+
@Override
41+
public BaseViewHolder onCreateViewHolder(@NonNull ViewGroup parent, int viewType) {
42+
if (mContext == null) {
43+
mContext = parent.getContext();
44+
mInflater = LayoutInflater.from(mContext);
45+
}
46+
int layoutByType = BaseCell.getLayoutByType(viewType);
47+
if (layoutByType != -1) {
48+
return new BaseViewHolder(mInflater.inflate(layoutByType, parent, false));
49+
}
50+
View viewByType = BaseCell.getViewByType(viewType);
51+
if (viewByType != null) {
52+
return new BaseViewHolder(viewByType);
53+
}
54+
throw new RuntimeException("onCreateViewHolder: get holder from view type failed.");
55+
}
56+
57+
@Override
58+
public final void onBindViewHolder(@NonNull BaseViewHolder holder, int position) {
59+
mData.get(position).bind(holder, position);
60+
}
61+
62+
@Override
63+
public int getItemCount() {
64+
return mData.size();
65+
}
66+
}
Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
package com.blankj.lib.base.rv;
2+
3+
import android.support.annotation.NonNull;
4+
import android.util.SparseArray;
5+
import android.util.SparseIntArray;
6+
import android.view.View;
7+
8+
/**
9+
* <pre>
10+
* author: blankj
11+
* blog : http://blankj.com
12+
* time : 2019/03/16
13+
* desc :
14+
* </pre>
15+
*/
16+
public abstract class BaseCell {
17+
18+
private static final SparseIntArray LAYOUT_SPARSE_ARRAY = new SparseIntArray();
19+
private static final SparseArray<View> VIEW_SPARSE_ARRAY = new SparseArray<>();
20+
21+
static int getLayoutByType(int type) {
22+
return LAYOUT_SPARSE_ARRAY.get(type, -1);
23+
}
24+
25+
static View getViewByType(int type) {
26+
return VIEW_SPARSE_ARRAY.get(type);
27+
}
28+
29+
public abstract void bind(@NonNull final BaseViewHolder holder, final int position);
30+
31+
protected int viewType;
32+
33+
public BaseCell(int layoutId) {
34+
viewType = getClass().hashCode();
35+
LAYOUT_SPARSE_ARRAY.put(viewType, layoutId);
36+
}
37+
38+
public BaseCell(View view) {
39+
viewType = getClass().hashCode();
40+
VIEW_SPARSE_ARRAY.put(viewType, view);
41+
}
42+
}

lib/base/src/main/java/com/blankj/lib/base/rv/BaseViewHolder.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ public BaseViewHolder(View itemView) {
2222
}
2323

2424
@SuppressWarnings("unchecked")
25-
public <T extends View> T getView(@IdRes final int viewId) {
25+
public <T extends View> T findViewById(@IdRes final int viewId) {
2626
View view = viewArray.get(viewId);
2727
if (view == null) {
2828
view = itemView.findViewById(viewId);

lib/base/src/main/java/com/blankj/lib/base/rv/adapter/BaseAdapter.java

Lines changed: 0 additions & 198 deletions
This file was deleted.

0 commit comments

Comments
 (0)