Skip to content

Commit aed631e

Browse files
author
junix
committed
组件拆分
1 parent be459cd commit aed631e

File tree

156 files changed

+1653
-1921
lines changed

Some content is hidden

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

156 files changed

+1653
-1921
lines changed

‎README.md‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@ Step2. Add the dependency
2121
```
2222
dependencies {
2323
implementation 'com.github.li-xiaojun.AndroidKTX:library:最新版本'
24-
implementation 'com.github.li-xiaojun.AndroidKTX:circleprogress:最新版本'
2524
implementation 'com.github.li-xiaojun.AndroidKTX:videoplayer:最新版本'
2625
implementation 'com.github.li-xiaojun.AndroidKTX:audioplayer:最新版本'
2726
implementation 'com.github.li-xiaojun.AndroidKTX:matisse:最新版本'
@@ -436,7 +435,7 @@ bitmap.saveToAlbum()
436435

437436
使用示例：
438437
```xml
439-
<com.lxj.androidktx.widget.TitleBar
438+
<com.lxj.widget.TitleBar
440439
android:layout_marginTop="15dp"
441440
app:title="嘻嘻"
442441
android:id="@+id/tt"
@@ -484,7 +483,7 @@ tt.clickListener(object : TitleBar.ClickListener{
484483

485484
基本使用：
486485
```xml
487-
<com.lxj.androidktx.widget.SuperLayout
486+
<com.lxj.widget.SuperLayout
488487
android:layout_marginLeft="20dp"
489488
android:layout_marginRight="20dp"
490489
android:paddingLeft="14dp"

‎app/app.keystore‎

2.58 KB
Binary file not shown.

‎app/build.gradle‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -58,5 +58,7 @@ dependencies {
5858
implementation project(':share')
5959
// implementation project(':pay')
6060
implementation project(':audioplayer')
61+
// implementation project(':matisse')
62+
// implementation project(':widget')
6163
// implementation project(':videoplayer')
6264
}

‎app/release/output-metadata.json‎

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
{
2+
"version": 2,
3+
"artifactType": {
4+
"type": "APK",
5+
"kind": "Directory"
6+
},
7+
"applicationId": "com.lxj.androidktxdemo",
8+
"variantName": "release",
9+
"elements": [
10+
{
11+
"type": "SINGLE",
12+
"filters": [],
13+
"versionCode": 1,
14+
"versionName": "1.0",
15+
"outputFile": "app-release.apk"
16+
}
17+
]
18+
}

‎app/src/main/java/com/lxj/androidktxdemo/AndroidKtxApp.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ import android.graphics.Typeface
44
import androidx.multidex.MultiDexApplication
55
import com.blankj.utilcode.util.LogUtils
66
import com.lxj.androidktx.AndroidKTX
7-
import com.lxj.androidktx.core.*
7+
import com.lxj.ext.*
88
import com.lxj.androidktxdemo.entity.User
99
import com.lxj.androidktxdemo.entity.UserGender
1010
import com.lxj.audioplayer.ExoPlayerManager

‎app/src/main/java/com/lxj/androidktxdemo/DemoActivity.kt‎

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,13 @@ import android.os.Looper
55
import android.webkit.WebSettings
66
import android.webkit.WebView
77
import android.webkit.WebViewClient
8-
import androidx.appcompat.app.AppCompatActivity
98
import androidx.viewpager2.widget.ViewPager2.ORIENTATION_HORIZONTAL
109
import androidx.viewpager2.widget.ViewPager2.ORIENTATION_VERTICAL
1110
import com.blankj.utilcode.util.*
12-
import com.lxj.androidktx.base.StateTitleBarActivity
13-
import com.lxj.androidktx.core.asCard
14-
import com.lxj.androidktx.core.bindFragment
15-
import com.lxj.androidktx.core.click
16-
import com.lxj.androidktx.core.dp
11+
import com.lxj.ext.asCard
12+
import com.lxj.ext.bindFragment
13+
import com.lxj.ext.click
14+
import com.lxj.ext.dp
1715
import com.lxj.xpopup.XPopup
1816
import com.lxj.xpopup.impl.LoadingPopupView
1917
import kotlinx.android.synthetic.main.demo.*
@@ -36,11 +34,9 @@ val html = """
3634
* Description:
3735
* Create by dance, at 2019/7/11
3836
*/
39-
class DemoActivity : StateTitleBarActivity(){
37+
class DemoActivity : com.lxj.widget.act.TitleBarActivity(){
4038
override fun getBodyLayout() = R.layout.demo
41-
override fun autoShowContent(): Boolean {
42-
return true
43-
}
39+
4440
var isFirst = true
4541
val loadingPopupView: LoadingPopupView by lazy { XPopup.Builder(this).asLoading("加载中") }
4642
val base64 : String by lazy {
@@ -224,10 +220,4 @@ class DemoActivity : StateTitleBarActivity(){
224220
}
225221
}
226222

227-
228-
override fun onConfigStateLayout() {
229-
super.onConfigStateLayout()
230-
stateLayout?.config()
231-
}
232-
233223
}

‎app/src/main/java/com/lxj/androidktxdemo/MainActivity.kt‎

Lines changed: 4 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,16 @@
11
package com.lxj.androidktxdemo
22

3+
import android.app.Application
34
import android.content.Intent
4-
import androidx.viewpager2.adapter.FragmentStateAdapter
55
import com.blankj.utilcode.util.BarUtils
6-
import com.blankj.utilcode.util.LogUtils
6+
import com.lxj.androidktx.AndroidKTX
77
import com.lxj.androidktx.base.BaseActivity
8-
import com.lxj.androidktx.core.*
8+
import com.lxj.ext.*
99
import com.lxj.share.Share
1010
import com.lxj.androidktxdemo.databinding.ActivityMainBinding
1111
import com.lxj.androidktxdemo.entity.PageInfo
1212
import com.lxj.androidktxdemo.fragment.*
13-
import com.lxj.androidktxdemo.popup.TestPopup
14-
import com.lxj.androidktxdemo.serv.PlayService
1513
import com.lxj.androidktxdemo.vm.TestVM
16-
import com.lxj.audioplayer.ExoPlayerManager
17-
import com.lxj.xpopup.XPopup
1814
import kotlinx.android.synthetic.main.activity_main.*
1915
import kotlin.random.Random
2016

@@ -50,7 +46,7 @@ class MainActivity : BaseActivity() {
5046
binding.fakeStatus.height(BarUtils.getStatusBarHeight())
5147
binding.viewPager.bindFragment(this, fragments = pages.map { it.page!! })
5248
binding.viewPager.bindTabLayout(tabLayout, pages.map { it.title })
53-
val testVM = getSavedStateVM(TestVM::class.java)
49+
val testVM = getSavedStateVM(AndroidKTX.context as Application, TestVM::class.java)
5450
testVM.num.observe(this, androidx.lifecycle.Observer {
5551
btnTest.text = "Random: $it"
5652
})

‎app/src/main/java/com/lxj/androidktxdemo/MyWebview.kt‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,12 +3,9 @@ package com.lxj.androidktxdemo
33
import android.content.Context
44
import android.util.AttributeSet
55
import android.view.*
6-
import android.webkit.ValueCallback
76
import android.webkit.WebView
87
import androidx.core.view.forEach
9-
import androidx.core.view.iterator
108
import com.blankj.utilcode.util.LogUtils
11-
import com.lxj.androidktx.core.toast
129

1310
class MyWebview : WebView {
1411
constructor(context: Context) : super(context) {}

‎app/src/main/java/com/lxj/androidktxdemo/WelcomeActivity.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
package com.lxj.androidktxdemo
22

33
import com.lxj.androidktx.base.BaseActivity
4-
import com.lxj.androidktx.core.postDelay
5-
import com.lxj.androidktx.core.startActivity
4+
import com.lxj.ext.postDelay
5+
import com.lxj.ext.startActivity
66

77
class WelcomeActivity : BaseActivity() {
88
override fun getLayoutId() = R.layout.activity_welcome

‎app/src/main/java/com/lxj/androidktxdemo/blibli/BlibliFragment.kt‎

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
package com.lxj.androidktxdemo.blibli
22

33
import android.widget.TextView
4-
import androidx.core.graphics.ColorUtils
5-
import com.lxj.androidktx.core.bindData
6-
import com.lxj.androidktx.core.vertical
4+
import com.lxj.ext.bindData
5+
import com.lxj.ext.vertical
76
import com.lxj.androidktxdemo.R
87
import com.lxj.androidktxdemo.fragment.BaseFragment
98
import kotlinx.android.synthetic.main.fragment_blibli.*

0 commit comments

Comments
 (0)