AndrewShkrob/organicmaps
1
Fork 0
forked from organicmaps/organicmaps
Code Pull requests Activity

[android] Changeg night resources for guides gallery item ui

Browse source
This commit is contained in:
Александр Зацепин 2020-06-15 21:06:36 +03:00 • committed by Vladimir Byko-Ianko
parent 13f699e424
commit 221ed8cdc3
6 changed files with 59 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
android/res/drawable/ic_claim_city_night.xml Normal file
View file

@ -0,0 +1,13 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M12,12m-10,0a10,10 0,1 1,20 0a10,10 0,1 1,-20 0"
android:fillColor="#ffffff"/>
<path
android:pathData="M2,12C2,6.477 6.477,2 12,2C17.523,2 22,6.477 22,12C22,17.523 17.523,22 12,22C6.477,22 2,17.523 2,12ZM7.4,11.8462L6,13.1923L10,17L18,9.3462L16.6,8L10,14.3077L7.4,11.8462Z"
android:fillColor="#9867FC"
android:fillType="evenOdd"/>
</vector>

13
android/res/drawable/ic_claim_night.xml Normal file
View file

@ -0,0 +1,13 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:pathData="M12,12m-10,0a10,10 0,1 1,20 0a10,10 0,1 1,-20 0"
android:fillColor="#ffffff"/>
<path
android:pathData="M2,12C2,6.477 6.477,2 12,2C17.523,2 22,6.477 22,12C22,17.523 17.523,22 12,22C6.477,22 2,17.523 2,12ZM7.4,11.8462L6,13.1923L10,17L18,9.3462L16.6,8L10,14.3077L7.4,11.8462Z"
android:fillColor="#93BF39"
android:fillType="evenOdd"/>
</vector>

2
android/res/values/colors.xml
View file

@ -233,4 +233,6 @@
<color name="skyeng_button">#4287DF</color>
<color name="city_color">#9B24B2</color>
<color name="outdoor_color">#3C8C3C</color>
<color name="city_color_night">#9867FC</color>
<color name="outdoor_color_night">#93BF39</color>
</resources>

12
android/res/values/themes-attrs.xml
View file

@ -94,9 +94,6 @@
<attr name="guidesDistance" format="reference" />
<attr name="bgRectangleView" format="reference" />
<attr name="bgRoundedCard" format="reference" />
<attr name="guidesIcon" format="reference"></attr>
<attr name="guidesMenuDisabled" format="reference"></attr>
<attr name="bgBoughtContent" format="reference"></attr>
</declare-styleable>
<declare-styleable name="ThemeAttrs.NavButtons">
<attr name="nav_background" format="reference" />
@ -130,6 +127,15 @@
<attr name="elevationProfileSelectedPointTriangle" format="reference" />
<attr name="elevationProfileFloatingTriangle" format="reference" />
</declare-styleable>
<declare-styleable name="ThemeAttrs.GuidesGallery">
<attr name="guidesIcon" format="reference" />
<attr name="guidesMenuDisabled" format="reference" />
<attr name="bgBoughtContent" format="reference" />
<attr name="subtitleCityColor" format="color" />
<attr name="subtitleOutdoorColor" format="color" />
<attr name="cityCheckbox" format="reference" />
<attr name="outdoorCheckbox" format="reference" />
</declare-styleable>
<declare-styleable name="ThemeAttrs.Fonts">
<attr name="fontHeadline1" format="reference" />
<attr name="fontHeadline2" format="reference" />

8
android/res/values/themes-base.xml
View file

@ -186,6 +186,10 @@
<item name="bgBoughtContent">@drawable/bg_bought_content</item>
<item name="guidesMenuDisabled">@drawable/guides_layer_default_light</item>
<item name="guidesIcon">@drawable/bg_guides_light</item>
<item name="subtitleCityColor">@color/city_color</item>
<item name="subtitleOutdoorColor">@color/outdoor_color</item>
<item name="outdoorCheckbox">@drawable/ic_claim</item>
<item name="cityCheckbox">@drawable/ic_claim_city</item>
</style>
<!-- Night theme -->
@ -371,5 +375,9 @@
<item name="guidesIcon">@drawable/bg_guides_night</item>
<item name="guidesMenuDisabled">@drawable/guides_layer_default_dark</item>
<item name="bgBoughtContent">@drawable/bg_bought_content_night</item>
<item name="subtitleCityColor">@color/city_color_night</item>
<item name="subtitleOutdoorColor">@color/outdoor_color_night</item>
<item name="outdoorCheckbox">@drawable/ic_claim_night</item>
<item name="cityCheckbox">@drawable/ic_claim_city_night</item>
</style>
</resources>

18
android/src/com/mapswithme/maps/gallery/Holders.java
View file

@ -16,6 +16,8 @@ import android.widget.ProgressBar;
import android.widget.TextView;
import androidx.annotation.CallSuper;
import androidx.annotation.ColorInt;
import androidx.annotation.DrawableRes;
import androidx.annotation.NonNull;
import androidx.annotation.Nullable;
import androidx.core.graphics.drawable.RoundedBitmapDrawable;
@ -658,7 +660,12 @@ public class Holders
BookmarkManager.INSTANCE.getCategoryByServerId(item.getGuideId());
mBoughtContentBtn.setText(category.isVisible() ? R.string.hide : R.string.show);
boolean isCity = item.getGuideType() == GuidesGallery.Type.City;
mBoughtContentCheckbox.setImageResource(isCity ? R.drawable.ic_claim_city : R.drawable.ic_claim);
Context context = mBoughtContentBtn.getContext();
@DrawableRes
int drawableRes =
ThemeUtils.getResource(context, isCity ? R.attr.cityCheckbox
: R.attr.outdoorCheckbox);
mBoughtContentCheckbox.setImageResource(drawableRes);
}
private void bindOutdoorBlock(@NonNull GuidesGallery.OutdoorParams params)
@ -721,7 +728,8 @@ public class Holders
}
@NonNull
private static Spannable makeSubtitle(Context context, @NonNull GuidesGallery.Item item)
private static Spannable makeSubtitle(@NonNull Context context,
@NonNull GuidesGallery.Item item)
{
boolean isCity = item.getGuideType() == GuidesGallery.Type.City;
SpannableStringBuilder builder =
@ -729,8 +737,10 @@ public class Holders
: context.getString(R.string.routes_card_outdoor));
Resources res = context.getResources();
int color = isCity ? res.getColor(R.color.city_color)
: res.getColor(R.color.outdoor_color);
@ColorInt
int color = isCity ? ThemeUtils.getColor(context, R.attr.subtitleCityColor)
: ThemeUtils.getColor(context, R.attr.subtitleOutdoorColor);
builder.setSpan(new ForegroundColorSpan(color), 0, builder.length(),
Spannable.SPAN_EXCLUSIVE_EXCLUSIVE);