tsanie/Pixiview
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

feature: custom dynamic tab icon

Browse Source
This commit is contained in:
Tsanie Lily 2020-05-22 20:11:30 +08:00
parent 9ca58cc814
commit b97e07e1ab
25 changed files with 303 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
Pixiview.Android/Pixiview.Android.csproj
View File

@ -213,6 +213,62 @@
<SubType></SubType>
<Generator></Generator>
</AndroidResource>
<AndroidResource Include="Resources\drawable\ic_bookmark.xml">
<SubType></SubType>
<Generator></Generator>
</AndroidResource>
<AndroidResource Include="Resources\drawable\ic_option.xml">
<SubType></SubType>
<Generator></Generator>
</AndroidResource>
<AndroidResource Include="Resources\drawable\ic_rank.xml">
<SubType></SubType>
<Generator></Generator>
</AndroidResource>
<AndroidResource Include="Resources\drawable\ic_sparkles.xml">
<SubType></SubType>
<Generator></Generator>
</AndroidResource>
<AndroidResource Include="Resources\drawable\ic_user.xml">
<SubType></SubType>
<Generator></Generator>
</AndroidResource>
<AndroidResource Include="Resources\drawable-night\ic_bookmark.xml">
<SubType></SubType>
<Generator></Generator>
</AndroidResource>
<AndroidResource Include="Resources\drawable-night\ic_option.xml">
<SubType></SubType>
<Generator></Generator>
</AndroidResource>
<AndroidResource Include="Resources\drawable-night\ic_rank.xml">
<SubType></SubType>
<Generator></Generator>
</AndroidResource>
<AndroidResource Include="Resources\drawable-night\ic_sparkles.xml">
<SubType></SubType>
<Generator></Generator>
</AndroidResource>
<AndroidResource Include="Resources\drawable-night\ic_user.xml">
<SubType></SubType>
<Generator></Generator>
</AndroidResource>
<AndroidResource Include="Resources\drawable\ic_bookmark_regular.xml">
<SubType></SubType>
<Generator></Generator>
</AndroidResource>
<AndroidResource Include="Resources\drawable\ic_rank_regular.xml">
<SubType></SubType>
<Generator></Generator>
</AndroidResource>
<AndroidResource Include="Resources\drawable\ic_sparkles_regular.xml">
<SubType></SubType>
<Generator></Generator>
</AndroidResource>
<AndroidResource Include="Resources\drawable\ic_user_regular.xml">
<SubType></SubType>
<Generator></Generator>
</AndroidResource>
</ItemGroup>
<ItemGroup>
<Folder Include="Resources\drawable\" />

4
Pixiview.Android/Renderers/AppShellRenderer.cs
View File

@ -1,5 +1,4 @@
#if TODO
using Android.Content;
using Android.Content;
using Pixiview.Droid.Renderers;
using Pixiview.Droid.Renderers.AppShellSection;
using Xamarin.Forms;
@ -20,4 +19,3 @@ namespace Pixiview.Droid.Renderers
}
}
}
#endif

21
Pixiview.Android/Renderers/AppShellSection/AppShellBottomNavViewAppearanceTracker.cs
View File

@ -64,6 +64,27 @@ namespace Pixiview.Droid.Renderers.AppShellSection
bottomView.ItemTextColor = _colorStateList;
bottomView.ItemIconTintList = _colorStateList;
var menu = bottomView.Menu;
if (menu != null && menu.HasVisibleItems)
{
var itemUser = menu.GetItem(0);
itemUser.SetIcon(itemUser.IsChecked ?
Resource.Drawable.ic_user :
Resource.Drawable.ic_user_regular);
var itemRecommend = menu.GetItem(1);
itemRecommend.SetIcon(itemRecommend.IsChecked ?
Resource.Drawable.ic_sparkles :
Resource.Drawable.ic_sparkles_regular);
var itemRank = menu.GetItem(2);
itemRank.SetIcon(itemRank.IsChecked ?
Resource.Drawable.ic_rank :
Resource.Drawable.ic_rank_regular);
var itemFavorite = menu.GetItem(3);
itemFavorite.SetIcon(itemFavorite.IsChecked ?
Resource.Drawable.ic_bookmark :
Resource.Drawable.ic_bookmark_regular);
}
SetBackgroundColor(bottomView, backgroundColor);
}

129
Pixiview.Android/Resources/Resource.designer.cs generated
View File

@ -8317,85 +8317,112 @@ namespace Pixiview.Droid
public const int download = 2131165282;
// aapt resource value: 0x7F070063
public const int ic_mtrl_chip_checked_black = 2131165283;
public const int ic_bookmark = 2131165283;
// aapt resource value: 0x7F070064
public const int ic_mtrl_chip_checked_circle = 2131165284;
public const int ic_bookmark_regular = 2131165284;
// aapt resource value: 0x7F070065
public const int ic_mtrl_chip_close_circle = 2131165285;
public const int ic_mtrl_chip_checked_black = 2131165285;
// aapt resource value: 0x7F070066
public const int ic_search = 2131165286;
public const int ic_mtrl_chip_checked_circle = 2131165286;
// aapt resource value: 0x7F070067
public const int mtrl_snackbar_background = 2131165287;
public const int ic_mtrl_chip_close_circle = 2131165287;
// aapt resource value: 0x7F070068
public const int mtrl_tabs_default_indicator = 2131165288;
public const int ic_option = 2131165288;
// aapt resource value: 0x7F070069
public const int navigation_empty_icon = 2131165289;
// aapt resource value: 0x7F07006B
public const int notification_action_background = 2131165291;
// aapt resource value: 0x7F07006C
public const int notification_bg = 2131165292;
// aapt resource value: 0x7F07006D
public const int notification_bg_low = 2131165293;
// aapt resource value: 0x7F07006E
public const int notification_bg_low_normal = 2131165294;
// aapt resource value: 0x7F07006F
public const int notification_bg_low_pressed = 2131165295;
// aapt resource value: 0x7F070070
public const int notification_bg_normal = 2131165296;
// aapt resource value: 0x7F070071
public const int notification_bg_normal_pressed = 2131165297;
// aapt resource value: 0x7F070072
public const int notification_icon_background = 2131165298;
// aapt resource value: 0x7F070073
public const int notification_template_icon_bg = 2131165299;
// aapt resource value: 0x7F070074
public const int notification_template_icon_low_bg = 2131165300;
// aapt resource value: 0x7F070075
public const int notification_tile_bg = 2131165301;
// aapt resource value: 0x7F070076
public const int notify_panel_notification_icon_bg = 2131165302;
public const int ic_rank = 2131165289;
// aapt resource value: 0x7F07006A
public const int no_profile = 2131165290;
public const int ic_rank_regular = 2131165290;
// aapt resource value: 0x7F07006B
public const int ic_search = 2131165291;
// aapt resource value: 0x7F07006C
public const int ic_sparkles = 2131165292;
// aapt resource value: 0x7F07006D
public const int ic_sparkles_regular = 2131165293;
// aapt resource value: 0x7F07006E
public const int ic_user = 2131165294;
// aapt resource value: 0x7F07006F
public const int ic_user_regular = 2131165295;
// aapt resource value: 0x7F070070
public const int mtrl_snackbar_background = 2131165296;
// aapt resource value: 0x7F070071
public const int mtrl_tabs_default_indicator = 2131165297;
// aapt resource value: 0x7F070072
public const int navigation_empty_icon = 2131165298;
// aapt resource value: 0x7F070074
public const int notification_action_background = 2131165300;
// aapt resource value: 0x7F070075
public const int notification_bg = 2131165301;
// aapt resource value: 0x7F070076
public const int notification_bg_low = 2131165302;
// aapt resource value: 0x7F070077
public const int segmented_control_background = 2131165303;
public const int notification_bg_low_normal = 2131165303;
// aapt resource value: 0x7F070078
public const int segmented_control_first_background = 2131165304;
public const int notification_bg_low_pressed = 2131165304;
// aapt resource value: 0x7F070079
public const int segmented_control_last_background = 2131165305;
public const int notification_bg_normal = 2131165305;
// aapt resource value: 0x7F07007A
public const int splash_logo = 2131165306;
public const int notification_bg_normal_pressed = 2131165306;
// aapt resource value: 0x7F07007B
public const int splash_screen = 2131165307;
public const int notification_icon_background = 2131165307;
// aapt resource value: 0x7F07007C
public const int tooltip_frame_dark = 2131165308;
public const int notification_template_icon_bg = 2131165308;
// aapt resource value: 0x7F07007D
public const int tooltip_frame_light = 2131165309;
public const int notification_template_icon_low_bg = 2131165309;
// aapt resource value: 0x7F07007E
public const int notification_tile_bg = 2131165310;
// aapt resource value: 0x7F07007F
public const int notify_panel_notification_icon_bg = 2131165311;
// aapt resource value: 0x7F070073
public const int no_profile = 2131165299;
// aapt resource value: 0x7F070080
public const int segmented_control_background = 2131165312;
// aapt resource value: 0x7F070081
public const int segmented_control_first_background = 2131165313;
// aapt resource value: 0x7F070082
public const int segmented_control_last_background = 2131165314;
// aapt resource value: 0x7F070083
public const int splash_logo = 2131165315;
// aapt resource value: 0x7F070084
public const int splash_screen = 2131165316;
// aapt resource value: 0x7F070085
public const int tooltip_frame_dark = 2131165317;
// aapt resource value: 0x7F070086
public const int tooltip_frame_light = 2131165318;
static Drawable()
{

5
Pixiview.Android/Resources/drawable-night/ic_bookmark.xml Normal file
View File

@ -0,0 +1,5 @@
<vector android:height="20dp" android:tint="#FFFFFF"
android:viewportHeight="512" android:viewportWidth="384"
android:width="15dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#FF000000" android:pathData="M0 512V48C0 21.49 21.49 0 48 0h288c26.51 0 48 21.49 48 48v464L192 400 0 512z"/>
</vector>

5
Pixiview.Android/Resources/drawable-night/ic_option.xml Normal file
View File

@ -0,0 +1,5 @@
<vector android:height="20dp" android:tint="#FFFFFF"
android:viewportHeight="512" android:viewportWidth="512"
android:width="20dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#FF000000" android:pathData="M487.4 315.7l-42.6-24.6c4.3-23.2 4.3-47 0-70.2l42.6-24.6c4.9-2.8 7.1-8.6 5.5-14-11.1-35.6-30-67.8-54.7-94.6-3.8-4.1-10-5.1-14.8-2.3L380.8 110c-17.9-15.4-38.5-27.3-60.8-35.1V25.8c0-5.6-3.9-10.5-9.4-11.7-36.7-8.2-74.3-7.8-109.2 0-5.5 1.2-9.4 6.1-9.4 11.7V75c-22.2 7.9-42.8 19.8-60.8 35.1L88.7 85.5c-4.9-2.8-11-1.9-14.8 2.3-24.7 26.7-43.6 58.9-54.7 94.6-1.7 5.4.6 11.2 5.5 14L67.3 221c-4.3 23.2-4.3 47 0 70.2l-42.6 24.6c-4.9 2.8-7.1 8.6-5.5 14 11.1 35.6 30 67.8 54.7 94.6 3.8 4.1 10 5.1 14.8 2.3l42.6-24.6c17.9 15.4 38.5 27.3 60.8 35.1v49.2c0 5.6 3.9 10.5 9.4 11.7 36.7 8.2 74.3 7.8 109.2 0 5.5-1.2 9.4-6.1 9.4-11.7v-49.2c22.2-7.9 42.8-19.8 60.8-35.1l42.6 24.6c4.9 2.8 11 1.9 14.8-2.3 24.7-26.7 43.6-58.9 54.7-94.6 1.5-5.5-.7-11.3-5.6-14.1zM256 336c-44.1 0-80-35.9-80-80s35.9-80 80-80 80 35.9 80 80-35.9 80-80 80z"/>
</vector>

5
Pixiview.Android/Resources/drawable-night/ic_rank.xml Normal file
View File

@ -0,0 +1,5 @@
<vector android:height="20dp" android:tint="#FFFFFF"
android:viewportHeight="512" android:viewportWidth="512"
android:width="20dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#FF000000" android:pathData="M276 192h152a20 20 0 0 0 20-20V52a20 20 0 0 0-20-20H276a20 20 0 0 0-20 20v120a20 20 0 0 0 20 20zm208 64H284a28 28 0 0 0-28 28v168a28 28 0 0 0 28 28h200a28 28 0 0 0 28-28V284a28 28 0 0 0-28-28zM107.31 36.69a16 16 0 0 0-22.62 0l-80 96C-5.35 142.74 1.77 160 16 160h48v304a16 16 0 0 0 16 16h32a16 16 0 0 0 16-16V160h48c14.21 0 21.38-17.24 11.31-27.31z"/>
</vector>

5
Pixiview.Android/Resources/drawable-night/ic_sparkles.xml Normal file
View File

@ -0,0 +1,5 @@
<vector android:height="20dp" android:tint="#FFFFFF"
android:viewportHeight="512" android:viewportWidth="512"
android:width="20dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#FF000000" android:pathData="M324.42 103.15L384 128l24.84 59.58a8 8 0 0 0 14.32 0L448 128l59.58-24.85a8 8 0 0 0 0-14.31L448 64 423.16 4.42a8 8 0 0 0-14.32 0L384 64l-59.58 24.84a8 8 0 0 0 0 14.31zm183.16 305.69L448 384l-24.84-59.58a8 8 0 0 0-14.32 0L384 384l-59.58 24.84a8 8 0 0 0 0 14.32L384 448l24.84 59.58a8 8 0 0 0 14.32 0L448 448l59.58-24.84a8 8 0 0 0 0-14.32zM384 255.64a16.06 16.06 0 0 0-8.84-14.33l-112.57-56.39-56.28-112.77c-5.44-10.87-23.19-10.87-28.62 0l-56.28 112.77L8.84 241.31a16 16 0 0 0 0 28.67l112.57 56.39 56.28 112.77a16 16 0 0 0 28.62 0l56.28-112.77L375.16 270a16.07 16.07 0 0 0 8.84-14.36z"/>
</vector>

5
Pixiview.Android/Resources/drawable-night/ic_user.xml Normal file
View File

@ -0,0 +1,5 @@
<vector android:height="20dp" android:tint="#FFFFFF"
android:viewportHeight="512" android:viewportWidth="448"
android:width="17.5dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#FF000000" android:pathData="M224 256c70.7 0 128-57.3 128-128S294.7 0 224 0 96 57.3 96 128s57.3 128 128 128zm89.6 32h-16.7c-22.2 10.2-46.9 16-72.9 16s-50.6-5.8-72.9-16h-16.7C60.2 288 0 348.2 0 422.4V464c0 26.5 21.5 48 48 48h352c26.5 0 48-21.5 48-48v-41.6c0-74.2-60.2-134.4-134.4-134.4z"/>
</vector>

5
Pixiview.Android/Resources/drawable/ic_bookmark.xml Normal file
View File

@ -0,0 +1,5 @@
<vector android:height="20dp" android:tint="#000000"
android:viewportHeight="512" android:viewportWidth="384"
android:width="15dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#FF000000" android:pathData="M0 512V48C0 21.49 21.49 0 48 0h288c26.51 0 48 21.49 48 48v464L192 400 0 512z"/>
</vector>

5
Pixiview.Android/Resources/drawable/ic_bookmark_regular.xml Normal file
View File

@ -0,0 +1,5 @@
<vector android:height="20dp" android:tint="#000000"
android:viewportHeight="512" android:viewportWidth="384"
android:width="15dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#FF000000" android:pathData="M336 0H48C21.49 0 0 21.49 0 48v464l192-112 192 112V48c0-26.51-21.49-48-48-48zm0 428.43l-144-84-144 84V54a6 6 0 0 1 6-6h276c3.314 0 6 2.683 6 5.996V428.43z"/>
</vector>

5
Pixiview.Android/Resources/drawable/ic_option.xml Normal file
View File

@ -0,0 +1,5 @@
<vector android:height="20dp" android:tint="#000000"
android:viewportHeight="512" android:viewportWidth="512"
android:width="20dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#FF000000" android:pathData="M487.4 315.7l-42.6-24.6c4.3-23.2 4.3-47 0-70.2l42.6-24.6c4.9-2.8 7.1-8.6 5.5-14-11.1-35.6-30-67.8-54.7-94.6-3.8-4.1-10-5.1-14.8-2.3L380.8 110c-17.9-15.4-38.5-27.3-60.8-35.1V25.8c0-5.6-3.9-10.5-9.4-11.7-36.7-8.2-74.3-7.8-109.2 0-5.5 1.2-9.4 6.1-9.4 11.7V75c-22.2 7.9-42.8 19.8-60.8 35.1L88.7 85.5c-4.9-2.8-11-1.9-14.8 2.3-24.7 26.7-43.6 58.9-54.7 94.6-1.7 5.4.6 11.2 5.5 14L67.3 221c-4.3 23.2-4.3 47 0 70.2l-42.6 24.6c-4.9 2.8-7.1 8.6-5.5 14 11.1 35.6 30 67.8 54.7 94.6 3.8 4.1 10 5.1 14.8 2.3l42.6-24.6c17.9 15.4 38.5 27.3 60.8 35.1v49.2c0 5.6 3.9 10.5 9.4 11.7 36.7 8.2 74.3 7.8 109.2 0 5.5-1.2 9.4-6.1 9.4-11.7v-49.2c22.2-7.9 42.8-19.8 60.8-35.1l42.6 24.6c4.9 2.8 11 1.9 14.8-2.3 24.7-26.7 43.6-58.9 54.7-94.6 1.5-5.5-.7-11.3-5.6-14.1zM256 336c-44.1 0-80-35.9-80-80s35.9-80 80-80 80 35.9 80 80-35.9 80-80 80z"/>
</vector>

5
Pixiview.Android/Resources/drawable/ic_rank.xml Normal file
View File

@ -0,0 +1,5 @@
<vector android:height="20dp" android:tint="#000000"
android:viewportHeight="512" android:viewportWidth="512"
android:width="20dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#FF000000" android:pathData="M276 192h152a20 20 0 0 0 20-20V52a20 20 0 0 0-20-20H276a20 20 0 0 0-20 20v120a20 20 0 0 0 20 20zm208 64H284a28 28 0 0 0-28 28v168a28 28 0 0 0 28 28h200a28 28 0 0 0 28-28V284a28 28 0 0 0-28-28zM107.31 36.69a16 16 0 0 0-22.62 0l-80 96C-5.35 142.74 1.77 160 16 160h48v304a16 16 0 0 0 16 16h32a16 16 0 0 0 16-16V160h48c14.21 0 21.38-17.24 11.31-27.31z"/>
</vector>

5
Pixiview.Android/Resources/drawable/ic_rank_regular.xml Normal file
View File

@ -0,0 +1,5 @@
<vector android:height="20dp" android:tint="#000000"
android:viewportHeight="512" android:viewportWidth="512"
android:width="20dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#FF000000" android:pathData="M484 256H252a28 28 0 0 0-28 28v168a28 28 0 0 0 28 28h232a28 28 0 0 0 28-28V284a28 28 0 0 0-28-28zm-20 176H272V304h192zM244 192h184a20 20 0 0 0 20-20V52a20 20 0 0 0-20-20H244a20 20 0 0 0-20 20v120a20 20 0 0 0 20 20zm28-112h128v64H272zM104.72 35.76a12 12 0 0 0-17.44 0l-68 72A12 12 0 0 0 28 128h44v336a16 16 0 0 0 16 16h16a16 16 0 0 0 16-16V128h44a12 12 0 0 0 8.73-20.24z"/>
</vector>

5
Pixiview.Android/Resources/drawable/ic_sparkles.xml Normal file
View File

@ -0,0 +1,5 @@
<vector android:height="20dp" android:tint="#000000"
android:viewportHeight="512" android:viewportWidth="512"
android:width="20dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#FF000000" android:pathData="M324.42 103.15L384 128l24.84 59.58a8 8 0 0 0 14.32 0L448 128l59.58-24.85a8 8 0 0 0 0-14.31L448 64 423.16 4.42a8 8 0 0 0-14.32 0L384 64l-59.58 24.84a8 8 0 0 0 0 14.31zm183.16 305.69L448 384l-24.84-59.58a8 8 0 0 0-14.32 0L384 384l-59.58 24.84a8 8 0 0 0 0 14.32L384 448l24.84 59.58a8 8 0 0 0 14.32 0L448 448l59.58-24.84a8 8 0 0 0 0-14.32zM384 255.64a16.06 16.06 0 0 0-8.84-14.33l-112.57-56.39-56.28-112.77c-5.44-10.87-23.19-10.87-28.62 0l-56.28 112.77L8.84 241.31a16 16 0 0 0 0 28.67l112.57 56.39 56.28 112.77a16 16 0 0 0 28.62 0l56.28-112.77L375.16 270a16.07 16.07 0 0 0 8.84-14.36z"/>
</vector>

5
Pixiview.Android/Resources/drawable/ic_sparkles_regular.xml Normal file
View File

@ -0,0 +1,5 @@
<vector android:height="20dp" android:tint="#000000"
android:viewportHeight="512" android:viewportWidth="512"
android:width="20dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#FF000000" android:pathData="M324.42 103.16L384 128l24.84 59.58a8 8 0 0 0 14.32 0L448 128l59.58-24.84a8 8 0 0 0 0-14.32L448 64 423.16 4.42a8 8 0 0 0-14.32 0L384 64l-59.58 24.84a8 8 0 0 0 0 14.32zm183.16 305.68L448 384l-24.84-59.58a8 8 0 0 0-14.32 0L384 384l-59.58 24.84a8 8 0 0 0 0 14.32L384 448l24.84 59.58a8 8 0 0 0 14.32 0L448 448l59.58-24.84a8 8 0 0 0 0-14.32zM384 256a24 24 0 0 0-13.28-21.47l-104.85-52.42-52.4-104.84c-8.13-16.25-34.81-16.25-42.94 0l-52.41 104.84-104.84 52.42a24 24 0 0 0 0 42.94l104.84 52.42 52.41 104.85a24 24 0 0 0 42.94 0l52.4-104.85 104.85-52.42A24 24 0 0 0 384 256zm-146.72 34.53a24 24 0 0 0-10.75 10.74L192 370.33l-34.53-69.06a24 24 0 0 0-10.75-10.74L77.66 256l69.06-34.53a24 24 0 0 0 10.75-10.73L192 141.67l34.53 69.07a24 24 0 0 0 10.75 10.73L306.34 256z"/>
</vector>

5
Pixiview.Android/Resources/drawable/ic_user.xml Normal file
View File

@ -0,0 +1,5 @@
<vector android:height="20dp" android:tint="#000000"
android:viewportHeight="512" android:viewportWidth="448"
android:width="17.5dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#FF000000" android:pathData="M224 256c70.7 0 128-57.3 128-128S294.7 0 224 0 96 57.3 96 128s57.3 128 128 128zm89.6 32h-16.7c-22.2 10.2-46.9 16-72.9 16s-50.6-5.8-72.9-16h-16.7C60.2 288 0 348.2 0 422.4V464c0 26.5 21.5 48 48 48h352c26.5 0 48-21.5 48-48v-41.6c0-74.2-60.2-134.4-134.4-134.4z"/>
</vector>

5
Pixiview.Android/Resources/drawable/ic_user_regular.xml Normal file
View File

@ -0,0 +1,5 @@
<vector android:height="20dp" android:tint="#000000"
android:viewportHeight="512" android:viewportWidth="448"
android:width="17.5dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#FF000000" android:pathData="M313.6 304c-28.7 0-42.5 16-89.6 16-47.1 0-60.8-16-89.6-16C60.2 304 0 364.2 0 438.4V464c0 26.5 21.5 48 48 48h352c26.5 0 48-21.5 48-48v-25.6c0-74.2-60.2-134.4-134.4-134.4zM400 464H48v-25.6c0-47.6 38.8-86.4 86.4-86.4 14.6 0 38.3 16 89.6 16 51.7 0 74.9-16 89.6-16 47.6 0 86.4 38.8 86.4 86.4V464zM224 288c79.5 0 144-64.5 144-144S303.5 0 224 0 80 64.5 80 144s64.5 144 144 144zm0-240c52.9 0 96 43.1 96 96s-43.1 96-96 96-96-43.1-96-96 43.1-96 96-96z"/>
</vector>

2
Pixiview.iOS/Renderers/AppShellRenderer.cs
View File

@ -32,7 +32,7 @@ namespace Pixiview.iOS.Renderers
protected override IShellTabBarAppearanceTracker CreateTabBarAppearanceTracker()
{
return new AppShellTabBarAppearanceTracker();
return new AppShellTabBarAppearanceTracker((AppShell)Element);
}
protected override IShellNavBarAppearanceTracker CreateNavBarAppearanceTracker()

39
Pixiview.iOS/Renderers/AppShellSection/AppAppearanceTracker.cs
View File

@ -1,4 +1,5 @@
using CoreGraphics;
using System.Linq;
using CoreGraphics;
using UIKit;
using Xamarin.Forms;
using Xamarin.Forms.Platform.iOS;
@ -99,6 +100,14 @@ namespace Pixiview.iOS.Renderers.AppShellSection
UIColor _defaultTint;
UIColor _defaultUnselectedTint;
private readonly AppShell appShell;
private bool initIcons;
public AppShellTabBarAppearanceTracker(AppShell shell)
{
appShell = shell;
}
public void ResetAppearance(UITabBarController controller)
{
if (_defaultTint == null)
@ -118,6 +127,34 @@ namespace Pixiview.iOS.Renderers.AppShellSection
var tintColor = appearanceElement.EffectiveTabBarForegroundColor; // appearanceElement.EffectiveTabBarTitleColor;
var tabBar = controller.TabBar;
if (tabBar.Items != null && !initIcons)
{
initIcons = true;
var sources = appShell.CurrentItem.Items.Select(i => (FontImageSource)i.Icon).ToArray();
var images = new UIImage[sources.Length];
var handler = new FontImageSourceHandler();
for (var i = 0; i < images.Length; i++)
{
var font = sources[i];
if (font != null)
{
images[i] = handler.LoadImageAsync(new FontImageSource
{
FontFamily = "FontAwesome5Pro-Solid",
Glyph = font.Glyph,
Size = font.Size
}).Result;
}
}
for (var i = 0; i < tabBar.Items.Length; i++)
{
var image = images[i];
if (image != null)
{
tabBar.Items[i].SelectedImage = image;
}
}
}
if (_defaultTint == null)
{

6
Pixiview/AppShell.xaml
View File

@ -74,27 +74,31 @@
<FlyoutItem FlyoutDisplayOptions="AsMultipleItems"
Route="{x:Static util:Routes.Illust}">
<Tab Icon="{DynamicResource FontIconUser}"
FlyoutIcon="{DynamicResource FontIconUserFlyout}"
Title="{r:Text Follow}"
Route="{x:Static util:Routes.Follow}">
<ShellContent ContentTemplate="{DataTemplate i:MainPage}"/>
</Tab>
<Tab Icon="{DynamicResource FontIconSparkles}"
FlyoutIcon="{DynamicResource FontIconSparklesFlyout}"
Title="{r:Text Recommends}"
Route="{x:Static util:Routes.Recommends}">
<ShellContent ContentTemplate="{DataTemplate i:RecommendsPage}"/>
</Tab>
<Tab Icon="{DynamicResource FontIconOrder}"
FlyoutIcon="{DynamicResource FontIconOrderFlyout}"
Title="{r:Text Ranking}"
Route="{x:Static util:Routes.Ranking}">
<ShellContent ContentTemplate="{DataTemplate i:RankingPage}"/>
</Tab>
<Tab Icon="{DynamicResource FontIconFavorite}"
FlyoutIcon="{DynamicResource FontIconFavoriteFlyout}"
Title="{r:Text Favorites}"
Route="{x:Static util:Routes.Favorites}">
<ShellContent ContentTemplate="{DataTemplate i:FavoritesPage}"/>
</Tab>
</FlyoutItem>
<FlyoutItem Icon="{DynamicResource FontIconOption}"
<FlyoutItem FlyoutIcon="{DynamicResource FontIconOption}"
Title="{r:Text Option}"
Route="{x:Static util:Routes.Option}">
<Tab>

7
Pixiview/Illust/FavoritesPage.xaml.cs
View File

@ -342,7 +342,7 @@ namespace Pixiview.Illust
{
item.ProfileUrl = user.image;
}
var url = item.ImageUrl;
var url = Configs.GetThumbnailUrl(item.ImageUrl);
if (url != null)
{
var image = Stores.LoadPreviewImage(url, false);
@ -382,7 +382,7 @@ namespace Pixiview.Illust
task = ParallelTask.Start("favorite.loadimages", 0, list.Length, Configs.MaxPageThreads, i =>
{
var item = list[i];
if (item.ImageUrl == null)
if (item.ImageUrl == null || item.ProfileUrl == null)
{
var data = Stores.LoadIllustPreloadData(item.Id, true, force: true);
if (data != null && data.illust.TryGetValue(item.Id, out var illust))
@ -401,8 +401,9 @@ namespace Pixiview.Illust
}
if (item.Image == null && item.ImageUrl != null)
{
var url = Configs.GetThumbnailUrl(item.ImageUrl);
item.Image = StyleDefinition.DownloadBackground;
var image = Stores.LoadThumbnailImage(item.ImageUrl, true, force: true);
var image = Stores.LoadThumbnailImage(url, true, force: true);
if (image != null)
{
item.Image = image;

4
Pixiview/Illust/MainPage.xaml.cs
View File

@ -80,9 +80,7 @@ namespace Pixiview.Illust
}
await ScrollToTopAsync(scrollView);
lastUpdated = default;
StartLoad(false);
StartLoad(true);
}
private void SearchBar_SearchButtonPressed(object sender, EventArgs e)

29
Pixiview/UI/Theme/ThemeBase.cs
View File

@ -7,12 +7,16 @@ namespace Pixiview.UI.Theme
public const string FontIconUser = nameof(FontIconUser);
public const string FontIconSparkles = nameof(FontIconSparkles);
public const string FontIconOrder = nameof(FontIconOrder);
public const string FontIconFavorite = nameof(FontIconFavorite);
public const string FontIconUserFlyout = nameof(FontIconUserFlyout);
public const string FontIconSparklesFlyout = nameof(FontIconSparklesFlyout);
public const string FontIconOrderFlyout = nameof(FontIconOrderFlyout);
public const string FontIconFavoriteFlyout = nameof(FontIconFavoriteFlyout);
public const string FontIconRefresh = nameof(FontIconRefresh);
public const string FontIconLove = nameof(FontIconLove);
public const string FontIconNotLove = nameof(FontIconNotLove);
public const string FontIconCircleLove = nameof(FontIconCircleLove);
public const string FontIconOption = nameof(FontIconOption);
public const string FontIconFavorite = nameof(FontIconFavorite);
public const string FontIconShare = nameof(FontIconShare);
public const string FontIconMore = nameof(FontIconMore);
public const string FontIconCaretCircleLeft = nameof(FontIconCaretCircleLeft);
@ -53,15 +57,28 @@ namespace Pixiview.UI.Theme
var regularFontFamily = StyleDefinition.IconRegularFontFamily;
var solidFontFamily = StyleDefinition.IconSolidFontFamily;
#if __IOS__
Add(FontIconUserFlyout, GetSolidIcon(StyleDefinition.IconUser, solidFontFamily));
Add(FontIconSparklesFlyout, GetSolidIcon(StyleDefinition.IconSparkles, solidFontFamily));
Add(FontIconOrderFlyout, GetSolidIcon(StyleDefinition.IconOrder, solidFontFamily));
Add(FontIconFavoriteFlyout, GetSolidIcon(StyleDefinition.IconFavorite, solidFontFamily));
Add(FontIconOption, GetSolidIcon(StyleDefinition.IconOption, solidFontFamily));
Add(FontIconUser, GetSolidIcon(StyleDefinition.IconUser, regularFontFamily));
Add(FontIconSparkles, GetSolidIcon(StyleDefinition.IconSparkles, regularFontFamily));
Add(FontIconOrder, GetSolidIcon(StyleDefinition.IconOrder, regularFontFamily));
Add(FontIconFavorite, GetSolidIcon(StyleDefinition.IconFavorite, regularFontFamily));
#elif __ANDROID__
Add(FontIconUserFlyout, ImageSource.FromFile("ic_user"));
Add(FontIconSparklesFlyout, ImageSource.FromFile("ic_sparkles"));
Add(FontIconOrderFlyout, ImageSource.FromFile("ic_rank"));
Add(FontIconFavoriteFlyout, ImageSource.FromFile("ic_bookmark"));
Add(FontIconOption, ImageSource.FromFile("ic_option"));
#endif
Add(FontIconLove, GetSolidIcon(StyleDefinition.IconLove, solidFontFamily, StyleDefinition.ColorRedBackground));
Add(FontIconCircleLove, GetSolidIcon(StyleDefinition.IconCircleLove, solidFontFamily, StyleDefinition.ColorRedBackground));
Add(FontIconUser, GetSolidIcon(StyleDefinition.IconUser, solidFontFamily));
Add(FontIconSparkles, GetSolidIcon(StyleDefinition.IconSparkles, solidFontFamily));
Add(FontIconOrder, GetSolidIcon(StyleDefinition.IconOrder, solidFontFamily));
Add(FontIconRefresh, GetSolidIcon(StyleDefinition.IconRefresh, solidFontFamily));
Add(FontIconNotLove, GetSolidIcon(StyleDefinition.IconLove, regularFontFamily));
Add(FontIconOption, GetSolidIcon(StyleDefinition.IconOption, solidFontFamily));
Add(FontIconFavorite, GetSolidIcon(StyleDefinition.IconFavorite, solidFontFamily));
Add(FontIconShare, GetSolidIcon(StyleDefinition.IconShare, solidFontFamily));
Add(FontIconMore, GetSolidIcon(StyleDefinition.IconMore, regularFontFamily));
Add(FontIconCaretCircleLeft, GetSolidIcon(StyleDefinition.IconCaretCircleLeft, solidFontFamily));

10
Pixiview/Utils/Stores.cs
View File

@ -846,12 +846,12 @@ namespace Pixiview.Utils
if (index > 0)
{
url = url.Substring(0, index) + "_master1200.jpg";
}
var start = url.IndexOf("/img-master/");
if (start > 0)
{
url = URL_PREVIEW + url.Substring(start);
}
var start = url.IndexOf("/img-master/");
if (start > 0)
{
url = URL_PREVIEW + url.Substring(start);
}
return url;
}