rename and fix buttons

1 month ago · 55dd1d0034
parent 2abff77640
commit 55dd1d0034
23 changed files with 47 additions and 40 deletions
--- a/App.xaml
+++ b/App.xaml
@ -1,8 +1,8 @@
 <?xml version = "1.0" encoding = "UTF-8" ?>
 <Application xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             xmlns:local="clr-namespace:MauiApp1"
-             x:Class="MauiApp1.App">
+             xmlns:local="clr-namespace:CommanderApp"
+             x:Class="CommanderApp.App">
    <Application.Resources>
        <ResourceDictionary>
            <ResourceDictionary.MergedDictionaries>
--- a/App.xaml.cs
+++ b/App.xaml.cs
@ -1,4 +1,4 @@
-namespace MauiApp1
+namespace CommanderApp
 {
    public partial class App : Application
    {
--- a/AppShell.xaml
+++ b/AppShell.xaml
@ -1,10 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <Shell
-    x:Class="MauiApp1.AppShell"
+    x:Class="CommanderApp.AppShell"
    xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
    xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-    xmlns:local="clr-namespace:MauiApp1"
-    Title="MauiApp1">
+    xmlns:local="clr-namespace:CommanderApp"
+    Title="MAUI Comander">

    <ShellContent
        Title="Home"
--- a/AppShell.xaml.cs
+++ b/AppShell.xaml.cs
@ -1,4 +1,4 @@
-namespace MauiApp1
+namespace CommanderApp
 {
    public partial class AppShell : Shell
    {
--- a/ComanderApp.csproj
+++ b/ComanderApp.csproj
@ -14,14 +14,14 @@
 		<!-- For example: <RuntimeIdentifiers>maccatalyst-x64;maccatalyst-arm64</RuntimeIdentifiers> -->

 		<OutputType>Exe</OutputType>
-		<RootNamespace>MauiApp1</RootNamespace>
+		<RootNamespace>CommanderApp</RootNamespace>
 		<UseMaui>true</UseMaui>
 		<SingleProject>true</SingleProject>
 		<ImplicitUsings>enable</ImplicitUsings>
 		<Nullable>enable</Nullable>

 		<!-- Display name -->
-		<ApplicationTitle>MauiApp1</ApplicationTitle>
+		<ApplicationTitle>CommanderApp</ApplicationTitle>

 		<!-- App Identifier -->
 		<ApplicationId>com.companyname.mauiapp1</ApplicationId>
--- a/FileSystemItem.cs
+++ b/FileSystemItem.cs
@ -1,4 +1,4 @@
-namespace MauiApp1
+namespace CommanderApp
 {
    public class FileSystemItem
    {
--- a/FileSystemService.cs
+++ b/FileSystemService.cs
@ -1,4 +1,4 @@
-namespace MauiApp1
+namespace CommanderApp
 {
    public class FileSystemService : IFileSystemService
    {
--- a/GlobalXmlns.cs
+++ b/GlobalXmlns.cs
@ -1,2 +1,2 @@
-[assembly: XmlnsDefinition("http://schemas.microsoft.com/dotnet/maui/global", "MauiApp1")]
-[assembly: XmlnsDefinition("http://schemas.microsoft.com/dotnet/maui/global", "MauiApp1.Pages")]
+[assembly: XmlnsDefinition("http://schemas.microsoft.com/dotnet/maui/global", "CommanderApp")]
+[assembly: XmlnsDefinition("http://schemas.microsoft.com/dotnet/maui/global", "CommanderApp.Pages")]
--- a/IFileSystemService.cs
+++ b/IFileSystemService.cs
@ -1,4 +1,4 @@
-namespace MauiApp1
+namespace CommanderApp
 {
    public interface IFileSystemService
    {
--- a/MainPage.xaml
+++ b/MainPage.xaml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8" ?>
 <ContentPage xmlns="http://schemas.microsoft.com/dotnet/2021/maui"
             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
-             x:Class="MauiApp1.MainPage"
+             x:Class="CommanderApp.MainPage"
             Title="MAUI Commander">

    <Grid RowDefinitions="Auto, *, Auto" ColumnDefinitions="*, *">
@ -79,16 +79,23 @@
            </CollectionView.ItemTemplate>
        </CollectionView>

-        <!-- Toolbar (Footer) -->
-        <HorizontalStackLayout Grid.Row="2" Grid.ColumnSpan="2"
-                               Padding="10"
-                               Spacing="10"
-                               BackgroundColor="#e0e0e0">
-            <Button Text="F5 Copy"   Clicked="OnCopyClicked"   />
-            <Button Text="F6 Move"   Clicked="OnMoveClicked"   />
-            <Button Text="F7 Mkdir"  Clicked="OnMkdirClicked"  />
-            <Button Text="F8 Delete" Clicked="OnDeleteClicked" />
-            <Button Text="F10 Exit"  Clicked="OnExitClicked"   />
-        </HorizontalStackLayout>
+        <!-- Адаптивный Toolbar (Footer) -->
+        <FlexLayout Grid.Row="2"
+            Grid.ColumnSpan="2"
+            Padding="10"
+            BackgroundColor="#e0e0e0"
+            Direction="Row"
+            Wrap="Wrap"
+            JustifyContent="Center"
+            AlignItems="Center">
+
+            <Button Text="F5 Copy"   Clicked="OnCopyClicked"   Padding="12,6" MinimumWidthRequest="80" Margin="0,0,8
+                    ,8" />
+            <Button Text="F6 Move"   Clicked="OnMoveClicked"   Padding="12,6" MinimumWidthRequest="80" Margin="0,0,8,8" />
+            <Button Text="F7 Mkdir"  Clicked="OnMkdirClicked"  Padding="12,6" MinimumWidthRequest="80" Margin="0,0,8,8" />
+            <Button Text="F8 Delete" Clicked="OnDeleteClicked" Padding="12,6" MinimumWidthRequest="80" Margin="0,0,8,8" />
+            <Button Text="F10 Exit"  Clicked="OnExitClicked"   Padding="12,6" MinimumWidthRequest="80" Margin="0,0,0,8" />
+
+        </FlexLayout>
    </Grid>
 </ContentPage>
--- a/MainPage.xaml.cs
+++ b/MainPage.xaml.cs
@ -2,7 +2,7 @@
 using System.Collections.ObjectModel;
 using Microsoft.Maui.Controls;

-namespace MauiApp1;
+namespace CommanderApp;

 public partial class MainPage : ContentPage
 {
--- a/MauiProgram.cs
+++ b/MauiProgram.cs
@ -1,6 +1,6 @@
 using Microsoft.Extensions.Logging;

-namespace MauiApp1
+namespace CommanderApp
 {
    public static class MauiProgram
    {
--- a/Platforms/Android/MainActivity.cs
+++ b/Platforms/Android/MainActivity.cs
@ -2,7 +2,7 @@
 using Android.Content.PM;
 using Android.OS;

-namespace MauiApp1
+namespace CommanderApp
 {
    [Activity(Theme = "@style/Maui.SplashTheme", MainLauncher = true, LaunchMode = LaunchMode.SingleTop, ConfigurationChanges = ConfigChanges.ScreenSize | ConfigChanges.Orientation | ConfigChanges.UiMode | ConfigChanges.ScreenLayout | ConfigChanges.SmallestScreenSize | ConfigChanges.Density)]
    public class MainActivity : MauiAppCompatActivity
--- a/Platforms/Android/MainApplication.cs
+++ b/Platforms/Android/MainApplication.cs
@ -1,7 +1,7 @@
 using Android.App;
 using Android.Runtime;

-namespace MauiApp1
+namespace CommanderApp
 {
    [Application]
    public class MainApplication : MauiApplication
--- a/Platforms/MacCatalyst/AppDelegate.cs
+++ b/Platforms/MacCatalyst/AppDelegate.cs
@ -1,6 +1,6 @@
 using Foundation;

-namespace MauiApp1
+namespace CommanderApp
 {
    [Register("AppDelegate")]
    public class AppDelegate : MauiUIApplicationDelegate
--- a/Platforms/MacCatalyst/Program.cs
+++ b/Platforms/MacCatalyst/Program.cs
@ -1,7 +1,7 @@
 using ObjCRuntime;
 using UIKit;

-namespace MauiApp1
+namespace CommanderApp
 {
    public class Program
    {
--- a/Platforms/Tizen/Main.cs
+++ b/Platforms/Tizen/Main.cs
@ -2,7 +2,7 @@ using System;
 using Microsoft.Maui;
 using Microsoft.Maui.Hosting;

-namespace MauiApp1
+namespace CommanderApp
 {
    internal class Program : MauiApplication
    {
--- a/Platforms/Tizen/tizen-manifest.xml
+++ b/Platforms/Tizen/tizen-manifest.xml
@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest package="maui-application-id-placeholder" version="0.0.0" api-version="9" xmlns="http://tizen.org/ns/packages">
  <profile name="common" />
-  <ui-application appid="maui-application-id-placeholder" exec="MauiApp1.dll" multiple="false" nodisplay="false" taskmanage="true" type="dotnet" launch_mode="single">
+  <ui-application appid="maui-application-id-placeholder" exec="CommanderApp.dll" multiple="false" nodisplay="false" taskmanage="true" type="dotnet" launch_mode="single">
    <label>maui-application-title-placeholder</label>
    <icon>maui-appicon-placeholder</icon>
    <metadata key="http://tizen.org/metadata/prefer_dotnet_aot" value="true" />
--- a/Platforms/Windows/App.xaml
+++ b/Platforms/Windows/App.xaml
@ -1,8 +1,8 @@
 <maui:MauiWinUIApplication
-    x:Class="MauiApp1.WinUI.App"
+    x:Class="CommanderApp.WinUI.App"
    xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
    xmlns:maui="using:Microsoft.Maui"
-    xmlns:local="using:MauiApp1.WinUI">
+    xmlns:local="using:CommanderApp.WinUI">

 </maui:MauiWinUIApplication>
--- a/Platforms/Windows/App.xaml.cs
+++ b/Platforms/Windows/App.xaml.cs
@ -3,7 +3,7 @@
 // To learn more about WinUI, the WinUI project structure,
 // and more about our project templates, see: http://aka.ms/winui-project-info.

-namespace MauiApp1.WinUI
+namespace CommanderApp.WinUI
 {
    /// <summary>
    /// Provides application-specific behavior to supplement the default Application class.
--- a/Platforms/Windows/app.manifest
+++ b/Platforms/Windows/app.manifest
@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <assembly manifestVersion="1.0" xmlns="urn:schemas-microsoft-com:asm.v1">
-  <assemblyIdentity version="1.0.0.0" name="MauiApp1.WinUI.app"/>
+  <assemblyIdentity version="1.0.0.0" name="CommanderApp.WinUI.app"/>

  <application xmlns="urn:schemas-microsoft-com:asm.v3">
    <windowsSettings>
--- a/Platforms/iOS/AppDelegate.cs
+++ b/Platforms/iOS/AppDelegate.cs
@ -1,6 +1,6 @@
 using Foundation;

-namespace MauiApp1
+namespace CommanderApp
 {
    [Register("AppDelegate")]
    public class AppDelegate : MauiUIApplicationDelegate
--- a/Platforms/iOS/Program.cs
+++ b/Platforms/iOS/Program.cs
@ -1,7 +1,7 @@
 using ObjCRuntime;
 using UIKit;

-namespace MauiApp1
+namespace CommanderApp
 {
    public class Program
    {