diff --git a/app/src/main/kotlin/at/bitfire/davdroid/ui/composable/CardWithImage.kt b/app/src/main/kotlin/at/bitfire/davdroid/ui/composable/CardWithImage.kt index 701100f3..d23fe8de 100644 --- a/app/src/main/kotlin/at/bitfire/davdroid/ui/composable/CardWithImage.kt +++ b/app/src/main/kotlin/at/bitfire/davdroid/ui/composable/CardWithImage.kt @@ -24,7 +24,6 @@ import androidx.compose.ui.Modifier import androidx.compose.ui.graphics.painter.Painter import androidx.compose.ui.graphics.vector.ImageVector import androidx.compose.ui.layout.ContentScale -import androidx.compose.ui.res.dimensionResource import androidx.compose.ui.res.painterResource import androidx.compose.ui.tooling.preview.Preview import androidx.compose.ui.unit.dp @@ -54,7 +53,7 @@ fun CardWithImage( contentDescription = imageContentDescription, modifier = Modifier .fillMaxWidth() - .heightIn(max = dimensionResource(R.dimen.card_theme_max_height)), + .heightIn(max = 126.dp), contentScale = imageContentScale, alignment = imageAlignment ) diff --git a/app/src/main/res/drawable-hdpi/ic_storage_notify.png b/app/src/main/res/drawable-hdpi/ic_storage_notify.png index 12bbcb33..e69de29b 100644 Binary files a/app/src/main/res/drawable-hdpi/ic_storage_notify.png and b/app/src/main/res/drawable-hdpi/ic_storage_notify.png differ diff --git a/app/src/main/res/drawable-mdpi/ic_storage_notify.png b/app/src/main/res/drawable-mdpi/ic_storage_notify.png index 1a8b1bdc..e69de29b 100644 Binary files a/app/src/main/res/drawable-mdpi/ic_storage_notify.png and b/app/src/main/res/drawable-mdpi/ic_storage_notify.png differ diff --git a/app/src/main/res/drawable-xhdpi/ic_storage_notify.png b/app/src/main/res/drawable-xhdpi/ic_storage_notify.png index d57b3b47..e69de29b 100644 Binary files a/app/src/main/res/drawable-xhdpi/ic_storage_notify.png and b/app/src/main/res/drawable-xhdpi/ic_storage_notify.png differ diff --git a/app/src/main/res/drawable-xxhdpi/ic_storage_notify.png b/app/src/main/res/drawable-xxhdpi/ic_storage_notify.png index cf3a5370..e69de29b 100644 Binary files a/app/src/main/res/drawable-xxhdpi/ic_storage_notify.png and b/app/src/main/res/drawable-xxhdpi/ic_storage_notify.png differ diff --git a/app/src/main/res/drawable/accounts_background.xml b/app/src/main/res/drawable/accounts_background.xml index a29c7c88..889f73ef 100644 --- a/app/src/main/res/drawable/accounts_background.xml +++ b/app/src/main/res/drawable/accounts_background.xml @@ -12,77 +12,77 @@ android:strokeAlpha="0.3" android:strokeWidth="4" android:fillColor="#00000000" - android:strokeColor="@color/accounts_background_blue" + android:strokeColor="#2196f3" android:fillAlpha="0.3"/> + android:fillColor="#f2f2f2"/> @@ -99,7 +99,7 @@ + android:fillColor="#f2f2f2"/> @@ -107,22 +107,22 @@ + android:fillColor="#f2f2f2"/> + android:fillColor="#f2f2f2"/> + android:fillColor="#9e9e9e"/> + android:fillColor="#fff"/> @@ -130,60 +130,60 @@ + android:fillColor="#fff"/> + android:fillColor="#9e9e9e"/> + android:fillColor="#9e9e9e"/> + android:fillColor="#9e9e9e"/> + android:fillColor="#fff"/> diff --git a/app/src/main/res/drawable/ic_adb.xml b/app/src/main/res/drawable/ic_adb.xml deleted file mode 100644 index 767e56de..00000000 --- a/app/src/main/res/drawable/ic_adb.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_add_white.xml b/app/src/main/res/drawable/ic_add_white.xml deleted file mode 100644 index c9fd7462..00000000 --- a/app/src/main/res/drawable/ic_add_white.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - diff --git a/app/src/main/res/drawable/ic_attach_money.xml b/app/src/main/res/drawable/ic_attach_money.xml deleted file mode 100644 index 52460a8d..00000000 --- a/app/src/main/res/drawable/ic_attach_money.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_bug_report.xml b/app/src/main/res/drawable/ic_bug_report.xml deleted file mode 100644 index 2629b476..00000000 --- a/app/src/main/res/drawable/ic_bug_report.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_cloud_off.xml b/app/src/main/res/drawable/ic_cloud_off.xml deleted file mode 100644 index 261561f8..00000000 --- a/app/src/main/res/drawable/ic_cloud_off.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_contacts.xml b/app/src/main/res/drawable/ic_contacts.xml deleted file mode 100644 index b6b0488d..00000000 --- a/app/src/main/res/drawable/ic_contacts.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_date_range.xml b/app/src/main/res/drawable/ic_date_range.xml deleted file mode 100644 index ce87ce79..00000000 --- a/app/src/main/res/drawable/ic_date_range.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_error.xml b/app/src/main/res/drawable/ic_error.xml deleted file mode 100644 index bbf8a3df..00000000 --- a/app/src/main/res/drawable/ic_error.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_folder_refresh_outline.xml b/app/src/main/res/drawable/ic_folder_refresh_outline.xml deleted file mode 100644 index b72d5670..00000000 --- a/app/src/main/res/drawable/ic_folder_refresh_outline.xml +++ /dev/null @@ -1 +0,0 @@ - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_forum.xml b/app/src/main/res/drawable/ic_forum.xml deleted file mode 100644 index 08ff19e6..00000000 --- a/app/src/main/res/drawable/ic_forum.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_group.xml b/app/src/main/res/drawable/ic_group.xml deleted file mode 100644 index 3bb857fc..00000000 --- a/app/src/main/res/drawable/ic_group.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_help.xml b/app/src/main/res/drawable/ic_help.xml deleted file mode 100644 index 4aed278e..00000000 --- a/app/src/main/res/drawable/ic_help.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_home.xml b/app/src/main/res/drawable/ic_home.xml deleted file mode 100644 index 1eea3d0d..00000000 --- a/app/src/main/res/drawable/ic_home.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_info.xml b/app/src/main/res/drawable/ic_info.xml deleted file mode 100644 index 564f9121..00000000 --- a/app/src/main/res/drawable/ic_info.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_invert_colors.xml b/app/src/main/res/drawable/ic_invert_colors.xml deleted file mode 100644 index 05947da5..00000000 --- a/app/src/main/res/drawable/ic_invert_colors.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_journals.xml b/app/src/main/res/drawable/ic_journals.xml deleted file mode 100644 index 97187f4d..00000000 --- a/app/src/main/res/drawable/ic_journals.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_login.xml b/app/src/main/res/drawable/ic_login.xml deleted file mode 100644 index 57aef3dc..00000000 --- a/app/src/main/res/drawable/ic_login.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_network_wifi.xml b/app/src/main/res/drawable/ic_network_wifi.xml deleted file mode 100644 index 50f0185c..00000000 --- a/app/src/main/res/drawable/ic_network_wifi.xml +++ /dev/null @@ -1,14 +0,0 @@ - - - - diff --git a/app/src/main/res/drawable/ic_notifications.xml b/app/src/main/res/drawable/ic_notifications.xml deleted file mode 100644 index 9f3a29db..00000000 --- a/app/src/main/res/drawable/ic_notifications.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_playlist_add_check.xml b/app/src/main/res/drawable/ic_playlist_add_check.xml deleted file mode 100644 index 81bdf77b..00000000 --- a/app/src/main/res/drawable/ic_playlist_add_check.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_remove.xml b/app/src/main/res/drawable/ic_remove.xml deleted file mode 100644 index 8561a339..00000000 --- a/app/src/main/res/drawable/ic_remove.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_remove_circle.xml b/app/src/main/res/drawable/ic_remove_circle.xml deleted file mode 100644 index 4865efcb..00000000 --- a/app/src/main/res/drawable/ic_remove_circle.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_today.xml b/app/src/main/res/drawable/ic_today.xml deleted file mode 100644 index 5d4d3759..00000000 --- a/app/src/main/res/drawable/ic_today.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - diff --git a/app/src/main/res/menu/activity_login.xml b/app/src/main/res/menu/activity_login.xml deleted file mode 100644 index 0649926f..00000000 --- a/app/src/main/res/menu/activity_login.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/values-h480dp/dimen.xml b/app/src/main/res/values-h480dp/dimen.xml deleted file mode 100644 index 3aecfba3..00000000 --- a/app/src/main/res/values-h480dp/dimen.xml +++ /dev/null @@ -1,4 +0,0 @@ - - - 252dp - \ No newline at end of file diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml deleted file mode 100644 index f93c030b..00000000 --- a/app/src/main/res/values-night/colors.xml +++ /dev/null @@ -1,8 +0,0 @@ - - - #186DB1 - #61AAB3 - #919191 - #C6C6C6 - #474747 - \ No newline at end of file diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml deleted file mode 100644 index c315d314..00000000 --- a/app/src/main/res/values/attrs.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 3f331461..62ec229f 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -3,10 +3,4 @@ #7cb342 #aee571 #4b830d - - #2196f3 - #80deea - #f2f2f2 - #fff - #9e9e9e \ No newline at end of file diff --git a/app/src/main/res/values/dimen.xml b/app/src/main/res/values/dimen.xml deleted file mode 100644 index e612ca20..00000000 --- a/app/src/main/res/values/dimen.xml +++ /dev/null @@ -1,13 +0,0 @@ - - - 8dp - - 126dp - 16dp - 12dp - - 16dp - - 16dp - - \ No newline at end of file diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index c6480a95..314c47f6 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -17,10 +17,4 @@ @android:color/white - - - - \ No newline at end of file