Skip to content

Commit 97ab9a7

Browse files
committed
Changed from using Material icons to use project icons [#162]
1 parent 93ad86d commit 97ab9a7

79 files changed

Lines changed: 144 additions & 266 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

README.md

Lines changed: 1 addition & 1 deletion

androidVariant/src/main/java/org/comixedproject/variant/android/ui/DismissBackground.kt

Lines changed: 0 additions & 57 deletions
This file was deleted.

androidVariant/src/main/java/org/comixedproject/variant/android/view/reading/PageNavigationView.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ fun PageNavigationView(
116116
}
117117
) {
118118
Icon(
119-
painterResource(R.drawable.ic_close),
119+
painterResource(R.drawable.ic_close_comic),
120120
contentDescription = stringResource(R.string.stopReadingLabel),
121121
)
122122
}

androidVariant/src/main/java/org/comixedproject/variant/android/view/server/DirectoryItemView.kt

Lines changed: 14 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -24,23 +24,24 @@ import androidx.compose.foundation.layout.Column
2424
import androidx.compose.foundation.layout.Row
2525
import androidx.compose.foundation.layout.fillMaxWidth
2626
import androidx.compose.foundation.layout.padding
27-
import androidx.compose.material.icons.Icons
28-
import androidx.compose.material.icons.filled.MoreVert
2927
import androidx.compose.material3.CardDefaults
3028
import androidx.compose.material3.ElevatedCard
3129
import androidx.compose.material3.Icon
30+
import androidx.compose.material3.IconButton
3231
import androidx.compose.material3.MaterialTheme
3332
import androidx.compose.material3.MaterialTheme.colorScheme
3433
import androidx.compose.material3.Text
3534
import androidx.compose.runtime.Composable
3635
import androidx.compose.ui.Alignment
3736
import androidx.compose.ui.Modifier
37+
import androidx.compose.ui.res.painterResource
3838
import androidx.compose.ui.text.font.FontWeight
3939
import androidx.compose.ui.text.style.TextAlign
4040
import androidx.compose.ui.text.style.TextOverflow
4141
import androidx.compose.ui.tooling.preview.Preview
4242
import androidx.compose.ui.unit.dp
4343
import org.comixedproject.variant.android.DIRECTORY_LIST
44+
import org.comixedproject.variant.android.R
4445
import org.comixedproject.variant.android.VariantTheme
4546
import org.comixedproject.variant.model.library.DirectoryEntry
4647
import org.comixedproject.variant.platform.Log
@@ -69,6 +70,17 @@ fun DirectoryItemView(
6970
horizontalArrangement = Arrangement.SpaceBetween,
7071
modifier = Modifier.fillMaxWidth(),
7172
) {
73+
IconButton(
74+
onClick = {
75+
Log.info(TAG, "Loading path: ${directoryEntry.path}")
76+
onLoadDirectory(directoryEntry.path)
77+
}
78+
) {
79+
Icon(
80+
painterResource(R.drawable.ic_browse_directory),
81+
contentDescription = directoryEntry.path,
82+
)
83+
}
7284
Text(
7385
text = "${directoryEntry.title}",
7486
style = MaterialTheme.typography.bodyLarge,
@@ -78,8 +90,6 @@ fun DirectoryItemView(
7890
overflow = TextOverflow.Ellipsis,
7991
modifier = Modifier.weight(1f),
8092
)
81-
82-
Icon(Icons.Default.MoreVert, contentDescription = directoryEntry.title)
8393
}
8494
}
8595
}

androidVariant/src/main/java/org/comixedproject/variant/android/view/server/FileItemView.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -73,7 +73,7 @@ fun FileItemView(
7373
if (comicBookFilenameList.contains(fileEntry.filename)) {
7474
IconButton(onClick = {}, enabled = downloadingState.size < 5) {
7575
Icon(
76-
painterResource(id = R.drawable.ic_downloaded_file),
76+
painterResource(id = R.drawable.ic_comic_downloaded),
7777
contentDescription = fileEntry.title,
7878
)
7979
}
@@ -83,15 +83,15 @@ fun FileItemView(
8383
enabled = downloadingState.size < 5,
8484
) {
8585
Icon(
86-
painterResource(R.drawable.ic_download_file),
86+
painterResource(R.drawable.ic_comic_download),
8787
contentDescription = fileEntry.title,
8888
)
8989
}
9090
}
9191
} else {
9292
IconButton(onClick = {}, enabled = downloadingState.size < 5) {
9393
Icon(
94-
painterResource(R.drawable.ic_downloading_file),
94+
painterResource(R.drawable.ic_comic_downloading),
9595
contentDescription = fileEntry.title,
9696
)
9797
}

androidVariant/src/main/java/org/comixedproject/variant/android/view/settings/EditServerView.kt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -22,8 +22,8 @@ import androidx.compose.foundation.layout.Column
2222
import androidx.compose.foundation.layout.Row
2323
import androidx.compose.foundation.layout.Spacer
2424
import androidx.compose.foundation.layout.fillMaxWidth
25-
import androidx.compose.material3.Button
2625
import androidx.compose.material3.Icon
26+
import androidx.compose.material3.IconButton
2727
import androidx.compose.material3.Text
2828
import androidx.compose.material3.TextField
2929
import androidx.compose.runtime.Composable
@@ -91,7 +91,7 @@ fun EditServerView(
9191
Row(modifier = Modifier.fillMaxWidth()) {
9292
Spacer(modifier = Modifier.weight(1f))
9393

94-
Button(
94+
IconButton(
9595
onClick = { onSave(addressValue, usernameValue, passwordValue) },
9696
enabled = validForm,
9797
) {
@@ -101,7 +101,7 @@ fun EditServerView(
101101
)
102102
}
103103

104-
Button(
104+
IconButton(
105105
onClick = {
106106
addressValue = address
107107
usernameValue = username

androidVariant/src/main/res/drawable-anydpi/ic_back.xml

Lines changed: 0 additions & 11 deletions
This file was deleted.

androidVariant/src/main/res/drawable-anydpi/ic_cancel.xml

Lines changed: 0 additions & 17 deletions
This file was deleted.

androidVariant/src/main/res/drawable-anydpi/ic_close.xml

Lines changed: 0 additions & 23 deletions
This file was deleted.

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

Lines changed: 0 additions & 20 deletions
This file was deleted.

0 commit comments

Comments
 (0)