diff --git a/Client/TheReel/.vs/TheReel/v14/.suo b/Client/TheReel/.vs/TheReel/v14/.suo index f5d83dd..081d66e 100644 Binary files a/Client/TheReel/.vs/TheReel/v14/.suo and b/Client/TheReel/.vs/TheReel/v14/.suo differ diff --git a/Client/TheReel/TheReel/TheReel.Droid/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/Client/TheReel/TheReel/TheReel.Droid/obj/Debug/DesignTimeResolveAssemblyReferences.cache index 6288a53..d435ea7 100644 Binary files a/Client/TheReel/TheReel/TheReel.Droid/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/Client/TheReel/TheReel/TheReel.Droid/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/Client/TheReel/TheReel/TheReel.Droid/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/Client/TheReel/TheReel/TheReel.Droid/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index fe2bb0b..9d405b5 100644 Binary files a/Client/TheReel/TheReel/TheReel.Droid/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/Client/TheReel/TheReel/TheReel.Droid/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/Client/TheReel/TheReel/TheReel.Droid/obj/Debug/TheReel.Droid.csproj.FileListAbsolute.txt b/Client/TheReel/TheReel/TheReel.Droid/obj/Debug/TheReel.Droid.csproj.FileListAbsolute.txt index 68b951b..55ee406 100644 --- a/Client/TheReel/TheReel/TheReel.Droid/obj/Debug/TheReel.Droid.csproj.FileListAbsolute.txt +++ b/Client/TheReel/TheReel/TheReel.Droid/obj/Debug/TheReel.Droid.csproj.FileListAbsolute.txt @@ -123,7 +123,6 @@ C:\Users\Aaron Yerman\Downloads\Projects\TheReel\Client\TheReel\TheReel\TheReel. C:\Users\Aaron Yerman\Downloads\Projects\TheReel\Client\TheReel\TheReel\TheReel.Droid\obj\Debug\android\assets\System.Xml.Linq.dll.mdb C:\Users\Aaron Yerman\Downloads\Projects\TheReel\Client\TheReel\TheReel\TheReel.Droid\obj\Debug\android\assets\TheReel.dll.mdb C:\Users\Aaron Yerman\Downloads\Projects\TheReel\Client\TheReel\TheReel\TheReel.Droid\obj\Debug\android\assets\TheReel.Droid.dll.mdb -C:\Users\Aaron Yerman\Downloads\Projects\TheReel\Client\TheReel\TheReel\TheReel.Droid\obj\Debug\TheReel.Droid.dll.mdb C:\Users\Armen_000\Documents\GitHub\TheReel\Client\TheReel\TheReel\TheReel.Droid\bin\Debug\TheReel.Droid.dll C:\Users\Armen_000\Documents\GitHub\TheReel\Client\TheReel\TheReel\TheReel.Droid\bin\Debug\TheReel.Droid.pdb C:\Users\Armen_000\Documents\GitHub\TheReel\Client\TheReel\TheReel\TheReel.Droid\bin\Debug\TheReel.Droid.apk @@ -252,4 +251,5 @@ C:\Users\Billh\OneDrive\Documents\GitHub\TheReel\Client\TheReel\TheReel\TheReel. C:\Users\Billh\OneDrive\Documents\GitHub\TheReel\Client\TheReel\TheReel\TheReel.Droid\obj\Debug\android\assets\TheReel.dll.mdb C:\Users\Billh\OneDrive\Documents\GitHub\TheReel\Client\TheReel\TheReel\TheReel.Droid\obj\Debug\android\assets\TheReel.Droid.dll.mdb C:\Users\Billh\OneDrive\Documents\GitHub\TheReel\Client\TheReel\TheReel\TheReel.Droid\obj\Debug\TheReel.Droid.dll.mdb -C:\Users\Billh\OneDrive\Documents\GitHub\TheReel\Client\TheReel\TheReel\TheReel.Droid\bin\Debug\TheReel.Droid.dll.mdb +C:\Users\Aaron Yerman\Downloads\Projects\TheReel\Client\TheReel\TheReel\TheReel.Droid\obj\Debug\TheReel.Droid.dll.mdb +C:\Users\Aaron Yerman\Downloads\Projects\TheReel\Client\TheReel\TheReel\TheReel.Droid\bin\Debug\TheReel.Droid.dll.mdb diff --git a/Client/TheReel/TheReel/TheReel.Droid/obj/Debug/TheReel.Droid.csprojResolveAssemblyReference.cache b/Client/TheReel/TheReel/TheReel.Droid/obj/Debug/TheReel.Droid.csprojResolveAssemblyReference.cache index 59dfea3..e6dae6c 100644 Binary files a/Client/TheReel/TheReel/TheReel.Droid/obj/Debug/TheReel.Droid.csprojResolveAssemblyReference.cache and b/Client/TheReel/TheReel/TheReel.Droid/obj/Debug/TheReel.Droid.csprojResolveAssemblyReference.cache differ diff --git a/Client/TheReel/TheReel/TheReel.Droid/obj/Debug/build.props b/Client/TheReel/TheReel/TheReel.Droid/obj/Debug/build.props index d4e3350..8e0b64d 100644 --- a/Client/TheReel/TheReel/TheReel.Droid/obj/Debug/build.props +++ b/Client/TheReel/TheReel/TheReel.Droid/obj/Debug/build.props @@ -12,5 +12,5 @@ AndroidSdkPath= AndroidNdkPath= JavaSdkPath= AndroidSequencePointsMode=None -XamarinAndroidVersion=6.1.1-0 +XamarinAndroidVersion=6.1.1-1 AndroidManagedSymbols=False diff --git a/Client/TheReel/TheReel/TheReel.Droid/obj/Debug/libraryprojectimports.cache b/Client/TheReel/TheReel/TheReel.Droid/obj/Debug/libraryprojectimports.cache index 921b487..9d2c91e 100644 --- a/Client/TheReel/TheReel/TheReel.Droid/obj/Debug/libraryprojectimports.cache +++ b/Client/TheReel/TheReel/TheReel.Droid/obj/Debug/libraryprojectimports.cache @@ -2,25 +2,25 @@ - C:\Users\Billh\OneDrive\Documents\GitHub\TheReel\Client\TheReel\TheReel\TheReel.Droid\obj\Debug\__library_projects__\SQLitePCL.batteries\library_project_imports\res - C:\Users\Billh\OneDrive\Documents\GitHub\TheReel\Client\TheReel\TheReel\TheReel.Droid\obj\Debug\__library_projects__\SQLitePCL.raw\library_project_imports\res - C:\Users\Billh\OneDrive\Documents\GitHub\TheReel\Client\TheReel\TheReel\TheReel.Droid\obj\Debug\__library_projects__\SQLitePCLPlugin_esqlite3\library_project_imports\res - C:\Users\Billh\OneDrive\Documents\GitHub\TheReel\Client\TheReel\TheReel\TheReel.Droid\obj\Debug\__library_projects__\Xamarin.Forms.Platform.Android\library_project_imports\res - C:\Users\Billh\OneDrive\Documents\GitHub\TheReel\Client\TheReel\TheReel\TheReel.Droid\obj\Debug\__library_projects__\Xamarin.Forms.Platform\library_project_imports\res + C:\Users\Aaron Yerman\Downloads\Projects\TheReel\Client\TheReel\TheReel\TheReel.Droid\obj\Debug\__library_projects__\SQLitePCL.batteries\library_project_imports\res + C:\Users\Aaron Yerman\Downloads\Projects\TheReel\Client\TheReel\TheReel\TheReel.Droid\obj\Debug\__library_projects__\SQLitePCL.raw\library_project_imports\res + C:\Users\Aaron Yerman\Downloads\Projects\TheReel\Client\TheReel\TheReel\TheReel.Droid\obj\Debug\__library_projects__\SQLitePCLPlugin_esqlite3\library_project_imports\res + C:\Users\Aaron Yerman\Downloads\Projects\TheReel\Client\TheReel\TheReel\TheReel.Droid\obj\Debug\__library_projects__\Xamarin.Forms.Platform.Android\library_project_imports\res + C:\Users\Aaron Yerman\Downloads\Projects\TheReel\Client\TheReel\TheReel\TheReel.Droid\obj\Debug\__library_projects__\Xamarin.Forms.Platform\library_project_imports\res - C:\Users\Billh\OneDrive\Documents\GitHub\TheReel\Client\TheReel\TheReel\TheReel.Droid\obj\Debug\__library_projects__\SQLitePCL.batteries\library_project_imports\assets - C:\Users\Billh\OneDrive\Documents\GitHub\TheReel\Client\TheReel\TheReel\TheReel.Droid\obj\Debug\__library_projects__\SQLitePCL.raw\library_project_imports\assets - C:\Users\Billh\OneDrive\Documents\GitHub\TheReel\Client\TheReel\TheReel\TheReel.Droid\obj\Debug\__library_projects__\SQLitePCLPlugin_esqlite3\library_project_imports\assets - C:\Users\Billh\OneDrive\Documents\GitHub\TheReel\Client\TheReel\TheReel\TheReel.Droid\obj\Debug\__library_projects__\Xamarin.Forms.Platform.Android\library_project_imports\assets - C:\Users\Billh\OneDrive\Documents\GitHub\TheReel\Client\TheReel\TheReel\TheReel.Droid\obj\Debug\__library_projects__\Xamarin.Forms.Platform\library_project_imports\assets + C:\Users\Aaron Yerman\Downloads\Projects\TheReel\Client\TheReel\TheReel\TheReel.Droid\obj\Debug\__library_projects__\SQLitePCL.batteries\library_project_imports\assets + C:\Users\Aaron Yerman\Downloads\Projects\TheReel\Client\TheReel\TheReel\TheReel.Droid\obj\Debug\__library_projects__\SQLitePCL.raw\library_project_imports\assets + C:\Users\Aaron Yerman\Downloads\Projects\TheReel\Client\TheReel\TheReel\TheReel.Droid\obj\Debug\__library_projects__\SQLitePCLPlugin_esqlite3\library_project_imports\assets + C:\Users\Aaron Yerman\Downloads\Projects\TheReel\Client\TheReel\TheReel\TheReel.Droid\obj\Debug\__library_projects__\Xamarin.Forms.Platform.Android\library_project_imports\assets + C:\Users\Aaron Yerman\Downloads\Projects\TheReel\Client\TheReel\TheReel\TheReel.Droid\obj\Debug\__library_projects__\Xamarin.Forms.Platform\library_project_imports\assets - C:\Users\Billh\OneDrive\Documents\GitHub\TheReel\Client\TheReel\TheReel\TheReel.Droid\obj\Debug\__library_projects__\SQLitePCL.batteries.stamp - C:\Users\Billh\OneDrive\Documents\GitHub\TheReel\Client\TheReel\TheReel\TheReel.Droid\obj\Debug\__library_projects__\SQLitePCL.raw.stamp - C:\Users\Billh\OneDrive\Documents\GitHub\TheReel\Client\TheReel\TheReel\TheReel.Droid\obj\Debug\__library_projects__\SQLitePCLPlugin_esqlite3.stamp - C:\Users\Billh\OneDrive\Documents\GitHub\TheReel\Client\TheReel\TheReel\TheReel.Droid\obj\Debug\__library_projects__\Xamarin.Forms.Platform.Android.stamp - C:\Users\Billh\OneDrive\Documents\GitHub\TheReel\Client\TheReel\TheReel\TheReel.Droid\obj\Debug\__library_projects__\Xamarin.Forms.Platform.stamp + C:\Users\Aaron Yerman\Downloads\Projects\TheReel\Client\TheReel\TheReel\TheReel.Droid\obj\Debug\__library_projects__\SQLitePCL.batteries.stamp + C:\Users\Aaron Yerman\Downloads\Projects\TheReel\Client\TheReel\TheReel\TheReel.Droid\obj\Debug\__library_projects__\SQLitePCL.raw.stamp + C:\Users\Aaron Yerman\Downloads\Projects\TheReel\Client\TheReel\TheReel\TheReel.Droid\obj\Debug\__library_projects__\SQLitePCLPlugin_esqlite3.stamp + C:\Users\Aaron Yerman\Downloads\Projects\TheReel\Client\TheReel\TheReel\TheReel.Droid\obj\Debug\__library_projects__\Xamarin.Forms.Platform.Android.stamp + C:\Users\Aaron Yerman\Downloads\Projects\TheReel\Client\TheReel\TheReel\TheReel.Droid\obj\Debug\__library_projects__\Xamarin.Forms.Platform.stamp \ No newline at end of file diff --git a/Client/TheReel/TheReel/TheReel.Droid/obj/Debug/sdks.cache b/Client/TheReel/TheReel/TheReel.Droid/obj/Debug/sdks.cache index 472f961..d536b00 100644 --- a/Client/TheReel/TheReel/TheReel.Droid/obj/Debug/sdks.cache +++ b/Client/TheReel/TheReel/TheReel.Droid/obj/Debug/sdks.cache @@ -2,18 +2,18 @@ 23 23 - C:\Program Files\Android\ndk\android-ndk-r11c - C:\Users\Billh\AppData\Local\Xamarin\MonoForAndroid\AndroidSDK\build-tools\23.0.2 - C:\Users\Billh\AppData\Local\Xamarin\MonoForAndroid\AndroidSDK\build-tools\23.0.2 - C:\Users\Billh\AppData\Local\Xamarin\MonoForAndroid\AndroidSDK - C:\Program Files (x86)\Java\jdk1.7.0_71 + C:\ProgramData\Microsoft\AndroidNDK\android-ndk-r10e\ + C:\Program Files (x86)\Android\android-sdk\build-tools\23.0.1 + C:\Program Files (x86)\Android\android-sdk\build-tools\23.0.1 + C:\Program Files (x86)\Android\android-sdk + C:\Program Files (x86)\Java\jdk1.7.0_55 C:\Program Files (x86)\MSBuild\Xamarin\Android C:\Program Files (x86)\MSBuild\Xamarin\Android C:\Program Files (x86)\Reference Assemblies\Microsoft\Framework\MonoAndroid\v1.0\ v6.0 - C:\Users\Billh\AppData\Local\Xamarin\MonoForAndroid\AndroidSDK\build-tools\23.0.2 + C:\Program Files (x86)\Android\android-sdk\build-tools\23.0.1 23 None diff --git a/Client/TheReel/TheReel/TheReel.UWP/obj/x86/Debug/XamlSaveStateFile.xml b/Client/TheReel/TheReel/TheReel.UWP/obj/x86/Debug/XamlSaveStateFile.xml index 4a797c1..587b5ec 100644 --- a/Client/TheReel/TheReel/TheReel.UWP/obj/x86/Debug/XamlSaveStateFile.xml +++ b/Client/TheReel/TheReel/TheReel.UWP/obj/x86/Debug/XamlSaveStateFile.xml @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/Client/TheReel/TheReel/TheReel.WinPhone/obj/Debug/App.g.i.cs b/Client/TheReel/TheReel/TheReel.WinPhone/obj/Debug/App.g.i.cs index ff46d6e..c39ee47 100644 --- a/Client/TheReel/TheReel/TheReel.WinPhone/obj/Debug/App.g.i.cs +++ b/Client/TheReel/TheReel/TheReel.WinPhone/obj/Debug/App.g.i.cs @@ -1,6 +1,6 @@  -#pragma checksum "C:\Users\Armen_000\Documents\GitHub\TheReel\Client\TheReel\TheReel\TheReel.WinPhone\App.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "60C5C1039481EA0AC3EA5877E3A40FDD" +#pragma checksum "C:\Users\Aaron Yerman\Downloads\Projects\TheReel\Client\TheReel\TheReel\TheReel.WinPhone\App.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "60C5C1039481EA0AC3EA5877E3A40FDD" //------------------------------------------------------------------------------ // // This code was generated by a tool. diff --git a/Client/TheReel/TheReel/TheReel.WinPhone/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/Client/TheReel/TheReel/TheReel.WinPhone/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 28c32f9..8504a6d 100644 Binary files a/Client/TheReel/TheReel/TheReel.WinPhone/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/Client/TheReel/TheReel/TheReel.WinPhone/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/Client/TheReel/TheReel/TheReel.WinPhone/obj/Debug/MainPage.g.i.cs b/Client/TheReel/TheReel/TheReel.WinPhone/obj/Debug/MainPage.g.i.cs index a93e597..ed03725 100644 --- a/Client/TheReel/TheReel/TheReel.WinPhone/obj/Debug/MainPage.g.i.cs +++ b/Client/TheReel/TheReel/TheReel.WinPhone/obj/Debug/MainPage.g.i.cs @@ -1,6 +1,6 @@  -#pragma checksum "C:\Users\Armen_000\Documents\GitHub\TheReel\Client\TheReel\TheReel\TheReel.WinPhone\MainPage.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "F86BE56460C1B4CE673EF0A384479508" +#pragma checksum "C:\Users\Aaron Yerman\Downloads\Projects\TheReel\Client\TheReel\TheReel\TheReel.WinPhone\MainPage.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "F86BE56460C1B4CE673EF0A384479508" //------------------------------------------------------------------------------ // // This code was generated by a tool. diff --git a/Client/TheReel/TheReel/TheReel.WinPhone/obj/Debug/XamlSaveStateFile.xml b/Client/TheReel/TheReel/TheReel.WinPhone/obj/Debug/XamlSaveStateFile.xml index e471b2e..395d7a2 100644 --- a/Client/TheReel/TheReel/TheReel.WinPhone/obj/Debug/XamlSaveStateFile.xml +++ b/Client/TheReel/TheReel/TheReel.WinPhone/obj/Debug/XamlSaveStateFile.xml @@ -1,15 +1,15 @@ - - - - - - - - - - + + + + + + + + + + diff --git a/Client/TheReel/TheReel/TheReel.Windows/obj/Debug/App.g.i.cs b/Client/TheReel/TheReel/TheReel.Windows/obj/Debug/App.g.i.cs index 1a3e9c7..d5f94ba 100644 --- a/Client/TheReel/TheReel/TheReel.Windows/obj/Debug/App.g.i.cs +++ b/Client/TheReel/TheReel/TheReel.Windows/obj/Debug/App.g.i.cs @@ -1,6 +1,6 @@  -#pragma checksum "C:\Users\Armen_000\Documents\GitHub\TheReel\Client\TheReel\TheReel\TheReel.Windows\App.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "A80D52BBC27CFAF6DAB53725D4470A33" +#pragma checksum "C:\Users\Aaron Yerman\Downloads\Projects\TheReel\Client\TheReel\TheReel\TheReel.Windows\App.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "A80D52BBC27CFAF6DAB53725D4470A33" //------------------------------------------------------------------------------ // // This code was generated by a tool. diff --git a/Client/TheReel/TheReel/TheReel.Windows/obj/Debug/MainPage.g.i.cs b/Client/TheReel/TheReel/TheReel.Windows/obj/Debug/MainPage.g.i.cs index 2265d9a..75915db 100644 --- a/Client/TheReel/TheReel/TheReel.Windows/obj/Debug/MainPage.g.i.cs +++ b/Client/TheReel/TheReel/TheReel.Windows/obj/Debug/MainPage.g.i.cs @@ -1,6 +1,6 @@  -#pragma checksum "C:\Users\Armen_000\Documents\GitHub\TheReel\Client\TheReel\TheReel\TheReel.Windows\MainPage.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "CE14117958BB1F0E228200BCD07FEF3E" +#pragma checksum "C:\Users\Aaron Yerman\Downloads\Projects\TheReel\Client\TheReel\TheReel\TheReel.Windows\MainPage.xaml" "{406ea660-64cf-4c82-b6f0-42d48172a799}" "CE14117958BB1F0E228200BCD07FEF3E" //------------------------------------------------------------------------------ // // This code was generated by a tool. diff --git a/Client/TheReel/TheReel/TheReel.Windows/obj/Debug/XamlSaveStateFile.xml b/Client/TheReel/TheReel/TheReel.Windows/obj/Debug/XamlSaveStateFile.xml index 296f520..7c767d8 100644 --- a/Client/TheReel/TheReel/TheReel.Windows/obj/Debug/XamlSaveStateFile.xml +++ b/Client/TheReel/TheReel/TheReel.Windows/obj/Debug/XamlSaveStateFile.xml @@ -1,11 +1,11 @@ - - - - - - + + + + + + diff --git a/Client/TheReel/TheReel/TheReel/App.cs b/Client/TheReel/TheReel/TheReel/App.cs index 713a134..1bcb6f2 100644 --- a/Client/TheReel/TheReel/TheReel/App.cs +++ b/Client/TheReel/TheReel/TheReel/App.cs @@ -17,7 +17,7 @@ public App() UserDAO UserWeb = new UserDAO(); //cleanDB(sqlDB); var liteUser = sqlDB.GetUsers().FirstOrDefault(); - if(liteUser != null && UserWeb.Login(liteUser)) + if(liteUser != null /*&& UserWeb.Login(liteUser)*/) { var newMain = new MasterDetailPage(); newMain.Master = new NavPage(liteUser.username); diff --git a/Client/TheReel/TheReel/TheReel/Core/Enums/ImageOrientation.cs b/Client/TheReel/TheReel/TheReel/Core/Enums/ImageOrientation.cs deleted file mode 100644 index 4dd35fd..0000000 --- a/Client/TheReel/TheReel/TheReel/Core/Enums/ImageOrientation.cs +++ /dev/null @@ -1,32 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace TheReel.Core.Enums -{ - public enum ImageOrientation - { - /// - /// The image to left - /// - ImageToLeft = 0, - /// - /// The image on top - /// - ImageOnTop = 1, - /// - /// The image to right - /// - ImageToRight = 2, - /// - /// The image on bottom - /// - ImageOnBottom = 3, - /// - /// The image centered - /// - ImageCentered = 4 - } -} diff --git a/Client/TheReel/TheReel/TheReel/Core/Enums/Orientation.cs b/Client/TheReel/TheReel/TheReel/Core/Enums/Orientation.cs deleted file mode 100644 index bb8c7ca..0000000 --- a/Client/TheReel/TheReel/TheReel/Core/Enums/Orientation.cs +++ /dev/null @@ -1,40 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace TheReel.Core.Enums -{ - public enum Orientation - { - /// - /// The none - /// - None = 0, - /// - /// The portrait - /// - Portrait = 1, - /// - /// The landscape - /// - Landscape = 2, - /// - /// The portrait up - /// - PortraitUp = 5, - /// - /// The portrait down - /// - PortraitDown = 9, - /// - /// The landscape left - /// - LandscapeLeft = 18, - /// - /// The landscape right - /// - LandscapeRight = 34, - } -} diff --git a/Client/TheReel/TheReel/TheReel/Core/Enums/TextCellDetailLocation.cs b/Client/TheReel/TheReel/TheReel/Core/Enums/TextCellDetailLocation.cs deleted file mode 100644 index 0bceea9..0000000 --- a/Client/TheReel/TheReel/TheReel/Core/Enums/TextCellDetailLocation.cs +++ /dev/null @@ -1,20 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Text; -using System.Threading.Tasks; - -namespace TheReel.Core.Enums -{ - public enum TextCellDetailLocation - { - /// - /// Set detail Below - /// - Below, - /// - /// Set detail Right - /// - Right - } -} diff --git a/Client/TheReel/TheReel/TheReel/Core/ImageButtonSourceConverter.cs b/Client/TheReel/TheReel/TheReel/Core/ImageButtonSourceConverter.cs deleted file mode 100644 index 156bb0e..0000000 --- a/Client/TheReel/TheReel/TheReel/Core/ImageButtonSourceConverter.cs +++ /dev/null @@ -1,51 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Globalization; -using System.Linq; -using System.Text; -using System.Threading.Tasks; -using Xamarin.Forms; - -namespace TheReel.Core -{ - public class ImageSourceConverter : TypeConverter - { - /// - /// Checks to see if the type attempted to be converted from is a string. - /// - /// The type that is attempting to be converted. - /// Returns true if the sourceType is a . - public override bool CanConvertFrom(Type sourceType) - { - return sourceType == typeof(string); - } - - /// - /// Converts the string value into a either from a file or URI. - /// - /// The current culture being used. - /// The string value to convert. - /// Returns a loaded from the value. - public override object ConvertFrom(CultureInfo culture, object value) - { - if (value == null) - { - return null; - } - - var str = value as string; - if (str != null) - { - Uri result; - if (!Uri.TryCreate(str, UriKind.Absolute, out result) || !(result.Scheme != "file")) - { - return ImageSource.FromFile(str); - } - return ImageSource.FromUri(result); - } - throw new InvalidOperationException( - string.Format("Cannot convert \"{0}\" into {1}", - new[] { value, typeof(ImageSource) })); - } - } -} diff --git a/Client/TheReel/TheReel/TheReel/TheReel.csproj b/Client/TheReel/TheReel/TheReel/TheReel.csproj index 03f72d7..6ca17dc 100644 --- a/Client/TheReel/TheReel/TheReel/TheReel.csproj +++ b/Client/TheReel/TheReel/TheReel/TheReel.csproj @@ -36,14 +36,9 @@ - - - - - LoginPage.xaml @@ -65,9 +60,6 @@ - - ..\..\..\..\..\..\..\..\Program Files (x86)\Reference Assemblies\Microsoft\Framework\MonoAndroid\v6.0\Mono.Android.dll - ..\..\packages\Newtonsoft.Json.8.0.3\lib\portable-net40+sl5+wp80+win8+wpa81\Newtonsoft.Json.dll True diff --git a/Client/TheReel/TheReel/TheReel/ViewModels/TopicsViewModel.cs b/Client/TheReel/TheReel/TheReel/ViewModels/TopicsViewModel.cs index 9125777..fa2f443 100644 --- a/Client/TheReel/TheReel/TheReel/ViewModels/TopicsViewModel.cs +++ b/Client/TheReel/TheReel/TheReel/ViewModels/TopicsViewModel.cs @@ -57,10 +57,10 @@ public TopicsViewModel() { Topics = new ObservableCollection(); TopicsDAO topicsWeb = new TopicsDAO(); - foreach(var topic in topicsWeb.getActiveTopics()) + /*foreach(var topic in topicsWeb.getActiveTopics()) { Topics.Add(topic); - } + }*/ } } } diff --git a/Client/TheReel/TheReel/TheReel/Views/Imagebutton/ImageButton.cs b/Client/TheReel/TheReel/TheReel/Views/Imagebutton/ImageButton.cs deleted file mode 100644 index 91925a2..0000000 --- a/Client/TheReel/TheReel/TheReel/Views/Imagebutton/ImageButton.cs +++ /dev/null @@ -1,158 +0,0 @@ -using System; -using System.Collections.Generic; -using System.Linq; -using System.Linq.Expressions; -using System.Text; -using System.Threading.Tasks; -using TheReel.Core; -using TheReel.Core.Enums; -using Xamarin.Forms; - -namespace TheReel.Views.Imagebutton -{ - public class ImageButton : Button - { - /// - /// Backing field for the Image property. - /// - public static readonly BindableProperty SourceProperty = BindableProperty.Create( - (Expression>)(w => w.Source), - null, - BindingMode.OneWay, - null, - (bindable, oldvalue, newvalue) => ((VisualElement)bindable).ToString()); - - /// - /// Backing field for the Image property. - /// - public static readonly BindableProperty DisabledSourceProperty = BindableProperty.Create( - (Expression>)(w => w.DisabledSource), - null, - BindingMode.OneWay, - null, - (bindable, oldvalue, newvalue) => ((VisualElement)bindable).ToString()); - - /// - /// Backing field for the image width property. - /// - public static readonly BindableProperty ImageWidthRequestProperty = - BindableProperty.Create( - p => p.ImageWidthRequest, default(int)); - - /// - /// Backing field for the image height property. - /// - public static readonly BindableProperty ImageHeightRequestProperty = - BindableProperty.Create( - p => p.ImageHeightRequest, default(int)); - - /// - /// Backing field for the orientation property. - /// - public static readonly BindableProperty OrientationProperty = - BindableProperty.Create( - p => p.Orientation, ImageOrientation.ImageToLeft); - - /// - /// Backing field for the tint color property. - /// - public static readonly BindableProperty ImageTintColorProperty = - BindableProperty.Create( - p => p.ImageTintColor, Color.Transparent); - - /// - /// Backing field for the disbaled tint color property. - /// - public static readonly BindableProperty DisabledImageTintColorProperty = - BindableProperty.Create( - p => p.DisabledImageTintColor, Color.Transparent); - - /// - /// Gets or sets the ImageSource to use with the control. - /// - /// - /// The Source property gets/sets the value of the backing field, SourceProperty. - /// - [TypeConverter(typeof(ImageSourceConverter))] - public ImageSource Source - { - get { return (ImageSource)GetValue(SourceProperty); } - set { SetValue(SourceProperty, value); } - } - - /// - /// Gets or sets the ImageSource to use with the control. - /// - /// - /// The Source property gets/sets the value of the backing field, SourceProperty. - /// - [TypeConverter(typeof(ImageSourceConverter))] - public ImageSource DisabledSource - { - get { return (ImageSource)GetValue(DisabledSourceProperty); } - set { SetValue(DisabledSourceProperty, value); } - } - - /// - /// Gets or sets The orientation of the image relative to the text. - /// - /// - /// The Orientation property gets/sets the value of the backing field, OrientationProperty. - /// - public ImageOrientation Orientation - { - get { return (ImageOrientation)GetValue(OrientationProperty); } - set { SetValue(OrientationProperty, value); } - } - - /// - /// Gets or sets the requested height of the image. If less than or equal to zero than a - /// height of 50 will be used. - /// - /// - /// The ImageHeightRequest property gets/sets the value of the backing field, ImageHeightRequestProperty. - /// - public int ImageHeightRequest - { - get { return (int)GetValue(ImageHeightRequestProperty); } - set { SetValue(ImageHeightRequestProperty, value); } - } - - /// - /// Gets or sets the requested width of the image. If less than or equal to zero than a - /// width of 50 will be used. - /// - /// - /// The ImageHeightRequest property gets/sets the value of the backing field, ImageHeightRequestProperty. - /// - public int ImageWidthRequest - { - get { return (int)GetValue(ImageWidthRequestProperty); } - set { SetValue(ImageWidthRequestProperty, value); } - } - - /// - /// Gets or sets the tint color of the image - /// - /// - /// The ImageTintColor property gets/sets the value of the backing field, ImageTintColorProperty. - /// - public Color ImageTintColor - { - get { return (Color)GetValue(ImageTintColorProperty); } - set { SetValue(ImageTintColorProperty, value); } - } - - /// - /// Gets or sets the tint color of the image when the button is disabled - /// - /// - /// The DisabledImageTintColor property gets/sets the value of the backing field, DisabledImageTintColorProperty. - /// - public Color DisabledImageTintColor - { - get { return (Color)GetValue(DisabledImageTintColorProperty); } - set { SetValue(DisabledImageTintColorProperty, value); } - } - } -} diff --git a/Client/TheReel/TheReel/TheReel/Views/LoginPage.xaml.cs b/Client/TheReel/TheReel/TheReel/Views/LoginPage.xaml.cs index eb8deb1..69dd4d2 100644 --- a/Client/TheReel/TheReel/TheReel/Views/LoginPage.xaml.cs +++ b/Client/TheReel/TheReel/TheReel/Views/LoginPage.xaml.cs @@ -22,7 +22,7 @@ public LoginPage(LoginViewModel Model) private void LoginClick(object obj, EventArgs e) { - var result = _Model.IsUserValid(); + var result = true;//_Model.IsUserValid(); if (result) { var newMain = new MasterDetailPage(); @@ -39,6 +39,7 @@ async void SignUp(object obj, EventArgs e) private void EntryFocus(object obj, FocusEventArgs e) { + if (!e.IsFocused) { LoginLayout.VerticalOptions = LayoutOptions.CenterAndExpand; diff --git a/Client/TheReel/TheReel/TheReel/Views/TopicsPage.xaml b/Client/TheReel/TheReel/TheReel/Views/TopicsPage.xaml index fe429e2..9bc85c3 100644 --- a/Client/TheReel/TheReel/TheReel/Views/TopicsPage.xaml +++ b/Client/TheReel/TheReel/TheReel/Views/TopicsPage.xaml @@ -19,110 +19,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + \ No newline at end of file diff --git a/Client/TheReel/TheReel/TheReel/Views/TopicsPage.xaml.cs b/Client/TheReel/TheReel/TheReel/Views/TopicsPage.xaml.cs index ed57319..0aadc98 100644 --- a/Client/TheReel/TheReel/TheReel/Views/TopicsPage.xaml.cs +++ b/Client/TheReel/TheReel/TheReel/Views/TopicsPage.xaml.cs @@ -18,5 +18,10 @@ public TopicsPage(TopicsViewModel Model) _Model = Model; BindingContext = _Model; } + + private void TextClick(object sender, EventArgs e) + { + + } } } diff --git a/Client/TheReel/TheReel/TheReel/obj/Debug/DesignTimeResolveAssemblyReferences.cache b/Client/TheReel/TheReel/TheReel/obj/Debug/DesignTimeResolveAssemblyReferences.cache index 4ce8129..c73a5d7 100644 Binary files a/Client/TheReel/TheReel/TheReel/obj/Debug/DesignTimeResolveAssemblyReferences.cache and b/Client/TheReel/TheReel/TheReel/obj/Debug/DesignTimeResolveAssemblyReferences.cache differ diff --git a/Client/TheReel/TheReel/TheReel/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache b/Client/TheReel/TheReel/TheReel/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache index 786760e..6a047dd 100644 Binary files a/Client/TheReel/TheReel/TheReel/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache and b/Client/TheReel/TheReel/TheReel/obj/Debug/DesignTimeResolveAssemblyReferencesInput.cache differ diff --git a/Client/TheReel/TheReel/TheReel/obj/Debug/TheReel.csproj.FileListAbsolute.txt b/Client/TheReel/TheReel/TheReel/obj/Debug/TheReel.csproj.FileListAbsolute.txt index 60867ae..5cd7b1c 100644 --- a/Client/TheReel/TheReel/TheReel/obj/Debug/TheReel.csproj.FileListAbsolute.txt +++ b/Client/TheReel/TheReel/TheReel/obj/Debug/TheReel.csproj.FileListAbsolute.txt @@ -47,8 +47,6 @@ C:\Users\Aaron Yerman\Downloads\Projects\TheReel\Client\TheReel\TheReel\TheReel\ C:\Users\Aaron Yerman\Downloads\Projects\TheReel\Client\TheReel\TheReel\TheReel\obj\Debug\TheReel.csprojResolveAssemblyReference.cache C:\Users\Aaron Yerman\Downloads\Projects\TheReel\Client\TheReel\TheReel\TheReel\obj\Debug\TheReel.Views.TopicsPage.xaml.g.cs C:\Users\Aaron Yerman\Downloads\Projects\TheReel\Client\TheReel\TheReel\TheReel\obj\Debug\TheReel.Views.NavPage.xaml.g.cs -C:\Users\Aaron Yerman\Downloads\Projects\TheReel\Client\TheReel\TheReel\TheReel\obj\Debug\TheReel.dll.mdb -C:\Users\Aaron Yerman\Downloads\Projects\TheReel\Client\TheReel\TheReel\TheReel\bin\Debug\TheReel.dll.mdb C:\Users\Armen_000\Documents\GitHub\TheReel\Client\TheReel\TheReel\TheReel\bin\Debug\TheReel.dll C:\Users\Armen_000\Documents\GitHub\TheReel\Client\TheReel\TheReel\TheReel\bin\Debug\TheReel.pdb C:\Users\Armen_000\Documents\GitHub\TheReel\Client\TheReel\TheReel\TheReel\bin\Debug\Newtonsoft.Json.dll @@ -92,5 +90,5 @@ C:\Users\Billh\OneDrive\Documents\GitHub\TheReel\Client\TheReel\TheReel\TheReel\ C:\Users\Billh\OneDrive\Documents\GitHub\TheReel\Client\TheReel\TheReel\TheReel\obj\Debug\TheReel.pdb C:\Users\Billh\OneDrive\Documents\GitHub\TheReel\Client\TheReel\TheReel\TheReel\obj\Debug\TheReel.dll.mdb C:\Users\Billh\OneDrive\Documents\GitHub\TheReel\Client\TheReel\TheReel\TheReel\bin\Debug\TheReel.dll.mdb -C:\Users\Billh\OneDrive\Documents\GitHub\TheReel\Client\TheReel\TheReel\TheReel\obj\Debug\TheReel.dll.mdb -C:\Users\Billh\OneDrive\Documents\GitHub\TheReel\Client\TheReel\TheReel\TheReel\bin\Debug\TheReel.dll.mdb +C:\Users\Aaron Yerman\Downloads\Projects\TheReel\Client\TheReel\TheReel\TheReel\obj\Debug\TheReel.dll.mdb +C:\Users\Aaron Yerman\Downloads\Projects\TheReel\Client\TheReel\TheReel\TheReel\bin\Debug\TheReel.dll.mdb