Skip to content
This repository was archived by the owner on Jun 8, 2024. It is now read-only.

Commit 2ddb570

Browse files
committed
Color: Improve accessiblity in night theme
Signed-off-by: Fung <fython@163.com>
1 parent 0f61dcf commit 2ddb570

8 files changed

Lines changed: 11 additions & 48 deletions

File tree

mobile/src/main/java/info/papdt/express/helper/ui/SearchActivity.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -206,6 +206,7 @@ public void onAnimationEnd(Animator animator) {
206206
@Override
207207
public boolean onCreateOptionsMenu(Menu menu) {
208208
getMenuInflater().inflate(R.menu.menu_search, menu);
209+
menu.findItem(R.id.action_clear).getIcon().setTint(getResources().getColor(R.color.black_in_light));
209210
return super.onCreateOptionsMenu(menu);
210211
}
211212

mobile/src/main/java/info/papdt/express/helper/ui/fragment/add/StepNoFound.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22

33
import android.app.Activity;
44
import android.content.Intent;
5-
import android.support.v4.content.ContextCompat;
65
import android.view.View;
76
import android.widget.Button;
87
import android.widget.Toast;
@@ -52,12 +51,12 @@ public void onClick(View view) {
5251
private void updateForceButton() {
5352
Package p = getAddActivity().getPackage();
5453
if (p != null && p.companyChineseName != null) {
55-
mForceBtn.setTextColor(ContextCompat.getColor(getContext(), R.color.pink_900));
54+
mForceBtn.setEnabled(true);
5655
mForceBtn.setText(String.format(getString(R.string.operation_force_add_when_cannot_find),
5756
getAddActivity().getPackage().companyChineseName));
5857
mForceBtn.setEnabled(true);
5958
} else {
60-
mForceBtn.setTextColor(ContextCompat.getColor(getContext(), R.color.grey_500));
59+
mForceBtn.setEnabled(false);
6160
mForceBtn.setText(String.format(getString(R.string.operation_force_add_when_cannot_find),
6261
getString(R.string.message_invalid_company)));
6362
mForceBtn.setEnabled(false);

mobile/src/main/res/layout/fragment_add_step_input.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@
3737
android:paddingEnd="8dp"
3838
android:text="@string/operation_scan"
3939
android:textAppearance="@style/TextAppearance.AppCompat.Button"
40-
android:textColor="@color/pink_900"
40+
android:textColor="@color/colorAccentDark"
4141
android:background="@drawable/button_bg"
4242
android:layout_gravity="end"/>
4343

mobile/src/main/res/layout/fragment_add_step_no_found.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
android:paddingEnd="8dp"
3737
android:text="@string/operation_manually_choose_company_when_cannot_find"
3838
android:textAppearance="@style/TextAppearance.AppCompat.Button"
39-
android:textColor="@color/pink_900"
39+
android:textColor="@color/colorAccentDark"
4040
android:background="@drawable/button_bg"
4141
android:layout_gravity="end"/>
4242

@@ -49,8 +49,8 @@
4949
android:paddingStart="8dp"
5050
android:paddingEnd="8dp"
5151
android:text="@string/operation_force_add_when_cannot_find"
52+
android:textColor="@color/colorAccentDark"
5253
android:textAppearance="@style/TextAppearance.AppCompat.Button"
53-
android:textColor="@color/pink_900"
5454
android:background="@drawable/button_bg"
5555
android:layout_gravity="end"/>
5656

mobile/src/main/res/layout/fragment_add_step_success.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@
4848
android:paddingEnd="8dp"
4949
android:text="@string/operation_manually_choose_company"
5050
android:textAppearance="@style/TextAppearance.AppCompat.Button"
51-
android:textColor="@color/pink_900"
51+
android:textColor="@color/colorAccentDark"
5252
android:background="@drawable/button_bg"
5353
android:layout_gravity="end"/>
5454

mobile/src/main/res/values-night/colors.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,4 +38,6 @@
3838

3939
<color name="black_in_light">@android:color/white</color>
4040

41+
<color name="colorAccentDark">@color/indigo_accent_200</color>
42+
4143
</resources>

mobile/src/main/res/values-notnight/colors.xml

Lines changed: 0 additions & 41 deletions
This file was deleted.

mobile/src/main/res/values/colors.xml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -74,4 +74,6 @@
7474

7575
<color name="black_in_light">@android:color/black</color>
7676

77+
<color name="colorAccentDark">@color/pink_900</color>
78+
7779
</resources>

0 commit comments

Comments
 (0)