Skip to content

Commit c70ae14

Browse files
mcpiercemcpierce
committed
Added the total number of comics to the comic display [#136]
1 parent 82bda7d commit c70ae14

27 files changed

+124
-11
lines changed

‎androidVariant/src/main/java/org/comixedproject/variant/android/view/VariantAppTopBar.kt‎

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ import androidx.compose.material3.Text
2929
import androidx.compose.material3.TopAppBar
3030
import androidx.compose.runtime.Composable
3131
import androidx.compose.ui.Modifier
32+
import androidx.compose.ui.res.painterResource
3233
import androidx.compose.ui.res.stringResource
3334
import androidx.compose.ui.tooling.preview.Preview
3435
import org.comixedproject.variant.android.R
@@ -49,21 +50,21 @@ fun VariantTopAppBar(
4950
actions = {
5051
IconButton(onClick = { onBrowseComics() }) {
5152
Icon(
52-
imageVector = Icons.Rounded.Home,
53+
painterResource(R.drawable.ic_comic_library),
5354
contentDescription = stringResource(R.string.browseServerDestinationLabel)
5455
)
5556
}
5657

5758
IconButton(onClick = { onBrowseServer() }) {
5859
Icon(
59-
imageVector = Icons.Rounded.AccountCircle,
60+
painterResource(R.drawable.ic_browse_library),
6061
contentDescription = stringResource(R.string.browseServerDestinationLabel)
6162
)
6263
}
6364

6465
IconButton(onClick = { onUpdateSettings() }) {
6566
Icon(
66-
imageVector = Icons.Rounded.Settings,
67+
painterResource(R.drawable.ic_settings),
6768
contentDescription = stringResource(R.string.settingsDestinationLabel)
6869
)
6970
}

‎androidVariant/src/main/java/org/comixedproject/variant/android/view/comics/ComicBookListView.kt‎

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,10 +23,12 @@ import androidx.compose.foundation.layout.padding
2323
import androidx.compose.foundation.lazy.staggeredgrid.LazyVerticalStaggeredGrid
2424
import androidx.compose.foundation.lazy.staggeredgrid.StaggeredGridCells
2525
import androidx.compose.foundation.lazy.staggeredgrid.items
26+
import androidx.compose.material3.MaterialTheme
2627
import androidx.compose.material3.Scaffold
2728
import androidx.compose.material3.Text
2829
import androidx.compose.runtime.Composable
2930
import androidx.compose.ui.Modifier
31+
import androidx.compose.ui.res.pluralStringResource
3032
import androidx.compose.ui.res.stringResource
3133
import androidx.compose.ui.tooling.preview.Preview
3234
import androidx.compose.ui.unit.dp
@@ -46,6 +48,13 @@ fun ComicBookListView(
4648
modifier: Modifier = Modifier
4749
) {
4850
Scaffold(
51+
topBar = {
52+
Text(
53+
pluralStringResource(R.plurals.comicBookListTitle, comicBookList.size,
54+
comicBookList.size),
55+
style = MaterialTheme.typography.headlineMedium
56+
)
57+
},
4958
content = { padding ->
5059
if (comicBookList.isEmpty()) {
5160
Log.debug(

‎androidVariant/src/main/java/org/comixedproject/variant/android/view/comics/ComicBookView.kt‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@
1919
package org.comixedproject.variant.android.view.comics
2020

2121
import androidx.compose.foundation.layout.padding
22-
import androidx.compose.material.icons.Icons
23-
import androidx.compose.material.icons.filled.Delete
2422
import androidx.compose.material3.BottomAppBar
2523
import androidx.compose.material3.Icon
2624
import androidx.compose.material3.IconButton
@@ -81,7 +79,7 @@ fun ComicBookView(
8179
onDeleteComics()
8280
}) {
8381
Icon(
84-
Icons.Filled.Delete,
82+
painterResource(R.drawable.ic_delete_comics),
8583
contentDescription = stringResource(R.string.deleteSelectionsLabel)
8684
)
8785
}

‎androidVariant/src/main/res/drawable-anydpi/ic_browse_library.xml‎

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,13 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="24dp"
3+
android:height="24dp"
4+
android:viewportWidth="24"
5+
android:viewportHeight="24"
6+
android:tint="#333333"
7+
android:alpha="0.6">
8+
<group android:translateY="-0.5">
9+
<path
10+
android:fillColor="#FF000000"
11+
android:pathData="M17.5,21H7A7,7 0,0 1,5.276 7.223a6,6 0,0 1,11.645 0.8A6.5,6.5 0,1 1,17.5 21ZM11,5A4,4 0,0 0,7.076 8.26l-0.131,0.7 -0.7,0.106A5,5 0,0 0,7 19H17.5a4.5,4.5 0,1 0,-1.246 -8.821l-1.339,0.385L15,8.979A4,4 0,0 0,11 5Z"/>
12+
</group>
13+
</vector>

‎androidVariant/src/main/res/drawable-anydpi/ic_comic_library.xml‎

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="24dp"
3+
android:height="24dp"
4+
android:viewportWidth="24"
5+
android:viewportHeight="24"
6+
android:tint="#333333"
7+
android:alpha="0.6">
8+
<group android:scaleX="1.2"
9+
android:scaleY="1.2"
10+
android:translateX="-2.4"
11+
android:translateY="-1.8">
12+
<path
13+
android:fillColor="#FF000000"
14+
android:pathData="M21.515,5.143A9.218,9.218 0,0 0,12 4.82a9.223,9.223 0,0 0,-9.515 0.323L2,5.434V19.766l1.515,-0.909A7.19,7.19 0,0 1,11.4 18.8l0.6,0.442 0.6,-0.439a7.194,7.194 0,0 1,7.889 0.054L22,19.766V5.434ZM7.559,15.656A9.3,9.3 0,0 0,4 16.378V6.585a7.2,7.2 0,0 1,7 -0.035v9.792A9.086,9.086 0,0 0,7.559 15.656ZM20,16.378a9.057,9.057 0,0 0,-7 -0.038V6.55a7.2,7.2 0,0 1,7 0.035Z"/>
15+
</group>
16+
</vector>

‎androidVariant/src/main/res/drawable-anydpi/ic_delete_comics.xml‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="24dp"
3+
android:height="24dp"
4+
android:viewportWidth="32"
5+
android:viewportHeight="32"
6+
android:tint="#333333"
7+
android:alpha="0.6">
8+
<path
9+
android:fillColor="#FF000000"
10+
android:pathData="M29.89,6.55l-1,-2A1,1 0,0 0,28 4H21V2a2,2 0,0 0,-2 -2H13a2,2 0,0 0,-2 2V4H4a1,1 0,0 0,-0.89 0.55l-1,2A1,1 0,0 0,3 8H5V30a2,2 0,0 0,0.47 1.41A2,2 0,0 0,7 32H25a2,2 0,0 0,2 -2V8h2a1,1 0,0 0,0.89 -1.45ZM13,2h6V4H13ZM25,30H7V8H25Z"/>
11+
<path
12+
android:fillColor="#FF000000"
13+
android:pathData="M17,26V10a2,2 0,0 0,-2 2l0.06,14H15v2A2,2 0,0 0,17 26Z"/>
14+
<path
15+
android:fillColor="#FF000000"
16+
android:pathData="M22,26V10a2,2 0,0 0,-2 2l0.06,14H20v2A2,2 0,0 0,22 26Z"/>
17+
<path
18+
android:fillColor="#FF000000"
19+
android:pathData="M12,26V10a2,2 0,0 0,-2 2l0.06,14H10v2A2,2 0,0 0,12 26Z"/>
20+
</vector>

‎androidVariant/src/main/res/drawable-anydpi/ic_settings.xml‎

Lines changed: 19 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,19 @@
1+
<vector xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:width="24dp"
3+
android:height="24dp"
4+
android:viewportWidth="32"
5+
android:viewportHeight="32"
6+
android:tint="#333333"
7+
android:alpha="0.6">
8+
<group android:scaleX="1.0909091"
9+
android:scaleY="1.0909091"
10+
android:translateX="-1.4545455"
11+
android:translateY="-1.4545455">
12+
<path
13+
android:pathData="M27.92,18.46l-1.14,-0.92a0.86,0.86 0,0 1,-0.31 -0.65V15.2a0.83,0.83 0,0 1,0.31 -0.65l1.11,-0.89A2.86,2.86 0,0 0,28.54 10L27.42,8.12A2.76,2.76 0,0 0,24.21 6.9l-1.82,0.58a0.73,0.73 0,0 1,-0.64 -0.09l-1.23,-0.81A0.8,0.8 0,0 1,20.16 6L19.92,4.4A2.77,2.77 0,0 0,17.18 2H14.93a2.79,2.79 0,0 0,-2.77 2.51L12,6a0.8,0.8 0,0 1,-0.41 0.63L10,7.48a0.79,0.79 0,0 1,-0.67 0L8.08,7A2.75,2.75 0,0 0,4.62 8.1L3.48,10a2.84,2.84 0,0 0,0.57 3.64L5.4,14.75a0.87,0.87 0,0 1,0.29 0.62l0,1.27a0.87,0.87 0,0 1,-0.28 0.65L4,18.61a2.85,2.85 0,0 0,-0.57 3.52l1,1.84a2.77,2.77 0,0 0,3.42 1.22l1.62,-0.63a0.73,0.73 0,0 1,0.66 0.05l1.4,0.84a0.76,0.76 0,0 1,0.38 0.55l0.32,1.66A2.81,2.81 0,0 0,15 29.94h2.15a2.79,2.79 0,0 0,2.75 -2.39l0.26,-1.65a0.85,0.85 0,0 1,0.4 -0.6l1.3,-0.74a0.78,0.78 0,0 1,0.65 0l1.64,0.63a2.76,2.76 0,0 0,3.37 -1.2l1.08,-1.83A2.86,2.86 0,0 0,27.92 18.46ZM26.85,21.1l-1.08,1.83a0.78,0.78 0,0 1,-0.94 0.34l-1.64,-0.63a2.77,2.77 0,0 0,-2.35 0.19l-1.3,0.74a2.81,2.81 0,0 0,-1.39 2l-0.26,1.66a0.78,0.78 0,0 1,-0.77 0.69H15a0.79,0.79 0,0 1,-0.77 -0.66l-0.32,-1.66a2.81,2.81 0,0 0,-1.33 -1.89l-1.4,-0.84a2.73,2.73 0,0 0,-1.41 -0.39,2.91 2.91,0 0,0 -1,0.19l-1.62,0.64a0.77,0.77 0,0 1,-1 -0.35l-1,-1.84a0.84,0.84 0,0 1,0.16 -1l1.48,-1.32a2.87,2.87 0,0 0,0.94 -2.17l0,-1.27a2.9,2.9 0,0 0,-1 -2.11L5.36,12.08A0.85,0.85 0,0 1,5.19 11L6.33,9.14a0.76,0.76 0,0 1,1 -0.32l1.25,0.53A2.72,2.72 0,0 0,11 9.23l1.61,-0.89A2.81,2.81 0,0 0,14 6.17l0.16,-1.46A0.79,0.79 0,0 1,14.93 4h2.24a0.79,0.79 0,0 1,0.78 0.7l0.23,1.61a2.85,2.85 0,0 0,1.24 2l1.23,0.8A2.72,2.72 0,0 0,23 9.38l1.82,-0.57a0.76,0.76 0,0 1,0.89 0.34L26.83,11a0.86,0.86 0,0 1,-0.19 1.09L25.53,13a2.84,2.84 0,0 0,-1.06 2.22v1.69a2.81,2.81 0,0 0,1.05 2.2l1.14,0.92A0.86,0.86 0,0 1,26.85 21.1Z"
14+
android:fillColor="#231f20"/>
15+
<path
16+
android:pathData="M16,11a5,5 0,1 0,5 5A5,5 0,0 0,16 11ZM16,19a3,3 0,1 1,3 -3A3,3 0,0 1,16 19.07Z"
17+
android:fillColor="#231f20"/>
18+
</group>
19+
</vector>

‎androidVariant/src/main/res/drawable-hdpi/ic_browse_library.png‎

633 Bytes
Loading

‎androidVariant/src/main/res/drawable-hdpi/ic_comic_library.png‎

494 Bytes
Loading

‎androidVariant/src/main/res/drawable-hdpi/ic_delete_comics.png‎

509 Bytes
Loading

0 commit comments

Comments
 (0)