Skip to content

Commit

Permalink
Restructure
Browse files Browse the repository at this point in the history
  • Loading branch information
trudyhood committed Dec 14, 2024
1 parent 4173d13 commit 974b4a1
Show file tree
Hide file tree
Showing 733 changed files with 751 additions and 727 deletions.
2 changes: 1 addition & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -898,7 +898,7 @@
### Client
* Update: Add client prefix to Bug Report File Name
* Update: Close Bug Report bottom page after sending report
* Update: Separate SPA from VpnHood.Client.App.UI. Make it easier for developers to use custom SPA
* Update: Separate SPA from VpnHood.AppFramework.UI. Make it easier for developers to use custom SPA
* Update: Change Anonymous IP masking from *.*.x.x to "*.x.x.*"
* Update: Diagnose set Last error to "Diagnose has been finished" if there is not other error
* Fix: Dark Icon
Expand Down
56 changes: 28 additions & 28 deletions Pub/PublishApps.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -32,42 +32,42 @@ Remove-Item "$packagesRootDir/ReleaseNote.txt" -ErrorAction Ignore;

# rebuild libraries
if ($nugets) {
& "$solutionDir/VpnHood.Core.Libs/VpnHood.Common/_publish.ps1";
& "$solutionDir/VpnHood.Core.Libs/VpnHood.Tunneling/_publish.ps1";
& "$solutionDir/VpnHood.Core.Libs/VpnHood.Client/_publish.ps1";
& "$solutionDir/VpnHood.Core.Libs/VpnHood.Client.Device.Android/_publish.ps1";
& "$solutionDir/VpnHood.Core.Libs/VpnHood.Client.Device/_publish.ps1";
& "$solutionDir/VpnHood.Core.Libs/VpnHood.Client.Device.WinDivert/_publish.ps1";
& "$solutionDir/VpnHood.Core.Libs/VpnHood.Server/_publish.ps1";
& "$solutionDir/VpnHood.Core.Libs/VpnHood.Server.Access/_publish.ps1";
& "$solutionDir/VpnHood.Core.Libs/VpnHood.Server.Access.FileAccessManager/_publish.ps1";

& "$solutionDir/VpnHood.Client.App.Libs/VpnHood.Client.App.Abstractions/_publish.ps1";
& "$solutionDir/VpnHood.Client.App.Libs/VpnHood.Client.App/_publish.ps1";
& "$solutionDir/VpnHood.Client.App.Libs/VpnHood.Client.App.Resources/_publish.ps1";
& "$solutionDir/VpnHood.Client.App.Libs/VpnHood.Client.App.WebServer/_publish.ps1";
& "$solutionDir/VpnHood.Client.App.Libs/VpnHood.Client.App.Store/_publish.ps1";
& "$solutionDir/VpnHood.Client.App.Libs/VpnHood.Client.App.Android.Common/_publish.ps1";
& "$solutionDir/VpnHood.Client.App.Libs/VpnHood.Client.App.Android.GooglePlay/_publish.ps1";
& "$solutionDir/VpnHood.Client.App.Libs/VpnHood.Client.App.Android.GooglePlay.Core/_publish.ps1";
& "$solutionDir/VpnHood.Client.App.Libs/VpnHood.Client.App.Android.Ads.AdMob/_publish.ps1";
& "$solutionDir/VpnHood.Client.App.Libs/VpnHood.Client.App.Win.Common/_publish.ps1";
& "$solutionDir/VpnHood.Client.App.Libs/VpnHood.Client.App.Win.Common.WpfSpa/_publish.ps1";
& "$solutionDir/Core/VpnHood.Common/_publish.ps1";
& "$solutionDir/Core/VpnHood.Tunneling/_publish.ps1";
& "$solutionDir/Core/VpnHood.Client/_publish.ps1";
& "$solutionDir/Core/VpnHood.Client.Device.Android/_publish.ps1";
& "$solutionDir/Core/VpnHood.Client.Device/_publish.ps1";
& "$solutionDir/Core/VpnHood.Client.Device.WinDivert/_publish.ps1";
& "$solutionDir/Core/VpnHood.Server/_publish.ps1";
& "$solutionDir/Core/VpnHood.Server.Access/_publish.ps1";
& "$solutionDir/Core/VpnHood.Server.Access.FileAccessManager/_publish.ps1";

& "$solutionDir/AppFramework/VpnHood.AppFramework.Abstractions/_publish.ps1";
& "$solutionDir/AppFramework/VpnHood.AppFramework/_publish.ps1";
& "$solutionDir/AppFramework/VpnHood.AppFramework.Resources/_publish.ps1";
& "$solutionDir/AppFramework/VpnHood.AppFramework.WebServer/_publish.ps1";
& "$solutionDir/AppFramework/VpnHood.AppFramework.Store/_publish.ps1";
& "$solutionDir/AppFramework/VpnHood.AppFramework.Android.Common/_publish.ps1";
& "$solutionDir/AppFramework/VpnHood.AppFramework.Android.GooglePlay/_publish.ps1";
& "$solutionDir/AppFramework/VpnHood.AppFramework.Android.GooglePlay.Core/_publish.ps1";
& "$solutionDir/AppFramework/VpnHood.AppFramework.Android.Ads.AdMob/_publish.ps1";
& "$solutionDir/AppFramework/VpnHood.AppFramework.Win.Common/_publish.ps1";
& "$solutionDir/AppFramework/VpnHood.AppFramework.Win.Common.WpfSpa/_publish.ps1";
}

# publish MAUI nugets
if ($maui) {
& "$solutionDir/VpnHood.Client.App.Libs/VpnHood.Client.App.Maui.Common/_publish.ps1";
& "$solutionDir/AppFramework/VpnHood.AppFramework.Maui.Common/_publish.ps1";
}

# publish win client
if ($clientWin) {
& "$solutionDir/VpnHood.Apps/VpnHood.Client.App.Win.Client/_publish.ps1";
& "$solutionDir/VpnHood.Apps/VpnHood.AppFramework.Win.Client/_publish.ps1";
}

# publish win client
if ($connectWin) {
& "$solutionDir/VpnHood.Apps/VpnHood.Client.App.Win.Connect/_publish.ps1";
& "$solutionDir/VpnHood.Apps/VpnHood.AppFramework.Win.Connect/_publish.ps1";
}

# publish server
Expand All @@ -80,14 +80,14 @@ if ($server) {

# publish android
if ($clientAndroid) {
& "$solutionDir/VpnHood.Apps/VpnHood.Client.App.Android.Client.Google/_publish.ps1";
& "$solutionDir/VpnHood.Apps/VpnHood.Client.App.Android.Client.Web/_publish.ps1";
& "$solutionDir/VpnHood.Apps/VpnHood.AppFramework.Android.Client.Google/_publish.ps1";
& "$solutionDir/VpnHood.Apps/VpnHood.AppFramework.Android.Client.Web/_publish.ps1";
}

# publish android
if ($connectAndroid) {
& "$solutionDir/VpnHood.Apps/VpnHood.Client.App.Android.Connect.Google/_publish.ps1";
& "$solutionDir/VpnHood.Apps/VpnHood.Client.App.Android.Connect.Web/_publish.ps1";
& "$solutionDir/VpnHood.Apps/VpnHood.AppFramework.Android.Connect.Google/_publish.ps1";
& "$solutionDir/VpnHood.Apps/VpnHood.AppFramework.Android.Connect.Web/_publish.ps1";
}


Expand Down
2 changes: 1 addition & 1 deletion Pub/PublishToGitHub.ps1
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ if ($connectRepo) {
Write-Host "*** Publish MainRepo releases" -BackgroundColor Blue

# set Connect Variables
$connectRepoDir = Join-Path $vhDir "VpnHood.Client.App.Connect";
$connectRepoDir = Join-Path $vhDir "VpnHood.AppFramework.Connect";
$androidGoogleLatestDir = Join-Path $connectRepoDir "pub/Android.GooglePlay/apk/latest";

# Publishing to GitHub
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace VpnHood.Client.App.Abstractions;
namespace VpnHood.AppFramework.Abstractions;

public class AppAccount
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace VpnHood.Client.App.Abstractions;
namespace VpnHood.AppFramework.Abstractions;

public enum AppAdType
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using System.Text.Json.Serialization;

namespace VpnHood.Client.App.Abstractions;
namespace VpnHood.AppFramework.Abstractions;

//todo: remove
[JsonConverter(typeof(JsonStringEnumConverter))]
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace VpnHood.Client.App.Abstractions;
namespace VpnHood.AppFramework.Abstractions;

public interface IAppAccountProvider
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using VpnHood.Client.Device;

namespace VpnHood.Client.App.Abstractions;
namespace VpnHood.AppFramework.Abstractions;

public interface IAppAdProvider : IDisposable
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using VpnHood.Client.Device;

namespace VpnHood.Client.App.Abstractions;
namespace VpnHood.AppFramework.Abstractions;

public interface IAppAuthenticationExternalProvider : IDisposable
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using VpnHood.Client.Device;

namespace VpnHood.Client.App.Abstractions;
namespace VpnHood.AppFramework.Abstractions;

public interface IAppAuthenticationProvider : IDisposable
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using VpnHood.Client.Device;

namespace VpnHood.Client.App.Abstractions;
namespace VpnHood.AppFramework.Abstractions;

public interface IAppBillingProvider : IDisposable
{
Expand All @@ -9,5 +9,5 @@ public interface IAppBillingProvider : IDisposable
/// <returns>Provider Order Id</returns>
Task<string> Purchase(IUiContext uiContext, string planId);

BillingPurchaseState PurchaseState { get; } // todo: consider removing
BillingPurchaseState PurchaseState { get; }
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace VpnHood.Client.App.Abstractions;
namespace VpnHood.AppFramework.Abstractions;

public interface IAppCultureProvider
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using VpnHood.Client.Device;

namespace VpnHood.Client.App.Abstractions;
namespace VpnHood.AppFramework.Abstractions;

public interface IAppUiProvider
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using VpnHood.Client.Device;

namespace VpnHood.Client.App.Abstractions;
namespace VpnHood.AppFramework.Abstractions;

public interface IAppUpdaterProvider
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace VpnHood.Client.App.Abstractions;
namespace VpnHood.AppFramework.Abstractions;

public class SubscriptionPlan
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@
</PropertyGroup>

<ItemGroup>
<ProjectReference Include="..\..\VpnHood.Core.Libs\VpnHood.Client.Device\VpnHood.Client.Device.csproj" />
<ProjectReference Include="..\..\Core\VpnHood.Client.Device\VpnHood.Client.Device.csproj" />
</ItemGroup>

<ItemGroup>
<None Include="..\..\VpnHood.png" Link="Resources\VpnHood.png">
<None Include="..\..\..\VpnHood.png" Link="Resources\VpnHood.png">
<Pack>True</Pack>
<PackagePath></PackagePath>
</None>
Expand Down
File renamed without changes.
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
using Android.Gms.Ads;
using Android.Gms.Ads.AppOpen;
using VpnHood.Client.App.Abstractions;
using VpnHood.Client.App.Droid.Ads.VhAdMob.AdNetworkCallBackFix;
using VpnHood.Client.App.Exceptions;
using VpnHood.AppFramework.Abstractions;
using VpnHood.AppFramework.Exceptions;
using VpnHood.AppFramework.Droid.Ads.VhAdMob.AdNetworkCallBackFix;
using VpnHood.Client.Device;
using VpnHood.Client.Device.Droid;
using VpnHood.Client.Device.Droid.Utils;
using VpnHood.Common.Exceptions;

namespace VpnHood.Client.App.Droid.Ads.VhAdMob;
namespace VpnHood.AppFramework.Droid.Ads.VhAdMob;

public class AdMobAppOpenAdProvider(string adUnitId) : IAppAdProvider
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
using Android.Gms.Ads;
using Android.Gms.Ads.Interstitial;
using VpnHood.Client.App.Abstractions;
using VpnHood.Client.App.Exceptions;
using VpnHood.AppFramework.Abstractions;
using VpnHood.AppFramework.Exceptions;
using VpnHood.Client.Device;
using VpnHood.Client.Device.Droid;
using VpnHood.Client.Device.Droid.Utils;
using VpnHood.Common.Exceptions;

namespace VpnHood.Client.App.Droid.Ads.VhAdMob;
namespace VpnHood.AppFramework.Droid.Ads.VhAdMob;

public class AdMobInterstitialAdProvider(string adUnitId) : IAppAdProvider
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,13 @@
using Android.Gms.Ads;
using Android.Gms.Ads.Rewarded;
using VpnHood.Client.App.Abstractions;
using VpnHood.Client.App.Exceptions;
using VpnHood.AppFramework.Abstractions;
using VpnHood.AppFramework.Exceptions;
using VpnHood.Client.Device;
using VpnHood.Client.Device.Droid;
using VpnHood.Client.Device.Droid.Utils;
using VpnHood.Common.Exceptions;

namespace VpnHood.Client.App.Droid.Ads.VhAdMob;
namespace VpnHood.AppFramework.Droid.Ads.VhAdMob;

public class AdMobRewardedAdProvider(string adUnitId) : IAppAdProvider
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using VpnHood.Common.Exceptions;
using VpnHood.Common.Utils;

namespace VpnHood.Client.App.Droid.Ads.VhAdMob;
namespace VpnHood.AppFramework.Droid.Ads.VhAdMob;

public class AdMobUtil
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Android.Gms.Ads.AppOpen;
using Android.Runtime;

namespace VpnHood.Client.App.Droid.Ads.VhAdMob.AdNetworkCallBackFix;
namespace VpnHood.AppFramework.Droid.Ads.VhAdMob.AdNetworkCallBackFix;

public abstract class AppOpenAdLoadCallback : AppOpenAd.AppOpenAdLoadCallback
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Android.Gms.Ads.Interstitial;
using Android.Runtime;

namespace VpnHood.Client.App.Droid.Ads.VhAdMob.AdNetworkCallBackFix;
namespace VpnHood.AppFramework.Droid.Ads.VhAdMob.AdNetworkCallBackFix;

public abstract class InterstitialAdLoadCallback : Android.Gms.Ads.Interstitial.InterstitialAdLoadCallback
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Android.Gms.Ads.Rewarded;
using Android.Runtime;

namespace VpnHood.Client.App.Droid.Ads.VhAdMob.AdNetworkCallBackFix;
namespace VpnHood.AppFramework.Droid.Ads.VhAdMob.AdNetworkCallBackFix;

public abstract class RewardedAdLoadCallback : Android.Gms.Ads.Rewarded.RewardedAdLoadCallback
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<Description>VpnHood Android Ad Library for AdMob</Description>
<TargetFramework>net9.0-android35.0</TargetFramework>
<SupportedOSPlatformVersion>23</SupportedOSPlatformVersion>
<RootNamespace>VpnHood.Client.App.Droid.Ads.VhAdMob</RootNamespace>
<RootNamespace>VpnHood.AppFramework.Droid.Ads.VhAdMob</RootNamespace>
</PropertyGroup>

<PropertyGroup>
Expand All @@ -27,14 +27,14 @@
</PropertyGroup>

<ItemGroup>
<None Include="..\..\VpnHood.png" Link="Resources\VpnHood.png">
<None Include="..\..\..\VpnHood.png" Link="Resources\VpnHood.png">
<Pack>True</Pack>
<PackagePath></PackagePath>
</None>
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\VpnHood.Client.App.Android.Common\VpnHood.Client.App.Android.Common.csproj" />
<ProjectReference Include="..\Android.Common\VpnHood.AppFramework.Android.Common.csproj" />
</ItemGroup>

<ItemGroup>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using VpnHood.Client.Device.Droid.ActivityEvents;

namespace VpnHood.Client.App.Droid.Common.Activities;
namespace VpnHood.AppFramework.Droid.Common.Activities;

public abstract class AndroidAppMainActivity : ActivityEvent
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,13 +2,13 @@
using Android.Content.Res;
using Android.Runtime;
using Android.Views;
using VpnHood.Client.App.ClientProfiles;
using VpnHood.AppFramework.ClientProfiles;
using VpnHood.Client.Device;
using VpnHood.Client.Device.Droid;
using VpnHood.Client.Device.Droid.ActivityEvents;
using Permission = Android.Content.PM.Permission;

namespace VpnHood.Client.App.Droid.Common.Activities;
namespace VpnHood.AppFramework.Droid.Common.Activities;

public class AndroidAppMainActivityHandler
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,10 +2,10 @@
using Android.Runtime;
using Android.Views;
using Android.Webkit;
using VpnHood.Client.App.WebServer;
using VpnHood.AppFramework.WebServer;
using VpnHood.Client.Device.Droid.ActivityEvents;

namespace VpnHood.Client.App.Droid.Common.Activities;
namespace VpnHood.AppFramework.Droid.Common.Activities;

public class AndroidAppWebViewMainActivityHandler(
IActivityEvent activityEvent,
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace VpnHood.Client.App.Droid.Common.Activities;
namespace VpnHood.AppFramework.Droid.Common.Activities;

public class AndroidMainActivityOptions
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
namespace VpnHood.Client.App.Droid.Common.Activities;
namespace VpnHood.AppFramework.Droid.Common.Activities;

public class AndroidMainActivityWebViewOptions : AndroidMainActivityOptions
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using Android.OS;
using Android.Views;

namespace VpnHood.Client.App.Droid.Common.Activities;
namespace VpnHood.AppFramework.Droid.Common.Activities;

public static class WebViewUpdaterPage
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
using Android.Content;
using Android.OS;
using Java.Util;
using VpnHood.Client.App.Abstractions;
using VpnHood.AppFramework.Abstractions;

namespace VpnHood.Client.App.Droid.Common;
namespace VpnHood.AppFramework.Droid.Common;

public class AndroidAppCultureProvider : IAppCultureProvider
{
Expand Down
Loading

0 comments on commit 974b4a1

Please sign in to comment.