package com.stoutner.privacybrowser.dialogs
import android.app.Dialog
-import android.content.res.Configuration
import android.os.Bundle
import android.view.WindowManager
// Use a builder to create the alert dialog.
val dialogBuilder: AlertDialog.Builder = AlertDialog.Builder(requireContext(), R.style.PrivacyBrowserAlertDialog)
- // Get the current theme status.
- val currentThemeStatus = resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK
-
// Set the style and the icon according to the theme.
- if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
- // Set a dark icon.
- dialogBuilder.setIcon(R.drawable.about_night)
- } else {
- // Set a light icon.
- dialogBuilder.setIcon(R.drawable.about_day)
- }
+ dialogBuilder.setIconAttribute(R.attr.aboutIcon)
// Set the title.
dialogBuilder.setTitle(R.string.about_view_source)
import android.app.Dialog
import android.content.Context
import android.content.DialogInterface
-import android.content.res.Configuration
import android.net.Uri
import android.os.Bundle
import android.text.Editable
// Use an alert dialog builder to create the alert dialog.
val dialogBuilder: AlertDialog.Builder = AlertDialog.Builder(requireContext(), R.style.PrivacyBrowserAlertDialog)
- // Get the current theme status.
- val currentThemeStatus = resources.configuration.uiMode and Configuration.UI_MODE_NIGHT_MASK
-
// Set the icon according to the theme.
- if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
- // Set the dark icon.
- dialogBuilder.setIcon(R.drawable.domains_night)
- } else {
- // Set the light icon.
- dialogBuilder.setIcon(R.drawable.domains_light)
- }
+ dialogBuilder.setIconAttribute(R.attr.domainsIcon)
// Set the title.
dialogBuilder.setTitle(R.string.add_domain)
// Create a blue `ForegroundColorSpan`.
ForegroundColorSpan blueColorSpan;
- // Set `blueColorSpan` according to the theme. The deprecated `getResources()` must be used until API >= 23.
+ // Set the blue color span according to the theme. The deprecated `getResources()` must be used until API >= 23.
if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
- blueColorSpan = new ForegroundColorSpan(getResources().getColor(R.color.blue_400));
+ blueColorSpan = new ForegroundColorSpan(getResources().getColor(R.color.violet_500));
} else {
blueColorSpan = new ForegroundColorSpan(getResources().getColor(R.color.blue_700));
}
// Set the color spans according to the theme. The deprecated `getResources()` must be used until the minimum API >= 23.
if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
- blueColorSpan = new ForegroundColorSpan(getResources().getColor(R.color.blue_400));
+ blueColorSpan = new ForegroundColorSpan(getResources().getColor(R.color.violet_500));
redColorSpan = new ForegroundColorSpan(getResources().getColor(R.color.red_900));
} else {
blueColorSpan = new ForegroundColorSpan(getResources().getColor(R.color.blue_700));
// Set the color spans according to the theme. The deprecated `getResources()` must be used until the minimum API >= 23.
if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
- blueColorSpan = new ForegroundColorSpan(getResources().getColor(R.color.blue_400));
+ blueColorSpan = new ForegroundColorSpan(getResources().getColor(R.color.violet_500));
redColorSpan = new ForegroundColorSpan(getResources().getColor(R.color.red_900));
} else {
blueColorSpan = new ForegroundColorSpan(getResources().getColor(R.color.blue_700));
// Set the blue color span according to the theme. The deprecated `getColor()` must be used until the minimum API >= 23.
if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
- blueColorSpan = new ForegroundColorSpan(activity.getResources().getColor(R.color.blue_400));
+ blueColorSpan = new ForegroundColorSpan(activity.getResources().getColor(R.color.violet_500));
} else {
blueColorSpan = new ForegroundColorSpan(activity.getResources().getColor(R.color.blue_700));
}
// Set the color spans according to the theme. The deprecated `getResources()` must be used until the minimum API >= 23.
if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
- blueColorSpan = new ForegroundColorSpan(getResources().getColor(R.color.blue_400));
+ blueColorSpan = new ForegroundColorSpan(getResources().getColor(R.color.violet_500));
redColorSpan = new ForegroundColorSpan(getResources().getColor(R.color.red_900));
} else {
blueColorSpan = new ForegroundColorSpan(getResources().getColor(R.color.blue_700));
SpannableStringBuilder ultraListStringBuilder = new SpannableStringBuilder(ultraListLabel + blocklistVersions[4]);
SpannableStringBuilder ultraPrivacyStringBuilder = new SpannableStringBuilder(ultraPrivacyLabel + blocklistVersions[5]);
- // Create the `blueColorSpan` variable.
+ // Define the blue color span variable.
ForegroundColorSpan blueColorSpan;
// Set the blue color span according to the theme. The deprecated `getResources()` must be used until the minimum API >= 23.
if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
- blueColorSpan = new ForegroundColorSpan(getResources().getColor(R.color.blue_400));
+ blueColorSpan = new ForegroundColorSpan(getResources().getColor(R.color.violet_500));
} else {
blueColorSpan = new ForegroundColorSpan(getResources().getColor(R.color.blue_700));
}
savedSslEndDateStringBuilder = new SpannableStringBuilder(endDateLabel + DateFormat.getDateTimeInstance(DateFormat.MEDIUM, DateFormat.LONG).format(savedSslEndDate));
}
- // Create a red foreground color span. The deprecated `resources.getColor` must be used until the minimum API >= 23.
- final ForegroundColorSpan redColorSpan = new ForegroundColorSpan(resources.getColor(R.color.red_a700));
-
- // Create a blue foreground color span.
+ // Create the foreground color spans.
+ final ForegroundColorSpan redColorSpan;
final ForegroundColorSpan blueColorSpan;
- // Set the blue color span according to the theme. The deprecated `resources` must be used until the minimum API >= 23.
+ // Set the color spans according to the theme. The deprecated `resources` must be used until the minimum API >= 23.
if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
- blueColorSpan = new ForegroundColorSpan(resources.getColor(R.color.blue_400));
+ redColorSpan = new ForegroundColorSpan(resources.getColor(R.color.red_900));
+ blueColorSpan = new ForegroundColorSpan(resources.getColor(R.color.violet_500));
} else {
+ redColorSpan = new ForegroundColorSpan(resources.getColor(R.color.red_a700));
blueColorSpan = new ForegroundColorSpan(resources.getColor(R.color.blue_700));
}
if (firstPartyCookiesInt == 1) { // First-party cookies are enabled.
// Set the third-party cookies status. Once the minimum API >= 21 a selector can be used as the tint mode instead of specifying different icons.
if (thirdPartyCookiesInt == 1) { // Both first-party and third-party cookies are enabled.
+ // Set the third-party cookies switch to be checked.
thirdPartyCookiesSwitch.setChecked(true);
+
+ // Set the icon to be red.
thirdPartyCookiesImageView.setImageDrawable(resources.getDrawable(R.drawable.cookies_warning));
} else { // First party cookies are enabled but third-party cookies are disabled.
+ // Set the third-party cookies switch to be checked.
thirdPartyCookiesSwitch.setChecked(false);
// Set the icon according to the theme.
// Update the third-party cookies icon.
if (thirdPartyCookiesSwitch.isChecked()) { // Third-party cookies are enabled.
+ // Set the third-party cookies icon to be red.
thirdPartyCookiesImageView.setImageDrawable(resources.getDrawable(R.drawable.cookies_warning));
} else { // Third-party cookies are disabled.
// Set the third-party cookies icon according to the theme.
thirdPartyCookiesSwitch.setOnCheckedChangeListener((CompoundButton buttonView, boolean isChecked) -> {
// Update the icon.
if (isChecked) {
+ // Set the third-party cookies icon to be red.
thirdPartyCookiesImageView.setImageDrawable(resources.getDrawable(R.drawable.cookies_warning));
} else {
// Update the third-party cookies icon according to the theme.
// Set the open intents in new tab preference icon.
if (savedPreferences.getBoolean("open_intents_in_new_tab", true)) {
if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
- openIntentsInNewTabPreference.setIcon(R.drawable.tab_enabled_dark);
+ openIntentsInNewTabPreference.setIcon(R.drawable.tab_enabled_night);
} else {
- openIntentsInNewTabPreference.setIcon(R.drawable.tab_enabled_light);
+ openIntentsInNewTabPreference.setIcon(R.drawable.tab_enabled_day);
}
} else {
if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
- openIntentsInNewTabPreference.setIcon(R.drawable.tab_disabled_dark);
+ openIntentsInNewTabPreference.setIcon(R.drawable.tab_disabled_night);
} else {
- openIntentsInNewTabPreference.setIcon(R.drawable.tab_disabled_light);
+ openIntentsInNewTabPreference.setIcon(R.drawable.tab_disabled_day);
}
}
// Update the icon.
if (sharedPreferences.getBoolean("open_intents_in_new_tab", true)) {
if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
- openIntentsInNewTabPreference.setIcon(R.drawable.tab_enabled_dark);
+ openIntentsInNewTabPreference.setIcon(R.drawable.tab_enabled_night);
} else {
- openIntentsInNewTabPreference.setIcon(R.drawable.tab_enabled_light);
+ openIntentsInNewTabPreference.setIcon(R.drawable.tab_enabled_day);
}
} else {
if (currentThemeStatus == Configuration.UI_MODE_NIGHT_YES) {
- openIntentsInNewTabPreference.setIcon(R.drawable.tab_disabled_dark);
+ openIntentsInNewTabPreference.setIcon(R.drawable.tab_disabled_night);
} else {
- openIntentsInNewTabPreference.setIcon(R.drawable.tab_disabled_light);
+ openIntentsInNewTabPreference.setIcon(R.drawable.tab_disabled_day);
}
}
break;
--- /dev/null
+<!-- This file comes from the Android Material icon set, where it is called `add`. It is released under the Apache License 2.0. -->
+<vector
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:height="24dp"
+ android:width="24dp"
+ android:viewportHeight="24.0"
+ android:viewportWidth="24.0" >
+
+ <!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used. -->
+ <path
+ android:fillColor="#FFFFFFFF"
+ android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
+</vector>
+++ /dev/null
-<!-- This file comes from the Android Material icon set, where it is called `add`. It is released under the Apache License 2.0. -->
-<vector
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:height="24dp"
- android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0" >
-
- <!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used. -->
- <path
- android:fillColor="#FFFFFFFF"
- android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
-</vector>
+++ /dev/null
-<!-- This file comes from the Android Material icon set, where it is called `add`. It is released under the Apache License 2.0. -->
-<vector
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:height="24dp"
- android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0" >
-
- <!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used. -->
- <path
- android:fillColor="#FFE0E0E0"
- android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
-</vector>
<!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used. -->
<path
- android:fillColor="#FF1E88E5"
+ android:fillColor="#FF8AB4F8"
android:pathData="M9,3L7.17,5L4,5c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,7c0,-1.1 -0.9,-2 -2,-2h-3.17L15,3L9,3zM12,18c-2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5 -2.24,5 -5,5zM12,17l1.25,-2.75L16,13l-2.75,-1.25L12,9l-1.25,2.75L8,13l2.75,1.25z"/>
</vector>
<!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used instead. -->
<path
- android:fillColor="#FF1E88E5"
+ android:fillColor="#FF8AB4F8"
android:pathData="M20,4L4,4c-1.11,0 -1.99,0.89 -1.99,2L2,18c0,1.11 0.89,2 2,2h16c1.11,0 2,-0.89 2,-2L22,6c0,-1.11 -0.89,-2 -2,-2zM20,18L4,18v-6h16v6zM20,8L4,8L4,6h16v2z" />
</vector>
--- /dev/null
+<!-- This file comes from the Android Material icon set, where it is called `style`. It is released under the Apache License 2.0. -->
+
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
+<vector
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:height="24dp"
+ android:width="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24"
+ android:autoMirrored="true"
+ tools:ignore="VectorRaster" >
+
+ <!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used. -->
+ <path
+ android:fillColor="#FF1565C0"
+ android:pathData="M2.53,19.65l1.34,0.56v-9.03l-2.43,5.86c-0.41,1.02 0.08,2.19 1.09,2.61zM22.03,15.95L17.07,3.98c-0.31,-0.75 -1.04,-1.21 -1.81,-1.23 -0.26,0 -0.53,0.04 -0.79,0.15L7.1,5.95c-0.75,0.31 -1.21,1.03 -1.23,1.8 -0.01,0.27 0.04,0.54 0.15,0.8l4.96,11.97c0.31,0.76 1.05,1.22 1.83,1.23 0.26,0 0.52,-0.05 0.77,-0.15l7.36,-3.05c1.02,-0.42 1.51,-1.59 1.09,-2.6zM7.88,8.75c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1 1,0.45 1,1 -0.45,1 -1,1zM5.88,19.75c0,1.1 0.9,2 2,2h1.45l-3.45,-8.34v6.34z"/>
+</vector>
\ No newline at end of file
--- /dev/null
+<!-- This file comes from the Android Material icon set, where it is called `style`. It is released under the Apache License 2.0. -->
+
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
+<vector
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:height="24dp"
+ android:width="24dp"
+ android:viewportWidth="24"
+ android:viewportHeight="24"
+ android:autoMirrored="true"
+ tools:ignore="VectorRaster" >
+
+ <!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used. -->
+ <path
+ android:fillColor="#FF8AB4F8"
+ android:pathData="M2.53,19.65l1.34,0.56v-9.03l-2.43,5.86c-0.41,1.02 0.08,2.19 1.09,2.61zM22.03,15.95L17.07,3.98c-0.31,-0.75 -1.04,-1.21 -1.81,-1.23 -0.26,0 -0.53,0.04 -0.79,0.15L7.1,5.95c-0.75,0.31 -1.21,1.03 -1.23,1.8 -0.01,0.27 0.04,0.54 0.15,0.8l4.96,11.97c0.31,0.76 1.05,1.22 1.83,1.23 0.26,0 0.52,-0.05 0.77,-0.15l7.36,-3.05c1.02,-0.42 1.51,-1.59 1.09,-2.6zM7.88,8.75c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1 1,0.45 1,1 -0.45,1 -1,1zM5.88,19.75c0,1.1 0.9,2 2,2h1.45l-3.45,-8.34v6.34z"/>
+</vector>
\ No newline at end of file
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0" >
+ android:viewportHeight="24"
+ android:viewportWidth="24" >
<!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used instead. -->
<path
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0" >
+ android:viewportHeight="24"
+ android:viewportWidth="24" >
<!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used instead. -->
<path
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0" >
+ android:viewportHeight="24"
+ android:viewportWidth="24" >
<!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used instead. -->
<path
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0" >
+ android:viewportHeight="24"
+ android:viewportWidth="24" >
<!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used instead. -->
<path
- android:fillColor="#FF1E88E5"
+ android:fillColor="#FF8AB4F8"
android:pathData="M20,12c0,-1.1 0.9,-2 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2L4,4c-1.1,0 -1.99,0.9 -1.99,2v4c1.1,0 1.99,0.9 1.99,2s-0.89,2 -2,2v4c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2v-4c-1.1,0 -2,-0.9 -2,-2zM15.58,16.8L12,14.5l-3.58,2.3 1.08,-4.12 -3.29,-2.69 4.24,-0.25L12,5.8l1.54,3.95 4.24,0.25 -3.29,2.69 1.09,4.11z"/>
</vector>
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0" >
+ android:viewportHeight="24"
+ android:viewportWidth="24" >
<!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used instead. -->
<path
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0" >
+ android:viewportHeight="24"
+ android:viewportWidth="24" >
<!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used instead. -->
<path
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0" >
+ android:viewportHeight="24"
+ android:viewportWidth="24" >
<!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used instead. -->
<path
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0" >
+ android:viewportHeight="24"
+ android:viewportWidth="24" >
<!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used instead. -->
<path
- android:fillColor="#FF1E88E5"
+ android:fillColor="#FF8AB4F8"
android:pathData="M23,12l-2.44,-2.78 0.34,-3.68 -3.61,-0.82 -1.89,-3.18L12,3 8.6,1.54 6.71,4.72l-3.61,0.81 0.34,3.68L1,12l2.44,2.78 -0.34,3.69 3.61,0.82 1.89,3.18L12,21l3.4,1.46 1.89,-3.18 3.61,-0.82 -0.34,-3.68L23,12zM13,17h-2v-2h2v2zM13,13h-2L11,7h2v6z"/>
</vector>
android:autoMirrored="true"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
tools:ignore="VectorRaster" >
<!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used instead. -->
android:autoMirrored="true"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
tools:ignore="VectorRaster" >
<!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used instead. -->
android:autoMirrored="true"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
tools:ignore="VectorRaster" >
<!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used instead. -->
<vector
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
- android:autoMirrored="true"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
+ android:autoMirrored="true"
tools:ignore="VectorRaster" >
<!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used instead. -->
<path
- android:fillColor="#FF1E88E5"
+ android:fillColor="#FF8AB4F8"
android:pathData="M12,6.5c1.38,0 2.5,1.12 2.5,2.5 0,0.74 -0.33,1.39 -0.83,1.85l3.63,3.63c0.98,-1.86 1.7,-3.8 1.7,-5.48 0,-3.87 -3.13,-7 -7,-7 -1.98,0 -3.76,0.83 -5.04,2.15l3.19,3.19c0.46,-0.52 1.11,-0.84 1.85,-0.84zM16.37,16.1l-4.63,-4.63 -0.11,-0.11L3.27,3 2,4.27l3.18,3.18C5.07,7.95 5,8.47 5,9c0,5.25 7,13 7,13s1.67,-1.85 3.38,-4.35L18.73,21 20,19.73l-3.63,-3.63z"/>
</vector>
--- /dev/null
+<!-- This file comes from the Android Material icon set, where it is called `bookmarks`. It is released under the Apache License 2.0. -->
+
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
+<vector
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:height="24dp"
+ android:width="24dp"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
+ tools:ignore="VectorRaster"
+ android:autoMirrored="true" >
+
+ <!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used. -->
+ <path
+ android:fillColor="#FFFFFFFF"
+ android:pathData="M19,18l2,1V3c0,-1.1 -0.9,-2 -2,-2H8.99C7.89,1 7,1.9 7,3h10c1.1,0 2,0.9 2,2v13zM15,5H5c-1.1,0 -2,0.9 -2,2v16l7,-3 7,3V7c0,-1.1 -0.9,-2 -2,-2z"/>
+</vector>
+++ /dev/null
-<!-- This file comes from the Android Material icon set, where it is called `bookmarks`. It is released under the Apache License 2.0. -->
-
-<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
-<vector
- xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- android:height="24dp"
- android:width="24dp"
- android:viewportHeight="24"
- android:viewportWidth="24"
- tools:ignore="VectorRaster"
- android:autoMirrored="true" >
-
- <!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used. -->
- <path
- android:fillColor="#FFFFFFFF"
- android:pathData="M19,18l2,1V3c0,-1.1 -0.9,-2 -2,-2H8.99C7.89,1 7,1.9 7,3h10c1.1,0 2,0.9 2,2v13zM15,5H5c-1.1,0 -2,0.9 -2,2v16l7,-3 7,3V7c0,-1.1 -0.9,-2 -2,-2z"/>
-</vector>
+++ /dev/null
-<!-- This file comes from the Android Material icon set, where it is called `bookmarks`. It is released under the Apache License 2.0. -->
-
-<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
-<vector
- xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- android:height="24dp"
- android:width="24dp"
- android:viewportHeight="24"
- android:viewportWidth="24"
- tools:ignore="VectorRaster"
- android:autoMirrored="true" >
-
- <!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used. -->
- <path
- android:fillColor="#FFE0E0E0"
- android:pathData="M19,18l2,1V3c0,-1.1 -0.9,-2 -2,-2H8.99C7.89,1 7,1.9 7,3h10c1.1,0 2,0.9 2,2v13zM15,5H5c-1.1,0 -2,0.9 -2,2v16l7,-3 7,3V7c0,-1.1 -0.9,-2 -2,-2z"/>
-</vector>
xmlns:tools="http://schemas.android.com/tools"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
android:autoMirrored="true"
tools:ignore="VectorRaster" >
xmlns:tools="http://schemas.android.com/tools"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
android:autoMirrored="true"
tools:ignore="VectorRaster" >
<!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used instead. -->
<path
- android:fillColor="#FF1E88E5"
+ android:fillColor="#FF8AB4F8"
android:pathData="M11,9.16V2c-5,0.5 -9,4.79 -9,10s4,9.5 9,10v-7.16c-1,-0.41 -2,-1.52 -2,-2.84s1,-2.43 2,-2.84zM14.86,11H22c-0.48,-4.75 -4,-8.53 -9,-9v7.16c1,0.3 1.52,0.98 1.86,1.84zM13,14.84V22c5,-0.47 8.52,-4.25 9,-9h-7.14c-0.34,0.86 -0.86,1.54 -1.86,1.84z"/>
</vector>
+++ /dev/null
-<!-- This file comes from the Android Material icon set, where it is called `close`. It is released under the Apache License 2.0. -->
-<vector
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:height="24dp"
- android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0" >
-
- <!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used. -->
- <path
- android:fillColor="#FF616161"
- android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z" />
-</vector>
\ No newline at end of file
xmlns:android="http://schemas.android.com/apk/res/android"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0" >
+ android:viewportHeight="24"
+ android:viewportWidth="24" >
<!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used instead. -->
<path
xmlns:android="http://schemas.android.com/apk/res/android"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0" >
+ android:viewportHeight="24"
+ android:viewportWidth="24" >
<!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used instead. -->
<path
<!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used instead. -->
<path
- android:fillColor="#FF1E88E5"
+ android:fillColor="#FF8AB4F8"
android:pathData="M6,19c0,1.1 0.9,2 2,2h8c1.1,0 2,-0.9 2,-2L18,7L6,7v12zM8.46,11.88l1.41,-1.41L12,12.59l2.12,-2.12 1.41,1.41L13.41,14l2.12,2.12 -1.41,1.41L12,15.41l-2.12,2.12 -1.41,-1.41L10.59,14l-2.13,-2.12zM15.5,4l-1,-1h-5l-1,1L5,4v2h14L19,4z"/>
</vector>
+++ /dev/null
-<!-- This file comes from the Android Material icon set, where it is called `close`. It is released under the Apache License 2.0. -->
-<vector
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:height="24dp"
- android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0" >
-
- <!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used. -->
- <path
- android:fillColor="#FFE0E0E0"
- android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z" />
-</vector>
\ No newline at end of file
xmlns:android="http://schemas.android.com/apk/res/android"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0" >
+ android:viewportHeight="24"
+ android:viewportWidth="24" >
<!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used instead. -->
<path
- android:fillColor="#FF1565C0"
+ android:fillColor="#FF616161"
android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z" />
</vector>
xmlns:android="http://schemas.android.com/apk/res/android"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0" >
+ android:viewportHeight="24"
+ android:viewportWidth="24" >
<!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used instead. -->
<path
- android:fillColor="#FF1E88E5"
+ android:fillColor="#FFE0E0E0"
android:pathData="M19,6.41L17.59,5 12,10.59 6.41,5 5,6.41 10.59,12 5,17.59 6.41,19 12,13.41 17.59,19 19,17.59 13.41,12z" />
</vector>
xmlns:tools="http://schemas.android.com/tools"
android:height="26dp"
android:width="26dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
android:autoMirrored="true"
tools:ignore="VectorRaster" >
xmlns:tools="http://schemas.android.com/tools"
android:height="26dp"
android:width="26dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
android:autoMirrored="true"
tools:ignore="VectorRaster" >
<!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used instead. -->
<path
- android:fillColor="#FF1E88E5"
+ android:fillColor="#FF8AB4F8"
android:pathData="M12,3A9,9 0 0,0 3,12A9,9 0 0,0 12,21A9,9 0 0,0 21,12C21,11.5 20.96,11 20.87,10.5C20.6,10 20,10 20,10H18V9C18,8 17,8 17,8H15V7C15,6 14,6 14,6H13V4C13,3 12,3 12,3M9.5,6A1.5,1.5 0 0,1 11,7.5A1.5,1.5 0 0,1 9.5,9A1.5,1.5 0 0,1 8,7.5A1.5,1.5 0 0,1 9.5,6M6.5,10A1.5,1.5 0 0,1 8,11.5A1.5,1.5 0 0,1 6.5,13A1.5,1.5 0 0,1 5,11.5A1.5,1.5 0 0,1 6.5,10M11.5,11A1.5,1.5 0 0,1 13,12.5A1.5,1.5 0 0,1 11.5,14A1.5,1.5 0 0,1 10,12.5A1.5,1.5 0 0,1 11.5,11M16.5,13A1.5,1.5 0 0,1 18,14.5A1.5,1.5 0 0,1 16.5,16H16.5A1.5,1.5 0 0,1 15,14.5H15A1.5,1.5 0 0,1 16.5,13M11,16A1.5,1.5 0 0,1 12.5,17.5A1.5,1.5 0 0,1 11,19A1.5,1.5 0 0,1 9.5,17.5A1.5,1.5 0 0,1 11,16Z" />
</vector>
\ No newline at end of file
xmlns:tools="http://schemas.android.com/tools"
android:height="26dp"
android:width="26dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
android:autoMirrored="true"
tools:ignore="VectorRaster" >
xmlns:tools="http://schemas.android.com/tools"
android:height="26dp"
android:width="26dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
android:autoMirrored="true"
tools:ignore="VectorRaster" >
xmlns:tools="http://schemas.android.com/tools"
android:height="26dp"
android:width="26dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
android:autoMirrored="true"
tools:ignore="VectorRaster" >
xmlns:tools="http://schemas.android.com/tools"
android:height="26dp"
android:width="26dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
android:autoMirrored="true"
tools:ignore="VectorRaster" >
xmlns:tools="http://schemas.android.com/tools"
android:height="26dp"
android:width="26dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
android:autoMirrored="true"
tools:ignore="VectorRaster" >
xmlns:tools="http://schemas.android.com/tools"
android:height="26dp"
android:width="26dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
android:autoMirrored="true"
tools:ignore="VectorRaster" >
<!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used. -->
<path
- android:fillColor="#FF1E88E5"
+ android:fillColor="#FF8AB4F8"
android:pathData="M16,1L4,1c-1.1,0 -2,0.9 -2,2v14h2L4,3h12L16,1zM15,5l6,6v10c0,1.1 -0.9,2 -2,2L7.99,23C6.89,23 6,22.1 6,21l0.01,-14c0,-1.1 0.89,-2 1.99,-2h7zM14,12h5.5L14,6.5L14,12z"/>
</vector>
\ No newline at end of file
--- /dev/null
+<!-- This file is derived from elements of `bookmark` and `create_new_folder`, which are part of the Android Material icon set. They are released under the Apache License 2.0.
+ Modifications copyright © 2017 Soren Stoutner <soren@stoutner.com>. The resulting image is released under the GPLv3+ license. -->
+<vector
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ android:height="24dp"
+ android:width="24dp"
+ android:viewportHeight="24"
+ android:viewportWidth="24" >
+
+ <!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used. -->
+ <path
+ android:fillColor="#FFFFFFFF"
+ android:pathData="M7,3C5.9,3 5.01,3.9 5.01,5L5,21L12,18L19,21L19,5C19,3.9 18.1,3 17,3L7,3zM11,7L13,7L13,10L16,10L16,12L13,12L13,15L11,15L11,12L8,12L8,10L11,10L11,7z" />
+
+</vector>
+++ /dev/null
-<!-- This file is derived from elements of `bookmark` and `create_new_folder`, which are part of the Android Material icon set. They are released under the Apache License 2.0.
- Modifications copyright © 2017 Soren Stoutner <soren@stoutner.com>. The resulting image is released under the GPLv3+ license. -->
-<vector
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:height="24dp"
- android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0" >
-
- <!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used. -->
- <path
- android:fillColor="#FFFFFFFF"
- android:pathData="M7,3C5.9,3 5.01,3.9 5.01,5L5,21L12,18L19,21L19,5C19,3.9 18.1,3 17,3L7,3zM11,7L13,7L13,10L16,10L16,12L13,12L13,15L11,15L11,12L8,12L8,10L11,10L11,7z" />
-
-</vector>
+++ /dev/null
-<!-- This file is derived from elements of `bookmark` and `create_new_folder`, which are part of the Android Material icon set. They are released under the Apache License 2.0.
- Modifications copyright © 2017 Soren Stoutner <soren@stoutner.com>. The resulting image is released under the GPLv3+ license. -->
-<vector
- xmlns:android="http://schemas.android.com/apk/res/android"
- android:height="24dp"
- android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0" >
-
- <!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used. -->
- <path
- android:fillColor="#FFE0E0E0"
- android:pathData="M7,3C5.9,3 5.01,3.9 5.01,5L5,21L12,18L19,21L19,5C19,3.9 18.1,3 17,3L7,3zM11,7L13,7L13,10L16,10L16,12L13,12L13,15L11,15L11,12L8,12L8,10L11,10L11,7z" />
-
-</vector>
--- /dev/null
+<!-- This file comes from the Android Material icon set, where it is called `create_new_folder`. It is released under the Apache License 2.0. -->
+
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
+<vector
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:height="24dp"
+ android:width="24dp"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
+ android:autoMirrored="true"
+ tools:ignore="VectorRaster" >
+
+ <!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used. -->
+ <path
+ android:fillColor="#FFFFFFFF"
+ android:pathData="M4,4C2.89,4 2.01,4.89 2.01,6L2,18C2,19.11 2.89,20 4,20L20,20C21.11,20 22,19.11 22,18L22,8C22,6.89 21.11,6 20,6L12,6L10,4L4,4zM11,9L13,9L13,12L16,12L16,14L13,14L13,17L11,17L11,14L8,14L8,12L11,12L11,9z" />
+</vector>
+++ /dev/null
-<!-- This file comes from the Android Material icon set, where it is called `create_new_folder`. It is released under the Apache License 2.0. -->
-
-<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
-<vector
- xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- android:height="24dp"
- android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0"
- android:autoMirrored="true"
- tools:ignore="VectorRaster" >
-
- <!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used. -->
- <path
- android:fillColor="#FFFFFFFF"
- android:pathData="M4,4C2.89,4 2.01,4.89 2.01,6L2,18C2,19.11 2.89,20 4,20L20,20C21.11,20 22,19.11 22,18L22,8C22,6.89 21.11,6 20,6L12,6L10,4L4,4zM11,9L13,9L13,12L16,12L16,14L13,14L13,17L11,17L11,14L8,14L8,12L11,12L11,9z" />
-</vector>
+++ /dev/null
-<!-- This file comes from the Android Material icon set, where it is called `create_new_folder`. It is released under the Apache License 2.0. -->
-
-<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
-<vector
- xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- android:height="24dp"
- android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0"
- android:autoMirrored="true"
- tools:ignore="VectorRaster" >
-
- <!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used. -->
- <path
- android:fillColor="#FFE0E0E0"
- android:pathData="M4,4C2.89,4 2.01,4.89 2.01,6L2,18C2,19.11 2.89,20 4,20L20,20C21.11,20 22,19.11 22,18L22,8C22,6.89 21.11,6 20,6L12,6L10,4L4,4zM11,9L13,9L13,12L16,12L16,14L13,14L13,17L11,17L11,14L8,14L8,12L11,12L11,9z" />
-</vector>
<vector
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
- android:autoMirrored="true"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
+ android:autoMirrored="true"
tools:ignore="VectorRaster">
<!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used instead. -->
<vector
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
- android:autoMirrored="true"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
+ android:autoMirrored="true"
tools:ignore="VectorRaster">
<!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used instead. -->
<path
- android:fillColor="#FF1E88E5"
+ android:fillColor="#FF8AB4F8"
android:pathData="M23,11.01L18,11c-0.55,0 -1,0.45 -1,1v9c0,0.55 0.45,1 1,1h5c0.55,0 1,-0.45 1,-1v-9c0,-0.55 -0.45,-0.99 -1,-0.99zM23,20h-5v-7h5v7zM20,2L2,2C0.89,2 0,2.89 0,4v12c0,1.1 0.89,2 2,2h7v2L7,20v2h8v-2h-2v-2h2v-2L2,16L2,4h18v5h2L22,4c0,-1.11 -0.9,-2 -2,-2zM11.97,9L11,6l-0.97,3L7,9l2.47,1.76 -0.94,2.91 2.47,-1.8 2.47,1.8 -0.94,-2.91L15,9h-3.03z"/>
</vector>
<vector
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
- android:autoMirrored="true"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
+ android:autoMirrored="true"
tools:ignore="VectorRaster">
<!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used instead. -->
android:autoMirrored="true"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
tools:ignore="VectorRaster">
<!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used instead. -->
xmlns:android="http://schemas.android.com/apk/res/android"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0" >
+ android:viewportHeight="24"
+ android:viewportWidth="24" >
<!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used. -->
<path
xmlns:android="http://schemas.android.com/apk/res/android"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0" >
+ android:viewportHeight="24"
+ android:viewportWidth="24" >
<!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used. -->
<path
xmlns:android="http://schemas.android.com/apk/res/android"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0" >
+ android:viewportHeight="24"
+ android:viewportWidth="24" >
<!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used. -->
<path
xmlns:tools="http://schemas.android.com/tools"
android:height="26dp"
android:width="26dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
android:autoMirrored="true"
tools:ignore="VectorRaster" >
xmlns:tools="http://schemas.android.com/tools"
android:height="26dp"
android:width="26dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
android:autoMirrored="true"
tools:ignore="VectorRaster" >
<!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used instead. -->
<path
- android:fillColor="#FF1E88E5"
+ android:fillColor="#FF8AB4F8"
android:pathData="M20,4L4,4c-1.1,0 -1.99,0.9 -1.99,2L2,18c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM15,18L4,18v-4h11v4zM15,13L4,13L4,9h11v4zM20,18h-4L16,9h4v9z"/>
</vector>
xmlns:tools="http://schemas.android.com/tools"
android:height="26dp"
android:width="26dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
android:autoMirrored="true"
tools:ignore="VectorRaster" >
xmlns:tools="http://schemas.android.com/tools"
android:height="26dp"
android:width="26dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
android:autoMirrored="true"
tools:ignore="VectorRaster" >
xmlns:tools="http://schemas.android.com/tools"
android:height="26dp"
android:width="26dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
android:autoMirrored="true"
tools:ignore="VectorRaster" >
xmlns:tools="http://schemas.android.com/tools"
android:height="26dp"
android:width="26dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
android:autoMirrored="true"
tools:ignore="VectorRaster">
xmlns:tools="http://schemas.android.com/tools"
android:height="26dp"
android:width="26dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
android:autoMirrored="true"
tools:ignore="VectorRaster">
xmlns:tools="http://schemas.android.com/tools"
android:height="26dp"
android:width="26dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
android:autoMirrored="true"
tools:ignore="VectorRaster" >
--- /dev/null
+<!-- This file comes from the Android Material icon set, where it is called `import_contacts`. It is released under the Apache License 2.0. -->
+
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
+<vector
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:height="24dp"
+ android:width="24dp"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
+ android:autoMirrored="true"
+ tools:ignore="VectorRaster" >
+
+ <!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used instead. -->
+ <path
+ android:fillColor="#FF1565C0"
+ android:pathData="M20,13H4c-0.55,0 -1,0.45 -1,1v6c0,0.55 0.45,1 1,1h16c0.55,0 1,-0.45 1,-1v-6c0,-0.55 -0.45,-1 -1,-1zM7,19c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM20,3H4c-0.55,0 -1,0.45 -1,1v6c0,0.55 0.45,1 1,1h16c0.55,0 1,-0.45 1,-1V4c0,-0.55 -0.45,-1 -1,-1zM7,9c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2z" />
+</vector>
+++ /dev/null
-<!-- This file comes from the Android Material icon set, where it is called `import_contacts`. It is released under the Apache License 2.0. -->
-
-<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
-<vector
- xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- android:height="24dp"
- android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0"
- android:autoMirrored="true"
- tools:ignore="VectorRaster" >
-
- <!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used instead. -->
- <path
- android:fillColor="#FF1565C0"
- android:pathData="M20,13H4c-0.55,0 -1,0.45 -1,1v6c0,0.55 0.45,1 1,1h16c0.55,0 1,-0.45 1,-1v-6c0,-0.55 -0.45,-1 -1,-1zM7,19c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM20,3H4c-0.55,0 -1,0.45 -1,1v6c0,0.55 0.45,1 1,1h16c0.55,0 1,-0.45 1,-1V4c0,-0.55 -0.45,-1 -1,-1zM7,9c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2z" />
-</vector>
xmlns:tools="http://schemas.android.com/tools"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
android:autoMirrored="true"
tools:ignore="VectorRaster" >
<!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used instead. -->
<path
- android:fillColor="#FF1E88E5"
+ android:fillColor="#FF8AB4F8"
android:pathData="M20,13H4c-0.55,0 -1,0.45 -1,1v6c0,0.55 0.45,1 1,1h16c0.55,0 1,-0.45 1,-1v-6c0,-0.55 -0.45,-1 -1,-1zM7,19c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM20,3H4c-0.55,0 -1,0.45 -1,1v6c0,0.55 0.45,1 1,1h16c0.55,0 1,-0.45 1,-1V4c0,-0.55 -0.45,-1 -1,-1zM7,9c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2z" />
</vector>
xmlns:android="http://schemas.android.com/apk/res/android"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0" >
+ android:viewportHeight="24"
+ android:viewportWidth="24" >
<!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used. -->
<path
xmlns:android="http://schemas.android.com/apk/res/android"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0" >
+ android:viewportHeight="24"
+ android:viewportWidth="24" >
<!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used. -->
<path
- android:fillColor="#FF1E88E5"
+ android:fillColor="#FF8AB4F8"
android:pathData="M19,9h-4V3H9v6H5l7,7 7,-7zM5,18v2h14v-2H5z" />
</vector>
\ No newline at end of file
xmlns:android="http://schemas.android.com/apk/res/android"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0" >
+ android:viewportHeight="24"
+ android:viewportWidth="24" >
<!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used. -->
<path
xmlns:android="http://schemas.android.com/apk/res/android"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0" >
+ android:viewportHeight="24"
+ android:viewportWidth="24" >
<!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used. -->
<path
xmlns:tools="http://schemas.android.com/tools"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
android:autoMirrored="true"
tools:ignore="VectorRaster" >
xmlns:tools="http://schemas.android.com/tools"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
android:autoMirrored="true"
tools:ignore="VectorRaster" >
xmlns:tools="http://schemas.android.com/tools"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
android:autoMirrored="true"
tools:ignore="VectorRaster" >
xmlns:tools="http://schemas.android.com/tools"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
android:autoMirrored="true"
tools:ignore="VectorRaster" >
<!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used instead. -->
<path
- android:fillColor="#FF1E88E5"
+ android:fillColor="#FF8AB4F8"
android:pathData="M2.5,4v3h5v12h3L10.5,7h5L15.5,4h-13zM21.5,9h-9v3h3v7h3v-7h3L21.5,9z" />
</vector>
\ No newline at end of file
xmlns:tools="http://schemas.android.com/tools"
android:height="26dp"
android:width="26dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
android:autoMirrored="true"
tools:ignore="VectorRaster">
xmlns:tools="http://schemas.android.com/tools"
android:height="26dp"
android:width="26dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
android:autoMirrored="true"
tools:ignore="VectorRaster">
<!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used instead. -->
<path
- android:fillColor="#FF1E88E5"
+ android:fillColor="#FF8AB4F8"
android:pathData="M20,4L4,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h16c1.1,0 2,-0.9 2,-2L22,6c0,-1.1 -0.9,-2 -2,-2zM4,12h4v2L4,14v-2zM14,18L4,18v-2h10v2zM20,18h-4v-2h4v2zM20,14L10,14v-2h10v2z"/>
</vector>
xmlns:tools="http://schemas.android.com/tools"
android:height="26dp"
android:width="26dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
android:autoMirrored="true"
tools:ignore="VectorRaster">
xmlns:tools="http://schemas.android.com/tools"
android:height="26dp"
android:width="26dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
android:autoMirrored="true"
tools:ignore="VectorRaster">
xmlns:tools="http://schemas.android.com/tools"
android:height="26dp"
android:width="26dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
android:autoMirrored="true"
tools:ignore="VectorRaster">
xmlns:tools="http://schemas.android.com/tools"
android:height="26dp"
android:width="26dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
android:autoMirrored="true"
tools:ignore="VectorRaster">
xmlns:android="http://schemas.android.com/apk/res/android"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0" >
+ android:viewportHeight="24"
+ android:viewportWidth="24" >
<!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used instead. -->
<path
xmlns:android="http://schemas.android.com/apk/res/android"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0" >
+ android:viewportHeight="24"
+ android:viewportWidth="24" >
<!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used instead. -->
<path
xmlns:android="http://schemas.android.com/apk/res/android"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0" >
+ android:viewportHeight="24"
+ android:viewportWidth="24" >
<!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used instead. -->
<path
xmlns:android="http://schemas.android.com/apk/res/android"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0" >
+ android:viewportHeight="24"
+ android:viewportWidth="24" >
<!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used instead. -->
<path
- android:fillColor="#FF1E88E5"
+ android:fillColor="#FF8AB4F8"
android:pathData="M17,1.01L7,1c-1.1,0 -2,0.9 -2,2v18c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2V3c0,-1.1 -0.9,-1.99 -2,-1.99zM17,19H7V5h10v14z"/>
</vector>
xmlns:android="http://schemas.android.com/apk/res/android"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0" >
+ android:viewportHeight="24"
+ android:viewportWidth="24" >
<!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used instead. -->
<path
xmlns:android="http://schemas.android.com/apk/res/android"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0" >
+ android:viewportHeight="24"
+ android:viewportWidth="24" >
<!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used instead. -->
<path
- android:fillColor="#FF1E88E5"
+ android:fillColor="#FF8AB4F8"
android:pathData="M10,20v-6h4v6h5v-8h3L12,3 2,12h3v8z" />
</vector>
\ No newline at end of file
xmlns:tools="http://schemas.android.com/tools"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
android:autoMirrored="true"
tools:ignore="VectorRaster" >
xmlns:tools="http://schemas.android.com/tools"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
android:autoMirrored="true"
tools:ignore="VectorRaster" >
xmlns:tools="http://schemas.android.com/tools"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
android:autoMirrored="true"
tools:ignore="VectorRaster" >
xmlns:tools="http://schemas.android.com/tools"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
android:autoMirrored="true"
tools:ignore="VectorRaster" >
<!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used instead. -->
<path
- android:fillColor="#FF1E88E5"
+ android:fillColor="#FF8AB4F8"
android:pathData="M21,19V5c0,-1.1 -0.9,-2 -2,-2H5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2zM8.5,13.5l2.5,3.01L14.5,12l4.5,6H5l3.5,-4.5z" />
</vector>
xmlns:tools="http://schemas.android.com/tools"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
android:autoMirrored="true"
tools:ignore="VectorRaster" >
<!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used instead. -->
<path
- android:fillColor="#FF1565C0"
+ android:fillColor="#FF5785C5"
android:pathData="M9,3L5,6.99h3L8,14h2L10,6.99h3L9,3zM16,17.01L16,10h-2v7.01h-3L15,21l4,-3.99h-3z" />
</vector>
\ No newline at end of file
xmlns:tools="http://schemas.android.com/tools"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
android:autoMirrored="true"
tools:ignore="VectorRaster" >
<!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used instead. -->
<path
- android:fillColor="#FF1E88E5"
+ android:fillColor="#FF8AB4F8"
android:pathData="M9,3L5,6.99h3L8,14h2L10,6.99h3L9,3zM16,17.01L16,10h-2v7.01h-3L15,21l4,-3.99h-3z" />
</vector>
\ No newline at end of file
android:autoMirrored="true"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
tools:ignore="VectorRaster">
<!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used instead. -->
android:autoMirrored="true"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
tools:ignore="VectorRaster">
<!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used instead. -->
android:autoMirrored="true"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
tools:ignore="VectorRaster">
<!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used instead. -->
android:autoMirrored="true"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
tools:ignore="VectorRaster">
<!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used instead. -->
<path
- android:fillColor="#FF1E88E5"
+ android:fillColor="#FF8AB4F8"
android:pathData="M12,7c2.76,0 5,2.24 5,5 0,0.65 -0.13,1.26 -0.36,1.83l2.92,2.92c1.51,-1.26 2.7,-2.89 3.43,-4.75 -1.73,-4.39 -6,-7.5 -11,-7.5 -1.4,0 -2.74,0.25 -3.98,0.7l2.16,2.16C10.74,7.13 11.35,7 12,7zM2,4.27l2.28,2.28 0.46,0.46C3.08,8.3 1.78,10.02 1,12c1.73,4.39 6,7.5 11,7.5 1.55,0 3.03,-0.3 4.38,-0.84l0.42,0.42L19.73,22 21,20.73 3.27,3 2,4.27zM7.53,9.8l1.55,1.55c-0.05,0.21 -0.08,0.43 -0.08,0.65 0,1.66 1.34,3 3,3 0.22,0 0.44,-0.03 0.65,-0.08l1.55,1.55c-0.67,0.33 -1.41,0.53 -2.2,0.53 -2.76,0 -5,-2.24 -5,-5 0,-0.79 0.2,-1.53 0.53,-2.2zM11.84,9.02l3.15,3.15 0.02,-0.16c0,-1.66 -1.34,-3 -3,-3l-0.17,0.01z"/>
</vector>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<item
android:state_activated="true"
- android:drawable="@color/blue_600" />
+ android:drawable="@color/violet_700" />
</selector>
\ No newline at end of file
xmlns:android="http://schemas.android.com/apk/res/android"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0" >
+ android:viewportHeight="24"
+ android:viewportWidth="24" >
<!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used instead. -->
<path
xmlns:android="http://schemas.android.com/apk/res/android"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0" >
+ android:viewportHeight="24"
+ android:viewportWidth="24" >
<!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used instead. -->
<path
- android:fillColor="#FF1E88E5"
+ android:fillColor="#FF8AB4F8"
android:pathData="M18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM12,17c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM15.1,8L8.9,8L8.9,6c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2z"/>
</vector>
<!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used instead. -->
<path
- android:fillColor="#FF1E88E5"
+ android:fillColor="#FF8AB4F8"
android:pathData="M17,7h-4v1.9h4c1.71,0 3.1,1.39 3.1,3.1 0,1.43 -0.98,2.63 -2.31,2.98l1.46,1.46C20.88,15.61 22,13.95 22,12c0,-2.76 -2.24,-5 -5,-5zM16,11h-2.19l2,2L16,13zM2,4.27l3.11,3.11C3.29,8.12 2,9.91 2,12c0,2.76 2.24,5 5,5h4v-1.9L7,15.1c-1.71,0 -3.1,-1.39 -3.1,-3.1 0,-1.59 1.21,-2.9 2.76,-3.07L8.73,11L8,11v2h2.73L13,15.27L13,17h1.73l4.01,4L20,19.74 3.27,3 2,4.27z"/>
</vector>
android:autoMirrored="true"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
tools:ignore="VectorRaster">
<!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used instead. -->
android:autoMirrored="true"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
tools:ignore="VectorRaster">
<!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used instead. -->
xmlns:tools="http://schemas.android.com/tools"
android:autoMirrored="true"
android:height="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
android:width="24dp"
tools:ignore="VectorRaster">
xmlns:tools="http://schemas.android.com/tools"
android:autoMirrored="true"
android:height="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
android:width="24dp"
tools:ignore="VectorRaster">
<!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used instead. -->
<path
- android:fillColor="#FF1E88E5"
+ android:fillColor="#FF8AB4F8"
android:pathData="M22,3L7,3c-0.69,0 -1.23,0.35 -1.59,0.88L0,12l5.41,8.11c0.36,0.53 0.97,0.89 1.66,0.89L22,21c1.1,0 2,-0.9 2,-2L24,5c0,-1.1 -0.9,-2 -2,-2zM9,13.5c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5zM14,13.5c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5zM19,13.5c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5z"/>
</vector>
xmlns:tools="http://schemas.android.com/tools"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
android:autoMirrored="true"
tools:ignore="VectorRaster" >
xmlns:tools="http://schemas.android.com/tools"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
android:autoMirrored="true"
tools:ignore="VectorRaster" >
xmlns:android="http://schemas.android.com/apk/res/android"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0" >
+ android:viewportHeight="24"
+ android:viewportWidth="24" >
<!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used. -->
<path
xmlns:android="http://schemas.android.com/apk/res/android"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0" >
+ android:viewportHeight="24"
+ android:viewportWidth="24" >
<!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used. -->
<path
xmlns:android="http://schemas.android.com/apk/res/android"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0" >
+ android:viewportHeight="24"
+ android:viewportWidth="24" >
<!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used. -->
<path
xmlns:tools="http://schemas.android.com/tools"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
android:autoMirrored="true"
tools:ignore="VectorRaster" >
xmlns:tools="http://schemas.android.com/tools"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
android:autoMirrored="true"
tools:ignore="VectorRaster" >
xmlns:tools="http://schemas.android.com/tools"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
android:autoMirrored="true"
tools:ignore="VectorRaster" >
<!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used instead. -->
<path
- android:fillColor="#FF1E88E5"
+ android:fillColor="#FF8AB4F8"
android:pathData="m14,3h5c1.1,0 2,0.9 2,2v14c0,1.1 -0.9,2 -2,2h-5v2L12,23L12,1h2zM14,18h5L14,12ZM5,3h5L10,5L5,5v13l5,-6v9L5,21C3.9,21 3,20.1 3,19L3,5C3,3.9 3.9,3 5,3Z"/>
</vector>
xmlns:android="http://schemas.android.com/apk/res/android"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0" >
+ android:viewportHeight="24"
+ android:viewportWidth="24" >
<!-- A hard coded color must be used until the minimum API >= 21. Then `@color` may be used instead. -->
<path
xmlns:android="http://schemas.android.com/apk/res/android"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0" >
+ android:viewportHeight="24"
+ android:viewportWidth="24" >
<!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used instead. -->
<path
xmlns:android="http://schemas.android.com/apk/res/android"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0" >
+ android:viewportHeight="24"
+ android:viewportWidth="24" >
<!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used instead. -->
<path
xmlns:android="http://schemas.android.com/apk/res/android"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0" >
+ android:viewportHeight="24"
+ android:viewportWidth="24" >
<!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used instead. -->
<path
- android:fillColor="#FF1E88E5"
+ android:fillColor="#FF8AB4F8"
android:pathData="M19,4L5,4c-1.11,0 -2,0.9 -2,2v12c0,1.1 0.89,2 2,2h4v-2L5,18L5,8h14v10h-4v2h4c1.1,0 2,-0.9 2,-2L21,6c0,-1.1 -0.89,-2 -2,-2zM12,10l-4,4h3v6h2v-6h3l-4,-4z" />
</vector>
xmlns:android="http://schemas.android.com/apk/res/android"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0" >
+ android:viewportHeight="24"
+ android:viewportWidth="24" >
<!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used instead. -->
<path
xmlns:android="http://schemas.android.com/apk/res/android"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0" >
+ android:viewportHeight="24"
+ android:viewportWidth="24" >
<!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used instead. -->
<path
android:autoMirrored="true"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
tools:ignore="VectorRaster" >
<!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used instead. -->
android:autoMirrored="true"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
tools:ignore="VectorRaster" >
<!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used instead. -->
android:autoMirrored="true"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
tools:ignore="VectorRaster" >
<!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used instead. -->
xmlns:tools="http://schemas.android.com/tools"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
android:autoMirrored="true"
tools:ignore="VectorRaster" >
<!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used instead. -->
<path
- android:fillColor="#FF1E88E5"
+ android:fillColor="#FF8AB4F8"
android:pathData="M17.65,6.35C16.2,4.9 14.21,4 12,4c-4.42,0 -7.99,3.58 -7.99,8s3.57,8 7.99,8c3.73,0 6.84,-2.55 7.73,-6h-2.08c-0.82,2.33 -3.04,4 -5.65,4 -3.31,0 -6,-2.69 -6,-6s2.69,-6 6,-6c1.66,0 3.14,0.69 4.22,1.78L13,11h7V4l-2.35,2.35z"/>
</vector>
xmlns:tools="http://schemas.android.com/tools"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
android:autoMirrored="true"
tools:ignore="VectorRaster" >
xmlns:tools="http://schemas.android.com/tools"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
android:autoMirrored="true"
tools:ignore="VectorRaster" >
<!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used. -->
<path
- android:fillColor="#FF1E88E5"
+ android:fillColor="#FF8AB4F8"
android:pathData="M17,3L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2L21,7l-4,-4zM12,19c-1.66,0 -3,-1.34 -3,-3s1.34,-3 3,-3 3,1.34 3,3 -1.34,3 -3,3zM15,9L5,9L5,5h10v4z" />
</vector>
\ No newline at end of file
xmlns:tools="http://schemas.android.com/tools"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
android:autoMirrored="true"
tools:ignore="VectorRaster" >
xmlns:tools="http://schemas.android.com/tools"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
android:autoMirrored="true"
tools:ignore="VectorRaster" >
<!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used instead. -->
<path
- android:fillColor="#FF1E88E5"
+ android:fillColor="#FF8AB4F8"
android:pathData="M20,19.59V8l-6,-6H6c-1.1,0 -1.99,0.9 -1.99,2L4,20c0,1.1 0.89,2 1.99,2H18c0.45,0 0.85,-0.15 1.19,-0.4l-4.43,-4.43c-0.8,0.52 -1.74,0.83 -2.76,0.83 -2.76,0 -5,-2.24 -5,-5s2.24,-5 5,-5 5,2.24 5,5c0,1.02 -0.31,1.96 -0.83,2.75L20,19.59zM9,13c0,1.66 1.34,3 3,3s3,-1.34 3,-3 -1.34,-3 -3,-3 -3,1.34 -3,3z"/>
</vector>
xmlns:tools="http://schemas.android.com/tools"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
android:autoMirrored="true"
tools:ignore="VectorRaster" >
xmlns:tools="http://schemas.android.com/tools"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
android:autoMirrored="true"
tools:ignore="VectorRaster" >
xmlns:tools="http://schemas.android.com/tools"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
android:autoMirrored="true"
tools:ignore="VectorRaster" >
xmlns:tools="http://schemas.android.com/tools"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
android:autoMirrored="true"
tools:ignore="VectorRaster" >
<!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used instead. -->
<path
- android:fillColor="#FF1E88E5"
+ android:fillColor="#FF8AB4F8"
android:pathData="M15.5,14h-0.79l-0.28,-0.27C15.41,12.59 16,11.11 16,9.5 16,5.91 13.09,3 9.5,3S3,5.91 3,9.5 5.91,16 9.5,16c1.61,0 3.09,-0.59 4.23,-1.57l0.27,0.28v0.79l5,4.99L20.49,19l-4.99,-5zM9.5,14C7.01,14 5,11.99 5,9.5S7.01,5 9.5,5 14,7.01 14,9.5 11.99,14 9.5,14z"/>
</vector>
xmlns:android="http://schemas.android.com/apk/res/android"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0" >
+ android:viewportHeight="24"
+ android:viewportWidth="24" >
<!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used. -->
<path
xmlns:android="http://schemas.android.com/apk/res/android"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0" >
+ android:viewportHeight="24"
+ android:viewportWidth="24" >
<!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used. -->
<path
xmlns:tools="http://schemas.android.com/tools"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
android:autoMirrored="true"
tools:ignore="VectorRaster" >
xmlns:tools="http://schemas.android.com/tools"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
android:autoMirrored="true"
tools:ignore="VectorRaster" >
xmlns:tools="http://schemas.android.com/tools"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
android:autoMirrored="true"
tools:ignore="VectorRaster" >
xmlns:tools="http://schemas.android.com/tools"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
android:autoMirrored="true"
tools:ignore="VectorRaster" >
<!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used instead. -->
<path
- android:fillColor="#FF1E88E5"
+ android:fillColor="#FF8AB4F8"
android:pathData="M12,6c0,-0.55 -0.45,-1 -1,-1L5.82,5l0.66,-3.18 0.02,-0.23c0,-0.31 -0.13,-0.59 -0.33,-0.8L5.38,0 0.44,4.94C0.17,5.21 0,5.59 0,6v6.5c0,0.83 0.67,1.5 1.5,1.5h6.75c0.62,0 1.15,-0.38 1.38,-0.91l2.26,-5.29c0.07,-0.17 0.11,-0.36 0.11,-0.55L12,6zM22.5,10h-6.75c-0.62,0 -1.15,0.38 -1.38,0.91l-2.26,5.29c-0.07,0.17 -0.11,0.36 -0.11,0.55L12,18c0,0.55 0.45,1 1,1h5.18l-0.66,3.18 -0.02,0.24c0,0.31 0.13,0.59 0.33,0.8l0.79,0.78 4.94,-4.94c0.27,-0.27 0.44,-0.65 0.44,-1.06v-6.5c0,-0.83 -0.67,-1.5 -1.5,-1.5z"/>
</vector>
xmlns:tools="http://schemas.android.com/tools"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
android:autoMirrored="true"
tools:ignore="VectorRaster" >
xmlns:tools="http://schemas.android.com/tools"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
android:autoMirrored="true"
tools:ignore="VectorRaster" >
android:autoMirrored="true"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
tools:ignore="VectorRaster" >
<!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used. -->
android:autoMirrored="true"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
tools:ignore="VectorRaster" >
<!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used. -->
xmlns:tools="http://schemas.android.com/tools"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
android:autoMirrored="true"
tools:ignore="VectorRaster" >
xmlns:tools="http://schemas.android.com/tools"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
android:autoMirrored="true"
tools:ignore="VectorRaster" >
xmlns:tools="http://schemas.android.com/tools"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
android:autoMirrored="true"
tools:ignore="VectorRaster" >
xmlns:tools="http://schemas.android.com/tools"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
android:autoMirrored="true"
tools:ignore="VectorRaster" >
<!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used instead. -->
<path
- android:fillColor="#FF1E88E5"
+ android:fillColor="#FF8AB4F8"
android:pathData="M22,4v-0.5C22,2.12 20.88,1 19.5,1S17,2.12 17,3.5L17,4c-0.55,0 -1,0.45 -1,1v4c0,0.55 0.45,1 1,1h5c0.55,0 1,-0.45 1,-1L23,5c0,-0.55 -0.45,-1 -1,-1zM21.2,4h-3.4v-0.5c0,-0.94 0.76,-1.7 1.7,-1.7s1.7,0.76 1.7,1.7L21.2,4zM18.92,12c0.04,0.33 0.08,0.66 0.08,1 0,2.08 -0.8,3.97 -2.1,5.39 -0.26,-0.81 -1,-1.39 -1.9,-1.39h-1v-3c0,-0.55 -0.45,-1 -1,-1L7,13v-2h2c0.55,0 1,-0.45 1,-1L10,8h2c1.1,0 2,-0.9 2,-2L14,3.46c-0.95,-0.3 -1.95,-0.46 -3,-0.46C5.48,3 1,7.48 1,13s4.48,10 10,10 10,-4.48 10,-10c0,-0.34 -0.02,-0.67 -0.05,-1h-2.03zM10,20.93c-3.95,-0.49 -7,-3.85 -7,-7.93 0,-0.62 0.08,-1.21 0.21,-1.79L8,16v1c0,1.1 0.9,2 2,2v1.93z" />
</vector>
\ No newline at end of file
+++ /dev/null
-<!-- This icon comes from the Android Material icon set, where it is called `tab`. It is released under the Apache License 2.0. -->
-
-<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
-<vector
- xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- android:height="24dp"
- android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0"
- android:autoMirrored="true"
- tools:ignore="VectorRaster" >
-
- <!-- A hard coded color must be used until the minimum API >= 21. Then `@color` can be used. -->
- <path
- android:fillColor="#FF9E9E9E"
- android:pathData="M21,3L3,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h18c1.1,0 2,-0.9 2,-2L23,5c0,-1.1 -0.9,-2 -2,-2zM21,19L3,19L3,5h10v4h8v10z" />
-</vector>
\ No newline at end of file
--- /dev/null
+<!-- This file comes from the Android Material icon set, where it is called `tab`. It is released under the Apache License 2.0. -->
+
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
+<vector
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:height="24dp"
+ android:width="24dp"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
+ android:autoMirrored="true"
+ tools:ignore="VectorRaster" >
+
+ <!-- A hard coded color must be used until the minimum API >= 21. Then `@color` can be used. -->
+ <path
+ android:fillColor="#FF757575"
+ android:pathData="M21,3L3,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h18c1.1,0 2,-0.9 2,-2L23,5c0,-1.1 -0.9,-2 -2,-2zM21,19L3,19L3,5h10v4h8v10z" />
+</vector>
\ No newline at end of file
+++ /dev/null
-<!-- This icon comes from the Android Material icon set, where it is called `tab`. It is released under the Apache License 2.0. -->
-
-<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
-<vector
- xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- android:height="24dp"
- android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0"
- android:autoMirrored="true"
- tools:ignore="VectorRaster" >
-
- <!-- A hard coded color must be used until the minimum API >= 21. Then `@color` can be used. -->
- <path
- android:fillColor="#FF757575"
- android:pathData="M21,3L3,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h18c1.1,0 2,-0.9 2,-2L23,5c0,-1.1 -0.9,-2 -2,-2zM21,19L3,19L3,5h10v4h8v10z" />
-</vector>
\ No newline at end of file
--- /dev/null
+<!-- This file comes from the Android Material icon set, where it is called `tab`. It is released under the Apache License 2.0. -->
+
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
+<vector
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:height="24dp"
+ android:width="24dp"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
+ android:autoMirrored="true"
+ tools:ignore="VectorRaster" >
+
+ <!-- A hard coded color must be used until the minimum API >= 21. Then `@color` can be used. -->
+ <path
+ android:fillColor="#FF9E9E9E"
+ android:pathData="M21,3L3,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h18c1.1,0 2,-0.9 2,-2L23,5c0,-1.1 -0.9,-2 -2,-2zM21,19L3,19L3,5h10v4h8v10z" />
+</vector>
\ No newline at end of file
+++ /dev/null
-<!-- This icon comes from the Android Material icon set, where it is called `tab`. It is released under the Apache License 2.0. -->
-
-<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
-<vector
- xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- android:height="24dp"
- android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0"
- android:autoMirrored="true"
- tools:ignore="VectorRaster" >
-
- <!-- A hard coded color must be used until the minimum API >= 21. Then `@color` can be used. -->
- <path
- android:fillColor="#FF1E88E5"
- android:pathData="M21,3L3,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h18c1.1,0 2,-0.9 2,-2L23,5c0,-1.1 -0.9,-2 -2,-2zM21,19L3,19L3,5h10v4h8v10z" />
-</vector>
\ No newline at end of file
--- /dev/null
+<!-- This file comes from the Android Material icon set, where it is called `tab`. It is released under the Apache License 2.0. -->
+
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
+<vector
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:height="24dp"
+ android:width="24dp"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
+ android:autoMirrored="true"
+ tools:ignore="VectorRaster" >
+
+ <!-- A hard coded color must be used until the minimum API >= 21. Then `@color` can be used. -->
+ <path
+ android:fillColor="#FF1565C0"
+ android:pathData="M21,3L3,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h18c1.1,0 2,-0.9 2,-2L23,5c0,-1.1 -0.9,-2 -2,-2zM21,19L3,19L3,5h10v4h8v10z" />
+</vector>
\ No newline at end of file
+++ /dev/null
-<!-- This icon comes from the Android Material icon set, where it is called `tab`. It is released under the Apache License 2.0. -->
-
-<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
-<vector
- xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- android:height="24dp"
- android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0"
- android:autoMirrored="true"
- tools:ignore="VectorRaster" >
-
- <!-- A hard coded color must be used until the minimum API >= 21. Then `@color` can be used. -->
- <path
- android:fillColor="#FF1565C0"
- android:pathData="M21,3L3,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h18c1.1,0 2,-0.9 2,-2L23,5c0,-1.1 -0.9,-2 -2,-2zM21,19L3,19L3,5h10v4h8v10z" />
-</vector>
\ No newline at end of file
--- /dev/null
+<!-- This file comes from the Android Material icon set, where it is called `tab`. It is released under the Apache License 2.0. -->
+
+<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
+<vector
+ xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:height="24dp"
+ android:width="24dp"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
+ android:autoMirrored="true"
+ tools:ignore="VectorRaster" >
+
+ <!-- A hard coded color must be used until the minimum API >= 21. Then `@color` can be used. -->
+ <path
+ android:fillColor="#FF8AB4F8"
+ android:pathData="M21,3L3,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h18c1.1,0 2,-0.9 2,-2L23,5c0,-1.1 -0.9,-2 -2,-2zM21,19L3,19L3,5h10v4h8v10z" />
+</vector>
\ No newline at end of file
+++ /dev/null
-<!-- This file comes from the Android Material icon set, where it is called `style`. It is released under the Apache License 2.0. -->
-
-<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
-<vector
- xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- android:height="24dp"
- android:width="24dp"
- android:viewportWidth="24.0"
- android:viewportHeight="24.0"
- android:autoMirrored="true"
- tools:ignore="VectorRaster" >
-
- <!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used. -->
- <path
- android:fillColor="#FF1565C0"
- android:pathData="M2.53,19.65l1.34,0.56v-9.03l-2.43,5.86c-0.41,1.02 0.08,2.19 1.09,2.61zM22.03,15.95L17.07,3.98c-0.31,-0.75 -1.04,-1.21 -1.81,-1.23 -0.26,0 -0.53,0.04 -0.79,0.15L7.1,5.95c-0.75,0.31 -1.21,1.03 -1.23,1.8 -0.01,0.27 0.04,0.54 0.15,0.8l4.96,11.97c0.31,0.76 1.05,1.22 1.83,1.23 0.26,0 0.52,-0.05 0.77,-0.15l7.36,-3.05c1.02,-0.42 1.51,-1.59 1.09,-2.6zM7.88,8.75c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1 1,0.45 1,1 -0.45,1 -1,1zM5.88,19.75c0,1.1 0.9,2 2,2h1.45l-3.45,-8.34v6.34z"/>
-</vector>
\ No newline at end of file
+++ /dev/null
-<!-- This file comes from the Android Material icon set, where it is called `style`. It is released under the Apache License 2.0. -->
-
-<!-- `tools:ignore="VectorRaster"` removes the lint warning about `android:autoMirrored="true"` not applying to API < 21. -->
-<vector
- xmlns:android="http://schemas.android.com/apk/res/android"
- xmlns:tools="http://schemas.android.com/tools"
- android:height="24dp"
- android:width="24dp"
- android:viewportWidth="24.0"
- android:viewportHeight="24.0"
- android:autoMirrored="true"
- tools:ignore="VectorRaster" >
-
- <!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used. -->
- <path
- android:fillColor="#FF1E88E5"
- android:pathData="M2.53,19.65l1.34,0.56v-9.03l-2.43,5.86c-0.41,1.02 0.08,2.19 1.09,2.61zM22.03,15.95L17.07,3.98c-0.31,-0.75 -1.04,-1.21 -1.81,-1.23 -0.26,0 -0.53,0.04 -0.79,0.15L7.1,5.95c-0.75,0.31 -1.21,1.03 -1.23,1.8 -0.01,0.27 0.04,0.54 0.15,0.8l4.96,11.97c0.31,0.76 1.05,1.22 1.83,1.23 0.26,0 0.52,-0.05 0.77,-0.15l7.36,-3.05c1.02,-0.42 1.51,-1.59 1.09,-2.6zM7.88,8.75c-0.55,0 -1,-0.45 -1,-1s0.45,-1 1,-1 1,0.45 1,1 -0.45,1 -1,1zM5.88,19.75c0,1.1 0.9,2 2,2h1.45l-3.45,-8.34v6.34z"/>
-</vector>
\ No newline at end of file
xmlns:tools="http://schemas.android.com/tools"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
android:autoMirrored="true"
tools:ignore="VectorRaster" >
xmlns:tools="http://schemas.android.com/tools"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0"
+ android:viewportHeight="24"
+ android:viewportWidth="24"
android:autoMirrored="true"
tools:ignore="VectorRaster" >
<!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used instead. -->
<path
- android:fillColor="#FF1E88E5"
+ android:fillColor="#FF8AB4F8"
android:pathData="M3,6h18L21,4L3,4c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h4v-2L3,18L3,6zM13,12L9,12v1.78c-0.61,0.55 -1,1.33 -1,2.22s0.39,1.67 1,2.22L9,20h4v-1.78c0.61,-0.55 1,-1.34 1,-2.22s-0.39,-1.67 -1,-2.22L13,12zM11,17.5c-0.83,0 -1.5,-0.67 -1.5,-1.5s0.67,-1.5 1.5,-1.5 1.5,0.67 1.5,1.5 -0.67,1.5 -1.5,1.5zM22,8h-6c-0.5,0 -1,0.5 -1,1v10c0,0.5 0.5,1 1,1h6c0.5,0 1,-0.5 1,-1L23,9c0,-0.5 -0.5,-1 -1,-1zM21,18h-4v-8h4v8z"/>
</vector>
xmlns:android="http://schemas.android.com/apk/res/android"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0" >
+ android:viewportHeight="24"
+ android:viewportWidth="24" >
<!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used instead. -->
<path
xmlns:android="http://schemas.android.com/apk/res/android"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0" >
+ android:viewportHeight="24"
+ android:viewportWidth="24" >
<!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used instead. -->
<path
xmlns:android="http://schemas.android.com/apk/res/android"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0" >
+ android:viewportHeight="24"
+ android:viewportWidth="24" >
<!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used instead. -->
<path
xmlns:android="http://schemas.android.com/apk/res/android"
android:height="24dp"
android:width="24dp"
- android:viewportHeight="24.0"
- android:viewportWidth="24.0" >
+ android:viewportHeight="24"
+ android:viewportWidth="24" >
<!-- A hard coded color must be used until API >= 21. Then `@color` or `?attr/colorControlNormal` may be used instead. -->
<path
- android:fillColor="#FF1E88E5"
+ android:fillColor="#FF8AB4F8"
android:pathData="M12.01,5.5L10,8h4l-1.99,-2.5zM18,10v4l2.5,-1.99L18,10zM6,10l-2.5,2.01L6,14v-4zM14,16h-4l2.01,2.5L14,16zM21,3L3,3c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h18c1.1,0 2,-0.9 2,-2L23,5c0,-1.1 -0.9,-2 -2,-2zM21,19.01L3,19.01L3,4.99h18v14.02z"/>
</vector>
android:layout_gravity="bottom|end"
android:layout_marginEnd="16dp"
android:layout_marginBottom="155dp"
- android:src="?attr/bookmarksIcon" />
+ android:src="@drawable/bookmarks"
+ android:tint="?attr/fabIconTintColor" />
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/create_bookmark_folder_fab"
android:layout_gravity="bottom|end"
android:layout_marginEnd="16dp"
android:layout_marginBottom="85dp"
- android:src="?attr/createFolderIcon" />
+ android:src="@drawable/create_folder"
+ android:tint="?attr/fabIconTintColor" />
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/create_bookmark_fab"
android:layout_width="wrap_content"
android:layout_gravity="bottom|end"
android:layout_margin="16dp"
- android:src="?attr/createBookmarkIcon" />
+ android:src="@drawable/create_bookmark"
+ android:tint="?attr/fabIconTintColor" />
</FrameLayout>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<!--
- Copyright © 2017,2019 Soren Stoutner <soren@stoutner.com>.
+ Copyright © 2017,2019-2020 Soren Stoutner <soren@stoutner.com>.
This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:text="@string/domain_name_already_exists"
- android:textColor="?attr/redText"
+ android:textColor="?attr/redTextColor"
android:layout_marginStart="8dp"
android:layout_marginEnd="8dp" />
</LinearLayout>
\ No newline at end of file
android:layout_gravity="bottom|end"
android:layout_marginEnd="16dp"
android:layout_marginBottom="85dp"
- android:src="?attr/createFolderIcon" />
+ android:src="@drawable/create_folder"
+ android:tint="?attr/fabIconTintColor" />
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/create_bookmark_fab"
android:layout_width="wrap_content"
android:layout_gravity="bottom|end"
android:layout_margin="16dp"
- android:src="?attr/createBookmarkIcon" />
+ android:src="@drawable/create_bookmark"
+ android:tint="?attr/fabIconTintColor" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
android:layout_gravity="bottom|end"
android:layout_marginEnd="16dp"
android:layout_marginBottom="155dp"
- android:src="?attr/bookmarksIcon" />
+ android:src="@drawable/bookmarks"
+ android:tint="?attr/fabIconTintColor" />
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/create_bookmark_folder_fab"
android:layout_gravity="bottom|end"
android:layout_marginEnd="16dp"
android:layout_marginBottom="85dp"
- android:src="?attr/createFolderIcon" />
+ android:src="@drawable/create_folder"
+ android:tint="?attr/fabIconTintColor" />
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/create_bookmark_fab"
android:layout_width="wrap_content"
android:layout_gravity="bottom|end"
android:layout_margin="16dp"
- android:src="?attr/createBookmarkIcon" />
+ android:src="@drawable/create_bookmark"
+ android:tint="?attr/fabIconTintColor" />
</FrameLayout>
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<!--
- Copyright © 2017-2018 Soren Stoutner <soren@stoutner.com>.
+ Copyright © 2017-2018,2020 Soren Stoutner <soren@stoutner.com>.
This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
android:paddingTop="8dp"
android:paddingBottom="8dp"
android:textSize="18sp"
- android:textColor="?attr/spinnerTextColorSelector" />
+ android:textColor="@color/checked_text_color_selector" />
</com.stoutner.privacybrowser.views.CheckedLinearLayout>
\ No newline at end of file
android:layout_marginEnd="10dp"
android:layout_marginBottom="12dp"
android:layout_gravity="bottom"
- android:src="@drawable/domains_light"
+ android:src="@drawable/domains_day"
android:tint="?attr/domainSettingsIconTintColor"
tools:ignore="contentDescription" />
android:layout_marginTop="1dp"
android:layout_marginEnd="10dp"
android:layout_gravity="center_vertical"
+ android:src="@drawable/cookies_enabled"
tools:ignore="contentDescription" />
<Switch
android:text="@string/issued_to"
android:textAllCaps="true"
android:textStyle="bold"
- android:textColor="?attr/sslTitle" />
+ android:textColor="?attr/blueTitleTextColor" />
<TextView
android:id="@+id/saved_ssl_certificate_issued_to_cname"
android:text="@string/issued_by"
android:textAllCaps="true"
android:textStyle="bold"
- android:textColor="?attr/sslTitle"/>
+ android:textColor="?attr/blueTitleTextColor"/>
<TextView
android:id="@+id/saved_ssl_certificate_issued_by_cname"
android:text="@string/valid_dates"
android:textAllCaps="true"
android:textStyle="bold"
- android:textColor="?attr/sslTitle"/>
+ android:textColor="?attr/blueTitleTextColor"/>
<TextView
android:id="@+id/saved_ssl_certificate_start_date"
android:text="@string/issued_to"
android:textAllCaps="true"
android:textStyle="bold"
- android:textColor="?attr/sslTitle" />
+ android:textColor="?attr/blueTitleTextColor" />
<TextView
android:id="@+id/current_website_certificate_issued_to_cname"
android:text="@string/issued_by"
android:textAllCaps="true"
android:textStyle="bold"
- android:textColor="?attr/sslTitle" />
+ android:textColor="?attr/blueTitleTextColor" />
<TextView
android:id="@+id/current_website_certificate_issued_by_cname"
android:text="@string/valid_dates"
android:textAllCaps="true"
android:textStyle="bold"
- android:textColor="?attr/sslTitle" />
+ android:textColor="?attr/blueTitleTextColor" />
<TextView
android:id="@+id/current_website_certificate_start_date"
android:layout_width="wrap_content"
android:layout_gravity="bottom|end"
android:layout_margin="16dp"
- android:src="?attr/addIcon" />
+ android:src="@drawable/add"
+ android:tint="?attr/fabIconTintColor" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
android:layout_gravity="center_horizontal"
android:layout_margin="5dp"
android:text="@string/file_does_not_exist"
- android:textColor="?attr/redText"
+ android:textColor="?attr/redTextColor"
android:textAlignment="center" />
<TextView
android:layout_gravity="center_horizontal"
android:layout_margin="5dp"
android:text="@string/file_exists_warning"
- android:textColor="?attr/redText"
+ android:textColor="?attr/redTextColor"
android:textAlignment="center" />
<!-- OpenKeychain import instructions -->
android:layout_gravity="center_vertical"
android:paddingStart="10dp"
android:paddingEnd="10dp"
- android:src="@drawable/add_day"
+ android:src="@drawable/add"
android:tint="?attr/addTabIconTintColor"
android:background="?attr/selectableItemBackground"
android:onClick="addTab"
android:layout_gravity="center_horizontal"
android:layout_margin="5dp"
android:text="@string/file_does_not_exist"
- android:textColor="?attr/redText"
+ android:textColor="?attr/redTextColor"
android:textAlignment="center" />
<!-- Storage permission explanation. -->
<?xml version="1.0" encoding="utf-8"?>
<!--
- Copyright © 2017-2019 Soren Stoutner <soren@stoutner.com>.
+ Copyright © 2017-2020 Soren Stoutner <soren@stoutner.com>.
This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
android:text="@string/domain"
android:textAllCaps="true"
android:textStyle="bold"
- android:textColor="?attr/sslTitle" />
+ android:textColor="?attr/blueTitleTextColor" />
<TextView
android:id="@+id/domain_name"
android:text="@string/issued_to"
android:textAllCaps="true"
android:textStyle="bold"
- android:textColor="?attr/sslTitle" />
+ android:textColor="?attr/blueTitleTextColor" />
<TextView
android:id="@+id/issued_to_cname"
android:text="@string/issued_by"
android:textAllCaps="true"
android:textStyle="bold"
- android:textColor="?attr/sslTitle" />
+ android:textColor="?attr/blueTitleTextColor" />
<TextView
android:id="@+id/issued_by_cname"
android:text="@string/valid_dates"
android:textAllCaps="true"
android:textStyle="bold"
- android:textColor="?attr/sslTitle" />
+ android:textColor="?attr/blueTitleTextColor" />
<TextView
android:id="@+id/start_date"
android:layout_gravity="center_horizontal"
android:layout_margin="5dp"
android:text="@string/file_exists_warning"
- android:textColor="?attr/redText"
+ android:textColor="?attr/redTextColor"
android:textAlignment="center" />
<!-- Storage permission explanation. -->
android:layout_gravity="center_horizontal"
android:layout_margin="5dp"
android:text="@string/file_exists_warning"
- android:textColor="?attr/redText"
+ android:textColor="?attr/redTextColor"
android:textAlignment="center" />
<!-- Storage permission explanation. -->
android:layout_height="wrap_content"
android:layout_width="wrap_content"
android:layout_gravity="center_horizontal"
- android:textColor="?attr/redText"
+ android:textColor="?attr/redTextColor"
android:textStyle="bold"/>
<!-- URL. -->
android:text="@string/url"
android:textAllCaps="true"
android:textStyle="bold"
- android:textColor="?attr/sslTitle" />
+ android:textColor="?attr/blueTitleTextColor" />
<TextView
android:id="@+id/url"
android:text="@string/issued_to"
android:textAllCaps="true"
android:textStyle="bold"
- android:textColor="?attr/sslTitle" />
+ android:textColor="?attr/blueTitleTextColor" />
<TextView
android:id="@+id/issued_to_cname"
android:text="@string/issued_by"
android:textAllCaps="true"
android:textStyle="bold"
- android:textColor="?attr/sslTitle"/>
+ android:textColor="?attr/blueTitleTextColor" />
<TextView
android:id="@+id/issued_by_cname"
android:text="@string/valid_dates"
android:textAllCaps="true"
android:textStyle="bold"
- android:textColor="?attr/sslTitle"/>
+ android:textColor="?attr/blueTitleTextColor" />
<TextView
android:id="@+id/start_date"
<?xml version="1.0" encoding="utf-8"?>
<!--
- Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
+ Copyright © 2016-2017,2020 Soren Stoutner <soren@stoutner.com>.
This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
android:layout_height="match_parent"
android:layout_width="match_parent"
android:padding="15dp"
- android:textColor="?attr/redText"
+ android:textColor="?attr/redTextColor"
android:text="@string/no_ssl_certificate" />
\ No newline at end of file
<?xml version="1.0" encoding="utf-8"?>
<!--
- Copyright © 2018 Soren Stoutner <soren@stoutner.com>.
+ Copyright © 2018,2020 Soren Stoutner <soren@stoutner.com>.
This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
android:layout_width="match_parent"
android:text="@string/disposition"
android:textSize="12sp"
- android:textColor="@color/blue_700"
+ android:textColor="?attr/blueTextColor"
android:layout_marginTop="5dp" />
<TextView
android:layout_width="match_parent"
android:text="@string/url"
android:textSize="12sp"
- android:textColor="@color/blue_700"
+ android:textColor="?attr/blueTextColor"
android:layout_marginTop="10dp" />
<TextView
android:layout_width="match_parent"
android:text="@string/blocklist"
android:textSize="12sp"
- android:textColor="@color/blue_700"
+ android:textColor="?attr/blueTextColor"
android:layout_marginTop="10dp" />
<TextView
android:layout_width="match_parent"
android:text="@string/sublist"
android:textSize="12sp"
- android:textColor="@color/blue_700"
+ android:textColor="?attr/blueTextColor"
android:layout_marginTop="10dp" />
<TextView
android:layout_width="match_parent"
android:text="@string/blocklist_entries"
android:textSize="12sp"
- android:textColor="@color/blue_700"
+ android:textColor="?attr/blueTextColor"
android:layout_marginTop="10dp" />
<TextView
android:layout_width="match_parent"
android:text="@string/blocklist_original_entry"
android:textSize="12sp"
- android:textColor="@color/blue_700"
+ android:textColor="?attr/blueTextColor"
android:layout_marginTop="10dp" />
<TextView
android:text="@string/request_headers"
android:textAlignment="center"
android:textSize="18sp"
- android:textColor="@color/blue_600"
+ android:textColor="?attr/blueTextColor"
android:textStyle="bold" />
<TextView
android:text="@string/response_message"
android:textAlignment="center"
android:textSize="18sp"
- android:textColor="@color/blue_600"
+ android:textColor="?attr/blueTextColor"
android:textStyle="bold" />
<TextView
android:text="@string/response_headers"
android:textAlignment="center"
android:textSize="18sp"
- android:textColor="@color/blue_600"
+ android:textColor="?attr/blueTextColor"
android:textStyle="bold" />
<TextView
android:text="@string/response_body"
android:textAlignment="center"
android:textSize="18sp"
- android:textColor="@color/blue_600"
+ android:textColor="?attr/blueTextColor"
android:textStyle="bold" />
<TextView
<?xml version="1.0" encoding="utf-8"?>
<!--
- Copyright © 2016-2017,2019 Soren Stoutner <soren@stoutner.com>.
+ Copyright © 2016-2017,2019-2020 Soren Stoutner <soren@stoutner.com>.
This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
android:text="@string/domain"
android:textAllCaps="true"
android:textStyle="bold"
- android:textColor="?attr/sslTitle" />
+ android:textColor="?attr/blueTitleTextColor" />
<TextView
android:id="@+id/domain"
android:text="@string/issued_to"
android:textAllCaps="true"
android:textStyle="bold"
- android:textColor="?attr/sslTitle" />
+ android:textColor="?attr/blueTitleTextColor" />
<TextView
android:id="@+id/issued_to_cname"
android:text="@string/issued_by"
android:textAllCaps="true"
android:textStyle="bold"
- android:textColor="?attr/sslTitle" />
+ android:textColor="?attr/blueTitleTextColor" />
<TextView
android:id="@+id/issued_by_cname"
android:text="@string/valid_dates"
android:textAllCaps="true"
android:textStyle="bold"
- android:textColor="?attr/sslTitle" />
+ android:textColor="?attr/blueTitleTextColor" />
<TextView
android:id="@+id/start_date"
<?xml version="1.0" encoding="utf-8"?>
<!--
- Copyright © 2015-2017 Soren Stoutner <soren@stoutner.com>.
+ Copyright © 2015-2017,2020 Soren Stoutner <soren@stoutner.com>.
This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
android:orderInCategory="20"
app:showAsAction="ifRoom" />
+ <!-- `android:iconTint` can be used once API >= 26 instead of including a separate drawable for each theme. -->
<item
android:id="@+id/move_to_folder"
android:title="@string/move_to_folder"
android:icon="?attr/moveToFolderIcon"
app:showAsAction="ifRoom" />
+ <!-- `android:iconTint` can be used once API >= 26 instead of including a separate drawable for each theme. -->
<item
android:id="@+id/edit_bookmark"
android:title="@string/edit"
android:icon="?attr/editIcon"
app:showAsAction="ifRoom" />
+ <!-- `android:iconTint` can be used once API >= 26 instead of including a separate drawable for each theme. -->
<item
android:id="@+id/delete_bookmark"
android:title="@string/delete"
android:icon="?attr/deleteIcon"
app:showAsAction="ifRoom" />
+ <!-- `android:iconTint` can be used once API >= 26 instead of including a separate drawable for each theme. -->
<item
android:id="@+id/context_menu_select_all_bookmarks"
android:title="@string/select_all"
<?xml version="1.0" encoding="utf-8"?>
<!--
- Copyright © 2019 Soren Stoutner <soren@stoutner.com>.
+ Copyright © 2019-2020 Soren Stoutner <soren@stoutner.com>.
This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
-
+ <!-- `android:iconTint` can be used once API >= 26 instead of including a separate drawable for each theme. -->
<item
android:id="@+id/select_all"
android:title="@string/select_all"
<?xml version="1.0" encoding="utf-8"?>
<!--
- Copyright © 2017 Soren Stoutner <soren@stoutner.com>.
+ Copyright © 2017,2020 Soren Stoutner <soren@stoutner.com>.
This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto">
+ <!-- `android:iconTint` can be used once API >= 26 instead of including a separate drawable for each theme. -->
<item
android:id="@+id/delete_domain"
android:title="@string/delete"
<?xml version="1.0" encoding="utf-8"?>
<!--
- Copyright © 2015-2019 Soren Stoutner <soren@stoutner.com>.
+ Copyright © 2015-2020 Soren Stoutner <soren@stoutner.com>.
This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
android:id="@+id/clear"
android:title="@string/clear"
android:orderInCategory="30"
- android:icon="?attr/clearIcon"
+ android:icon="?attr/closeIcon"
app:showAsAction="ifRoom" />
</menu>
\ No newline at end of file
<item
android:id="@+id/domains"
android:title="@string/domains"
- android:icon="@drawable/domains_light"
+ android:icon="@drawable/domains_day"
android:orderInCategory="90" />
<item
<string name="custom_user_agent">Eigener User Agent</string>
<string name="incognito_mode">Inkognito-Modus</string>
<string name="incognito_mode_summary">Löscht den Verlauf und den Cache nach jedem fertigen Laden einer Webseite.
- Im Incognito-Modus schliesst \'Zurück\'-Button den aktive Tab (oder die App, wenn nur ein Tab geöffnet wurde).</string>
+ Im Incognito-Modus schließt \'Zurück\'-Button den aktive Tab (oder die App, wenn nur ein Tab geöffnet wurde).</string>
<string name="do_not_track">Nicht verfolgen (Do not track)</string>
<string name="do_not_track_summary">Einen "Do Not Track-Header" senden, der freundlich anfragt, dass Webserver diesen Browser nicht nachverfolgen sollen.</string>
<string name="allow_screenshots">Screenshots zulassen</string>
</string-array>
<string name="custom_user_agent">User agent personnalisé</string>
<string name="incognito_mode">Mode Incognito</string>
- <string name="incognito_mode_summary">Vider l\'historique et le cache après le chargement de chaque page. In Incognito Mode, back closes the tab (or the app if there is only one tab).</string>
+ <string name="incognito_mode_summary">Vider l\'historique et le cache après le chargement de chaque page.
+ Dans le mode Incognito, le bouton Retour ferme l\'onglet (ou l\'application s\'il n\'y a qu\'un seul onglet).</string>
<string name="do_not_track">Ne pas me pister</string>
<string name="do_not_track_summary">Envoyer aux sites web un signal «Ne pas me pister» indiquant poliement que vous ne souhaitez pas être pisté</string>
<string name="allow_screenshots">Autoriser captures d\'écrans</string>
<!-- Colors. -->
<item name="android:actionModeBackground">?android:attr/colorBackground</item>
- <item name="android:textColorHighlight">@color/blue_800</item>
- <item name="blueTextColor">@color/blue_700</item>
- <item name="blueTitleTextColor">@color/blue_600</item>
+ <item name="android:textColorHighlight">@color/violet_700</item>
+ <item name="blueTextColor">@color/violet_500</item>
+ <item name="blueTitleTextColor">@color/violet_700</item>
<item name="buttonBackgroundColorSelector">@color/button_background_color_selector_night</item>
<item name="buttonTextColorSelector">@color/button_text_color_selector_night</item>
- <item name="colorAccent">@color/blue_600</item>
- <item name="domainSettingsIconTintColor">@color/blue_800</item>
- <item name="redText">@color/red_900</item>
- <item name="sslTitle">@color/blue_700</item>
+ <item name="colorAccent">@color/violet_500</item>
+ <item name="redTextColor">@color/red_900</item>
<!-- Tints. -->
<item name="addTabIconTintColor">@color/gray_400</item>
- <item name="findOnPageIconTintColor">@color/blue_600</item>
- <item name="navigationIconTintColor">@color/blue_600</item>
- <item name="progressTintColor">@color/blue_600</item>
+ <item name="domainSettingsIconTintColor">@color/violet_500</item>
+ <item name="fabIconTintColor">@color/gray_875</item>
+ <item name="findOnPageIconTintColor">@color/violet_500</item>
+ <item name="navigationIconTintColor">@color/violet_500</item>
+ <item name="progressTintColor">@color/violet_500</item>
<!-- Drawables. -->
<item name="listSelectorDrawable">@drawable/list_selector_night</item>
<!-- Icons. -->
<item name="aboutIcon">@drawable/about_night</item>
- <item name="addIcon">@drawable/add_night</item>
- <item name="bookmarksIcon">@drawable/bookmarks_night</item>
- <item name="clearIcon">@drawable/clear_night</item>
+ <item name="closeIcon">@drawable/close_night</item>
<item name="copyIcon">@drawable/copy_night</item>
- <item name="createBookmarkIcon">@drawable/create_bookmark_night</item>
- <item name="createFolderIcon">@drawable/create_folder_night</item>
<item name="deleteIcon">@drawable/delete_night</item>
+ <item name="domainsIcon">@drawable/domains_night</item>
<item name="editIcon">@drawable/edit_night</item>
<item name="moveToFolderIcon">@drawable/move_to_folder_night</item>
<item name="saveIcon">@drawable/save_night</item>
<item name="android:windowLightStatusBar">?attr/isLightTheme</item>
<!-- Colors. -->
- <item name="colorAccent">@color/blue_600</item>
+ <item name="colorAccent">@color/violet_500</item>
<item name="colorPrimary">?android:attr/colorBackground</item> <!-- `colorPrimary` sets the background color of the app bar. -->
<!-- Icons. -->
- <item name="appThemeIcon">@drawable/theme_night</item>
+ <item name="appThemeIcon">@drawable/app_theme_night</item>
<item name="downloadIcon">@drawable/downloads_enabled_night</item>
<item name="fontSizeIcon">@drawable/font_size_night</item>
<item name="homepageIcon">@drawable/home_enabled_night</item>
</style>
<style name="PrivacyBrowserAlertDialog" parent="Theme.AppCompat.DayNight.Dialog.Alert" >
- <item name="colorAccent">@color/blue_600</item>
+ <item name="colorAccent">@color/violet_500</item>
</style>
</resources>
\ No newline at end of file
<!-- Colors. -->
<item name="android:actionModeBackground">?android:attr/colorBackground</item>
- <item name="android:textColorHighlight">@color/blue_800</item>
- <item name="blueTextColor">@color/blue_700</item>
- <item name="blueTitleTextColor">@color/blue_600</item>
+ <item name="android:textColorHighlight">@color/violet_700</item>
+ <item name="blueTextColor">@color/violet_500</item>
+ <item name="blueTitleTextColor">@color/violet_700</item>
<item name="buttonBackgroundColorSelector">@color/button_background_color_selector_night</item>
<item name="buttonTextColorSelector">@color/button_text_color_selector_night</item>
- <item name="colorAccent">@color/blue_600</item>
- <item name="domainSettingsIconTintColor">@color/blue_800</item>
- <item name="redText">@color/red_900</item>
- <item name="sslTitle">@color/blue_700</item>
+ <item name="colorAccent">@color/violet_500</item>
+ <item name="redTextColor">@color/red_900</item>
<!-- Tints. -->
<item name="addTabIconTintColor">@color/gray_400</item>
- <item name="findOnPageIconTintColor">@color/blue_600</item>
- <item name="navigationIconTintColor">@color/blue_600</item>
- <item name="progressTintColor">@color/blue_600</item>
+ <item name="domainSettingsIconTintColor">@color/violet_500</item>
+ <item name="fabIconTintColor">@color/gray_875</item>
+ <item name="findOnPageIconTintColor">@color/violet_500</item>
+ <item name="navigationIconTintColor">@color/violet_500</item>
+ <item name="progressTintColor">@color/violet_500</item>
<!-- Drawables. -->
<item name="listSelectorDrawable">@drawable/list_selector_night</item>
<!-- Icons. -->
<item name="aboutIcon">@drawable/about_night</item>
- <item name="addIcon">@drawable/add_night</item>
- <item name="bookmarksIcon">@drawable/bookmarks_night</item>
- <item name="clearIcon">@drawable/clear_night</item>
+ <item name="closeIcon">@drawable/close_night</item>
<item name="copyIcon">@drawable/copy_night</item>
- <item name="createBookmarkIcon">@drawable/create_bookmark_night</item>
- <item name="createFolderIcon">@drawable/create_folder_night</item>
<item name="deleteIcon">@drawable/delete_night</item>
+ <item name="domainsIcon">@drawable/domains_night</item>
<item name="editIcon">@drawable/edit_night</item>
<item name="moveToFolderIcon">@drawable/move_to_folder_night</item>
<item name="saveIcon">@drawable/save_night</item>
<item name="android:windowLightStatusBar">?attr/isLightTheme</item>
<!-- Colors. -->
- <item name="colorAccent">@color/blue_600</item>
+ <item name="colorAccent">@color/violet_500</item>
<item name="colorPrimary">?android:attr/colorBackground</item> <!-- `colorPrimary` sets the background color of the app bar. -->
<!-- Icons. -->
- <item name="appThemeIcon">@drawable/theme_night</item>
+ <item name="appThemeIcon">@drawable/app_theme_night</item>
<item name="downloadIcon">@drawable/downloads_enabled_night</item>
<item name="fontSizeIcon">@drawable/font_size_night</item>
<item name="homepageIcon">@drawable/home_enabled_night</item>
</style>
<style name="PrivacyBrowserAlertDialog" parent="Theme.AppCompat.DayNight.Dialog.Alert" >
- <item name="colorAccent">@color/blue_600</item>
+ <item name="colorAccent">@color/violet_500</item>
</style>
</resources>
\ No newline at end of file
--- /dev/null
+<?xml version="1.0" encoding="utf-8"?>
+
+<!--
+ Copyright © 2016-2017,2020 Soren Stoutner <soren@stoutner.com>.
+
+ This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
+
+ Privacy Browser is free software: you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation, either version 3 of the License, or
+ (at your option) any later version.
+
+ Privacy Browser is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ GNU General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with Privacy Browser. If not, see <http://www.gnu.org/licenses/>. -->
+
+<!-- Colors are currently hardcoded in the vector drawables. Once the minimum API is >= 22 the hardcoded colors can be removed and they can reference these entries instead. -->
+<resources>
+ <!-- Named colors. -->
+ <color name="disabled_tint">#FF9E9E9E</color> <!-- gray_500 -->
+ <color name="ghosted_tint">#FF616161</color> <!-- gray_700 -->
+ <color name="red_tint">#FFB71C1C</color> <!-- red_900 -->
+
+ <!-- Raw colors. -->
+ <color name="semi_transparent_black">#66000000</color>
+
+ <color name="black">#FF000000</color>
+ <color name="black_translucent_11">#11000000</color>
+ <color name="black_translucent_22">#22000000</color>
+ <color name="black_translucent_33">#33000000</color>
+
+ <color name="blue_50">#FFE3F2FD</color>
+ <color name="blue_100">#FFBBDEFB</color>
+ <color name="blue_200">#FF90CAF9</color>
+ <color name="blue_300">#FF64B5F6</color>
+ <color name="blue_400">#FF42A5F5</color>
+ <color name="blue_500">#FF2196F3</color>
+ <color name="blue_600">#FF1E88E5</color>
+ <color name="blue_700">#FF1976D2</color>
+ <color name="blue_700_50">#881976D2</color>
+ <color name="blue_750">#FF1770C6</color>
+ <color name="blue_800">#FF1565C0</color>
+ <color name="blue_830">#FF1760B5</color>
+ <color name="blue_900">#FF0D47A1</color>
+ <color name="blue_1000">#FF082B61</color>
+ <color name="blue_a700">#FF2962FF</color>
+
+ <color name="violet_300">#FFBAD3FB</color>
+ <color name="violet_500">#FF8AB4F8</color>
+ <color name="violet_700">#FF5785C5</color>
+ <color name="violet_a900">#FF586479</color>
+
+ <color name="blue_gray_500">#FF607D8B</color>
+
+ <color name="dark_blue_65">#FF1766A6</color>
+ <color name="dark_blue_55">#FF14568C</color>
+ <color name="dark_blue_40">#FF0E3F66</color>
+ <color name="dark_blue_30">#FF002A4D</color>
+ <color name="dark_blue_15">#FF001C33</color>
+
+ <color name="dark_green_15">#FF163317</color>
+
+ <color name="gray_50">#FFFAFAFA</color>
+ <color name="gray_100">#FFF5F5F5</color>
+ <color name="gray_200">#FFEEEEEE</color>
+ <color name="gray_300">#FFE0E0E0</color>
+ <color name="gray_400">#FFBDBDBD</color>
+ <color name="gray_425">#FFB7B7B7</color>
+ <color name="gray_500">#FF9E9E9E</color>
+ <color name="gray_600">#FF757575</color>
+ <color name="gray_700">#FF616161</color>
+ <color name="gray_750">#FF515151</color>
+ <color name="gray_800">#FF424242</color>
+ <color name="gray_850">#FF313131</color>
+ <color name="gray_875">#FF2D2D2D</color>
+ <color name="gray_900">#FF212121</color>
+
+ <color name="green_50">#FFE8F5E9</color>
+ <color name="green_100">#FFC8E6C9</color>
+ <color name="green_200">#FFA5D6A7</color>
+
+ <color name="light_green_100">#FFDCEDC8</color>
+ <color name="light_green_a700">#FF64DD17</color>
+
+ <color name="red_100">#FFFFCDD2</color>
+ <color name="red_200">#FFEF9A9A</color>
+ <color name="red_600">#FFE53935</color>
+ <color name="red_700">#FFD32F2F</color>
+ <color name="red_700_40">#55D32F2F</color>
+ <color name="red_800">#FFC62828</color>
+ <color name="red_900">#FFB71C1C</color>
+ <color name="red_1000">#FFA21212</color>
+ <color name="red_a700">#FFD50000</color>
+
+ <color name="transparent">#00000000</color>
+
+ <color name="white">#FFFFFFFF</color>
+
+ <color name="yellow_100">#FFFFF9C4</color>
+ <color name="yellow_700_50">#88FBC02D</color>
+ <color name="yellow_900">#FFF57F17</color>
+ <color name="yellow_a700">#FFFFD600</color>
+</resources>
\ No newline at end of file
<!-- Colors. -->
<item name="android:actionModeBackground">?android:attr/colorBackground</item>
- <item name="android:textColorHighlight">@color/blue_800</item>
- <item name="blueTextColor">@color/blue_700</item>
- <item name="blueTitleTextColor">@color/blue_600</item>
+ <item name="android:textColorHighlight">@color/violet_700</item>
+ <item name="blueTextColor">@color/violet_500</item>
+ <item name="blueTitleTextColor">@color/violet_700</item>
<item name="buttonBackgroundColorSelector">@color/button_background_color_selector_night</item>
<item name="buttonTextColorSelector">@color/button_text_color_selector_night</item>
- <item name="colorAccent">@color/blue_600</item>
- <item name="domainSettingsIconTintColor">@color/blue_800</item>
- <item name="redText">@color/red_900</item>
- <item name="sslTitle">@color/blue_700</item>
+ <item name="colorAccent">@color/violet_500</item>
+ <item name="redTextColor">@color/red_900</item>
<!-- Tints. -->
<item name="addTabIconTintColor">@color/gray_400</item>
- <item name="findOnPageIconTintColor">@color/blue_600</item>
- <item name="navigationIconTintColor">@color/blue_600</item>
- <item name="progressTintColor">@color/blue_600</item>
+ <item name="domainSettingsIconTintColor">@color/violet_500</item>
+ <item name="fabIconTintColor">@color/gray_875</item>
+ <item name="findOnPageIconTintColor">@color/violet_500</item>
+ <item name="navigationIconTintColor">@color/violet_500</item>
+ <item name="progressTintColor">@color/violet_500</item>
<!-- Drawables. -->
<item name="listSelectorDrawable">@drawable/list_selector_night</item>
<!-- Icons. -->
<item name="aboutIcon">@drawable/about_night</item>
- <item name="addIcon">@drawable/add_night</item>
- <item name="bookmarksIcon">@drawable/bookmarks_night</item>
- <item name="clearIcon">@drawable/clear_night</item>
+ <item name="closeIcon">@drawable/close_night</item>
<item name="copyIcon">@drawable/copy_night</item>
- <item name="createBookmarkIcon">@drawable/create_bookmark_night</item>
- <item name="createFolderIcon">@drawable/create_folder_night</item>
<item name="deleteIcon">@drawable/delete_night</item>
+ <item name="domainsIcon">@drawable/domains_night</item>
<item name="editIcon">@drawable/edit_night</item>
<item name="moveToFolderIcon">@drawable/move_to_folder_night</item>
<item name="saveIcon">@drawable/save_night</item>
<style name="PrivacyBrowserSettings" parent="Theme.AppCompat.DayNight" >
<!-- Colors. -->
- <item name="colorAccent">@color/blue_600</item>
+ <item name="colorAccent">@color/violet_500</item>
<item name="colorPrimary">?android:attr/colorBackground</item> <!-- `colorPrimary` sets the background color of the app bar. -->
<!-- Icons. -->
- <item name="appThemeIcon">@drawable/theme_night</item>
+ <item name="appThemeIcon">@drawable/app_theme_night</item>
<item name="downloadIcon">@drawable/downloads_enabled_night</item>
<item name="fontSizeIcon">@drawable/font_size_night</item>
<item name="homepageIcon">@drawable/home_enabled_night</item>
</style>
<style name="PrivacyBrowserAlertDialog" parent="Theme.AppCompat.DayNight.Dialog.Alert" >
- <item name="colorAccent">@color/blue_600</item>
+ <item name="colorAccent">@color/violet_500</item>
</style>
</resources>
\ No newline at end of file
<item name="buttonBackgroundColorSelector">@color/button_background_color_selector_day</item>
<item name="buttonTextColorSelector">@color/button_text_color_selector_day</item>
<item name="colorAccent">@color/blue_700</item>
- <item name="domainSettingsIconTintColor">@color/blue_800</item>
- <item name="redText">@color/red_a700</item>
- <item name="sslTitle">@color/blue_900</item>
+ <item name="redTextColor">@color/red_a700</item>
<!-- Tints. -->
<item name="addTabIconTintColor">@color/gray_700</item>
+ <item name="domainSettingsIconTintColor">@color/blue_700</item>
+ <item name="fabIconTintColor">@color/white</item>
<item name="findOnPageIconTintColor">@color/blue_800</item>
<item name="navigationIconTintColor">@color/blue_800</item>
<item name="progressTintColor">@color/blue_700</item>
<!-- Icons. -->
<item name="aboutIcon">@drawable/about_day</item>
- <item name="addIcon">@drawable/add_day</item>
- <item name="bookmarksIcon">@drawable/bookmarks_day</item>
- <item name="clearIcon">@drawable/clear_day</item>
+ <item name="closeIcon">@drawable/close_day</item>
<item name="copyIcon">@drawable/copy_day</item>
- <item name="createBookmarkIcon">@drawable/create_bookmark_day</item>
- <item name="createFolderIcon">@drawable/create_folder_day</item>
<item name="deleteIcon">@drawable/delete_day</item>
+ <item name="domainsIcon">@drawable/domains_day</item>
<item name="editIcon">@drawable/edit_day</item>
<item name="moveToFolderIcon">@drawable/move_to_folder_day</item>
<item name="saveIcon">@drawable/save_day</item>
<item name="colorPrimary">?android:attr/colorBackground</item> <!-- `colorPrimary` sets the background color of the app bar. -->
<!-- Icons. -->
- <item name="appThemeIcon">@drawable/theme_day</item>
+ <item name="appThemeIcon">@drawable/app_theme_day</item>
<item name="downloadIcon">@drawable/downloads_enabled_day</item>
<item name="fontSizeIcon">@drawable/font_size_day</item>
<item name="homepageIcon">@drawable/home_enabled_day</item>
<item name="buttonBackgroundColorSelector">@color/button_background_color_selector_day</item>
<item name="buttonTextColorSelector">@color/button_text_color_selector_day</item>
<item name="colorAccent">@color/blue_700</item>
- <item name="domainSettingsIconTintColor">@color/blue_800</item>
- <item name="redText">@color/red_a700</item>
- <item name="sslTitle">@color/blue_900</item>
+ <item name="redTextColor">@color/red_a700</item>
<!-- Tints. -->
<item name="addTabIconTintColor">@color/gray_700</item>
+ <item name="domainSettingsIconTintColor">@color/blue_700</item>
+ <item name="fabIconTintColor">@color/white</item>
<item name="findOnPageIconTintColor">@color/blue_800</item>
<item name="navigationIconTintColor">@color/blue_800</item>
<item name="progressTintColor">@color/blue_700</item>
<!-- Icons. -->
<item name="aboutIcon">@drawable/about_day</item>
- <item name="addIcon">@drawable/add_day</item>
- <item name="bookmarksIcon">@drawable/bookmarks_day</item>
- <item name="clearIcon">@drawable/clear_day</item>
+ <item name="closeIcon">@drawable/close_day</item>
<item name="copyIcon">@drawable/copy_day</item>
- <item name="createBookmarkIcon">@drawable/create_bookmark_day</item>
- <item name="createFolderIcon">@drawable/create_folder_day</item>
<item name="deleteIcon">@drawable/delete_day</item>
+ <item name="domainsIcon">@drawable/domains_day</item>
<item name="editIcon">@drawable/edit_day</item>
<item name="moveToFolderIcon">@drawable/move_to_folder_day</item>
<item name="saveIcon">@drawable/save_day</item>
<item name="colorPrimary">?android:attr/colorBackground</item> <!-- `colorPrimary` sets the background color of the app bar. -->
<!-- Icons. -->
- <item name="appThemeIcon">@drawable/theme_day</item>
+ <item name="appThemeIcon">@drawable/app_theme_day</item>
<item name="downloadIcon">@drawable/downloads_enabled_day</item>
<item name="fontSizeIcon">@drawable/font_size_day</item>
<item name="homepageIcon">@drawable/home_enabled_day</item>
<attr name="blueTitleTextColor" format="color" />
<attr name="buttonBackgroundColorSelector" format="color" />
<attr name="buttonTextColorSelector" format="color" />
- <attr name="redText" format="color" />
- <attr name="sslTitle" format="color" />
+ <attr name="redTextColor" format="color" />
<attr name="spinnerTextColorSelector" format="color" />
<!-- Tint Colors. -->
<attr name="addTabIconTintColor" format="color" />
<attr name="domainSettingsIconTintColor" format="color" />
+ <attr name="fabIconTintColor" format="color" />
<attr name="findOnPageIconTintColor" format="color" />
<attr name="navigationIconTintColor" format="color" />
<attr name="progressTintColor" format="color" />
<!-- Icons. -->
<attr name="aboutIcon" format="reference" />
- <attr name="addIcon" format="reference" />
<attr name="appThemeIcon" format="reference" />
- <attr name="bookmarksIcon" format="reference" />
- <attr name="clearIcon" format="reference" />
+ <attr name="closeIcon" format="reference" />
<attr name="copyIcon" format="reference" />
- <attr name="createBookmarkIcon" format="reference" />
- <attr name="createFolderIcon" format="reference" />
<attr name="deleteIcon" format="reference" />
+ <attr name="domainsIcon" format="reference" />
<attr name="downloadIcon" format="reference" />
<attr name="editIcon" format="reference" />
<attr name="fontSizeIcon" format="reference" />
<?xml version="1.0" encoding="utf-8"?>
<!--
- Copyright © 2016-2017 Soren Stoutner <soren@stoutner.com>.
+ Copyright © 2016-2017,2020 Soren Stoutner <soren@stoutner.com>.
This file is part of Privacy Browser <https://www.stoutner.com/privacy-browser>.
You should have received a copy of the GNU General Public License
along with Privacy Browser. If not, see <http://www.gnu.org/licenses/>. -->
-<!-- Colors are currently hardcoded in the vector drawables. Once the minimum API is >= 22 we can remove the hardcoded colors and reference these entries. -->
+<!-- Colors are currently hardcoded in the vector drawables. Once the minimum API is >= 22 the hardcoded colors can be removed and they can reference these entries instead. -->
<resources>
+ <!-- Named colors. -->
+ <color name="disabled_tint">#FF757575</color> <!-- gray_600 -->
+ <color name="ghosted_tint">#FFB7B7B7</color> <!-- gray_425 -->
+ <color name="red_tint">#FFB71C1C</color> <!-- red_900 -->
+
+ <!-- Raw colors. -->
<color name="semi_transparent_black">#66000000</color>
<color name="black">#FF000000</color>
<color name="blue_1000">#FF082B61</color>
<color name="blue_a700">#FF2962FF</color>
+ <color name="violet_300">#FFBAD3FB</color>
+ <color name="violet_500">#FF8AB4F8</color>
+ <color name="violet_700">#FF5785C5</color>
+ <color name="violet_a900">#FF586479</color>
+
<color name="blue_gray_500">#FF607D8B</color>
<color name="dark_blue_65">#FF1766A6</color>
<color name="gray_200">#FFEEEEEE</color>
<color name="gray_300">#FFE0E0E0</color>
<color name="gray_400">#FFBDBDBD</color>
+ <color name="gray_425">#FFB7B7B7</color>
<color name="gray_500">#FF9E9E9E</color>
<color name="gray_600">#FF757575</color>
<color name="gray_700">#FF616161</color>
<color name="gray_750">#FF515151</color>
<color name="gray_800">#FF424242</color>
<color name="gray_850">#FF313131</color>
+ <color name="gray_875">#FF2D2D2D</color>
<color name="gray_900">#FF212121</color>
<color name="green_50">#FFE8F5E9</color>
<color name="red_700_40">#55D32F2F</color>
<color name="red_800">#FFC62828</color>
<color name="red_900">#FFB71C1C</color>
+ <color name="red_1000">#FFA21212</color>
<color name="red_a700">#FFD50000</color>
<color name="transparent">#00000000</color>
<item name="buttonBackgroundColorSelector">@color/button_background_color_selector_day</item>
<item name="buttonTextColorSelector">@color/button_text_color_selector_day</item>
<item name="colorAccent">@color/blue_700</item>
- <item name="domainSettingsIconTintColor">@color/blue_800</item>
- <item name="redText">@color/red_a700</item>
- <item name="sslTitle">@color/blue_900</item>
+ <item name="redTextColor">@color/red_a700</item>
<!-- Tints. -->
<item name="addTabIconTintColor">@color/gray_700</item>
+ <item name="domainSettingsIconTintColor">@color/blue_700</item>
+ <item name="fabIconTintColor">@color/white</item>
<item name="findOnPageIconTintColor">@color/blue_800</item>
<item name="navigationIconTintColor">@color/blue_800</item>
<item name="progressTintColor">@color/blue_700</item>
<!-- Icons. -->
<item name="aboutIcon">@drawable/about_day</item>
- <item name="addIcon">@drawable/add_day</item>
- <item name="bookmarksIcon">@drawable/bookmarks_day</item>
- <item name="clearIcon">@drawable/clear_day</item>
+ <item name="closeIcon">@drawable/close_day</item>
<item name="copyIcon">@drawable/copy_day</item>
- <item name="createBookmarkIcon">@drawable/create_bookmark_day</item>
- <item name="createFolderIcon">@drawable/create_folder_day</item>
<item name="deleteIcon">@drawable/delete_day</item>
+ <item name="domainsIcon">@drawable/domains_day</item>
<item name="editIcon">@drawable/edit_day</item>
<item name="moveToFolderIcon">@drawable/move_to_folder_day</item>
<item name="saveIcon">@drawable/save_day</item>
<item name="colorPrimary">?android:attr/colorBackground</item> <!-- `colorPrimary` sets the background color of the app bar. -->
<!-- Icons. -->
- <item name="appThemeIcon">@drawable/theme_day</item>
+ <item name="appThemeIcon">@drawable/app_theme_day</item>
<item name="downloadIcon">@drawable/downloads_enabled_day</item>
<item name="fontSizeIcon">@drawable/font_size_day</item>
<item name="homepageIcon">@drawable/home_enabled_day</item>
projects / PrivacyBrowserAndroid.git / commitdiff