Make some minor revert on color scheme and some change name

This commit is contained in:
Schoumi 2020-06-29 17:25:06 +02:00
parent 027ffa27dc
commit 740a2f37c6
6 changed files with 25 additions and 10 deletions

View File

@ -161,9 +161,9 @@ public class ReportViewModel extends BaseObservable {
if (number == 0)
return R.drawable.square_green;
else if(number < 5)
return R.drawable.square_yellow;
return R.drawable.square_light_yellow;
else
return R.drawable.square_red;
return R.drawable.square_light_red;
}

View File

@ -151,9 +151,9 @@ public class ApplicationListAdapter extends RecyclerView.Adapter {
if(size == 0)
appItemBinding.appPermissionNb.setBackgroundResource(R.drawable.square_green);
else if (size < 5)
appItemBinding.appPermissionNb.setBackgroundResource(R.drawable.square_yellow);
appItemBinding.appPermissionNb.setBackgroundResource(R.drawable.square_light_yellow);
else
appItemBinding.appPermissionNb.setBackgroundResource(R.drawable.square_red);
appItemBinding.appPermissionNb.setBackgroundResource(R.drawable.square_light_red);
Report report = viewModel.report;
if(report != null) {
@ -164,9 +164,9 @@ public class ApplicationListAdapter extends RecyclerView.Adapter {
if(size == 0)
appItemBinding.appTrackerNb.setBackgroundResource(R.drawable.square_green);
else if (size < 5)
appItemBinding.appTrackerNb.setBackgroundResource(R.drawable.square_yellow);
appItemBinding.appTrackerNb.setBackgroundResource(R.drawable.square_light_yellow);
else
appItemBinding.appTrackerNb.setBackgroundResource(R.drawable.square_red);
appItemBinding.appTrackerNb.setBackgroundResource(R.drawable.square_light_red);
if(versionName != null && !report.version.equals(viewModel.versionName)) {
String string = context.getString(R.string.tested,versionName, report.version);

View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/colorLightRed"/>
<corners android:radius="5dp"/>
<padding android:left="0dp" android:top="0dp" android:right="0dp" android:bottom="0dp" />
</shape>

View File

@ -0,0 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android">
<solid android:color="@color/colorLightYellow"/>
<corners android:radius="5dp"/>
<padding android:left="0dp" android:top="0dp" android:right="0dp" android:bottom="0dp" />
</shape>

View File

@ -39,7 +39,8 @@
app:layout_constraintStart_toStartOf="parent"
android:textSize="30sp"
android:textColor="@color/colorPurple"
android:textStyle="bold"/>
android:textStyle="bold"
android:textAlignment="center"/>
<View
android:id="@+id/dummy"

View File

@ -1,11 +1,13 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="colorPrimary">#212529</color>
<color name="colorPrimaryDark">#212529</color>
<color name="colorAccent">#212529</color>
<color name="colorPrimary">#684971</color>
<color name="colorPrimaryDark">#3d2b43</color>
<color name="colorAccent">#684971</color>
<color name="colorGreen">#6fc384</color>
<color name="colorRed">#e46772</color>
<color name="colorYellow">#ffdb66</color>
<color name="colorLightRed">#e46772</color>
<color name="colorLightYellow">#ffdb66</color>
<color name="colorPurple">#684971</color>
<color name="textColorDark">#343A40</color>
<color name="textColorDarkLight">#6C757D</color>