diff --git a/src/ST.Client.Android/ST.Client.Android.csproj b/src/ST.Client.Android/ST.Client.Android.csproj
index 41e3e4e3b..036092b3b 100644
--- a/src/ST.Client.Android/ST.Client.Android.csproj
+++ b/src/ST.Client.Android/ST.Client.Android.csproj
@@ -1016,6 +1016,9 @@
Resources\drawable-xxxhdpi\splash_logo.png
+
+ Resources\layout\activity_about_not_binding.xml
+
Resources\layout\activity_barcode_scanner.xml
@@ -1037,6 +1040,9 @@
Resources\layout\activity_main.xml
+
+ Resources\layout\activity_settings_not_binding.xml
+
Resources\layout\activity_steam_auth_data.xml
@@ -1115,12 +1121,6 @@
Resources\layout\fragment_settings.xml
-
- Resources\layout\layout_activity_about.xml
-
-
- Resources\layout\layout_activity_settings.xml
-
Resources\layout\layout_card_gap_authenticator.xml
@@ -1276,3 +1276,7 @@
+
+
+
+
diff --git a/src/ST.Client.Android/UI/Activities/LocalAuthPage/SteamAuthTradeActivity.cs b/src/ST.Client.Android/UI/Activities/LocalAuthPage/SteamAuthTradeActivity.cs
index 350c6b44f..56f65b587 100644
--- a/src/ST.Client.Android/UI/Activities/LocalAuthPage/SteamAuthTradeActivity.cs
+++ b/src/ST.Client.Android/UI/Activities/LocalAuthPage/SteamAuthTradeActivity.cs
@@ -35,7 +35,7 @@ namespace System.Application.UI.Activities
[Register(JavaPackageConstants.Activities + nameof(MockSteamAuthTradeActivity))]
[Activity(Theme = ManifestConstants.MainTheme2_NoActionBar,
LaunchMode = LaunchMode.SingleTask,
- //MainLauncher = true,
+ MainLauncher = true,
Label = "AuthTrade(Mock)",
ConfigurationChanges = ManifestConstants.ConfigurationChanges)]
internal sealed class MockSteamAuthTradeActivity : BaseSteamAuthTradeActivity
@@ -69,36 +69,42 @@ namespace System.Application.UI.Activities
Details = "出售 - XX Y 号武器箱 （ABCDEFG）",
Traded = "￥x.xx（￥y.yy）",
When = "z 小时以前",
+ Image = "https://img-prod-cms-rt-microsoft-com.akamaized.net/cms/api/am/imageFileData/RE4wHfJ",
},
new()
{
Details = "出售 - XX Y 号武器箱 （ABCDEFG）",
Traded = "￥x.xx（￥y.yy）",
When = "z 小时以前",
+ Image = "https://cn.bing.com/th?id=OHR.AmericanRobin_ZH-CN0667508209_1920x1080.jpg",
},
new()
{
Details = "出售 - XX Y 号武器箱 （ABCDEFG）",
Traded = "￥x.xx（￥y.yy）",
When = "z 小时以前",
+ Image = "https://cn.bing.com/th?id=OHR.ElPanecilloHill_ZH-CN0527709139_1920x1080.jpg",
},
new()
{
Details = "出售 - XX Y 号武器箱 （ABCDEFG）",
Traded = "￥x.xx（￥y.yy）",
When = "z 小时以前",
+ Image = "https://cn.bing.com/th?id=OHR.WickerCultivation_ZH-CN0310713697_1920x1080.jpg",
},
new()
{
Details = "出售 - XX Y 号武器箱 （ABCDEFG）",
Traded = "￥x.xx（￥y.yy）",
When = "z 小时以前",
+ Image = "https://cn.bing.com/th?id=OHR.ShadowEverest_ZH-CN9951649290_1920x1080.jpg",
},
new()
{
Details = "出售 - XX Y 号武器箱 （ABCDEFG）",
Traded = "￥x.xx（￥y.yy）",
When = "z 小时以前",
+ Image = "https://cn.bing.com/th?id=OHR.FoxDovrefjell_ZH-CN9554491452_1920x1080.jpg",
},
});
return vm;
diff --git a/src/ST.Client.Android/UI/Controllers/AboutController.cs b/src/ST.Client.Android/UI/Controllers/AboutController.cs
index 5e360fd4a..bf31e831f 100644
--- a/src/ST.Client.Android/UI/Controllers/AboutController.cs
+++ b/src/ST.Client.Android/UI/Controllers/AboutController.cs
@@ -276,10 +276,12 @@ namespace System.Application.UI.Controllers
namespace System.Application.UI.Fragments
{
+#if __XAMARIN_FORMS__
internal sealed class AboutFragment : BaseMvcFragment
{
protected override int? LayoutResource => Resource.Layout.fragment_about;
}
+#endif
}
namespace System.Application.UI.Activities
@@ -290,6 +292,6 @@ namespace System.Application.UI.Activities
ConfigurationChanges = ManifestConstants.ConfigurationChanges)]
internal sealed class AboutActivity : BaseMvcActivity
{
- protected override int? LayoutResource => Resource.Layout.layout_activity_about;
+ protected override int? LayoutResource => Resource.Layout.activity_about_not_binding;
}
}
\ No newline at end of file
diff --git a/src/ST.Client.Android/UI/Controllers/SettingsController.cs b/src/ST.Client.Android/UI/Controllers/SettingsController.cs
index a633ac5bd..5995c1503 100644
--- a/src/ST.Client.Android/UI/Controllers/SettingsController.cs
+++ b/src/ST.Client.Android/UI/Controllers/SettingsController.cs
@@ -22,6 +22,7 @@ namespace System.Application.UI.Controllers
{
public SettingsController(IHost host, V binding) : base(host, binding)
{
+
}
public override M? OnCreateViewModel() => M.Instance;
@@ -186,10 +187,12 @@ namespace System.Application.UI.Controllers
namespace System.Application.UI.Fragments
{
+#if __XAMARIN_FORMS__
internal sealed class SettingsFragment : BaseMvcFragment
{
protected override int? LayoutResource => Resource.Layout.fragment_settings;
}
+#endif
}
namespace System.Application.UI.Activities
@@ -200,6 +203,6 @@ namespace System.Application.UI.Activities
ConfigurationChanges = ManifestConstants.ConfigurationChanges)]
internal sealed class SettingsActivity : BaseMvcActivity
{
- protected override int? LayoutResource => Resource.Layout.layout_activity_settings;
+ protected override int? LayoutResource => Resource.Layout.activity_settings_not_binding;
}
}
\ No newline at end of file
diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/layout/layout_activity_about.xml b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/layout/activity_about_not_binding.xml
similarity index 100%
rename from src/ST.Client.Mobile.Droid.Design/ui/src/main/res/layout/layout_activity_about.xml
rename to src/ST.Client.Mobile.Droid.Design/ui/src/main/res/layout/activity_about_not_binding.xml
diff --git a/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/layout/layout_activity_settings.xml b/src/ST.Client.Mobile.Droid.Design/ui/src/main/res/layout/activity_settings_not_binding.xml
similarity index 100%
rename from src/ST.Client.Mobile.Droid.Design/ui/src/main/res/layout/layout_activity_settings.xml
rename to src/ST.Client.Mobile.Droid.Design/ui/src/main/res/layout/activity_settings_not_binding.xml
diff --git a/src/ST.Tools.AndroidResourceLink/Program.cs b/src/ST.Tools.AndroidResourceLink/Program.cs
index e585c91d1..1b9900318 100644
--- a/src/ST.Tools.AndroidResourceLink/Program.cs
+++ b/src/ST.Tools.AndroidResourceLink/Program.cs
@@ -30,8 +30,8 @@ foreach (var file in files)
{
var include = Path.GetRelativePath(androidProjPath, file);
var link = Path.GetRelativePath(androidProjPath, resPath);
- link = "Resources" + include.Substring(link.Length, include.Length - link.Length);
- var tag = link.Contains("\\layout") /*&& !link.Contains("\\shared_") && !link.Contains("_content.xml")*/ ? "AndroidBoundLayout" : "AndroidResource";
+ link = "Resources" + include[link.Length..];
+ var tag = link.Contains("\\layout") && /*!link.Contains("\\shared_") && !link.Contains("_content.xml") &&*/ !link.Contains("_not_binding.xml") ? "AndroidBoundLayout" : "AndroidResource";
sb.AppendFormat(" <{1} Include=\"{0}\">", include, tag).AppendLine()
.AppendFormat(" {0}", link).AppendLine()
.AppendFormat(" ", tag).AppendLine();