FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

[JetNews] bump to alpha06 by objcode · Pull Request #258 · android/compose-samples · GitHub

/ compose-samples Public

[JetNews] bump to alpha06 #258

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

Merged
chrisbanes merged 2 commits into from
Oct 28, 2020
Conversation 3 Commits 2 Checks 0 Files changed
Merged

[JetNews] bump to alpha06 #258

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
8ff3687
[JetNews] bump to alpha06
objcode Oct 27, 2020
7119cdd
Fix unused modifier on BookmarkButton
Oct 28, 2020
File filter

Filter by extension

Filter by extension .gradle  (2) .kt  (8) .properties  (1) All 3 file types selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
2 changes: 1 addition & 1 deletion JetNews/app/build.gradle
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ dependencies {
implementation "androidx.lifecycle:lifecycle-viewmodel-savedstate:2.3.0-beta01"
implementation "androidx.lifecycle:lifecycle-livedata-ktx:2.3.0-beta01"

androidTestImplementation 'junit:junit:4.13'
androidTestImplementation 'junit:junit:4.13.1'
androidTestImplementation 'androidx.test:rules:1.3.0'
androidTestImplementation 'androidx.test:runner:1.3.0'
androidTestImplementation "androidx.ui:ui-test:$compose_version"
Expand Down
2 changes: 1 addition & 1 deletion JetNews/app/src/androidTest/java/com/example/jetnews/HomeScreenSnackbarTest.kt
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ import org.junit.Test
class HomeScreenSnackbarTest {

@get:Rule
val composeTestRule = createComposeRule(disableTransitions = true)
val composeTestRule = createComposeRule()

@OptIn(
ExperimentalMaterialApi::class,
Expand Down
2 changes: 1 addition & 1 deletion JetNews/app/src/androidTest/java/com/example/jetnews/JetnewsUiTest.kt
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ import org.junit.Test
class JetnewsUiTest {

@get:Rule
val composeTestRule = createComposeRule(disableTransitions = true)
val composeTestRule = createComposeRule()

@Before
fun setUp() {
Expand Down
2 changes: 1 addition & 1 deletion JetNews/app/src/main/java/com/example/jetnews/ui/article/ArticleScreen.kt
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -19,14 +19,14 @@ package com.example.jetnews.ui.article
import android.content.Context
import android.content.Intent
import androidx.compose.foundation.AmbientContentColor
import androidx.compose.foundation.Icon
import androidx.compose.foundation.Text
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.preferredHeight
import androidx.compose.material.AlertDialog
import androidx.compose.material.Icon
import androidx.compose.material.IconButton
import androidx.compose.material.MaterialTheme
import androidx.compose.material.Scaffold
Expand Down
4 changes: 2 additions & 2 deletions JetNews/app/src/main/java/com/example/jetnews/ui/article/PostContent.kt
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -214,7 +214,7 @@ private fun BulletParagraph(
Box(
modifier = Modifier
.preferredSize(8.sp.toDp(), 8.sp.toDp())
.alignWithSiblings {
.alignBy {
// Add an alignment "baseline" 1sp below the bottom of the circle
9.sp.toIntPx()
}
Expand All @@ -224,7 +224,7 @@ private fun BulletParagraph(
Text(
modifier = Modifier
.weight(1f)
.alignWithSiblings(FirstBaseline),
.alignBy(FirstBaseline),
text = text,
style = textStyle.merge(paragraphStyle)
)
Expand Down
2 changes: 1 addition & 1 deletion JetNews/app/src/main/java/com/example/jetnews/ui/home/HomeScreen.kt
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

package com.example.jetnews.ui.home

import androidx.compose.foundation.Icon
import androidx.compose.foundation.ScrollableColumn
import androidx.compose.foundation.ScrollableRow
import androidx.compose.foundation.Text
Expand All @@ -33,6 +32,7 @@ import androidx.compose.material.CircularProgressIndicator
import androidx.compose.material.Divider
import androidx.compose.material.DrawerValue
import androidx.compose.material.ExperimentalMaterialApi
import androidx.compose.material.Icon
import androidx.compose.material.IconButton
import androidx.compose.material.MaterialTheme
import androidx.compose.material.ProvideEmphasis
Expand Down
19 changes: 6 additions & 13 deletions JetNews/app/src/main/java/com/example/jetnews/ui/home/PostCards.kt
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -16,16 +16,15 @@

package com.example.jetnews.ui.home

import androidx.compose.foundation.Icon
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.fillMaxSize
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.preferredSize
import androidx.compose.material.AmbientEmphasisLevels
import androidx.compose.material.Icon
import androidx.compose.material.IconToggleButton
import androidx.compose.material.MaterialTheme
import androidx.compose.material.ProvideEmphasis
Expand Down Expand Up @@ -131,7 +130,7 @@ fun PostCardHistory(post: Post, navigateTo: (Screen) -> Unit) {
)
}
ProvideEmphasis(AmbientEmphasisLevels.current.medium) {
Icon(asset = Icons.Filled.MoreVert)
Icon(Icons.Filled.MoreVert)
}
}
}
Expand All @@ -144,19 +143,13 @@ fun BookmarkButton(
) {
IconToggleButton(
checked = isBookmarked,
onCheckedChange = { onClick() }
onCheckedChange = { onClick() },
modifier = modifier
) {
modifier.fillMaxSize()
if (isBookmarked) {
Icon(
asset = Icons.Filled.Bookmark,
modifier = modifier
)
Icon(asset = Icons.Filled.Bookmark)
Comment thread
chrisbanes marked this conversation as resolved.
} else {
Icon(
asset = Icons.Filled.BookmarkBorder,
modifier = modifier
)
Icon(asset = Icons.Filled.BookmarkBorder)
}
}
}
Expand Down
2 changes: 1 addition & 1 deletion JetNews/app/src/main/java/com/example/jetnews/ui/interests/InterestsScreen.kt
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@

package com.example.jetnews.ui.interests

import androidx.compose.foundation.Icon
import androidx.compose.foundation.Image
import androidx.compose.foundation.ScrollableColumn
import androidx.compose.foundation.Text
Expand All @@ -30,6 +29,7 @@ import androidx.compose.foundation.selection.toggleable
import androidx.compose.foundation.shape.RoundedCornerShape
import androidx.compose.material.Divider
import androidx.compose.material.DrawerValue
import androidx.compose.material.Icon
import androidx.compose.material.IconButton
import androidx.compose.material.MaterialTheme
import androidx.compose.material.Scaffold
Expand Down
2 changes: 1 addition & 1 deletion JetNews/app/src/main/java/com/example/jetnews/ui/interests/SelectTopicButton.kt
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -16,11 +16,11 @@

package com.example.jetnews.ui.interests

import androidx.compose.foundation.Icon
import androidx.compose.foundation.layout.padding
import androidx.compose.foundation.layout.preferredSize
import androidx.compose.foundation.shape.CircleShape
import androidx.compose.material.AmbientEmphasisLevels
import androidx.compose.material.Icon
import androidx.compose.material.MaterialTheme
import androidx.compose.material.ProvideEmphasis
import androidx.compose.material.Surface
Expand Down
8 changes: 6 additions & 2 deletions JetNews/build.gradle
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -16,15 +16,15 @@

buildscript {
ext.kotlin_version = '1.4.10'
ext.compose_version = '1.0.0-alpha05'
ext.compose_version = '1.0.0-SNAPSHOT'

repositories {
google()
jcenter()
}

dependencies {
classpath 'com.android.tools.build:gradle:4.2.0-alpha13'
classpath 'com.android.tools.build:gradle:4.2.0-alpha15'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
}
}
Expand All @@ -35,6 +35,10 @@ plugins {

subprojects {
repositories {
maven {
def snapshot = "6922857"
url "https://androidx.dev/snapshots/builds/$snapshot/artifacts/repository/"
}
google()
jcenter()
}
Expand Down
4 changes: 2 additions & 2 deletions JetNews/gradle/wrapper/gradle-wrapper.properties
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
#Wed Sep 16 10:20:00 PDT 2020
#Tue Oct 27 16:21:59 PDT 2020
distributionBase=GRADLE_USER_HOME
distributionUrl=https\://services.gradle.org/distributions/gradle-6.6.1-bin.zip
distributionUrl=https\://services.gradle.org/distributions/gradle-6.7-bin.zip
distributionPath=wrapper/dists
zipStorePath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME
Back | FazBrowse Home | New Git URL