diff --git a/Opus/Code/Api/PlaylistManager.cs b/Opus/Code/Api/PlaylistManager.cs index 4ee00b3..55e21b6 100644 --- a/Opus/Code/Api/PlaylistManager.cs +++ b/Opus/Code/Api/PlaylistManager.cs @@ -295,11 +295,6 @@ namespace Opus.Api playlists.Add(Loading); View Layout = MainActivity.instance.LayoutInflater.Inflate(Resource.Layout.AddToPlaylistLayout, null); - if (MainActivity.Theme == 1) - { - Layout.FindViewById(Resource.Id.leftIcon).SetColorFilter(Color.White); - Layout.FindViewById(Resource.Id.divider).SetBackgroundColor(Color.White); - } AlertDialog.Builder builder = new AlertDialog.Builder(MainActivity.instance, MainActivity.dialogTheme); builder.SetTitle(Resource.String.save_playlist); builder.SetView(Layout); diff --git a/Opus/Code/MainActivity.cs b/Opus/Code/MainActivity.cs index b661b54..817db17 100644 --- a/Opus/Code/MainActivity.cs +++ b/Opus/Code/MainActivity.cs @@ -36,7 +36,7 @@ using YoutubeExplode; using Environment = Android.OS.Environment; using Fragment = Android.Support.V4.App.Fragment; using Playlist = Opus.Fragments.Playlist; -using Request = Square.OkHttp.Request; +//using Request = Square.OkHttp.Request; using SearchView = Android.Support.V7.Widget.SearchView; using Toolbar = Android.Support.V7.Widget.Toolbar; using TransportType = Android.Net.TransportType; diff --git a/Opus/Code/UI/Adapter/AddToPlaylistAdapter.cs b/Opus/Code/UI/Adapter/AddToPlaylistAdapter.cs index 994425e..1cd2b4e 100644 --- a/Opus/Code/UI/Adapter/AddToPlaylistAdapter.cs +++ b/Opus/Code/UI/Adapter/AddToPlaylistAdapter.cs @@ -46,8 +46,6 @@ namespace Opus.Adapter { holder.Status.Visibility = ViewStates.Gone; holder.SyncLoading.Visibility = ViewStates.Visible; - if (MainActivity.Theme == 1) - holder.SyncLoading.IndeterminateTintList = ColorStateList.ValueOf(Color.White); } else if(Playlists[position].YoutubeID != null) { @@ -59,12 +57,6 @@ namespace Opus.Adapter holder.Status.Visibility = ViewStates.Gone; holder.SyncLoading.Visibility = ViewStates.Gone; } - - if (MainActivity.Theme == 1) - { - holder.Status.SetColorFilter(Color.White); - holder.Title.SetTextColor(Color.White); - } } public override RecyclerView.ViewHolder OnCreateViewHolder(ViewGroup parent, int viewType) diff --git a/Opus/Code/UI/Adapter/BottomSheetAdapter.cs b/Opus/Code/UI/Adapter/BottomSheetAdapter.cs index 7a4aff0..e6a222e 100644 --- a/Opus/Code/UI/Adapter/BottomSheetAdapter.cs +++ b/Opus/Code/UI/Adapter/BottomSheetAdapter.cs @@ -2,8 +2,10 @@ using Android.Content.Res; using Android.Graphics; using Android.Graphics.Drawables; +using Android.Util; using Android.Views; using Android.Widget; +using Java.Lang; using System; using System.Collections.Generic; @@ -41,11 +43,15 @@ namespace Opus.Adapter ((TextView)convertView).Text = items[position].name; - Drawable icon = MainActivity.instance.GetDrawable(items[position].Ressource); - if(MainActivity.Theme != 1) - icon.SetTintList(ColorStateList.ValueOf(Color.Black)); + Color color; + TypedValue value = new TypedValue(); + if (Context.Theme.ResolveAttribute(Resource.Attribute.iconColor, value, true)) + color = Color.ParseColor("#" + Integer.ToHexString(value.Data)); else - icon.SetTintList(ColorStateList.ValueOf(Color.White)); + color = Color.Black; + + Drawable icon = MainActivity.instance.GetDrawable(items[position].Ressource); + icon.SetTintList(ColorStateList.ValueOf(color)); ((TextView)convertView).SetCompoundDrawablesWithIntrinsicBounds(icon, null, null, null); diff --git a/Opus/Code/UI/Adapter/BrowseAdapter.cs b/Opus/Code/UI/Adapter/BrowseAdapter.cs index 815efc5..5e02202 100644 --- a/Opus/Code/UI/Adapter/BrowseAdapter.cs +++ b/Opus/Code/UI/Adapter/BrowseAdapter.cs @@ -32,12 +32,7 @@ namespace Opus.Adapter public override void OnBindViewHolder(RecyclerView.ViewHolder viewHolder, int position) { if (position == 0 && displayShuffle) - { - if (MainActivity.Theme == 1) - ((CardView)viewHolder.ItemView).SetCardBackgroundColor(Color.ParseColor("#212121")); - else - ((CardView)viewHolder.ItemView).SetCardBackgroundColor(Color.White); - } + return; else base.OnBindViewHolder(viewHolder, position); } diff --git a/Opus/Resources/Resource.Designer.cs b/Opus/Resources/Resource.Designer.cs index a4b5d99..5816bd7 100644 --- a/Opus/Resources/Resource.Designer.cs +++ b/Opus/Resources/Resource.Designer.cs @@ -1119,6 +1119,9 @@ namespace Opus // aapt resource value: 0x7f01008d public const int icon = 2130772109; + // aapt resource value: 0x7f01027e + public const int iconColor = 2130772606; + // aapt resource value: 0x7f0101c9 public const int iconEndPadding = 2130772425; diff --git a/Opus/Resources/layout/AddToPlaylistItem.xml b/Opus/Resources/layout/AddToPlaylistItem.xml index 5f7908f..910f040 100644 --- a/Opus/Resources/layout/AddToPlaylistItem.xml +++ b/Opus/Resources/layout/AddToPlaylistItem.xml @@ -24,6 +24,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:background="@null" + android:tint="?iconColor" android:id="@+id/status" android:paddingRight="15dp" android:layout_centerVertical="true" @@ -34,7 +35,7 @@ android:layout_height="20dp" android:paddingRight="15dp" android:indeterminate="true" - android:indeterminateTint="@android:color/black" + android:indeterminateTint="?iconColor" android:layout_centerVertical="true" android:layout_alignParentRight="true" android:visibility="gone" /> diff --git a/Opus/Resources/layout/AddToPlaylistLayout.xml b/Opus/Resources/layout/AddToPlaylistLayout.xml index 55d01b0..e6b8c1e 100644 --- a/Opus/Resources/layout/AddToPlaylistLayout.xml +++ b/Opus/Resources/layout/AddToPlaylistLayout.xml @@ -16,7 +16,7 @@ android:id="@+id/divider" android:layout_margin="5dp" android:alpha="0.6" - android:background="#000000" /> + android:background="?iconColor" /> + \ No newline at end of file diff --git a/Opus/Resources/values/styles.xml b/Opus/Resources/values/styles.xml index 71af475..f965d82 100644 --- a/Opus/Resources/values/styles.xml +++ b/Opus/Resources/values/styles.xml @@ -11,6 +11,7 @@ @style/LightDropDown @style/LightPreferences #A3BBDC + #000 #000 #000 #ffffff @@ -25,6 +26,7 @@ #212121 @style/DarkPreferences #A3BBDC + #ffffff #ffffff #ffffff #212121