Fixed platform settings not using unique values for Android and iOS (#7198)

* Fixed platform settings not using unique values for Android and iOS

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>

* Removed unnecessary comment

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>

* Changes from PR

Signed-off-by: John Jones-Steele <82226755+jjjoness@users.noreply.github.com>

AutomatedTesting/Gem/PythonTests/editor/EditorScripts/Menus_FileMenuOptions.py

@@ -38,7 +38,7 @@ def Menus_FileMenuOptions_Work():
         ("Save As",),
         ("Save Level Statistics",),
         ("Edit Project Settings",),
-        #("Edit Platform Settings",),   Temporarily disabled due to https://github.com/o3de/o3de/issues/6604
+        ("Edit Platform Settings",),
         ("New Project",),
         ("Open Project",),
         ("Show Log File",),

Code/Editor/Plugins/ProjectSettingsTool/PlatformSettings_Android.cpp

@@ -209,12 +209,10 @@ namespace ProjectSettingsTool
                         ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::PackageName))
                         ->Attribute(Attributes::LinkOptional, true)
                         ->Attribute(Attributes::PropertyIdentfier, Identfiers::AndroidPackageName)
-                        ->Attribute(Attributes::LinkedProperty, Identfiers::IosBundleIdentifer)
                     ->DataElement(Handlers::LinkedLineEdit, &AndroidSettings::m_versionName, "Version Name", "Human readable version number. Used to set the \"android: versionName\" tag in the AndroidManifest.xml and ultimately what will be displayed in the App Store.")
                         ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::IOSVersionNumber))
                         ->Attribute(Attributes::LinkOptional, true)
                         ->Attribute(Attributes::PropertyIdentfier, Identfiers::AndroidVersionName)
-                        ->Attribute(Attributes::LinkedProperty, Identfiers::IosVersionName)
                     ->DataElement(AZ::Edit::UIHandlers::Default, &AndroidSettings::m_versionNumber, "Version Number", "Internal application version number. Used to set the \"android:versionCode\" tag in the AndroidManifest.xml.")
                         ->Attribute(AZ::Edit::Attributes::Min, 1)
                         ->Attribute(AZ::Edit::Attributes::Max, Validators::maxAndroidVersion)

Code/Editor/Plugins/ProjectSettingsTool/PlatformSettings_Base.cpp

@@ -37,19 +37,15 @@ namespace ProjectSettingsTool
                     ->DataElement(Handlers::LinkedLineEdit, &BaseSettings::m_projectName, "Project Name", "The name of the project.")
                         ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::FileName))
                         ->Attribute(Attributes::PropertyIdentfier, Identfiers::ProjectName)
-                        ->Attribute(Attributes::LinkedProperty, Identfiers::IosBundleName)
                     ->DataElement(Handlers::LinkedLineEdit, &BaseSettings::m_productName, "Product Name", "The project's user facing name.")
                         ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::IsNotEmpty))
                         ->Attribute(Attributes::PropertyIdentfier, Identfiers::ProductName)
-                        ->Attribute(Attributes::LinkedProperty, Identfiers::IosDisplayName)
                     ->DataElement(Handlers::LinkedLineEdit, &BaseSettings::m_executableName, "Executable Name", "The project launcher's name.")
                         ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::FileName))
                         ->Attribute(Attributes::PropertyIdentfier, Identfiers::ExecutableName)
-                        ->Attribute(Attributes::LinkedProperty, Identfiers::IosExecutableName)
                     ->DataElement(Handlers::QValidatedLineEdit, &BaseSettings::m_projectPath, "Project Path", "The project root folder path .")
                         ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::FileNameOrEmpty))
                         ->Attribute(Attributes::PropertyIdentfier, Identfiers::ProductName)
-                        ->Attribute(Attributes::LinkedProperty, Identfiers::ExecutableName)
                     ->DataElement(Handlers::QValidatedLineEdit, &BaseSettings::m_projectOutputFolder, "Output Folder", "The folder the packed project will be exported to.")
                     ->DataElement(Handlers::QValidatedLineEdit, &BaseSettings::m_codeFolder, "Code Folder (legacy)", "A legacy setting specifing the folder for this project's code.")
                 ;

Code/Editor/Plugins/ProjectSettingsTool/PlatformSettings_Ios.cpp

@@ -262,27 +262,22 @@ namespace ProjectSettingsTool
                         ->Attribute(AZ::Edit::Attributes::AutoExpand, true)
                         ->Attribute(AZ::Edit::Attributes::Visibility, AZ::Edit::PropertyVisibility::ShowChildrenOnly)
                     ->DataElement(Handlers::LinkedLineEdit, &IosSettings::m_bundleName, "Bundle Name", "The name of the bundle.")
-                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::FileName))
+                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::IOSFileName))
                         ->Attribute(Attributes::PropertyIdentfier, Identfiers::IosBundleName)
-                        ->Attribute(Attributes::LinkedProperty, Identfiers::ProjectName)
                     ->DataElement(Handlers::LinkedLineEdit, &IosSettings::m_bundleDisplayName, "Display Name", "The user visible name of the bundle.")
                         ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::IsNotEmpty))
                         ->Attribute(Attributes::PropertyIdentfier, Identfiers::IosDisplayName)
-                        ->Attribute(Attributes::LinkedProperty, Identfiers::ProductName)
                     ->DataElement(Handlers::LinkedLineEdit, &IosSettings::m_executableName, "Executable Name", "Name of the bundle's executable file.")
-                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::FileName))
+                        ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::IOSFileName))
                         ->Attribute(Attributes::PropertyIdentfier, Identfiers::IosExecutableName)
-                        ->Attribute(Attributes::LinkedProperty, Identfiers::ExecutableName)
                     ->DataElement(Handlers::LinkedLineEdit, &IosSettings::m_bundleIdentifier, "Bundle Identifier", "Uniquely identifies the bundle. Should be in reverse-DNS format.")
                         ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::PackageName))
                         ->Attribute(Attributes::LinkOptional, true)
                         ->Attribute(Attributes::PropertyIdentfier, Identfiers::IosBundleIdentifer)
-                        ->Attribute(Attributes::LinkedProperty, Identfiers::AndroidPackageName)
                     ->DataElement(Handlers::LinkedLineEdit, &IosSettings::m_versionName, "Version Name", "The release version number string for the app. Displayed in the app store.")
                         ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::IOSVersionNumber))
                         ->Attribute(Attributes::LinkOptional, true)
                         ->Attribute(Attributes::PropertyIdentfier, Identfiers::IosVersionName)
-                        ->Attribute(Attributes::LinkedProperty, Identfiers::AndroidVersionName)
                     ->DataElement(Handlers::QValidatedLineEdit, &IosSettings::m_versionNumber, "Version Number", "The build version number string for the bundle.")
                         ->Attribute(Attributes::FuncValidator, ConvertFunctorToVoid(&Validators::IOSVersionNumber))
                     ->DataElement(AZ::Edit::UIHandlers::ComboBox, &IosSettings::m_developmentRegion, "Development Region", "The default language and region for the app.")

Code/Editor/Plugins/ProjectSettingsTool/PlatformSettings_common.h

@@ -22,7 +22,6 @@ namespace ProjectSettingsTool
         static const AZ::Crc32 Obfuscated = AZ_CRC("ObfuscatedText");
         // Used as a tooltip and for distinguising linked properties
         static const AZ::Crc32 PropertyIdentfier = AZ_CRC("PropertyIdentfier");
-        static const AZ::Crc32 LinkedProperty = AZ_CRC("LinkedProperty");
         static const AZ::Crc32 DefaultPath = AZ_CRC("DefaultPath");
         static const AZ::Crc32 DefaultImagePreview = AZ_CRC("DefaultImagePreview");
         static const AZ::Crc32 ObfuscatedText = AZ_CRC("ObfuscatedText");

Code/Editor/Plugins/ProjectSettingsTool/PropertyLinked.cpp

@@ -225,25 +225,6 @@ namespace ProjectSettingsTool
                 }
             }
         }
-        else if (attrib == Attributes::LinkedProperty)
-        {
-            AZStd::string linked;
-            if (attrValue->Read<AZStd::string>(linked))
-            {
-                auto result = m_ctrlToIdentAndLink.find(GUI);
-                if (result != m_ctrlToIdentAndLink.end())
-                {
-                    result->second.linkedIdentifier = linked;
-                }
-                else
-                {
-                    m_ctrlToIdentAndLink.insert(AZStd::pair<PropertyLinkedCtrl*, IdentAndLink>(GUI, IdentAndLink{ "", linked }));
-                    m_ctrlInitOrder.push_back(GUI);
-                }
-
-                GUI->SetLinkTooltip(linked.data());
-            }
-        }
         else
         {
             GUI->ConsumeAttribute(attrib, attrValue, debugName);

Code/Editor/Plugins/ProjectSettingsTool/Validators.cpp

@@ -106,6 +106,11 @@ namespace ProjectSettingsTool
             return RegularExpressionValidator("[\\w,-]+", name);
         }
 
+        // Returns true if valid iOS file or directory name
+        RetType IOSFileName(const QString& name)
+        {
+            return RegularExpressionValidator("[\\w,-.]+", name);
+        }
         RetType FileNameOrEmpty(const QString& name)
         {
             if (IsNotEmpty(name).first == QValidator::Acceptable)

Code/Editor/Plugins/ProjectSettingsTool/Validators.h

@@ -24,6 +24,8 @@ namespace ProjectSettingsTool
 
         // Returns true if valid cross platform file or directory name
         FunctorValidator::ReturnType FileName(const QString& name);
+        // Returns true if valid iOS file or directory name
+        FunctorValidator::ReturnType IOSFileName(const QString& name);
         // Returns true if valid cross platform file or directory name or empty
         FunctorValidator::ReturnType FileNameOrEmpty(const QString& name);
         // Returns true if string isn't empty