Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -26,4 +26,4 @@ To achieve these goals, the project will:

# Credits

[Reshot](https://www.reshot.com/free-svg-icons/) - for toolbar icons.
[UXWing](https://www.uxwing.com/) for icons used in the app.

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -116,7 +116,7 @@ fun PageNavigationView(
}
) {
Icon(
painterResource(R.drawable.ic_close),
painterResource(R.drawable.ic_close_comic),
contentDescription = stringResource(R.string.stopReadingLabel),
)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,23 +24,24 @@ import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.foundation.layout.padding
import androidx.compose.material.icons.Icons
import androidx.compose.material.icons.filled.MoreVert
import androidx.compose.material3.CardDefaults
import androidx.compose.material3.ElevatedCard
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.MaterialTheme
import androidx.compose.material3.MaterialTheme.colorScheme
import androidx.compose.material3.Text
import androidx.compose.runtime.Composable
import androidx.compose.ui.Alignment
import androidx.compose.ui.Modifier
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextAlign
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.tooling.preview.Preview
import androidx.compose.ui.unit.dp
import org.comixedproject.variant.android.DIRECTORY_LIST
import org.comixedproject.variant.android.R
import org.comixedproject.variant.android.VariantTheme
import org.comixedproject.variant.model.library.DirectoryEntry
import org.comixedproject.variant.platform.Log
Expand Down Expand Up @@ -69,6 +70,17 @@ fun DirectoryItemView(
horizontalArrangement = Arrangement.SpaceBetween,
modifier = Modifier.fillMaxWidth(),
) {
IconButton(
onClick = {
Log.info(TAG, "Loading path: ${directoryEntry.path}")
onLoadDirectory(directoryEntry.path)
}
) {
Icon(
painterResource(R.drawable.ic_browse_directory),
contentDescription = directoryEntry.path,
)
}
Text(
text = "${directoryEntry.title}",
style = MaterialTheme.typography.bodyLarge,
Expand All @@ -78,8 +90,6 @@ fun DirectoryItemView(
overflow = TextOverflow.Ellipsis,
modifier = Modifier.weight(1f),
)

Icon(Icons.Default.MoreVert, contentDescription = directoryEntry.title)
}
}
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ fun FileItemView(
if (comicBookFilenameList.contains(fileEntry.filename)) {
IconButton(onClick = {}, enabled = downloadingState.size < 5) {
Icon(
painterResource(id = R.drawable.ic_downloaded_file),
painterResource(id = R.drawable.ic_comic_downloaded),
contentDescription = fileEntry.title,
)
}
Expand All @@ -83,15 +83,15 @@ fun FileItemView(
enabled = downloadingState.size < 5,
) {
Icon(
painterResource(R.drawable.ic_download_file),
painterResource(R.drawable.ic_comic_download),
contentDescription = fileEntry.title,
)
}
}
} else {
IconButton(onClick = {}, enabled = downloadingState.size < 5) {
Icon(
painterResource(R.drawable.ic_downloading_file),
painterResource(R.drawable.ic_comic_downloading),
contentDescription = fileEntry.title,
)
}
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -22,8 +22,8 @@ import androidx.compose.foundation.layout.Column
import androidx.compose.foundation.layout.Row
import androidx.compose.foundation.layout.Spacer
import androidx.compose.foundation.layout.fillMaxWidth
import androidx.compose.material3.Button
import androidx.compose.material3.Icon
import androidx.compose.material3.IconButton
import androidx.compose.material3.Text
import androidx.compose.material3.TextField
import androidx.compose.runtime.Composable
Expand Down Expand Up @@ -91,7 +91,7 @@ fun EditServerView(
Row(modifier = Modifier.fillMaxWidth()) {
Spacer(modifier = Modifier.weight(1f))

Button(
IconButton(
onClick = { onSave(addressValue, usernameValue, passwordValue) },
enabled = validForm,
) {
Expand All @@ -101,7 +101,7 @@ fun EditServerView(
)
}

Button(
IconButton(
onClick = {
addressValue = address
usernameValue = username
Expand Down
11 changes: 0 additions & 11 deletions androidVariant/src/main/res/drawable-anydpi/ic_back.xml

This file was deleted.

17 changes: 0 additions & 17 deletions androidVariant/src/main/res/drawable-anydpi/ic_cancel.xml

This file was deleted.

23 changes: 0 additions & 23 deletions androidVariant/src/main/res/drawable-anydpi/ic_close.xml

This file was deleted.

20 changes: 0 additions & 20 deletions androidVariant/src/main/res/drawable-anydpi/ic_delete_comics.xml

This file was deleted.

20 changes: 0 additions & 20 deletions androidVariant/src/main/res/drawable-anydpi/ic_download_file.xml

This file was deleted.

11 changes: 0 additions & 11 deletions androidVariant/src/main/res/drawable-anydpi/ic_downloaded_file.xml

This file was deleted.

This file was deleted.

14 changes: 0 additions & 14 deletions androidVariant/src/main/res/drawable-anydpi/ic_next_page.xml

This file was deleted.

14 changes: 0 additions & 14 deletions androidVariant/src/main/res/drawable-anydpi/ic_previous_page.xml

This file was deleted.

14 changes: 0 additions & 14 deletions androidVariant/src/main/res/drawable-anydpi/ic_save.xml

This file was deleted.

This file was deleted.

This file was deleted.

Binary file removed androidVariant/src/main/res/drawable-hdpi/ic_back.png
Binary file not shown.
Binary file removed androidVariant/src/main/res/drawable-hdpi/ic_cancel.png
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed androidVariant/src/main/res/drawable-hdpi/ic_save.png
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed androidVariant/src/main/res/drawable-mdpi/ic_back.png
Binary file not shown.
Binary file removed androidVariant/src/main/res/drawable-mdpi/ic_cancel.png
Binary file not shown.
Binary file removed androidVariant/src/main/res/drawable-mdpi/ic_close.png
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed androidVariant/src/main/res/drawable-mdpi/ic_save.png
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file removed androidVariant/src/main/res/drawable-xhdpi/ic_back.png
Binary file not shown.
Binary file removed androidVariant/src/main/res/drawable-xhdpi/ic_cancel.png
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Binary file removed androidVariant/src/main/res/drawable-xxhdpi/ic_back.png
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Diff not rendered.
Loading