Skip to content

Commit

Permalink
* Downgraded compose version to 1.3.1
Browse files Browse the repository at this point in the history
  • Loading branch information
iZakirSheikh committed Jan 22, 2023
1 parent aa6297b commit f2fe2bc
Show file tree
Hide file tree
Showing 5 changed files with 11 additions and 46 deletions.
2 changes: 1 addition & 1 deletion build.gradle
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
buildscript {
ext {
compose_version = '1.4.0-alpha04'
compose_version = '1.3.1'
kotlin_version = '1.8.0'
compiler_v = "1.4.0"
}
Expand Down
6 changes: 3 additions & 3 deletions compose-ui/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -46,9 +46,9 @@ android {

dependencies {
implementation project(path: ':core-ktx')
implementation "androidx.compose.foundation:foundation-layout:$compose_version"
implementation "androidx.compose.ui:ui:$compose_version"
implementation "androidx.compose.material:material:$compose_version"
compileOnly "androidx.compose.foundation:foundation-layout:$compose_version"
compileOnly "androidx.compose.ui:ui:$compose_version"
compileOnly "androidx.compose.material:material:$compose_version"

// currently required for BottomSheetDialog
implementation 'com.google.android.material:material:1.7.0'
Expand Down
44 changes: 4 additions & 40 deletions compose-ui/src/main/java/com/primex/ui/Extension.kt
Original file line number Diff line number Diff line change
@@ -1,63 +1,26 @@
package com.primex.ui

import androidx.compose.runtime.Composable
import androidx.compose.animation.Crossfade
import androidx.compose.animation.animateColorAsState
import androidx.compose.animation.animateContentSize

import androidx.compose.animation.*
import androidx.compose.animation.core.animateFloatAsState
import androidx.compose.animation.core.tween
import androidx.compose.foundation.BorderStroke
import androidx.compose.foundation.background
import androidx.compose.foundation.interaction.MutableInteractionSource
import androidx.compose.foundation.layout.*
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.foundation.shape.ZeroCornerSize
import androidx.compose.foundation.text.KeyboardActions
import androidx.compose.foundation.text.KeyboardOptions
import androidx.compose.material.*
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.Close
import androidx.compose.material.icons.filled.Search
import androidx.compose.runtime.*
import androidx.compose.ui.Alignment
import androidx.compose.ui.ExperimentalComposeUiApi
import androidx.compose.ui.Modifier
import androidx.compose.ui.draw.scale
import androidx.compose.ui.focus.FocusRequester
import androidx.compose.ui.focus.focusRequester
import androidx.compose.ui.graphics.*
import androidx.compose.ui.graphics.painter.Painter
import androidx.compose.ui.graphics.vector.ImageVector
import androidx.compose.ui.platform.LocalDensity
import androidx.compose.ui.text.AnnotatedString
import androidx.compose.ui.text.TextStyle
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.input.TextFieldValue
import androidx.compose.ui.text.input.VisualTransformation
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.*


import androidx.annotation.DrawableRes
import androidx.annotation.RawRes
import androidx.compose.animation.*
import androidx.compose.animation.core.MutableTransitionState
import androidx.compose.animation.core.animateFloatAsState
import androidx.compose.animation.core.tween
import androidx.compose.foundation.layout.*
import androidx.compose.foundation.shape.CornerSize
import androidx.compose.material.*
import androidx.compose.runtime.*
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.graphics.Shape
import androidx.compose.ui.unit.Dp
import androidx.compose.ui.unit.TextUnit
import androidx.compose.ui.unit.dp
import androidx.compose.ui.window.DialogProperties
import com.primex.ui.Label
import com.primex.ui.Placeholder
import com.primex.core.Result
import com.primex.ui.dialog.BottomSheetDialogProperties

@NonRestartableComposable
Expand Down Expand Up @@ -658,6 +621,7 @@ inline fun Dialog(


@Composable
@ExperimentalComposeUiApi
inline fun BottomSheetDialog(
expanded: Boolean,
noinline onDismissRequest: () -> Unit,
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -251,8 +251,9 @@ private val BlackScrimmed: (Color) -> Color = { original ->
* @param properties [BottomSheetDialogProperties] for further customization of this dialog's behavior.
* @param content The content to be displayed inside the dialog.
*/
@OptIn(ExperimentalComposeUiApi::class)

@Composable
@ExperimentalComposeUiApi
fun BottomSheetDialog(
onDismissRequest: () -> Unit,
properties: BottomSheetDialogProperties = BottomSheetDialogProperties(),
Expand Down
2 changes: 1 addition & 1 deletion core-ktx/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ android {

dependencies {
implementation 'androidx.core:core:1.9.0'
implementation "androidx.compose.foundation:foundation:$compose_version"
compileOnly "androidx.compose.foundation:foundation:$compose_version"
//compileOnly "androidx.compose.ui:ui:$compose_version"
}

Expand Down

0 comments on commit f2fe2bc

Please sign in to comment.