From 4d0107bd74058ce7c38aa09a739943d4d29191f5 Mon Sep 17 00:00:00 2001 From: h4h13 Date: Fri, 3 Jan 2020 18:10:42 +0530 Subject: [PATCH] Fix icons --- app/build.gradle | 2 +- .../activities/SupportDevelopmentActivity.kt | 360 ++++++++-------- .../tageditor/AbsTagEditorActivity.kt | 2 +- .../tageditor/SongTagEditorActivity.kt | 2 +- .../adapter/song/PlayingQueueAdapter.kt | 35 +- .../normal/PlayerPlaybackControlsFragment.kt | 13 +- .../monkey/retromusic/model/CategoryInfo.java | 48 ++- .../drawable/ic_access_time_white_24dp.xml | 17 +- .../res/drawable/ic_account_white_24dp.xml | 2 +- .../res/drawable/ic_add_photo_white_24dp.xml | 8 +- .../drawable/ic_album_selected_white_24dp.xml | 11 - .../main/res/drawable/ic_album_white_24dp.xml | 3 +- .../drawable/ic_app_shortcut_last_added.xml | 2 +- .../res/drawable/ic_app_shortcut_search.xml | 2 +- .../res/drawable/ic_artist_white_24dp.xml | 2 +- .../res/drawable/ic_audiotrack_black_24dp.xml | 10 - .../ic_audiotrack_selected_black_24dp.xml | 11 - ..._24dp.xml => ic_audiotrack_white_24dp.xml} | 5 +- .../drawable/ic_card_giftcard_white_24dp.xml | 14 + .../res/drawable/ic_clear_all_black_24dp.xml | 16 +- .../main/res/drawable/ic_close_white_24dp.xml | 16 +- .../res/drawable/ic_disc_full_black_24dp.xml | 9 - .../main/res/drawable/ic_edit_white_24dp.xml | 16 +- .../res/drawable/ic_equalizer_white_24dp.xml | 17 +- .../ic_favorite_border_white_24dp.xml | 2 +- .../res/drawable/ic_favorite_white_24dp.xml | 2 +- .../main/res/drawable/ic_flag_white_24dp.xml | 17 +- .../res/drawable/ic_folder_white_24dp.xml | 16 +- .../drawable/ic_github_circle_white_24dp.xml | 14 + .../res/drawable/ic_grid_size_white_24dp.xml | 2 +- .../res/drawable/ic_guitar_white_24dp.xml | 14 + .../res/drawable/ic_hdr_strong_white_24dp.xml | 16 +- .../main/res/drawable/ic_help_white_24dp.xml | 17 +- .../drawable/ic_home_selected_white_24dp.xml | 10 - .../main/res/drawable/ic_home_white_24dp.xml | 17 +- .../main/res/drawable/ic_image_white_24dp.xml | 17 +- .../drawable/ic_info_outline_white_24dp.xml | 10 +- .../drawable/ic_invert_colors_white_24dp.xml | 13 +- .../ic_keyboard_arrow_down_black_24dp.xml | 2 +- .../ic_keyboard_arrow_right_white_24dp.xml | 14 +- .../drawable/ic_keyboard_arrow_up_24dp.xml | 14 +- .../ic_keyboard_backspace_black_24dp.xml | 17 +- .../drawable/ic_library_add_white_24dp.xml | 16 +- .../drawable/ic_library_music_white_24dp.xml | 17 +- .../main/res/drawable/ic_menu_white_24dp.xml | 17 +- .../main/res/drawable/ic_mic_white_24dp.xml | 16 +- .../res/drawable/ic_more_vert_white_24dp.xml | 18 +- .../drawable/ic_music_note_off_white_24dp.xml | 4 +- .../ic_notifications_active_white_24dp.xml | 18 +- .../ic_open_in_browser_white_24dp.xml | 2 +- .../main/res/drawable/ic_pause_white_24dp.xml | 6 +- .../main/res/drawable/ic_pause_white_48dp.xml | 3 +- .../main/res/drawable/ic_pause_white_64dp.xml | 4 +- .../res/drawable/ic_pinterest_white_24dp.xml | 14 + .../res/drawable/ic_play_arrow_white_24dp.xml | 16 +- .../res/drawable/ic_play_arrow_white_32dp.xml | 7 +- .../res/drawable/ic_play_arrow_white_48dp.xml | 2 +- .../res/drawable/ic_play_arrow_white_64dp.xml | 18 +- .../drawable/ic_playlist_add_white_24dp.xml | 2 +- .../drawable/ic_playlist_play_white_24dp.xml | 2 +- .../drawable/ic_queue_music_white_24dp.xml | 11 +- .../res/drawable/ic_repeat_one_white_24dp.xml | 3 +- .../res/drawable/ic_repeat_white_24dp.xml | 3 +- .../main/res/drawable/ic_save_white_24dp.xml | 16 +- .../main/res/drawable/ic_send_white_24dp.xml | 24 +- .../ic_settings_brigntness_white_24dp.xml | 2 +- .../main/res/drawable/ic_share_white_24dp.xml | 2 +- .../res/drawable/ic_shuffle_white_24dp.xml | 2 +- .../ic_skip_next_round_white_32dp.xml | 2 +- .../res/drawable/ic_skip_next_white_24dp.xml | 2 +- .../ic_skip_previous_round_white_32dp.xml | 14 + .../drawable/ic_skip_previous_white_24dp.xml | 6 +- .../main/res/drawable/ic_sort_white_24dp.xml | 17 +- .../main/res/drawable/ic_star_white_24dp.xml | 3 +- .../drawable/ic_theme_palette_white_24dp.xml | 15 +- .../drawable/ic_trending_up_white_24dp.xml | 2 +- .../drawable/ic_unfold_more_black_24dp.xml | 12 - .../drawable/ic_view_carousel_black_24dp.xml | 2 +- .../drawable/ic_volume_down_white_24dp.xml | 2 +- .../res/drawable/ic_volume_off_white_24dp.xml | 2 +- .../res/drawable/ic_volume_up_white_24dp.xml | 16 +- app/src/main/res/drawable/toggle_album.xml | 18 - app/src/main/res/drawable/toggle_artist.xml | 19 - .../main/res/drawable/toggle_audiotrack.xml | 19 - app/src/main/res/drawable/toggle_guitar.xml | 17 - app/src/main/res/drawable/toggle_home.xml | 19 - app/src/main/res/drawable/toggle_playlist.xml | 18 - .../main/res/drawable/toggle_queue_music.xml | 19 - .../res/layout/activity_album_content.xml | 17 +- app/src/main/res/layout/activity_donation.xml | 1 + .../main/res/layout/activity_pro_version.xml | 4 +- app/src/main/res/layout/fragment_full.xml | 6 +- .../layout/fragment_full_player_controls.xml | 383 +++++++++--------- .../res/layout/fragment_main_settings.xml | 2 +- .../fragment_player_playback_controls.xml | 5 +- app/src/main/res/layout/fragment_volume.xml | 30 +- app/src/main/res/layout/item_album_card.xml | 6 +- app/src/main/res/layout/item_list.xml | 18 +- .../main/res/menu/bottom_navigation_main.xml | 10 +- 99 files changed, 999 insertions(+), 789 deletions(-) delete mode 100644 app/src/main/res/drawable/ic_album_selected_white_24dp.xml delete mode 100644 app/src/main/res/drawable/ic_audiotrack_black_24dp.xml delete mode 100644 app/src/main/res/drawable/ic_audiotrack_selected_black_24dp.xml rename app/src/main/res/drawable/{ic_queue_music_selected_white_24dp.xml => ic_audiotrack_white_24dp.xml} (76%) delete mode 100644 app/src/main/res/drawable/ic_disc_full_black_24dp.xml delete mode 100644 app/src/main/res/drawable/ic_home_selected_white_24dp.xml delete mode 100644 app/src/main/res/drawable/ic_unfold_more_black_24dp.xml delete mode 100644 app/src/main/res/drawable/toggle_album.xml delete mode 100644 app/src/main/res/drawable/toggle_artist.xml delete mode 100644 app/src/main/res/drawable/toggle_audiotrack.xml delete mode 100644 app/src/main/res/drawable/toggle_guitar.xml delete mode 100644 app/src/main/res/drawable/toggle_home.xml delete mode 100644 app/src/main/res/drawable/toggle_playlist.xml delete mode 100644 app/src/main/res/drawable/toggle_queue_music.xml diff --git a/app/build.gradle b/app/build.gradle index 013a450d..491708f9 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -13,7 +13,7 @@ android { vectorDrawables.useSupportLibrary = true applicationId "code.name.monkey.retromusic" - versionCode 398 + versionCode 399 versionName '3.4.850' multiDexEnabled true diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/SupportDevelopmentActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/SupportDevelopmentActivity.kt index 0f27363e..88e3684a 100644 --- a/app/src/main/java/code/name/monkey/retromusic/activities/SupportDevelopmentActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/SupportDevelopmentActivity.kt @@ -19,229 +19,239 @@ import androidx.recyclerview.widget.RecyclerView import code.name.monkey.appthemehelper.ThemeStore import code.name.monkey.appthemehelper.util.ATHUtil import code.name.monkey.appthemehelper.util.TintHelper +import code.name.monkey.appthemehelper.util.ToolbarContentTintHelper import code.name.monkey.retromusic.BuildConfig import code.name.monkey.retromusic.R import code.name.monkey.retromusic.activities.base.AbsBaseActivity -import code.name.monkey.retromusic.extensions.applyToolbar import com.anjlab.android.iab.v3.BillingProcessor import com.anjlab.android.iab.v3.SkuDetails import com.anjlab.android.iab.v3.TransactionDetails -import kotlinx.android.synthetic.main.activity_donation.* +import kotlinx.android.synthetic.main.activity_about.toolbar +import kotlinx.android.synthetic.main.activity_donation.donation +import kotlinx.android.synthetic.main.activity_donation.progress +import kotlinx.android.synthetic.main.activity_donation.progressContainer +import kotlinx.android.synthetic.main.activity_donation.recyclerView import java.lang.ref.WeakReference -import java.util.* +import java.util.ArrayList +import java.util.Arrays class SupportDevelopmentActivity : AbsBaseActivity(), BillingProcessor.IBillingHandler { - companion object { - val TAG: String = SupportDevelopmentActivity::class.java.simpleName - const val DONATION_PRODUCT_IDS = R.array.donation_ids - private const val TEZ_REQUEST_CODE = 123 - } + companion object { + val TAG: String = SupportDevelopmentActivity::class.java.simpleName + const val DONATION_PRODUCT_IDS = R.array.donation_ids + private const val TEZ_REQUEST_CODE = 123 + } - var billingProcessor: BillingProcessor? = null - private var skuDetailsLoadAsyncTask: AsyncTask<*, *, *>? = null + var billingProcessor: BillingProcessor? = null + private var skuDetailsLoadAsyncTask: AsyncTask<*, *, *>? = null - override fun onOptionsItemSelected(item: MenuItem): Boolean { - if (item.itemId == android.R.id.home) { - onBackPressed() - return true - } - return super.onOptionsItemSelected(item) - } + override fun onOptionsItemSelected(item: MenuItem): Boolean { + if (item.itemId == android.R.id.home) { + onBackPressed() + return true + } + return super.onOptionsItemSelected(item) + } - fun donate(i: Int) { - val ids = resources.getStringArray(DONATION_PRODUCT_IDS) - billingProcessor!!.purchase(this, ids[i]) - } + fun donate(i: Int) { + val ids = resources.getStringArray(DONATION_PRODUCT_IDS) + billingProcessor!!.purchase(this, ids[i]) + } - override fun onCreate(savedInstanceState: Bundle?) { - super.onCreate(savedInstanceState) - setContentView(R.layout.activity_donation) + override fun onCreate(savedInstanceState: Bundle?) { + super.onCreate(savedInstanceState) + setContentView(R.layout.activity_donation) - setStatusbarColorAuto() - setNavigationbarColorAuto() - setTaskDescriptionColorAuto() - setLightNavigationBar(true) + setStatusbarColorAuto() + setNavigationbarColorAuto() + setTaskDescriptionColorAuto() + setLightNavigationBar(true) - setupToolbar() + setupToolbar() - billingProcessor = BillingProcessor(this, BuildConfig.GOOGLE_PLAY_LICENSING_KEY, this) - TintHelper.setTint(progress, ThemeStore.accentColor(this)) - donation.setTextColor(ThemeStore.accentColor(this)) - } + billingProcessor = BillingProcessor(this, BuildConfig.GOOGLE_PLAY_LICENSING_KEY, this) + TintHelper.setTint(progress, ThemeStore.accentColor(this)) + donation.setTextColor(ThemeStore.accentColor(this)) + } - private fun setupToolbar() { - applyToolbar(toolbar) - } + private fun setupToolbar() { + val toolbarColor = ATHUtil.resolveColor(this, R.attr.colorSurface) + toolbar.setBackgroundColor(toolbarColor) + ToolbarContentTintHelper.colorBackButton(toolbar) + setSupportActionBar(toolbar) + } - override fun onBillingInitialized() { - loadSkuDetails() - } + override fun onBillingInitialized() { + loadSkuDetails() + } - private fun loadSkuDetails() { - if (skuDetailsLoadAsyncTask != null) { - skuDetailsLoadAsyncTask!!.cancel(false) - } - skuDetailsLoadAsyncTask = SkuDetailsLoadAsyncTask(this).execute() + private fun loadSkuDetails() { + if (skuDetailsLoadAsyncTask != null) { + skuDetailsLoadAsyncTask!!.cancel(false) + } + skuDetailsLoadAsyncTask = SkuDetailsLoadAsyncTask(this).execute() + } - } + override fun onProductPurchased(productId: String, details: TransactionDetails?) { + //loadSkuDetails(); + Toast.makeText(this, R.string.thank_you, Toast.LENGTH_SHORT).show() + } - override fun onProductPurchased(productId: String, details: TransactionDetails?) { - //loadSkuDetails(); - Toast.makeText(this, R.string.thank_you, Toast.LENGTH_SHORT).show() - } + override fun onBillingError(errorCode: Int, error: Throwable?) { + Log.e(TAG, "Billing error: code = $errorCode", error) + } - override fun onBillingError(errorCode: Int, error: Throwable?) { - Log.e(TAG, "Billing error: code = $errorCode", error) - } + override fun onPurchaseHistoryRestored() { + //loadSkuDetails(); + Toast.makeText(this, R.string.restored_previous_purchases, Toast.LENGTH_SHORT).show() + } - override fun onPurchaseHistoryRestored() { - //loadSkuDetails(); - Toast.makeText(this, R.string.restored_previous_purchases, Toast.LENGTH_SHORT).show() - } + override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { + if (!billingProcessor!!.handleActivityResult(requestCode, resultCode, data)) { + super.onActivityResult(requestCode, resultCode, data) + } + if (requestCode == TEZ_REQUEST_CODE) { + // Process based on the data in response. + Log.d("result", data!!.getStringExtra("Status")) + } + } - override fun onActivityResult(requestCode: Int, resultCode: Int, data: Intent?) { - if (!billingProcessor!!.handleActivityResult(requestCode, resultCode, data)) { - super.onActivityResult(requestCode, resultCode, data) - } - if (requestCode == TEZ_REQUEST_CODE) { - // Process based on the data in response. - Log.d("result", data!!.getStringExtra("Status")) - } - } - - override fun onDestroy() { - if (billingProcessor != null) { - billingProcessor!!.release() - } - if (skuDetailsLoadAsyncTask != null) { - skuDetailsLoadAsyncTask!!.cancel(true) - } - super.onDestroy() - } + override fun onDestroy() { + if (billingProcessor != null) { + billingProcessor!!.release() + } + if (skuDetailsLoadAsyncTask != null) { + skuDetailsLoadAsyncTask!!.cancel(true) + } + super.onDestroy() + } } -private class SkuDetailsLoadAsyncTask internal constructor(supportDevelopmentActivity: SupportDevelopmentActivity) : AsyncTask>() { - private val weakReference: WeakReference = WeakReference( - supportDevelopmentActivity - ) +private class SkuDetailsLoadAsyncTask internal constructor(supportDevelopmentActivity: SupportDevelopmentActivity) : + AsyncTask>() { - override fun onPreExecute() { - super.onPreExecute() - val supportDevelopmentActivity = weakReference.get() ?: return + private val weakReference: WeakReference = WeakReference( + supportDevelopmentActivity + ) - supportDevelopmentActivity.progressContainer.visibility = View.VISIBLE - supportDevelopmentActivity.recyclerView.visibility = View.GONE - } + override fun onPreExecute() { + super.onPreExecute() + val supportDevelopmentActivity = weakReference.get() ?: return - override fun doInBackground(vararg params: Void): List? { - val dialog = weakReference.get() - if (dialog != null) { - val ids = dialog.resources.getStringArray(SupportDevelopmentActivity.DONATION_PRODUCT_IDS) - return dialog.billingProcessor!!.getPurchaseListingDetails(ArrayList(Arrays.asList(*ids))) - } - cancel(false) - return null - } + supportDevelopmentActivity.progressContainer.visibility = View.VISIBLE + supportDevelopmentActivity.recyclerView.visibility = View.GONE + } - override fun onPostExecute(skuDetails: List?) { - super.onPostExecute(skuDetails) - val dialog = weakReference.get() ?: return + override fun doInBackground(vararg params: Void): List? { + val dialog = weakReference.get() + if (dialog != null) { + val ids = dialog.resources.getStringArray(SupportDevelopmentActivity.DONATION_PRODUCT_IDS) + return dialog.billingProcessor!!.getPurchaseListingDetails(ArrayList(Arrays.asList(*ids))) + } + cancel(false) + return null + } - if (skuDetails == null || skuDetails.isEmpty()) { - dialog.progressContainer.visibility = View.GONE - return - } + override fun onPostExecute(skuDetails: List?) { + super.onPostExecute(skuDetails) + val dialog = weakReference.get() ?: return - dialog.progressContainer.visibility = View.GONE - dialog.recyclerView.itemAnimator = DefaultItemAnimator() - dialog.recyclerView.layoutManager = GridLayoutManager(dialog, 2) - dialog.recyclerView.adapter = SkuDetailsAdapter(dialog, skuDetails) - dialog.recyclerView.visibility = View.VISIBLE - } + if (skuDetails == null || skuDetails.isEmpty()) { + dialog.progressContainer.visibility = View.GONE + return + } + + dialog.progressContainer.visibility = View.GONE + dialog.recyclerView.itemAnimator = DefaultItemAnimator() + dialog.recyclerView.layoutManager = GridLayoutManager(dialog, 2) + dialog.recyclerView.adapter = SkuDetailsAdapter(dialog, skuDetails) + dialog.recyclerView.visibility = View.VISIBLE + } } class SkuDetailsAdapter( - private var donationsDialog: SupportDevelopmentActivity, objects: List + private var donationsDialog: SupportDevelopmentActivity, objects: List ) : RecyclerView.Adapter() { - private var skuDetailsList: List = ArrayList() - init { - skuDetailsList = objects - } + private var skuDetailsList: List = ArrayList() - private fun getIcon(position: Int): Int { - return when (position) { - 0 -> R.drawable.ic_cookie_white_24dp - 1 -> R.drawable.ic_take_away_white_24dp - 2 -> R.drawable.ic_take_away_coffe_white_24dp - 3 -> R.drawable.ic_beer_white_24dp - 4 -> R.drawable.ic_fast_food_meal_white_24dp - 5 -> R.drawable.ic_popcorn_white_24dp - 6 -> R.drawable.ic_card_giftcard_white_24dp - else -> R.drawable.ic_card_giftcard_white_24dp - } - } + init { + skuDetailsList = objects + } - override fun onCreateViewHolder(viewGroup: ViewGroup, i: Int): ViewHolder { - return ViewHolder( - LayoutInflater.from(donationsDialog).inflate( - LAYOUT_RES_ID, - viewGroup, - false - ) - ) - } + private fun getIcon(position: Int): Int { + return when (position) { + 0 -> R.drawable.ic_cookie_white_24dp + 1 -> R.drawable.ic_take_away_white_24dp + 2 -> R.drawable.ic_take_away_coffe_white_24dp + 3 -> R.drawable.ic_beer_white_24dp + 4 -> R.drawable.ic_fast_food_meal_white_24dp + 5 -> R.drawable.ic_popcorn_white_24dp + 6 -> R.drawable.ic_card_giftcard_white_24dp + else -> R.drawable.ic_card_giftcard_white_24dp + } + } - override fun onBindViewHolder(viewHolder: ViewHolder, i: Int) { - val skuDetails = skuDetailsList[i] - viewHolder.title.text = skuDetails.title.replace("(Retro Music Player)", "") - .trim { it <= ' ' } - viewHolder.text.text = skuDetails.description - viewHolder.text.visibility = View.GONE - viewHolder.price.text = skuDetails.priceText - viewHolder.image.setImageResource(getIcon(i)) + override fun onCreateViewHolder(viewGroup: ViewGroup, i: Int): ViewHolder { + return ViewHolder( + LayoutInflater.from(donationsDialog).inflate( + LAYOUT_RES_ID, + viewGroup, + false + ) + ) + } - val purchased = donationsDialog.billingProcessor!!.isPurchased(skuDetails.productId) - val titleTextColor = if (purchased) ATHUtil.resolveColor( - donationsDialog, - android.R.attr.textColorHint - ) else ThemeStore.textColorPrimary(donationsDialog) - val contentTextColor = if (purchased) titleTextColor else ThemeStore.textColorSecondary( - donationsDialog - ) + override fun onBindViewHolder(viewHolder: ViewHolder, i: Int) { + val skuDetails = skuDetailsList[i] + viewHolder.title.text = skuDetails.title.replace("(Retro Music Player)", "") + .trim { it <= ' ' } + viewHolder.text.text = skuDetails.description + viewHolder.text.visibility = View.GONE + viewHolder.price.text = skuDetails.priceText + viewHolder.image.setImageResource(getIcon(i)) + + val purchased = donationsDialog.billingProcessor!!.isPurchased(skuDetails.productId) + val titleTextColor = if (purchased) ATHUtil.resolveColor( + donationsDialog, + android.R.attr.textColorHint + ) else ThemeStore.textColorPrimary(donationsDialog) + val contentTextColor = if (purchased) titleTextColor else ThemeStore.textColorSecondary( + donationsDialog + ) - viewHolder.title.setTextColor(titleTextColor) - viewHolder.text.setTextColor(contentTextColor) - viewHolder.price.setTextColor(titleTextColor) + viewHolder.title.setTextColor(titleTextColor) + viewHolder.text.setTextColor(contentTextColor) + viewHolder.price.setTextColor(titleTextColor) - strikeThrough(viewHolder.title, purchased) - strikeThrough(viewHolder.text, purchased) - strikeThrough(viewHolder.price, purchased) + strikeThrough(viewHolder.title, purchased) + strikeThrough(viewHolder.text, purchased) + strikeThrough(viewHolder.price, purchased) - viewHolder.itemView.setOnTouchListener { _, _ -> purchased } - viewHolder.itemView.setOnClickListener { donationsDialog.donate(i) } - } + viewHolder.itemView.setOnTouchListener { _, _ -> purchased } + viewHolder.itemView.setOnClickListener { donationsDialog.donate(i) } + } - override fun getItemCount(): Int { - return skuDetailsList.size - } + override fun getItemCount(): Int { + return skuDetailsList.size + } - class ViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var title: TextView = view.findViewById(R.id.itemTitle) - var text: TextView = view.findViewById(R.id.itemText) - var price: TextView = view.findViewById(R.id.itemPrice) - var image: AppCompatImageView = view.findViewById(R.id.itemImage) - } + class ViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var title: TextView = view.findViewById(R.id.itemTitle) + var text: TextView = view.findViewById(R.id.itemText) + var price: TextView = view.findViewById(R.id.itemPrice) + var image: AppCompatImageView = view.findViewById(R.id.itemImage) + } - companion object { - @LayoutRes - private val LAYOUT_RES_ID = R.layout.item_donation_option + companion object { + @LayoutRes + private val LAYOUT_RES_ID = R.layout.item_donation_option - private fun strikeThrough(textView: TextView, strikeThrough: Boolean) { - textView.paintFlags = if (strikeThrough) textView.paintFlags or Paint.STRIKE_THRU_TEXT_FLAG - else textView.paintFlags and Paint.STRIKE_THRU_TEXT_FLAG.inv() - } - } + private fun strikeThrough(textView: TextView, strikeThrough: Boolean) { + textView.paintFlags = if (strikeThrough) textView.paintFlags or Paint.STRIKE_THRU_TEXT_FLAG + else textView.paintFlags and Paint.STRIKE_THRU_TEXT_FLAG.inv() + } + } } diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/AbsTagEditorActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/AbsTagEditorActivity.kt index 8b82cb48..06d3c839 100755 --- a/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/AbsTagEditorActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/AbsTagEditorActivity.kt @@ -187,7 +187,7 @@ abstract class AbsTagEditorActivity : AbsBaseActivity() { setUpViews() - + setStatusbarColorAuto() setNavigationbarColorAuto() setTaskDescriptionColorAuto() } diff --git a/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/SongTagEditorActivity.kt b/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/SongTagEditorActivity.kt index bdee34c6..a76f74e9 100755 --- a/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/SongTagEditorActivity.kt +++ b/app/src/main/java/code/name/monkey/retromusic/activities/tageditor/SongTagEditorActivity.kt @@ -43,7 +43,7 @@ class SongTagEditorActivity : AbsTagEditorActivity(), TextWatcher { setNoImageMode() setUpViews() applyToolbar(toolbar) - setStatusbarColorAuto() + } private fun setUpViews() { diff --git a/app/src/main/java/code/name/monkey/retromusic/adapter/song/PlayingQueueAdapter.kt b/app/src/main/java/code/name/monkey/retromusic/adapter/song/PlayingQueueAdapter.kt index 1fa489f3..aa5827be 100644 --- a/app/src/main/java/code/name/monkey/retromusic/adapter/song/PlayingQueueAdapter.kt +++ b/app/src/main/java/code/name/monkey/retromusic/adapter/song/PlayingQueueAdapter.kt @@ -1,7 +1,7 @@ package code.name.monkey.retromusic.adapter.song import android.graphics.Color -import android.graphics.PorterDuff +import android.graphics.PorterDuff.Mode import android.view.MenuItem import android.view.View import android.widget.ImageView @@ -23,16 +23,15 @@ import com.h6ah4i.android.widget.advrecyclerview.swipeable.action.SwipeResultAct import com.h6ah4i.android.widget.advrecyclerview.swipeable.action.SwipeResultActionDefault import com.h6ah4i.android.widget.advrecyclerview.swipeable.action.SwipeResultActionRemoveItem import com.h6ah4i.android.widget.advrecyclerview.swipeable.annotation.SwipeableItemResults -import java.util.* - +import java.util.ArrayList class PlayingQueueAdapter( - activity: AppCompatActivity, - dataSet: ArrayList, - private var current: Int, - itemLayoutRes: Int + activity: AppCompatActivity, + dataSet: ArrayList, + private var current: Int, + itemLayoutRes: Int ) : SongAdapter( - activity, dataSet, itemLayoutRes, false, null + activity, dataSet, itemLayoutRes, false, null ), DraggableItemAdapter, SwipeableItemAdapter { private var color = -1 @@ -67,7 +66,7 @@ class PlayingQueueAdapter( holder.time?.setTextColor(white) holder.imageText?.setTextColor(white) if (holder.menu != null) { - (holder.menu as ImageView).setColorFilter(white, PorterDuff.Mode.SRC_IN) + (holder.menu as ImageView).setColorFilter(white, Mode.SRC_IN) } } @@ -158,7 +157,7 @@ class PlayingQueueAdapter( override fun onSongMenuItemClick(item: MenuItem): Boolean { when (item.itemId) { R.id.action_remove_from_playing_queue -> { - MusicPlayerRemote.removeFromQueue(adapterPosition) + removeFromQueue(adapterPosition) return true } } @@ -186,7 +185,10 @@ class PlayingQueueAdapter( private const val UP_NEXT = 2 } - override fun onSwipeItem(holder: ViewHolder?, position: Int, @SwipeableItemResults result: Int): SwipeResultAction { + override fun onSwipeItem( + holder: ViewHolder?, + position: Int, @SwipeableItemResults result: Int + ): SwipeResultAction { return if (result === SwipeableItemConstants.RESULT_CANCELED) { SwipeResultActionDefault() } else { @@ -206,12 +208,14 @@ class PlayingQueueAdapter( } override fun onSetSwipeBackground(holder: ViewHolder?, position: Int, result: Int) { - } - internal class SwipedResultActionRemoveItem(private val adapter: PlayingQueueAdapter, - private val position: Int, - private val activity: AppCompatActivity) : SwipeResultActionRemoveItem() { + internal class SwipedResultActionRemoveItem( + private val adapter: PlayingQueueAdapter, + private val position: Int, + private val activity: AppCompatActivity + ) : SwipeResultActionRemoveItem() { + private var songToRemove: Song? = null private val isPlaying: Boolean = MusicPlayerRemote.isPlaying private val songProgressMillis = 0 @@ -230,6 +234,5 @@ class PlayingQueueAdapter( adapter.setSongToRemove(songToRemove!!) removeFromQueue(songToRemove!!) } - } } diff --git a/app/src/main/java/code/name/monkey/retromusic/fragments/player/normal/PlayerPlaybackControlsFragment.kt b/app/src/main/java/code/name/monkey/retromusic/fragments/player/normal/PlayerPlaybackControlsFragment.kt index ba458c90..94592c03 100644 --- a/app/src/main/java/code/name/monkey/retromusic/fragments/player/normal/PlayerPlaybackControlsFragment.kt +++ b/app/src/main/java/code/name/monkey/retromusic/fragments/player/normal/PlayerPlaybackControlsFragment.kt @@ -25,7 +25,16 @@ import code.name.monkey.retromusic.service.MusicService import code.name.monkey.retromusic.util.MusicUtil import code.name.monkey.retromusic.util.PreferenceUtil import code.name.monkey.retromusic.util.ViewUtil -import kotlinx.android.synthetic.main.fragment_player_playback_controls.* +import kotlinx.android.synthetic.main.fragment_player_playback_controls.nextButton +import kotlinx.android.synthetic.main.fragment_player_playback_controls.playPauseButton +import kotlinx.android.synthetic.main.fragment_player_playback_controls.previousButton +import kotlinx.android.synthetic.main.fragment_player_playback_controls.progressSlider +import kotlinx.android.synthetic.main.fragment_player_playback_controls.repeatButton +import kotlinx.android.synthetic.main.fragment_player_playback_controls.shuffleButton +import kotlinx.android.synthetic.main.fragment_player_playback_controls.songCurrentProgress +import kotlinx.android.synthetic.main.fragment_player_playback_controls.songTotalTime +import kotlinx.android.synthetic.main.fragment_player_playback_controls.text +import kotlinx.android.synthetic.main.fragment_player_playback_controls.title class PlayerPlaybackControlsFragment : AbsPlayerControlsFragment() { @@ -135,7 +144,7 @@ class PlayerPlaybackControlsFragment : AbsPlayerControlsFragment() { if (MusicPlayerRemote.isPlaying) { playPauseButton.setImageResource(R.drawable.ic_pause_white_24dp) } else { - playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_32dp) + playPauseButton.setImageResource(R.drawable.ic_play_arrow_white_24dp) } } diff --git a/app/src/main/java/code/name/monkey/retromusic/model/CategoryInfo.java b/app/src/main/java/code/name/monkey/retromusic/model/CategoryInfo.java index 7c3999ff..88920a3f 100644 --- a/app/src/main/java/code/name/monkey/retromusic/model/CategoryInfo.java +++ b/app/src/main/java/code/name/monkey/retromusic/model/CategoryInfo.java @@ -16,11 +16,33 @@ package code.name.monkey.retromusic.model; import android.os.Parcel; import android.os.Parcelable; - import code.name.monkey.retromusic.R; public class CategoryInfo implements Parcelable { + + public enum Category { + HOME(R.id.action_home, R.string.home, R.drawable.ic_home_white_24dp), + SONGS(R.id.action_song, R.string.songs, R.drawable.ic_audiotrack_white_24dp), + ALBUMS(R.id.action_album, R.string.albums, R.drawable.ic_album_white_24dp), + ARTISTS(R.id.action_artist, R.string.artists, R.drawable.ic_artist_white_24dp), + PLAYLISTS(R.id.action_playlist, R.string.playlists, R.drawable.ic_playlist_play_white_24dp), + GENRES(R.id.action_genre, R.string.genres, R.drawable.ic_guitar_white_24dp), + QUEUE(R.id.action_playing_queue, R.string.queue, R.drawable.ic_queue_music_white_24dp); + + public final int icon; + + public final int id; + + public final int stringRes; + + Category(int id, int stringRes, int icon) { + this.stringRes = stringRes; + this.id = id; + this.icon = icon; + } + } + public static final Creator CREATOR = new Creator() { public CategoryInfo createFromParcel(Parcel source) { return new CategoryInfo(source); @@ -30,15 +52,17 @@ public class CategoryInfo implements Parcelable { return new CategoryInfo[size]; } }; + public Category category; + public boolean visible; + public CategoryInfo(Category category, boolean visible) { this.category = category; this.visible = visible; } - private CategoryInfo(Parcel source) { category = (Category) source.readSerializable(); visible = source.readInt() == 1; @@ -53,24 +77,4 @@ public class CategoryInfo implements Parcelable { dest.writeSerializable(category); dest.writeInt(visible ? 1 : 0); } - - public enum Category { - HOME(R.id.action_home, R.string.home, R.drawable.toggle_home), - SONGS(R.id.action_song, R.string.songs, R.drawable.toggle_audiotrack), - ALBUMS(R.id.action_album, R.string.albums, R.drawable.toggle_album), - ARTISTS(R.id.action_artist, R.string.artists, R.drawable.toggle_artist), - PLAYLISTS(R.id.action_playlist, R.string.playlists, R.drawable.toggle_playlist), - GENRES(R.id.action_genre, R.string.genres, R.drawable.toggle_guitar), - QUEUE(R.id.action_playing_queue, R.string.queue, R.drawable.toggle_queue_music); - - public final int stringRes; - public final int id; - public final int icon; - - Category(int id, int stringRes, int icon) { - this.stringRes = stringRes; - this.id = id; - this.icon = icon; - } - } } diff --git a/app/src/main/res/drawable/ic_access_time_white_24dp.xml b/app/src/main/res/drawable/ic_access_time_white_24dp.xml index b1fc7d60..93b0fd05 100644 --- a/app/src/main/res/drawable/ic_access_time_white_24dp.xml +++ b/app/src/main/res/drawable/ic_access_time_white_24dp.xml @@ -1,4 +1,17 @@ - + + + android:pathData="M11.99 2C6.47 2 2 6.48 2 12s4.47 10 9.99 10C17.52 22 22 17.52 22 12S17.52 2 11.99 2zM12 20c-4.42 0-8-3.58-8-8s3.58-8 8-8 8 3.58 8 8-3.58 8-8 8zm-0.22-13h-0.06c-0.4 0-0.72 0.32 -0.72 0.72 v4.72c0 0.35 0.18 0.68 0.49 0.86l4.15 2.49c0.34 0.2 0.78 0.1 0.98-0.24 0.21 -0.34 0.1 -0.79-0.25-0.99l-3.87-2.3V7.72c0-0.4-0.32-0.72-0.72-0.72z" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_account_white_24dp.xml b/app/src/main/res/drawable/ic_account_white_24dp.xml index 57af742f..4414a60e 100644 --- a/app/src/main/res/drawable/ic_account_white_24dp.xml +++ b/app/src/main/res/drawable/ic_account_white_24dp.xml @@ -20,5 +20,5 @@ + android:pathData="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 3c1.66 0 3 1.34 3 3s-1.34 3-3 3-3-1.34-3-3 1.34-3 3-3zm0 14.2c-2.5 0-4.71-1.28-6-3.22 0.03 -1.99 4-3.08 6-3.08 1.99 0 5.97 1.09 6 3.08-1.29 1.94-3.5 3.22-6 3.22z" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_add_photo_white_24dp.xml b/app/src/main/res/drawable/ic_add_photo_white_24dp.xml index 49d868e9..8326f2d4 100644 --- a/app/src/main/res/drawable/ic_add_photo_white_24dp.xml +++ b/app/src/main/res/drawable/ic_add_photo_white_24dp.xml @@ -8,5 +8,11 @@ + android:pathData="M3 8c0 0.55 0.45 1 1 1s1-0.45 1-1V6h2c0.55 0 1-0.45 1-1s-0.45-1-1-1H5V2c0-0.55-0.45-1-1-1s-1 0.45-1 1v2H1c-0.55 0-1 0.45-1 1s0.45 1 1 1h2v2z" /> + + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_album_selected_white_24dp.xml b/app/src/main/res/drawable/ic_album_selected_white_24dp.xml deleted file mode 100644 index 9e831534..00000000 --- a/app/src/main/res/drawable/ic_album_selected_white_24dp.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_album_white_24dp.xml b/app/src/main/res/drawable/ic_album_white_24dp.xml index 13d269f2..9e831534 100644 --- a/app/src/main/res/drawable/ic_album_white_24dp.xml +++ b/app/src/main/res/drawable/ic_album_white_24dp.xml @@ -5,8 +5,7 @@ android:viewportWidth="24" android:viewportHeight="24"> - + android:pathData="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 14.5c-2.49 0-4.5-2.01-4.5-4.5S9.51 7.5 12 7.5s4.5 2.01 4.5 4.5-2.01 4.5-4.5 4.5zm0-5.5c-0.55 0-1 0.45-1 1s0.45 1 1 1 1-0.45 1-1-0.45-1-1-1z" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_app_shortcut_last_added.xml b/app/src/main/res/drawable/ic_app_shortcut_last_added.xml index 934f0be6..c9e3d3e8 100644 --- a/app/src/main/res/drawable/ic_app_shortcut_last_added.xml +++ b/app/src/main/res/drawable/ic_app_shortcut_last_added.xml @@ -15,6 +15,6 @@ + android:pathData="M3 6c-0.55 0-1 0.45-1 1v13c0 1.1 0.9 2 2 2h13c0.55 0 1-0.45 1-1s-0.45-1-1-1H5c-0.55 0-1-0.45-1-1V7c0-0.55-0.45-1-1-1zm17-4H8c-1.1 0-2 0.9-2 2v12c0 1.1 0.9 2 2 2h12c1.1 0 2-0.9 2-2V4c0-1.1-0.9-2-2-2zm-2 9h-3v3c0 0.55-0.45 1-1 1s-1-0.45-1-1v-3h-3c-0.55 0-1-0.45-1-1s0.45-1 1-1h3V6c0-0.55 0.45 -1 1-1s1 0.45 1 1v3h3c0.55 0 1 0.45 1 1s-0.45 1-1 1z" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_app_shortcut_search.xml b/app/src/main/res/drawable/ic_app_shortcut_search.xml index 4e05cab7..dfefe806 100644 --- a/app/src/main/res/drawable/ic_app_shortcut_search.xml +++ b/app/src/main/res/drawable/ic_app_shortcut_search.xml @@ -15,6 +15,6 @@ + android:pathData="M15.5 14h-0.79l-0.28-0.27c1.2-1.4 1.82-3.31 1.48-5.34-0.47-2.78-2.79-5-5.59-5.34-4.23-0.52-7.79 3.04-7.27 7.27 0.34 2.8 2.56 5.12 5.34 5.59 2.03 0.34 3.94-0.28 5.34-1.48l0.27 0.28 v0.79l4.25 4.25c0.41 0.41 1.08 0.41 1.49 0 0.41-0.41 0.41 -1.08 0-1.49L15.5 14zm-6 0C7.01 14 5 11.99 5 9.5S7.01 5 9.5 5 14 7.01 14 9.5 11.99 14 9.5 14z" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_artist_white_24dp.xml b/app/src/main/res/drawable/ic_artist_white_24dp.xml index ce926c92..d4e7cb5c 100644 --- a/app/src/main/res/drawable/ic_artist_white_24dp.xml +++ b/app/src/main/res/drawable/ic_artist_white_24dp.xml @@ -6,5 +6,5 @@ android:viewportHeight="24"> + android:pathData="M11,14C12,14 13.05,14.16 14.2,14.44C13.39,15.31 13,16.33 13,17.5C13,18.39 13.25,19.23 13.78,20H3V18C3,16.81 3.91,15.85 5.74,15.12C7.57,14.38 9.33,14 11,14M11,12C9.92,12 9,11.61 8.18,10.83C7.38,10.05 7,9.11 7,8C7,6.92 7.38,6 8.18,5.18C9,4.38 9.92,4 11,4C12.11,4 13.05,4.38 13.83,5.18C14.61,6 15,6.92 15,8C15,9.11 14.61,10.05 13.83,10.83C13.05,11.61 12.11,12 11,12M18.5,10H20L22,10V12H20V17.5A2.5,2.5 0 0,1 17.5,20A2.5,2.5 0 0,1 15,17.5A2.5,2.5 0 0,1 17.5,15C17.86,15 18.19,15.07 18.5,15.21V10Z" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_audiotrack_black_24dp.xml b/app/src/main/res/drawable/ic_audiotrack_black_24dp.xml deleted file mode 100644 index 0cbc058d..00000000 --- a/app/src/main/res/drawable/ic_audiotrack_black_24dp.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_audiotrack_selected_black_24dp.xml b/app/src/main/res/drawable/ic_audiotrack_selected_black_24dp.xml deleted file mode 100644 index 57206a2d..00000000 --- a/app/src/main/res/drawable/ic_audiotrack_selected_black_24dp.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_queue_music_selected_white_24dp.xml b/app/src/main/res/drawable/ic_audiotrack_white_24dp.xml similarity index 76% rename from app/src/main/res/drawable/ic_queue_music_selected_white_24dp.xml rename to app/src/main/res/drawable/ic_audiotrack_white_24dp.xml index 3d9f1180..dc969641 100644 --- a/app/src/main/res/drawable/ic_queue_music_selected_white_24dp.xml +++ b/app/src/main/res/drawable/ic_audiotrack_white_24dp.xml @@ -1,5 +1,5 @@ + + android:pathData="M12 5v8.55c-0.94-0.54-2.1-0.75-3.33-0.32-1.34 0.48 -2.37 1.67-2.61 3.07-0.46 2.74 1.86 5.08 4.59 4.65 1.96-0.31 3.35-2.11 3.35-4.1V7h2c1.1 0 2-0.9 2-2s-0.9-2-2-2h-2c-1.1 0-2 0.9-2 2z" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_card_giftcard_white_24dp.xml b/app/src/main/res/drawable/ic_card_giftcard_white_24dp.xml index 2da45ec5..880b4f5b 100644 --- a/app/src/main/res/drawable/ic_card_giftcard_white_24dp.xml +++ b/app/src/main/res/drawable/ic_card_giftcard_white_24dp.xml @@ -1,4 +1,18 @@ + + + + + android:pathData="M6 13h12c0.55 0 1-0.45 1-1s-0.45-1-1-1H6c-0.55 0-1 0.45-1 1s0.45 1 1 1zm-2 4h12c0.55 0 1-0.45 1-1s-0.45-1-1-1H4c-0.55 0-1 0.45-1 1s0.45 1 1 1zm3-9c0 0.55 0.45 1 1 1h12c0.55 0 1-0.45 1-1s-0.45-1-1-1H8c-0.55 0-1 0.45-1 1z" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_close_white_24dp.xml b/app/src/main/res/drawable/ic_close_white_24dp.xml index 555e3b31..3ab565e2 100644 --- a/app/src/main/res/drawable/ic_close_white_24dp.xml +++ b/app/src/main/res/drawable/ic_close_white_24dp.xml @@ -1,4 +1,18 @@ + + + android:pathData="M18.3 5.71c-0.39-0.39-1.02-0.39-1.41 0L12 10.59 7.11 5.7c-0.39-0.39-1.02-0.39-1.41 0-0.39 0.39 -0.39 1.02 0 1.41L10.59 12 5.7 16.89c-0.39 0.39 -0.39 1.02 0 1.41 0.39 0.39 1.02 0.39 1.41 0L12 13.41l4.89 4.89c0.39 0.39 1.02 0.39 1.41 0 0.39-0.39 0.39 -1.02 0-1.41L13.41 12l4.89-4.89c0.38-0.38 0.38 -1.02 0-1.4z" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_disc_full_black_24dp.xml b/app/src/main/res/drawable/ic_disc_full_black_24dp.xml deleted file mode 100644 index a3cf65a3..00000000 --- a/app/src/main/res/drawable/ic_disc_full_black_24dp.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - diff --git a/app/src/main/res/drawable/ic_edit_white_24dp.xml b/app/src/main/res/drawable/ic_edit_white_24dp.xml index 2dd6d0d4..9ba07137 100644 --- a/app/src/main/res/drawable/ic_edit_white_24dp.xml +++ b/app/src/main/res/drawable/ic_edit_white_24dp.xml @@ -1,4 +1,18 @@ + + + android:pathData="M3 17.46v3.04c0 0.28 0.22 0.5 0.5 0.5h3.04c0.13 0 0.26-0.05 0.35 -0.15L17.81 9.94l-3.75-3.75L3.15 17.1c-0.1 0.1 -0.15 0.22 -0.15 0.36 zM20.71 7.04c0.39-0.39 0.39 -1.02 0-1.41l-2.34-2.34c-0.39-0.39-1.02-0.39-1.41 0l-1.83 1.83 3.75 3.75 1.83-1.83z" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_equalizer_white_24dp.xml b/app/src/main/res/drawable/ic_equalizer_white_24dp.xml index 2323f94b..0f939e87 100644 --- a/app/src/main/res/drawable/ic_equalizer_white_24dp.xml +++ b/app/src/main/res/drawable/ic_equalizer_white_24dp.xml @@ -1,4 +1,17 @@ - + + + android:pathData="M12 20c1.1 0 2-0.9 2-2V6c0-1.1-0.9-2-2-2s-2 0.9-2 2v12c0 1.1 0.9 2 2 2zm-6 0c1.1 0 2-0.9 2-2v-4c0-1.1-0.9-2-2-2s-2 0.9-2 2v4c0 1.1 0.9 2 2 2zm10-9v7c0 1.1 0.9 2 2 2s2-0.9 2-2v-7c0-1.1-0.9-2-2-2s-2 0.9-2 2z" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_favorite_border_white_24dp.xml b/app/src/main/res/drawable/ic_favorite_border_white_24dp.xml index 70a8901f..b399e446 100644 --- a/app/src/main/res/drawable/ic_favorite_border_white_24dp.xml +++ b/app/src/main/res/drawable/ic_favorite_border_white_24dp.xml @@ -7,5 +7,5 @@ + android:pathData="M19.66 3.99c-2.64-1.8-5.9-0.96-7.66 1.1-1.76-2.06-5.02-2.91-7.66-1.1-1.4 0.96 -2.28 2.58-2.34 4.29-0.14 3.88 3.3 6.99 8.55 11.76l0.1 0.09 c0.76 0.69 1.93 0.69 2.69-0.01l0.11-0.1c5.25-4.76 8.68-7.87 8.55-11.75-0.06-1.7-0.94-3.32-2.34-4.28zM12.1 18.55l-0.1 0.1 -0.1-0.1C7.14 14.24 4 11.39 4 8.5 4 6.5 5.5 5 7.5 5c1.54 0 3.04 0.99 3.57 2.36h1.87C13.46 5.99 14.96 5 16.5 5c2 0 3.5 1.5 3.5 3.5 0 2.89-3.14 5.74-7.9 10.05z" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_favorite_white_24dp.xml b/app/src/main/res/drawable/ic_favorite_white_24dp.xml index 598ed9b5..786db019 100644 --- a/app/src/main/res/drawable/ic_favorite_white_24dp.xml +++ b/app/src/main/res/drawable/ic_favorite_white_24dp.xml @@ -7,5 +7,5 @@ + android:pathData="M13.35 20.13c-0.76 0.69 -1.93 0.69 -2.69-0.01l-0.11-0.1C5.3 15.27 1.87 12.16 2 8.28c0.06-1.7 0.93 -3.33 2.34-4.29 2.64-1.8 5.9-0.96 7.66 1.1 1.76-2.06 5.02-2.91 7.66-1.1 1.41 0.96 2.28 2.59 2.34 4.29 0.14 3.88-3.3 6.99-8.55 11.76l-0.1 0.09 z" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_flag_white_24dp.xml b/app/src/main/res/drawable/ic_flag_white_24dp.xml index 245bc0f4..75f0025a 100644 --- a/app/src/main/res/drawable/ic_flag_white_24dp.xml +++ b/app/src/main/res/drawable/ic_flag_white_24dp.xml @@ -1,12 +1,25 @@ + + - + android:pathData="M14 6l-0.72-1.45c-0.17-0.34-0.52-0.55-0.9-0.55H6c-0.55 0-1 0.45-1 1v15c0 0.55 0.45 1 1 1s1-0.45 1-1v-6h5l0.72 1.45c0.17 0.34 0.52 0.55 0.89 0.55 H19c0.55 0 1-0.45 1-1V7c0-0.55-0.45-1-1-1h-5zm4 8h-4l-1-2H7V6h5l1 2h5v6z" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_folder_white_24dp.xml b/app/src/main/res/drawable/ic_folder_white_24dp.xml index 358bc626..6b3950c1 100644 --- a/app/src/main/res/drawable/ic_folder_white_24dp.xml +++ b/app/src/main/res/drawable/ic_folder_white_24dp.xml @@ -1,4 +1,18 @@ + + + android:pathData="M10.59 4.59C10.21 4.21 9.7 4 9.17 4H4c-1.1 0-1.99 0.9 -1.99 2L2 18c0 1.1 0.9 2 2 2h16c1.1 0 2-0.9 2-2V8c0-1.1-0.9-2-2-2h-8l-1.41-1.41z" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_github_circle_white_24dp.xml b/app/src/main/res/drawable/ic_github_circle_white_24dp.xml index b2446883..4c2c6790 100644 --- a/app/src/main/res/drawable/ic_github_circle_white_24dp.xml +++ b/app/src/main/res/drawable/ic_github_circle_white_24dp.xml @@ -1,3 +1,17 @@ + + + + + android:pathData="M17 6c-3.31 0-6 2.69-6 6s2.69 6 6 6 6-2.69 6-6-2.69-6-6-6zM5 8c-2.21 0-4 1.79-4 4s1.79 4 4 4 4-1.79 4-4-1.79-4-4-4zm0 6c-1.1 0-2-0.9-2-2s0.9-2 2-2 2 0.9 2 2-0.9 2-2 2z" /> diff --git a/app/src/main/res/drawable/ic_help_white_24dp.xml b/app/src/main/res/drawable/ic_help_white_24dp.xml index 8c245fcf..02eca164 100644 --- a/app/src/main/res/drawable/ic_help_white_24dp.xml +++ b/app/src/main/res/drawable/ic_help_white_24dp.xml @@ -1,12 +1,25 @@ + + - + android:pathData="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm1 17h-2v-2h2v2zm2.07-7.75l-0.9 0.92 c-0.5 0.51 -0.86 0.97 -1.04 1.69-0.08 0.32 -0.13 0.68 -0.13 1.14h-2v-0.5c0-0.46 0.08 -0.9 0.22 -1.31 0.2 -0.58 0.53 -1.1 0.95 -1.52l1.24-1.26c0.46-0.44 0.68 -1.1 0.55 -1.8-0.13-0.72-0.69-1.33-1.39-1.53-1.11-0.31-2.14 0.32 -2.47 1.27-0.12 0.37 -0.43 0.65 -0.82 0.65 h-0.3C8.4 9 8 8.44 8.16 7.88c0.43-1.47 1.68-2.59 3.23-2.83 1.52-0.24 2.97 0.55 3.87 1.8 1.18 1.63 0.83 3.38-0.19 4.4z" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_home_selected_white_24dp.xml b/app/src/main/res/drawable/ic_home_selected_white_24dp.xml deleted file mode 100644 index 6f6136f0..00000000 --- a/app/src/main/res/drawable/ic_home_selected_white_24dp.xml +++ /dev/null @@ -1,10 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_home_white_24dp.xml b/app/src/main/res/drawable/ic_home_white_24dp.xml index 76f069b7..49bb4eea 100644 --- a/app/src/main/res/drawable/ic_home_white_24dp.xml +++ b/app/src/main/res/drawable/ic_home_white_24dp.xml @@ -1,4 +1,17 @@ - + + + android:pathData="M10 19v-5h4v5c0 0.55 0.45 1 1 1h3c0.55 0 1-0.45 1-1v-7h1.7c0.46 0 0.68-0.57 0.33 -0.87L12.67 3.6c-0.38-0.34-0.96-0.34-1.34 0l-8.36 7.53c-0.34 0.3 -0.13 0.87 0.33 0.87 H5v7c0 0.55 0.45 1 1 1h3c0.55 0 1-0.45 1-1z" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_image_white_24dp.xml b/app/src/main/res/drawable/ic_image_white_24dp.xml index 1d0d0361..dbd4acc0 100644 --- a/app/src/main/res/drawable/ic_image_white_24dp.xml +++ b/app/src/main/res/drawable/ic_image_white_24dp.xml @@ -1,4 +1,17 @@ - + + + android:pathData="M21 19V5c0-1.1-0.9-2-2-2H5c-1.1 0-2 0.9-2 2v14c0 1.1 0.9 2 2 2h14c1.1 0 2-0.9 2-2zM8.9 13.98l2.1 2.53 3.1-3.99c0.2-0.26 0.6 -0.26 0.8 0.01l3.51 4.68c0.25 0.33 0.01 0.8 -0.4 0.8 H6.02c-0.42 0-0.65-0.48-0.39-0.81L8.12 14c0.19-0.26 0.57 -0.27 0.78 -0.02z" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_info_outline_white_24dp.xml b/app/src/main/res/drawable/ic_info_outline_white_24dp.xml index d55da2e5..01175772 100644 --- a/app/src/main/res/drawable/ic_info_outline_white_24dp.xml +++ b/app/src/main/res/drawable/ic_info_outline_white_24dp.xml @@ -13,11 +13,11 @@ --> + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:pathData="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2zm0 15c-0.55 0-1-0.45-1-1v-4c0-0.55 0.45 -1 1-1s1 0.45 1 1v4c0 0.55-0.45 1-1 1zm1-8h-2V7h2v2z" /> diff --git a/app/src/main/res/drawable/ic_invert_colors_white_24dp.xml b/app/src/main/res/drawable/ic_invert_colors_white_24dp.xml index 2ab841ab..a0670e6b 100644 --- a/app/src/main/res/drawable/ic_invert_colors_white_24dp.xml +++ b/app/src/main/res/drawable/ic_invert_colors_white_24dp.xml @@ -12,8 +12,13 @@ ~ See the GNU General Public License for more details. --> - - + + diff --git a/app/src/main/res/drawable/ic_keyboard_arrow_down_black_24dp.xml b/app/src/main/res/drawable/ic_keyboard_arrow_down_black_24dp.xml index fbe65eb0..69a6c301 100644 --- a/app/src/main/res/drawable/ic_keyboard_arrow_down_black_24dp.xml +++ b/app/src/main/res/drawable/ic_keyboard_arrow_down_black_24dp.xml @@ -7,5 +7,5 @@ + android:pathData="M8.12 9.29L12 13.17l3.88-3.88c0.39-0.39 1.02-0.39 1.41 0 0.39 0.39 0.39 1.02 0 1.41l-4.59 4.59c-0.39 0.39 -1.02 0.39 -1.41 0L6.7 10.7c-0.39-0.39-0.39-1.02 0-1.41 0.39 -0.38 1.03-0.39 1.42 0z" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_keyboard_arrow_right_white_24dp.xml b/app/src/main/res/drawable/ic_keyboard_arrow_right_white_24dp.xml index 80e5acc7..37733107 100644 --- a/app/src/main/res/drawable/ic_keyboard_arrow_right_white_24dp.xml +++ b/app/src/main/res/drawable/ic_keyboard_arrow_right_white_24dp.xml @@ -1,12 +1,4 @@ - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_keyboard_arrow_up_24dp.xml b/app/src/main/res/drawable/ic_keyboard_arrow_up_24dp.xml index a127ed52..712d88e3 100755 --- a/app/src/main/res/drawable/ic_keyboard_arrow_up_24dp.xml +++ b/app/src/main/res/drawable/ic_keyboard_arrow_up_24dp.xml @@ -1,12 +1,4 @@ - - - - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_keyboard_backspace_black_24dp.xml b/app/src/main/res/drawable/ic_keyboard_backspace_black_24dp.xml index 8ae23acb..95abfbb5 100644 --- a/app/src/main/res/drawable/ic_keyboard_backspace_black_24dp.xml +++ b/app/src/main/res/drawable/ic_keyboard_backspace_black_24dp.xml @@ -1,4 +1,17 @@ - + + + android:pathData="M19 11H7.83l4.88-4.88c0.39-0.39 0.39 -1.03 0-1.42-0.39-0.39-1.02-0.39-1.41 0l-6.59 6.59c-0.39 0.39 -0.39 1.02 0 1.41l6.59 6.59c0.39 0.39 1.02 0.39 1.41 0 0.39-0.39 0.39 -1.02 0-1.41L7.83 13H19c0.55 0 1-0.45 1-1s-0.45-1-1-1z" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_library_add_white_24dp.xml b/app/src/main/res/drawable/ic_library_add_white_24dp.xml index 7863ff91..110f7c14 100644 --- a/app/src/main/res/drawable/ic_library_add_white_24dp.xml +++ b/app/src/main/res/drawable/ic_library_add_white_24dp.xml @@ -1,4 +1,18 @@ + + + android:pathData="M3 6c-0.55 0-1 0.45-1 1v13c0 1.1 0.9 2 2 2h13c0.55 0 1-0.45 1-1s-0.45-1-1-1H5c-0.55 0-1-0.45-1-1V7c0-0.55-0.45-1-1-1zm17-4H8c-1.1 0-2 0.9-2 2v12c0 1.1 0.9 2 2 2h12c1.1 0 2-0.9 2-2V4c0-1.1-0.9-2-2-2zm-2 9h-3v3c0 0.55-0.45 1-1 1s-1-0.45-1-1v-3h-3c-0.55 0-1-0.45-1-1s0.45-1 1-1h3V6c0-0.55 0.45 -1 1-1s1 0.45 1 1v3h3c0.55 0 1 0.45 1 1s-0.45 1-1 1z" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_library_music_white_24dp.xml b/app/src/main/res/drawable/ic_library_music_white_24dp.xml index 03de8419..de4b8a91 100644 --- a/app/src/main/res/drawable/ic_library_music_white_24dp.xml +++ b/app/src/main/res/drawable/ic_library_music_white_24dp.xml @@ -1,4 +1,17 @@ - + + + android:pathData="M20 2H8c-1.1 0-2 0.9-2 2v12c0 1.1 0.9 2 2 2h12c1.1 0 2-0.9 2-2V4c0-1.1-0.9-2-2-2zm-3 5h-2v5.37c0 1.27-0.9 2.44-2.16 2.6-1.69 0.23 -3.11-1.25-2.8-2.95 0.2 -1.1 1.18-1.95 2.3-2.02 0.63 -0.04 1.2 0.16 1.66 0.51 V6c0-0.55 0.45 -1 1-1h2c0.55 0 1 0.45 1 1s-0.45 1-1 1zM3 6c-0.55 0-1 0.45-1 1v13c0 1.1 0.9 2 2 2h13c0.55 0 1-0.45 1-1s-0.45-1-1-1H5c-0.55 0-1-0.45-1-1V7c0-0.55-0.45-1-1-1z" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_menu_white_24dp.xml b/app/src/main/res/drawable/ic_menu_white_24dp.xml index ecd8a598..9a28c405 100644 --- a/app/src/main/res/drawable/ic_menu_white_24dp.xml +++ b/app/src/main/res/drawable/ic_menu_white_24dp.xml @@ -1,4 +1,17 @@ - + + + android:pathData="M4 18h16c0.55 0 1-0.45 1-1s-0.45-1-1-1H4c-0.55 0-1 0.45-1 1s0.45 1 1 1zm0-5h16c0.55 0 1-0.45 1-1s-0.45-1-1-1H4c-0.55 0-1 0.45-1 1s0.45 1 1 1zM3 7c0 0.55 0.45 1 1 1h16c0.55 0 1-0.45 1-1s-0.45-1-1-1H4c-0.55 0-1 0.45-1 1z" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_mic_white_24dp.xml b/app/src/main/res/drawable/ic_mic_white_24dp.xml index 1c655c30..4e2a8ee3 100644 --- a/app/src/main/res/drawable/ic_mic_white_24dp.xml +++ b/app/src/main/res/drawable/ic_mic_white_24dp.xml @@ -1,4 +1,18 @@ + + + android:pathData="M12 14c1.66 0 3-1.34 3-3V5c0-1.66-1.34-3-3-3S9 3.34 9 5v6c0 1.66 1.34 3 3 3zm5.91-3c-0.49 0-0.9 0.36 -0.98 0.85 C16.52 14.2 14.47 16 12 16s-4.52-1.8-4.93-4.15c-0.08-0.49-0.49-0.85-0.98-0.85-0.61 0-1.09 0.54 -1 1.14 0.49 3 2.89 5.35 5.91 5.78V20c0 0.55 0.45 1 1 1s1-0.45 1-1v-2.08c3.02-0.43 5.42-2.78 5.91-5.78 0.1 -0.6-0.39-1.14-1-1.14z" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_more_vert_white_24dp.xml b/app/src/main/res/drawable/ic_more_vert_white_24dp.xml index c42c1dcd..7cbf5c00 100644 --- a/app/src/main/res/drawable/ic_more_vert_white_24dp.xml +++ b/app/src/main/res/drawable/ic_more_vert_white_24dp.xml @@ -1,8 +1,22 @@ + + + android:viewportWidth="24.0" + android:viewportHeight="24.0"> diff --git a/app/src/main/res/drawable/ic_music_note_off_white_24dp.xml b/app/src/main/res/drawable/ic_music_note_off_white_24dp.xml index 5643cb81..84be954d 100644 --- a/app/src/main/res/drawable/ic_music_note_off_white_24dp.xml +++ b/app/src/main/res/drawable/ic_music_note_off_white_24dp.xml @@ -1,5 +1,5 @@ + - + android:pathData="M18 16v-5c0-3.07-1.64-5.64-4.5-6.32V4c0-0.83-0.68-1.5-1.51-1.5S10.5 3.17 10.5 4v0.68C7.63 5.36 6 7.92 6 11v5l-1.3 1.29c-0.63 0.63 -0.19 1.71 0.7 1.71h13.17c0.89 0 1.34-1.08 0.71 -1.71L18 16zm-6.01 6c1.1 0 2-0.9 2-2h-4c0 1.1 0.89 2 2 2zM6.77 4.73c0.42-0.38 0.43 -1.03 0.03 -1.43-0.38-0.38-1-0.39-1.39-0.02C3.7 4.84 2.52 6.96 2.14 9.34c-0.09 0.61 0.38 1.16 1 1.16 0.48 0 0.9-0.35 0.98 -0.83 0.3 -1.94 1.26-3.67 2.65-4.94zM18.6 3.28c-0.4-0.37-1.02-0.36-1.4 0.02 -0.4 0.4 -0.38 1.04 0.03 1.42 1.38 1.27 2.35 3 2.65 4.94 0.07 0.48 0.49 0.83 0.98 0.83 0.61 0 1.09-0.55 0.99 -1.16-0.38-2.37-1.55-4.48-3.25-6.05z" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_open_in_browser_white_24dp.xml b/app/src/main/res/drawable/ic_open_in_browser_white_24dp.xml index d58b804f..eeff055d 100644 --- a/app/src/main/res/drawable/ic_open_in_browser_white_24dp.xml +++ b/app/src/main/res/drawable/ic_open_in_browser_white_24dp.xml @@ -8,5 +8,5 @@ + android:pathData="M19 4H5c-1.11 0-2 0.9-2 2v12c0 1.1 0.9 2 2 2h3c0.55 0 1-0.45 1-1s-0.45-1-1-1H5V8h14v10h-3c-0.55 0-1 0.45-1 1s0.45 1 1 1h3c1.1 0 2-0.9 2-2V6c0-1.1-0.89-2-2-2zm-7.35 6.35l-2.79 2.79c-0.32 0.32 -0.1 0.86 0.35 0.86 H11v5c0 0.55 0.45 1 1 1s1-0.45 1-1v-5h1.79c0.45 0 0.67-0.54 0.35 -0.85l-2.79-2.79c-0.19-0.2-0.51-0.2-0.7-0.01z" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_pause_white_24dp.xml b/app/src/main/res/drawable/ic_pause_white_24dp.xml index c5d23ca3..76bdc96f 100644 --- a/app/src/main/res/drawable/ic_pause_white_24dp.xml +++ b/app/src/main/res/drawable/ic_pause_white_24dp.xml @@ -1,5 +1,4 @@ - - + + + + android:pathData="M8 6.82v10.36c0 0.79 0.87 1.27 1.54 0.84 l8.14-5.18c0.62-0.39 0.62 -1.29 0-1.69L9.54 5.98C8.87 5.55 8 6.03 8 6.82z" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_play_arrow_white_32dp.xml b/app/src/main/res/drawable/ic_play_arrow_white_32dp.xml index 8ed511c7..937fd4a2 100644 --- a/app/src/main/res/drawable/ic_play_arrow_white_32dp.xml +++ b/app/src/main/res/drawable/ic_play_arrow_white_32dp.xml @@ -1,5 +1,4 @@ - - + + + android:pathData="M8 6.82v10.36c0 0.79 0.87 1.27 1.54 0.84 l8.14-5.18c0.62-0.39 0.62 -1.29 0-1.69L9.54 5.98C8.87 5.55 8 6.03 8 6.82z" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_playlist_add_white_24dp.xml b/app/src/main/res/drawable/ic_playlist_add_white_24dp.xml index a4bc4e8b..3134b131 100644 --- a/app/src/main/res/drawable/ic_playlist_add_white_24dp.xml +++ b/app/src/main/res/drawable/ic_playlist_add_white_24dp.xml @@ -7,5 +7,5 @@ + android:pathData="M13 10H3c-0.55 0-1 0.45-1 1s0.45 1 1 1h10c0.55 0 1-0.45 1-1s-0.45-1-1-1zm0-4H3c-0.55 0-1 0.45-1 1s0.45 1 1 1h10c0.55 0 1-0.45 1-1s-0.45-1-1-1zm5 8v-3c0-0.55-0.45-1-1-1s-1 0.45-1 1v3h-3c-0.55 0-1 0.45-1 1s0.45 1 1 1h3v3c0 0.55 0.45 1 1 1s1-0.45 1-1v-3h3c0.55 0 1-0.45 1-1s-0.45-1-1-1h-3zM3 16h6c0.55 0 1-0.45 1-1s-0.45-1-1-1H3c-0.55 0-1 0.45-1 1s0.45 1 1 1z" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_playlist_play_white_24dp.xml b/app/src/main/res/drawable/ic_playlist_play_white_24dp.xml index 1bae1b2d..3e5782ed 100644 --- a/app/src/main/res/drawable/ic_playlist_play_white_24dp.xml +++ b/app/src/main/res/drawable/ic_playlist_play_white_24dp.xml @@ -5,5 +5,5 @@ android:viewportHeight="24.0"> + android:pathData="M5 10h10c0.55 0 1 0.45 1 1s-0.45 1-1 1H5c-0.55 0-1-0.45-1-1s0.45-1 1-1zm0-4h10c0.55 0 1 0.45 1 1s-0.45 1-1 1H5c-0.55 0-1-0.45-1-1s0.45-1 1-1zm0 8h6c0.55 0 1 0.45 1 1s-0.45 1-1 1H5c-0.55 0-1-0.45-1-1s0.45-1 1-1zm9 0.88v4.23c0 0.39 0.42 0.63 0.76 0.43l3.53-2.12c0.32-0.19 0.32 -0.66 0-0.86l-3.53-2.12c-0.34-0.19-0.76 0.05 -0.76 0.44 z" /> diff --git a/app/src/main/res/drawable/ic_queue_music_white_24dp.xml b/app/src/main/res/drawable/ic_queue_music_white_24dp.xml index ab5a3224..94de4470 100644 --- a/app/src/main/res/drawable/ic_queue_music_white_24dp.xml +++ b/app/src/main/res/drawable/ic_queue_music_white_24dp.xml @@ -19,14 +19,5 @@ - - - + android:pathData="M14 6H4c-0.55 0-1 0.45-1 1s0.45 1 1 1h10c0.55 0 1-0.45 1-1s-0.45-1-1-1zm0 4H4c-0.55 0-1 0.45-1 1s0.45 1 1 1h10c0.55 0 1-0.45 1-1s-0.45-1-1-1zM4 16h6c0.55 0 1-0.45 1-1s-0.45-1-1-1H4c-0.55 0-1 0.45-1 1s0.45 1 1 1zM19 6c-1.1 0-2 0.9-2 2v6.18c-0.31-0.11-0.65-0.18-1-0.18-1.84 0-3.28 1.64-2.95 3.54 0.21 1.21 1.2 2.2 2.41 2.41 1.9 0.33 3.54-1.11 3.54-2.95V8h2c0.55 0 1-0.45 1-1s-0.45-1-1-1h-2z" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_repeat_one_white_24dp.xml b/app/src/main/res/drawable/ic_repeat_one_white_24dp.xml index 64af7f6d..8c04a4b9 100644 --- a/app/src/main/res/drawable/ic_repeat_one_white_24dp.xml +++ b/app/src/main/res/drawable/ic_repeat_one_white_24dp.xml @@ -5,8 +5,7 @@ android:viewportWidth="24" android:viewportHeight="24"> - + android:pathData="M7 7h10v1.79c0 0.45 0.54 0.67 0.85 0.35l2.79-2.79c0.2-0.2 0.2 -0.51 0-0.71l-2.79-2.79c-0.31-0.31-0.85-0.09-0.85 0.36 V5H6c-0.55 0-1 0.45-1 1v4c0 0.55 0.45 1 1 1s1-0.45 1-1V7zm10 10H7v-1.79c0-0.45-0.54-0.67-0.85-0.35l-2.79 2.79c-0.2 0.2 -0.2 0.51 0 0.71l2.79 2.79c0.31 0.31 0.85 0.09 0.85-0.36V19h11c0.55 0 1-0.45 1-1v-4c0-0.55-0.45-1-1-1s-1 0.45-1 1v3zm-4-2.75V9.81c0-0.45-0.36-0.81-0.81-0.81-0.13 0-0.25 0.03 -0.36 0.09 l-1.49 0.74 c-0.21 0.1 -0.34 0.32 -0.34 0.55 0 0.34 0.28 0.62 0.62 0.62h0.88v3.25c0 0.41 0.34 0.75 0.75 0.75s0.75-0.34 0.75 -0.75z" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_repeat_white_24dp.xml b/app/src/main/res/drawable/ic_repeat_white_24dp.xml index ca9078ff..57a84735 100644 --- a/app/src/main/res/drawable/ic_repeat_white_24dp.xml +++ b/app/src/main/res/drawable/ic_repeat_white_24dp.xml @@ -5,8 +5,7 @@ android:viewportWidth="24" android:viewportHeight="24"> - + android:pathData="M7 7h10v1.79c0 0.45 0.54 0.67 0.85 0.35l2.79-2.79c0.2-0.2 0.2 -0.51 0-0.71l-2.79-2.79c-0.31-0.31-0.85-0.09-0.85 0.36 V5H6c-0.55 0-1 0.45-1 1v4c0 0.55 0.45 1 1 1s1-0.45 1-1V7zm10 10H7v-1.79c0-0.45-0.54-0.67-0.85-0.35l-2.79 2.79c-0.2 0.2 -0.2 0.51 0 0.71l2.79 2.79c0.31 0.31 0.85 0.09 0.85-0.36V19h11c0.55 0 1-0.45 1-1v-4c0-0.55-0.45-1-1-1s-1 0.45-1 1v3z" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_save_white_24dp.xml b/app/src/main/res/drawable/ic_save_white_24dp.xml index 6739a82a..8aa8bd1a 100644 --- a/app/src/main/res/drawable/ic_save_white_24dp.xml +++ b/app/src/main/res/drawable/ic_save_white_24dp.xml @@ -1,4 +1,18 @@ + + + android:pathData="M17.59 3.59c-0.38-0.38-0.89-0.59-1.42-0.59H5c-1.11 0-2 0.9-2 2v14c0 1.1 0.9 2 2 2h14c1.1 0 2-0.9 2-2V7.83c0-0.53-0.21-1.04-0.59-1.41l-2.82-2.83zM12 19c-1.66 0-3-1.34-3-3s1.34-3 3-3 3 1.34 3 3-1.34 3-3 3zm1-10H7c-1.1 0-2-0.9-2-2s0.9-2 2-2h6c1.1 0 2 0.9 2 2s-0.9 2-2 2z" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_send_white_24dp.xml b/app/src/main/res/drawable/ic_send_white_24dp.xml index 243cb7e6..f2e8eff4 100644 --- a/app/src/main/res/drawable/ic_send_white_24dp.xml +++ b/app/src/main/res/drawable/ic_send_white_24dp.xml @@ -1,9 +1,23 @@ + + + android:width="24dp" + android:height="24dp" + android:viewportWidth="24.0" + android:viewportHeight="24.0"> + android:pathData="M3.4 20.4l17.45-7.48c0.81-0.35 0.81 -1.49 0-1.84L3.4 3.6c-0.66-0.29-1.39 0.2 -1.39 0.91 L2 9.12c0 0.5 0.37 0.93 0.87 0.99L17 12 2.87 13.88c-0.5 0.07 -0.87 0.5 -0.87 1l0.01 4.61c0 0.71 0.73 1.2 1.39 0.91 z" /> diff --git a/app/src/main/res/drawable/ic_settings_brigntness_white_24dp.xml b/app/src/main/res/drawable/ic_settings_brigntness_white_24dp.xml index 013be8c3..09e35336 100644 --- a/app/src/main/res/drawable/ic_settings_brigntness_white_24dp.xml +++ b/app/src/main/res/drawable/ic_settings_brigntness_white_24dp.xml @@ -20,5 +20,5 @@ + android:pathData="M21 3H3c-1.1 0-2 0.9-2 2v14c0 1.1 0.9 2 2 2h18c1.1 0 2-0.9 2-2V5c0-1.1-0.9-2-2-2zm-1 16.01H4c-0.55 0-1-0.45-1-1V5.99c0-0.55 0.45 -1 1-1h16c0.55 0 1 0.45 1 1v12.02c0 0.55-0.45 1-1 1zM8.5 16h2l1.15 1.15c0.2 0.2 0.51 0.2 0.71 0L13.5 16h2c0.28 0 0.5-0.22 0.5 -0.5v-2l1.15-1.15c0.2-0.2 0.2 -0.51 0-0.71L16 10.5v-2c0-0.28-0.22-0.5-0.5-0.5h-2l-1.15-1.15c-0.2-0.2-0.51-0.2-0.71 0L10.5 8h-2c-0.28 0-0.5 0.22 -0.5 0.5 v2l-1.15 1.15c-0.2 0.2 -0.2 0.51 0 0.71L8 13.5v2c0 0.28 0.22 0.5 0.5 0.5zM12 9c1.66 0 3 1.34 3 3s-1.34 3-3 3V9z" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_share_white_24dp.xml b/app/src/main/res/drawable/ic_share_white_24dp.xml index 1446f1df..f06ac695 100644 --- a/app/src/main/res/drawable/ic_share_white_24dp.xml +++ b/app/src/main/res/drawable/ic_share_white_24dp.xml @@ -7,5 +7,5 @@ + android:pathData="M18 16.08c-0.76 0-1.44 0.3 -1.96 0.77 L8.91 12.7c0.05-0.23 0.09 -0.46 0.09 -0.7s-0.04-0.47-0.09-0.7l7.05-4.11c0.54 0.5 1.25 0.81 2.04 0.81 1.66 0 3-1.34 3-3s-1.34-3-3-3-3 1.34-3 3c0 0.24 0.04 0.47 0.09 0.7L8.04 9.81C7.5 9.31 6.79 9 6 9c-1.66 0-3 1.34-3 3s1.34 3 3 3c0.79 0 1.5-0.31 2.04-0.81l7.12 4.16c-0.05 0.21 -0.08 0.43 -0.08 0.65 0 1.61 1.31 2.92 2.92 2.92s2.92-1.31 2.92-2.92-1.31-2.92-2.92-2.92z" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_shuffle_white_24dp.xml b/app/src/main/res/drawable/ic_shuffle_white_24dp.xml index e56b2e36..025d9fd1 100644 --- a/app/src/main/res/drawable/ic_shuffle_white_24dp.xml +++ b/app/src/main/res/drawable/ic_shuffle_white_24dp.xml @@ -7,5 +7,5 @@ + android:pathData="M10.59 9.17L6.12 4.7c-0.39-0.39-1.02-0.39-1.41 0-0.39 0.39 -0.39 1.02 0 1.41l4.46 4.46 1.42-1.4zm4.76-4.32l1.19 1.19L4.7 17.88c-0.39 0.39 -0.39 1.02 0 1.41 0.39 0.39 1.02 0.39 1.41 0L17.96 7.46l1.19 1.19c0.31 0.31 0.85 0.09 0.85-0.36V4.5c0-0.28-0.22-0.5-0.5-0.5h-3.79c-0.45 0-0.67 0.54 -0.36 0.85 zm-0.52 8.56l-1.41 1.41 3.13 3.13-1.2 1.2c-0.31 0.31 -0.09 0.85 0.36 0.85 h3.79c0.28 0 0.5-0.22 0.5 -0.5v-3.79c0-0.45-0.54-0.67-0.85-0.35l-1.19 1.19-3.13-3.14z" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_skip_next_round_white_32dp.xml b/app/src/main/res/drawable/ic_skip_next_round_white_32dp.xml index 94f5a32e..dab71529 100644 --- a/app/src/main/res/drawable/ic_skip_next_round_white_32dp.xml +++ b/app/src/main/res/drawable/ic_skip_next_round_white_32dp.xml @@ -1,5 +1,5 @@ + + android:viewportWidth="24" + android:viewportHeight="24"> + android:pathData="M7 6c0.55 0 1 0.45 1 1v10c0 0.55-0.45 1-1 1s-1-0.45-1-1V7c0-0.55 0.45 -1 1-1zm3.66 6.82l5.77 4.07c0.66 0.47 1.58-0.01 1.58-0.82V7.93c0-0.81-0.91-1.28-1.58-0.82l-5.77 4.07c-0.57 0.4 -0.57 1.24 0 1.64z" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_sort_white_24dp.xml b/app/src/main/res/drawable/ic_sort_white_24dp.xml index 148d60f4..7107b50c 100644 --- a/app/src/main/res/drawable/ic_sort_white_24dp.xml +++ b/app/src/main/res/drawable/ic_sort_white_24dp.xml @@ -1,12 +1,25 @@ + + - + android:pathData="M4 18h4c0.55 0 1-0.45 1-1s-0.45-1-1-1H4c-0.55 0-1 0.45-1 1s0.45 1 1 1zM3 7c0 0.55 0.45 1 1 1h16c0.55 0 1-0.45 1-1s-0.45-1-1-1H4c-0.55 0-1 0.45-1 1zm1 6h10c0.55 0 1-0.45 1-1s-0.45-1-1-1H4c-0.55 0-1 0.45-1 1s0.45 1 1 1z" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_star_white_24dp.xml b/app/src/main/res/drawable/ic_star_white_24dp.xml index f8cbc6aa..0337872f 100644 --- a/app/src/main/res/drawable/ic_star_white_24dp.xml +++ b/app/src/main/res/drawable/ic_star_white_24dp.xml @@ -17,7 +17,8 @@ android:height="24dp" android:viewportWidth="24.0" android:viewportHeight="24.0"> + + android:pathData="M12,17.27l4.15,2.51c0.76,0.46,1.69-0.22,1.49-1.08l-1.1-4.72l3.67-3.18c0.67-0.58,0.31-1.68-0.57-1.75l-4.83-0.41 l-1.89-4.46c-0.34-0.81-1.5-0.81-1.84,0L9.19,8.63L4.36,9.04c-0.88,0.07-1.24,1.17-0.57,1.75l3.67,3.18l-1.1,4.72 c-0.2,0.86,0.73,1.54,1.49,1.08L12,17.27z" /> diff --git a/app/src/main/res/drawable/ic_theme_palette_white_24dp.xml b/app/src/main/res/drawable/ic_theme_palette_white_24dp.xml index c8b92333..489e9fed 100644 --- a/app/src/main/res/drawable/ic_theme_palette_white_24dp.xml +++ b/app/src/main/res/drawable/ic_theme_palette_white_24dp.xml @@ -7,17 +7,6 @@ - - - - + android:pathData="M12 3c-4.97 0-9 4.03-9 9s4.03 9 9 9c0.83 0 1.5-0.67 1.5-1.5 0-0.39-0.15-0.74-0.39-1.01-0.23-0.26-0.38-0.61-0.38-0.99 0-0.83 0.67 -1.5 1.5-1.5H16c2.76 0 5-2.24 5-5 0-4.42-4.03-8-9-8zm-5.5 9c-0.83 0-1.5-0.67-1.5-1.5S5.67 9 6.5 9 8 9.67 8 10.5 7.33 12 6.5 12zm3-4C8.67 8 8 7.33 8 6.5S8.67 5 9.5 5s1.5 0.67 1.5 1.5S10.33 8 9.5 8zm5 0c-0.83 0-1.5-0.67-1.5-1.5S13.67 5 14.5 5s1.5 0.67 1.5 1.5S15.33 8 14.5 8zm3 4c-0.83 0-1.5-0.67-1.5-1.5S16.67 9 17.5 9s1.5 0.67 1.5 1.5-0.67 1.5-1.5 1.5z" /> + \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_trending_up_white_24dp.xml b/app/src/main/res/drawable/ic_trending_up_white_24dp.xml index abf201b9..56049b11 100644 --- a/app/src/main/res/drawable/ic_trending_up_white_24dp.xml +++ b/app/src/main/res/drawable/ic_trending_up_white_24dp.xml @@ -8,5 +8,5 @@ + android:pathData="M16.85 6.85l1.44 1.44-4.88 4.88-3.29-3.29c-0.39-0.39-1.02-0.39-1.41 0l-6 6.01c-0.39 0.39 -0.39 1.02 0 1.41 0.39 0.39 1.02 0.39 1.41 0L9.41 12l3.29 3.29c0.39 0.39 1.02 0.39 1.41 0l5.59-5.58 1.44 1.44c0.31 0.31 0.85 0.09 0.85-0.35V6.5c0.01-0.28-0.21-0.5-0.49-0.5h-4.29c-0.45 0-0.67 0.54 -0.36 0.85 z" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_unfold_more_black_24dp.xml b/app/src/main/res/drawable/ic_unfold_more_black_24dp.xml deleted file mode 100644 index 1e936ba0..00000000 --- a/app/src/main/res/drawable/ic_unfold_more_black_24dp.xml +++ /dev/null @@ -1,12 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_view_carousel_black_24dp.xml b/app/src/main/res/drawable/ic_view_carousel_black_24dp.xml index 18a04420..61de4b17 100644 --- a/app/src/main/res/drawable/ic_view_carousel_black_24dp.xml +++ b/app/src/main/res/drawable/ic_view_carousel_black_24dp.xml @@ -7,5 +7,5 @@ + android:pathData="M8 19h8c0.55 0 1-0.45 1-1V5c0-0.55-0.45-1-1-1H8c-0.55 0-1 0.45-1 1v13c0 0.55 0.45 1 1 1zm-5-2h2c0.55 0 1-0.45 1-1V7c0-0.55-0.45-1-1-1H3c-0.55 0-1 0.45-1 1v9c0 0.55 0.45 1 1 1zM18 7v9c0 0.55 0.45 1 1 1h2c0.55 0 1-0.45 1-1V7c0-0.55-0.45-1-1-1h-2c-0.55 0-1 0.45-1 1z" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_volume_down_white_24dp.xml b/app/src/main/res/drawable/ic_volume_down_white_24dp.xml index 992a363e..040371ab 100644 --- a/app/src/main/res/drawable/ic_volume_down_white_24dp.xml +++ b/app/src/main/res/drawable/ic_volume_down_white_24dp.xml @@ -7,5 +7,5 @@ + android:pathData="M18.5 12c0-1.77-1.02-3.29-2.5-4.03v8.05c1.48-0.73 2.5-2.25 2.5-4.02zM5 10v4c0 0.55 0.45 1 1 1h3l3.29 3.29c0.63 0.63 1.71 0.18 1.71-0.71V6.41c0-0.89-1.08-1.34-1.71-0.71L9 9H6c-0.55 0-1 0.45-1 1z" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_volume_off_white_24dp.xml b/app/src/main/res/drawable/ic_volume_off_white_24dp.xml index 3b7a8c10..ac1440d2 100644 --- a/app/src/main/res/drawable/ic_volume_off_white_24dp.xml +++ b/app/src/main/res/drawable/ic_volume_off_white_24dp.xml @@ -8,5 +8,5 @@ + android:pathData="M3.63 3.63c-0.39 0.39 -0.39 1.02 0 1.41L7.29 8.7 7 9H4c-0.55 0-1 0.45-1 1v4c0 0.55 0.45 1 1 1h3l3.29 3.29c0.63 0.63 1.71 0.18 1.71-0.71v-4.17l4.18 4.18c-0.49 0.37 -1.02 0.68 -1.6 0.91 -0.36 0.15 -0.58 0.53 -0.58 0.92 0 0.72 0.73 1.18 1.39 0.91 0.8-0.33 1.55-0.77 2.22-1.31l1.34 1.34c0.39 0.39 1.02 0.39 1.41 0 0.39-0.39 0.39 -1.02 0-1.41L5.05 3.63c-0.39-0.39-1.02-0.39-1.42 0zM19 12c0 0.82-0.15 1.61-0.41 2.34l1.53 1.53c0.56-1.17 0.88 -2.48 0.88 -3.87 0-3.83-2.4-7.11-5.78-8.4-0.59-0.23-1.22 0.23 -1.22 0.86 v0.19c0 0.38 0.25 0.71 0.61 0.85C17.18 6.54 19 9.06 19 12zm-8.71-6.29l-0.17 0.17 L12 7.76V6.41c0-0.89-1.08-1.33-1.71-0.7zM16.5 12c0-1.77-1.02-3.29-2.5-4.03v1.79l2.48 2.48c0.01-0.08 0.02 -0.16 0.02 -0.24z" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_volume_up_white_24dp.xml b/app/src/main/res/drawable/ic_volume_up_white_24dp.xml index 77e9c780..7fea94c1 100644 --- a/app/src/main/res/drawable/ic_volume_up_white_24dp.xml +++ b/app/src/main/res/drawable/ic_volume_up_white_24dp.xml @@ -1,4 +1,18 @@ + + + android:pathData="M3 10v4c0 0.55 0.45 1 1 1h3l3.29 3.29c0.63 0.63 1.71 0.18 1.71-0.71V6.41c0-0.89-1.08-1.34-1.71-0.71L7 9H4c-0.55 0-1 0.45-1 1zm13.5 2c0-1.77-1.02-3.29-2.5-4.03v8.05c1.48-0.73 2.5-2.25 2.5-4.02zM14 4.45v0.2c0 0.38 0.25 0.71 0.6 0.85C17.18 6.53 19 9.06 19 12s-1.82 5.47-4.4 6.5c-0.36 0.14 -0.6 0.47 -0.6 0.85 v0.2c0 0.63 0.63 1.07 1.21 0.85 C18.6 19.11 21 15.84 21 12s-2.4-7.11-5.79-8.4c-0.58-0.23-1.21 0.22 -1.21 0.85 z" /> \ No newline at end of file diff --git a/app/src/main/res/drawable/toggle_album.xml b/app/src/main/res/drawable/toggle_album.xml deleted file mode 100644 index d4838d2d..00000000 --- a/app/src/main/res/drawable/toggle_album.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/toggle_artist.xml b/app/src/main/res/drawable/toggle_artist.xml deleted file mode 100644 index 46802416..00000000 --- a/app/src/main/res/drawable/toggle_artist.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/toggle_audiotrack.xml b/app/src/main/res/drawable/toggle_audiotrack.xml deleted file mode 100644 index 57e16d19..00000000 --- a/app/src/main/res/drawable/toggle_audiotrack.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/toggle_guitar.xml b/app/src/main/res/drawable/toggle_guitar.xml deleted file mode 100644 index 954adb12..00000000 --- a/app/src/main/res/drawable/toggle_guitar.xml +++ /dev/null @@ -1,17 +0,0 @@ - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/toggle_home.xml b/app/src/main/res/drawable/toggle_home.xml deleted file mode 100644 index 0574dc92..00000000 --- a/app/src/main/res/drawable/toggle_home.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/toggle_playlist.xml b/app/src/main/res/drawable/toggle_playlist.xml deleted file mode 100644 index 6540a249..00000000 --- a/app/src/main/res/drawable/toggle_playlist.xml +++ /dev/null @@ -1,18 +0,0 @@ - - - - - - \ No newline at end of file diff --git a/app/src/main/res/drawable/toggle_queue_music.xml b/app/src/main/res/drawable/toggle_queue_music.xml deleted file mode 100644 index 7e9fbf2b..00000000 --- a/app/src/main/res/drawable/toggle_queue_music.xml +++ /dev/null @@ -1,19 +0,0 @@ - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/activity_album_content.xml b/app/src/main/res/layout/activity_album_content.xml index e89994d5..5a15c004 100644 --- a/app/src/main/res/layout/activity_album_content.xml +++ b/app/src/main/res/layout/activity_album_content.xml @@ -10,11 +10,13 @@ android:id="@+id/playAction" android:layout_width="0dp" android:layout_height="wrap_content" + android:layout_marginBottom="8dp" + android:layout_marginEnd="@dimen/button_margin_horizontal" android:layout_marginStart="@dimen/button_margin_horizontal" android:layout_marginTop="8dp" - android:layout_marginEnd="@dimen/button_margin_horizontal" - android:layout_marginBottom="8dp" android:text="@string/action_play_all" + android:textColor="?android:attr/textColorPrimary" + app:backgroundTint="?attr/colorSurface" app:icon="@drawable/ic_play_arrow_white_24dp" app:layout_constraintEnd_toStartOf="@+id/shuffleAction" app:layout_constraintHorizontal_bias="0.5" @@ -25,11 +27,13 @@ android:id="@+id/shuffleAction" android:layout_width="0dp" android:layout_height="wrap_content" + android:layout_marginBottom="8dp" + android:layout_marginEnd="@dimen/button_margin_horizontal" android:layout_marginStart="@dimen/button_margin_horizontal" android:layout_marginTop="8dp" - android:layout_marginEnd="@dimen/button_margin_horizontal" - android:layout_marginBottom="8dp" android:text="@string/shuffle" + android:textColor="?android:attr/textColorPrimary" + app:backgroundTint="?attr/colorSurface" app:icon="@drawable/ic_shuffle_white_24dp" app:layout_constraintBottom_toBottomOf="@+id/playAction" app:layout_constraintEnd_toEndOf="parent" @@ -66,7 +70,7 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@id/recyclerView" - tools:text="More by Artist" + tools:text="More by Hemanth" tools:visibility="visible" /> diff --git a/app/src/main/res/layout/activity_donation.xml b/app/src/main/res/layout/activity_donation.xml index 768ae337..a4c6a1b8 100644 --- a/app/src/main/res/layout/activity_donation.xml +++ b/app/src/main/res/layout/activity_donation.xml @@ -16,6 +16,7 @@ android:id="@+id/toolbar" style="@style/Toolbar" app:layout_collapseMode="pin" + app:navigationIcon="@drawable/ic_keyboard_backspace_black_24dp" app:title="@string/support_development" app:titleTextAppearance="@style/ToolbarTextAppearanceNormal" tools:ignore="UnusedAttribute" /> diff --git a/app/src/main/res/layout/activity_pro_version.xml b/app/src/main/res/layout/activity_pro_version.xml index b5de32c7..05092b5d 100644 --- a/app/src/main/res/layout/activity_pro_version.xml +++ b/app/src/main/res/layout/activity_pro_version.xml @@ -58,9 +58,7 @@ android:layout_height="wrap_content" android:layout_margin="4dp" app:cardCornerRadius="8dp" - app:cardElevation="0dp" - app:cardUseCompatPadding="true" - app:strokeWidth="1.5dp"> + app:cardUseCompatPadding="true"> - + tools:text="@tools:sample/lorem/random" /> + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:tools="http://schemas.android.com/tools" + android:id="@+id/player_footer_frame" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:orientation="vertical" + tools:background="@color/md_grey_800"> - + - + - + - + - + - + - + - + android:gravity="center_vertical|left|end" + android:paddingLeft="8dp" + android:singleLine="true" + android:textColor="@color/md_white_1000" + android:textSize="12sp" + tools:ignore="RtlHardcoded,RtlSymmetry" + tools:text="00:00" /> - + android:gravity="center_vertical|right|end" + android:paddingRight="8dp" + android:singleLine="true" + android:textColor="@color/md_white_1000" + android:textSize="12sp" + tools:ignore="RtlHardcoded,RtlSymmetry" + tools:text="00:00" /> - - + + - + - + - + - - + - + - + - + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_main_settings.xml b/app/src/main/res/layout/fragment_main_settings.xml index 122af633..2b5ba568 100644 --- a/app/src/main/res/layout/fragment_main_settings.xml +++ b/app/src/main/res/layout/fragment_main_settings.xml @@ -146,7 +146,7 @@ android:id="@+id/otherSettings" android:layout_width="match_parent" android:layout_height="wrap_content" - app:settingListItemIcon="@drawable/ic_notifications_active_white_24dp" + app:settingListItemIcon="@drawable/ic_testing_white_24dp" app:settingListItemIconColor="@color/md_indigo_A400" app:settingListItemText="@string/other_settings_summary" app:settingListItemTitle="@string/others" /> diff --git a/app/src/main/res/layout/fragment_player_playback_controls.xml b/app/src/main/res/layout/fragment_player_playback_controls.xml index b1dfa4de..c07a57b7 100755 --- a/app/src/main/res/layout/fragment_player_playback_controls.xml +++ b/app/src/main/res/layout/fragment_player_playback_controls.xml @@ -193,11 +193,10 @@ diff --git a/app/src/main/res/layout/fragment_volume.xml b/app/src/main/res/layout/fragment_volume.xml index 0e621cab..5be8e7b9 100755 --- a/app/src/main/res/layout/fragment_volume.xml +++ b/app/src/main/res/layout/fragment_volume.xml @@ -1,5 +1,5 @@ - + android:paddingStart="16dp" + android:paddingEnd="16dp"> - - \ No newline at end of file + \ No newline at end of file diff --git a/app/src/main/res/layout/item_album_card.xml b/app/src/main/res/layout/item_album_card.xml index 48245a3d..1acbcaaf 100644 --- a/app/src/main/res/layout/item_album_card.xml +++ b/app/src/main/res/layout/item_album_card.xml @@ -28,10 +28,10 @@ android:layout_height="match_parent" android:ellipsize="end" android:maxLines="2" - android:paddingStart="12dp" - android:paddingEnd="8dp" android:paddingBottom="4dp" + android:paddingEnd="8dp" + android:paddingStart="12dp" android:textAppearance="@style/TextViewNormal" tools:ignore="MissingPrefix" - tools:text="My top tracks" /> + tools:text="@tools:sample/full_names" /> \ No newline at end of file diff --git a/app/src/main/res/layout/item_list.xml b/app/src/main/res/layout/item_list.xml index 2979abfa..4f8dc4fd 100755 --- a/app/src/main/res/layout/item_list.xml +++ b/app/src/main/res/layout/item_list.xml @@ -4,10 +4,10 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="wrap_content" + android:layout_marginBottom="2dp" + android:layout_marginEnd="4dp" android:layout_marginStart="4dp" android:layout_marginTop="2dp" - android:layout_marginEnd="4dp" - android:layout_marginBottom="2dp" android:clickable="true" android:focusable="true" android:foreground="?rectSelector" @@ -32,8 +32,8 @@ android:layout_width="wrap_content" android:layout_height="match_parent" android:layout_weight="0" - android:paddingStart="16dp" - android:paddingEnd="0dp"> + android:paddingEnd="0dp" + android:paddingStart="16dp"> + android:paddingEnd="16dp" + android:paddingStart="16dp"> + tools:text="@tools:sample/lorem/random" /> + tools:text="@tools:sample/lorem/random" /> \ No newline at end of file