From 0e0e9f5c67bdc06877cbd19254fef6fc6cb69f2d Mon Sep 17 00:00:00 2001 From: Soren Stoutner Date: Sat, 6 Mar 2021 16:13:43 -0700 Subject: [PATCH] Fix the bookmarks dialogs to align the icons and the radio buttons. https://redmine.stoutner.com/issues/228 --- .idea/dictionaries/soren.xml | 3 + app/build.gradle | 10 +- app/src/main/assets/de/about_changelog.html | 138 ++++---- .../main/assets/de/about_contributors.html | 4 +- app/src/main/assets/de/about_links.html | 6 +- app/src/main/assets/de/guide_overview.html | 8 +- app/src/main/assets/en/about_changelog.html | 140 ++++---- .../main/assets/en/about_contributors.html | 4 +- app/src/main/assets/en/about_links.html | 6 +- app/src/main/assets/en/guide_overview.html | 6 +- app/src/main/assets/es/about_changelog.html | 140 ++++---- .../main/assets/es/about_contributors.html | 4 +- app/src/main/assets/es/about_links.html | 6 +- app/src/main/assets/es/guide_overview.html | 8 +- app/src/main/assets/fr/about_changelog.html | 146 ++++---- .../main/assets/fr/about_contributors.html | 6 +- app/src/main/assets/fr/about_licenses.html | 4 +- app/src/main/assets/fr/about_links.html | 8 +- app/src/main/assets/fr/about_permissions.html | 4 +- .../main/assets/fr/about_privacy_policy.html | 4 +- .../main/assets/fr/guide_domain_settings.html | 4 +- app/src/main/assets/fr/guide_javascript.html | 4 +- .../main/assets/fr/guide_local_storage.html | 4 +- app/src/main/assets/fr/guide_overview.html | 8 +- app/src/main/assets/fr/guide_proxies.html | 4 +- app/src/main/assets/fr/guide_requests.html | 4 +- .../assets/fr/guide_ssl_certificates.html | 4 +- .../main/assets/fr/guide_tracking_ids.html | 4 +- app/src/main/assets/fr/guide_user_agent.html | 4 +- app/src/main/assets/it/about_changelog.html | 140 ++++---- .../main/assets/it/about_contributors.html | 4 +- app/src/main/assets/it/about_links.html | 6 +- app/src/main/assets/it/guide_overview.html | 8 +- .../main/assets/pt-rBR/about_changelog.html | 140 ++++---- .../assets/pt-rBR/about_contributors.html | 4 +- app/src/main/assets/pt-rBR/about_links.html | 6 +- .../assets/pt-rBR/guide_domain_settings.html | 4 +- .../main/assets/pt-rBR/guide_javascript.html | 4 +- .../assets/pt-rBR/guide_local_storage.html | 4 +- .../main/assets/pt-rBR/guide_overview.html | 8 +- app/src/main/assets/pt-rBR/guide_proxies.html | 4 +- .../main/assets/pt-rBR/guide_requests.html | 4 +- .../assets/pt-rBR/guide_ssl_certificates.html | 4 +- .../assets/pt-rBR/guide_tracking_ids.html | 4 +- .../main/assets/pt-rBR/guide_user_agent.html | 4 +- app/src/main/assets/ru/about_changelog.html | 138 ++++---- .../main/assets/ru/about_contributors.html | 4 +- app/src/main/assets/ru/about_links.html | 6 +- app/src/main/assets/ru/guide_overview.html | 6 +- app/src/main/assets/tr/about_changelog.html | 140 ++++---- .../main/assets/tr/about_contributors.html | 4 +- app/src/main/assets/tr/about_links.html | 6 +- app/src/main/assets/tr/guide_overview.html | 6 +- .../activities/BookmarksActivity.java | 40 +-- .../BookmarksDatabaseViewActivity.java | 312 +++++++++--------- .../activities/MainWebViewActivity.java | 24 +- .../dialogs/CreateBookmarkFolderDialog.kt | 38 ++- .../dialogs/EditBookmarkDatabaseViewDialog.kt | 56 +++- .../dialogs/EditBookmarkDialog.kt | 50 ++- .../EditBookmarkFolderDatabaseViewDialog.kt | 86 +++-- .../dialogs/EditBookmarkFolderDialog.kt | 72 +++- .../layout/create_bookmark_folder_dialog.xml | 122 +++---- .../edit_bookmark_databaseview_dialog.xml | 131 ++++---- .../main/res/layout/edit_bookmark_dialog.xml | 120 +++---- ...it_bookmark_folder_databaseview_dialog.xml | 182 +++++----- .../layout/edit_bookmark_folder_dialog.xml | 174 +++++----- app/src/main/res/values-de/strings.xml | 6 +- app/src/main/res/values-es/strings.xml | 6 +- app/src/main/res/values-fr/strings.xml | 6 +- app/src/main/res/values-it/strings.xml | 6 +- app/src/main/res/values-pt-rBR/strings.xml | 6 +- app/src/main/res/values-ru/strings.xml | 6 +- app/src/main/res/values-tr/strings.xml | 6 +- app/src/main/res/values/strings.xml | 6 +- build.gradle | 4 +- .../metadata/android/de-DE/changelogs/47.txt | 2 +- .../metadata/android/de-DE/changelogs/48.txt | 2 +- .../metadata/android/de-DE/changelogs/50.txt | 2 +- .../metadata/android/de-DE/changelogs/52.txt | 2 +- .../android/de-DE/full_description.txt | 6 +- .../metadata/android/en-US/changelogs/47.txt | 2 +- .../metadata/android/en-US/changelogs/48.txt | 2 +- .../metadata/android/en-US/changelogs/50.txt | 2 +- .../metadata/android/en-US/changelogs/52.txt | 2 +- .../android/en-US/full_description.txt | 6 +- .../metadata/android/es-ES/changelogs/47.txt | 2 +- .../metadata/android/es-ES/changelogs/48.txt | 2 +- .../metadata/android/es-ES/changelogs/50.txt | 2 +- .../metadata/android/es-ES/changelogs/52.txt | 2 +- .../android/es-ES/full_description.txt | 6 +- .../metadata/android/fr-FR/changelogs/47.txt | 2 +- .../metadata/android/fr-FR/changelogs/48.txt | 2 +- .../metadata/android/fr-FR/changelogs/50.txt | 2 +- .../metadata/android/fr-FR/changelogs/52.txt | 2 +- .../android/fr-FR/full_description.txt | 6 +- .../metadata/android/it-IT/changelogs/47.txt | 2 +- .../metadata/android/it-IT/changelogs/48.txt | 2 +- .../metadata/android/it-IT/changelogs/50.txt | 2 +- .../metadata/android/it-IT/changelogs/52.txt | 2 +- .../android/it-IT/full_description.txt | 6 +- .../metadata/android/pt-BR/changelogs/52.txt | 2 +- .../metadata/android/ru-RU/changelogs/47.txt | 2 +- .../metadata/android/ru-RU/changelogs/48.txt | 2 +- .../metadata/android/ru-RU/changelogs/50.txt | 2 +- .../metadata/android/ru-RU/changelogs/52.txt | 2 +- .../android/ru-RU/full_description.txt | 6 +- .../metadata/android/tr-TR/changelogs/47.txt | 2 +- .../metadata/android/tr-TR/changelogs/48.txt | 2 +- .../metadata/android/tr-TR/changelogs/50.txt | 2 +- .../metadata/android/tr-TR/changelogs/52.txt | 2 +- .../android/tr-TR/full_description.txt | 6 +- 111 files changed, 1562 insertions(+), 1350 deletions(-) diff --git a/.idea/dictionaries/soren.xml b/.idea/dictionaries/soren.xml index 9e0f62ac..16970c6f 100644 --- a/.idea/dictionaries/soren.xml +++ b/.idea/dictionaries/soren.xml @@ -36,6 +36,7 @@ ciphertext cname commitdiff + conceição coordinatorlayout cors customuseragent @@ -114,6 +115,7 @@ mojeek mozilla navigationview + nazareno nestedscroll nightmode nist @@ -181,6 +183,7 @@ textinputlayout textview theverge + thiago torproject uidh uids diff --git a/app/build.gradle b/app/build.gradle index be417985..4223e3a8 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,5 +1,5 @@ /* - * Copyright © 2016-2020 Soren Stoutner . + * Copyright © 2016-2021 Soren Stoutner . * * This file is part of Privacy Browser . * @@ -81,7 +81,7 @@ dependencies { implementation 'androidx.appcompat:appcompat:1.2.0' implementation 'androidx.cardview:cardview:1.0.0' implementation 'androidx.coordinatorlayout:coordinatorlayout:1.1.0' - implementation "androidx.core:core-ktx:1.3.2" + implementation 'androidx.core:core-ktx:1.3.2' implementation 'androidx.drawerlayout:drawerlayout:1.1.1' implementation 'androidx.preference:preference-ktx:1.1.1' implementation 'androidx.swiperefreshlayout:swiperefreshlayout:1.1.0' @@ -89,11 +89,11 @@ dependencies { implementation 'androidx.webkit:webkit:1.4.0' // Include the Kotlin standard libraries. This should be the same version number listed in project build.gradle. - implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.21" + implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.4.31' // Include the Google material library. - implementation 'com.google.android.material:material:1.2.1' + implementation 'com.google.android.material:material:1.3.0' // Only compile AdMob ads for the free flavor. - freeImplementation 'com.google.android.gms:play-services-ads:19.6.0' + freeImplementation 'com.google.android.gms:play-services-ads:19.7.0' } \ No newline at end of file diff --git a/app/src/main/assets/de/about_changelog.html b/app/src/main/assets/de/about_changelog.html index 8202e0db..f9e99d6c 100644 --- a/app/src/main/assets/de/about_changelog.html +++ b/app/src/main/assets/de/about_changelog.html @@ -1,5 +1,5 @@ + + android:orientation="horizontal" + android:layout_marginTop="12dp" + android:layout_marginBottom="6dp" > - - - - - - - - - - + + + + - - - - - + android:layout_width="wrap_content" + android:layout_marginStart="7dp" + android:layout_gravity="center_vertical" + android:text="@string/default_folder_icon" + android:textSize="18sp" + android:textColor="?android:textColorPrimary" /> + + + + + + + + + + - + - + + android:text="@string/folder_names_must_be_unique" + android:layout_marginStart="7dp" + android:layout_marginEnd="7dp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/edit_bookmark_databaseview_dialog.xml b/app/src/main/res/layout/edit_bookmark_databaseview_dialog.xml index 4c074a49..f20966b9 100644 --- a/app/src/main/res/layout/edit_bookmark_databaseview_dialog.xml +++ b/app/src/main/res/layout/edit_bookmark_databaseview_dialog.xml @@ -1,7 +1,7 @@ + - + + android:orientation="horizontal" + android:layout_marginTop="6dp" + android:layout_marginBottom="6dp" > - - - - - - - - - - + + + + - - - - - + android:layout_width="wrap_content" + android:layout_marginStart="7dp" + android:layout_gravity="center_vertical" + android:text="@string/current_bookmark_icon" + android:textSize="18sp" + android:textColor="?android:textColorPrimary" /> + + + + + + + + + + - + - + - + - + @@ -196,10 +201,10 @@ android:textSize="18sp" android:textColor="?android:textColorPrimary" android:layout_marginEnd="6dp" - android:labelFor="@+id/edit_bookmark_display_order_edittext"/> + android:labelFor="@+id/bookmark_display_order_edittext"/> + + android:orientation="horizontal" + android:layout_marginTop="12dp" + android:layout_marginBottom="6dp" > - - - - - - - - - - + + + + - - - - - + android:layout_width="wrap_content" + android:layout_marginStart="7dp" + android:layout_gravity="center_vertical" + android:text="@string/current_bookmark_icon" + android:textSize="18sp" + android:textColor="?android:textColorPrimary" /> + + + + + + + + + + - + - + - + - + + - + + android:orientation="horizontal" + android:layout_marginTop="6dp" + android:layout_marginBottom="6dp" > - - - - - - - - - - - - + + + + - - - - - - - + android:layout_width="wrap_content" + android:layout_marginStart="7dp" + android:layout_gravity="center_vertical" + android:text="@string/current_folder_icon" + android:textSize="18sp" + android:textColor="?android:textColorPrimary" /> + + + + + + + + + + + + + + + + + + + + - + - + @@ -195,10 +213,10 @@ android:textSize="18sp" android:textColor="?android:textColorPrimary" android:layout_marginEnd="6dp" - android:labelFor="@+id/edit_folder_display_order_edittext"/> + android:labelFor="@+id/display_order_edittext"/> + android:text="@string/folder_names_must_be_unique" + android:layout_marginStart="7dp" + android:layout_marginEnd="7dp" /> \ No newline at end of file diff --git a/app/src/main/res/layout/edit_bookmark_folder_dialog.xml b/app/src/main/res/layout/edit_bookmark_folder_dialog.xml index 9a0b3977..a2a3fc56 100644 --- a/app/src/main/res/layout/edit_bookmark_folder_dialog.xml +++ b/app/src/main/res/layout/edit_bookmark_folder_dialog.xml @@ -1,7 +1,7 @@ + + android:orientation="horizontal" + android:layout_marginTop="12dp" + android:layout_marginBottom="6dp" > - - - - - - - - - - - - + + + + - - - - - - - + android:layout_width="wrap_content" + android:layout_marginStart="7dp" + android:layout_gravity="center_vertical" + android:text="@string/current_folder_icon" + android:textSize="18sp" + android:textColor="?android:textColorPrimary" /> - - + + + + + + + + + + + + + + + + + + + + + - + + android:text="@string/folder_names_must_be_unique" + android:layout_marginStart="7dp" + android:layout_marginEnd="7dp" /> \ No newline at end of file diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index d93564ca..3e593edd 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -1,7 +1,7 @@