Skip to content

Commit b9a812e

Browse files
PonchalePonchale
committed
revert commit
1 parent 84f5d4d commit b9a812e

File tree

8 files changed

+43
-45
lines changed

8 files changed

+43
-45
lines changed

‎app/build.gradle

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ import static org.gradle.api.tasks.testing.TestResult.ResultType
2222
apply from: 'benchmark.gradle'
2323

2424
android {
25-
compileSdkVersion Config.compileSdkVersion
2625

2726
project.maybeConfigForJetpackBenchmark(it)
2827
if (project.hasProperty("testBuildType")) {

‎app/src/main/java/org/midorinext/android/compose/tabstray/TabGridItem.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@ import androidx.compose.material.Icon
3535
import androidx.compose.material.IconButton
3636
import androidx.compose.material.Text
3737
import androidx.compose.material.rememberDismissState
38-
import androidx.compose.material.ripple
38+
import androidx.compose.material.ripple.rememberRipple
3939
import androidx.compose.runtime.Composable
4040
import androidx.compose.runtime.remember
4141
import androidx.compose.ui.Alignment
@@ -148,7 +148,7 @@ fun TabGridItem(
148148
Modifier.clickable(
149149
enabled = shouldClickListen,
150150
interactionSource = interactionSource,
151-
indication = ripple(
151+
indication = rememberRipple(
152152
color = clickableColor(),
153153
),
154154
onClick = { onClick(tab) },
@@ -157,7 +157,7 @@ fun TabGridItem(
157157
Modifier.combinedClickable(
158158
enabled = shouldClickListen,
159159
interactionSource = interactionSource,
160-
indication = ripple(
160+
indication = rememberRipple(
161161
color = clickableColor(),
162162
),
163163
onLongClick = { onLongClick(tab) },

‎app/src/main/java/org/midorinext/android/compose/tabstray/TabListItem.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ import androidx.compose.material.Icon
2828
import androidx.compose.material.IconButton
2929
import androidx.compose.material.Text
3030
import androidx.compose.material.rememberDismissState
31-
import androidx.compose.material.ripple
31+
import androidx.compose.material.ripple.rememberRipple
3232
import androidx.compose.runtime.Composable
3333
import androidx.compose.runtime.remember
3434
import androidx.compose.ui.Alignment
@@ -114,7 +114,7 @@ fun TabListItem(
114114
Modifier.clickable(
115115
enabled = shouldClickListen,
116116
interactionSource = interactionSource,
117-
indication = ripple(
117+
indication = rememberRipple(
118118
color = clickableColor(),
119119
),
120120
onClick = { onClick(tab) },
@@ -123,7 +123,7 @@ fun TabListItem(
123123
Modifier.combinedClickable(
124124
enabled = shouldClickListen,
125125
interactionSource = interactionSource,
126-
indication = ripple(
126+
indication = rememberRipple(
127127
color = clickableColor(),
128128
),
129129
onLongClick = { onLongClick(tab) },

‎app/src/main/java/org/midorinext/android/library/LibrarySiteItem.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ import androidx.compose.foundation.shape.CircleShape
1919
import androidx.compose.material.Icon
2020
import androidx.compose.material.IconButton
2121
import androidx.compose.material.Text
22-
import androidx.compose.material.ripple
22+
import androidx.compose.material.ripple.rememberRipple
2323
import androidx.compose.runtime.*
2424
import androidx.compose.runtime.saveable.rememberSaveable
2525
import androidx.compose.ui.Alignment
@@ -86,7 +86,7 @@ fun <T> LibrarySiteItem(
8686
}
8787
},
8888
interactionSource = remember { MutableInteractionSource() },
89-
indication = ripple(color = WaterfoxTheme.colors.textSecondary),
89+
indication = rememberRipple(color = MidoriTheme.colors.textSecondary),
9090
)
9191
.then(modifier),
9292
verticalAlignment = Alignment.CenterVertically,

‎app/src/main/java/org/midorinext/android/tabstray/TabsTray.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ fun TabsTray(
187187
HorizontalPager(
188188
modifier = Modifier.fillMaxSize(),
189189
state = pagerState,
190-
beyondViewportPageCount = 2,
190+
beyondBoundsPageCount = 2,
191191
userScrollEnabled = false,
192192
) { position ->
193193
when (Page.positionToPage(position)) {

‎app/src/main/java/org/midorinext/android/tabstray/TabsTrayBanner.kt

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,14 @@ import androidx.compose.foundation.layout.fillMaxHeight
1414
import androidx.compose.foundation.layout.fillMaxWidth
1515
import androidx.compose.foundation.layout.height
1616
import androidx.compose.foundation.layout.size
17-
import androidx.compose.material.ExperimentalMaterialApi
1817
import androidx.compose.material.Icon
1918
import androidx.compose.material.IconButton
20-
import androidx.compose.material.LocalRippleConfiguration
21-
import androidx.compose.material.RippleConfiguration
2219
import androidx.compose.material.Tab
2320
import androidx.compose.material.TabRow
2421
import androidx.compose.material.Text
22+
import androidx.compose.material.ripple.LocalRippleTheme
2523
import androidx.compose.material.ripple.RippleAlpha
24+
import androidx.compose.material.ripple.RippleTheme
2625
import androidx.compose.runtime.Composable
2726
import androidx.compose.runtime.CompositionLocalProvider
2827
import androidx.compose.runtime.getValue
@@ -42,6 +41,7 @@ import androidx.compose.ui.unit.dp
4241
import mozilla.components.browser.state.state.ContentState
4342
import mozilla.components.browser.state.state.TabSessionState
4443
import mozilla.components.lib.state.ext.observeAsComposableState
44+
import mozilla.components.ui.tabcounter.TabCounter
4545
import org.midorinext.android.R
4646
import org.midorinext.android.compose.Banner
4747
import org.midorinext.android.compose.BottomSheetHandle
@@ -177,7 +177,6 @@ fun TabsTrayBanner(
177177
}
178178
}
179179

180-
@OptIn(ExperimentalMaterialApi::class)
181180
@Suppress("LongMethod")
182181
@Composable
183182
private fun SingleSelectBanner(
@@ -209,7 +208,7 @@ private fun SingleSelectBanner(
209208
.height(80.dp),
210209
horizontalArrangement = Arrangement.spacedBy(16.dp),
211210
) {
212-
CompositionLocalProvider(LocalRippleConfiguration provides DisabledRippleConfiguration) {
211+
CompositionLocalProvider(LocalRippleTheme provides DisabledRippleTheme) {
213212
TabRow(
214213
selectedTabIndex = selectedPage.ordinal,
215214
modifier = Modifier.fillMaxWidth(MAX_WIDTH_TAB_ROW_PERCENT),
@@ -468,12 +467,13 @@ private fun TabsTrayBannerPreviewRoot(
468467
}
469468
}
470469

471-
@OptIn(ExperimentalMaterialApi::class)
472-
private val DisabledRippleConfiguration =
473-
RippleConfiguration(
474-
color = Color.Unspecified,
475-
rippleAlpha = RippleAlpha(0.0f, 0.0f, 0.0f, 0.0f),
476-
)
470+
private object DisabledRippleTheme : RippleTheme {
471+
@Composable
472+
override fun defaultColor() = Color.Unspecified
473+
474+
@Composable
475+
override fun rippleAlpha(): RippleAlpha = RippleAlpha(0.0f, 0.0f, 0.0f, 0.0f)
476+
}
477477

478478
private fun generateFakeTabsList(tabCount: Int = 10, isPrivate: Boolean = false): List<TabSessionState> =
479479
List(tabCount) { index ->

‎buildSrc/src/main/java/AndroidComponents.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@
33
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
44

55
object AndroidComponents {
6-
const val VERSION = "130.0.1"
6+
const val VERSION = "127.0"
77
}

‎buildSrc/src/main/java/Dependencies.kt

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -3,43 +3,42 @@
33
* file, You can obtain one at http://mozilla.org/MPL/2.0/. */
44

55
object Versions {
6-
const val kotlin = "1.9.24"
7-
const val coroutines = "1.8.1"
6+
const val kotlin = "1.9.22"
7+
const val coroutines = "1.7.3"
88

99
// These versions are linked: lint should be X+23.Y.Z of gradle_plugin version, according to:
1010
// https://github.com/alexjlockwood/android-lint-checks-demo/blob/0245fc027463137b1b4afb97c5295d60dce998b6/dependencies.gradle#L3
11-
const val android_gradle_plugin = "8.4.0"
12-
const val android_lint_api = "31.4.0"
11+
const val android_gradle_plugin = "8.2.2"
12+
const val android_lint_api = "31.2.2"
1313

14-
const val sentry = "7.9.0"
15-
const val leakcanary = "2.14"
14+
const val sentry = "6.6.0"
15+
const val leakcanary = "2.13"
1616
const val osslicenses_plugin = "0.10.6"
1717
const val detekt = "1.23.4"
1818
const val jna = "5.12.1"
1919

20-
const val androidx_compose = "1.7.1"
21-
const val androidx_compose_paging = "3.3.0"
22-
const val androidx_compose_compiler = "1.5.14"
23-
const val androidx_appcompat = "1.7.0"
24-
const val androidx_benchmark = "1.2.4"
20+
const val androidx_compose = "1.5.4"
21+
const val androidx_compose_paging = "1.0.0-alpha20"
22+
const val androidx_compose_compiler = "1.5.8"
23+
const val androidx_appcompat = "1.6.1"
24+
const val androidx_benchmark = "1.2.2"
2525
const val androidx_biometric = "1.1.0"
26-
const val androidx_coordinator_layout = "1.2.0"
27-
const val androidx_constraint_layout = "2.1.4"
28-
const val androidx_preference = "1.2.1"
26+
const val androidx_coordinator_layout = "1.1.0"
27+
const val androidx_constraint_layout = "2.0.4"
28+
const val androidx_preference = "1.1.1"
2929
const val androidx_legacy = "1.0.0"
30-
const val androidx_annotation = "1.8.0"
31-
const val androidx_lifecycle = "2.8.3"
30+
const val androidx_annotation = "1.5.0"
31+
const val androidx_lifecycle = "2.7.0"
3232
const val androidx_fragment = "1.6.2"
33-
const val androidx_navigation = "2.7.7"
33+
const val androidx_navigation = "2.5.3"
3434
const val androidx_recyclerview = "1.3.2"
35-
const val androidx_core = "1.13.0"
36-
const val androidx_paging = "3.3.0"
35+
const val androidx_core = "1.12.0"
36+
const val androidx_paging = "3.2.1"
3737
const val androidx_transition = "1.4.1"
38-
const val androidx_work = "2.9.0"
39-
const val androidx_datastore = "1.1.1"
40-
const val google_material = "1.9.0"
38+
const val androidx_work = "2.7.1"
39+
const val androidx_datastore = "1.0.0"
40+
const val google_material = "1.2.1"
4141
const val accompanist_drawablepainter = "0.30.1"
42-
const val coil = "2.4.0"
4342

4443
const val mozilla_android_components = AndroidComponents.VERSION
4544

0 commit comments

Comments
 (0)