Skip to content

Commit 019b7d4

Browse files
rockarocka
committed
Remove wildcard imports
1 parent 90cf96e commit 019b7d4

20 files changed

+150
-37
lines changed

‎app/src/main/java/org/fcitx/fcitx5/android/input/bar/ui/idle/InlineSuggestionsUi.kt

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,22 @@ import com.google.android.flexbox.FlexWrap
1717
import com.google.android.flexbox.FlexboxLayout
1818
import com.google.android.flexbox.JustifyContent
1919
import splitties.dimensions.dp
20-
import splitties.views.dsl.constraintlayout.*
21-
import splitties.views.dsl.core.*
20+
import splitties.views.dsl.constraintlayout.before
21+
import splitties.views.dsl.constraintlayout.centerOn
22+
import splitties.views.dsl.constraintlayout.centerVertically
23+
import splitties.views.dsl.constraintlayout.constraintLayout
24+
import splitties.views.dsl.constraintlayout.endOfParent
25+
import splitties.views.dsl.constraintlayout.lParams
26+
import splitties.views.dsl.constraintlayout.matchConstraints
27+
import splitties.views.dsl.constraintlayout.startOfParent
28+
import splitties.views.dsl.core.Ui
29+
import splitties.views.dsl.core.add
30+
import splitties.views.dsl.core.frameLayout
31+
import splitties.views.dsl.core.horizontalMargin
32+
import splitties.views.dsl.core.lParams
33+
import splitties.views.dsl.core.matchParent
34+
import splitties.views.dsl.core.view
35+
import splitties.views.dsl.core.wrapContent
2236

2337
class InlineSuggestionsUi(override val ctx: Context) : Ui {
2438

‎app/src/main/java/org/fcitx/fcitx5/android/input/candidates/expanded/ExpandedCandidateLayout.kt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,13 @@ import org.fcitx.fcitx5.android.data.theme.Theme
1212
import org.fcitx.fcitx5.android.data.theme.ThemeManager
1313
import org.fcitx.fcitx5.android.input.keyboard.*
1414
import splitties.views.backgroundColor
15-
import splitties.views.dsl.constraintlayout.*
15+
import splitties.views.dsl.constraintlayout.bottomOfParent
16+
import splitties.views.dsl.constraintlayout.lParams
17+
import splitties.views.dsl.constraintlayout.leftOfParent
18+
import splitties.views.dsl.constraintlayout.leftToRightOf
19+
import splitties.views.dsl.constraintlayout.rightOfParent
20+
import splitties.views.dsl.constraintlayout.rightToLeftOf
21+
import splitties.views.dsl.constraintlayout.topOfParent
1622
import splitties.views.dsl.core.add
1723
import splitties.views.dsl.recyclerview.recyclerView
1824
import splitties.views.imageResource

‎app/src/main/java/org/fcitx/fcitx5/android/input/clipboard/ClipboardUi.kt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,12 @@ import splitties.dimensions.dp
1818
import splitties.views.backgroundColor
1919
import splitties.views.dsl.coordinatorlayout.coordinatorLayout
2020
import splitties.views.dsl.coordinatorlayout.defaultLParams
21-
import splitties.views.dsl.core.*
21+
import splitties.views.dsl.core.Ui
22+
import splitties.views.dsl.core.add
23+
import splitties.views.dsl.core.horizontalLayout
24+
import splitties.views.dsl.core.lParams
25+
import splitties.views.dsl.core.matchParent
26+
import splitties.views.dsl.core.view
2227
import splitties.views.dsl.recyclerview.recyclerView
2328
import timber.log.Timber
2429

‎app/src/main/java/org/fcitx/fcitx5/android/input/editorinfo/EditorInfoUi.kt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,11 @@ import android.content.Context
88
import android.widget.TableLayout
99
import android.widget.TableRow
1010
import org.fcitx.fcitx5.android.data.theme.Theme
11-
import splitties.views.dsl.core.*
11+
import splitties.views.dsl.core.Ui
12+
import splitties.views.dsl.core.textView
13+
import splitties.views.dsl.core.view
14+
import splitties.views.dsl.core.wrapInHorizontalScrollView
15+
import splitties.views.dsl.core.wrapInScrollView
1216
import splitties.views.setPaddingDp
1317

1418
class EditorInfoUi(override val ctx: Context, private val theme: Theme) : Ui {

‎app/src/main/java/org/fcitx/fcitx5/android/input/picker/PickerLayout.kt

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,13 @@ import org.fcitx.fcitx5.android.R
1212
import org.fcitx.fcitx5.android.data.theme.Theme
1313
import org.fcitx.fcitx5.android.input.keyboard.*
1414
import splitties.dimensions.dp
15-
import splitties.views.dsl.constraintlayout.*
15+
import splitties.views.dsl.constraintlayout.above
16+
import splitties.views.dsl.constraintlayout.below
17+
import splitties.views.dsl.constraintlayout.bottomOfParent
18+
import splitties.views.dsl.constraintlayout.centerHorizontally
19+
import splitties.views.dsl.constraintlayout.lParams
20+
import splitties.views.dsl.constraintlayout.matchConstraints
21+
import splitties.views.dsl.constraintlayout.topOfParent
1622
import splitties.views.dsl.core.add
1723
import splitties.views.dsl.core.view
1824
import splitties.views.imageResource

‎app/src/main/java/org/fcitx/fcitx5/android/input/picker/PickerPaginationUi.kt

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,15 @@ import androidx.core.view.updateLayoutParams
1111
import org.fcitx.fcitx5.android.data.theme.Theme
1212
import org.fcitx.fcitx5.android.utils.alpha
1313
import splitties.views.backgroundColor
14-
import splitties.views.dsl.constraintlayout.*
15-
import splitties.views.dsl.core.*
14+
import splitties.views.dsl.constraintlayout.centerVertically
15+
import splitties.views.dsl.constraintlayout.constraintLayout
16+
import splitties.views.dsl.constraintlayout.lParams
17+
import splitties.views.dsl.constraintlayout.matchConstraints
18+
import splitties.views.dsl.constraintlayout.startOfParent
19+
import splitties.views.dsl.core.Ui
20+
import splitties.views.dsl.core.add
21+
import splitties.views.dsl.core.matchParent
22+
import splitties.views.dsl.core.view
1623
import kotlin.math.roundToInt
1724

1825
class PickerPaginationUi(override val ctx: Context, val theme: Theme) : Ui {
@@ -52,7 +59,7 @@ class PickerPaginationUi(override val ctx: Context, val theme: Theme) : Ui {
5259

5360
fun updateScrollProgress(current: Int, progress: Float) {
5461
highlight.updateLayoutParams<ConstraintLayout.LayoutParams> {
55-
startMargin = ((current + progress) * highlight.width).roundToInt()
62+
marginStart = ((current + progress) * highlight.width).roundToInt()
5663
}
5764
}
5865
}

‎app/src/main/java/org/fcitx/fcitx5/android/input/preedit/PreeditUi.kt

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@ import android.text.Spanned
1212
import android.text.SpannedString
1313
import android.text.style.DynamicDrawableSpan
1414
import android.view.View
15-
import android.view.View.*
1615
import android.widget.TextView
1716
import androidx.annotation.ColorInt
1817
import androidx.core.text.buildSpannedString
@@ -21,7 +20,11 @@ import org.fcitx.fcitx5.android.data.theme.Theme
2120
import org.fcitx.fcitx5.android.data.theme.ThemeManager
2221
import splitties.dimensions.dp
2322
import splitties.views.backgroundColor
24-
import splitties.views.dsl.core.*
23+
import splitties.views.dsl.core.Ui
24+
import splitties.views.dsl.core.add
25+
import splitties.views.dsl.core.lParams
26+
import splitties.views.dsl.core.textView
27+
import splitties.views.dsl.core.verticalLayout
2528
import splitties.views.horizontalPadding
2629

2730
class PreeditUi(override val ctx: Context, private val theme: Theme) : Ui {
@@ -63,17 +66,17 @@ class PreeditUi(override val ctx: Context, private val theme: Theme) : Ui {
6366

6467
override val root: View = verticalLayout {
6568
alpha = 0.8f
66-
visibility = INVISIBLE
69+
visibility = View.INVISIBLE
6770
add(upView, lParams())
6871
add(downView, lParams())
6972
}
7073

7174
private fun updateTextView(view: TextView, str: CharSequence, visible: Boolean) = view.run {
7275
if (visible) {
7376
text = str
74-
if (visibility == GONE) visibility = VISIBLE
75-
} else if (visibility != GONE) {
76-
visibility = GONE
77+
if (visibility == View.GONE) visibility = View.VISIBLE
78+
} else if (visibility != View.GONE) {
79+
visibility = View.GONE
7780
}
7881
}
7982

‎app/src/main/java/org/fcitx/fcitx5/android/ui/common/BaseDynamicListUi.kt

Lines changed: 21 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -4,15 +4,20 @@
44
*/
55
package org.fcitx.fcitx5.android.ui.common
66

7+
import android.annotation.SuppressLint
8+
import android.app.AlertDialog
79
import android.content.Context
810
import android.view.View
911
import android.view.ViewGroup
1012
import android.widget.CheckBox
1113
import android.widget.ImageButton
1214
import androidx.activity.OnBackPressedDispatcher
13-
import androidx.appcompat.app.AlertDialog
1415
import androidx.coordinatorlayout.widget.CoordinatorLayout
15-
import androidx.core.view.*
16+
import androidx.core.view.ViewCompat
17+
import androidx.core.view.WindowInsetsCompat
18+
import androidx.core.view.doOnAttach
19+
import androidx.core.view.isVisible
20+
import androidx.core.view.updateLayoutParams
1621
import androidx.core.widget.addTextChangedListener
1722
import androidx.recyclerview.widget.ItemTouchHelper
1823
import arrow.core.identity
@@ -26,10 +31,21 @@ import splitties.resources.drawable
2631
import splitties.resources.styledColor
2732
import splitties.views.backgroundColor
2833
import splitties.views.bottomPadding
29-
import splitties.views.dsl.constraintlayout.*
34+
import splitties.views.dsl.constraintlayout.bottomOfParent
35+
import splitties.views.dsl.constraintlayout.constraintLayout
36+
import splitties.views.dsl.constraintlayout.lParams
37+
import splitties.views.dsl.constraintlayout.leftOfParent
38+
import splitties.views.dsl.constraintlayout.rightOfParent
39+
import splitties.views.dsl.constraintlayout.topOfParent
3040
import splitties.views.dsl.coordinatorlayout.coordinatorLayout
3141
import splitties.views.dsl.coordinatorlayout.defaultLParams
32-
import splitties.views.dsl.core.*
42+
import splitties.views.dsl.core.Ui
43+
import splitties.views.dsl.core.add
44+
import splitties.views.dsl.core.editText
45+
import splitties.views.dsl.core.margin
46+
import splitties.views.dsl.core.matchParent
47+
import splitties.views.dsl.core.view
48+
import splitties.views.dsl.core.wrapContent
3349
import splitties.views.dsl.recyclerview.recyclerView
3450
import splitties.views.gravityEndBottom
3551
import splitties.views.imageDrawable
@@ -294,6 +310,7 @@ abstract class BaseDynamicListUi<T>(
294310
gravity = gravityEndBottom
295311
margin = dp(16)
296312
behavior = object : HideBottomViewOnScrollBehavior<FloatingActionButton>() {
313+
@SuppressLint("RestrictedApi")
297314
override fun layoutDependsOn(
298315
parent: CoordinatorLayout,
299316
child: FloatingActionButton,

‎app/src/main/java/org/fcitx/fcitx5/android/ui/common/DynamicListAdapter.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ import androidx.annotation.CallSuper
1515
import androidx.recyclerview.widget.ItemTouchHelper
1616
import androidx.recyclerview.widget.RecyclerView
1717
import org.fcitx.fcitx5.android.ui.main.MainViewModel
18-
import java.util.*
18+
import java.util.Collections
1919

2020
abstract class DynamicListAdapter<T>(
2121
initialEntries: List<T>,

‎app/src/main/java/org/fcitx/fcitx5/android/ui/common/Preset.kt

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,13 @@ import kotlinx.coroutines.delay
1616
import kotlinx.coroutines.launch
1717
import org.fcitx.fcitx5.android.R
1818
import splitties.dimensions.dp
19-
import splitties.views.dsl.core.*
19+
import splitties.views.dsl.core.add
20+
import splitties.views.dsl.core.horizontalMargin
21+
import splitties.views.dsl.core.lParams
22+
import splitties.views.dsl.core.matchParent
2023
import splitties.views.dsl.core.styles.AndroidStyles
24+
import splitties.views.dsl.core.verticalLayout
25+
import splitties.views.dsl.core.verticalMargin
2126

2227
@Suppress("FunctionName")
2328
fun <T> Context.DynamicListUi(

0 commit comments

Comments
 (0)
pFad - Phonifier reborn

Pfad - The Proxy pFad of © 2024 Garber Painting. All rights reserved.

Note: This service is not intended for secure transactions such as banking, social media, email, or purchasing. Use at your own risk. We assume no liability whatsoever for broken pages.


Alternative Proxies:

Alternative Proxy

pFad Proxy

pFad v3 Proxy

pFad v4 Proxy