Fix a crach when editing a bookmark in the bookmarks drawer. https://redmine.stoutne...

author Soren Stoutner <soren@stoutner.com>

Wed, 8 Nov 2017 22:30:24 +0000 (15:30 -0700)

committer Soren Stoutner <soren@stoutner.com>

Wed, 8 Nov 2017 22:30:24 +0000 (15:30 -0700)
author Soren Stoutner <soren@stoutner.com>
Wed, 8 Nov 2017 22:30:24 +0000 (15:30 -0700)
committer Soren Stoutner <soren@stoutner.com>
Wed, 8 Nov 2017 22:30:24 +0000 (15:30 -0700)
diff --git a/app/src/main/assets/de/about_changelog_dark.html b/app/src/main/assets/de/about_changelog_dark.html

index 40340c794cf304c294a30e3f9fc8e8534da1aa88..115101be6d7d8d6f184134b27d41a53b740caadf 100644 (file)
--- a/app/src/main/assets/de/about_changelog_dark.html
+++ b/app/src/main/assets/de/about_changelog_dark.html
@@ -30,7 +30,7 @@
  
      <body>
          <h3>2.7 (version code 27)</h3>
  
      <body>
          <h3>2.7 (version code 27)</h3>
-        <p>7. November 2017 - minimum API 19, target API 26</p>
+        <p><a href="https://git.stoutner.com/?p=PrivacyBrowser.git;a=commitdiff;h=eb9bc527c37223964f7c00592df982b47ff2f81c">7. November 2017</a> - minimum API 19, target API 26</p>
          <ul>
              <li>Add a <a href="https://redmine.stoutner.com/issues/132">bookmarks drawer</a> that is accessed by sliding from the right.</li>
              <li>Prevent Night Mode from <a href="https://redmine.stoutner.com/issues/213">flashing a white background</a> when loading new pages.</li>
          <ul>
              <li>Add a <a href="https://redmine.stoutner.com/issues/132">bookmarks drawer</a> that is accessed by sliding from the right.</li>
              <li>Prevent Night Mode from <a href="https://redmine.stoutner.com/issues/213">flashing a white background</a> when loading new pages.</li>
diff --git a/app/src/main/assets/de/about_changelog_light.html b/app/src/main/assets/de/about_changelog_light.html

index 7c661567425daef8864d51c0550dffef6c8829a7..4ab95add6be440f8ebd5cf91dab20ff621ef393e 100644 (file)
--- a/app/src/main/assets/de/about_changelog_light.html
+++ b/app/src/main/assets/de/about_changelog_light.html
@@ -30,7 +30,7 @@
  
      <body>
          <h3>2.7 (version code 27)</h3>
  
      <body>
          <h3>2.7 (version code 27)</h3>
-        <p>7. November 2017 - minimum API 19, target API 26</p>
+        <p><a href="https://git.stoutner.com/?p=PrivacyBrowser.git;a=commitdiff;h=eb9bc527c37223964f7c00592df982b47ff2f81c">7. November 2017</a> - minimum API 19, target API 26</p>
          <ul>
              <li>Add a <a href="https://redmine.stoutner.com/issues/132">bookmarks drawer</a> that is accessed by sliding from the right.</li>
              <li>Prevent Night Mode from <a href="https://redmine.stoutner.com/issues/213">flashing a white background</a> when loading new pages.</li>
          <ul>
              <li>Add a <a href="https://redmine.stoutner.com/issues/132">bookmarks drawer</a> that is accessed by sliding from the right.</li>
              <li>Prevent Night Mode from <a href="https://redmine.stoutner.com/issues/213">flashing a white background</a> when loading new pages.</li>
diff --git a/app/src/main/assets/en/about_changelog_dark.html b/app/src/main/assets/en/about_changelog_dark.html

index 75f1c2c64344aa6746d8a779fd221215679a066e..270f283aa621d339c797537c2da780ab333ec92a 100644 (file)
--- a/app/src/main/assets/en/about_changelog_dark.html
+++ b/app/src/main/assets/en/about_changelog_dark.html
@@ -25,7 +25,7 @@
  
      <body>
          <h3>2.7 (version code 27)</h3>
  
      <body>
          <h3>2.7 (version code 27)</h3>
-        <p>7 November 2017 - minimum API 19, target API 26</p>
+        <p><a href="https://git.stoutner.com/?p=PrivacyBrowser.git;a=commitdiff;h=eb9bc527c37223964f7c00592df982b47ff2f81c">7 November 2017</a> - minimum API 19, target API 26</p>
          <ul>
              <li>Add a <a href="https://redmine.stoutner.com/issues/132">bookmarks drawer</a> that is accessed by sliding from the right.</li>
              <li>Prevent Night Mode from <a href="https://redmine.stoutner.com/issues/213">flashing a white background</a> when loading new pages.</li>
          <ul>
              <li>Add a <a href="https://redmine.stoutner.com/issues/132">bookmarks drawer</a> that is accessed by sliding from the right.</li>
              <li>Prevent Night Mode from <a href="https://redmine.stoutner.com/issues/213">flashing a white background</a> when loading new pages.</li>
diff --git a/app/src/main/assets/en/about_changelog_light.html b/app/src/main/assets/en/about_changelog_light.html

index 717622b592d55e0e48f6e83728e9c75e2fdf5365..13d64bf1afee6dfc7fb061e51444d974d2e4b84d 100644 (file)
--- a/app/src/main/assets/en/about_changelog_light.html
+++ b/app/src/main/assets/en/about_changelog_light.html
@@ -25,7 +25,7 @@
  
      <body>
          <h3>2.7 (version code 27)</h3>
  
      <body>
          <h3>2.7 (version code 27)</h3>
-        <p>7 November 2017 - minimum API 19, target API 26</p>
+        <p><a href="https://git.stoutner.com/?p=PrivacyBrowser.git;a=commitdiff;h=eb9bc527c37223964f7c00592df982b47ff2f81c">7 November 2017</a> - minimum API 19, target API 26</p>
          <ul>
              <li>Add a <a href="https://redmine.stoutner.com/issues/132">bookmarks drawer</a> that is accessed by sliding from the right.</li>
              <li>Prevent Night Mode from <a href="https://redmine.stoutner.com/issues/213">flashing a white background</a> when loading new pages.</li>
          <ul>
              <li>Add a <a href="https://redmine.stoutner.com/issues/132">bookmarks drawer</a> that is accessed by sliding from the right.</li>
              <li>Prevent Night Mode from <a href="https://redmine.stoutner.com/issues/213">flashing a white background</a> when loading new pages.</li>
diff --git a/app/src/main/assets/es/about_changelog_dark.html b/app/src/main/assets/es/about_changelog_dark.html

index 57fbceb48648a7a750f8ee1c1df11aeeeb8d731c..ee723114d2a51fe898be97d5762eead59cff3a39 100644 (file)
--- a/app/src/main/assets/es/about_changelog_dark.html
+++ b/app/src/main/assets/es/about_changelog_dark.html
@@ -27,7 +27,7 @@
  
      <body>
          <h3>2.7 (código de versión 27)</h3>
  
      <body>
          <h3>2.7 (código de versión 27)</h3>
-        <p>7 de noviembre de 2017 - API mínimo 19, API dirigido 26</p>
+        <p><a href="https://git.stoutner.com/?p=PrivacyBrowser.git;a=commitdiff;h=eb9bc527c37223964f7c00592df982b47ff2f81c">7 de noviembre de 2017</a> - API mínimo 19, API dirigido 26</p>
          <ul>
              <li>Añadir un <a href="https://redmine.stoutner.com/issues/132">cajón de favoritos</a> al que se accede deslizando desde la derecha.</li>
              <li>Evitar que el Modo Noche <a href="https://redmine.stoutner.com/issues/213">parpadee sobre un fondo blanco</a> al cargar páginas nuevas.</li>
          <ul>
              <li>Añadir un <a href="https://redmine.stoutner.com/issues/132">cajón de favoritos</a> al que se accede deslizando desde la derecha.</li>
              <li>Evitar que el Modo Noche <a href="https://redmine.stoutner.com/issues/213">parpadee sobre un fondo blanco</a> al cargar páginas nuevas.</li>
diff --git a/app/src/main/assets/es/about_changelog_light.html b/app/src/main/assets/es/about_changelog_light.html

index d3a9f1345138082329c3b26709a411ba7d9c97e8..f96e205acca91e4e0f1dddfc8c273495408e500c 100644 (file)
--- a/app/src/main/assets/es/about_changelog_light.html
+++ b/app/src/main/assets/es/about_changelog_light.html
@@ -27,7 +27,7 @@
  
      <body>
          <h3>2.7 (código de versión 27)</h3>
  
      <body>
          <h3>2.7 (código de versión 27)</h3>
-        <p>7 de noviembre de 2017 - API mínimo 19, API dirigido 26</p>
+        <p><a href="https://git.stoutner.com/?p=PrivacyBrowser.git;a=commitdiff;h=eb9bc527c37223964f7c00592df982b47ff2f81c">7 de noviembre de 2017</a> - API mínimo 19, API dirigido 26</p>
          <ul>
              <li>Añadir un <a href="https://redmine.stoutner.com/issues/132">cajón de favoritos</a> al que se accede deslizando desde la derecha.</li>
              <li>Evitar que el Modo Noche <a href="https://redmine.stoutner.com/issues/213">parpadee sobre un fondo blanco</a> al cargar páginas nuevas.</li>
          <ul>
              <li>Añadir un <a href="https://redmine.stoutner.com/issues/132">cajón de favoritos</a> al que se accede deslizando desde la derecha.</li>
              <li>Evitar que el Modo Noche <a href="https://redmine.stoutner.com/issues/213">parpadee sobre un fondo blanco</a> al cargar páginas nuevas.</li>
diff --git a/app/src/main/assets/it/about_changelog_dark.html b/app/src/main/assets/it/about_changelog_dark.html

index 80f4837338480cf25c0857b73788d1938e7cb940..6c6eb99cf7edc4be84ae1210b208d4177fbab039 100644 (file)
--- a/app/src/main/assets/it/about_changelog_dark.html
+++ b/app/src/main/assets/it/about_changelog_dark.html
@@ -27,7 +27,7 @@
  
      <body>
          <h3>2.7 (version code 27)</h3>
  
      <body>
          <h3>2.7 (version code 27)</h3>
-        <p>7 Novembre 2017 - minima API 19, target API 26</p>
+        <p><a href="https://git.stoutner.com/?p=PrivacyBrowser.git;a=commitdiff;h=eb9bc527c37223964f7c00592df982b47ff2f81c">7 Novembre 2017</a> - minima API 19, target API 26</p>
          <ul>
              <li>Aggiunta di un <a href="https://redmine.stoutner.com/issues/132">cassetto dei segnalibri</a> accessibile scorrendo da destra.</li>
              <li>Corretto un difetto della Modalità Notte per cui appariva <a href="https://redmine.stoutner.com/issues/213">uno sfondo bianco</a> durante il caricamento di pagine nuove.</li>
          <ul>
              <li>Aggiunta di un <a href="https://redmine.stoutner.com/issues/132">cassetto dei segnalibri</a> accessibile scorrendo da destra.</li>
              <li>Corretto un difetto della Modalità Notte per cui appariva <a href="https://redmine.stoutner.com/issues/213">uno sfondo bianco</a> durante il caricamento di pagine nuove.</li>
diff --git a/app/src/main/assets/it/about_changelog_light.html b/app/src/main/assets/it/about_changelog_light.html

index ee1715e4216390ff11c35b3a13fe87fee0609404..16e11ebbd59b4b0133ad1823599da832f4c986ee 100644 (file)
--- a/app/src/main/assets/it/about_changelog_light.html
+++ b/app/src/main/assets/it/about_changelog_light.html
@@ -27,7 +27,7 @@
  
      <body>
          <h3>2.7 (version code 27)</h3>
  
      <body>
          <h3>2.7 (version code 27)</h3>
-        <p>7 Novembre 2017 - minima API 19, target API 26</p>
+        <p><a href="https://git.stoutner.com/?p=PrivacyBrowser.git;a=commitdiff;h=eb9bc527c37223964f7c00592df982b47ff2f81c">7 Novembre 2017</a> - minima API 19, target API 26</p>
          <ul>
              <li>Aggiunta di un <a href="https://redmine.stoutner.com/issues/132">cassetto dei segnalibri</a> accessibile scorrendo da destra.</li>
              <li>Corretto un difetto della Modalità Notte per cui appariva <a href="https://redmine.stoutner.com/issues/213">uno sfondo bianco</a> durante il caricamento di pagine nuove.</li>
          <ul>
              <li>Aggiunta di un <a href="https://redmine.stoutner.com/issues/132">cassetto dei segnalibri</a> accessibile scorrendo da destra.</li>
              <li>Corretto un difetto della Modalità Notte per cui appariva <a href="https://redmine.stoutner.com/issues/213">uno sfondo bianco</a> durante il caricamento di pagine nuove.</li>
diff --git a/app/src/main/res/color/bookmarks_spinner_color_selector_dark.xml b/app/src/main/res/color/bookmarks_spinner_color_selector_dark.xml

index dae2ca44da7fb8e5e4314503394a78bd3b2233f9..bec0b3a96fddb48faa78f884ed680094c40a9826 100644 (file)
--- a/app/src/main/res/color/bookmarks_spinner_color_selector_dark.xml
+++ b/app/src/main/res/color/bookmarks_spinner_color_selector_dark.xml
@@ -21,5 +21,5 @@
  <!-- Highlight the selected item when the spinner is open. -->
  <selector xmlns:android="http://schemas.android.com/apk/res/android" >
      <item android:state_checked="true" android:color="@color/gray_300" />
  <!-- Highlight the selected item when the spinner is open. -->
  <selector xmlns:android="http://schemas.android.com/apk/res/android" >
      <item android:state_checked="true" android:color="@color/gray_300" />
-    <item android:color="@color/gray_500" />
+    <item android:color="@color/blue_300" />
  </selector>
 \ No newline at end of file
  </selector>
 \ No newline at end of file
diff --git a/app/src/main/res/color/edit_bookmark_spinner_color_selector_dark.xml b/app/src/main/res/color/edit_bookmark_spinner_color_selector_dark.xml

index 6df233399c7ac468ed0de4df1f25fc0888c0fce7..51751824291763cfffe355b2dd55416aa6f06cbc 100644 (file)
--- a/app/src/main/res/color/edit_bookmark_spinner_color_selector_dark.xml
+++ b/app/src/main/res/color/edit_bookmark_spinner_color_selector_dark.xml
@@ -20,7 +20,6 @@
  
  <!-- Change the dark theme enabled text from white to gray. -->
  <selector xmlns:android="http://schemas.android.com/apk/res/android" >
  
  <!-- Change the dark theme enabled text from white to gray. -->
  <selector xmlns:android="http://schemas.android.com/apk/res/android" >
-    <!-- `#4DFFFFFF` comes from the built-in `@color/primary_text_disabled_material_dark`. -->
-    <item android:state_checked="false" android:color="#4DFFFFFF" />
+    <item android:state_checked="false" android:color="@color/gray_500" />
      <item android:color="@color/gray_300" />
  </selector>
 \ No newline at end of file
      <item android:color="@color/gray_300" />
  </selector>
 \ No newline at end of file
diff --git a/app/src/main/res/layout/domain_settings_fragment.xml b/app/src/main/res/layout/domain_settings_fragment.xml

index 73c8e5da11d9e9c478322000b2631cb974c77268..b113ca727752267e5f4b49276db0123cacc8a207 100644 (file)
--- a/app/src/main/res/layout/domain_settings_fragment.xml
+++ b/app/src/main/res/layout/domain_settings_fragment.xml
@@ -105,7 +105,7 @@
                  android:layout_marginTop="14dp"
                  android:layout_marginBottom="14dp"
                  android:text="@string/javascript_enabled"
                  android:layout_marginTop="14dp"
                  android:layout_marginBottom="14dp"
                  android:text="@string/javascript_enabled"
-                android:textColor="?attr/primaryTextColorSelector"
+                android:textColor="?android:textColorPrimary"
                  android:textSize="18sp" />
          </LinearLayout>
  
                  android:textSize="18sp" />
          </LinearLayout>
  
@@ -132,7 +132,7 @@
                  android:layout_marginTop="14dp"
                  android:layout_marginBottom="14dp"
                  android:text="@string/first_party_cookies_enabled"
                  android:layout_marginTop="14dp"
                  android:layout_marginBottom="14dp"
                  android:text="@string/first_party_cookies_enabled"
-                android:textColor="?attr/primaryTextColorSelector"
+                android:textColor="?android:textColorPrimary"
                  android:textSize="18sp" />
          </LinearLayout>
  
                  android:textSize="18sp" />
          </LinearLayout>
  
@@ -160,7 +160,7 @@
                  android:layout_marginTop="14dp"
                  android:layout_marginBottom="14dp"
                  android:text="@string/third_party_cookies_enabled"
                  android:layout_marginTop="14dp"
                  android:layout_marginBottom="14dp"
                  android:text="@string/third_party_cookies_enabled"
-                android:textColor="?attr/primaryTextColorSelector"
+                android:textColor="?android:textColorPrimary"
                  android:textSize="18sp" />
          </LinearLayout>
  
                  android:textSize="18sp" />
          </LinearLayout>
  
@@ -187,7 +187,7 @@
                  android:layout_marginTop="14dp"
                  android:layout_marginBottom="14dp"
                  android:text="@string/dom_storage_enabled"
                  android:layout_marginTop="14dp"
                  android:layout_marginBottom="14dp"
                  android:text="@string/dom_storage_enabled"
-                android:textColor="?attr/primaryTextColorSelector"
+                android:textColor="?android:textColorPrimary"
                  android:textSize="18sp" />
          </LinearLayout>
  
                  android:textSize="18sp" />
          </LinearLayout>
  
@@ -214,7 +214,7 @@
                  android:layout_marginTop="14dp"
                  android:layout_marginBottom="14dp"
                  android:text="@string/form_data_enabled"
                  android:layout_marginTop="14dp"
                  android:layout_marginBottom="14dp"
                  android:text="@string/form_data_enabled"
-                android:textColor="?attr/primaryTextColorSelector"
+                android:textColor="?android:textColorPrimary"
                  android:textSize="18sp" />
          </LinearLayout>
  
                  android:textSize="18sp" />
          </LinearLayout>
  
@@ -407,7 +407,7 @@
                      android:layout_width="match_parent"
                      android:layout_marginStart="8dp"
                      android:text="@string/pinned_ssl_certificate"
                      android:layout_width="match_parent"
                      android:layout_marginStart="8dp"
                      android:text="@string/pinned_ssl_certificate"
-                    android:textColor="?attr/primaryTextColorSelector"
+                    android:textColor="?android:textColorPrimary"
                      android:textSize="18sp" />
              </LinearLayout>
  
                      android:textSize="18sp" />
              </LinearLayout>
  
diff --git a/app/src/main/res/layout/domain_settings_spinner_dropdown_item.xml b/app/src/main/res/layout/domain_settings_spinner_dropdown_item.xml

index bef27af66ae4658260dceb75feba5ae06726dd03..6d746b6b123a7fc293a4fd5297fef947c97cea1f 100644 (file)
--- a/app/src/main/res/layout/domain_settings_spinner_dropdown_item.xml
+++ b/app/src/main/res/layout/domain_settings_spinner_dropdown_item.xml
@@ -31,5 +31,4 @@
      android:paddingTop="8dp"
      android:paddingBottom="8dp"
      android:textSize="18sp"
      android:paddingTop="8dp"
      android:paddingBottom="8dp"
      android:textSize="18sp"
-    android:textColor="?attr/primaryTextColorSelector"
      android:checkMark="?android:attr/listChoiceIndicatorSingle" />
 \ No newline at end of file
      android:checkMark="?android:attr/listChoiceIndicatorSingle" />
 \ No newline at end of file
diff --git a/app/src/main/res/layout/domain_settings_spinner_item.xml b/app/src/main/res/layout/domain_settings_spinner_item.xml

index d06d7cfdf2d4f67eade0ee4f9038c4563f299a27..0896cffc68c2c974f0bda69d5bc9d1ef9cc36036 100644 (file)
--- a/app/src/main/res/layout/domain_settings_spinner_item.xml
+++ b/app/src/main/res/layout/domain_settings_spinner_item.xml
@@ -28,4 +28,4 @@
      android:paddingStart="10dp"
      android:paddingEnd="10dp"
      android:textSize="18sp"
      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_databaseview_dialog.xml b/app/src/main/res/layout/edit_bookmark_databaseview_dialog.xml

index 625b3ed51860a479d66c84746cf6cb19a428a354..fa7ee1de0d030cef51062c6535186003a463b521 100644 (file)
--- a/app/src/main/res/layout/edit_bookmark_databaseview_dialog.xml
+++ b/app/src/main/res/layout/edit_bookmark_databaseview_dialog.xml
@@ -46,7 +46,7 @@
                  android:layout_width="wrap_content"
                  android:text="@string/database_id"
                  android:textSize="18sp"
                  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" />
  
              <TextView
                  android:layout_marginEnd="8dp" />
  
              <TextView
@@ -104,7 +104,7 @@
                      android:layout_marginBottom="4dp"
                      android:text="@string/current_bookmark_icon"
                      android:textSize="18sp"
                      android:layout_marginBottom="4dp"
                      android:text="@string/current_bookmark_icon"
                      android:textSize="18sp"
-                    android:textColor="?attr/primaryTextColorSelector" />
+                    android:textColor="?android:textColorPrimary" />
  
                  <RadioButton
                      android:id="@+id/edit_bookmark_webpage_favorite_icon_radiobutton"
  
                  <RadioButton
                      android:id="@+id/edit_bookmark_webpage_favorite_icon_radiobutton"
@@ -113,7 +113,7 @@
                      android:layout_marginTop="5dp"
                      android:text="@string/web_page_favorite_icon"
                      android:textSize="18sp"
                      android:layout_marginTop="5dp"
                      android:text="@string/web_page_favorite_icon"
                      android:textSize="18sp"
-                    android:textColor="?attr/primaryTextColorSelector" />
+                    android:textColor="?android:textColorPrimary" />
              </RadioGroup>
          </LinearLayout>
  
              </RadioGroup>
          </LinearLayout>
  
@@ -171,7 +171,7 @@
                  android:layout_width="wrap_content"
                  android:text="@string/folder"
                  android:textSize="18sp"
                  android:layout_width="wrap_content"
                  android:text="@string/folder"
                  android:textSize="18sp"
-                android:textColor="?attr/primaryTextColorSelector" />
+                android:textColor="?android:textColorPrimary" />
  
              <Spinner
                  android:id="@+id/edit_bookmark_folder_spinner"
  
              <Spinner
                  android:id="@+id/edit_bookmark_folder_spinner"
@@ -194,7 +194,7 @@
                  android:layout_width="wrap_content"
                  android:text="@string/display_order"
                  android:textSize="18sp"
                  android:layout_width="wrap_content"
                  android:text="@string/display_order"
                  android:textSize="18sp"
-                android:textColor="?attr/primaryTextColorSelector"
+                android:textColor="?android:textColorPrimary"
                  android:layout_marginEnd="6dp"
                  android:labelFor="@+id/edit_bookmark_display_order_edittext"/>
  
                  android:layout_marginEnd="6dp"
                  android:labelFor="@+id/edit_bookmark_display_order_edittext"/>
  
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 d06d7cfdf2d4f67eade0ee4f9038c4563f299a27..0896cffc68c2c974f0bda69d5bc9d1ef9cc36036 100644 (file)
--- 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: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 5e7afddb1059f02b59d02d1e861977f3cdf41462..1184805eda9cc66ac6dd575ef65fcb1565eb7a9c 100644 (file)
--- 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:layout_marginBottom="4dp"
                      android:text="@string/current_bookmark_icon"
                      android:textSize="18sp"
-                    android:textColor="?attr/primaryTextColorSelector" />
+                    android:textColor="?android:textColorPrimary" />
  
                  <RadioButton
                      android:id="@+id/edit_bookmark_webpage_favorite_icon_radiobutton"
  
                  <RadioButton
                      android:id="@+id/edit_bookmark_webpage_favorite_icon_radiobutton"
@@ -84,7 +84,7 @@
                      android:layout_marginTop="5dp"
                      android:text="@string/web_page_favorite_icon"
                      android:textSize="18sp"
                      android:layout_marginTop="5dp"
                      android:text="@string/web_page_favorite_icon"
                      android:textSize="18sp"
-                    android:textColor="?attr/primaryTextColorSelector" />
+                    android:textColor="?android:textColorPrimary" />
              </RadioGroup>
          </LinearLayout>
  
              </RadioGroup>
          </LinearLayout>
  
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 72acc7ef92891fd6a97fe6d64a5aa1d8933769f9..6ea35eeba0fddbd1ee46e26812147702bcff1b59 100644 (file)
--- 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:layout_width="wrap_content"
                  android:text="@string/database_id"
                  android:textSize="18sp"
-                android:textColor="?attr/primaryTextColorSelector"
+                android:textColor="?android:textColorPrimary"
                  android:layout_marginEnd="8dp" />
  
              <TextView
                  android:layout_marginEnd="8dp" />
  
              <TextView
@@ -114,7 +114,7 @@
                      android:layout_marginBottom="4dp"
                      android:text="@string/current_bookmark_icon"
                      android:textSize="18sp"
                      android:layout_marginBottom="4dp"
                      android:text="@string/current_bookmark_icon"
                      android:textSize="18sp"
-                    android:textColor="?attr/primaryTextColorSelector" />
+                    android:textColor="?android:textColorPrimary" />
  
                  <RadioButton
                      android:id="@+id/edit_folder_default_icon_radiobutton"
  
                  <RadioButton
                      android:id="@+id/edit_folder_default_icon_radiobutton"
@@ -124,7 +124,7 @@
                      android:layout_marginBottom="4dp"
                      android:text="@string/default_folder_icon"
                      android:textSize="18sp"
                      android:layout_marginBottom="4dp"
                      android:text="@string/default_folder_icon"
                      android:textSize="18sp"
-                    android:textColor="?attr/primaryTextColorSelector" />
+                    android:textColor="?android:textColorPrimary" />
  
                  <RadioButton
                      android:id="@+id/edit_folder_webpage_favorite_icon_radiobutton"
  
                  <RadioButton
                      android:id="@+id/edit_folder_webpage_favorite_icon_radiobutton"
@@ -133,7 +133,7 @@
                      android:layout_marginTop="5dp"
                      android:text="@string/web_page_favorite_icon"
                      android:textSize="18sp"
                      android:layout_marginTop="5dp"
                      android:text="@string/web_page_favorite_icon"
                      android:textSize="18sp"
-                    android:textColor="?attr/primaryTextColorSelector" />
+                    android:textColor="?android:textColorPrimary" />
              </RadioGroup>
          </LinearLayout>
  
              </RadioGroup>
          </LinearLayout>
  
@@ -171,7 +171,7 @@
                  android:layout_width="wrap_content"
                  android:text="@string/parent_folder"
                  android:textSize="18sp"
                  android:layout_width="wrap_content"
                  android:text="@string/parent_folder"
                  android:textSize="18sp"
-                android:textColor="?attr/primaryTextColorSelector" />
+                android:textColor="?android:textColorPrimary" />
  
              <Spinner
                  android:id="@+id/edit_folder_parent_folder_spinner"
  
              <Spinner
                  android:id="@+id/edit_folder_parent_folder_spinner"
@@ -193,7 +193,7 @@
                  android:layout_width="wrap_content"
                  android:text="@string/display_order"
                  android:textSize="18sp"
                  android:layout_width="wrap_content"
                  android:text="@string/display_order"
                  android:textSize="18sp"
-                android:textColor="?attr/primaryTextColorSelector"
+                android:textColor="?android:textColorPrimary"
                  android:layout_marginEnd="6dp"
                  android:labelFor="@+id/edit_folder_display_order_edittext"/>
  
                  android:layout_marginEnd="6dp"
                  android:labelFor="@+id/edit_folder_display_order_edittext"/>
  
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 8b1f5876b4febe5748904161489f5b4fe4d12754..9bed6a405ad6650dbe51705c34a62f24dc21618d 100644 (file)
--- 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:layout_marginBottom="4dp"
                      android:text="@string/current_folder_icon"
                      android:textSize="18sp"
-                    android:textColor="?attr/primaryTextColorSelector" />
+                    android:textColor="?android:textColorPrimary" />
  
                  <RadioButton
                      android:id="@+id/edit_folder_default_icon_radiobutton"
  
                  <RadioButton
                      android:id="@+id/edit_folder_default_icon_radiobutton"
@@ -97,7 +97,7 @@
                      android:layout_marginBottom="4dp"
                      android:text="@string/default_folder_icon"
                      android:textSize="18sp"
                      android:layout_marginBottom="4dp"
                      android:text="@string/default_folder_icon"
                      android:textSize="18sp"
-                    android:textColor="?attr/primaryTextColorSelector" />
+                    android:textColor="?android:textColorPrimary" />
  
                  <RadioButton
                      android:id="@+id/edit_folder_web_page_icon_radiobutton"
  
                  <RadioButton
                      android:id="@+id/edit_folder_web_page_icon_radiobutton"
@@ -106,7 +106,7 @@
                      android:layout_marginTop="5dp"
                      android:text="@string/web_page_favorite_icon"
                      android:textSize="18sp"
                      android:layout_marginTop="5dp"
                      android:text="@string/web_page_favorite_icon"
                      android:textSize="18sp"
-                    android:textColor="?attr/primaryTextColorSelector" />
+                    android:textColor="?android:textColorPrimary" />
              </RadioGroup>
          </LinearLayout>
  
              </RadioGroup>
          </LinearLayout>
  
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml

index 72e4c3e1a4382cb51f55937a5b293241f81c6cae..e6544ce10884cc2532e4b34aaeacf8540a0dd1cf 100644 (file)
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -31,7 +31,6 @@
      <attr name="sslTitle" format="reference" />
      <attr name="sslHeader" format="reference" />
      <attr name="urlHistoryText" format="reference" />
      <attr name="sslTitle" format="reference" />
      <attr name="sslHeader" format="reference" />
      <attr name="urlHistoryText" format="reference" />
-    <attr name="primaryTextColorSelector" format="reference" />
      <attr name="bookmarksSpinnerHeaderTextColor" format="reference" />
      <attr name="bookmarksSpinnerTextColorSelector" format="reference" />
      <attr name="bookmarksSpinnerBackground" format="reference" />
      <attr name="bookmarksSpinnerHeaderTextColor" format="reference" />
      <attr name="bookmarksSpinnerTextColorSelector" format="reference" />
      <attr name="bookmarksSpinnerBackground" format="reference" />
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml

index 343cebaa79dc0d9c6f3f6b3798a563d7f7e7d3d6..8f9c5939b5116e029d0f6f0c5a5cd1d783e5e089 100644 (file)
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -24,6 +24,7 @@
      <!-- `android:windowTranslucentStatus` makes the system status bar translucent.  When it is specified the root layout should include `android:fitsSystemWindows="true"`. -->
      <style name="PrivacyBrowserLight" parent="Theme.AppCompat.Light.NoActionBar" >
          <item name="android:windowTranslucentStatus">true</item>
      <!-- `android:windowTranslucentStatus` makes the system status bar translucent.  When it is specified the root layout should include `android:fitsSystemWindows="true"`. -->
      <style name="PrivacyBrowserLight" parent="Theme.AppCompat.Light.NoActionBar" >
          <item name="android:windowTranslucentStatus">true</item>
+        <item name="android:textColorPrimary">@color/primary_text_color_selector_light</item>
          <item name="colorAccent">@color/blue_700</item>
          <item name="android:textColorHighlight">@color/blue_200</item>
          <item name="navigationHeaderBackground">@color/blue_700</item>
          <item name="colorAccent">@color/blue_700</item>
          <item name="android:textColorHighlight">@color/blue_200</item>
          <item name="navigationHeaderBackground">@color/blue_700</item>
@@ -45,7 +46,6 @@
          <item name="colorPrimaryDark">@color/blue_700</item>
          <item name="android:textColorHighlight">@color/blue_200</item>
          <item name="android:actionModeBackground">@color/blue_700</item>
          <item name="colorPrimaryDark">@color/blue_700</item>
          <item name="android:textColorHighlight">@color/blue_200</item>
          <item name="android:actionModeBackground">@color/blue_700</item>
-        <item name="primaryTextColorSelector">@color/primary_text_color_selector_light</item>
          <item name="bookmarksSpinnerHeaderTextColor">@color/white</item>
          <item name="bookmarksSpinnerTextColorSelector">@color/bookmarks_spinner_color_selector_light</item>
          <item name="bookmarksSpinnerBackground">@color/blue_750</item>
          <item name="bookmarksSpinnerHeaderTextColor">@color/white</item>
          <item name="bookmarksSpinnerTextColorSelector">@color/bookmarks_spinner_color_selector_light</item>
          <item name="bookmarksSpinnerBackground">@color/blue_750</item>
@@ -130,7 +130,6 @@
          <item name="windowActionModeOverlay">true</item>
          <item name="colorPrimaryDark">@color/blue_800</item>
          <item name="android:actionModeBackground">@color/blue_800</item>
          <item name="windowActionModeOverlay">true</item>
          <item name="colorPrimaryDark">@color/blue_800</item>
          <item name="android:actionModeBackground">@color/blue_800</item>
-        <item name="primaryTextColorSelector">@color/primary_text_color_selector_dark</item>
          <item name="bookmarksSpinnerHeaderTextColor">@color/gray_300</item>
          <item name="bookmarksSpinnerTextColorSelector">@color/bookmarks_spinner_color_selector_dark</item>
          <item name="bookmarksSpinnerBackground">@color/blue_830</item>
          <item name="bookmarksSpinnerHeaderTextColor">@color/gray_300</item>
          <item name="bookmarksSpinnerTextColorSelector">@color/bookmarks_spinner_color_selector_dark</item>
          <item name="bookmarksSpinnerBackground">@color/blue_830</item>
author	Soren Stoutner <soren@stoutner.com>
	Wed, 8 Nov 2017 22:30:24 +0000 (15:30 -0700)
committer	Soren Stoutner <soren@stoutner.com>
	Wed, 8 Nov 2017 22:30:24 +0000 (15:30 -0700)
app/src/main/assets/de/about_changelog_dark.html		patch \| blob \| history
app/src/main/assets/de/about_changelog_light.html		patch \| blob \| history
app/src/main/assets/en/about_changelog_dark.html		patch \| blob \| history
app/src/main/assets/en/about_changelog_light.html		patch \| blob \| history
app/src/main/assets/es/about_changelog_dark.html		patch \| blob \| history
app/src/main/assets/es/about_changelog_light.html		patch \| blob \| history
app/src/main/assets/it/about_changelog_dark.html		patch \| blob \| history
app/src/main/assets/it/about_changelog_light.html		patch \| blob \| history
app/src/main/res/color/bookmarks_spinner_color_selector_dark.xml		patch \| blob \| history
app/src/main/res/color/edit_bookmark_spinner_color_selector_dark.xml		patch \| blob \| history
app/src/main/res/layout/domain_settings_fragment.xml		patch \| blob \| history
app/src/main/res/layout/domain_settings_spinner_dropdown_item.xml		patch \| blob \| history
app/src/main/res/layout/domain_settings_spinner_item.xml		patch \| blob \| history
app/src/main/res/layout/edit_bookmark_databaseview_dialog.xml		patch \| blob \| history
app/src/main/res/layout/edit_bookmark_databaseview_spinner_item.xml		patch \| blob \| history
app/src/main/res/layout/edit_bookmark_dialog.xml		patch \| blob \| history
app/src/main/res/layout/edit_bookmark_folder_databaseview_dialog.xml		patch \| blob \| history
app/src/main/res/layout/edit_bookmark_folder_dialog.xml		patch \| blob \| history
app/src/main/res/values/attrs.xml		patch \| blob \| history
app/src/main/res/values/styles.xml		patch \| blob \| history