WIP Show text

jonvwolf · jonvwolf · commit 296b04b4fb97 · 2020-08-20T15:18:01.000-05:00
diff --git a/BasicPlainTextReaderApp.Library/BasicPlainTextReaderApp.Library.csproj b/BasicPlainTextReaderApp.Library/BasicPlainTextReaderApp.Library.csproj
@@ -0,0 +1,7 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+  <PropertyGroup>
+    <TargetFramework>netstandard2.0</TargetFramework>
+  </PropertyGroup>
+
+</Project>
diff --git a/BasicPlainTextReaderApp.Library/TextModel.cs b/BasicPlainTextReaderApp.Library/TextModel.cs
@@ -0,0 +1,20 @@
+﻿using System;
+
+namespace BasicPlainTextReaderApp.Library
+{
+    public class TextModel
+    {
+        public string Text { get; }
+        public string DataString { get; }
+        public string Type { get; }
+        public string DataPath { get; }
+
+        public TextModel(string txt, string dt, string t, string dp)
+        {
+            Text = txt ?? "_null_";
+            DataString = dt ?? "_null_";
+            Type = t ?? "_null_";
+            DataPath = dp ?? "_null";
+        }
+    }
+}
diff --git a/BasicPlainTextReaderApp.sln b/BasicPlainTextReaderApp.sln
@@ -5,7 +5,9 @@ VisualStudioVersion = 16.0.30406.217
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BasicPlainTextReaderApp.Android", "BasicPlainTextReaderApp\BasicPlainTextReaderApp.Android\BasicPlainTextReaderApp.Android.csproj", "{C1C3CE2C-4ABB-442E-96BE-1F5B2AD8DBDC}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BasicPlainTextReaderApp", "BasicPlainTextReaderApp\BasicPlainTextReaderApp\BasicPlainTextReaderApp.csproj", "{CA1AEA98-AE84-4763-A402-A993868615F1}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BasicPlainTextReaderApp", "BasicPlainTextReaderApp\BasicPlainTextReaderApp\BasicPlainTextReaderApp.csproj", "{CA1AEA98-AE84-4763-A402-A993868615F1}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BasicPlainTextReaderApp.Library", "BasicPlainTextReaderApp.Library\BasicPlainTextReaderApp.Library.csproj", "{F889341B-08D1-4416-A989-D0E03D434B11}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -25,6 +27,10 @@ Global
 		{CA1AEA98-AE84-4763-A402-A993868615F1}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{CA1AEA98-AE84-4763-A402-A993868615F1}.Release|Any CPU.Build.0 = Release|Any CPU
 		{CA1AEA98-AE84-4763-A402-A993868615F1}.Release|Any CPU.Deploy.0 = Release|Any CPU
+		{F889341B-08D1-4416-A989-D0E03D434B11}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{F889341B-08D1-4416-A989-D0E03D434B11}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{F889341B-08D1-4416-A989-D0E03D434B11}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{F889341B-08D1-4416-A989-D0E03D434B11}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
diff --git a/BasicPlainTextReaderApp/BasicPlainTextReaderApp.Android/BasicPlainTextReaderApp.Android.csproj b/BasicPlainTextReaderApp/BasicPlainTextReaderApp.Android/BasicPlainTextReaderApp.Android.csproj
@@ -88,6 +88,10 @@
     <AndroidResource Include="Resources\drawable\tab_feed.png" />
   </ItemGroup>
   <ItemGroup>
+    <ProjectReference Include="..\..\BasicPlainTextReaderApp.Library\BasicPlainTextReaderApp.Library.csproj">
+      <Project>{F889341B-08D1-4416-A989-D0E03D434B11}</Project>
+      <Name>BasicPlainTextReaderApp.Library</Name>
+    </ProjectReference>
     <ProjectReference Include="..\BasicPlainTextReaderApp\BasicPlainTextReaderApp.csproj">
       <Project>{6327818D-35B3-4749-82F8-108F4C4ED810}</Project>
       <Name>BasicPlainTextReaderApp</Name>
diff --git a/BasicPlainTextReaderApp/BasicPlainTextReaderApp.Android/MainActivity.cs b/BasicPlainTextReaderApp/BasicPlainTextReaderApp.Android/MainActivity.cs
@@ -10,6 +10,7 @@
 using System.IO;
 using Android.Provider;
 using System.Text;
+using BasicPlainTextReaderApp.Library;
 
 namespace BasicPlainTextReaderApp.Droid
 {
@@ -25,9 +26,10 @@ protected override void OnCreate(Bundle savedInstanceState)
         {
             string action = Intent.Action;
             string type = Intent.Type;
-            StringBuilder sb = null;
 
-            if(Intent.ActionView.Equals(action) && !string.IsNullOrEmpty(type))
+            TextModel data = null;
+
+            if (Intent.ActionView.Equals(action) && !string.IsNullOrEmpty(type))
             {
                 Android.Net.Uri fileUri = Intent.Data;
                 if (fileUri != null)
@@ -40,17 +42,17 @@ protected override void OnCreate(Bundle savedInstanceState)
                         using (var bufferedReader = new Java.IO.BufferedReader(reader))
                         {
                             string line;
-                            sb = new StringBuilder();
+                            var sb = new StringBuilder();
                             while ((line = bufferedReader.ReadLine()) != null)
                             {
                                 sb.AppendLine(line);
                             }
+                            data = new TextModel(sb.ToString(), Intent.DataString, Intent.Type, Intent.Data.Path);
                         }
                     }
                     catch (Exception e)
                     {
-                        sb = new StringBuilder();
-                        sb.AppendLine(e.ToString());
+                        data = new TextModel(e.ToString(), "error", "error", "error");
                     }
                 }
             }
@@ -62,7 +64,7 @@ protected override void OnCreate(Bundle savedInstanceState)
 
             Xamarin.Essentials.Platform.Init(this, savedInstanceState);
             global::Xamarin.Forms.Forms.Init(this, savedInstanceState);
-            LoadApplication(new App(sb.ToString()));
+            LoadApplication(new App(data));
         }
         public override void OnRequestPermissionsResult(int requestCode, string[] permissions, [GeneratedEnum] Android.Content.PM.Permission[] grantResults)
         {
diff --git a/BasicPlainTextReaderApp/BasicPlainTextReaderApp/App.xaml.cs b/BasicPlainTextReaderApp/BasicPlainTextReaderApp/App.xaml.cs
@@ -2,22 +2,34 @@
 using Xamarin.Forms;
 using Xamarin.Forms.Xaml;
 using BasicPlainTextReaderApp.Views;
+using BasicPlainTextReaderApp.Library;
 
 namespace BasicPlainTextReaderApp
 {
     public partial class App : Application
     {
-        string _text;
-        public App(string text = null)
+        readonly TextModel _data;
+        public App(TextModel data = null)
         {
             InitializeComponent();
 
-            _text = text;
-            MainPage = new AppShell();
+            _data = data;
+            MainPage = new AppShell(this);
+        }
+
+        public void GoToCurrentTextPage()
+        {
+            var page = new TextPage(_data);
+            Shell.Current.Navigation.PushAsync(page);
+            Shell.Current.FlyoutIsPresented = false;
         }
 
         protected override void OnStart()
         {
+            if(_data != null)
+            {
+                GoToCurrentTextPage();
+            }
         }
 
         protected override void OnSleep()
diff --git a/BasicPlainTextReaderApp/BasicPlainTextReaderApp/AppShell.xaml b/BasicPlainTextReaderApp/BasicPlainTextReaderApp/AppShell.xaml
@@ -81,20 +81,19 @@
     -->
     <FlyoutItem FlyoutDisplayOptions="AsMultipleItems">
         <ShellContent Title="About" Icon="tab_about.png" Route="AboutPage" ContentTemplate="{DataTemplate local:AboutPage}" />
-        <!-- <ShellContent Title="Browse" Icon="tab_feed.png" ContentTemplate="{DataTemplate local:ItemsPage}" /> -->
     </FlyoutItem>
 
     <!-- When the Flyout is visible this will be a menu item you can tie a click behavior to  -->
-    <!-- <MenuItem Text="Logout" StyleClass="MenuItemLayoutStyle" Clicked="OnMenuItemClicked">
-    </MenuItem> -->
-
+    <MenuItem Text="Current Text" StyleClass="MenuItemLayoutStyle" Clicked="OnMenuItemClicked" IconImageSource="tab_feed.png">
+    </MenuItem>
+    
     <!--
         This defines content that won't show up in a flyout menu. When this content is active the flyout menu won't be available.
         This is useful for creating areas of the application where you don't want users to be able to navigate away from.
         If you would like to navigate to this content you can do so by calling
         await Shell.Current.GoToAsync("//LoginPage");
     -->
-    <!-- <ShellContent Route="LoginPage" Shell.FlyoutBehavior="Disabled" ContentTemplate="{DataTemplate local:LoginPage}"  /> -->
+    <!--<ShellContent Route="TextPage" Shell.FlyoutBehavior="Disabled" ContentTemplate="{DataTemplate local:TextPage}"  />-->
 
     <!-- Optional Templates 
     // These may be provided inline as below or as separate classes.
diff --git a/BasicPlainTextReaderApp/BasicPlainTextReaderApp/AppShell.xaml.cs b/BasicPlainTextReaderApp/BasicPlainTextReaderApp/AppShell.xaml.cs
@@ -1,5 +1,6 @@
 ﻿using System;
 using System.Collections.Generic;
+using BasicPlainTextReaderApp.Library;
 using BasicPlainTextReaderApp.ViewModels;
 using BasicPlainTextReaderApp.Views;
 using Xamarin.Forms;
@@ -8,10 +9,17 @@ namespace BasicPlainTextReaderApp
 {
     public partial class AppShell : Xamarin.Forms.Shell
     {
-        public AppShell()
+        readonly App _parent;
+        public AppShell(App parent)
         {
             InitializeComponent();
+            _parent = parent;
+            Shell.SetTabBarIsVisible(this, false);
         }
 
+        private void OnMenuItemClicked(object sender, EventArgs e)
+        {
+            _parent.GoToCurrentTextPage();
+        }
     }
 }
diff --git a/BasicPlainTextReaderApp/BasicPlainTextReaderApp/BasicPlainTextReaderApp.csproj b/BasicPlainTextReaderApp/BasicPlainTextReaderApp/BasicPlainTextReaderApp.csproj
@@ -14,4 +14,14 @@
     <Folder Include="Models\" />
     <Folder Include="Services\" />
   </ItemGroup>
+
+  <ItemGroup>
+    <ProjectReference Include="..\..\BasicPlainTextReaderApp.Library\BasicPlainTextReaderApp.Library.csproj" />
+  </ItemGroup>
+
+  <ItemGroup>
+    <EmbeddedResource Update="Views\TextPage.xaml">
+      <Generator>MSBuild:UpdateDesignTimeXaml</Generator>
+    </EmbeddedResource>
+  </ItemGroup>
 </Project>
diff --git a/BasicPlainTextReaderApp/BasicPlainTextReaderApp/ViewModels/AboutViewModel.cs b/BasicPlainTextReaderApp/BasicPlainTextReaderApp/ViewModels/AboutViewModel.cs
@@ -11,7 +11,6 @@ public AboutViewModel()
         {
             Title = "About";
             OpenWebCommand = new Command(async () => await Browser.OpenAsync(Constants.AboutUrl));
-            OpenWebCommand = new Command(async () => await Shell.Current.GoToAsync("//LoginPage"));
         }
 
         public ICommand OpenWebCommand { get; }
diff --git a/BasicPlainTextReaderApp/BasicPlainTextReaderApp/ViewModels/TextPageViewModel.cs b/BasicPlainTextReaderApp/BasicPlainTextReaderApp/ViewModels/TextPageViewModel.cs
@@ -0,0 +1,47 @@
+﻿using BasicPlainTextReaderApp.Library;
+using System;
+using System.Collections.Generic;
+using System.Text;
+using Xamarin.Forms;
+
+namespace BasicPlainTextReaderApp.ViewModels
+{
+    public class TextPageViewModel : BaseViewModel
+    {
+        TextModel _model;
+        public ToolbarItem InfoItem { get; set; }
+        public TextPageViewModel()
+        {
+            ShowPlaceholderText = true;
+            ShowText = false;
+            Title = "No text!";
+        }
+
+        public TextModel TModel
+        {
+            get { return _model; }
+            set
+            {
+                if (value != null)
+                {
+                    ShowPlaceholderText = false;
+                    ShowText = true;
+
+                    Title = value.DataPath;
+                    InfoItem.IsEnabled = true;
+                }
+                else
+                {
+                    ShowPlaceholderText = true;
+                    ShowText = false;
+                    InfoItem.IsEnabled = false;
+                }
+                SetProperty(ref _model, value);
+            }
+        }
+        bool _showPlaceholderText;
+        bool _showText;
+        public bool ShowPlaceholderText { get { return _showPlaceholderText; } set { SetProperty(ref _showPlaceholderText, value); } }
+        public bool ShowText { get { return _showText; } set { SetProperty(ref _showText, value); } }
+    }
+}
diff --git a/BasicPlainTextReaderApp/BasicPlainTextReaderApp/Views/AboutPage.xaml b/BasicPlainTextReaderApp/BasicPlainTextReaderApp/Views/AboutPage.xaml
@@ -30,7 +30,7 @@
         <ScrollView Grid.Row="1">
             <StackLayout Orientation="Vertical" Padding="30,24,30,24" Spacing="10">
                 <Label Text="Basic Text Reader App" FontSize="Title"/>
-                <Label Text="This app tries to read any file! And it doesn't save any temporarily hidden file like other text editors do!" FontSize="16" Padding="0,0,0,0"/>
+                <Label Text="This app tries to read any file as plaint text! And it doesn't save any temporarily hidden file like other text editors do!" FontSize="16" Padding="0,0,0,0"/>
                 <Label Text="This app uses work from:" FontSize="16" Padding="0,24,0,0"/>
                 <Label Text="Icons made by Freepik from https://www.flaticon.com/authors/freepik" FontSize="16" Padding="0,7,0,0"/>
                 
diff --git a/BasicPlainTextReaderApp/BasicPlainTextReaderApp/Views/TextPage.xaml b/BasicPlainTextReaderApp/BasicPlainTextReaderApp/Views/TextPage.xaml
@@ -0,0 +1,29 @@
+﻿<?xml version="1.0" encoding="utf-8" ?>
+<ContentPage xmlns="http://xamarin.com/schemas/2014/forms"
+             xmlns:x="http://schemas.microsoft.com/winfx/2009/xaml"
+             x:Class="BasicPlainTextReaderApp.Views.TextPage"
+             xmlns:vm="clr-namespace:BasicPlainTextReaderApp.ViewModels"
+             xmlns:d="http://xamarin.com/schemas/2014/forms/design"
+             xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+             mc:Ignorable="d"
+             Title="{Binding Title}">
+
+    <ContentPage.ToolbarItems>
+        <ToolbarItem Text="Info" Clicked="ToolbarItem_Clicked" x:Name="InfoItem" />
+    </ContentPage.ToolbarItems>
+    
+    <ContentPage.BindingContext>
+        <vm:TextPageViewModel />
+    </ContentPage.BindingContext>
+    
+    <ContentPage.Content>
+        <StackLayout>
+            <Label Text="There is no text. Try opening a text file (txt) from the default file app with Basic Plain Text Reader app"
+                VerticalOptions="CenterAndExpand" 
+                HorizontalOptions="CenterAndExpand"
+                   IsVisible="{Binding ShowPlaceholderText}" Padding="10,10,10,10" d:IsVisible="false"/>
+            <Label Text="{Binding Path=TModel.Text}" IsVisible="{Binding ShowText}" d:IsVisible="true" d:Text="Text file goes here"/>
+        </StackLayout>
+        
+    </ContentPage.Content>
+</ContentPage>
diff --git a/BasicPlainTextReaderApp/BasicPlainTextReaderApp/Views/TextPage.xaml.cs b/BasicPlainTextReaderApp/BasicPlainTextReaderApp/Views/TextPage.xaml.cs
@@ -0,0 +1,39 @@
+﻿using BasicPlainTextReaderApp.Library;
+using BasicPlainTextReaderApp.ViewModels;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+using Xamarin.Forms;
+using Xamarin.Forms.Xaml;
+
+namespace BasicPlainTextReaderApp.Views
+{
+    [XamlCompilation(XamlCompilationOptions.Compile)]
+    public partial class TextPage : ContentPage
+    {
+        readonly TextPageViewModel _vm;
+        public TextPage(TextModel model = null)
+        {
+            InitializeComponent();
+
+            _vm = BindingContext as TextPageViewModel;
+            _vm.InfoItem = InfoItem;
+            _vm.TModel = model;
+        }
+
+        private async void ToolbarItem_Clicked(object sender, EventArgs e)
+        {
+            if (_vm.TModel == null)
+                return;
+
+            await DisplayAlert("Extra details",
+                "Type: " + _vm.TModel.Type + Environment.NewLine +
+                "DataPath: " + _vm.TModel.DataPath + Environment.NewLine +
+                "DataString: " + _vm.TModel.DataString,
+                "Close");
+        }
+    }
+}

Original file line number	Diff line number	Diff line change
`@@ -10,6 +10,7 @@`
`10`	`10`	`using System.IO;`
`11`	`11`	`using Android.Provider;`
`12`	`12`	`using System.Text;`
	`13`	`+using BasicPlainTextReaderApp.Library;`
`13`	`14`
`14`	`15`	`namespace BasicPlainTextReaderApp.Droid`
`15`	`16`	`{`
`@@ -25,9 +26,10 @@ protected override void OnCreate(Bundle savedInstanceState)`
`25`	`26`	`{`
`26`	`27`	`string action = Intent.Action;`
`27`	`28`	`string type = Intent.Type;`
`28`		`- StringBuilder sb = null;`
`29`	`29`
`30`		`- if(Intent.ActionView.Equals(action) && !string.IsNullOrEmpty(type))`
	`30`	`+ TextModel data = null;`
	`31`	`+`
	`32`	`+ if (Intent.ActionView.Equals(action) && !string.IsNullOrEmpty(type))`
`31`	`33`	`{`
`32`	`34`	`Android.Net.Uri fileUri = Intent.Data;`
`33`	`35`	`if (fileUri != null)`
`@@ -40,17 +42,17 @@ protected override void OnCreate(Bundle savedInstanceState)`
`40`	`42`	`using (var bufferedReader = new Java.IO.BufferedReader(reader))`
`41`	`43`	`{`
`42`	`44`	`string line;`
`43`		`- sb = new StringBuilder();`
	`45`	`+ var sb = new StringBuilder();`
`44`	`46`	`while ((line = bufferedReader.ReadLine()) != null)`
`45`	`47`	`{`
`46`	`48`	`sb.AppendLine(line);`
`47`	`49`	`}`
	`50`	`+ data = new TextModel(sb.ToString(), Intent.DataString, Intent.Type, Intent.Data.Path);`
`48`	`51`	`}`
`49`	`52`	`}`
`50`	`53`	`catch (Exception e)`
`51`	`54`	`{`
`52`		`- sb = new StringBuilder();`
`53`		`- sb.AppendLine(e.ToString());`
	`55`	`+ data = new TextModel(e.ToString(), "error", "error", "error");`
`54`	`56`	`}`
`55`	`57`	`}`
`56`	`58`	`}`
`@@ -62,7 +64,7 @@ protected override void OnCreate(Bundle savedInstanceState)`
`62`	`64`
`63`	`65`	`Xamarin.Essentials.Platform.Init(this, savedInstanceState);`
`64`	`66`	`global::Xamarin.Forms.Forms.Init(this, savedInstanceState);`
`65`		`- LoadApplication(new App(sb.ToString()));`
	`67`	`+ LoadApplication(new App(data));`
`66`	`68`	`}`
`67`	`69`	`public override void OnRequestPermissionsResult(int requestCode, string[] permissions, [GeneratedEnum] Android.Content.PM.Permission[] grantResults)`
`68`	`70`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,5 +1,6 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Collections.Generic;`
	`3`	`+using BasicPlainTextReaderApp.Library;`
`3`	`4`	`using BasicPlainTextReaderApp.ViewModels;`
`4`	`5`	`using BasicPlainTextReaderApp.Views;`
`5`	`6`	`using Xamarin.Forms;`
`@@ -8,10 +9,17 @@ namespace BasicPlainTextReaderApp`
`8`	`9`	`{`
`9`	`10`	`public partial class AppShell : Xamarin.Forms.Shell`
`10`	`11`	`{`
`11`		`- public AppShell()`
	`12`	`+ readonly App _parent;`
	`13`	`+ public AppShell(App parent)`
`12`	`14`	`{`
`13`	`15`	`InitializeComponent();`
	`16`	`+ _parent = parent;`
	`17`	`+ Shell.SetTabBarIsVisible(this, false);`
`14`	`18`	`}`
`15`	`19`
	`20`	`+ private void OnMenuItemClicked(object sender, EventArgs e)`
	`21`	`+ {`
	`22`	`+ _parent.GoToCurrentTextPage();`
	`23`	`+ }`
`16`	`24`	`}`
`17`	`25`	`}`
Original file line number	Diff line number	Diff line change
`@@ -11,7 +11,6 @@ public AboutViewModel()`
`11`	`11`	`{`
`12`	`12`	`Title = "About";`
`13`	`13`	`OpenWebCommand = new Command(async () => await Browser.OpenAsync(Constants.AboutUrl));`
`14`		`- OpenWebCommand = new Command(async () => await Shell.Current.GoToAsync("//LoginPage"));`
`15`	`14`	`}`
`16`	`15`
`17`	`16`	`public ICommand OpenWebCommand { get; }`