Skip to content

Commit ed6a8fc

Browse files
sentinelwebsentinelweb
sentinelweb
authored and
sentinelweb
committed
#496 - xml layout tweaks
1 parent 3f423f4 commit ed6a8fc

File tree

7 files changed

+52
-44
lines changed

7 files changed

+52
-44
lines changed

‎app/src/main/java/uk/co/sentinelweb/cuer/app/ui/browse/BrowseComposables.kt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ import uk.co.sentinelweb.cuer.app.ui.browse.BrowseContract.View.Event.OnCategory
2727
import uk.co.sentinelweb.cuer.app.ui.common.compose.Const.PREVIEW_LOG_WRAPPER
2828
import uk.co.sentinelweb.cuer.app.ui.common.compose.CuerBrowseTheme
2929
import uk.co.sentinelweb.cuer.app.ui.common.compose.image.NetworkImage
30+
import uk.co.sentinelweb.cuer.app.ui.common.compose.mediumRoundedShape
3031
import uk.co.sentinelweb.cuer.app.ui.common.compose.topappbar.Action
3132
import uk.co.sentinelweb.cuer.app.ui.common.compose.topappbar.CuerMenuItem
3233
import uk.co.sentinelweb.cuer.app.ui.common.compose.topappbar.CuerTopAppBarComposables
@@ -216,7 +217,7 @@ object BrowseComposables {
216217
exit = fadeOut(animationSpec = tween(durationMillis = 200))
217218
),
218219
elevation = 4.dp,
219-
shape = MaterialTheme.shapes.medium
220+
shape = mediumRoundedShape
220221
) {
221222
Row(
222223
modifier = Modifier

‎app/src/main/java/uk/co/sentinelweb/cuer/app/ui/common/chip/ChipCreator.kt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@ import uk.co.sentinelweb.cuer.app.util.image.loadFirebaseOrOtherUrl
2323
import uk.co.sentinelweb.cuer.app.util.wrapper.ResourceWrapper
2424
import java.security.MessageDigest
2525

26-
2726
class ChipCreator(
2827
private val c: Context,
2928
private val imageProvider: ImageProvider,

‎app/src/main/java/uk/co/sentinelweb/cuer/app/ui/common/compose/Shape.kt‎

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,9 @@
11
package uk.co.sentinelweb.cuer.app.ui.common.compose
22

3-
import androidx.compose.foundation.shape.CutCornerShape
3+
import androidx.compose.foundation.shape.RoundedCornerShape
44
import androidx.compose.ui.unit.dp
55

6-
val largeShape = CutCornerShape(topStart = 32.dp, bottomEnd = 32.dp)
7-
val mediumShape = CutCornerShape(topStart = 16.dp, bottomEnd = 16.dp)
8-
val smallShape = CutCornerShape(topStart = 8.dp, bottomEnd = 8.dp)
6+
//val largeShape = CutCornerShape(topStart = 32.dp, bottomEnd = 32.dp)
7+
//val mediumShape = CutCornerShape(topStart = 16.dp, bottomEnd = 16.dp)
8+
//val smallShape = CutCornerShape(topStart = 8.dp, bottomEnd = 8.dp)
9+
val mediumRoundedShape = RoundedCornerShape(topStart = 16.dp, bottomEnd = 16.dp)

‎app/src/main/java/uk/co/sentinelweb/cuer/app/util/extension/BitmapExtensions.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ fun Bitmap.cropShapedBitmap(res: ResourceWrapper): Bitmap {
4848
paint.setAntiAlias(true)
4949
val pathProvider = ShapeAppearancePathProvider()
5050
val path = Path()
51-
val shapeModel = res.getShapeModel(R.style.ShapeAppearance_Button)
51+
val shapeModel = res.getShapeModel(R.style.ShapeAppearance_Item_Icon)
5252
val rect = Rect(0, 0, squareBitmapWidth, squareBitmapWidth)
5353
val rectF = RectF(rect)
5454
pathProvider.calculatePath(shapeModel, 1f, rectF, path)
@@ -62,4 +62,4 @@ fun Bitmap.cropShapedBitmap(res: ResourceWrapper): Bitmap {
6262
this.recycle()
6363
// Return the circular bitmap
6464
return dstBitmap
65-
}
65+
}

‎app/src/main/res/layout/view_ribbon_item.xml‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,13 +5,14 @@
55
xmlns:tools="http://schemas.android.com/tools" android:id="@+id/ribbon_item_text"
66
style="@style/Header.Button"
77
android:contentDescription="@string/menu_star"
8-
android:layout_height="56dp"
8+
android:layout_height="wrap_content"
99
android:layout_width="wrap_content"
1010
android:text="@string/menu_star"
1111
app:tint="?colorOnSurface"
1212
app:iconGravity="textTop"
1313
app:iconPadding="4dp"
1414
app:icon="@drawable/ic_starred"
15+
app:iconSize="24dp"
1516
android:paddingEnd="8dp"
1617
android:minWidth="48dp"
1718
tools:ignore="RtlSymmetry"/>

‎app/src/main/res/values/shapes.xml‎

Lines changed: 39 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -60,39 +60,45 @@
6060
<!-- rounded test -->
6161

6262
<style name="ShapeAppearance.Item.Icon" parent="ShapeAppearance.MaterialComponents">
63-
<item name="cornerFamily">rounded</item>
64-
<item name="cornerSize">@dimen/medium_corner_cut</item>
65-
</style>
66-
67-
<style name="ShapeAppearance.Item.TileText" parent="ShapeAppearance.MaterialComponents">
68-
<item name="cornerFamily">rounded</item>
69-
<item name="cornerSize">@dimen/medium_corner_cut</item>
70-
</style>
71-
72-
<style name="ShapeAppearance.Button" parent="ShapeAppearance.MaterialComponents">
73-
<item name="cornerFamily">rounded</item>
74-
<item name="cornerSize">@dimen/medium_corner_cut</item>
75-
</style>
76-
77-
<style name="ShapeAppearance.Player.Icon" parent="ShapeAppearance.MaterialComponents">
78-
<item name="cornerFamily">rounded</item>
79-
<item name="cornerSize">@dimen/medium_corner_cut</item>
80-
</style>
81-
82-
<style name="ShapeAppearance.Small" parent="ShapeAppearance.MaterialComponents">
83-
<item name="cornerFamily">rounded</item>
84-
<item name="cornerSize">@dimen/small_corner_cut</item>
85-
</style>
86-
87-
<style name="ShapeAppearance.Medium" parent="ShapeAppearance.MaterialComponents">
88-
<item name="cornerFamily">rounded</item>
89-
<item name="cornerSize">@dimen/medium_corner_cut</item>
90-
</style>
91-
92-
<style name="ShapeAppearance.Large" parent="ShapeAppearance.MaterialComponents">
93-
<item name="cornerFamily">rounded</item>
94-
<item name="cornerSize">@dimen/large_corner_cut</item>
95-
</style>
63+
<item name="cornerFamily">rounded</item>
64+
<item name="cornerSizeTopLeft">@dimen/medium_corner_cut</item>
65+
<item name="cornerSizeTopRight">0dp</item>
66+
<item name="cornerSizeBottomRight">@dimen/medium_corner_cut</item>
67+
<item name="cornerSizeBottomLeft">0dp</item>
68+
</style>
69+
70+
<style name="ShapeAppearance.Item.TileText" parent="ShapeAppearance.MaterialComponents">
71+
<item name="cornerFamily">rounded</item>
72+
<item name="cornerSize">@dimen/medium_corner_cut</item>
73+
</style>
74+
75+
<style name="ShapeAppearance.Button" parent="ShapeAppearance.MaterialComponents">
76+
<item name="cornerFamily">rounded</item>
77+
<item name="cornerSize">@dimen/medium_corner_cut</item>
78+
</style>
79+
80+
<style name="ShapeAppearance.Player.Icon" parent="ShapeAppearance.MaterialComponents">
81+
<item name="cornerFamily">rounded</item>
82+
<item name="cornerSizeTopLeft">@dimen/medium_corner_cut</item>
83+
<item name="cornerSizeTopRight">0dp</item>
84+
<item name="cornerSizeBottomRight">@dimen/medium_corner_cut</item>
85+
<item name="cornerSizeBottomLeft">0dp</item>
86+
</style>
87+
88+
<style name="ShapeAppearance.Small" parent="ShapeAppearance.MaterialComponents">
89+
<item name="cornerFamily">rounded</item>
90+
<item name="cornerSize">@dimen/small_corner_cut</item>
91+
</style>
92+
93+
<style name="ShapeAppearance.Medium" parent="ShapeAppearance.MaterialComponents">
94+
<item name="cornerFamily">rounded</item>
95+
<item name="cornerSize">@dimen/medium_corner_cut</item>
96+
</style>
97+
98+
<style name="ShapeAppearance.Large" parent="ShapeAppearance.MaterialComponents">
99+
<item name="cornerFamily">rounded</item>
100+
<item name="cornerSize">@dimen/large_corner_cut</item>
101+
</style>
96102

97103
</resources>
98104

‎app/src/main/res/values/theme.xml‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@
5353
<!-- <item name="bodyFont">sans-serif</item>-->
5454
<!-- <item name="headlineFont">sans-serif</item>-->
5555

56-
<item name="headlineFontLetterSpacing">0.02</item>
57-
<item name="headlineFontXScaling">1.05</item>
56+
<item name="headlineFontLetterSpacing">0.0</item>
57+
<item name="headlineFontXScaling">1</item>
5858
<item name="textEditBackground">@color/text_edit_background</item>
5959
<item name="colorNavigation">@color/nav_bar</item>
6060

0 commit comments

Comments
 (0)