Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'fix-icon-colors' into 'master'

Browse Source 
fix icon color in search for dark theme

Closes #1187

See merge request fdroid/fdroidclient!682
This commit is contained in:
Hans-Christoph Steiner 2018-05-03 08:09:05 +00:00
commit 93083c6111
12 changed files with 31 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/src/main/java/org/fdroid/fdroid/views/swap/SwapWorkflowActivity.java
View File

@ -370,7 +370,7 @@ public class SwapWorkflowActivity extends AppCompatActivity {
toolbar.setBackgroundColor(getResources().getColor(currentView.getToolbarColour()));
toolbar.setTitle(currentView.getToolbarTitle());
toolbar.setNavigationIcon(R.drawable.ic_close_white);
toolbar.setNavigationIcon(R.drawable.ic_close_white_24dp);
toolbar.setNavigationOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {

BIN
app/src/main/res/drawable-hdpi/ic_close_white.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 451 B

7
app/src/main/res/drawable-ldrtl/ic_back_white_24dp.xml Normal file
View File

@ -0,0 +1,7 @@
<!-- Would like to use the android:autoMirror property, but that is not suppoted on pre-lollipop
unless using VectorDrawableCompat (instead of using build-tools to produce .pngs for us). -->
<vector android:height="24dp"
android:viewportHeight="24.0" android:viewportWidth="24.0"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#FFFFFFFF" android:pathData="M 4,11 H 16.17 L 10.58,5.41 12,4 20,12 12,20 10.59,18.59 16.17,13 H 4 Z"/>
</vector>

BIN
app/src/main/res/drawable-mdpi/ic_close_white.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 368 B

BIN
app/src/main/res/drawable-xhdpi/ic_close_white.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 542 B

BIN
app/src/main/res/drawable-xxhdpi/ic_close_white.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 663 B

BIN
app/src/main/res/drawable-xxxhdpi/ic_close_white.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 703 B

5
app/src/main/res/drawable/ic_back_white_24dp.xml Normal file
View File

@ -0,0 +1,5 @@
<vector android:height="24dp"
android:viewportHeight="24.0" android:viewportWidth="24.0"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#FFFFFFFF" android:pathData="M20,11H7.83l5.59,-5.59L12,4l-8,8 8,8 1.41,-1.41L7.83,13H20v-2z"/>
</vector>

9
app/src/main/res/drawable/ic_close_white_24dp.xml Normal file
View File

@ -0,0 +1,9 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24.0"
android:viewportHeight="24.0">
<path
android:fillColor="#FFFFFF"
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>

4
app/src/main/res/layout/activity_app_list.xml
View File

@ -33,7 +33,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@string/back"
android:src="@drawable/ic_back_black_24dp"
android:src="?attr/backButtonDrawable"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"/>
@ -59,7 +59,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@string/clear_search"
android:src="@drawable/ic_close_black_24dp"
android:src="?attr/clearButtonDrawable"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent"/>

4
app/src/main/res/values/attrs.xml
View File

@ -1,5 +1,5 @@
<?xml version='1.0' encoding='utf-8'?>
<resources xmlns:android="http://schemas.android.com/apk/res/android">
<resources>
<declare-styleable name="Theme">
<attr name="appDetailsBackground" format="color" />
<attr name="appDetailsCardBackground" format="color" />
@ -12,6 +12,8 @@
<attr name="appListItem" format="color" />
<attr name="lightGrayTextColor" format="color" />
<attr name="antiFeaturesWarning" format="reference" />
<attr name="backButtonDrawable" format="reference" />
<attr name="clearButtonDrawable" format="reference" />
</declare-styleable>
<integer name="unhidePin">1337</integer>

4
app/src/main/res/values/styles.xml
View File

@ -23,6 +23,8 @@
<item name="appListItem">#ffffff</item>
<item name="lightGrayTextColor">#a6a6a6</item>
<item name="antiFeaturesWarning">@drawable/ic_warning_white_24dp</item>
<item name="backButtonDrawable">@drawable/ic_back_white_24dp</item>
<item name="clearButtonDrawable">@drawable/ic_close_white_24dp</item>
<item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
</style>
@ -48,6 +50,8 @@
<item name="appListItem">#424242</item>
<item name="lightGrayTextColor">#4a4a4a</item>
<item name="antiFeaturesWarning">@drawable/ic_warning_black_24dp</item>
<item name="backButtonDrawable">@drawable/ic_back_black_24dp</item>
<item name="clearButtonDrawable">@drawable/ic_close_black_24dp</item>
<item name="preferenceTheme">@style/PreferenceThemeOverlay.v14.Material</item>
</style>