diff --git a/.gitignore b/.gitignore
index b6350ffeac..31d0a2de5e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -15,3 +15,4 @@ bin
*.tree
*.zip
.idea
+.DS_Store
diff --git a/samples/ImapClientDemo.Android/ImapClientDemo.Android.sln b/samples/ImapClientDemo.Android/ImapClientDemo.Android.sln
index ffed0bb755..0f29f2ed59 100644
--- a/samples/ImapClientDemo.Android/ImapClientDemo.Android.sln
+++ b/samples/ImapClientDemo.Android/ImapClientDemo.Android.sln
@@ -1,26 +1,22 @@
Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio Version 16
-VisualStudioVersion = 16.0.29926.136
+# Visual Studio Version 17
+VisualStudioVersion = 17.0.31903.59
MinimumVisualStudioVersion = 10.0.40219.1
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImapClientDemo.Android", "ImapClientDemo.Android\ImapClientDemo.Android.csproj", "{E24B6562-C9B2-4190-A43C-116FA52AACE5}"
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ImapClientDemo.Android", "ImapClientDemo.Android\ImapClientDemo.Android.csproj", "{9E3D80A0-B988-4BA8-9327-3CD7BE5852DF}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Release|Any CPU = Release|Any CPU
EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {E24B6562-C9B2-4190-A43C-116FA52AACE5}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {E24B6562-C9B2-4190-A43C-116FA52AACE5}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {E24B6562-C9B2-4190-A43C-116FA52AACE5}.Debug|Any CPU.Deploy.0 = Debug|Any CPU
- {E24B6562-C9B2-4190-A43C-116FA52AACE5}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {E24B6562-C9B2-4190-A43C-116FA52AACE5}.Release|Any CPU.Build.0 = Release|Any CPU
- EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
EndGlobalSection
- GlobalSection(ExtensibilityGlobals) = postSolution
- SolutionGuid = {AD43C050-ACBB-4A31-A155-C71AFC1D5AE2}
+ GlobalSection(ProjectConfigurationPlatforms) = postSolution
+ {9E3D80A0-B988-4BA8-9327-3CD7BE5852DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {9E3D80A0-B988-4BA8-9327-3CD7BE5852DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {9E3D80A0-B988-4BA8-9327-3CD7BE5852DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {9E3D80A0-B988-4BA8-9327-3CD7BE5852DF}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
EndGlobal
diff --git a/samples/ImapClientDemo.Android/ImapClientDemo.Android/AndroidManifest.xml b/samples/ImapClientDemo.Android/ImapClientDemo.Android/AndroidManifest.xml
new file mode 100644
index 0000000000..3fead98ca0
--- /dev/null
+++ b/samples/ImapClientDemo.Android/ImapClientDemo.Android/AndroidManifest.xml
@@ -0,0 +1,6 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/samples/ImapClientDemo.Android/ImapClientDemo.Android/Assets/AboutAssets.txt b/samples/ImapClientDemo.Android/ImapClientDemo.Android/Assets/AboutAssets.txt
deleted file mode 100644
index a9b0638eb1..0000000000
--- a/samples/ImapClientDemo.Android/ImapClientDemo.Android/Assets/AboutAssets.txt
+++ /dev/null
@@ -1,19 +0,0 @@
-Any raw assets you want to be deployed with your application can be placed in
-this directory (and child directories) and given a Build Action of "AndroidAsset".
-
-These files will be deployed with your package and will be accessible using Android's
-AssetManager, like this:
-
-public class ReadAsset : Activity
-{
- protected override void OnCreate (Bundle bundle)
- {
- base.OnCreate (bundle);
-
- InputStream input = Assets.Open ("my_asset.txt");
- }
-}
-
-Additionally, some Android functions will automatically load asset files:
-
-Typeface tf = Typeface.CreateFromAsset (Context.Assets, "fonts/samplefont.ttf");
diff --git a/samples/ImapClientDemo.Android/ImapClientDemo.Android/FoldersActivity.cs b/samples/ImapClientDemo.Android/ImapClientDemo.Android/FoldersActivity.cs
index 6fbad67c74..88c8c37aa5 100644
--- a/samples/ImapClientDemo.Android/ImapClientDemo.Android/FoldersActivity.cs
+++ b/samples/ImapClientDemo.Android/ImapClientDemo.Android/FoldersActivity.cs
@@ -49,9 +49,9 @@ protected async override void OnCreate (Bundle bundle)
Console.WriteLine ("FoldersCreated!");
- SetContentView (Resource.Layout.FoldersLayout);
+ SetContentView (ImapClientDemo.Android.Resource.Layout.FoldersLayout);
- listView = FindViewById (Resource.Id.listView);
+ listView = FindViewById (ImapClientDemo.Android.Resource.Id.listView);
adapter = new FoldersAdapter (this);
@@ -120,11 +120,11 @@ public override IMailFolder this [int index] {
public override View GetView (int position, View convertView, ViewGroup parent)
{
- var view = convertView ?? LayoutInflater.FromContext (Parent).Inflate (Android.Resource.Layout.SimpleListItem1, parent, false);
+ var view = convertView ?? LayoutInflater.FromContext (Parent).Inflate (global::Android.Resource.Layout.SimpleListItem1, parent, false);
var folder = Folders[position];
- view.FindViewById (Android.Resource.Id.Text1).Text = folder.FullName;
+ view.FindViewById (global::Android.Resource.Id.Text1).Text = folder.FullName;
return view;
}
diff --git a/samples/ImapClientDemo.Android/ImapClientDemo.Android/ImapClientDemo.Android.csproj b/samples/ImapClientDemo.Android/ImapClientDemo.Android/ImapClientDemo.Android.csproj
index 7037a4302b..9edf18aca2 100644
--- a/samples/ImapClientDemo.Android/ImapClientDemo.Android/ImapClientDemo.Android.csproj
+++ b/samples/ImapClientDemo.Android/ImapClientDemo.Android/ImapClientDemo.Android.csproj
@@ -1,85 +1,15 @@
-
-
-
- Debug
- AnyCPU
- {EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- {E24B6562-C9B2-4190-A43C-116FA52AACE5}
- Library
- ImapClientDemo
- Assets
- Resources
- Resource
- Resources\Resource.designer.cs
- True
- ImapClientDemo.Android
- Properties\AndroidManifest.xml
- v12.1
-
-
- portable
- false
- bin\Debug
- DEBUG;
- prompt
- 4
- None
- false
- False
- true
- armeabi-v7a;x86;x86_64
-
-
- portable
- true
- bin\Release
- prompt
- 4
- false
- false
- armeabi-v7a;x86;x86_64
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+ net8.0-android
+ 21
+ Exe
+ enable
+ enable
+ com.companyname.ImapClientDemo.Android
+ 1
+ 1.0
+
+
+
+
\ No newline at end of file
diff --git a/samples/ImapClientDemo.Android/ImapClientDemo.Android/LoginActivity.cs b/samples/ImapClientDemo.Android/ImapClientDemo.Android/LoginActivity.cs
index 313e0561f6..f676f8851c 100644
--- a/samples/ImapClientDemo.Android/ImapClientDemo.Android/LoginActivity.cs
+++ b/samples/ImapClientDemo.Android/ImapClientDemo.Android/LoginActivity.cs
@@ -46,14 +46,14 @@ protected override void OnCreate (Bundle bundle)
{
base.OnCreate (bundle);
- SetContentView (Resource.Layout.LoginLayout);
+ SetContentView (ImapClientDemo.Android.Resource.Layout.LoginLayout);
- textServer = FindViewById (Resource.Id.textServer);
- textPort = FindViewById (Resource.Id.textPort);
- textLogin = FindViewById (Resource.Id.textLogin);
- textPassword = FindViewById (Resource.Id.textPassword);
- checkSsl = FindViewById (Resource.Id.checkSsl);
- buttonLogin = FindViewById