Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Support for compose 0.1.0-dev16 #38

Merged
merged 4 commits into from
Aug 11, 2020
Merged

Support for compose 0.1.0-dev16 #38

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
bf10944
Support for compose 0.1.0-dev16
Aug 10, 2020
2b64c2b
Also fix imports in sample apps; Don't use wildcard imports.
Aug 10, 2020
8941d96
Update kotlin version to 1.4.0-rc
Aug 11, 2020
aaf0991
Fix layout in PhotosOfAlbum.kt
Aug 11, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 5 additions & 3 deletions app-lifelike/src/main/java/com/example/lifelike/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@ package com.example.lifelike

import android.os.Bundle
import androidx.appcompat.app.AppCompatActivity
import androidx.compose.Providers
import androidx.ui.core.setContent
import androidx.ui.material.MaterialTheme
import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.material.MaterialTheme
import androidx.compose.runtime.Providers
import androidx.compose.ui.platform.setContent
import com.example.lifelike.composable.Root
import com.example.lifelike.composable.Root.Routing.LoggedOut
import com.github.zsoltk.compose.backpress.AmbientBackPressHandler
Expand All @@ -16,6 +17,7 @@ import com.github.zsoltk.compose.savedinstancestate.saveAmbient
class MainActivity : AppCompatActivity() {
private val backPressHandler = BackPressHandler()

@ExperimentalFoundationApi
override fun onCreate(savedInstanceState: Bundle?) {
super.onCreate(savedInstanceState)

Expand Down
12 changes: 6 additions & 6 deletions app-lifelike/src/main/java/com/example/lifelike/composable/LoggedIn.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
package com.example.lifelike.composable

import androidx.compose.Composable
import androidx.ui.core.Alignment
import androidx.ui.core.Modifier
import androidx.ui.foundation.Box
import androidx.ui.layout.Column
import androidx.ui.layout.wrapContentSize
import androidx.compose.foundation.Box
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.wrapContentSize
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import com.example.lifelike.composable.loggedin.Gallery
import com.example.lifelike.composable.loggedin.Gallery.Routing.AlbumList
import com.example.lifelike.composable.loggedin.Menu
Expand Down
4 changes: 3 additions & 1 deletion app-lifelike/src/main/java/com/example/lifelike/composable/LoggedOut.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.example.lifelike.composable

import androidx.compose.Composable
import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.runtime.Composable
import com.example.lifelike.composable.loggedout.RegConfirmSmsCode
import com.example.lifelike.composable.loggedout.RegFinal
import com.example.lifelike.composable.loggedout.RegUserName
Expand All @@ -20,6 +21,7 @@ interface LoggedOut {
}

companion object {
@ExperimentalFoundationApi
@Composable
fun Content(defaultRouting: Routing, onLoggedIn: (User) -> Unit) {
val user = User("Demo user", "123456789")
Expand Down
4 changes: 3 additions & 1 deletion app-lifelike/src/main/java/com/example/lifelike/composable/Root.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package com.example.lifelike.composable

import androidx.compose.Composable
import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.runtime.Composable
import com.example.lifelike.composable.LoggedIn.Routing.Gallery
import com.example.lifelike.composable.LoggedOut.Routing.Splash
import com.example.lifelike.entity.User
Expand All @@ -14,6 +15,7 @@ interface Root {
}

companion object {
@ExperimentalFoundationApi
@Composable
fun Content(defaultRouting: Routing) {
Router(defaultRouting) { backStack ->
Expand Down
10 changes: 5 additions & 5 deletions app-lifelike/src/main/java/com/example/lifelike/composable/common/BigButton.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
package com.example.lifelike.composable.common

import androidx.compose.Composable
import androidx.ui.foundation.Text
import androidx.ui.graphics.Color
import androidx.ui.material.Button
import androidx.ui.material.MaterialTheme
import androidx.compose.foundation.Text
import androidx.compose.material.Button
import androidx.compose.material.MaterialTheme
import androidx.compose.runtime.Composable
import androidx.compose.ui.graphics.Color

@Composable
fun BigButton(text: String, onClick: () -> Unit) {
Expand Down
34 changes: 17 additions & 17 deletions app-lifelike/src/main/java/com/example/lifelike/composable/loggedin/AlbumList.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
package com.example.lifelike.composable.loggedin

import androidx.compose.Composable
import androidx.ui.core.Modifier
import androidx.ui.foundation.Box
import androidx.ui.foundation.Image
import androidx.ui.foundation.ScrollableColumn
import androidx.ui.foundation.Text
import androidx.ui.foundation.clickable
import androidx.ui.layout.Column
import androidx.ui.layout.Row
import androidx.ui.layout.Spacer
import androidx.ui.layout.padding
import androidx.ui.layout.preferredSize
import androidx.ui.layout.preferredWidth
import androidx.ui.material.MaterialTheme
import androidx.ui.res.imageResource
import androidx.ui.text.font.FontWeight
import androidx.compose.foundation.Box
import androidx.compose.foundation.Image
import androidx.compose.foundation.ScrollableColumn
import androidx.compose.foundation.Text
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.preferredSize
import androidx.compose.foundation.layout.preferredWidth
import androidx.compose.material.MaterialTheme
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.imageResource
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.unit.dp
import androidx.ui.tooling.preview.Preview
import androidx.ui.unit.dp
import com.example.lifelike.R
import com.example.lifelike.entity.Album
import com.example.lifelike.entity.albums
Expand Down
34 changes: 17 additions & 17 deletions app-lifelike/src/main/java/com/example/lifelike/composable/loggedin/FullScreenPhoto.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,23 +1,23 @@
package com.example.lifelike.composable.loggedin

import androidx.compose.Composable
import androidx.ui.core.Alignment
import androidx.ui.core.Modifier
import androidx.ui.foundation.Box
import androidx.ui.foundation.Image
import androidx.ui.foundation.Text
import androidx.ui.graphics.Color
import androidx.ui.layout.Column
import androidx.ui.layout.Spacer
import androidx.ui.layout.fillMaxSize
import androidx.ui.layout.padding
import androidx.ui.layout.preferredHeight
import androidx.ui.layout.wrapContentSize
import androidx.ui.material.MaterialTheme
import androidx.ui.material.Surface
import androidx.ui.res.imageResource
import androidx.compose.foundation.Box
import androidx.compose.foundation.Image
import androidx.compose.foundation.Text
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.preferredHeight
import androidx.compose.foundation.layout.wrapContentSize
import androidx.compose.material.MaterialTheme
import androidx.compose.material.Surface
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.graphics.Color
import androidx.compose.ui.res.imageResource
import androidx.compose.ui.unit.dp
import androidx.ui.tooling.preview.Preview
import androidx.ui.unit.dp
import com.example.lifelike.R
import com.example.lifelike.entity.Photo

Expand Down
2 changes: 1 addition & 1 deletion app-lifelike/src/main/java/com/example/lifelike/composable/loggedin/Gallery.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.example.lifelike.composable.loggedin

import androidx.compose.Composable
import androidx.compose.runtime.Composable
import com.example.lifelike.entity.Album
import com.example.lifelike.entity.Photo
import com.github.zsoltk.compose.router.Router
Expand Down
30 changes: 15 additions & 15 deletions app-lifelike/src/main/java/com/example/lifelike/composable/loggedin/Menu.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,21 +1,21 @@
package com.example.lifelike.composable.loggedin

import androidx.compose.Composable
import androidx.ui.core.Modifier
import androidx.ui.foundation.Box
import androidx.ui.foundation.Text
import androidx.ui.foundation.clickable
import androidx.ui.foundation.shape.corner.RoundedCornerShape
import androidx.ui.layout.Row
import androidx.ui.layout.fillMaxWidth
import androidx.ui.layout.padding
import androidx.ui.material.MaterialTheme
import androidx.ui.material.Surface
import androidx.ui.text.AnnotatedString
import androidx.ui.text.ParagraphStyle
import androidx.ui.text.style.TextAlign
import androidx.compose.foundation.Box
import androidx.compose.foundation.Text
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.MaterialTheme
import androidx.compose.material.Surface
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.text.AnnotatedString
import androidx.compose.ui.text.ParagraphStyle
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.unit.dp
import androidx.ui.tooling.preview.Preview
import androidx.ui.unit.dp
import com.example.lifelike.composable.loggedin.Menu.MenuItem.Gallery
import com.example.lifelike.composable.loggedin.Menu.MenuItem.News
import com.example.lifelike.composable.loggedin.Menu.MenuItem.Profile
Expand Down
14 changes: 7 additions & 7 deletions app-lifelike/src/main/java/com/example/lifelike/composable/loggedin/News.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
package com.example.lifelike.composable.loggedin

import androidx.compose.Composable
import androidx.ui.core.Modifier
import androidx.ui.foundation.Box
import androidx.ui.foundation.ScrollableColumn
import androidx.ui.foundation.Text
import androidx.ui.layout.padding
import androidx.compose.foundation.Box
import androidx.compose.foundation.ScrollableColumn
import androidx.compose.foundation.Text
import androidx.compose.foundation.layout.padding
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.unit.dp
import androidx.ui.tooling.preview.Preview
import androidx.ui.unit.dp


interface News {
Expand Down
38 changes: 19 additions & 19 deletions app-lifelike/src/main/java/com/example/lifelike/composable/loggedin/PhotosOfAlbum.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,24 +1,24 @@
package com.example.lifelike.composable.loggedin

import androidx.compose.Composable
import androidx.ui.core.DensityAmbient
import androidx.ui.core.Modifier
import androidx.ui.core.WithConstraints
import androidx.ui.foundation.Box
import androidx.ui.foundation.Image
import androidx.ui.foundation.Text
import androidx.ui.foundation.clickable
import androidx.ui.foundation.lazy.LazyColumnItems
import androidx.ui.layout.Column
import androidx.ui.layout.Row
import androidx.ui.layout.aspectRatio
import androidx.ui.layout.fillMaxSize
import androidx.ui.layout.padding
import androidx.ui.layout.width
import androidx.ui.material.MaterialTheme
import androidx.ui.res.imageResource
import androidx.compose.foundation.Box
import androidx.compose.foundation.Image
import androidx.compose.foundation.Text
import androidx.compose.foundation.clickable
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.aspectRatio
import androidx.compose.foundation.layout.fillMaxSize
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.width
import androidx.compose.foundation.lazy.LazyColumnFor
import androidx.compose.material.MaterialTheme
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.WithConstraints
import androidx.compose.ui.platform.DensityAmbient
import androidx.compose.ui.res.imageResource
import androidx.compose.ui.unit.dp
import androidx.ui.tooling.preview.Preview
import androidx.ui.unit.dp
import com.example.lifelike.R
import com.example.lifelike.entity.Album
import com.example.lifelike.entity.Photo
Expand Down Expand Up @@ -82,7 +82,7 @@ interface PhotosOfAlbum {
val photoRows = album.photos.chunked(cols)

Box(modifier = Modifier.padding(4.dp)) {
LazyColumnItems(photoRows) { row ->
LazyColumnFor(photoRows) { row ->
WithConstraints {
Row {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Seems like it breaks layout of these albums now
Can you add modifier fillParentMaxWidth to the Row to make it work again? :)

val w = with(DensityAmbient.current) { (constraints.maxWidth.toDp().value / cols).dp }
Expand Down
24 changes: 12 additions & 12 deletions app-lifelike/src/main/java/com/example/lifelike/composable/loggedin/Profile.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
package com.example.lifelike.composable.loggedin

import androidx.compose.Composable
import androidx.ui.core.Modifier
import androidx.ui.foundation.Text
import androidx.ui.layout.Arrangement
import androidx.ui.layout.Column
import androidx.ui.layout.Spacer
import androidx.ui.layout.fillMaxHeight
import androidx.ui.layout.padding
import androidx.ui.layout.preferredHeight
import androidx.ui.material.Button
import androidx.ui.material.MaterialTheme
import androidx.compose.foundation.Text
import androidx.compose.foundation.layout.Arrangement
import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxHeight
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.preferredHeight
import androidx.compose.material.Button
import androidx.compose.material.MaterialTheme
import androidx.compose.runtime.Composable
import androidx.compose.ui.Modifier
import androidx.compose.ui.unit.dp
import androidx.ui.tooling.preview.Preview
import androidx.ui.unit.dp
import com.example.lifelike.entity.User


Expand Down
14 changes: 8 additions & 6 deletions app-lifelike/src/main/java/com/example/lifelike/composable/loggedout/RegConfirmSmsCode.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,18 @@
package com.example.lifelike.composable.loggedout

import androidx.compose.Composable
import androidx.compose.state
import androidx.ui.foundation.TextField
import androidx.ui.input.TextFieldValue
import androidx.ui.text.TextRange
import androidx.compose.foundation.BaseTextField
import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.runtime.Composable
import androidx.compose.runtime.state
import androidx.compose.ui.text.TextRange
import androidx.compose.ui.text.input.TextFieldValue
import com.example.lifelike.composable.loggedout.common.RegFlowPanel


interface RegConfirmSmsCode {
companion object {

@ExperimentalFoundationApi
@Composable
fun Content(onNext: () -> Unit) {
val code = state {
Expand All @@ -21,7 +23,7 @@ interface RegConfirmSmsCode {
RegFlowPanel(
"Confirm SMS code that will never arrive",
{ if (code.value.text.length == 4) onNext() }) {
TextField(
BaseTextField(
value = code.value,
onValueChange = {
val digits = it.text.filter { it.isDigit() }
Expand Down
2 changes: 1 addition & 1 deletion app-lifelike/src/main/java/com/example/lifelike/composable/loggedout/RegFinal.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package com.example.lifelike.composable.loggedout

import androidx.compose.Composable
import androidx.compose.runtime.Composable
import com.example.lifelike.composable.loggedout.common.RegFlowPanel


Expand Down
13 changes: 8 additions & 5 deletions app-lifelike/src/main/java/com/example/lifelike/composable/loggedout/RegUserName.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,9 +1,11 @@
package com.example.lifelike.composable.loggedout

import androidx.compose.Composable
import androidx.ui.foundation.TextField
import androidx.ui.input.TextFieldValue
import androidx.ui.text.TextRange
import androidx.compose.foundation.BaseTextField
import androidx.compose.foundation.ExperimentalFoundationApi
import androidx.compose.material.TextField
import androidx.compose.runtime.Composable
import androidx.compose.ui.text.TextRange
import androidx.compose.ui.text.input.TextFieldValue
import androidx.ui.tooling.preview.Preview
import com.example.lifelike.composable.loggedout.common.RegFlowPanel
import com.example.lifelike.entity.User
Expand All @@ -12,10 +14,11 @@ import com.example.lifelike.entity.User
interface RegUserName {
companion object {

@OptIn(ExperimentalFoundationApi::class)
@Composable
fun Content(user: User, onNext: () -> Unit) {
RegFlowPanel("Your fake name", onNext) {
TextField(
BaseTextField(
value = TextFieldValue(user.name, TextRange(user.name.length,user.name.length)),
onValueChange = { user.name = it.text }
)
Expand Down