mirror of
https://github.com/anyproto/anytype-kotlin.git
synced 2025-06-08 05:47:05 +09:00
DROID-1434 Onboarding | Fix | Fixed text colors (#161)
This commit is contained in:
parent
0ea9c0b3db
commit
007b687fa9
5 changed files with 18 additions and 8 deletions
|
@ -24,6 +24,7 @@ import androidx.compose.ui.text.withStyle
|
|||
import androidx.compose.ui.tooling.preview.Preview
|
||||
import androidx.compose.ui.unit.dp
|
||||
import com.anytypeio.anytype.R
|
||||
import com.anytypeio.anytype.core_ui.ColorButtonInversion
|
||||
import com.anytypeio.anytype.core_ui.OnBoardingTextPrimaryColor
|
||||
import com.anytypeio.anytype.core_ui.OnBoardingTextSecondaryColor
|
||||
import com.anytypeio.anytype.core_ui.views.ButtonSize
|
||||
|
@ -145,7 +146,8 @@ fun SignButtons(
|
|||
modifier = Modifier
|
||||
.weight(1f)
|
||||
.fillMaxWidth()
|
||||
.padding(start = 6.dp, end = 32.dp)
|
||||
.padding(start = 6.dp, end = 32.dp),
|
||||
textColor = ColorButtonInversion
|
||||
)
|
||||
}
|
||||
}
|
||||
|
|
|
@ -23,6 +23,7 @@ import androidx.compose.ui.text.input.ImeAction
|
|||
import androidx.compose.ui.text.style.TextAlign
|
||||
import androidx.compose.ui.unit.dp
|
||||
import com.anytypeio.anytype.R
|
||||
import com.anytypeio.anytype.core_ui.ColorButtonRegular
|
||||
import com.anytypeio.anytype.core_ui.OnBoardingTextPrimaryColor
|
||||
import com.anytypeio.anytype.core_ui.foundation.noRippleClickable
|
||||
import com.anytypeio.anytype.core_ui.views.ButtonSize
|
||||
|
@ -147,7 +148,8 @@ fun RecoveryScreen(
|
|||
size = ButtonSize.Large,
|
||||
modifier = Modifier
|
||||
.fillMaxWidth()
|
||||
.padding(start = 18.dp, end = 18.dp, bottom = 24.dp)
|
||||
.padding(start = 18.dp, end = 18.dp, bottom = 24.dp),
|
||||
textColor = ColorButtonRegular
|
||||
)
|
||||
}
|
||||
}
|
||||
|
|
|
@ -25,6 +25,7 @@ import androidx.compose.ui.unit.dp
|
|||
import androidx.lifecycle.compose.collectAsStateWithLifecycle
|
||||
import com.anytypeio.anytype.R
|
||||
import com.anytypeio.anytype.core_ui.ColorBackgroundField
|
||||
import com.anytypeio.anytype.core_ui.ColorButtonRegular
|
||||
import com.anytypeio.anytype.core_ui.OnBoardingTextPrimaryColor
|
||||
import com.anytypeio.anytype.core_ui.OnBoardingTextSecondaryColor
|
||||
import com.anytypeio.anytype.core_ui.extensions.conditional
|
||||
|
@ -125,7 +126,9 @@ fun MnemonicButtons(
|
|||
),
|
||||
onClick = {
|
||||
openSoulCreation.invoke()
|
||||
}, size = ButtonSize.Large
|
||||
},
|
||||
size = ButtonSize.Large,
|
||||
textColor = ColorButtonRegular
|
||||
)
|
||||
}
|
||||
}
|
||||
|
@ -199,7 +202,9 @@ fun MnemonicPhrase(
|
|||
.padding(bottom = 12.dp),
|
||||
onClick = {
|
||||
copyMnemonicToClipboard.invoke(state.mnemonicPhrase)
|
||||
}, size = ButtonSize.SmallSecondary
|
||||
},
|
||||
size = ButtonSize.SmallSecondary,
|
||||
textColor = ColorButtonRegular
|
||||
)
|
||||
}
|
||||
}
|
||||
|
|
|
@ -17,6 +17,8 @@ val ColorButtonSecondaryPressed = Color(0xFF1F1E1C)
|
|||
val ColorButtonSecondaryBorder = Color(0xFF525148)
|
||||
val ColorButtonSecondaryBorderPressed = Color(0xFF525148)
|
||||
val ColorButtonSecondaryText = Color(0xFF7B7A72)
|
||||
val ColorButtonRegular = Color(0xFFCBC9BD)
|
||||
val ColorButtonInversion= Color(0xFFFFFFFF)
|
||||
|
||||
val ColorPagerIndicator = Color(0xFF3A3935)
|
||||
val ColorPagerIndicatorCurrent = Color(0xFFF3F2EC)
|
||||
|
|
|
@ -14,7 +14,6 @@ import androidx.compose.runtime.CompositionLocalProvider
|
|||
import androidx.compose.runtime.remember
|
||||
import androidx.compose.ui.Modifier
|
||||
import androidx.compose.ui.graphics.Color
|
||||
import androidx.compose.ui.res.colorResource
|
||||
import androidx.compose.ui.unit.dp
|
||||
import com.anytypeio.anytype.core_ui.ColorButtonPrimaryActive
|
||||
import com.anytypeio.anytype.core_ui.ColorButtonPrimaryInactive
|
||||
|
@ -26,7 +25,6 @@ import com.anytypeio.anytype.core_ui.ColorButtonSecondaryBorder
|
|||
import com.anytypeio.anytype.core_ui.ColorButtonSecondaryBorderPressed
|
||||
import com.anytypeio.anytype.core_ui.ColorButtonSecondaryPressed
|
||||
import com.anytypeio.anytype.core_ui.ColorButtonSecondaryText
|
||||
import com.anytypeio.anytype.core_ui.R
|
||||
|
||||
@Composable
|
||||
fun OnBoardingButtonPrimary(
|
||||
|
@ -78,7 +76,8 @@ fun OnBoardingButtonSecondary(
|
|||
onClick: () -> Unit,
|
||||
enabled: Boolean = true,
|
||||
modifier: Modifier = Modifier,
|
||||
size: ButtonSize
|
||||
size: ButtonSize,
|
||||
textColor: Color = ColorButtonSecondaryText
|
||||
) {
|
||||
val interactionSource = remember { MutableInteractionSource() }
|
||||
val isPressed = interactionSource.collectIsPressedAsState()
|
||||
|
@ -114,7 +113,7 @@ fun OnBoardingButtonSecondary(
|
|||
Text(
|
||||
text = text,
|
||||
style = size.textStyle.copy(
|
||||
color = ColorButtonSecondaryText
|
||||
color = textColor
|
||||
)
|
||||
)
|
||||
}
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue