Skip to content
This repository has been archived by the owner on Feb 16, 2021. It is now read-only.

Commit

Permalink
AARs updated to 0.9.6.0
Browse files Browse the repository at this point in the history
  • Loading branch information
dminta committed May 1, 2018
1 parent e9c1f47 commit 5957c9d
Show file tree
Hide file tree
Showing 22 changed files with 3,000 additions and 2,690 deletions.
Binary file removed MaterialDialogs.Commons/Jars/commons-0.9.4.4.aar
Binary file not shown.
Binary file added MaterialDialogs.Commons/Jars/commons-0.9.6.0.aar
Binary file not shown.
101 changes: 48 additions & 53 deletions MaterialDialogs.Commons/MaterialDialogs.Commons.csproj

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions MaterialDialogs.Commons/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("0.9.4.4")]
[assembly: AssemblyFileVersion("0.9.4.4")]
[assembly: AssemblyVersion("0.9.6.0")]
[assembly: AssemblyFileVersion("0.9.6.0")]
3 changes: 0 additions & 3 deletions MaterialDialogs.Commons/Transforms/Metadata.xml
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,4 @@
name="managedName">AFollestad.MaterialDialogs.SimpleList</attr>
<attr path="/api/package[@name='com.afollestad.materialdialogs.folderselector']"
name="managedName">AFollestad.MaterialDialogs.FolderSelector</attr>

<attr path="//parameter[@type='ActivityType']"
name="type">Android.Support.V7.App.AppCompatActivity</attr>
</metadata>
25 changes: 13 additions & 12 deletions MaterialDialogs.Commons/packages.config
Original file line number Diff line number Diff line change
@@ -1,15 +1,16 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Xamarin.Android.Support.Animated.Vector.Drawable" version="25.3.1" targetFramework="monoandroid71" />
<package id="Xamarin.Android.Support.Annotations" version="25.3.1" targetFramework="monoandroid71" />
<package id="Xamarin.Android.Support.Compat" version="25.3.1" targetFramework="monoandroid71" />
<package id="Xamarin.Android.Support.Core.UI" version="25.3.1" targetFramework="monoandroid71" />
<package id="Xamarin.Android.Support.Core.Utils" version="25.3.1" targetFramework="monoandroid71" />
<package id="Xamarin.Android.Support.Fragment" version="25.3.1" targetFramework="monoandroid71" />
<package id="Xamarin.Android.Support.Media.Compat" version="25.3.1" targetFramework="monoandroid71" />
<package id="Xamarin.Android.Support.v13" version="25.3.1" targetFramework="monoandroid71" />
<package id="Xamarin.Android.Support.v7.AppCompat" version="25.3.1" targetFramework="monoandroid71" />
<package id="Xamarin.Android.Support.v7.RecyclerView" version="25.3.1" targetFramework="monoandroid71" />
<package id="Xamarin.Android.Support.Vector.Drawable" version="25.3.1" targetFramework="monoandroid71" />
<package id="Xamarin.Build.Download" version="0.4.4" targetFramework="monoandroid71" />
<package id="Xamarin.Android.Arch.Core.Common" version="1.0.0" targetFramework="monoandroid81" />
<package id="Xamarin.Android.Arch.Lifecycle.Common" version="1.0.3" targetFramework="monoandroid81" />
<package id="Xamarin.Android.Arch.Lifecycle.Runtime" version="1.0.3" targetFramework="monoandroid81" />
<package id="Xamarin.Android.Support.Animated.Vector.Drawable" version="27.0.2" targetFramework="monoandroid81" />
<package id="Xamarin.Android.Support.Annotations" version="27.0.2" targetFramework="monoandroid81" />
<package id="Xamarin.Android.Support.Compat" version="27.0.2" targetFramework="monoandroid81" />
<package id="Xamarin.Android.Support.Core.UI" version="27.0.2" targetFramework="monoandroid81" />
<package id="Xamarin.Android.Support.Core.Utils" version="27.0.2" targetFramework="monoandroid81" />
<package id="Xamarin.Android.Support.Fragment" version="27.0.2" targetFramework="monoandroid81" />
<package id="Xamarin.Android.Support.Media.Compat" version="27.0.2" targetFramework="monoandroid81" />
<package id="Xamarin.Android.Support.v7.AppCompat" version="27.0.2" targetFramework="monoandroid81" />
<package id="Xamarin.Android.Support.v7.RecyclerView" version="27.0.2" targetFramework="monoandroid81" />
<package id="Xamarin.Android.Support.Vector.Drawable" version="27.0.2" targetFramework="monoandroid81" />
</packages>
Binary file removed MaterialDialogs.Core/Jars/core-0.9.4.4.aar
Binary file not shown.
Binary file added MaterialDialogs.Core/Jars/core-0.9.6.0.aar
Binary file not shown.
106 changes: 50 additions & 56 deletions MaterialDialogs.Core/MaterialDialogs.Core.csproj

Large diffs are not rendered by default.

4 changes: 2 additions & 2 deletions MaterialDialogs.Core/Properties/AssemblyInfo.cs
Original file line number Diff line number Diff line change
Expand Up @@ -26,5 +26,5 @@
// You can specify all the values or you can default the Build and Revision Numbers
// by using the '*' as shown below:
// [assembly: AssemblyVersion("1.0.*")]
[assembly: AssemblyVersion("0.9.4.4")]
[assembly: AssemblyFileVersion("0.9.4.4")]
[assembly: AssemblyVersion("0.9.6.0")]
[assembly: AssemblyFileVersion("0.9.6.0")]
27 changes: 14 additions & 13 deletions MaterialDialogs.Core/packages.config
Original file line number Diff line number Diff line change
@@ -1,16 +1,17 @@
<?xml version="1.0" encoding="utf-8"?>
<packages>
<package id="Xamarin.Android.Support.Animated.Vector.Drawable" version="25.3.1" targetFramework="monoandroid71" />
<package id="Xamarin.Android.Support.Annotations" version="25.3.1" targetFramework="monoandroid71" />
<package id="Xamarin.Android.Support.Compat" version="25.3.1" targetFramework="monoandroid71" />
<package id="Xamarin.Android.Support.Core.UI" version="25.3.1" targetFramework="monoandroid71" />
<package id="Xamarin.Android.Support.Core.Utils" version="25.3.1" targetFramework="monoandroid71" />
<package id="Xamarin.Android.Support.Fragment" version="25.3.1" targetFramework="monoandroid71" />
<package id="Xamarin.Android.Support.Media.Compat" version="25.3.1" targetFramework="monoandroid71" />
<package id="Xamarin.Android.Support.v13" version="25.3.1" targetFramework="monoandroid71" />
<package id="Xamarin.Android.Support.v7.AppCompat" version="25.3.1" targetFramework="monoandroid71" />
<package id="Xamarin.Android.Support.v7.RecyclerView" version="25.3.1" targetFramework="monoandroid71" />
<package id="Xamarin.Android.Support.Vector.Drawable" version="25.3.1" targetFramework="monoandroid71" />
<package id="Xamarin.Build.Download" version="0.4.4" targetFramework="monoandroid71" />
<package id="ZhangHai.Android.MaterialProgressBar" version="1.4.1" targetFramework="monoandroid71" />
<package id="Xamarin.Android.Arch.Core.Common" version="1.0.0" targetFramework="monoandroid81" />
<package id="Xamarin.Android.Arch.Lifecycle.Common" version="1.0.3" targetFramework="monoandroid81" />
<package id="Xamarin.Android.Arch.Lifecycle.Runtime" version="1.0.3" targetFramework="monoandroid81" />
<package id="Xamarin.Android.Support.Animated.Vector.Drawable" version="27.0.2" targetFramework="monoandroid81" />
<package id="Xamarin.Android.Support.Annotations" version="27.0.2" targetFramework="monoandroid81" />
<package id="Xamarin.Android.Support.Compat" version="27.0.2" targetFramework="monoandroid81" />
<package id="Xamarin.Android.Support.Core.UI" version="27.0.2" targetFramework="monoandroid81" />
<package id="Xamarin.Android.Support.Core.Utils" version="27.0.2" targetFramework="monoandroid81" />
<package id="Xamarin.Android.Support.Fragment" version="27.0.2" targetFramework="monoandroid81" />
<package id="Xamarin.Android.Support.Media.Compat" version="27.0.2" targetFramework="monoandroid81" />
<package id="Xamarin.Android.Support.v7.AppCompat" version="27.0.2" targetFramework="monoandroid81" />
<package id="Xamarin.Android.Support.v7.RecyclerView" version="27.0.2" targetFramework="monoandroid81" />
<package id="Xamarin.Android.Support.Vector.Drawable" version="27.0.2" targetFramework="monoandroid81" />
<package id="ZhangHai.Android.MaterialProgressBar" version="1.4.2" targetFramework="monoandroid81" />
</packages>
2 changes: 1 addition & 1 deletion MaterialDialogs.Sample/ChangelogDialog.cs
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public override Dialog OnCreateDialog(Bundle savedInstanceState)
{
customView = LayoutInflater.From(Activity).Inflate(Resource.Layout.dialog_webview, null);
}
catch (InflateException e)
catch (InflateException)
{
throw new IllegalStateException("This device does not support Web Views.");
}
Expand Down
51 changes: 22 additions & 29 deletions MaterialDialogs.Sample/MainActivity.cs
Original file line number Diff line number Diff line change
@@ -1,5 +1,4 @@
using AFollestad.MaterialDialogs;
using AFollestad.MaterialDialogs.Color;
using AFollestad.MaterialDialogs.Color;
using AFollestad.MaterialDialogs.FolderSelector;
using AFollestad.MaterialDialogs.Internal;
using AFollestad.MaterialDialogs.SimpleList;
Expand All @@ -9,7 +8,6 @@
using Android.App;
using Android.Content;
using Android.Content.PM;
using Android.Graphics;
using Android.Graphics.Drawables;
using Android.OS;
using Android.Runtime;
Expand Down Expand Up @@ -110,7 +108,7 @@ public void ShowBasic(object sender, EventArgs e)
{
new MaterialDialog.Builder(this)
.Title(Resource.String.useGoogleLocationServices)
.Content(Html.FromHtml(GetString(Resource.String.useGoogleLocationServicesPrompt)))
.Content(Resource.String.useGoogleLocationServicesPrompt, true)
.PositiveText(Resource.String.agree)
.NegativeText(Resource.String.disagree)
.Show();
Expand All @@ -124,6 +122,7 @@ public void ShowBasicLongContent(object sender, EventArgs e)
.Content(Resource.String.loremIpsum)
.PositiveText(Resource.String.agree)
.NegativeText(Resource.String.disagree)
.CheckBoxPrompt("Hello, world!", true, null)
.Show();
}

Expand All @@ -134,7 +133,7 @@ public void ShowBasicIcon(object sender, EventArgs e)
.IconRes(Resource.Mipmap.ic_launcher)
.LimitIconToDefaultSize()
.Title(Resource.String.useGoogleLocationServices)
.Content(Html.FromHtml(GetString(Resource.String.useGoogleLocationServicesPrompt)))
.Content(Resource.String.useGoogleLocationServicesPrompt, true)
.PositiveText(Resource.String.agree)
.NegativeText(Resource.String.disagree)
.Show();
Expand Down Expand Up @@ -163,7 +162,7 @@ public void ShowStacked(object sender, EventArgs e)
{
new MaterialDialog.Builder(this)
.Title(Resource.String.useGoogleLocationServices)
.Content(Html.FromHtml(GetString(Resource.String.useGoogleLocationServicesPrompt)))
.Content(Resource.String.useGoogleLocationServicesPrompt, true)
.PositiveText(Resource.String.speedBoost)
.NegativeText(Resource.String.noThanks)
.BtnStackedGravity(GravityEnum.End)
Expand All @@ -176,7 +175,7 @@ public void ShowNeutral(object sender, EventArgs e)
{
new MaterialDialog.Builder(this)
.Title(Resource.String.useGoogleLocationServices)
.Content(Html.FromHtml(GetString(Resource.String.useGoogleLocationServicesPrompt)))
.Content(Resource.String.useGoogleLocationServicesPrompt, true)
.PositiveText(Resource.String.agree)
.NegativeText(Resource.String.disagree)
.NeutralText(Resource.String.more_info)
Expand All @@ -188,7 +187,7 @@ public void ShowCallbacks(object sender, EventArgs e)
{
new MaterialDialog.Builder(this)
.Title(Resource.String.useGoogleLocationServices)
.Content(Html.FromHtml(GetString(Resource.String.useGoogleLocationServicesPrompt)))
.Content(Resource.String.useGoogleLocationServicesPrompt, true)
.PositiveText(Resource.String.agree)
.NegativeText(Resource.String.disagree)
.NeutralText(Resource.String.more_info)
Expand Down Expand Up @@ -287,6 +286,7 @@ public void ShowSingleChoice(object sender, EventArgs e)
new MaterialDialog.Builder(this)
.Title(Resource.String.socialNetworks)
.Items(Resource.Array.socialNetworks)
.ItemsDisabledIndices(1, 3)
.ItemsCallbackSingleChoice(2, (dialog, view, which, text) =>
{
ShowToast($"{which}: {text}");
Expand Down Expand Up @@ -319,7 +319,7 @@ public void ShowMultiChoice(object sender, EventArgs e)
.Items(Resource.Array.socialNetworks)
.ItemsCallbackMultiChoice(new int[] { 1, 3 }, (dialog, which, text) =>
{
StringBuilder str = new StringBuilder();
var str = new StringBuilder();
for (int i = 0; i < which.Length; i++)
{
if (i > 0) str.Append('\n');
Expand Down Expand Up @@ -387,7 +387,7 @@ public void ShowMultiChoiceLongItems(object sender, EventArgs e)
.Items(Resource.Array.socialNetworks_longItems)
.ItemsCallbackMultiChoice(new int[] { 1, 3 }, (dialog, which, text) =>
{
StringBuilder str = new StringBuilder();
var str = new StringBuilder();
for (int i = 0; i < which.Length; i++)
{
if (i > 0) str.Append('\n');
Expand All @@ -410,7 +410,7 @@ public void ShowMultiChoiceDisabledItems(object sender, EventArgs e)
.Items(Resource.Array.socialNetworks)
.ItemsCallbackMultiChoice(new int[] { 0, 1, 2 }, (dialog, which, text) =>
{
StringBuilder str = new StringBuilder();
var str = new StringBuilder();
for (int i = 0; i < which.Length; i++)
{
if (i > 0) str.Append('\n');
Expand Down Expand Up @@ -485,7 +485,8 @@ public void ShowCustomView(object sender, EventArgs e)
.CustomView(Resource.Layout.dialog_customview, true)
.PositiveText(Resource.String.connect)
.NegativeText(Android.Resource.String.Cancel)
.OnPositive((dialog1, which) => ShowToast("Password: " + _passwordInput.Text)).Build();
.OnPositive((dialog1, which) => ShowToast("Password: " + _passwordInput.Text))
.Build();

_positiveAction = dialog.GetActionButton(DialogAction.Positive);

Expand Down Expand Up @@ -546,7 +547,7 @@ public void ShowColorChooserPrimary(object sender, EventArgs e)
new ColorChooserDialog.Builder(this, Resource.String.color_palette)
.TitleSub(Resource.String.colors)
.Preselect(_primaryPreselect)
.Show();
.Show(this);
}

[OnClick(Resource.Id.colorChooser_accent)]
Expand All @@ -556,7 +557,7 @@ public void ShowColorChooserAccent(object sender, EventArgs e)
.TitleSub(Resource.String.colors)
.AccentMode(true)
.Preselect(_accentPreselect)
.Show();
.Show(this);
}

[OnClick(Resource.Id.colorChooser_customColors)]
Expand Down Expand Up @@ -606,7 +607,7 @@ public void ShowColorChooserCustomColors(object sender, EventArgs e)
.TitleSub(Resource.String.colors)
.Preselect(_primaryPreselect)
.CustomColors(Resource.Array.custom_colors, subColors)
.Show();
.Show(this);
}

[OnClick(Resource.Id.colorChooser_customColorsNoSub)]
Expand All @@ -616,7 +617,7 @@ public void ShowColorChooserCustomColorsNoSub(object sender, EventArgs e)
.TitleSub(Resource.String.colors)
.Preselect(_primaryPreselect)
.CustomColors(Resource.Array.custom_colors, null)
.Show();
.Show(this);
}

#region ColorChooserDialog.IColorCallback implementation
Expand Down Expand Up @@ -659,7 +660,7 @@ public void ShowThemed(object sender, EventArgs e)
{
new MaterialDialog.Builder(this)
.Title(Resource.String.useGoogleLocationServices)
.Content(Html.FromHtml(GetString(Resource.String.useGoogleLocationServicesPrompt)))
.Content(Resource.String.useGoogleLocationServicesPrompt, true)
.PositiveText(Resource.String.agree)
.NegativeText(Resource.String.disagree)
.PositiveColorRes(Resource.Color.material_red_400)
Expand All @@ -681,7 +682,7 @@ public void ShowShowCancelDismissCallbacks(object sender, EventArgs e)
{
new MaterialDialog.Builder(this)
.Title(Resource.String.useGoogleLocationServices)
.Content(Html.FromHtml(GetString(Resource.String.useGoogleLocationServicesPrompt)))
.Content(Resource.String.useGoogleLocationServicesPrompt, true)
.PositiveText(Resource.String.agree)
.NegativeText(Resource.String.disagree)
.NeutralText(Resource.String.more_info)
Expand All @@ -702,8 +703,7 @@ public void ShowFileChooser(object sender, EventArgs e)
ActivityCompat.RequestPermissions(this, new string[] { Manifest.Permission.ReadExternalStorage }, StoragePermissionRC);
return;
}
new FileChooserDialog.Builder(this)
.Show();
new FileChooserDialog.Builder(this).Show(this);
}

#region FileChooserDialog.IFileCallback implementation
Expand Down Expand Up @@ -734,7 +734,7 @@ public void ShowFolderChooser(object sender, EventArgs e)
new FolderChooserDialog.Builder(this)
.ChooseButton(Resource.String.md_choose_label)
.AllowNewFolder(true, 0)
.Show();
.Show(this);
}

#region FolderChooserDialog.IFolderCallback implementation
Expand Down Expand Up @@ -882,14 +882,7 @@ void ShowIndeterminateProgressDialog(bool horizontal)
[OnClick(Resource.Id.preference_dialogs)]
public void ShowPreferenceDialogs(object sender, EventArgs e)
{
if (Build.VERSION.SdkInt > BuildVersionCodes.GingerbreadMr1)
{
StartActivity(new Intent(ApplicationContext, typeof(PreferenceActivity)));
}
else
{
StartActivity(new Intent(ApplicationContext, typeof(PreferenceActivityCompat)));
}
StartActivity(new Intent(ApplicationContext, typeof(PreferenceActivity)));
}

#endregion
Expand Down
Loading

0 comments on commit 5957c9d

Please sign in to comment.