Skip to content

Commit

Permalink
mark as obosolete, increase version
Browse files Browse the repository at this point in the history
  • Loading branch information
selmaohneh-draeger authored and selmaohneh committed Sep 26, 2024
1 parent e1ba3ba commit 254f57d
Show file tree
Hide file tree
Showing 28 changed files with 182 additions and 184 deletions.
1 change: 0 additions & 1 deletion DdfGuide.Android/AudioDramaListAdapter.cs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@
using Android.Views;
using Android.Widget;
using DdfGuide.Core;
using FFImageLoading.Views;

namespace DdfGuide.Android
{
Expand Down
12 changes: 10 additions & 2 deletions DdfGuide.Android/AudioDramaListView.cs
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,7 @@

namespace DdfGuide.Android
{
[Obsolete]
public class AudioDramaListView : Fragment, IAudioDramaListView
{
private readonly IImageViewFiller _imageViewFiller;
Expand All @@ -26,16 +27,18 @@ public class AudioDramaListView : Fragment, IAudioDramaListView
private AudioDramaListAdapter _listViewAdapter;
private ListView _listView;
private TabLayout _tabLayout;
private SwipeActionListener _swipeActionListener;

private SwipeActionListener _swipeActionListener;

/// <summary>
/// Fragments need a default constructor. Needed for old android versions.
/// </summary>
[Obsolete]
public AudioDramaListView()
{
_imageViewFiller = new ImageViewFiller();
}

[Obsolete]
public AudioDramaListView(IImageViewFiller imageViewFiller, IReleaseDateService releaseDateService,
IUserNotifier userNotifier)
{
Expand All @@ -44,6 +47,7 @@ public AudioDramaListView(IImageViewFiller imageViewFiller, IReleaseDateService
_userNotifier = userNotifier;
}

[Obsolete]
public override View OnCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState)
{
_view = inflater.Inflate(Resource.Layout.audiodramalistlayout, container, false);
Expand All @@ -55,6 +59,7 @@ public override View OnCreateView(LayoutInflater inflater, ViewGroup container,
return _view;
}

[Obsolete]
private void SetupFloatingRandomButton()
{
var fab = _view.FindViewById<FloatingActionButton>(Resource.Id.floatingActionButtonRandom);
Expand All @@ -65,6 +70,7 @@ private void SetupFloatingRandomButton()
fab.Click += (sender, args) => { RandomClicked?.Invoke(this, EventArgs.Empty); };
}

[Obsolete]
private void SetupListView()
{
_listView = _view.FindViewById<ListView>(Resource.Id.listViewAudioDramas);
Expand Down Expand Up @@ -121,6 +127,7 @@ private void SetupListView()
swipeActionAdapter.SetSwipeActionListener(_swipeActionListener);
}

[Obsolete]
private void SetupToolbar()
{
_toolbar = _view.FindViewById<Toolbar>(Resource.Id.toolbar);
Expand All @@ -144,6 +151,7 @@ private void SetupSearchView()
_searchView.QueryTextChange += (sender, args) => { SearchTextChanged?.Invoke(this, EventArgs.Empty); };
}

[Obsolete]
private void SetupTabs()
{
_tabLayout = _view.FindViewById<TabLayout>(Resource.Id.tabLayout);
Expand Down
12 changes: 10 additions & 2 deletions DdfGuide.Android/AudioDramaView.cs
Original file line number Diff line number Diff line change
Expand Up @@ -11,10 +11,12 @@

namespace DdfGuide.Android
{
[Obsolete]
public class UpdatingView : Fragment, IUpdatingView
{
private View _view;

[Obsolete]
public override View OnCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState)
{
_view = inflater.Inflate(Resource.Layout.updatinglayout, container, false);
Expand All @@ -23,24 +25,28 @@ public override View OnCreateView(LayoutInflater inflater, ViewGroup container,
}
}

[Obsolete]
public class AudioDramaView : Fragment, IAudioDramaView
{
private readonly IImageViewFiller _imageViewFiller;
private View _view;

private View _view;

/// <summary>
/// Fragments need a default constructor. Needed for old android versions.
/// </summary>
[Obsolete]
public AudioDramaView()
{
_imageViewFiller = new ImageViewFiller();
}

[Obsolete]
public AudioDramaView(IImageViewFiller imageViewFiller)
{
_imageViewFiller = imageViewFiller;
}

[Obsolete]
public override View OnCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState)
{
_view = inflater.Inflate(Resource.Layout.audiodramalayout, container, false);
Expand Down Expand Up @@ -82,6 +88,7 @@ private void SetupHeardCheckbox()
};
}

[Obsolete]
private void SetupToolbar()
{
var toolbar = _view.FindViewById<Toolbar>(Resource.Id.toolbarsingleview);
Expand All @@ -91,6 +98,7 @@ private void SetupToolbar()
toolbar.NavigationOnClick += (sender, args) => BackClicked?.Invoke(this, EventArgs.Empty);
}

[Obsolete]
public void SetAudioDrama(AudioDrama audioDrama)
{
var interpreterView = _view.FindViewById<TextView>(Resource.Id.textviewinterpreter);
Expand Down
3 changes: 2 additions & 1 deletion DdfGuide.Android/DdfGuide.Android.csproj
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,8 @@
<EnableLLVM>false</EnableLLVM>
<BundleAssemblies>false</BundleAssemblies>
<AndroidSupportedAbis>armeabi-v7a;arm64-v8a</AndroidSupportedAbis>
<AndroidSigningKeyStore>C:\Users\marce\Downloads\keystore.jks</AndroidSigningKeyStore>
<AndroidSigningKeyStore>C:\Users\neummarc\Downloads\keystore.jks</AndroidSigningKeyStore>
<AndroidEnableProfiledAot>false</AndroidEnableProfiledAot>
</PropertyGroup>
<ItemGroup>
<Reference Include="System" />
Expand Down
53 changes: 27 additions & 26 deletions DdfGuide.Android/ImageViewFiller.cs
Original file line number Diff line number Diff line change
@@ -1,27 +1,28 @@
using FFImageLoading;
using FFImageLoading.Views;
using FFImageLoading.Work;

namespace DdfGuide.Android
{
public class ImageViewFiller : IImageViewFiller
{
public void FillImageViewFromUrl(ImageViewAsync imageView, string url)
{
if (string.IsNullOrWhiteSpace(url))
{
ImageService.Instance
.LoadCompiledResource("ic_launcher")
.IntoAsync(imageView);
}
else
{
ImageService.Instance
.LoadUrl(url)
.LoadingPlaceholder("ic_launcher", ImageSource.CompiledResource)
.ErrorPlaceholder("ic_launcher", ImageSource.CompiledResource)
.IntoAsync(imageView);
}
}
}
using Android.Widget;
using FFImageLoading;
using FFImageLoading.Work;

namespace DdfGuide.Android
{
public class ImageViewFiller : IImageViewFiller
{
[System.Obsolete]
public void FillImageViewFromUrl(ImageView imageView, string url)
{
if (string.IsNullOrWhiteSpace(url))
{
ImageService.Instance
.LoadCompiledResource("ic_launcher")
.IntoAsync(imageView);
}
else
{
ImageService.Instance
.LoadUrl(url)
.LoadingPlaceholder("ic_launcher", ImageSource.CompiledResource)
.ErrorPlaceholder("ic_launcher", ImageSource.CompiledResource)
.IntoAsync(imageView);
}
}
}
}
Loading

0 comments on commit 254f57d

Please sign in to comment.