Adjust namespace

nearby-sharing · Jan 6, 2025 · e1c9934 · e1c9934
1 parent 7891563
commit e1c9934
Show file tree

Hide file tree

Showing 19 changed files with 36 additions and 31 deletions.
diff --git a/NearShare.sln b/NearShare.sln
@@ -3,7 +3,7 @@ Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio Version 17
 VisualStudioVersion = 17.1.32421.90
 MinimumVisualStudioVersion = 10.0.40219.1
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NearShare.Droid", "src\NearShare.Droid.csproj", "{081AC55E-14D3-42A9-A742-29818E649650}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "NearShare.Android", "src\NearShare.Android.csproj", "{081AC55E-14D3-42A9-A742-29818E649650}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ShortDev.Microsoft.ConnectedDevices", "lib\ShortDev.Microsoft.ConnectedDevices\ShortDev.Microsoft.ConnectedDevices.csproj", "{6EBE41DB-AEFB-45C0-A5E1-8A4352CC4B8E}"
 EndProject
@@ -17,10 +17,6 @@ EndProject
 Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "CdpSvcUtil", "utils\CdpSvcUtil\CdpSvcUtil.vcxproj", "{CFABE26A-FBFF-4CF9-8C94-B603B317A223}"
 EndProject
 Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "tests", "tests", "{F0E5B489-0FD2-4A7E-B660-C28450479583}"
-	ProjectSection(SolutionItems) = preProject
-		dockerfile.test = dockerfile.test
-		testenvironments.json = testenvironments.json
-	EndProjectSection
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ShortDev.Microsoft.ConnectedDevices.Test", "tests\ShortDev.Microsoft.ConnectedDevices.Test\ShortDev.Microsoft.ConnectedDevices.Test.csproj", "{B0DE3385-5FD7-4D05-8296-6E298A3F1BA2}"
 EndProject

diff --git a/src/App.cs b/src/App.cs
@@ -1,7 +1,7 @@
 using Android.Runtime;
 using AndroidX.AppCompat.App;
 using Google.Android.Material.Color;
-using NearShare.Droid.Settings;
+using NearShare.Settings;
 
 [assembly: UsesPermission(ManifestPermission.Bluetooth)]
 [assembly: UsesPermission(ManifestPermission.BluetoothAdmin)]
@@ -22,12 +22,12 @@
 [assembly: UsesFeature("android.hardware.bluetooth", Required = false)]
 [assembly: UsesFeature("android.hardware.bluetooth_le", Required = false)]
 
-namespace NearShare.Droid;
+namespace NearShare;
 
 [Application]
 public sealed class App : Application
 {
-    public App(IntPtr javaReference, JniHandleOwnership transfer) : base(javaReference, transfer)
+    public App(nint javaReference, JniHandleOwnership transfer) : base(javaReference, transfer)
     {
         SentrySdk.Init(options =>
         {

diff --git a/src/AndroidBluetoothHandler.cs → src/Handlers/AndroidBluetoothHandler.cs b/src/AndroidBluetoothHandler.cs → src/Handlers/AndroidBluetoothHandler.cs
@@ -7,7 +7,7 @@
 using System.Net.NetworkInformation;
 using ShortDev.Microsoft.ConnectedDevices.Transports.Bluetooth;
 
-namespace NearShare.Droid;
+namespace NearShare.Handlers;
 
 public sealed class AndroidBluetoothHandler(BluetoothAdapter adapter, PhysicalAddress macAddress) : IBluetoothHandler
 {

diff --git a/src/AndroidNetworkHandler.cs → src/Handlers/AndroidNetworkHandler.cs b/src/AndroidNetworkHandler.cs → src/Handlers/AndroidNetworkHandler.cs
@@ -4,7 +4,7 @@
 using ShortDev.Microsoft.ConnectedDevices.Transports.Network;
 using System.Net;
 
-namespace NearShare.Droid;
+namespace NearShare.Handlers;
 
 internal sealed class AndroidNetworkHandler(Context context) : INetworkHandler
 {

diff --git a/src/MainActivity.cs b/src/MainActivity.cs
@@ -8,8 +8,9 @@
 using Google.Android.Material.Card;
 using Google.Android.Material.Dialog;
 using Google.Android.Material.TextField;
+using NearShare.Utils;
 
-namespace NearShare.Droid;
+namespace NearShare;
 
 [Activity(Label = "@string/app_name", Theme = "@style/AppTheme", MainLauncher = true, ConfigurationChanges = UIHelper.ConfigChangesFlags)]
 public sealed class MainActivity : AppCompatActivity
@@ -42,7 +43,7 @@ private void ReceiveButton_Click(object? sender, EventArgs e)
     }
 
     const int FilePickCode = 0x1;
-    private void SendButton_Click(object? sender, System.EventArgs e)
+    private void SendButton_Click(object? sender, EventArgs e)
     {
         StartActivityForResult(
             new Intent(Intent.ActionOpenDocument)

diff --git a/src/NearShare.Droid.csproj → src/NearShare.Android.csproj b/src/NearShare.Droid.csproj → src/NearShare.Android.csproj
@@ -9,6 +9,9 @@
 		<UseAndroidCrypto>true</UseAndroidCrypto>
 		<AndroidErrorOnCustomJavaObject>false</AndroidErrorOnCustomJavaObject>
 	</PropertyGroup>
+	<PropertyGroup>
+		<RootNamespace>NearShare</RootNamespace>
+	</PropertyGroup>
 	<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
 		<RunAOTCompilation>False</RunAOTCompilation>
 		<PublishTrimmed>false</PublishTrimmed>

diff --git a/src/QuickSettings/ReceiveTileService.cs b/src/QuickSettings/ReceiveTileService.cs
@@ -1,7 +1,7 @@
 using Android.Content;
 using Android.Service.QuickSettings;
 
-namespace NearShare.Droid.QuickSettings;
+namespace NearShare.QuickSettings;
 
 [IntentFilter([ActionQsTile])]
 [Service(Label = "Receive", Exported = true, Icon = "@drawable/quick_settings_tile_icon", Permission = "android.permission.BIND_QUICK_SETTINGS_TILE")]

diff --git a/src/ReceiveActivity.cs b/src/ReceiveActivity.cs
@@ -8,7 +8,8 @@
 using Google.Android.Material.Dialog;
 using Google.Android.Material.ProgressIndicator;
 using Microsoft.Extensions.Logging;
-using NearShare.Droid.Utils;
+using NearShare.Droid;
+using NearShare.Utils;
 using ShortDev.Android.UI;
 using ShortDev.Microsoft.ConnectedDevices;
 using ShortDev.Microsoft.ConnectedDevices.NearShare;
@@ -18,7 +19,7 @@
 using System.Net.NetworkInformation;
 using SystemDebug = System.Diagnostics.Debug;
 
-namespace NearShare.Droid;
+namespace NearShare;
 
 [Activity(Label = "@string/app_name", Theme = "@style/AppTheme", ConfigurationChanges = UIHelper.ConfigChangesFlags)]
 public sealed class ReceiveActivity : AppCompatActivity

diff --git a/src/ReceiveSetupActivity.cs b/src/ReceiveSetupActivity.cs
@@ -3,11 +3,12 @@
 using Android.Views;
 using AndroidX.AppCompat.App;
 using Google.Android.Material.TextField;
+using NearShare.Utils;
 using ShortDev.Microsoft.ConnectedDevices;
 using System.Diagnostics.CodeAnalysis;
 using System.Net.NetworkInformation;
 
-namespace NearShare.Droid;
+namespace NearShare;
 
 [Activity(Label = "@string/app_name", Theme = "@style/AppTheme", ConfigurationChanges = UIHelper.ConfigChangesFlags)]
 public sealed class ReceiveSetupActivity : AppCompatActivity

diff --git a/src/SendActivity.cs b/src/SendActivity.cs
@@ -10,15 +10,16 @@
 using Google.Android.Material.Color;
 using Google.Android.Material.ProgressIndicator;
 using Microsoft.Extensions.Logging;
-using NearShare.Droid.Utils;
+using NearShare.Droid;
+using NearShare.Utils;
 using ShortDev.Android.UI;
 using ShortDev.Microsoft.ConnectedDevices;
 using ShortDev.Microsoft.ConnectedDevices.NearShare;
 using ShortDev.Microsoft.ConnectedDevices.Transports;
 using System.Collections.ObjectModel;
 using OperationCanceledException = System.OperationCanceledException;
 
-namespace NearShare.Droid;
+namespace NearShare;
 
 [IntentFilter([Intent.ActionProcessText], Categories = [Intent.CategoryDefault, Intent.CategoryBrowsable], DataMimeType = "text/plain", Label = "@string/app_name")]
 [IntentFilter([Intent.ActionSend, Intent.ActionSendMultiple], Categories = [Intent.CategoryDefault, Intent.CategoryBrowsable], DataMimeType = "*/*")]

diff --git a/src/Settings/ISettingsNavigation.cs b/src/Settings/ISettingsNavigation.cs
@@ -1,4 +1,4 @@
-namespace NearShare.Droid.Settings;
+namespace NearShare.Settings;
 
 internal interface ISettingsNavigation
 {

diff --git a/src/Settings/SettingsActivity.cs b/src/Settings/SettingsActivity.cs
@@ -5,8 +5,9 @@
 using AndroidX.Activity;
 using AndroidX.AppCompat.App;
 using AndroidX.Preference;
+using NearShare.Utils;
 
-namespace NearShare.Droid.Settings;
+namespace NearShare.Settings;
 
 [IntentFilter([TileService.ActionQsTilePreferences])]
 [Activity(Label = "@string/app_name", Exported = true, Theme = "@style/AppTheme", ConfigurationChanges = UIHelper.ConfigChangesFlags)]

diff --git a/src/Settings/SettingsFragment.cs b/src/Settings/SettingsFragment.cs
@@ -4,7 +4,7 @@
 using AndroidX.Preference;
 using Google.Android.Material.Theme.Overlay;
 
-namespace NearShare.Droid.Settings;
+namespace NearShare.Settings;
 
 internal abstract class SettingsFragment : PreferenceFragmentCompat
 {

diff --git a/src/Layout/BottomSheetBehaviorCallback.cs → src/Utils/BottomSheetBehaviorCallback.cs b/src/Layout/BottomSheetBehaviorCallback.cs → src/Utils/BottomSheetBehaviorCallback.cs
@@ -1,7 +1,7 @@
 using Android.Views;
 using Google.Android.Material.BottomSheet;
 
-namespace NearShare.Droid.Layout;
+namespace NearShare.Utils;
 
 public class BottomSheetBehaviorCallback(Activity activity) : BottomSheetBehavior.BottomSheetCallback
 {

diff --git a/src/Utils/CdpUtils.cs b/src/Utils/CdpUtils.cs
@@ -2,14 +2,15 @@
 using Android.Content;
 using Android.OS;
 using Microsoft.Extensions.Logging;
-using NearShare.Droid.Settings;
+using NearShare.Handlers;
+using NearShare.Settings;
 using ShortDev.Microsoft.ConnectedDevices;
 using ShortDev.Microsoft.ConnectedDevices.Encryption;
 using ShortDev.Microsoft.ConnectedDevices.Transports.Bluetooth;
 using ShortDev.Microsoft.ConnectedDevices.Transports.Network;
 using System.Net.NetworkInformation;
 
-namespace NearShare.Droid.Utils;
+namespace NearShare.Utils;
 
 internal static class CdpUtils
 {

diff --git a/src/Utils/EdgeToEdgeExtensions.cs b/src/Utils/EdgeToEdgeExtensions.cs
@@ -1,7 +1,7 @@
 using Android.Graphics;
 using AndroidX.Activity;
 
-namespace NearShare.Droid.Utils;
+namespace NearShare.Utils;
 
 internal static class EdgeToEdgeExtensions
 {

diff --git a/src/FileUtils.cs → src/Utils/FileUtils.cs b/src/FileUtils.cs → src/Utils/FileUtils.cs
@@ -3,7 +3,7 @@
 using Microsoft.Win32.SafeHandles;
 using ShortDev.Microsoft.ConnectedDevices.NearShare;
 
-namespace NearShare.Droid;
+namespace NearShare.Utils;
 
 internal static class FileUtils
 {
@@ -50,7 +50,7 @@ public static (AndroidUri uri, FileStream stream) CreateMediaStoreStream(this Co
     public static FileStream OpenFileStream(this ContentResolver resolver, AndroidUri mediaUri)
     {
         using var fileDescriptor = resolver.OpenFileDescriptor(mediaUri, "rwt") ?? throw new InvalidOperationException("Could not open file descriptor");
-        
+
         SafeFileHandle handle = new(fileDescriptor.DetachFd(), ownsHandle: true);
         return new(handle, FileAccess.ReadWrite);
     }

diff --git a/src/Compat.cs → src/Utils/IntentExtensions.cs b/src/Compat.cs → src/Utils/IntentExtensions.cs
@@ -2,9 +2,9 @@
 using Java.Lang;
 using System.Collections;
 
-namespace NearShare.Droid;
+namespace NearShare.Utils;
 
-internal static class Compat
+internal static class IntentExtensions
 {
     public static IList<T>? GetParcelableArrayListExtra<T>(this Intent @this, string? name) where T : Java.Lang.Object
     {

diff --git a/src/UIHelper.cs → src/Utils/UIHelper.cs b/src/UIHelper.cs → src/Utils/UIHelper.cs
@@ -9,12 +9,12 @@
 using AndroidX.Browser.CustomTabs;
 using AndroidX.Core.App;
 using Google.Android.Material.Dialog;
-using NearShare.Droid.Settings;
+using NearShare.Settings;
 using System.Runtime.Versioning;
 using AlertDialog = AndroidX.AppCompat.App.AlertDialog;
 using CompatToolbar = AndroidX.AppCompat.Widget.Toolbar;
 
-namespace NearShare.Droid;
+namespace NearShare.Utils;
 
 internal static class UIHelper
 {