GithubStar/SteamTools
1
0
Fork 0
mirror of https://github.com/BeyondDimension/SteamTools.git synced 2026-10-29 16:08:15 +08:00
Code Issues Packages Projects Releases Wiki Activity

SteamAuthTrade new icons

Browse Source
This commit is contained in:
Aigio Liu
2021-07-15 10:08:11 +08:00
parent 8fc34fc5f6
commit d95522537d
29 changed files with 136 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/Common.ClientLib/Application/Essentials/XamarinEssentials.cs
+6 -5
View File
@@ -1,5 +1,5 @@
using System.Reflection;
using System.Runtime.Versioning;
//using System.Reflection;
//using System.Runtime.Versioning;
using Xamarin.Essentials;
namespace System.Application
@@ -8,9 +8,10 @@ namespace System.Application
{
static readonly Lazy<bool> _IsSupported = new(() =>
{
// TargetFrameworkAttribute It may be deleted by link(mono) or trimmable or PublishSingleFile
var attr = Assembly.GetAssembly(typeof(DevicePlatform)).GetCustomAttribute<TargetFrameworkAttribute>();
return attr != null && !attr.FrameworkName.StartsWith(".NETStandard,Version=");
//// TargetFrameworkAttribute It may be deleted by link(mono) or trimmable or PublishSingleFile
//var attr = Assembly.GetAssembly(typeof(DevicePlatform)).GetCustomAttribute<TargetFrameworkAttribute>();
//return attr != null && !attr.FrameworkName.StartsWith(".NETStandard,Version=");
return DeviceInfo.Platform != DevicePlatform.Unknown;
});
public static bool IsSupported => _IsSupported.Value;
src/ST.Client.Mobile.Droid.Design/app/src/main/AndroidManifest.xml
+3 -3
View File
@@ -3,7 +3,7 @@
package="net.steampp.app.design">
<application
android:name=".ui.MainApplication"
android:name="net.steampp.app.ui.MainApplication"
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
@@ -11,12 +11,12 @@
android:supportsRtl="true"
android:theme="@style/MainTheme">
<activity
android:name=".ui.activities.MainActivity"
android:name="net.steampp.app.ui.activities.MainActivity"
android:configChanges="screenSize|orientation|keyboard|keyboardHidden|screenLayout|smallestScreenSize"
android:label="@string/app_name"
android:launchMode="singleTask" />
<activity
android:name=".ui.activities.SplashActivity"
android:name="net.steampp.app.ui.activities.SplashActivity"
android:configChanges="screenSize|orientation|keyboard|keyboardHidden|screenLayout|smallestScreenSize"
android:label="@string/app_name"
android:launchMode="singleTask"
src/ST.Client.Mobile.Droid.Design/app/src/main/java/net/steampp/app/ui/fragments/LocalAuthFragment.java
+3 -11
View File
@@ -12,23 +12,21 @@ import androidx.fragment.app.Fragment;
import androidx.lifecycle.Observer;
import androidx.lifecycle.ViewModelProvider;
import net.steampp.app.ui.databinding.FragmentLocalAuthBinding;
import net.steampp.app.design.R;
import net.steampp.app.ui.viewmodels.LocalAuthViewModel;
public class LocalAuthFragment extends Fragment {
private LocalAuthViewModel viewModel;
private FragmentLocalAuthBinding binding;
public View onCreateView(@NonNull LayoutInflater inflater,
ViewGroup container, Bundle savedInstanceState) {
viewModel =
new ViewModelProvider(this).get(LocalAuthViewModel.class);
binding = FragmentLocalAuthBinding.inflate(inflater, container, false);
View root = binding.getRoot();
View root = inflater.inflate(R.layout.fragment_local_auth_test, container, false);
final TextView textView = binding.textView;
final TextView textView = root.findViewById(R.id.textView);
viewModel.getText().observe(getViewLifecycleOwner(), new Observer<String>() {
@Override
public void onChanged(@Nullable String s) {
@@ -37,10 +35,4 @@ public class LocalAuthFragment extends Fragment {
});
return root;
}
@Override
public void onDestroyView() {
super.onDestroyView();
binding = null;
}
}
src/ST.Client.Mobile.Droid.Design/app/src/main/res/layout/fragment_local_auth_test.xml
+23
View File
@@ -0,0 +1,23 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
xmlns:xamarin="http://schemas.xamarin.com/android/xamarin/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
<androidx.appcompat.widget.AppCompatTextView
android:id="@+id/textView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="8dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="8dp"
android:textAlignment="center"
android:textSize="20sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
xamarin:managedType="AndroidX.AppCompat.Widget.AppCompatTextView" />
</androidx.constraintlayout.widget.ConstraintLayout>
src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_check_black_24.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 168 B

src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_logout_black_24.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 209 B

src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-hdpi/baseline_more_horiz_black_24.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 121 B

src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_check_black_24.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 134 B

src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_logout_black_24.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 141 B

src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-mdpi/baseline_more_horiz_black_24.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 97 B

src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_check_black_24.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 196 B

src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_logout_black_24.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 225 B

src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xhdpi/baseline_more_horiz_black_24.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 143 B

src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_check_black_24.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 239 B

src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_logout_black_24.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 311 B

src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxhdpi/baseline_more_horiz_black_24.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 178 B

src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_check_black_24.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 323 B

src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_logout_black_24.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 385 B

src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable-xxxhdpi/baseline_more_horiz_black_24.png
BIN
View File
Binary file not shown.
Side by Side

After

Width:  |  Height:  |  Size: 222 B

src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable/baseline_check_black_24.xml
+10
View File
@@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z"/>
</vector>
src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable/baseline_logout_black_24.xml
+11
View File
@@ -0,0 +1,11 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?attr/colorControlNormal"
android:autoMirrored="true">
<path
android:fillColor="@android:color/white"
android:pathData="M17,7l-1.41,1.41L18.17,11H8v2h10.17l-2.58,2.58L17,17l5,-5zM4,5h8V3H4c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h8v-2H4V5z"/>
</vector>
src/ST.Client.Mobile.Droid.Design/ui/src/main/res/drawable/baseline_more_horiz_black_24.xml
+10
View File
@@ -0,0 +1,10 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:viewportWidth="24"
android:viewportHeight="24"
android:tint="?attr/colorControlNormal">
<path
android:fillColor="@android:color/white"
android:pathData="M6,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM18,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2zM12,10c-1.1,0 -2,0.9 -2,2s0.9,2 2,2 2,-0.9 2,-2 -0.9,-2 -2,-2z"/>
</vector>
src/ST.Client.Mobile.Droid.Design/ui/src/main/res/layout/activity_steam_auth_trade.xml
+3 -2
View File
@@ -46,7 +46,8 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:overScrollMode="never"
tools:itemCount="3"
android:paddingBottom="@dimen/fab_full_height"
tools:itemCount="4"
tools:listitem="@layout/layout_card_steam_auth_trade_confirmation"
xamarin:managedType="AndroidX.RecyclerView.Widget.RecyclerView" />
</LinearLayout>
@@ -116,7 +117,7 @@
android:layout_height="37dp"
android:layout_gravity="center_horizontal"
android:layout_marginTop="@dimen/activity_vertical_margin"
tools:background="@color/icon_background"
tools:background="@color/grey_background"
xamarin:managedType="AndroidX.AppCompat.Widget.AppCompatTextView" />
<com.google.android.material.textfield.TextInputLayout
src/ST.Client.Mobile.Droid.Design/ui/src/main/res/layout/fragment_local_auth.xml
+1
View File
@@ -18,6 +18,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:overScrollMode="never"
android:paddingBottom="@dimen/fab_full_height"
tools:itemCount="5"
tools:listitem="@layout/layout_card_gap_authenticator"
xamarin:managedType="AndroidX.RecyclerView.Widget.RecyclerView" />
src/ST.Client.Mobile.Droid.Design/ui/src/main/res/layout/layout_card_steam_auth_trade_confirmation_content.xml
+1 -1
View File
@@ -14,7 +14,7 @@
android:layout_marginTop="@dimen/activity_vertical_margin"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:src="@color/icon_background"
tools:src="@color/grey_background"
xamarin:managedType="AndroidX.AppCompat.Widget.AppCompatImageView" />
<androidx.appcompat.widget.AppCompatTextView
src/ST.Client.Mobile.Droid.Design/ui/src/main/res/values/dimens.xml
+1
View File
@@ -21,4 +21,5 @@
<dimen name="list_header_title_font_size">16sp</dimen>
<dimen name="steam_user_login_logo_size">125dp</dimen>
<dimen name="steam_auth__trade_confirmation_img_size">80dp</dimen>
<dimen name="fab_full_height">88dp</dimen>
</resources>
src/ST.Client.Mobile.Droid/ST.Client.Mobile.Droid.csproj
+55
View File
@@ -197,6 +197,9 @@
<AndroidResource Include="..\ST.Client.Mobile.Droid.Design\ui\src\main\res\drawable\baseline_checklist_black_24.xml">
<Link>Resources\drawable\baseline_checklist_black_24.xml</Link>
</AndroidResource>
<AndroidResource Include="..\ST.Client.Mobile.Droid.Design\ui\src\main\res\drawable\baseline_check_black_24.xml">
<Link>Resources\drawable\baseline_check_black_24.xml</Link>
</AndroidResource>
<AndroidResource Include="..\ST.Client.Mobile.Droid.Design\ui\src\main\res\drawable\baseline_check_circle.xml">
<Link>Resources\drawable\baseline_check_circle.xml</Link>
</AndroidResource>
@@ -227,9 +230,15 @@
<AndroidResource Include="..\ST.Client.Mobile.Droid.Design\ui\src\main\res\drawable\baseline_lock_open_black_24.xml">
<Link>Resources\drawable\baseline_lock_open_black_24.xml</Link>
</AndroidResource>
<AndroidResource Include="..\ST.Client.Mobile.Droid.Design\ui\src\main\res\drawable\baseline_logout_black_24.xml">
<Link>Resources\drawable\baseline_logout_black_24.xml</Link>
</AndroidResource>
<AndroidResource Include="..\ST.Client.Mobile.Droid.Design\ui\src\main\res\drawable\baseline_male_black_24.xml">
<Link>Resources\drawable\baseline_male_black_24.xml</Link>
</AndroidResource>
<AndroidResource Include="..\ST.Client.Mobile.Droid.Design\ui\src\main\res\drawable\baseline_more_horiz_black_24.xml">
<Link>Resources\drawable\baseline_more_horiz_black_24.xml</Link>
</AndroidResource>
<AndroidResource Include="..\ST.Client.Mobile.Droid.Design\ui\src\main\res\drawable\baseline_person_black_24.xml">
<Link>Resources\drawable\baseline_person_black_24.xml</Link>
</AndroidResource>
@@ -302,6 +311,9 @@
<AndroidResource Include="..\ST.Client.Mobile.Droid.Design\ui\src\main\res\drawable-hdpi\baseline_checklist_black_24.png">
<Link>Resources\drawable-hdpi\baseline_checklist_black_24.png</Link>
</AndroidResource>
<AndroidResource Include="..\ST.Client.Mobile.Droid.Design\ui\src\main\res\drawable-hdpi\baseline_check_black_24.png">
<Link>Resources\drawable-hdpi\baseline_check_black_24.png</Link>
</AndroidResource>
<AndroidResource Include="..\ST.Client.Mobile.Droid.Design\ui\src\main\res\drawable-hdpi\baseline_close_black_24.png">
<Link>Resources\drawable-hdpi\baseline_close_black_24.png</Link>
</AndroidResource>
@@ -329,9 +341,15 @@
<AndroidResource Include="..\ST.Client.Mobile.Droid.Design\ui\src\main\res\drawable-hdpi\baseline_lock_open_black_24.png">
<Link>Resources\drawable-hdpi\baseline_lock_open_black_24.png</Link>
</AndroidResource>
<AndroidResource Include="..\ST.Client.Mobile.Droid.Design\ui\src\main\res\drawable-hdpi\baseline_logout_black_24.png">
<Link>Resources\drawable-hdpi\baseline_logout_black_24.png</Link>
</AndroidResource>
<AndroidResource Include="..\ST.Client.Mobile.Droid.Design\ui\src\main\res\drawable-hdpi\baseline_male_black_24.png">
<Link>Resources\drawable-hdpi\baseline_male_black_24.png</Link>
</AndroidResource>
<AndroidResource Include="..\ST.Client.Mobile.Droid.Design\ui\src\main\res\drawable-hdpi\baseline_more_horiz_black_24.png">
<Link>Resources\drawable-hdpi\baseline_more_horiz_black_24.png</Link>
</AndroidResource>
<AndroidResource Include="..\ST.Client.Mobile.Droid.Design\ui\src\main\res\drawable-hdpi\baseline_person_black_24.png">
<Link>Resources\drawable-hdpi\baseline_person_black_24.png</Link>
</AndroidResource>
@@ -377,6 +395,9 @@
<AndroidResource Include="..\ST.Client.Mobile.Droid.Design\ui\src\main\res\drawable-mdpi\baseline_checklist_black_24.png">
<Link>Resources\drawable-mdpi\baseline_checklist_black_24.png</Link>
</AndroidResource>
<AndroidResource Include="..\ST.Client.Mobile.Droid.Design\ui\src\main\res\drawable-mdpi\baseline_check_black_24.png">
<Link>Resources\drawable-mdpi\baseline_check_black_24.png</Link>
</AndroidResource>
<AndroidResource Include="..\ST.Client.Mobile.Droid.Design\ui\src\main\res\drawable-mdpi\baseline_close_black_24.png">
<Link>Resources\drawable-mdpi\baseline_close_black_24.png</Link>
</AndroidResource>
@@ -404,9 +425,15 @@
<AndroidResource Include="..\ST.Client.Mobile.Droid.Design\ui\src\main\res\drawable-mdpi\baseline_lock_open_black_24.png">
<Link>Resources\drawable-mdpi\baseline_lock_open_black_24.png</Link>
</AndroidResource>
<AndroidResource Include="..\ST.Client.Mobile.Droid.Design\ui\src\main\res\drawable-mdpi\baseline_logout_black_24.png">
<Link>Resources\drawable-mdpi\baseline_logout_black_24.png</Link>
</AndroidResource>
<AndroidResource Include="..\ST.Client.Mobile.Droid.Design\ui\src\main\res\drawable-mdpi\baseline_male_black_24.png">
<Link>Resources\drawable-mdpi\baseline_male_black_24.png</Link>
</AndroidResource>
<AndroidResource Include="..\ST.Client.Mobile.Droid.Design\ui\src\main\res\drawable-mdpi\baseline_more_horiz_black_24.png">
<Link>Resources\drawable-mdpi\baseline_more_horiz_black_24.png</Link>
</AndroidResource>
<AndroidResource Include="..\ST.Client.Mobile.Droid.Design\ui\src\main\res\drawable-mdpi\baseline_person_black_24.png">
<Link>Resources\drawable-mdpi\baseline_person_black_24.png</Link>
</AndroidResource>
@@ -452,6 +479,9 @@
<AndroidResource Include="..\ST.Client.Mobile.Droid.Design\ui\src\main\res\drawable-xhdpi\baseline_checklist_black_24.png">
<Link>Resources\drawable-xhdpi\baseline_checklist_black_24.png</Link>
</AndroidResource>
<AndroidResource Include="..\ST.Client.Mobile.Droid.Design\ui\src\main\res\drawable-xhdpi\baseline_check_black_24.png">
<Link>Resources\drawable-xhdpi\baseline_check_black_24.png</Link>
</AndroidResource>
<AndroidResource Include="..\ST.Client.Mobile.Droid.Design\ui\src\main\res\drawable-xhdpi\baseline_close_black_24.png">
<Link>Resources\drawable-xhdpi\baseline_close_black_24.png</Link>
</AndroidResource>
@@ -479,9 +509,15 @@
<AndroidResource Include="..\ST.Client.Mobile.Droid.Design\ui\src\main\res\drawable-xhdpi\baseline_lock_open_black_24.png">
<Link>Resources\drawable-xhdpi\baseline_lock_open_black_24.png</Link>
</AndroidResource>
<AndroidResource Include="..\ST.Client.Mobile.Droid.Design\ui\src\main\res\drawable-xhdpi\baseline_logout_black_24.png">
<Link>Resources\drawable-xhdpi\baseline_logout_black_24.png</Link>
</AndroidResource>
<AndroidResource Include="..\ST.Client.Mobile.Droid.Design\ui\src\main\res\drawable-xhdpi\baseline_male_black_24.png">
<Link>Resources\drawable-xhdpi\baseline_male_black_24.png</Link>
</AndroidResource>
<AndroidResource Include="..\ST.Client.Mobile.Droid.Design\ui\src\main\res\drawable-xhdpi\baseline_more_horiz_black_24.png">
<Link>Resources\drawable-xhdpi\baseline_more_horiz_black_24.png</Link>
</AndroidResource>
<AndroidResource Include="..\ST.Client.Mobile.Droid.Design\ui\src\main\res\drawable-xhdpi\baseline_person_black_24.png">
<Link>Resources\drawable-xhdpi\baseline_person_black_24.png</Link>
</AndroidResource>
@@ -527,6 +563,9 @@
<AndroidResource Include="..\ST.Client.Mobile.Droid.Design\ui\src\main\res\drawable-xxhdpi\baseline_checklist_black_24.png">
<Link>Resources\drawable-xxhdpi\baseline_checklist_black_24.png</Link>
</AndroidResource>
<AndroidResource Include="..\ST.Client.Mobile.Droid.Design\ui\src\main\res\drawable-xxhdpi\baseline_check_black_24.png">
<Link>Resources\drawable-xxhdpi\baseline_check_black_24.png</Link>
</AndroidResource>
<AndroidResource Include="..\ST.Client.Mobile.Droid.Design\ui\src\main\res\drawable-xxhdpi\baseline_close_black_24.png">
<Link>Resources\drawable-xxhdpi\baseline_close_black_24.png</Link>
</AndroidResource>
@@ -554,9 +593,15 @@
<AndroidResource Include="..\ST.Client.Mobile.Droid.Design\ui\src\main\res\drawable-xxhdpi\baseline_lock_open_black_24.png">
<Link>Resources\drawable-xxhdpi\baseline_lock_open_black_24.png</Link>
</AndroidResource>
<AndroidResource Include="..\ST.Client.Mobile.Droid.Design\ui\src\main\res\drawable-xxhdpi\baseline_logout_black_24.png">
<Link>Resources\drawable-xxhdpi\baseline_logout_black_24.png</Link>
</AndroidResource>
<AndroidResource Include="..\ST.Client.Mobile.Droid.Design\ui\src\main\res\drawable-xxhdpi\baseline_male_black_24.png">
<Link>Resources\drawable-xxhdpi\baseline_male_black_24.png</Link>
</AndroidResource>
<AndroidResource Include="..\ST.Client.Mobile.Droid.Design\ui\src\main\res\drawable-xxhdpi\baseline_more_horiz_black_24.png">
<Link>Resources\drawable-xxhdpi\baseline_more_horiz_black_24.png</Link>
</AndroidResource>
<AndroidResource Include="..\ST.Client.Mobile.Droid.Design\ui\src\main\res\drawable-xxhdpi\baseline_person_black_24.png">
<Link>Resources\drawable-xxhdpi\baseline_person_black_24.png</Link>
</AndroidResource>
@@ -608,6 +653,9 @@
<AndroidResource Include="..\ST.Client.Mobile.Droid.Design\ui\src\main\res\drawable-xxxhdpi\baseline_checklist_black_24.png">
<Link>Resources\drawable-xxxhdpi\baseline_checklist_black_24.png</Link>
</AndroidResource>
<AndroidResource Include="..\ST.Client.Mobile.Droid.Design\ui\src\main\res\drawable-xxxhdpi\baseline_check_black_24.png">
<Link>Resources\drawable-xxxhdpi\baseline_check_black_24.png</Link>
</AndroidResource>
<AndroidResource Include="..\ST.Client.Mobile.Droid.Design\ui\src\main\res\drawable-xxxhdpi\baseline_close_black_24.png">
<Link>Resources\drawable-xxxhdpi\baseline_close_black_24.png</Link>
</AndroidResource>
@@ -635,9 +683,15 @@
<AndroidResource Include="..\ST.Client.Mobile.Droid.Design\ui\src\main\res\drawable-xxxhdpi\baseline_lock_open_black_24.png">
<Link>Resources\drawable-xxxhdpi\baseline_lock_open_black_24.png</Link>
</AndroidResource>
<AndroidResource Include="..\ST.Client.Mobile.Droid.Design\ui\src\main\res\drawable-xxxhdpi\baseline_logout_black_24.png">
<Link>Resources\drawable-xxxhdpi\baseline_logout_black_24.png</Link>
</AndroidResource>
<AndroidResource Include="..\ST.Client.Mobile.Droid.Design\ui\src\main\res\drawable-xxxhdpi\baseline_male_black_24.png">
<Link>Resources\drawable-xxxhdpi\baseline_male_black_24.png</Link>
</AndroidResource>
<AndroidResource Include="..\ST.Client.Mobile.Droid.Design\ui\src\main\res\drawable-xxxhdpi\baseline_more_horiz_black_24.png">
<Link>Resources\drawable-xxxhdpi\baseline_more_horiz_black_24.png</Link>
</AndroidResource>
<AndroidResource Include="..\ST.Client.Mobile.Droid.Design\ui\src\main\res\drawable-xxxhdpi\baseline_person_black_24.png">
<Link>Resources\drawable-xxxhdpi\baseline_person_black_24.png</Link>
</AndroidResource>
@@ -884,3 +938,4 @@
src/ST.Client.Mobile.Droid/UI/Activities/LocalAuthPage/SteamAuthTradeActivity.cs
+3 -3
View File
@@ -94,10 +94,10 @@ namespace System.Application.UI.Activities
static int ToIconRes(ActionItem action) => action switch
{
ActionItem.ConfirmAll => Resource.Drawable.baseline_add_black_24,
ActionItem.CancelAll => Resource.Drawable.baseline_enhanced_encryption_black_24,
ActionItem.ConfirmAll => Resource.Drawable.baseline_check_black_24,
ActionItem.CancelAll => Resource.Drawable.baseline_close_black_24,
ActionItem.Refresh => Resource.Drawable.baseline_refresh_black_24,
ActionItem.Logout => Resource.Drawable.baseline_save_alt_black_24,
ActionItem.Logout => Resource.Drawable.baseline_logout_black_24,
_ => throw new ArgumentOutOfRangeException(nameof(action), action, null),
};
src/ST.Client.Mobile.Droid/UI/ImageLoader.cs
+6 -5
View File
@@ -1,5 +1,6 @@
using Android.Content;
using Android.Graphics;
using Android.Graphics.Drawables;
using Android.Widget;
using Square.Picasso;
using System.Application.Services;
@@ -68,25 +69,25 @@ namespace System.Application.UI
}
try
{
var requestCreator = Picasso.Load(requestUri);
var requestCreator = Picasso.Load(requestUri).Placeholder(new ColorDrawable(new((imageView.Context ?? Android.App.Application.Context).GetColorCompat(Resource.Color.grey_background))));
var useCenterCropDefault = false;
if (targetSize > 0)
{
requestCreator.Resize(targetSize, targetSize);
requestCreator = requestCreator.Resize(targetSize, targetSize);
useCenterCropDefault = true;
}
else if (targetResId > 0)
{
requestCreator.ResizeDimen(targetResId, targetResId);
requestCreator = requestCreator.ResizeDimen(targetResId, targetResId);
useCenterCropDefault = true;
}
if (scaleType == ScaleType.CenterCrop || (useCenterCropDefault && scaleType == default))
{
requestCreator.CenterCrop();
requestCreator = requestCreator.CenterCrop();
}
else if (scaleType == ScaleType.CenterInside)
{
requestCreator.CenterInside();
requestCreator = requestCreator.CenterInside();
}
requestCreator.Into(imageView);
}