Skip to content

Commit 9b6fa4d

Browse files
cgspinecgspine
committed
feat: Compose tip collect page.
1 parent c1b0760 commit 9b6fa4d

4 files changed

Lines changed: 146 additions & 2 deletions

File tree

‎plugin/src/main/java/com/qmuiteam/plugin/Dep.kt‎

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,13 +14,20 @@ object Dep {
1414
object QMUI {
1515
const val group = "com.qmuiteam"
1616
const val qmuiVer = "2.0.1"
17-
const val archVer = "2.0.1"
17+
const val archVer = "2.0.1_f_14"
1818
const val typeVer = "0.0.14"
1919
const val composeCoreVer = "0.0.1"
2020
const val composeVer = "0.0.1"
2121
const val photoVer = "0.0.1"
2222
}
2323

24+
object Coroutines {
25+
private const val version = "1.6.0"
26+
const val core = "org.jetbrains.kotlinx:kotlinx-coroutines-core:$version"
27+
const val android = "org.jetbrains.kotlinx:kotlinx-coroutines-android:$version"
28+
const val test = "org.jetbrains.kotlinx:kotlinx-coroutines-test:$version"
29+
}
30+
2431
object AndroidX {
2532
val appcompat = "androidx.appcompat:appcompat:1.4.0"
2633
val annotation = "androidx.annotation:annotation:1.3.0"
@@ -38,6 +45,7 @@ object Dep {
3845
val material = "androidx.compose.material:material:$version"
3946
val compiler = "androidx.compose.compiler:compiler:$version"
4047
val activity = "androidx.activity:activity-compose:1.4.0"
48+
val constraintlayout = "androidx.constraintlayout:constraintlayout-compose:1.0.0"
4149

4250
val pager = "com.google.accompanist:accompanist-pager:0.24.0-alpha"
4351
}

‎qmuidemo/build.gradle.kts‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -76,8 +76,8 @@ dependencies {
7676
implementation(Dep.AndroidX.appcompat)
7777
implementation(Dep.AndroidX.annotation)
7878
implementation(Dep.MaterialDesign.material)
79-
8079
implementation(Dep.ButterKnife.butterknife)
80+
implementation(Dep.Compose.constraintlayout)
8181
kapt(Dep.ButterKnife.compiler)
8282
implementation(project(":lib"))
8383
implementation(project(":qmui"))

‎qmuidemo/src/main/java/com/qmuiteam/qmuidemo/fragment/lab/QDComposeTipFragment.kt‎

Lines changed: 134 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,134 @@
1+
package com.qmuiteam.qmuidemo.fragment.lab
2+
3+
import androidx.compose.foundation.background
4+
import androidx.compose.foundation.layout.*
5+
import androidx.compose.foundation.lazy.LazyColumn
6+
import androidx.compose.foundation.lazy.rememberLazyListState
7+
import androidx.compose.material.Text
8+
import androidx.compose.runtime.Composable
9+
import androidx.compose.ui.Modifier
10+
import androidx.compose.ui.graphics.Color
11+
import androidx.compose.ui.text.style.TextOverflow
12+
import androidx.compose.ui.unit.dp
13+
import androidx.compose.ui.unit.sp
14+
import androidx.constraintlayout.compose.ChainStyle
15+
import androidx.constraintlayout.compose.ConstraintLayout
16+
import androidx.constraintlayout.compose.Dimension
17+
import com.qmuiteam.compose.core.ui.QMUITopBarBackIconItem
18+
import com.qmuiteam.compose.core.ui.QMUITopBarTextItem
19+
import com.qmuiteam.compose.core.ui.QMUITopBarWithLazyScrollState
20+
import com.qmuiteam.photo.activity.QMUIPhotoPickerActivity
21+
import com.qmuiteam.qmui.arch.annotation.LatestVisitRecord
22+
import com.qmuiteam.qmuidemo.R
23+
import com.qmuiteam.qmuidemo.activity.QDPhotoPickerActivity
24+
import com.qmuiteam.qmuidemo.base.ComposeBaseFragment
25+
import com.qmuiteam.qmuidemo.lib.annotation.Widget
26+
27+
@Widget(name = "QMUI Compose Tip", iconRes = R.mipmap.icon_grid_in_progress)
28+
@LatestVisitRecord
29+
class QDComposeTipFragment : ComposeBaseFragment() {
30+
@Composable
31+
override fun PageContent() {
32+
Column(modifier = Modifier.fillMaxSize()) {
33+
val scrollState = rememberLazyListState()
34+
QMUITopBarWithLazyScrollState(
35+
scrollState = scrollState,
36+
title = "QMUIPhoto",
37+
leftItems = arrayListOf(
38+
QMUITopBarBackIconItem {
39+
popBackStack()
40+
}
41+
),
42+
rightItems = arrayListOf(
43+
QMUITopBarTextItem("Pick a Picture") {
44+
val activity = activity ?: return@QMUITopBarTextItem
45+
val intent = QMUIPhotoPickerActivity.intentOf(activity, QDPhotoPickerActivity::class.java)
46+
startActivity(intent)
47+
}
48+
)
49+
)
50+
LazyColumn(
51+
state = scrollState,
52+
modifier = Modifier
53+
.fillMaxWidth()
54+
.weight(1f)
55+
.background(Color.White)
56+
) {
57+
item {
58+
Column(
59+
modifier = Modifier
60+
.fillMaxWidth()
61+
.padding(12.dp)
62+
) {
63+
Text(
64+
text = "在 UI 开发过程中，经常会遇到如下一个需求：\n" +
65+
"假设一个布局是 【头像】【人名】【推荐信息】，正常用 LinearLayout 实现， " +
66+
"是没有任何问题的，但是要求在人名过长，整体内容会超过容器宽度时，" +
67+
"不要省略推荐信息，而是省略人名信息。",
68+
fontSize = 13.sp,
69+
modifier = Modifier.padding(vertical = 12.dp)
70+
)
71+
Row(
72+
modifier = Modifier.fillMaxWidth().height(100.dp)
73+
) {
74+
ConstraintLayout(
75+
modifier = Modifier
76+
.weight(1f)
77+
.fillMaxHeight()
78+
.background(Color.LightGray)
79+
) {
80+
val (one, two, three) = createRefs()
81+
createHorizontalChain(one, two, three, chainStyle = ChainStyle.Packed(0f))
82+
Text(
83+
"此处不压缩",
84+
color = Color.White,
85+
maxLines = 1,
86+
modifier = Modifier
87+
.background(Color.Red)
88+
.constrainAs(one) {
89+
top.linkTo(parent.top)
90+
bottom.linkTo(parent.bottom)
91+
start.linkTo(parent.start)
92+
end.linkTo(two.start)
93+
})
94+
Text(
95+
"此处如果内容有那么一点点过长，那就压缩省略压缩省略压缩省略",
96+
color = Color.White,
97+
maxLines = 1,
98+
overflow = TextOverflow.Ellipsis,
99+
modifier = Modifier
100+
.background(Color.Green)
101+
.constrainAs(two) {
102+
width = Dimension.preferredWrapContent
103+
top.linkTo(parent.top)
104+
bottom.linkTo(parent.bottom)
105+
start.linkTo(one.end)
106+
end.linkTo(three.start)
107+
})
108+
Text(
109+
"此处也不压缩",
110+
color = Color.White,
111+
maxLines = 1,
112+
modifier = Modifier
113+
.background(Color.Black)
114+
.constrainAs(three) {
115+
top.linkTo(parent.top)
116+
bottom.linkTo(parent.bottom)
117+
start.linkTo(two.end)
118+
end.linkTo(parent.end)
119+
})
120+
}
121+
Box(
122+
modifier = Modifier
123+
.fillMaxHeight()
124+
.width(50.dp)
125+
.background(Color.Blue)
126+
)
127+
}
128+
129+
}
130+
}
131+
}
132+
}
133+
}
134+
}

‎qmuidemo/src/main/java/com/qmuiteam/qmuidemo/manager/QDDataManager.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@
4444
import com.qmuiteam.qmuidemo.fragment.components.viewpager.QDViewPagerFragment;
4545
import com.qmuiteam.qmuidemo.fragment.lab.QDAnimationListViewFragment;
4646
import com.qmuiteam.qmuidemo.fragment.lab.QDArchTestFragment;
47+
import com.qmuiteam.qmuidemo.fragment.lab.QDComposeTipFragment;
4748
import com.qmuiteam.qmuidemo.fragment.lab.QDContinuousNestedScrollFragment;
4849
import com.qmuiteam.qmuidemo.fragment.lab.QDPhotoClipFragment;
4950
import com.qmuiteam.qmuidemo.fragment.lab.QDPhotoFragment;
@@ -147,6 +148,7 @@ private void initLabDesc() {
147148
mLabNames.add(QDArchTestFragment.class);
148149
mLabNames.add(QDWebViewFragment.class);
149150
mLabNames.add(QDSchemeFragment.class);
151+
mLabNames.add(QDComposeTipFragment.class);
150152
mLabNames.add(QDPhotoFragment.class);
151153
mLabNames.add(QDPhotoClipFragment.class);
152154
}

0 commit comments

Comments
 (0)