Skip to content

Commit a50ebb7

Browse files
committed
优化部分界面
1 parent 877a48e commit a50ebb7

13 files changed

Lines changed: 17 additions & 19 deletions

app/build.gradle.kts

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,8 @@ android {
1313
defaultConfig {
1414
minSdk = 23
1515
targetSdk = 34
16-
versionCode = 60
17-
versionName = "1.6.1"
16+
versionCode = 61
17+
versionName = "1.6.2"
1818
applicationId = "com.example.dora"
1919
// 21以上虚拟机天然支持multidex
2020
multiDexEnabled = true
1.22 MB
Loading
-268 KB
Binary file not shown.

dview/src/main/java/com/example/dview/ui/IndicatorViewActivity.kt

Lines changed: 10 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,8 @@ package com.example.dview.ui
22

33
import android.content.Intent
44
import android.os.Bundle
5-
import android.view.Gravity
65
import android.view.ViewGroup
7-
import android.widget.TextView
6+
import android.widget.ImageView
87
import androidx.recyclerview.widget.RecyclerView
98
import androidx.viewpager2.widget.ViewPager2
109
import com.alibaba.android.arouter.facade.annotation.Route
@@ -32,22 +31,21 @@ class IndicatorViewActivity : BaseActivity<ActivityIndicatorViewBinding>() {
3231
}
3332

3433
override fun initData(savedInstanceState: Bundle?, binding: ActivityIndicatorViewBinding) {
35-
val items = listOf("Page 1", "Page 2", "Page 3", "Page 4", "Page 5")
36-
binding.viewPager.adapter = object : RecyclerView.Adapter<TextVH>() {
37-
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): TextVH {
38-
val tv = TextView(parent.context).apply {
39-
textSize = 24f
40-
gravity = Gravity.CENTER
34+
val items = listOf(R.drawable.by_molly_brett1, R.drawable.by_molly_brett2,
35+
R.drawable.by_molly_brett3, R.drawable.by_molly_brett4)
36+
binding.viewPager.adapter = object : RecyclerView.Adapter<ImageVH>() {
37+
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): ImageVH {
38+
val iv = ImageView(parent.context).apply {
4139
layoutParams = ViewGroup.LayoutParams(
4240
ViewGroup.LayoutParams.MATCH_PARENT,
4341
ViewGroup.LayoutParams.MATCH_PARENT
4442
)
4543
}
46-
return TextVH(tv)
44+
return ImageVH(iv)
4745
}
4846
override fun getItemCount() = items.size
49-
override fun onBindViewHolder(holder: TextVH, position: Int) {
50-
holder.textView.text = items[position]
47+
override fun onBindViewHolder(holder: ImageVH, position: Int) {
48+
holder.imageView.setImageResource(items[position])
5149
}
5250
}
5351

@@ -84,5 +82,5 @@ class IndicatorViewActivity : BaseActivity<ActivityIndicatorViewBinding>() {
8482
})
8583
}
8684

87-
class TextVH(val textView: TextView) : RecyclerView.ViewHolder(textView)
85+
class ImageVH(val imageView: ImageView) : RecyclerView.ViewHolder(imageView)
8886
}

dview/src/main/java/com/example/dview/ui/PinchZoomLayoutActivity.kt

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,8 @@ import dora.widget.DoraPinchZoomLayout
2323
class PinchZoomLayoutActivity : BaseActivity<ActivityPinchZoomLayoutBinding>() {
2424

2525
val pages: IntArray = intArrayOf(
26-
R.drawable.qixi1,
27-
R.drawable.qixi2,
28-
R.drawable.qixi3)
26+
R.drawable.by_ren_hangs_photograph_depicting1,
27+
R.drawable.by_ren_hangs_photograph_depicting2)
2928

3029
override fun getLayoutId(): Int {
3130
return R.layout.activity_pinch_zoom_layout

dview/src/main/java/com/example/dview/ui/SideBarActivity.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ class SideBarActivity : BaseActivity<ActivitySideBarBinding>() {
5353
.setSelectedBgColor(Color.parseColor("#ffffff"))
5454
.setUnSelectBgColor(Color.parseColor("#eeeeee"))
5555
.setTextXOffset(DensityUtils.dp2px(this, 12f).toFloat())
56-
.setTextSize(DensityUtils.sp2px(this, 18f).toFloat())
56+
.setTextSize(DensityUtils.sp2px(this, 15f).toFloat())
5757
.setHeight(DensityUtils.dp2px(this, 30f))
5858
.build()
5959
val content: ArrayList<String> = ArrayList()
1.47 MB
Loading
1.19 MB
Loading
1.65 MB
Loading
1.36 MB
Loading

0 commit comments

Comments
 (0)