Skip to content

Commit

Permalink
Merge branch 'Add-NewOptionsForTemplateImages'
Browse files Browse the repository at this point in the history
  • Loading branch information
pierre3 committed Dec 14, 2017
2 parents f7925fa + 5fbdb90 commit d58da2d
Show file tree
Hide file tree
Showing 9 changed files with 393 additions and 3 deletions.
13 changes: 13 additions & 0 deletions FunctionAppSample/FunctionAppSample.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,17 @@
<ItemGroup>
<ProjectReference Include="..\Line.Messaging\Line.Messaging.csproj" />
</ItemGroup>
<ItemGroup>
<Compile Update="Properties\Resources.Designer.cs">
<DesignTime>True</DesignTime>
<AutoGen>True</AutoGen>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
</ItemGroup>
<ItemGroup>
<EmbeddedResource Update="Properties\Resources.resx">
<Generator>ResXFileCodeGenerator</Generator>
<LastGenOutput>Resources.Designer.cs</LastGenOutput>
</EmbeddedResource>
</ItemGroup>
</Project>
5 changes: 3 additions & 2 deletions FunctionAppSample/HttpTriggerFunction.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public static async Task<HttpResponseMessage> Run([HttpTrigger(AuthorizationLeve
var connectionString = System.Configuration.ConfigurationManager.AppSettings["AzureWebJobsStorage"];
var eventSourceState = await TableStorage<EventSourceState>.CreateAsync(connectionString, "eventsourcestate");
var blobStorage = await BlobStorage.CreateAsync(connectionString, "linebotcontainer");
var app = new LineBotApp(lineMessagingClient, eventSourceState, blobStorage, log);
//var app = new LineBotApp(lineMessagingClient, eventSourceState, blobStorage, log);

//Samples app
//var app = new DateTimePickerSampleApp(lineMessagingClient, log);
Expand All @@ -41,7 +41,8 @@ public static async Task<HttpResponseMessage> Run([HttpTrigger(AuthorizationLeve
//var app = new RichMenuSampleApp(lineMessagingClient, log);
//var eventSourceLocation = await TableStorage<EventSourceLocation>.CreateAsync(connectionString, "eventsourcelocation");
//var app = new PostbackMessageSampleApp(lineMessagingClient, eventSourceLocation, log);

//var app = new ButtonsTemplateSampleApp(lineMessagingClient, blobStorage, log);
var app = new CarouselTemplateSampleApp(lineMessagingClient, blobStorage, log);
await app.RunAsync(events);

}
Expand Down
73 changes: 73 additions & 0 deletions FunctionAppSample/Properties/Resources.Designer.cs

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

124 changes: 124 additions & 0 deletions FunctionAppSample/Properties/Resources.resx
Original file line number Diff line number Diff line change
@@ -0,0 +1,124 @@
<?xml version="1.0" encoding="utf-8"?>
<root>
<!--
Microsoft ResX Schema
Version 2.0
The primary goals of this format is to allow a simple XML format
that is mostly human readable. The generation and parsing of the
various data types are done through the TypeConverter classes
associated with the data types.
Example:
... ado.net/XML headers & schema ...
<resheader name="resmimetype">text/microsoft-resx</resheader>
<resheader name="version">2.0</resheader>
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
<value>[base64 mime encoded serialized .NET Framework object]</value>
</data>
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
<comment>This is a comment</comment>
</data>
There are any number of "resheader" rows that contain simple
name/value pairs.
Each data row contains a name, and value. The row also contains a
type or mimetype. Type corresponds to a .NET class that support
text/value conversion through the TypeConverter architecture.
Classes that don't support this are serialized and stored with the
mimetype set.
The mimetype is used for serialized objects, and tells the
ResXResourceReader how to depersist the object. This is currently not
extensible. For a given mimetype the value must be set accordingly:
Note - application/x-microsoft.net.object.binary.base64 is the format
that the ResXResourceWriter will generate, however the reader can
read any of the formats listed below.
mimetype: application/x-microsoft.net.object.binary.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.soap.base64
value : The object must be serialized with
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
: and then encoded with base64 encoding.
mimetype: application/x-microsoft.net.object.bytearray.base64
value : The object must be serialized into a byte array
: using a System.ComponentModel.TypeConverter
: and then encoded with base64 encoding.
-->
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
<xsd:element name="root" msdata:IsDataSet="true">
<xsd:complexType>
<xsd:choice maxOccurs="unbounded">
<xsd:element name="metadata">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" />
</xsd:sequence>
<xsd:attribute name="name" use="required" type="xsd:string" />
<xsd:attribute name="type" type="xsd:string" />
<xsd:attribute name="mimetype" type="xsd:string" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="assembly">
<xsd:complexType>
<xsd:attribute name="alias" type="xsd:string" />
<xsd:attribute name="name" type="xsd:string" />
</xsd:complexType>
</xsd:element>
<xsd:element name="data">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
<xsd:attribute ref="xml:space" />
</xsd:complexType>
</xsd:element>
<xsd:element name="resheader">
<xsd:complexType>
<xsd:sequence>
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
</xsd:sequence>
<xsd:attribute name="name" type="xsd:string" use="required" />
</xsd:complexType>
</xsd:element>
</xsd:choice>
</xsd:complexType>
</xsd:element>
</xsd:schema>
<resheader name="resmimetype">
<value>text/microsoft-resx</value>
</resheader>
<resheader name="version">
<value>2.0</value>
</resheader>
<resheader name="reader">
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
<assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
<data name="sample_image" type="System.Resources.ResXFileRef, System.Windows.Forms">
<value>..\Resources\sample_image.jpg;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
</data>
</root>
Binary file added FunctionAppSample/Resources/sample_image.jpg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
81 changes: 81 additions & 0 deletions FunctionAppSample/Samples/ButtonsTemplateSampleApp.cs
Original file line number Diff line number Diff line change
@@ -0,0 +1,81 @@
using Line.Messaging;
using Line.Messaging.Webhooks;
using Microsoft.Azure.WebJobs.Host;
using System.Linq;
using System.Threading.Tasks;

namespace FunctionAppSample
{

class ButtonsTemplateSampleApp : WebhookApplication
{
private LineMessagingClient MessagingClient { get; }

private BlobStorage BlobStorage { get; }
private TraceWriter Log { get; }

private static string blobDirectoryName = "TemplateImage";
private static string imageName = "sample.jpeg";

public ButtonsTemplateSampleApp(LineMessagingClient lineMessagingClient, BlobStorage blobStorage, TraceWriter log)
{
MessagingClient = lineMessagingClient;
BlobStorage = blobStorage;
Log = log;
}


protected override async Task OnMessageAsync(MessageEvent ev)
{

var msg = ev.Message as TextEventMessage;
if (msg == null) { return; }

switch (msg.Text)
{
case "Rectangle-Cover":
await ReplyButtonsTemplateMessageAsync(ImageAspectRatioType.Rectangle, ImageSizeType.Cover);
break;
case "Square-Contain":
await ReplyButtonsTemplateMessageAsync(ImageAspectRatioType.Square, ImageSizeType.Contain);
break;
case "Square-Cover":
await ReplyButtonsTemplateMessageAsync(ImageAspectRatioType.Square, ImageSizeType.Cover);
break;
case "Rectangle-Contein":
default:
await ReplyButtonsTemplateMessageAsync(ImageAspectRatioType.Rectangle, ImageSizeType.Contain);
break;
}

async Task ReplyButtonsTemplateMessageAsync(ImageAspectRatioType imageAspectRatio, ImageSizeType imageSize)
{
var imageUri = BlobStorage.ListBlobUri(blobDirectoryName).FirstOrDefault(uri => uri.ToString().EndsWith(imageName));
if (imageUri == null)
{
imageUri = await BlobStorage.UploadImageAsync(Properties.Resources.sample_image, blobDirectoryName, imageName);
}

var actions = new[]
{
new MessageTemplateAction("Rectangle-Contain", "Rectangle-Contain"),
new MessageTemplateAction("Rectangle-Cover", "Rectangle-Cover"),
new MessageTemplateAction("Square-Contain", "Square-Contain"),
new MessageTemplateAction("Square-Cover", "Square-Cover")
};
var templateMessage = new TemplateMessage("ButtonsTemplate",
new ButtonsTemplate(
imageAspectRatio.ToString() + "-" + imageSize.ToString(),
imageUri.ToString(),
"Test of thumbnail image settings",
actions,
imageAspectRatio,
imageSize,
imageBackgroundColor: "#FF0000"));
await MessagingClient.ReplyMessageAsync(ev.ReplyToken, new[] { templateMessage });
}

}

}
}
Loading

0 comments on commit d58da2d

Please sign in to comment.