Skip to content

Commit

Permalink
Merge pull request #387 from UltraStar-Deluxe/anst/improvements
Browse files Browse the repository at this point in the history
Anst/improvements
  • Loading branch information
achimmihca authored Feb 1, 2023
2 parents d2da564 + 12c9007 commit 84df7f1
Show file tree
Hide file tree
Showing 42 changed files with 821 additions and 99 deletions.
17 changes: 16 additions & 1 deletion UltraStar Play Companion/Assets/Common/R/RMessages.cs
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ public static class Messages
public static readonly string action_webcamOnOff = "action_webcamOnOff";
public static readonly string active = "active";
public static readonly string add = "add";
public static readonly string androidInternalStorage = "androidInternalStorage";
public static readonly string androidSdCardStorage = "androidSdCardStorage";
public static readonly string back = "back";
public static readonly string buildTimeStamp = "buildTimeStamp";
public static readonly string cancel = "cancel";
Expand Down Expand Up @@ -119,6 +121,10 @@ public static class Messages
public static readonly string options_delay_calibrate = "options_delay_calibrate";
public static readonly string options_delay_calibrate_timeout = "options_delay_calibrate_timeout";
public static readonly string options_design_button = "options_design_button";
public static readonly string options_design_helpDialog_customThemes = "options_design_helpDialog_customThemes";
public static readonly string options_design_helpDialog_customThemes_title = "options_design_helpDialog_customThemes_title";
public static readonly string options_design_helpDialog_title = "options_design_helpDialog_title";
public static readonly string options_design_theme = "options_design_theme";
public static readonly string options_design_title = "options_design_title";
public static readonly string options_development_button = "options_development_button";
public static readonly string options_development_title = "options_development_title";
Expand All @@ -143,6 +149,15 @@ public static class Messages
public static readonly string options_noteDisplayMode_sentenceBySentence = "options_noteDisplayMode_sentenceBySentence";
public static readonly string options_pitchDetectionAlgorithm = "options_pitchDetectionAlgorithm";
public static readonly string options_playerProfiles_button = "options_playerProfiles_button";
public static readonly string options_playerProfiles_helpDialog_activateProfile = "options_playerProfiles_helpDialog_activateProfile";
public static readonly string options_playerProfiles_helpDialog_activateProfile_title = "options_playerProfiles_helpDialog_activateProfile_title";
public static readonly string options_playerProfiles_helpDialog_customProfileImages = "options_playerProfiles_helpDialog_customProfileImages";
public static readonly string options_playerProfiles_helpDialog_customProfileImages_title = "options_playerProfiles_helpDialog_customProfileImages_title";
public static readonly string options_playerProfiles_helpDialog_difficulty = "options_playerProfiles_helpDialog_difficulty";
public static readonly string options_playerProfiles_helpDialog_difficulty_title = "options_playerProfiles_helpDialog_difficulty_title";
public static readonly string options_playerProfiles_helpDialog_title = "options_playerProfiles_helpDialog_title";
public static readonly string options_playerProfiles_helpDialog_webcamProfileImages = "options_playerProfiles_helpDialog_webcamProfileImages";
public static readonly string options_playerProfiles_helpDialog_webcamProfileImages_title = "options_playerProfiles_helpDialog_webcamProfileImages_title";
public static readonly string options_playerProfiles_title = "options_playerProfiles_title";
public static readonly string options_previewVolume = "options_previewVolume";
public static readonly string options_recording_button = "options_recording_button";
Expand Down Expand Up @@ -198,7 +213,6 @@ public static class Messages
public static readonly string options_sound_button = "options_sound_button";
public static readonly string options_sound_title = "options_sound_title";
public static readonly string options_targetFps = "options_targetFps";
public static readonly string options_theme = "options_theme";
public static readonly string options_useForSinging = "options_useForSinging";
public static readonly string options_useImageAsCursor = "options_useImageAsCursor";
public static readonly string options_volume = "options_volume";
Expand Down Expand Up @@ -293,6 +307,7 @@ public static class Messages
public static readonly string submit = "submit";
public static readonly string timeUppercase = "timeUppercase";
public static readonly string uri_howToAddAndCreateSongs = "uri_howToAddAndCreateSongs";
public static readonly string uri_howToAddCustomThemes = "uri_howToAddCustomThemes";
public static readonly string uri_howToConfigureMicsAndSpeaker = "uri_howToConfigureMicsAndSpeaker";
public static readonly string uri_howToDownloadSongs = "uri_howToDownloadSongs";
public static readonly string uri_logFiles = "uri_logFiles";
Expand Down
136 changes: 136 additions & 0 deletions UltraStar Play Companion/Assets/Common/R/RUssClasses.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,136 @@
// GENERATED CODE. To update this file use the corresponding menu item in the Unity Editor.
public static partial class R
{
public static class UssClasses
{
public const string accordionRoot = "accordionRoot";
public const string asset = "asset";
public const string bootstrapIcon = "bootstrapIcon";
public const string centerHorizontalByMargin = "centerHorizontalByMargin";
public const string centerVerticalByMargin = "centerVerticalByMargin";
public const string characterQuickJumpCharacter = "characterQuickJumpCharacter";
public const string characterQuickJumpCharacterButton = "characterQuickJumpCharacterButton";
public const string comboBoxButton = "comboBoxButton";
public const string comboBoxTextField = "comboBoxTextField";
public const string contextMenu = "contextMenu";
public const string contextMenuSeparator = "contextMenuSeparator";
public const string controlLabel = "controlLabel";
public const string creditsEntryCharacter = "creditsEntryCharacter";
public const string creditsGoldBanner = "creditsGoldBanner";
public const string creditsRegularBanner = "creditsRegularBanner";
public const string currentLyrics = "currentLyrics";
public const string currentNoteLyrics = "currentNoteLyrics";
public const string dangerButton = "dangerButton";
public const string dialogBackground = "dialogBackground";
public const string dialogButton = "dialogButton";
public const string dialogMessage = "dialogMessage";
public const string dialogTextButton = "dialogTextButton";
public const string dialogTitle = "dialogTitle";
public const string dialogTitleImage = "dialogTitleImage";
public const string ellipsis = "ellipsis";
public const string error = "error";
public const string expanded = "expanded";
public const string focusableNavigatorRoot = "focusableNavigatorRoot";
public const string fontIcon = "fontIcon";
public const string fpsLabel = "fpsLabel";
public const string fullMinHeightUnityContentContainer = "fullMinHeightUnityContentContainer";
public const string goldenNote = "goldenNote";
public const string iconImage = "iconImage";
public const string iconImageTextSized = "iconImageTextSized";
public const string innerTimeBarSentenceEntryContainer = "innerTimeBarSentenceEntryContainer";
public const string inputLegendBar = "inputLegendBar";
public const string inputLegendLabel = "inputLegendLabel";
public const string itemPickerButton = "itemPickerButton";
public const string itemPickerItemLabel = "itemPickerItemLabel";
public const string largeFont = "largeFont";
public const string largerFont = "largerFont";
public const string lyricsContainer = "lyricsContainer";
public const string mainSceneButton = "mainSceneButton";
public const string mainSceneButtonSpacer = "mainSceneButtonSpacer";
public const string marginBottomSmall = "marginBottomSmall";
public const string marginBottomSmaller = "marginBottomSmaller";
public const string materialIcon = "materialIcon";
public const string middleCenterText = "middleCenterText";
public const string modalDialogContainer = "modalDialogContainer";
public const string nextLyrics = "nextLyrics";
public const string noBackground = "noBackground";
public const string onlyVisibleWhenConnected = "onlyVisibleWhenConnected";
public const string onlyVisibleWhenNotConnected = "onlyVisibleWhenNotConnected";
public const string optionsLabelAndItemPicker = "optionsLabelAndItemPicker";
public const string optionsOverviewButton = "optionsOverviewButton";
public const string optionsOverviewButtonRow = "optionsOverviewButtonRow";
public const string optionsSceneMainContainer = "optionsSceneMainContainer";
public const string optionsSceneTitleAndImageContainer = "optionsSceneTitleAndImageContainer";
public const string optionsSceneTitleContainer = "optionsSceneTitleContainer";
public const string optionsSceneTopRow = "optionsSceneTopRow";
public const string outline = "outline";
public const string outlineOnFocus = "outlineOnFocus";
public const string overlay = "overlay";
public const string placeholderVisible = "placeholderVisible";
public const string previousNoteLyrics = "previousNoteLyrics";
public const string roundButton = "roundButton";
public const string roundCorners = "roundCorners";
public const string scoreRow = "scoreRow";
public const string scrollingNoteStreamSentenceSeparator = "scrollingNoteStreamSentenceSeparator";
public const string searchPropertyContainer = "searchPropertyContainer";
public const string settingsProblemHintIcon = "settingsProblemHintIcon";
public const string singingLyrics = "singingLyrics";
public const string singingResultUiSmall = "singingResultUiSmall";
public const string singingResultUiSmaller = "singingResultUiSmaller";
public const string singingResultUiSmallest = "singingResultUiSmallest";
public const string singScenePlayerUi = "singScenePlayerUi";
public const string singScenePlayerUiSmall = "singScenePlayerUiSmall";
public const string smallControl = "smallControl";
public const string smallerFont = "smallerFont";
public const string smallFont = "smallFont";
public const string songArchiveInfoLabel = "songArchiveInfoLabel";
public const string songDetailOverlayLabel = "songDetailOverlayLabel";
public const string songIssueMessage = "songIssueMessage";
public const string songIssueSongMetaTitle = "songIssueSongMetaTitle";
public const string squareButton = "squareButton";
public const string startButtonClass = "startButtonClass";
public const string stopRecordingButton = "stopRecordingButton";
public const string svg = "svg";
public const string textColorTint = "textColorTint";
public const string textFieldHint = "textFieldHint";
public const string textOutline = "textOutline";
public const string timeBar = "timeBar";
public const string tinyFont = "tinyFont";
public const string titleImage = "titleImage";
public const string titleSubText = "titleSubText";
public const string titleText = "titleText";
public const string tooltip = "tooltip";
public const string transparentBackgroundColor = "transparentBackgroundColor";
public const string unity_base_dropdown = "unity-base-dropdown";
public const string unity_base_dropdown__container_inner = "unity-base-dropdown__container-inner";
public const string unity_base_dropdown__container_outer = "unity-base-dropdown__container-outer";
public const string unity_base_dropdown__item = "unity-base-dropdown__item";
public const string unity_base_dropdown__label = "unity-base-dropdown__label";
public const string unity_base_popup_field = "unity-base-popup-field";
public const string unity_base_popup_field__arrow = "unity-base-popup-field__arrow";
public const string unity_base_popup_field__text = "unity-base-popup-field__text";
public const string unity_base_slider__horizontal = "unity-base-slider--horizontal";
public const string unity_base_slider__vertical = "unity-base-slider--vertical";
public const string unity_base_text_field = "unity-base-text-field";
public const string unity_base_text_field__input = "unity-base-text-field__input";
public const string unity_button = "unity-button";
public const string unity_label = "unity-label";
public const string unity_radio_button = "unity-radio-button";
public const string unity_radio_button__checkmark_background = "unity-radio-button__checkmark-background";
public const string unity_radio_button_group = "unity-radio-button-group";
public const string unity_scroller__high_button = "unity-scroller__high-button";
public const string unity_scroller__low_button = "unity-scroller__low-button";
public const string unity_scroller__horizontal = "unity-scroller--horizontal";
public const string unity_scroller__vertical = "unity-scroller--vertical";
public const string unity_scroll_view = "unity-scroll-view";
public const string unity_scroll_view__content_and_vertical_scroll_container = "unity-scroll-view__content-and-vertical-scroll-container";
public const string unity_scroll_view__content_container = "unity-scroll-view__content-container";
public const string unity_text_input = "unity-text-input";
public const string unity_toggle = "unity-toggle";
public const string unity_toggle__checkmark = "unity-toggle__checkmark";
public const string warning = "warning";
public const string wideControl = "wideControl";
public const string wordWrap = "wordWrap";
public const string xxlFont = "xxlFont";
}
}
11 changes: 11 additions & 0 deletions UltraStar Play Companion/Assets/Common/R/RUssClasses.cs.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

38 changes: 38 additions & 0 deletions UltraStar Play Companion/Assets/Common/R/RUxmlNames.cs
Original file line number Diff line number Diff line change
Expand Up @@ -3,21 +3,47 @@ public static partial class R
{
public static class UxmlNames
{
public const string accordionItemContent = "accordionItemContent";
public const string accordionItemRoot = "accordionItemRoot";
public const string accordionItemTitle = "accordionItemTitle";
public const string audioWaveForm = "audioWaveForm";
public const string background = "background";
public const string buildTimeStampText = "buildTimeStampText";
public const string cancelButton = "cancelButton";
public const string clientNameTextField = "clientNameTextField";
public const string closeMenuButton = "closeMenuButton";
public const string commitHashText = "commitHashText";
public const string connectionInfoText = "connectionInfoText";
public const string connectionStatusText = "connectionStatusText";
public const string connectionThroubleshootingText = "connectionThroubleshootingText";
public const string connectionViewContainer = "connectionViewContainer";
public const string container = "container";
public const string contextMenu = "contextMenu";
public const string contextMenuButton = "contextMenuButton";
public const string contextMenuItem = "contextMenuItem";
public const string ContextMenuItemUi = "ContextMenuItemUi";
public const string contextMenuLabel = "contextMenuLabel";
public const string contextMenuSeparator = "contextMenuSeparator";
public const string ContextMenuSeparatorUi = "ContextMenuSeparatorUi";
public const string devModeContainer = "devModeContainer";
public const string devModeLabel = "devModeLabel";
public const string devModePicker = "devModePicker";
public const string dialogButtonContainer = "dialogButtonContainer";
public const string dialogContent = "dialogContent";
public const string dialogMessage = "dialogMessage";
public const string dialogMessageContainer = "dialogMessageContainer";
public const string dialogTitle = "dialogTitle";
public const string dialogTitleImage = "dialogTitleImage";
public const string dialogTitleImageAndTextContainer = "dialogTitleImageAndTextContainer";
public const string dialogTitleMaterialIcon = "dialogTitleMaterialIcon";
public const string dummyButton = "dummyButton";
public const string dummyContent = "dummyContent";
public const string hiddenCloseMenuButton = "hiddenCloseMenuButton";
public const string infoContainer = "infoContainer";
public const string invalidValueIcon = "invalidValueIcon";
public const string invalidValueLabel = "invalidValueLabel";
public const string itemImage = "itemImage";
public const string itemLabel = "itemLabel";
public const string languageContainer = "languageContainer";
public const string languageLabel = "languageLabel";
public const string languagePicker = "languagePicker";
Expand All @@ -28,9 +54,17 @@ public static class UxmlNames
public const string micIcon = "micIcon";
public const string micViewContainer = "micViewContainer";
public const string networkConfigContainer = "networkConfigContainer";
public const string nextItemButton = "nextItemButton";
public const string nextItemIcon = "nextItemIcon";
public const string notificationLabel = "notificationLabel";
public const string notificationOverlay = "notificationOverlay";
public const string okButton = "okButton";
public const string overlay = "overlay";
public const string ownHostContainer = "ownHostContainer";
public const string ownHostLabel = "ownHostLabel";
public const string ownHostTextField = "ownHostTextField";
public const string previousItemButton = "previousItemButton";
public const string previousItemIcon = "previousItemIcon";
public const string recordingDeviceColorIndicator = "recordingDeviceColorIndicator";
public const string recordingDeviceContainer = "recordingDeviceContainer";
public const string recordingDeviceInfo = "recordingDeviceInfo";
Expand All @@ -52,6 +86,8 @@ public static class UxmlNames
public const string titleAndDescription = "titleAndDescription";
public const string titleContainer = "titleContainer";
public const string titleImageAndText = "titleImageAndText";
public const string toggleAccordionItemContentButton = "toggleAccordionItemContentButton";
public const string toggleAccordionItemContentIcon = "toggleAccordionItemContentIcon";
public const string toggleRecordingButton = "toggleRecordingButton";
public const string toggleRecordingButtonContainer = "toggleRecordingButtonContainer";
public const string udpPortOnClientContainer = "udpPortOnClientContainer";
Expand All @@ -60,6 +96,8 @@ public static class UxmlNames
public const string udpPortOnServerContainer = "udpPortOnServerContainer";
public const string udpPortOnServerLabel = "udpPortOnServerLabel";
public const string udpPortOnServerTextField = "udpPortOnServerTextField";
public const string validationWarningContainer = "validationWarningContainer";
public const string valueTextField = "valueTextField";
public const string visualizeAudioLabel = "visualizeAudioLabel";
public const string visualizeAudioToggle = "visualizeAudioToggle";
public const string visualizeAudioToggleContainer = "visualizeAudioToggleContainer";
Expand Down
Loading

0 comments on commit 84df7f1

Please sign in to comment.