From 8807eaccc921d6e8535a40421fd58d8c71cee17f Mon Sep 17 00:00:00 2001 From: Soren Stoutner Date: Wed, 8 Nov 2017 15:30:24 -0700 Subject: [PATCH] Fix a crach when editing a bookmark in the bookmarks drawer. https://redmine.stoutner.com/issues/225 --- app/src/main/assets/de/about_changelog_dark.html | 2 +- app/src/main/assets/de/about_changelog_light.html | 2 +- app/src/main/assets/en/about_changelog_dark.html | 2 +- app/src/main/assets/en/about_changelog_light.html | 2 +- app/src/main/assets/es/about_changelog_dark.html | 2 +- app/src/main/assets/es/about_changelog_light.html | 2 +- app/src/main/assets/it/about_changelog_dark.html | 2 +- app/src/main/assets/it/about_changelog_light.html | 2 +- .../color/bookmarks_spinner_color_selector_dark.xml | 2 +- .../edit_bookmark_spinner_color_selector_dark.xml | 3 +-- app/src/main/res/layout/domain_settings_fragment.xml | 12 ++++++------ .../layout/domain_settings_spinner_dropdown_item.xml | 1 - .../main/res/layout/domain_settings_spinner_item.xml | 2 +- .../res/layout/edit_bookmark_databaseview_dialog.xml | 10 +++++----- .../edit_bookmark_databaseview_spinner_item.xml | 2 +- app/src/main/res/layout/edit_bookmark_dialog.xml | 4 ++-- .../edit_bookmark_folder_databaseview_dialog.xml | 12 ++++++------ .../main/res/layout/edit_bookmark_folder_dialog.xml | 6 +++--- app/src/main/res/values/attrs.xml | 1 - app/src/main/res/values/styles.xml | 3 +-- 20 files changed, 35 insertions(+), 39 deletions(-) diff --git a/app/src/main/assets/de/about_changelog_dark.html b/app/src/main/assets/de/about_changelog_dark.html index 40340c79..115101be 100644 --- a/app/src/main/assets/de/about_changelog_dark.html +++ b/app/src/main/assets/de/about_changelog_dark.html @@ -30,7 +30,7 @@

2.7 (version code 27)

7. November 2017 - minimum API 19, target API 26

Add a bookmarks drawer that is accessed by sliding from the right.
Prevent Night Mode from flashing a white background when loading new pages.

2.7 (version code 27)

7. November 2017 - minimum API 19, target API 26

Add a bookmarks drawer that is accessed by sliding from the right.
Prevent Night Mode from flashing a white background when loading new pages.

2.7 (version code 27)

7 November 2017 - minimum API 19, target API 26

Add a bookmarks drawer that is accessed by sliding from the right.
Prevent Night Mode from flashing a white background when loading new pages.

2.7 (version code 27)

7 November 2017 - minimum API 19, target API 26

Add a bookmarks drawer that is accessed by sliding from the right.
Prevent Night Mode from flashing a white background when loading new pages.

2.7 (cÃ³digo de versiÃ³n 27)

7 de noviembre de 2017 - API mÃnimo 19, API dirigido 26

AÃ±adir un cajÃ³n de favoritos al que se accede deslizando desde la derecha.
Evitar que el Modo Noche parpadee sobre un fondo blanco al cargar pÃ¡ginas nuevas.

2.7 (cÃ³digo de versiÃ³n 27)

7 de noviembre de 2017 - API mÃnimo 19, API dirigido 26

AÃ±adir un cajÃ³n de favoritos al que se accede deslizando desde la derecha.
Evitar que el Modo Noche parpadee sobre un fondo blanco al cargar pÃ¡ginas nuevas.

2.7 (version code 27)

7 Novembre 2017 - minima API 19, target API 26

Aggiunta di un cassetto dei segnalibri accessibile scorrendo da destra.
Corretto un difetto della ModalitÃ Notte per cui appariva uno sfondo bianco durante il caricamento di pagine nuove.

2.7 (version code 27)

7 Novembre 2017 - minima API 19, target API 26

Aggiunta di un cassetto dei segnalibri accessibile scorrendo da destra.
Corretto un difetto della ModalitÃ Notte per cui appariva uno sfondo bianco durante il caricamento di pagine nuove.

- +

- - +

+ android:textColor="?android:textColorPrimary" /> + android:textColor="?android:textColorPrimary" /> @@ -171,7 +171,7 @@ android:layout_width="wrap_content" android:text="@string/folder" android:textSize="18sp" - android:textColor="?attr/primaryTextColorSelector" /> + android:textColor="?android:textColorPrimary" /> diff --git a/app/src/main/res/layout/edit_bookmark_databaseview_spinner_item.xml b/app/src/main/res/layout/edit_bookmark_databaseview_spinner_item.xml index d06d7cfd..0896cffc 100644 --- a/app/src/main/res/layout/edit_bookmark_databaseview_spinner_item.xml +++ b/app/src/main/res/layout/edit_bookmark_databaseview_spinner_item.xml @@ -28,4 +28,4 @@ android:paddingStart="10dp" android:paddingEnd="10dp" android:textSize="18sp" - android:textColor="?attr/primaryTextColorSelector" /> \ No newline at end of file + android:textColor="?android:textColorPrimary" /> \ No newline at end of file diff --git a/app/src/main/res/layout/edit_bookmark_dialog.xml b/app/src/main/res/layout/edit_bookmark_dialog.xml index 5e7afddb..1184805e 100644 --- a/app/src/main/res/layout/edit_bookmark_dialog.xml +++ b/app/src/main/res/layout/edit_bookmark_dialog.xml @@ -75,7 +75,7 @@ android:layout_marginBottom="4dp" android:text="@string/current_bookmark_icon" android:textSize="18sp" - android:textColor="?attr/primaryTextColorSelector" /> + android:textColor="?android:textColorPrimary" /> + android:textColor="?android:textColorPrimary" /> diff --git a/app/src/main/res/layout/edit_bookmark_folder_databaseview_dialog.xml b/app/src/main/res/layout/edit_bookmark_folder_databaseview_dialog.xml index 72acc7ef..6ea35eeb 100644 --- a/app/src/main/res/layout/edit_bookmark_folder_databaseview_dialog.xml +++ b/app/src/main/res/layout/edit_bookmark_folder_databaseview_dialog.xml @@ -46,7 +46,7 @@ android:layout_width="wrap_content" android:text="@string/database_id" android:textSize="18sp" - android:textColor="?attr/primaryTextColorSelector" + android:textColor="?android:textColorPrimary" android:layout_marginEnd="8dp" /> + android:textColor="?android:textColorPrimary" /> + android:textColor="?android:textColorPrimary" /> + android:textColor="?android:textColorPrimary" /> @@ -171,7 +171,7 @@ android:layout_width="wrap_content" android:text="@string/parent_folder" android:textSize="18sp" - android:textColor="?attr/primaryTextColorSelector" /> + android:textColor="?android:textColorPrimary" /> 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 8b1f5876..9bed6a40 100644 --- a/app/src/main/res/layout/edit_bookmark_folder_dialog.xml +++ b/app/src/main/res/layout/edit_bookmark_folder_dialog.xml @@ -87,7 +87,7 @@ android:layout_marginBottom="4dp" android:text="@string/current_folder_icon" android:textSize="18sp" - android:textColor="?attr/primaryTextColorSelector" /> + android:textColor="?android:textColorPrimary" /> + android:textColor="?android:textColorPrimary" /> + android:textColor="?android:textColorPrimary" /> diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml index 72e4c3e1..e6544ce1 100644 --- a/app/src/main/res/values/attrs.xml +++ b/app/src/main/res/values/attrs.xml @@ -31,7 +31,6 @@ - diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 343cebaa..8f9c5939 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -24,6 +24,7 @@