Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

ShellBottomNavigator Solution NameChange #38

Closed
wants to merge 2 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view

This file was deleted.

Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,12 @@
using Avalonia.ReactiveUI;
using AvaloniaInside.Shell;

namespace ShellBottomCustomNavigator.Android;
namespace ShellBottomNavigator.Android;

[Activity(
Label = "ShellBottomCustomNavigator.Android",
Label = "ShellBottomNavigator.Android",
Theme = "@style/MyTheme.NoActionBar",
Icon = "@drawable/icon",
MainLauncher = true,
ConfigurationChanges = ConfigChanges.Orientation | ConfigChanges.ScreenSize | ConfigChanges.UiMode)]
public class MainActivity : AvaloniaMainActivity<App>
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" android:installLocation="auto">
<uses-permission android:name="android.permission.INTERNET" />
<application android:label="ShellBottomCustomNavigator" android:icon="@drawable/Icon" />
<application android:label="ShellBottomNavigator" android:icon="@drawable/Icon" />
</manifest>
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
<?xml version="1.0" encoding="utf-8" ?>
<resources>

<style name="MyTheme">

</style>

<style name="MyTheme.NoActionBar" parent="@style/Theme.AppCompat.DayNight.NoActionBar">
<item name="android:windowActionBar">false</item>
<item name="android:windowNoTitle">true</item>

<item name="android:statusBarColor">@android:color/transparent</item>
<item name="android:navigationBarColor">@android:color/transparent</item>
</style>

<style name="MyTheme.Splash" parent ="MyTheme.NoActionBar">
<item name="android:windowBackground">@drawable/splash_screen</item>
<item name="android:windowContentOverlay">@null</item>
</style>

<style name="MyTheme.Main" parent ="MyTheme.NoActionBar">
<item name="android:windowIsTranslucent">true</item>
</style>


</resources>
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
<TargetFramework>net8.0-android</TargetFramework>
<SupportedOSPlatformVersion>21</SupportedOSPlatformVersion>
<Nullable>enable</Nullable>
<ApplicationId>com.CompanyName.ShellBottomCustomNavigator</ApplicationId>
<ApplicationId>com.CompanyName.ShellBottomNavigator</ApplicationId>
<ApplicationVersion>1</ApplicationVersion>
<ApplicationDisplayVersion>1.0</ApplicationDisplayVersion>
<AndroidPackageFormat>apk</AndroidPackageFormat>
Expand All @@ -18,12 +18,11 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Avalonia.Android" Version="$(AvaloniaVersion)"/>
<PackageReference Include="Xamarin.AndroidX.Core.SplashScreen" Version="1.0.1.1"/>
<PackageReference Include="Avalonia.Android" Version="$(AvaloniaVersion)" />
<PackageReference Include="Xamarin.AndroidX.Core.SplashScreen" Version="1.0.1.1" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\AvaloniaInside.Shell\AvaloniaInside.Shell.csproj" />
<ProjectReference Include="..\ShellBottomCustomNavigator\ShellBottomCustomNavigator.csproj"/>
<ProjectReference Include="..\ShellBottomNavigator\ShellBottomNavigator.csproj" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
using Android.App;
using Android.Content;
using Application = Android.App.Application;

namespace ShellBottomNavigator.Android;

[Activity(Theme = "@style/MyTheme.Splash", MainLauncher = true, NoHistory = true)]
public class SplashActivity : Activity
{
protected override void OnResume()
{
base.OnResume();

StartActivity(new Intent(Application.Context, typeof(MainActivity)));
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
<html>

<head>
<title>ShellBottomCustomNavigator.Browser</title>
<title>ShellBottomNavigator.Browser</title>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<base href="/" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using Avalonia.Browser;
using Avalonia.ReactiveUI;
using AvaloniaInside.Shell;
using ShellBottomCustomNavigator;
using ShellBottomNavigator;

[assembly: SupportedOSPlatform("browser")]

Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"profiles": {
"ShellBottomCustomNavigator.Browser": {
"ShellBottomNavigator.Browser": {
"commandName": "Project",
"launchBrowser": true,
"environmentVariables": {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,14 @@
</PropertyGroup>

<ItemGroup>
<WasmExtraFilesToDeploy Include="AppBundle\**"/>
<WasmExtraFilesToDeploy Include="AppBundle\**" />
</ItemGroup>

<ItemGroup>
<PackageReference Include="Avalonia.Browser" Version="$(AvaloniaVersion)"/>
<PackageReference Include="Avalonia.Browser" Version="$(AvaloniaVersion)" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\AvaloniaInside.Shell\AvaloniaInside.Shell.csproj" />
<ProjectReference Include="..\ShellBottomCustomNavigator\ShellBottomCustomNavigator.csproj"/>
<ProjectReference Include="..\ShellBottomNavigator\ShellBottomNavigator.csproj" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using Avalonia.ReactiveUI;
using AvaloniaInside.Shell;

namespace ShellBottomCustomNavigator.Desktop;
namespace ShellBottomNavigator.Desktop;

sealed class Program
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,13 +13,12 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaVersion)"/>
<PackageReference Include="Avalonia.Desktop" Version="$(AvaloniaVersion)" />
<!--Condition below is needed to remove Avalonia.Diagnostics package from build output in Release configuration.-->
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)"/>
<PackageReference Condition="'$(Configuration)' == 'Debug'" Include="Avalonia.Diagnostics" Version="$(AvaloniaVersion)" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\AvaloniaInside.Shell\AvaloniaInside.Shell.csproj" />
<ProjectReference Include="..\ShellBottomCustomNavigator\ShellBottomCustomNavigator.csproj"/>
<ProjectReference Include="..\ShellBottomNavigator\ShellBottomNavigator.csproj" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
<!-- This manifest is used on Windows only.
Don't remove it as it might cause problems with window transparency and embedded controls.
For more details visit https://learn.microsoft.com/en-us/windows/win32/sbscs/application-manifests -->
<assemblyIdentity version="1.0.0.0" name="ShellBottomCustomNavigator.Desktop"/>
<assemblyIdentity version="1.0.0.0" name="ShellBottomNavigator.Desktop"/>

<compatibility xmlns="urn:schemas-microsoft-com:compatibility.v1">
<application>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
using Avalonia.ReactiveUI;
using AvaloniaInside.Shell;

namespace ShellBottomCustomNavigator.iOS;
namespace ShellBottomNavigator.iOS;

// The UIApplicationDelegate for the application. This class is responsible for launching the
// User Interface of the application, as well as listening (and optionally responding) to
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@
<plist version="1.0">
<dict>
<key>CFBundleDisplayName</key>
<string>ShellBottomCustomNavigator</string>
<string>ShellBottomNavigator</string>
<key>CFBundleIdentifier</key>
<string>companyName.ShellBottomCustomNavigator</string>
<string>companyName.ShellBottomNavigator</string>
<key>CFBundleShortVersionString</key>
<string>1.0</string>
<key>CFBundleVersion</key>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using UIKit;

namespace ShellBottomCustomNavigator.iOS;
namespace ShellBottomNavigator.iOS;

public class Application
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
<color key="textColor" cocoaTouchSystemColor="darkTextColor" />
<nil key="highlightedColor" />
</label>
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="ShellBottomCustomNavigator" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines"
<label opaque="NO" clipsSubviews="YES" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="ShellBottomNavigator" textAlignment="center" lineBreakMode="middleTruncation" baselineAdjustment="alignBaselines"
minimumFontSize="18" translatesAutoresizingMaskIntoConstraints="NO" id="kId-c2-rCX">
<rect key="frame" x="20" y="140" width="441" height="43" />
<fontDescription key="fontDescription" type="boldSystem" pointSize="36" />
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,10 @@
</PropertyGroup>

<ItemGroup>
<PackageReference Include="Avalonia.iOS" Version="$(AvaloniaVersion)"/>
<PackageReference Include="Avalonia.iOS" Version="$(AvaloniaVersion)" />
</ItemGroup>

<ItemGroup>
<ProjectReference Include="..\..\..\AvaloniaInside.Shell\AvaloniaInside.Shell.csproj" />
<ProjectReference Include="..\ShellBottomCustomNavigator\ShellBottomCustomNavigator.csproj"/>
<ProjectReference Include="..\ShellBottomNavigator\ShellBottomNavigator.csproj" />
</ItemGroup>
</Project>
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,23 @@ Microsoft Visual Studio Solution File, Format Version 12.00
# Visual Studio Version 17
VisualStudioVersion = 17.3.32811.315
MinimumVisualStudioVersion = 10.0.40219.1
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ShellBottomCustomNavigator", "ShellBottomCustomNavigator\ShellBottomCustomNavigator.csproj", "{EBFA8512-1EA5-4D8C-B4AC-AB5B48A6D568}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ShellBottomNavigator", "ShellBottomNavigator\ShellBottomNavigator.csproj", "{EBFA8512-1EA5-4D8C-B4AC-AB5B48A6D568}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ShellBottomCustomNavigator.Desktop", "ShellBottomCustomNavigator.Desktop\ShellBottomCustomNavigator.Desktop.csproj", "{ABC31E74-02FF-46EB-B3B2-4E6AE43B456C}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ShellBottomNavigator.Desktop", "ShellBottomNavigator.Desktop\ShellBottomNavigator.Desktop.csproj", "{ABC31E74-02FF-46EB-B3B2-4E6AE43B456C}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ShellBottomCustomNavigator.Browser", "ShellBottomCustomNavigator.Browser\ShellBottomCustomNavigator.Browser.csproj", "{1C1A049E-235C-4CD0-B6FA-D53AC418F4DA}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ShellBottomNavigator.Browser", "ShellBottomNavigator.Browser\ShellBottomNavigator.Browser.csproj", "{1C1A049E-235C-4CD0-B6FA-D53AC418F4DA}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ShellBottomCustomNavigator.iOS", "ShellBottomCustomNavigator.iOS\ShellBottomCustomNavigator.iOS.csproj", "{EBD9022F-BC83-4846-9A11-6F7F3772DC64}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ShellBottomNavigator.iOS", "ShellBottomNavigator.iOS\ShellBottomNavigator.iOS.csproj", "{EBD9022F-BC83-4846-9A11-6F7F3772DC64}"
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ShellBottomCustomNavigator.Android", "ShellBottomCustomNavigator.Android\ShellBottomCustomNavigator.Android.csproj", "{7AD1DAC8-7FBE-49D5-8614-7321233DB82E}"
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "ShellBottomNavigator.Android", "ShellBottomNavigator.Android\ShellBottomNavigator.Android.csproj", "{7AD1DAC8-7FBE-49D5-8614-7321233DB82E}"
EndProject
Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{3DA99C4E-89E3-4049-9C22-0A7EC60D83D8}"
ProjectSection(SolutionItems) = preProject
Directory.Build.props = Directory.Build.props
EndProjectSection
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "AvaloniaInside.Shell", "..\..\AvaloniaInside.Shell\AvaloniaInside.Shell.csproj", "{BF6644BF-ECB7-4749-A99B-61BBE780E1DA}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
Expand All @@ -44,6 +46,10 @@ Global
{7AD1DAC8-7FBE-49D5-8614-7321233DB82E}.Debug|Any CPU.Build.0 = Debug|Any CPU
{7AD1DAC8-7FBE-49D5-8614-7321233DB82E}.Release|Any CPU.ActiveCfg = Release|Any CPU
{7AD1DAC8-7FBE-49D5-8614-7321233DB82E}.Release|Any CPU.Build.0 = Release|Any CPU
{BF6644BF-ECB7-4749-A99B-61BBE780E1DA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
{BF6644BF-ECB7-4749-A99B-61BBE780E1DA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{BF6644BF-ECB7-4749-A99B-61BBE780E1DA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{BF6644BF-ECB7-4749-A99B-61BBE780E1DA}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<Application xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="using:ShellBottomCustomNavigator"
x:Class="ShellBottomCustomNavigator.App">
xmlns:local="using:ShellBottomNavigator"
x:Class="ShellBottomNavigator.App">
<!-- "Default" ThemeVariant follows system theme variant. "Dark" or "Light" are other available options. -->

<Application.DataTemplates>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
using Avalonia.Markup.Xaml;
using Projektanker.Icons.Avalonia;
using Projektanker.Icons.Avalonia.FontAwesome;
using ShellBottomCustomNavigator.ViewModels;
using ShellBottomCustomNavigator.Views;
using ShellBottomNavigator.ViewModels;
using ShellBottomNavigator.Views;

namespace ShellBottomCustomNavigator;
namespace ShellBottomNavigator;

public partial class App : Application
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,9 @@
using System.Globalization;
using Avalonia.Data.Converters;
using Avalonia.Media.Imaging;
using ShellBottomCustomNavigator.Helpers;
using ShellBottomNavigator.Helpers;

namespace ShellBottomCustomNavigator.Converters;
namespace ShellBottomNavigator.Converters;

public class BitmapAssetValueConverter : IValueConverter
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
using Avalonia.Controls;
using Avalonia.VisualTree;

namespace ShellBottomCustomNavigator;
namespace ShellBottomNavigator;
public static class Helper
{
public static void SetCarouselToTabControl(Carousel carousel, bool v)
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using Avalonia.Platform;
using Splat;

namespace ShellBottomCustomNavigator.Helpers;
namespace ShellBottomNavigator.Helpers;

public static class ImageHelper
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
using System.Reflection;
using Newtonsoft.Json;

namespace ShellBottomCustomNavigator.Models;
namespace ShellBottomNavigator.Models;

public static class DummyPlace
{
Expand All @@ -12,7 +12,7 @@ public static class DummyPlace
public static string GetProductsJson()
{
var assembly = Assembly.GetExecutingAssembly();
using var stream = assembly.GetManifestResourceStream("ShellBottomCustomNavigator.Resources.Products.json");
using var stream = assembly.GetManifestResourceStream("ShellBottomNavigator.Resources.Products.json");
using var reader = new StreamReader(stream);
return reader.ReadToEnd();
}
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
using Newtonsoft.Json;

namespace ShellBottomCustomNavigator.Models;
namespace ShellBottomNavigator.Models;

public partial class ProductDto
{
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<linker>
<!-- Can be removed if CompiledBinding and no reflection are used -->
<assembly fullname="ShellBottomCustomNavigator" preserve="All" />
<assembly fullname="ShellBottomNavigator" preserve="All" />
<assembly fullname="Avalonia.Themes.Fluent" preserve="All" />
</linker>
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Styles xmlns="https://github.com/avaloniaui"
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
xmlns:local="clr-namespace:ShellBottomCustomNavigator">
xmlns:local="clr-namespace:ShellBottomNavigator">
<Styles.Resources>
<ResourceDictionary>
<Geometry x:Key="ArcData">
Expand Down
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
using System;
using Avalonia.Controls;
using Avalonia.Controls.Templates;
using ShellBottomCustomNavigator.ViewModels;
using ShellBottomNavigator.ViewModels;

namespace ShellBottomCustomNavigator;
namespace ShellBottomNavigator;

public class ViewLocator : IDataTemplate
{
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
using AvaloniaInside.Shell;
using ReactiveUI;

namespace ShellBottomCustomNavigator.ViewModels;
namespace ShellBottomNavigator.ViewModels;

public class HomePageViewModel : ViewModelBase
{
Expand Down
Loading
Loading