From a7a4cb11462b9861eeebf23e66511856d7233eed Mon Sep 17 00:00:00 2001 From: TheJoKlLa Date: Sat, 21 Nov 2020 00:58:55 +0100 Subject: [PATCH] Added: Full Figma Layout --- .../Borepin.Android/Borepin.Android.csproj | 6 + Borepin/Borepin.Android/MainActivity.cs | 3 + .../Resources/Resource.designer.cs | 132 ++++++++++-------- .../Resources/layout/Tabbar.xml | 11 ++ .../Resources/layout/Toolbar.xml | 9 ++ .../Resources/values/styles.xml | 1 + Borepin/Borepin.UWP/Borepin.UWP.csproj | 2 +- Borepin/Borepin/Page/MachinesPage.xaml | 19 ++- Borepin/Borepin/Page/MainPage.xaml | 1 - Borepin/Borepin/Styles/LightTheme.xaml | 2 + 10 files changed, 118 insertions(+), 68 deletions(-) create mode 100644 Borepin/Borepin.Android/Resources/layout/Tabbar.xml create mode 100644 Borepin/Borepin.Android/Resources/layout/Toolbar.xml diff --git a/Borepin/Borepin.Android/Borepin.Android.csproj b/Borepin/Borepin.Android/Borepin.Android.csproj index 9276dff..b96cb90 100644 --- a/Borepin/Borepin.Android/Borepin.Android.csproj +++ b/Borepin/Borepin.Android/Borepin.Android.csproj @@ -153,6 +153,12 @@ + + + + + + diff --git a/Borepin/Borepin.Android/MainActivity.cs b/Borepin/Borepin.Android/MainActivity.cs index 0303de7..e50ec56 100644 --- a/Borepin/Borepin.Android/MainActivity.cs +++ b/Borepin/Borepin.Android/MainActivity.cs @@ -14,6 +14,9 @@ namespace Borepin.Droid { protected override void OnCreate(Bundle savedInstanceState) { + TabLayoutResource = Resource.Layout.Tabbar; + ToolbarResource = Resource.Layout.Toolbar; + base.OnCreate(savedInstanceState); global::Xamarin.Forms.Forms.Init(this, savedInstanceState); diff --git a/Borepin/Borepin.Android/Resources/Resource.designer.cs b/Borepin/Borepin.Android/Resources/Resource.designer.cs index 24c54bc..65d6514 100644 --- a/Borepin/Borepin.Android/Resources/Resource.designer.cs +++ b/Borepin/Borepin.Android/Resources/Resource.designer.cs @@ -8875,151 +8875,157 @@ namespace Borepin.Droid public const int showTitle = 2131230876; // aapt resource value: 0x7F08009D - public const int smallLabel = 2131230877; + public const int sliding_tabs = 2131230877; // aapt resource value: 0x7F08009E - public const int snackbar_action = 2131230878; + public const int smallLabel = 2131230878; // aapt resource value: 0x7F08009F - public const int snackbar_text = 2131230879; + public const int snackbar_action = 2131230879; // aapt resource value: 0x7F0800A0 - public const int snap = 2131230880; + public const int snackbar_text = 2131230880; // aapt resource value: 0x7F0800A1 - public const int snapMargins = 2131230881; + public const int snap = 2131230881; // aapt resource value: 0x7F0800A2 - public const int spacer = 2131230882; + public const int snapMargins = 2131230882; // aapt resource value: 0x7F0800A3 - public const int split_action_bar = 2131230883; + public const int spacer = 2131230883; // aapt resource value: 0x7F0800A4 - public const int src_atop = 2131230884; + public const int split_action_bar = 2131230884; // aapt resource value: 0x7F0800A5 - public const int src_in = 2131230885; + public const int src_atop = 2131230885; // aapt resource value: 0x7F0800A6 - public const int src_over = 2131230886; + public const int src_in = 2131230886; // aapt resource value: 0x7F0800A7 - public const int start = 2131230887; + public const int src_over = 2131230887; // aapt resource value: 0x7F0800A8 - public const int status_bar_latest_event_content = 2131230888; + public const int start = 2131230888; // aapt resource value: 0x7F0800A9 - public const int stretch = 2131230889; + public const int status_bar_latest_event_content = 2131230889; // aapt resource value: 0x7F0800AA - public const int submenuarrow = 2131230890; + public const int stretch = 2131230890; // aapt resource value: 0x7F0800AB - public const int submit_area = 2131230891; + public const int submenuarrow = 2131230891; + + // aapt resource value: 0x7F0800AC + public const int submit_area = 2131230892; // aapt resource value: 0x7F080005 public const int SYM = 2131230725; - // aapt resource value: 0x7F0800AC - public const int tabMode = 2131230892; - // aapt resource value: 0x7F0800AD - public const int tag_transition_group = 2131230893; + public const int tabMode = 2131230893; // aapt resource value: 0x7F0800AE - public const int tag_unhandled_key_event_manager = 2131230894; + public const int tag_transition_group = 2131230894; // aapt resource value: 0x7F0800AF - public const int tag_unhandled_key_listeners = 2131230895; + public const int tag_unhandled_key_event_manager = 2131230895; // aapt resource value: 0x7F0800B0 - public const int text = 2131230896; + public const int tag_unhandled_key_listeners = 2131230896; // aapt resource value: 0x7F0800B1 - public const int text2 = 2131230897; - - // aapt resource value: 0x7F0800B6 - public const int textinput_counter = 2131230902; - - // aapt resource value: 0x7F0800B7 - public const int textinput_error = 2131230903; - - // aapt resource value: 0x7F0800B8 - public const int textinput_helper_text = 2131230904; + public const int text = 2131230897; // aapt resource value: 0x7F0800B2 - public const int textSpacerNoButtons = 2131230898; + public const int text2 = 2131230898; - // aapt resource value: 0x7F0800B3 - public const int textSpacerNoTitle = 2131230899; + // aapt resource value: 0x7F0800B7 + public const int textinput_counter = 2131230903; - // aapt resource value: 0x7F0800B4 - public const int textStart = 2131230900; - - // aapt resource value: 0x7F0800B5 - public const int text_input_password_toggle = 2131230901; + // aapt resource value: 0x7F0800B8 + public const int textinput_error = 2131230904; // aapt resource value: 0x7F0800B9 - public const int time = 2131230905; + public const int textinput_helper_text = 2131230905; + + // aapt resource value: 0x7F0800B3 + public const int textSpacerNoButtons = 2131230899; + + // aapt resource value: 0x7F0800B4 + public const int textSpacerNoTitle = 2131230900; + + // aapt resource value: 0x7F0800B5 + public const int textStart = 2131230901; + + // aapt resource value: 0x7F0800B6 + public const int text_input_password_toggle = 2131230902; // aapt resource value: 0x7F0800BA - public const int title = 2131230906; + public const int time = 2131230906; // aapt resource value: 0x7F0800BB - public const int titleDividerNoCustom = 2131230907; + public const int title = 2131230907; // aapt resource value: 0x7F0800BC - public const int title_template = 2131230908; + public const int titleDividerNoCustom = 2131230908; // aapt resource value: 0x7F0800BD - public const int top = 2131230909; + public const int title_template = 2131230909; // aapt resource value: 0x7F0800BE - public const int topPanel = 2131230910; + public const int toolbar = 2131230910; // aapt resource value: 0x7F0800BF - public const int touch_outside = 2131230911; + public const int top = 2131230911; // aapt resource value: 0x7F0800C0 - public const int transition_current_scene = 2131230912; + public const int topPanel = 2131230912; // aapt resource value: 0x7F0800C1 - public const int transition_layout_save = 2131230913; + public const int touch_outside = 2131230913; // aapt resource value: 0x7F0800C2 - public const int transition_position = 2131230914; + public const int transition_current_scene = 2131230914; // aapt resource value: 0x7F0800C3 - public const int transition_scene_layoutid_cache = 2131230915; + public const int transition_layout_save = 2131230915; // aapt resource value: 0x7F0800C4 - public const int transition_transform = 2131230916; + public const int transition_position = 2131230916; // aapt resource value: 0x7F0800C5 - public const int uniform = 2131230917; + public const int transition_scene_layoutid_cache = 2131230917; // aapt resource value: 0x7F0800C6 - public const int unlabeled = 2131230918; + public const int transition_transform = 2131230918; // aapt resource value: 0x7F0800C7 - public const int up = 2131230919; + public const int uniform = 2131230919; // aapt resource value: 0x7F0800C8 - public const int useLogo = 2131230920; + public const int unlabeled = 2131230920; // aapt resource value: 0x7F0800C9 - public const int view_offset_helper = 2131230921; + public const int up = 2131230921; // aapt resource value: 0x7F0800CA - public const int visible = 2131230922; + public const int useLogo = 2131230922; // aapt resource value: 0x7F0800CB - public const int withText = 2131230923; + public const int view_offset_helper = 2131230923; // aapt resource value: 0x7F0800CC - public const int wrap_content = 2131230924; + public const int visible = 2131230924; + + // aapt resource value: 0x7F0800CD + public const int withText = 2131230925; + + // aapt resource value: 0x7F0800CE + public const int wrap_content = 2131230926; static Id() { @@ -9324,6 +9330,12 @@ namespace Borepin.Droid // aapt resource value: 0x7F0B0044 public const int support_simple_spinner_dropdown_item = 2131427396; + // aapt resource value: 0x7F0B0045 + public const int Tabbar = 2131427397; + + // aapt resource value: 0x7F0B0046 + public const int Toolbar = 2131427398; + static Layout() { global::Android.Runtime.ResourceIdManager.UpdateIdValues(); diff --git a/Borepin/Borepin.Android/Resources/layout/Tabbar.xml b/Borepin/Borepin.Android/Resources/layout/Tabbar.xml new file mode 100644 index 0000000..ad1f87d --- /dev/null +++ b/Borepin/Borepin.Android/Resources/layout/Tabbar.xml @@ -0,0 +1,11 @@ + + diff --git a/Borepin/Borepin.Android/Resources/layout/Toolbar.xml b/Borepin/Borepin.Android/Resources/layout/Toolbar.xml new file mode 100644 index 0000000..aabd0a3 --- /dev/null +++ b/Borepin/Borepin.Android/Resources/layout/Toolbar.xml @@ -0,0 +1,9 @@ + + diff --git a/Borepin/Borepin.Android/Resources/values/styles.xml b/Borepin/Borepin.Android/Resources/values/styles.xml index 86278f8..395083e 100644 --- a/Borepin/Borepin.Android/Resources/values/styles.xml +++ b/Borepin/Borepin.Android/Resources/values/styles.xml @@ -5,6 +5,7 @@