Skip to content

Commit

Permalink
WPF/Android: Refactoring of CloudService/CloudLibraryService and impl…
Browse files Browse the repository at this point in the history 
…ementations of Dropbox. CloudService is now strictly used for uploading/downloading files from cloud services. CloudLibraryService is now using a generic CloudService; that way the logic is not duplicated into different implementations.
  • Loading branch information
@ycastonguay
ycastonguay committed Nov 22, 2013
1 parent a5921f3 commit 2dd64b1
Show file tree
Hide file tree
Showing 17 changed files with 708 additions and 932 deletions.
105 changes: 0 additions & 105 deletions MPfm/MPfm.Android/Classes/Activities/SyncCloudActivity.cs
View file
Expand Up @@ -35,7 +35,6 @@ namespace MPfm.Android
public class SyncCloudActivity : BaseActivity, ISyncCloudView
{
private MobileNavigationManager _navigationManager;
private ICloudLibraryService _cloudLibrary;
private TextView _lblConnected;
private TextView _lblDataChanged;
private TextView _lblValue;
Expand All @@ -50,9 +49,6 @@ protected override void OnCreate(Bundle bundle)
Console.WriteLine("SyncCloudActivity - OnCreate");
base.OnCreate(bundle);

_cloudLibrary = Bootstrapper.GetContainer().Resolve<ICloudLibraryService>();
_cloudLibrary.OnCloudDataChanged += OnCloudLibraryDataChanged;

_navigationManager = Bootstrapper.GetContainer().Resolve<MobileNavigationManager>();
SetContentView(Resource.Layout.SyncCloud);
ActionBar.SetDisplayHomeAsUpEnabled(true);
Expand All @@ -66,113 +62,12 @@ protected override void OnCreate(Bundle bundle)
_btnPull = FindViewById<Button>(Resource.Id.syncCloud_btnPull);
_btnPush = FindViewById<Button>(Resource.Id.syncCloud_btnPush);
_btnDelete = FindViewById<Button>(Resource.Id.syncCloud_btnDelete);
_btnLogin.Click += BtnLoginOnClick;
_btnLogout.Click += BtnLogoutOnClick;
_btnPull.Click += BtnPullOnClick;
_btnPush.Click += BtnPushOnClick;
_btnDelete.Click += BtnDeleteOnClick;

//_lblConnected.Text = string.Format("Is Linked: {0} {1}", _accountManager.HasLinkedAccount, DateTime.Now.ToLongTimeString());
_lblConnected.Text = string.Format("Is Linked: {0} {1}", _cloudLibrary.HasLinkedAccount, DateTime.Now.ToLongTimeString());

// Since the onViewReady action could not be added to an intent, tell the NavMgr the view is ready
//((AndroidNavigationManager)_navigationManager).SetSyncCloudActivityInstance(this);
_navigationManager.BindSyncCloudView(this);
}

private void BtnLoginOnClick(object sender, EventArgs e)
{
try
{
_cloudLibrary.LinkApp(this);
_lblConnected.Text = string.Format("Is Linked: {0} {1}", _cloudLibrary.HasLinkedAccount, DateTime.Now.ToLongTimeString());
}
catch (Exception ex)
{
AlertDialog ad = new AlertDialog.Builder(this).Create();
ad.SetCancelable(false);
ad.SetMessage(string.Format("An error has occured in SyncCloud: {0}", ex));
ad.SetButton("OK", (sender2, args2) => ad.Dismiss());
ad.Show();
}
}

private void BtnLogoutOnClick(object sender, EventArgs e)
{
try
{
_cloudLibrary.UnlinkApp();
_lblConnected.Text = string.Format("Is Linked: {0} {1}", _cloudLibrary.HasLinkedAccount, DateTime.Now.ToLongTimeString());
}
catch (Exception ex)
{
AlertDialog ad = new AlertDialog.Builder(this).Create();
ad.SetCancelable(false);
ad.SetMessage(string.Format("An error has occured in SyncCloud: {0}", ex));
ad.SetButton("OK", (sender2, args2) => ad.Dismiss());
ad.Show();
}
}

private void BtnPullOnClick(object sender, EventArgs e)
{
try
{
string nowPlaying = _cloudLibrary.PullStuff();
_lblValue.Text = nowPlaying;
}
catch (Exception ex)
{
AlertDialog ad = new AlertDialog.Builder(this).Create();
ad.SetCancelable(false);
ad.SetMessage(string.Format("An error has occured in SyncCloud: {0}", ex));
ad.SetButton("OK", (sender2, args2) => ad.Dismiss());
ad.Show();
}
}

private void BtnPushOnClick(object sender, EventArgs e)
{
try
{
_cloudLibrary.PushStuff();
_cloudLibrary.PushPlaylist(null);
}
catch (Exception ex)
{
AlertDialog ad = new AlertDialog.Builder(this).Create();
ad.SetCancelable(false);
ad.SetMessage(string.Format("An error has occured in SyncCloud: {0}", ex));
ad.SetButton("OK", (sender2, args2) => ad.Dismiss());
ad.Show();
}
}

private void BtnDeleteOnClick(object sender, EventArgs e)
{
try
{
_cloudLibrary.DeleteStuff();
_cloudLibrary.DeleteNowPlaying();
}
catch (Exception ex)
{
AlertDialog ad = new AlertDialog.Builder(this).Create();
ad.SetCancelable(false);
ad.SetMessage(string.Format("An error has occured in SyncCloud: {0}", ex));
ad.SetButton("OK", (sender2, args2) => ad.Dismiss());
ad.Show();
}
}

private void OnCloudLibraryDataChanged(string data)
{
RunOnUiThread(() =>
{
_lblValue.Text = data;
});
}

protected override void OnStart()
{
Console.WriteLine("SyncCloudActivity - OnStart");
Expand Down
2 changes: 1 addition & 1 deletion MPfm/MPfm.Android/Classes/Application.cs
View file
Expand Up @@ -153,7 +153,7 @@ private void BootstrapApp()
// Complete IoC configuration
TinyIoC.TinyIoCContainer container = Bootstrapper.GetContainer();
container.Register<ISyncDeviceSpecifications, AndroidSyncDeviceSpecifications>().AsSingleton();
container.Register<ICloudLibraryService, AndroidDropboxService>().AsSingleton();
container.Register<ICloudService, AndroidDropboxService>().AsSingleton();
container.Register<IAppConfigProvider, AndroidAppConfigProvider>().AsSingleton();
container.Register<MobileNavigationManager, AndroidNavigationManager>().AsSingleton();
container.Register<IMobileOptionsMenuView, MainActivity>().AsMultiInstance();
Expand Down

0 comments on commit 2dd64b1

Please sign in to comment.