jwetzell/qController
1
0
Fork 0
mirror of https://github.com/jwetzell/qController.git synced 2026-08-07 00:13:49 +00:00
Code Issues Packages Projects Releases Wiki Activity

Begin work on QBrowserPage

Browse Source
This commit is contained in:
Joel Wetzell
2020-06-21 09:02:00 -05:00
parent 7d9f725029
commit 2afec2bc7e
16 changed files with 5504 additions and 46 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Droid/Assets/materialdesignicons-webfont.ttf
BIN
View File
Binary file not shown.
Droid/qController.Droid.csproj
+1
View File
@@ -269,6 +269,7 @@
</ItemGroup>
<ItemGroup>
<None Include="app.config" />
<AndroidAsset Include="Assets\materialdesignicons-webfont.ttf" />
<None Include="Resources\AboutResources.txt" />
<None Include="Properties\AndroidManifest.xml" />
<None Include="Assets\AboutAssets.txt" />
iOS/Resources/materialdesignicons-webfont.ttf
BIN
View File
Binary file not shown.
qController.Standard/Classes/Communication/Events/QEventArgs.cs
+1 -1
View File
@@ -16,7 +16,7 @@ namespace qController.Communication
public class WorkspaceEventArgs : EventArgs
{
public QWorkspace UpdatedWorkspace
public QOldWorkspace UpdatedWorkspace
{
get;
set;
qController.Standard/Classes/Communication/QController.cs
+4 -4
View File
@@ -12,7 +12,7 @@ namespace qController.Communication
public QUpdater qUpdater;
public QClient qClient;
public QWorkspace qWorkspace;
public QOldWorkspace qWorkspace;
public string playbackPosition;
private string ipAddress;
private int port;
@@ -29,19 +29,19 @@ namespace qController.Communication
public void Connect(string workspace_id)
{
Log.Debug($"QCONTROLLER - Connect Called: {workspace_id}");
qWorkspace = new QWorkspace(workspace_id);
qWorkspace = new QOldWorkspace(workspace_id);
qClient.sendTCP("/workspace/"+workspace_id+"/connect");
}
public void Connect(string workspace_id, string passcode)
{
Log.Debug($"QCONTROLLER - Connect with Passcode Called: {workspace_id}:{passcode}");
qWorkspace = new QWorkspace(workspace_id);
qWorkspace = new QOldWorkspace(workspace_id);
qClient.sendTCP("/workspace/" + workspace_id + "/connect", passcode);
}
public void Connect(QWorkspace workspace)
public void Connect(QOldWorkspace workspace)
{
if(workspace.passcode != null)
Connect(workspace.workspace_id, workspace.passcode);
qController.Standard/Classes/Communication/QParser.cs
+3 -3
View File
@@ -109,7 +109,7 @@ namespace qController.Communication
{
try
{
QWorkspace workspace = JsonConvert.DeserializeObject<QWorkspace>(msg.Arguments[0].ToString());
QOldWorkspace workspace = JsonConvert.DeserializeObject<QOldWorkspace>(msg.Arguments[0].ToString());
OnWorkspaceUpdated(workspace);
}
catch (Exception ex)
@@ -141,7 +141,7 @@ namespace qController.Communication
return json.GetValue("data");
}
protected virtual void OnWorkspaceUpdated(QWorkspace workspace)
protected virtual void OnWorkspaceUpdated(QOldWorkspace workspace)
{
WorkspaceUpdated?.Invoke(this, new WorkspaceEventArgs() { UpdatedWorkspace = workspace });
}
@@ -177,7 +177,7 @@ namespace qController.Communication
}
protected virtual void OnWorkspaceLoadError(string id)
{
WorkspaceLoadError?.Invoke(this, new WorkspaceEventArgs { UpdatedWorkspace = new QWorkspace(id) });
WorkspaceLoadError?.Invoke(this, new WorkspaceEventArgs { UpdatedWorkspace = new QOldWorkspace(id) });
}
}
qController.Standard/Classes/Dialogs/WorkspacePrompt.cs
+4 -4
View File
@@ -8,7 +8,7 @@ namespace qController.Dialogs
{
public class WorkspacePromptArgs : EventArgs
{
public QWorkspace SelectedWorkspace
public QOldWorkspace SelectedWorkspace
{
get;
set;
@@ -38,7 +38,7 @@ namespace qController.Dialogs
if (!workspace.hasPasscode)
{
OnWorkspaceSelected(new QWorkspace(workspace.uniqueID));
OnWorkspaceSelected(new QOldWorkspace(workspace.uniqueID));
}
else
{
@@ -64,7 +64,7 @@ namespace qController.Dialogs
{
if (resp.Ok)
{
OnWorkspaceSelected(new QWorkspace(workspace_id,resp.Value));
OnWorkspaceSelected(new QOldWorkspace(workspace_id,resp.Value));
}
else
{
@@ -75,7 +75,7 @@ namespace qController.Dialogs
});
}
protected virtual void OnWorkspaceSelected(QWorkspace workspace)
protected virtual void OnWorkspaceSelected(QOldWorkspace workspace)
{
if (WorkspaceSelected != null)
WorkspaceSelected(this, new WorkspacePromptArgs() { SelectedWorkspace = workspace });
qController.Standard/Classes/QItems/QWorkSpace.cs
+4 -4
View File
@@ -4,7 +4,7 @@ using Serilog;
namespace qController.QItems
{
public class QWorkspace
public class QOldWorkspace
{
public string status { get; set; }
public List<QCueList> data { get; set; }
@@ -15,18 +15,18 @@ namespace qController.QItems
public string passcode { get; set; }
//ONLY FOR PASSING A WORKSPACE LOAD ERROR
public QWorkspace(string id)
public QOldWorkspace(string id)
{
workspace_id = id;
}
public QWorkspace(string id, string passcode)
public QOldWorkspace(string id, string passcode)
{
workspace_id = id;
this.passcode = passcode;
}
public QWorkspace()
public QOldWorkspace()
{
}
qController.Standard/Helpers/IconConstants.cs
+5335
View File
File diff suppressed because it is too large Load Diff
qController.Standard/Pages/App.xaml
+6 -1
View File
@@ -6,5 +6,10 @@
<On Platform="Android" Value="qfont.ttf#qfont" />
<On Platform="iOS" Value="qfont" />
</OnPlatform>
</Application.Resources>
<OnPlatform x:Key="MaterialFontFamily" x:TypeArguments="x:String">
<On Platform="iOS" Value="Material Design Icons" />
<On Platform="Android" Value="materialdesignicons-webfont.ttf#Material Design Icons" />
</OnPlatform>
</Application.Resources>
</Application>
qController.Standard/Pages/MenuPage.xaml.cs
+1 -1
View File
@@ -85,7 +85,7 @@ namespace qController
});
}
public void ChangeToWorkspace(QWorkspace workspace)
public void ChangeToWorkspace(QOldWorkspace workspace)
{
for(int i = 0; i < workspace.data.Count; i++)
{
qController.Standard/Pages/QBrowserPage.xaml
+17 -3
View File
@@ -16,19 +16,33 @@
</ListView>
<ListView x:Name="serverListView" GroupDisplayBinding="{Binding name}" IsGroupingEnabled="True">
<ListView x:Name="serverListView"
GroupDisplayBinding="{Binding name}"
IsGroupingEnabled="True"
d:IsGroupingEnabled="False"
ItemsSource="{Binding ServersGrouped}">
<ListView.ItemTemplate>
<DataTemplate>
<ViewCell>
<Grid BackgroundColor="Blue">
<Grid Margin="20,0,0,0">
<Grid.RowDefinitions>
<RowDefinition Height="*"/>
</Grid.RowDefinitions>
<Grid.ColumnDefinitions>
<ColumnDefinition Width="*"/>
<ColumnDefinition Width="Auto"/>
</Grid.ColumnDefinitions>
<Label Text="{Binding name}"
<Label Grid.Column="0" Text="{Binding Name}"
HorizontalOptions="FillAndExpand"
VerticalOptions="FillAndExpand"
VerticalTextAlignment="Center"
HorizontalTextAlignment="Start"/>
<Label Grid.Column="1" Text="&#xf1184;"
FontFamily="{StaticResource MaterialFontFamily}"
FontSize="Large"
IsVisible="{Binding HasPasscode}"
HorizontalOptions="FillAndExpand"
VerticalOptions="FillAndExpand"
VerticalTextAlignment="Center"
qController.Standard/Pages/QBrowserPage.xaml.cs
+11 -25
View File
@@ -1,5 +1,4 @@
using QSharp;
using System.Collections.Generic;
using Xamarin.Forms;
using Serilog;
using System.Collections.ObjectModel;
@@ -8,21 +7,23 @@ using Acr.UserDialogs;
using qController.Dialogs;
using Xamarin.Essentials;
using System;
using qController.ViewModels;
namespace qController.Pages
{
public partial class QBrowserPage : ContentPage
{
public ObservableCollection<ServerGroup> servers = new ObservableCollection<ServerGroup>();
public QBrowserPage()
{
InitializeComponent();
App.rootPage.MenuItemSelected += OnMenuItemSelected;
serverListView.ItemsSource = servers;
QBrowser browser = new QBrowser();
browser.ServerUpdatedWorkspaces += Browser_ServerUpdatedWorkspaces;
serverListView.ItemSelected += ServerListView_ItemSelected;
serverListView.BindingContext = new QBrowserViewModel(new QBrowser());
serverListView.ItemSelected += QWorkspaceSelected;
storageListView.ItemsSource = QStorage.qInstances;
storageListView.ItemTemplate = new DataTemplate(typeof(QInstanceCell));
@@ -36,25 +37,17 @@ namespace qController.Pages
}
async void ServerListView_ItemSelected(object sender, SelectedItemChangedEventArgs e)
async void QWorkspaceSelected(object sender, SelectedItemChangedEventArgs e)
{
if (e.SelectedItem == null)
return;
QWorkspace selectedWorkspace = e.SelectedItem as QWorkspace;
QWorkspace selectedWorkspace = (e.SelectedItem as QWorkspaceViewModel).workspace;
Log.Debug($"[demo] workspace: {selectedWorkspace.nameWithoutPathExtension} has been selected");
((ListView)sender).SelectedItem = null;
await Navigation.PushAsync(new WorkspacePage(selectedWorkspace));
}
private void Browser_ServerUpdatedWorkspaces(object source, QServerUpdatedArgs args)
{
ServerGroup serverGroup = new ServerGroup(args.server.name);
serverGroup.AddRange(args.server.workspaces);
Device.BeginInvokeOnMainThread(() =>
{
servers.Add(serverGroup);
});
}
void AddWorkspace()
@@ -79,12 +72,5 @@ namespace qController.Pages
}
}
public class ServerGroup : List<QWorkspace>
{
public string name { get; set; }
public ServerGroup(string name)
{
this.name = name;
}
}
}
qController.Standard/ViewModels/QBrowserViewModel.cs
+34
View File
@@ -0,0 +1,34 @@
using QSharp;
using System.Collections.ObjectModel;
using System.ComponentModel;
using System.Runtime.CompilerServices;
namespace qController.ViewModels
{
public class QBrowserViewModel : INotifyPropertyChanged
{
QBrowser browser;
public event PropertyChangedEventHandler PropertyChanged;
public ObservableCollection<QServerViewModel> ServersGrouped { get; set; }
public QBrowserViewModel(QBrowser browser)
{
this.browser = browser;
ServersGrouped = new ObservableCollection<QServerViewModel>();
this.browser.ServerFound += OnServerFound;
}
private void OnServerFound(object source, QServerFoundArgs args)
{
ServersGrouped.Add(new QServerViewModel(args.server));
}
void OnPropertyChanged([CallerMemberName] string name = "")
{
PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(name));
}
}
}
qController.Standard/ViewModels/QServerViewModel.cs
+43
View File
@@ -0,0 +1,43 @@
using qController.Pages;
using QSharp;
using System.Collections.ObjectModel;
namespace qController.ViewModels
{
public class QServerViewModel : ObservableCollection<QWorkspaceViewModel>
{
QServer server;
public string name
{
get
{
return server.name;
}
set
{
server.name = value;
}
}
public QServerViewModel(QServer server)
{
this.server = server;
name = this.server.name;
foreach (var workspace in this.server.workspaces)
{
this.Add(new QWorkspaceViewModel(workspace));
}
this.server.ServerUpdated += OnServerUpdated;
}
private void OnServerUpdated(object source, QServerUpdatedArgs args)
{
foreach (var workspace in this.server.workspaces)
{
QWorkspaceViewModel workspaceViewModel = new QWorkspaceViewModel(workspace);
if (!Contains(workspaceViewModel))
Add(workspaceViewModel);
}
}
}
}
qController.Standard/ViewModels/QWorkspaceViewModel.cs
+40
View File
@@ -0,0 +1,40 @@
using qController.QItems;
using System;
using System.Collections.Generic;
using System.Text;
using QSharp;
namespace qController.ViewModels
{
public class QWorkspaceViewModel
{
public QWorkspace workspace;
public QWorkspaceViewModel(QWorkspace workspace)
{
this.workspace = workspace;
}
public string Name
{
get
{
return workspace.name;
}
set
{
}
}
public bool HasPasscode
{
get
{
return workspace.hasPasscode;
}
set
{
}
}
}
}