diff options
| author | daniel oeh <daniel.oeh@gmail.com> | 2014-10-25 20:12:53 +0200 |
|---|---|---|
| committer | daniel oeh <daniel.oeh@gmail.com> | 2014-11-05 20:40:11 +0100 |
| commit | ad14fa4f7f0084c875d511b20b0a06633580a3ed (patch) | |
| tree | d4330fcba123f8464d21bf99ca188f3d3fa5a9a1 | |
| parent | baac7c535a20d65a00da7efcaabd4ff0d5d89cad (diff) | |
| download | AntennaPod-ad14fa4f7f0084c875d511b20b0a06633580a3ed.zip | |
Updated layouts
Use new navigation drawer toggle
Customized colors of new themes
Updated navigation drawer layout
Updated "new episodes list" layout
Updated feeditemlist layout
Fixed refresh button behavior in feeditemlist
Updated downloads fragment layout
Fixed layouts on smaller screens, updated borderless buttons
Use PreferenceFragment instead of PreferenceActivity if possible
Changes of the Preference UI should now be made in the PreferenceController class.
Replaced vertical_divider with android:attr/listDivider
Updated itemlist layout in onlinefeedview
Fixed NPE in TagFragment
Updated gpodnet list layout
Updated search layout
Adjusted background color of external player
Added material design icons
Adjusted primary dark color
480 files changed, 1409 insertions, 1721 deletions
diff --git a/app/src/androidTest/java/de/test/antennapod/ui/MainActivityTest.java b/app/src/androidTest/java/de/test/antennapod/ui/MainActivityTest.java index 3656582e1..ce7b790e0 100644 --- a/app/src/androidTest/java/de/test/antennapod/ui/MainActivityTest.java +++ b/app/src/androidTest/java/de/test/antennapod/ui/MainActivityTest.java @@ -8,9 +8,10 @@ import com.robotium.solo.Solo; import de.danoeh.antennapod.R; import de.danoeh.antennapod.activity.DefaultOnlineFeedViewActivity; import de.danoeh.antennapod.activity.MainActivity; -import de.danoeh.antennapod.activity.PreferenceActivity; +import de.danoeh.antennapod.activity.PreferenceActivityGingerbread; import de.danoeh.antennapod.core.feed.Feed; import de.danoeh.antennapod.core.storage.PodDBAdapter; +import de.danoeh.antennapod.preferences.PreferenceController; /** * User interface tests for MainActivity @@ -110,6 +111,6 @@ public class MainActivityTest extends ActivityInstrumentationTestCase2<MainActiv public void testGoToPreferences() { solo.setNavigationDrawer(Solo.CLOSED); solo.clickOnMenuItem(solo.getString(R.string.settings_label)); - solo.waitForActivity(PreferenceActivity.class); + solo.waitForActivity(PreferenceController.getPreferenceActivity()); } } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index cce3d2dc0..7ec462f70 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -70,6 +70,15 @@ android:launchMode="singleInstance"/> <activity + android:name=".activity.PreferenceActivityGingerbread" + android:configChanges="keyboardHidden|orientation" + android:label="@string/settings_label"> + <meta-data + android:name="android.support.PARENT_ACTIVITY" + android:value="de.danoeh.antennapod.activity.MainActivity"/> + </activity> + + <activity android:name=".activity.PreferenceActivity" android:configChanges="keyboardHidden|orientation" android:label="@string/settings_label"> diff --git a/app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java index 033d650ce..9979896f6 100644 --- a/app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java +++ b/app/src/main/java/de/danoeh/antennapod/activity/AudioplayerActivity.java @@ -6,11 +6,11 @@ import android.content.res.Configuration; import android.content.res.TypedArray; import android.os.AsyncTask; import android.os.Bundle; -import android.support.v4.app.ActionBarDrawerToggle; import android.support.v4.app.Fragment; import android.support.v4.app.FragmentTransaction; import android.support.v4.app.ListFragment; import android.support.v4.widget.DrawerLayout; +import android.support.v7.app.ActionBarDrawerToggle; import android.util.Log; import android.view.Menu; import android.view.MenuItem; @@ -32,23 +32,22 @@ import de.danoeh.antennapod.R; import de.danoeh.antennapod.adapter.ChapterListAdapter; import de.danoeh.antennapod.adapter.NavListAdapter; import de.danoeh.antennapod.core.asynctask.PicassoProvider; -import de.danoeh.antennapod.core.util.id3reader.ChapterReader; -import de.danoeh.antennapod.dialog.VariableSpeedDialog; import de.danoeh.antennapod.core.feed.Chapter; import de.danoeh.antennapod.core.feed.EventDistributor; import de.danoeh.antennapod.core.feed.Feed; import de.danoeh.antennapod.core.feed.MediaType; import de.danoeh.antennapod.core.feed.SimpleChapter; -import de.danoeh.antennapod.fragment.CoverFragment; -import de.danoeh.antennapod.fragment.ItemDescriptionFragment; import de.danoeh.antennapod.core.preferences.UserPreferences; import de.danoeh.antennapod.core.service.playback.PlaybackService; import de.danoeh.antennapod.core.storage.DBReader; -import de.danoeh.antennapod.menuhandler.MenuItemUtils; -import de.danoeh.antennapod.menuhandler.NavDrawerActivity; import de.danoeh.antennapod.core.util.playback.ExternalMedia; import de.danoeh.antennapod.core.util.playback.Playable; import de.danoeh.antennapod.core.util.playback.PlaybackController; +import de.danoeh.antennapod.dialog.VariableSpeedDialog; +import de.danoeh.antennapod.fragment.CoverFragment; +import de.danoeh.antennapod.fragment.ItemDescriptionFragment; +import de.danoeh.antennapod.menuhandler.MenuItemUtils; +import de.danoeh.antennapod.menuhandler.NavDrawerActivity; /** * Activity for playing audio files. @@ -428,8 +427,7 @@ public class AudioplayerActivity extends MediaplayerActivity implements ItemDesc butNavRight = (ImageButton) findViewById(R.id.butNavRight); butPlaybackSpeed = (Button) findViewById(R.id.butPlaybackSpeed); - TypedArray typedArray = obtainStyledAttributes(new int[]{R.attr.nav_drawer_toggle}); - drawerToggle = new ActionBarDrawerToggle(this, drawerLayout, typedArray.getResourceId(0, 0), R.string.drawer_open, R.string.drawer_close) { + drawerToggle = new ActionBarDrawerToggle(this, drawerLayout, R.string.drawer_open, R.string.drawer_close) { CharSequence currentTitle = getSupportActionBar().getTitle(); @Override @@ -447,7 +445,7 @@ public class AudioplayerActivity extends MediaplayerActivity implements ItemDesc supportInvalidateOptionsMenu(); } }; - typedArray.recycle(); + drawerToggle.setDrawerIndicatorEnabled(false); drawerLayout.setDrawerListener(drawerToggle); diff --git a/app/src/main/java/de/danoeh/antennapod/activity/FlattrAuthActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/FlattrAuthActivity.java index f4a973fac..3b10ba4c3 100644 --- a/app/src/main/java/de/danoeh/antennapod/activity/FlattrAuthActivity.java +++ b/app/src/main/java/de/danoeh/antennapod/activity/FlattrAuthActivity.java @@ -16,6 +16,8 @@ import de.danoeh.antennapod.BuildConfig; import de.danoeh.antennapod.R; import de.danoeh.antennapod.core.preferences.UserPreferences; import de.danoeh.antennapod.core.util.flattr.FlattrUtils; +import de.danoeh.antennapod.preferences.PreferenceController; + import org.shredzone.flattr4j.exception.FlattrException; /** Guides the user through the authentication process */ @@ -108,7 +110,7 @@ public class FlattrAuthActivity extends ActionBarActivity { switch (item.getItemId()) { case android.R.id.home: if (authSuccessful) { - Intent intent = new Intent(this, PreferenceActivity.class); + Intent intent = new Intent(this, PreferenceController.getPreferenceActivity()); intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TOP); startActivity(intent); } else { diff --git a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java index 9b7c11843..df6ff1046 100644 --- a/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java +++ b/app/src/main/java/de/danoeh/antennapod/activity/MainActivity.java @@ -3,42 +3,51 @@ package de.danoeh.antennapod.activity; import android.content.Intent; import android.content.SharedPreferences; import android.content.res.Configuration; -import android.content.res.TypedArray; import android.media.AudioManager; import android.os.AsyncTask; import android.os.Bundle; import android.os.Handler; -import android.support.v4.app.ActionBarDrawerToggle; import android.support.v4.app.Fragment; import android.support.v4.app.FragmentManager; import android.support.v4.app.FragmentTransaction; import android.support.v4.widget.DrawerLayout; import android.support.v7.app.ActionBar; import android.support.v7.app.ActionBarActivity; +import android.support.v7.app.ActionBarDrawerToggle; import android.util.Log; -import android.view.*; +import android.view.Menu; +import android.view.MenuInflater; +import android.view.MenuItem; +import android.view.View; import android.widget.AdapterView; import android.widget.ListView; import org.apache.commons.lang3.Validate; +import java.util.List; + import de.danoeh.antennapod.BuildConfig; import de.danoeh.antennapod.R; import de.danoeh.antennapod.adapter.NavListAdapter; import de.danoeh.antennapod.core.feed.EventDistributor; import de.danoeh.antennapod.core.feed.Feed; -import de.danoeh.antennapod.fragment.*; import de.danoeh.antennapod.core.preferences.UserPreferences; import de.danoeh.antennapod.core.storage.DBReader; import de.danoeh.antennapod.core.util.StorageUtils; +import de.danoeh.antennapod.fragment.AddFeedFragment; +import de.danoeh.antennapod.fragment.DownloadsFragment; +import de.danoeh.antennapod.fragment.ExternalPlayerFragment; +import de.danoeh.antennapod.fragment.ItemlistFragment; +import de.danoeh.antennapod.fragment.NewEpisodesFragment; +import de.danoeh.antennapod.fragment.PlaybackHistoryFragment; +import de.danoeh.antennapod.fragment.QueueFragment; import de.danoeh.antennapod.menuhandler.NavDrawerActivity; - -import java.util.List; +import de.danoeh.antennapod.preferences.PreferenceController; /** * The activity that is shown when the user launches the app. */ -public class MainActivity extends ActionBarActivity implements NavDrawerActivity{ +public class MainActivity extends ActionBarActivity implements NavDrawerActivity { private static final String TAG = "MainActivity"; private static final int EVENTS = EventDistributor.DOWNLOAD_HANDLED | EventDistributor.DOWNLOAD_QUEUED @@ -84,8 +93,7 @@ public class MainActivity extends ActionBarActivity implements NavDrawerActivity drawerLayout = (DrawerLayout) findViewById(R.id.drawer_layout); navList = (ListView) findViewById(R.id.nav_list); - TypedArray typedArray = obtainStyledAttributes(new int[]{R.attr.nav_drawer_toggle}); - drawerToggle = new ActionBarDrawerToggle(this, drawerLayout, typedArray.getResourceId(0, 0), R.string.drawer_open, R.string.drawer_close) { + drawerToggle = new ActionBarDrawerToggle(this, drawerLayout, R.string.drawer_open, R.string.drawer_close) { @Override public void onDrawerOpened(View drawerView) { super.onDrawerOpened(drawerView); @@ -102,7 +110,6 @@ public class MainActivity extends ActionBarActivity implements NavDrawerActivity } }; - typedArray.recycle(); drawerLayout.setDrawerListener(drawerToggle); FragmentManager fm = getSupportFragmentManager(); @@ -308,7 +315,7 @@ public class MainActivity extends ActionBarActivity implements NavDrawerActivity } switch (item.getItemId()) { case R.id.show_preferences: - startActivity(new Intent(this, PreferenceActivity.class)); + startActivity(new Intent(this, PreferenceController.getPreferenceActivity())); return true; default: return super.onOptionsItemSelected(item); diff --git a/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java b/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java index 95e352874..1454a2eff 100644 --- a/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java +++ b/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivity.java @@ -1,387 +1,83 @@ package de.danoeh.antennapod.activity; -import android.annotation.SuppressLint; +import android.annotation.TargetApi; import android.app.ActionBar; -import android.content.Context; -import android.content.DialogInterface; +import android.app.Activity; import android.content.Intent; -import android.content.res.Resources.Theme; -import android.net.wifi.WifiConfiguration; -import android.net.wifi.WifiManager; -import android.os.Bundle; import android.os.Build; -import android.preference.CheckBoxPreference; -import android.preference.ListPreference; +import android.os.Bundle; import android.preference.Preference; -import android.preference.Preference.OnPreferenceChangeListener; -import android.preference.Preference.OnPreferenceClickListener; -import android.preference.PreferenceScreen; -import android.util.Log; +import android.preference.PreferenceFragment; import android.view.Menu; import android.view.MenuItem; -import android.widget.Toast; -import de.danoeh.antennapod.BuildConfig; +import android.view.ViewGroup; +import android.widget.FrameLayout; + import de.danoeh.antennapod.R; -import de.danoeh.antennapod.core.asynctask.FlattrClickWorker; -import de.danoeh.antennapod.asynctask.OpmlExportWorker; -import de.danoeh.antennapod.dialog.AuthenticationDialog; -import de.danoeh.antennapod.dialog.AutoFlattrPreferenceDialog; -import de.danoeh.antennapod.dialog.GpodnetSetHostnameDialog; -import de.danoeh.antennapod.dialog.VariableSpeedDialog; -import de.danoeh.antennapod.core.preferences.GpodnetPreferences; import de.danoeh.antennapod.core.preferences.UserPreferences; -import de.danoeh.antennapod.core.util.flattr.FlattrStatus; -import de.danoeh.antennapod.core.util.flattr.FlattrUtils; -import de.danoeh.antennapod.core.util.flattr.SimpleFlattrThing; - -import java.io.File; -import java.util.ArrayList; -import java.util.Arrays; -import java.util.List; +import de.danoeh.antennapod.preferences.PreferenceController; /** - * The main preference activity + * PreferenceActivity for API 11+. In order to change the behavior of the preference UI, see + * PreferenceController. */ -public class PreferenceActivity extends android.preference.PreferenceActivity { - private static final String TAG = "PreferenceActivity"; +public class PreferenceActivity extends Activity { - private static final String PREF_FLATTR_THIS_APP = "prefFlattrThisApp"; - private static final String PREF_FLATTR_SETTINGS = "prefFlattrSettings"; - private static final String PREF_FLATTR_AUTH = "pref_flattr_authenticate"; - private static final String PREF_FLATTR_REVOKE = "prefRevokeAccess"; - private static final String PREF_AUTO_FLATTR_PREFS = "prefAutoFlattrPrefs"; - private static final String PREF_OPML_EXPORT = "prefOpmlExport"; - private static final String PREF_ABOUT = "prefAbout"; - private static final String PREF_CHOOSE_DATA_DIR = "prefChooseDataDir"; - private static final String AUTO_DL_PREF_SCREEN = "prefAutoDownloadSettings"; - private static final String PREF_PLAYBACK_SPEED_LAUNCHER = "prefPlaybackSpeedLauncher"; + private PreferenceController preferenceController; + private MainFragment prefFragment; + private static PreferenceActivity instance; - private static final String PREF_GPODNET_LOGIN = "pref_gpodnet_authenticate"; - private static final String PREF_GPODNET_SETLOGIN_INFORMATION = "pref_gpodnet_setlogin_information"; - private static final String PREF_GPODNET_LOGOUT = "pref_gpodnet_logout"; - private static final String PREF_GPODNET_HOSTNAME = "pref_gpodnet_hostname"; - private static final String PREF_EXPANDED_NOTIFICATION = "prefExpandNotify"; - private static final String PREF_PERSISTENT_NOTIFICATION = "prefPersistNotify"; + private final PreferenceController.PreferenceUI preferenceUI = new PreferenceController.PreferenceUI() { + @TargetApi(Build.VERSION_CODES.HONEYCOMB) + @Override + public Preference findPreference(CharSequence key) { + return prefFragment.findPreference(key); + } - private CheckBoxPreference[] selectedNetworks; + @Override + public Activity getActivity() { + return PreferenceActivity.this; + } + }; - @SuppressLint("NewApi") - @SuppressWarnings("deprecation") + @TargetApi(Build.VERSION_CODES.HONEYCOMB) @Override - public void onCreate(Bundle savedInstanceState) { + protected void onCreate(Bundle savedInstanceState) { setTheme(UserPreferences.getTheme()); super.onCreate(savedInstanceState); + instance = this; - if (android.os.Build.VERSION.SDK_INT >= 11) { - @SuppressLint("AppCompatMethod") ActionBar ab = getActionBar(); - if (ab != null) { - ab.setDisplayHomeAsUpEnabled(true); - } + ActionBar ab = getActionBar(); + if (ab != null) { + ab.setDisplayHomeAsUpEnabled(true); } - addPreferencesFromResource(R.xml.preferences); - - if (android.os.Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN) { - // disable expanded notification option on unsupported android versions - findPreference(PREF_EXPANDED_NOTIFICATION).setEnabled(false); - findPreference(PREF_EXPANDED_NOTIFICATION).setOnPreferenceClickListener( - new OnPreferenceClickListener() { - - @Override - public boolean onPreferenceClick(Preference preference) { - Toast toast = Toast.makeText(PreferenceActivity.this, R.string.pref_expand_notify_unsupport_toast, Toast.LENGTH_SHORT); - toast.show(); - return true; - } - } - ); - } - - findPreference(PREF_FLATTR_THIS_APP).setOnPreferenceClickListener( - new OnPreferenceClickListener() { - - @Override - public boolean onPreferenceClick(Preference preference) { - new FlattrClickWorker(PreferenceActivity.this, - new SimpleFlattrThing(PreferenceActivity.this.getString(R.string.app_name), - FlattrUtils.APP_URL, - new FlattrStatus(FlattrStatus.STATUS_QUEUE) - ) - ).executeAsync(); - - return true; - } - } - ); - - findPreference(PREF_FLATTR_REVOKE).setOnPreferenceClickListener( - new OnPreferenceClickListener() { - - @Override - public boolean onPreferenceClick(Preference preference) { - FlattrUtils.revokeAccessToken(PreferenceActivity.this); - checkItemVisibility(); - return true; - } - - } - ); - - findPreference(PREF_ABOUT).setOnPreferenceClickListener( - new OnPreferenceClickListener() { - - @Override - public boolean onPreferenceClick(Preference preference) { - PreferenceActivity.this.startActivity(new Intent( - PreferenceActivity.this, AboutActivity.class)); - return true; - } - - } - ); - - findPreference(PREF_OPML_EXPORT).setOnPreferenceClickListener( - new OnPreferenceClickListener() { - - @Override - public boolean onPreferenceClick(Preference preference) { - new OpmlExportWorker(PreferenceActivity.this) - .executeAsync(); - - return true; - } - } - ); - - findPreference(PREF_CHOOSE_DATA_DIR).setOnPreferenceClickListener( - new OnPreferenceClickListener() { - - @Override - public boolean onPreferenceClick(Preference preference) { - startActivityForResult( - new Intent(PreferenceActivity.this, - DirectoryChooserActivity.class), - DirectoryChooserActivity.RESULT_CODE_DIR_SELECTED - ); - return true; - } - } - ); - findPreference(UserPreferences.PREF_THEME) - .setOnPreferenceChangeListener( - new OnPreferenceChangeListener() { - - @Override - public boolean onPreferenceChange( - Preference preference, Object newValue) { - Intent i = getIntent(); - i.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK - | Intent.FLAG_ACTIVITY_NEW_TASK); - finish(); - startActivity(i); - return true; - } - } - ); - findPreference(UserPreferences.PREF_ENABLE_AUTODL) - .setOnPreferenceChangeListener(new OnPreferenceChangeListener() { - @Override - public boolean onPreferenceChange(Preference preference, Object newValue) { - if (newValue instanceof Boolean) { - findPreference(UserPreferences.PREF_ENABLE_AUTODL_WIFI_FILTER).setEnabled((Boolean) newValue); - setSelectedNetworksEnabled((Boolean) newValue && UserPreferences.isEnableAutodownloadWifiFilter()); - } - return true; - } - }); - findPreference(UserPreferences.PREF_ENABLE_AUTODL_WIFI_FILTER) - .setOnPreferenceChangeListener( - new OnPreferenceChangeListener() { - - @Override - public boolean onPreferenceChange( - Preference preference, Object newValue) { - if (newValue instanceof Boolean) { - setSelectedNetworksEnabled((Boolean) newValue); - return true; - } else { - return false; - } - } - } - ); - findPreference(UserPreferences.PREF_EPISODE_CACHE_SIZE) - .setOnPreferenceChangeListener( - new OnPreferenceChangeListener() { - @Override - public boolean onPreferenceChange(Preference preference, Object o) { - if (o instanceof String) { - setEpisodeCacheSizeText(UserPreferences.readEpisodeCacheSize((String) o)); - } - return true; - } - } - ); - findPreference(PREF_PLAYBACK_SPEED_LAUNCHER) - .setOnPreferenceClickListener(new OnPreferenceClickListener() { - @Override - public boolean onPreferenceClick(Preference preference) { - VariableSpeedDialog.showDialog(PreferenceActivity.this); - return true; - } - }); - findPreference(PREF_GPODNET_SETLOGIN_INFORMATION).setOnPreferenceClickListener(new OnPreferenceClickListener() { - @Override - public boolean onPreferenceClick(Preference preference) { - AuthenticationDialog dialog = new AuthenticationDialog(PreferenceActivity.this, - R.string.pref_gpodnet_setlogin_information_title, false, false, GpodnetPreferences.getUsername(), - null) { - - @Override - protected void onConfirmed(String username, String password, boolean saveUsernamePassword) { - GpodnetPreferences.setPassword(password); - } - }; - dialog.show(); - return true; - } - }); - findPreference(PREF_GPODNET_LOGOUT).setOnPreferenceClickListener(new OnPreferenceClickListener() { - @Override - public boolean onPreferenceClick(Preference preference) { - GpodnetPreferences.logout(); - Toast toast = Toast.makeText(PreferenceActivity.this, R.string.pref_gpodnet_logout_toast, Toast.LENGTH_SHORT); - toast.show(); - updateGpodnetPreferenceScreen(); - return true; - } - }); - findPreference(PREF_GPODNET_HOSTNAME).setOnPreferenceClickListener(new OnPreferenceClickListener() { - @Override - public boolean onPreferenceClick(Preference preference) { - GpodnetSetHostnameDialog.createDialog(PreferenceActivity.this).setOnDismissListener(new DialogInterface.OnDismissListener() { - @Override - public void onDismiss(DialogInterface dialog) { - updateGpodnetPreferenceScreen(); - } - }); - return true; - } - }); - - findPreference(PREF_AUTO_FLATTR_PREFS).setOnPreferenceClickListener(new OnPreferenceClickListener() { - @Override - public boolean onPreferenceClick(Preference preference) { - AutoFlattrPreferenceDialog.newAutoFlattrPreferenceDialog(PreferenceActivity.this, - new AutoFlattrPreferenceDialog.AutoFlattrPreferenceDialogInterface() { - @Override - public void onCancelled() { - - } - - @Override - public void onConfirmed(boolean autoFlattrEnabled, float autoFlattrValue) { - UserPreferences.setAutoFlattrSettings(PreferenceActivity.this, autoFlattrEnabled, autoFlattrValue); - checkItemVisibility(); - } - }); - return true; - } - }); - buildUpdateIntervalPreference(); - buildAutodownloadSelectedNetworsPreference(); - setSelectedNetworksEnabled(UserPreferences - .isEnableAutodownloadWifiFilter()); - } - - private void updateGpodnetPreferenceScreen() { - final boolean loggedIn = GpodnetPreferences.loggedIn(); - findPreference(PREF_GPODNET_LOGIN).setEnabled(!loggedIn); - findPreference(PREF_GPODNET_SETLOGIN_INFORMATION).setEnabled(loggedIn); - findPreference(PREF_GPODNET_LOGOUT).setEnabled(loggedIn); - findPreference(PREF_GPODNET_HOSTNAME).setSummary(GpodnetPreferences.getHostname()); - } - - private void buildUpdateIntervalPreference() { - ListPreference pref = (ListPreference) findPreference(UserPreferences.PREF_UPDATE_INTERVAL); - String[] values = getResources().getStringArray( - R.array.update_intervall_values); - String[] entries = new String[values.length]; - for (int x = 0; x < values.length; x++) { - Integer v = Integer.parseInt(values[x]); - switch (v) { - case 0: - entries[x] = getString(R.string.pref_update_interval_hours_manual); - break; - case 1: - entries[x] = v - + " " - + getString(R.string.pref_update_interval_hours_singular); - break; - default: - entries[x] = v + " " - + getString(R.string.pref_update_interval_hours_plural); - break; - - } - } - pref.setEntries(entries); + // set up layout + FrameLayout root = new FrameLayout(this); + root.setId(R.id.content); + root.setLayoutParams(new FrameLayout.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, + ViewGroup.LayoutParams.MATCH_PARENT)); + setContentView(root); + prefFragment = new MainFragment(); + getFragmentManager().beginTransaction().replace(R.id.content, prefFragment).commit(); - } - - private void setSelectedNetworksEnabled(boolean b) { - if (selectedNetworks != null) { - for (Preference p : selectedNetworks) { - p.setEnabled(b); - } - } + preferenceController = new PreferenceController(preferenceUI); } @Override - protected void onResume() { - super.onResume(); - checkItemVisibility(); - setEpisodeCacheSizeText(UserPreferences.getEpisodeCacheSize()); - setDataFolderText(); - updateGpodnetPreferenceScreen(); - } - - @SuppressWarnings("deprecation") - private void checkItemVisibility() { - - boolean hasFlattrToken = FlattrUtils.hasToken(); - - findPreference(PREF_FLATTR_SETTINGS).setEnabled(FlattrUtils.hasAPICredentials()); - findPreference(PREF_FLATTR_AUTH).setEnabled(!hasFlattrToken); - findPreference(PREF_FLATTR_REVOKE).setEnabled(hasFlattrToken); - findPreference(PREF_AUTO_FLATTR_PREFS).setEnabled(hasFlattrToken); - - findPreference(UserPreferences.PREF_ENABLE_AUTODL_WIFI_FILTER) - .setEnabled(UserPreferences.isEnableAutodownload()); - setSelectedNetworksEnabled(UserPreferences.isEnableAutodownload() - && UserPreferences.isEnableAutodownloadWifiFilter()); - - } - - private void setEpisodeCacheSizeText(int cacheSize) { - String s; - if (cacheSize == getResources().getInteger( - R.integer.episode_cache_size_unlimited)) { - s = getString(R.string.pref_episode_cache_unlimited); - } else { - s = Integer.toString(cacheSize) - + getString(R.string.episodes_suffix); - } - findPreference(UserPreferences.PREF_EPISODE_CACHE_SIZE).setSummary(s); + protected void onActivityResult(int requestCode, int resultCode, Intent data) { + super.onActivityResult(requestCode, resultCode, data); + preferenceController.onActivityResult(requestCode, resultCode, data); } - private void setDataFolderText() { - File f = UserPreferences.getDataFolder(this, null); - if (f != null) { - findPreference(PREF_CHOOSE_DATA_DIR) - .setSummary(f.getAbsolutePath()); - } + @Override + public void onBackPressed() { + // The default back button behavior has to be overwritten because changing the theme clears the back stack + Intent destIntent = new Intent(this, MainActivity.class); + destIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + startActivity(destIntent); + finish(); } @Override @@ -404,129 +100,20 @@ public class PreferenceActivity extends android.preference.PreferenceActivity { } } - @Override - protected void onApplyThemeResource(Theme theme, int resid, boolean first) { - theme.applyStyle(UserPreferences.getTheme(), true); - } + @TargetApi(Build.VERSION_CODES.HONEYCOMB) + public static class MainFragment extends PreferenceFragment { - @Override - protected void onActivityResult(int requestCode, int resultCode, Intent data) { - super.onActivityResult(requestCode, resultCode, data); - if (resultCode == DirectoryChooserActivity.RESULT_CODE_DIR_SELECTED) { - String dir = data - .getStringExtra(DirectoryChooserActivity.RESULT_SELECTED_DIR); - if (BuildConfig.DEBUG) - Log.d(TAG, "Setting data folder"); - UserPreferences.setDataFolder(dir); + @Override + public void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + addPreferencesFromResource(R.xml.preferences); + instance.preferenceController.onCreate(); } - } - private void buildAutodownloadSelectedNetworsPreference() { - if (selectedNetworks != null) { - clearAutodownloadSelectedNetworsPreference(); + @Override + public void onResume() { + super.onResume(); + instance.preferenceController.onResume(); } - // get configured networks - WifiManager wifiservice = (WifiManager) getSystemService(Context.WIFI_SERVICE); - List<WifiConfiguration> networks = wifiservice.getConfiguredNetworks(); - - if (networks != null) { - selectedNetworks = new CheckBoxPreference[networks.size()]; - List<String> prefValues = Arrays.asList(UserPreferences - .getAutodownloadSelectedNetworks()); - PreferenceScreen prefScreen = (PreferenceScreen) findPreference(AUTO_DL_PREF_SCREEN); - OnPreferenceClickListener clickListener = new OnPreferenceClickListener() { - - @Override - public boolean onPreferenceClick(Preference preference) { - if (preference instanceof CheckBoxPreference) { - String key = preference.getKey(); - ArrayList<String> prefValuesList = new ArrayList<String>( - Arrays.asList(UserPreferences - .getAutodownloadSelectedNetworks()) - ); - boolean newValue = ((CheckBoxPreference) preference) - .isChecked(); - if (BuildConfig.DEBUG) - Log.d(TAG, "Selected network " + key - + ". New state: " + newValue); - - int index = prefValuesList.indexOf(key); - if (index >= 0 && newValue == false) { - // remove network - prefValuesList.remove(index); - } else if (index < 0 && newValue == true) { - prefValuesList.add(key); - } - - UserPreferences.setAutodownloadSelectedNetworks( - PreferenceActivity.this, prefValuesList - .toArray(new String[prefValuesList - .size()]) - ); - return true; - } else { - return false; - } - } - }; - // create preference for each known network. attach listener and set - // value - for (int i = 0; i < networks.size(); i++) { - WifiConfiguration config = networks.get(i); - - CheckBoxPreference pref = new CheckBoxPreference(this); - String key = Integer.toString(config.networkId); - pref.setTitle(config.SSID); - pref.setKey(key); - pref.setOnPreferenceClickListener(clickListener); - pref.setPersistent(false); - pref.setChecked(prefValues.contains(key)); - selectedNetworks[i] = pref; - prefScreen.addPreference(pref); - } - } else { - Log.e(TAG, "Couldn't get list of configure Wi-Fi networks"); - } - } - - private void clearAutodownloadSelectedNetworsPreference() { - if (selectedNetworks != null) { - PreferenceScreen prefScreen = (PreferenceScreen) findPreference(AUTO_DL_PREF_SCREEN); - - for (int i = 0; i < selectedNetworks.length; i++) { - if (selectedNetworks[i] != null) { - prefScreen.removePreference(selectedNetworks[i]); - } - } - } - } - - @SuppressWarnings("deprecation") - @Override - public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, - Preference preference) { - super.onPreferenceTreeClick(preferenceScreen, preference); - if (preference != null) - if (preference instanceof PreferenceScreen) - if (((PreferenceScreen) preference).getDialog() != null) - ((PreferenceScreen) preference) - .getDialog() - .getWindow() - .getDecorView() - .setBackgroundDrawable( - this.getWindow().getDecorView() - .getBackground().getConstantState() - .newDrawable() - ); - return false; - } - - @Override - public void onBackPressed() { - // The default back button behavior has to be overwritten because changing the theme clears the back stack - Intent destIntent = new Intent(this, MainActivity.class); - destIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - startActivity(destIntent); - finish(); } } diff --git a/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivityGingerbread.java b/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivityGingerbread.java new file mode 100644 index 000000000..c58593f77 --- /dev/null +++ b/app/src/main/java/de/danoeh/antennapod/activity/PreferenceActivityGingerbread.java @@ -0,0 +1,96 @@ +package de.danoeh.antennapod.activity; + +import android.annotation.SuppressLint; +import android.app.Activity; +import android.content.Intent; +import android.content.res.Resources.Theme; +import android.os.Bundle; +import android.preference.Preference; +import android.preference.PreferenceScreen; + +import de.danoeh.antennapod.R; +import de.danoeh.antennapod.core.preferences.UserPreferences; +import de.danoeh.antennapod.preferences.PreferenceController; + +/** + * PreferenceActivity for API 10. In order to change the behavior of the preference UI, see + * PreferenceController. + */ +public class PreferenceActivityGingerbread extends android.preference.PreferenceActivity { + private static final String TAG = "PreferenceActivity"; + + private PreferenceController preferenceController; + + private final PreferenceController.PreferenceUI preferenceUI = new PreferenceController.PreferenceUI() { + + @SuppressWarnings("deprecation") + @Override + public Preference findPreference(CharSequence key) { + return PreferenceActivityGingerbread.this.findPreference(key); + } + + @Override + public Activity getActivity() { + return PreferenceActivityGingerbread.this; + } + }; + + @SuppressLint("NewApi") + @SuppressWarnings("deprecation") + @Override + public void onCreate(Bundle savedInstanceState) { + setTheme(UserPreferences.getTheme()); + super.onCreate(savedInstanceState); + + addPreferencesFromResource(R.xml.preferences); + preferenceController = new PreferenceController(preferenceUI); + preferenceController.onCreate(); + } + + + @Override + protected void onResume() { + super.onResume(); + preferenceController.onResume(); + } + + @Override + protected void onApplyThemeResource(Theme theme, int resid, boolean first) { + theme.applyStyle(UserPreferences.getTheme(), true); + } + + @Override + protected void onActivityResult(int requestCode, int resultCode, Intent data) { + super.onActivityResult(requestCode, resultCode, data); + preferenceController.onActivityResult(requestCode, resultCode, data); + } + + @SuppressWarnings("deprecation") + @Override + public boolean onPreferenceTreeClick(PreferenceScreen preferenceScreen, + Preference preference) { + super.onPreferenceTreeClick(preferenceScreen, preference); + if (preference != null) + if (preference instanceof PreferenceScreen) + if (((PreferenceScreen) preference).getDialog() != null) + ((PreferenceScreen) preference) + .getDialog() + .getWindow() + .getDecorView() + .setBackgroundDrawable( + this.getWindow().getDecorView() + .getBackground().getConstantState() + .newDrawable() + ); + return false; + } + + @Override + public void onBackPressed() { + // The default back button behavior has to be overwritten because changing the theme clears the back stack + Intent destIntent = new Intent(this, MainActivity.class); + destIntent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + startActivity(destIntent); + finish(); + } +} diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/ActionButtonUtils.java b/app/src/main/java/de/danoeh/antennapod/adapter/ActionButtonUtils.java index fecddeaf4..c35bb9694 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/ActionButtonUtils.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/ActionButtonUtils.java @@ -27,7 +27,7 @@ public class ActionButtonUtils { this.context = context; drawables = context.obtainStyledAttributes(new int[]{ - R.attr.av_play, R.attr.navigation_cancel, R.attr.av_download, R.attr.navigation_chapters, R.attr.navigation_accept}); + R.attr.av_play, R.attr.navigation_cancel, R.attr.av_download, R.attr.av_pause, R.attr.navigation_accept}); labels = new int[]{R.string.play_label, R.string.cancel_download_label, R.string.download_label, R.string.mark_read_label}; } diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/AdapterUtils.java b/app/src/main/java/de/danoeh/antennapod/adapter/AdapterUtils.java index c3902639a..e22b31361 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/AdapterUtils.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/AdapterUtils.java @@ -4,7 +4,7 @@ import android.content.res.Resources; import android.view.View; import android.widget.ProgressBar; import android.widget.TextView; -import de.danoeh.antennapod.R; + import de.danoeh.antennapod.core.feed.FeedItem; import de.danoeh.antennapod.core.feed.FeedMedia; import de.danoeh.antennapod.core.util.Converter; @@ -44,13 +44,9 @@ public class AdapterUtils { - media.getPosition())); } } else if (!media.isDownloaded()) { - txtvPos.setText(res.getString( - R.string.size_prefix) - + Converter.byteToString(media.getSize())); + txtvPos.setText(Converter.byteToString(media.getSize())); } else { - txtvPos.setText(res.getString( - R.string.length_prefix) - + Converter.getDurationStringLong(media + txtvPos.setText(Converter.getDurationStringLong(media .getDuration())); } } diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/DownloadedEpisodesListAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadedEpisodesListAdapter.java index 8785916a0..3af9bdcda 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/DownloadedEpisodesListAdapter.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadedEpisodesListAdapter.java @@ -72,7 +72,7 @@ public class DownloadedEpisodesListAdapter extends BaseAdapter { } holder.title.setText(item.getTitle()); - holder.pubDate.setText(DateUtils.formatDateTime(context, item.getPubDate().getTime(), DateUtils.FORMAT_SHOW_DATE)); + holder.pubDate.setText(DateUtils.formatDateTime(context, item.getPubDate().getTime(), DateUtils.FORMAT_ABBREV_ALL)); holder.txtvSize.setText(Converter.byteToString(item.getMedia().getSize())); FeedItem.State state = item.getState(); diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/DownloadlistAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadlistAdapter.java index 4257c6eb9..206d07f0f 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/DownloadlistAdapter.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/DownloadlistAdapter.java @@ -8,6 +8,7 @@ import android.widget.BaseAdapter; import android.widget.ImageButton; import android.widget.ProgressBar; import android.widget.TextView; + import de.danoeh.antennapod.R; import de.danoeh.antennapod.core.service.download.DownloadRequest; import de.danoeh.antennapod.core.service.download.DownloadStatus; @@ -49,7 +50,7 @@ public class DownloadlistAdapter extends BaseAdapter { @Override public View getView(int position, View convertView, ViewGroup parent) { Holder holder; - Downloader downloader = getItem(position); + Downloader downloader = getItem(position); DownloadRequest request = downloader.getDownloadRequest(); // Inflate layout if (convertView == null) { @@ -58,8 +59,6 @@ public class DownloadlistAdapter extends BaseAdapter { .getSystemService(Context.LAYOUT_INFLATER_SERVICE); convertView = inflater.inflate(R.layout.downloadlist_item, parent, false); holder.title = (TextView) convertView.findViewById(R.id.txtvTitle); - holder.message = (TextView) convertView - .findViewById(R.id.txtvMessage); holder.downloaded = (TextView) convertView .findViewById(R.id.txtvDownloaded); holder.percent = (TextView) convertView @@ -82,9 +81,9 @@ public class DownloadlistAdapter extends BaseAdapter { } holder.title.setText(request.getTitle()); - if (request.getStatusMsg() != 0) { - holder.message.setText(request.getStatusMsg()); - } + + holder.progbar.setIndeterminate(request.getSoFar() <= 0); + String strDownloaded = Converter.byteToString(request.getSoFar()); if (request.getSize() != DownloadStatus.SIZE_UNKNOWN) { strDownloaded += " / " + Converter.byteToString(request.getSize()); @@ -115,7 +114,6 @@ public class DownloadlistAdapter extends BaseAdapter { static class Holder { TextView title; - TextView message; TextView downloaded; TextView percent; ProgressBar progbar; diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/ExternalEpisodesListAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/ExternalEpisodesListAdapter.java deleted file mode 100644 index 8b1ed9112..000000000 --- a/app/src/main/java/de/danoeh/antennapod/adapter/ExternalEpisodesListAdapter.java +++ /dev/null @@ -1,306 +0,0 @@ -package de.danoeh.antennapod.adapter; - -import android.content.Context; -import android.content.res.TypedArray; -import android.view.LayoutInflater; -import android.view.View; -import android.view.View.OnClickListener; -import android.view.ViewGroup; -import android.widget.BaseExpandableListAdapter; -import android.widget.ImageButton; -import android.widget.ImageView; -import android.widget.ProgressBar; -import android.widget.TextView; - -import de.danoeh.antennapod.R; -import de.danoeh.antennapod.core.asynctask.PicassoProvider; -import de.danoeh.antennapod.core.feed.FeedItem; -import de.danoeh.antennapod.core.feed.FeedMedia; -import de.danoeh.antennapod.core.storage.DownloadRequester; -import de.danoeh.antennapod.core.util.Converter; - -/** - * Displays unread items and items in the queue in one combined list. The - * structure of this list is: [header] [queueItems] [header] [unreadItems]. - */ -public class ExternalEpisodesListAdapter extends BaseExpandableListAdapter { - private static final String TAG = "ExternalEpisodesListAdapter"; - - public static final int GROUP_POS_QUEUE = 0; - public static final int GROUP_POS_UNREAD = 1; - - private Context context; - private ItemAccess itemAccess; - - private ActionButtonCallback feedItemActionCallback; - private OnGroupActionClicked groupActionCallback; - - private final int imageSize; - - public ExternalEpisodesListAdapter(Context context, - ActionButtonCallback callback, - OnGroupActionClicked groupActionCallback, - ItemAccess itemAccess) { - super(); - this.context = context; - this.itemAccess = itemAccess; - this.feedItemActionCallback = callback; - this.groupActionCallback = groupActionCallback; - this.imageSize = (int) context.getResources().getDimension(R.dimen.thumbnail_length); - } - - @Override - public boolean areAllItemsEnabled() { - return true; - } - - @Override - public FeedItem getChild(int groupPosition, int childPosition) { - if (groupPosition == GROUP_POS_QUEUE) { - return itemAccess.getQueueItemAt(childPosition); - } else if (groupPosition == GROUP_POS_UNREAD) { - return itemAccess.getUnreadItemAt(childPosition); - } - return null; - } - - @Override - public long getChildId(int groupPosition, int childPosition) { - return childPosition; - } - - @Override - public View getChildView(int groupPosition, final int childPosition, - boolean isLastChild, View convertView, ViewGroup parent) { - Holder holder; - final FeedItem item = getChild(groupPosition, childPosition); - - if (convertView == null) { - holder = new Holder(); - LayoutInflater inflater = (LayoutInflater) context - .getSystemService(Context.LAYOUT_INFLATER_SERVICE); - convertView = inflater.inflate(R.layout.external_itemlist_item, - parent, false); - holder.title = (TextView) convertView.findViewById(R.id.txtvTitle); - holder.feedTitle = (TextView) convertView - .findViewById(R.id.txtvFeedname); - holder.lenSize = (TextView) convertView - .findViewById(R.id.txtvLenSize); - holder.downloadStatus = (ImageView) convertView - .findViewById(R.id.imgvDownloadStatus); - holder.feedImage = (ImageView) convertView - .findViewById(R.id.imgvFeedimage); - holder.butAction = (ImageButton) convertView - .findViewById(R.id.butAction); - holder.statusPlaying = (View) convertView - .findViewById(R.id.statusPlaying); - holder.episodeProgress = (ProgressBar) convertView - .findViewById(R.id.pbar_episode_progress); - convertView.setTag(holder); - } else { - holder = (Holder) convertView.getTag(); - } - - holder.title.setText(item.getTitle()); - holder.feedTitle.setText(item.getFeed().getTitle()); - FeedItem.State state = item.getState(); - - if (groupPosition == GROUP_POS_QUEUE) { - switch (state) { - case PLAYING: - holder.statusPlaying.setVisibility(View.VISIBLE); - holder.episodeProgress.setVisibility(View.VISIBLE); - break; - case IN_PROGRESS: - holder.statusPlaying.setVisibility(View.GONE); - holder.episodeProgress.setVisibility(View.VISIBLE); - break; - case NEW: - holder.statusPlaying.setVisibility(View.GONE); - holder.episodeProgress.setVisibility(View.GONE); - break; - default: - holder.statusPlaying.setVisibility(View.GONE); - holder.episodeProgress.setVisibility(View.GONE); - break; - } - } else { - holder.statusPlaying.setVisibility(View.GONE); - holder.episodeProgress.setVisibility(View.GONE); - } - - FeedMedia media = item.getMedia(); - if (media != null) { - - if (state == FeedItem.State.PLAYING - || state == FeedItem.State.IN_PROGRESS) { - if (media.getDuration() > 0) { - holder.episodeProgress.setProgress((int) (((double) media - .getPosition()) / media.getDuration() * 100)); - holder.lenSize.setText(Converter - .getDurationStringLong(media.getDuration() - - media.getPosition())); - } - } else if (!media.isDownloaded()) { - holder.lenSize.setText(context.getString(R.string.size_prefix) - + Converter.byteToString(media.getSize())); - } else { - holder.lenSize.setText(context - .getString(R.string.length_prefix) - + Converter.getDurationStringLong(media.getDuration())); - } - - TypedArray drawables = context.obtainStyledAttributes(new int[]{ - R.attr.av_download, R.attr.navigation_refresh}); - final int[] labels = new int[]{R.string.status_downloaded_label, R.string.downloading_label}; - holder.lenSize.setVisibility(View.VISIBLE); - if (!media.isDownloaded()) { - if (DownloadRequester.getInstance().isDownloadingFile(media)) { - holder.downloadStatus.setVisibility(View.VISIBLE); - holder.downloadStatus.setImageDrawable(drawables - .getDrawable(1)); - holder.downloadStatus.setContentDescription(context.getString(labels[1])); - } else { - holder.downloadStatus.setVisibility(View.INVISIBLE); - } - } else { - holder.downloadStatus.setVisibility(View.VISIBLE); - holder.downloadStatus - .setImageDrawable(drawables.getDrawable(0)); - holder.downloadStatus.setContentDescription(context.getString(labels[0])); - } - } else { - holder.downloadStatus.setVisibility(View.INVISIBLE); - holder.lenSize.setVisibility(View.INVISIBLE); - } - - PicassoProvider.getMediaMetadataPicassoInstance(context) - .load(item.getImageUri()) - .fit() - .into(holder.feedImage); - - holder.butAction.setFocusable(false); - holder.butAction.setOnClickListener(new OnClickListener() { - - @Override - public void onClick(View v) { - feedItemActionCallback.onActionButtonPressed(item); - } - }); - - return convertView; - - } - - static class Holder { - TextView title; - TextView feedTitle; - TextView lenSize; - ImageView downloadStatus; - ImageView feedImage; - ImageButton butAction; - View statusPlaying; - ProgressBar episodeProgress; - } - - @Override - public int getChildrenCount(int groupPosition) { - if (groupPosition == GROUP_POS_QUEUE) { - return itemAccess.getQueueSize(); - } else if (groupPosition == GROUP_POS_UNREAD) { - return itemAccess.getUnreadItemsSize(); - } - return 0; - } - - @Override - public int getGroupCount() { - // Hide 'unread items' group if empty - if (itemAccess.getUnreadItemsSize() > 0) { - return 2; - } else { - return 1; - } - } - - @Override - public long getGroupId(int groupPosition) { - return groupPosition; - } - - @Override - public View getGroupView(final int groupPosition, boolean isExpanded, - View convertView, ViewGroup parent) { - LayoutInflater inflater = (LayoutInflater) context - .getSystemService(Context.LAYOUT_INFLATER_SERVICE); - convertView = inflater.inflate(R.layout.feeditemlist_header, parent, false); - TextView headerTitle = (TextView) convertView - .findViewById(0); - ImageButton actionButton = (ImageButton) convertView - .findViewById(R.id.butAction); - TextView numItems = (TextView) convertView.findViewById(0); - - String headerString = null; - int childrenCount = 0; - - if (groupPosition == 0) { - headerString = context.getString(R.string.queue_label); - childrenCount = getChildrenCount(GROUP_POS_QUEUE); - } else { - headerString = context.getString(R.string.waiting_list_label); - childrenCount = getChildrenCount(GROUP_POS_UNREAD); - } - headerTitle.setText(headerString); - if (childrenCount <= 0) { - numItems.setVisibility(View.INVISIBLE); - } else { - numItems.setVisibility(View.VISIBLE); - numItems.setText(Integer.toString(childrenCount)); - } - actionButton.setFocusable(false); - actionButton.setOnClickListener(new OnClickListener() { - - @Override - public void onClick(View v) { - groupActionCallback.onClick(getGroupId(groupPosition)); - } - }); - return convertView; - } - - @Override - public boolean isEmpty() { - return itemAccess.getUnreadItemsSize() == 0 - && itemAccess.getQueueSize() == 0; - } - - @Override - public Object getGroup(int groupPosition) { - return null; - } - - @Override - public boolean hasStableIds() { - return true; - } - - @Override - public boolean isChildSelectable(int groupPosition, int childPosition) { - return true; - } - - public interface OnGroupActionClicked { - public void onClick(long groupId); - } - - public static interface ItemAccess { - public int getQueueSize(); - - public int getUnreadItemsSize(); - - public FeedItem getQueueItemAt(int position); - - public FeedItem getUnreadItemAt(int position); - } - -} diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/FeedItemlistAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/FeedItemlistAdapter.java index 2f69e6580..8f1a838f9 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/FeedItemlistAdapter.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/FeedItemlistAdapter.java @@ -107,22 +107,22 @@ public class FeedItemlistAdapter extends BaseAdapter { FeedItem.State state = item.getState(); switch (state) { case PLAYING: - holder.statusUnread.setVisibility(View.GONE); + holder.statusUnread.setVisibility(View.INVISIBLE); holder.episodeProgress.setVisibility(View.VISIBLE); break; case IN_PROGRESS: - holder.statusUnread.setVisibility(View.GONE); + holder.statusUnread.setVisibility(View.INVISIBLE); holder.episodeProgress.setVisibility(View.VISIBLE); break; case NEW: holder.statusUnread.setVisibility(View.VISIBLE); break; default: - holder.statusUnread.setVisibility(View.GONE); + holder.statusUnread.setVisibility(View.INVISIBLE); break; } - holder.published.setText(DateUtils.formatDateTime(context, item.getPubDate().getTime(), DateUtils.FORMAT_SHOW_DATE)); + holder.published.setText(DateUtils.formatDateTime(context, item.getPubDate().getTime(), DateUtils.FORMAT_ABBREV_ALL)); FeedMedia media = item.getMedia(); @@ -145,6 +145,10 @@ public class FeedItemlistAdapter extends BaseAdapter { item.getMedia())) { holder.episodeProgress.setVisibility(View.VISIBLE); holder.episodeProgress.setProgress(((ItemAccess) itemAccess).getItemDownloadProgressPercent(item)); + holder.published.setVisibility(View.GONE); + } else { + holder.episodeProgress.setVisibility(View.GONE); + holder.published.setVisibility(View.VISIBLE); } TypedArray typeDrawables = context.obtainStyledAttributes( diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java index a917633e6..cbe7665fd 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/NavListAdapter.java @@ -10,6 +10,7 @@ import android.view.ViewGroup; import android.widget.BaseAdapter; import android.widget.ImageView; import android.widget.TextView; + import de.danoeh.antennapod.R; import de.danoeh.antennapod.core.asynctask.PicassoProvider; import de.danoeh.antennapod.core.feed.Feed; @@ -37,7 +38,7 @@ public class NavListAdapter extends BaseAdapter { this.context = context; TypedArray ta = context.obtainStyledAttributes(new int[]{R.attr.ic_new, R.attr.stat_playlist, - R.attr.av_download, R.attr.device_access_time, R.attr.content_new}); + R.attr.av_download, R.attr.ic_history, R.attr.content_new}); drawables = new Drawable[]{ta.getDrawable(0), ta.getDrawable(1), ta.getDrawable(2), ta.getDrawable(3), ta.getDrawable(4)}; ta.recycle(); @@ -54,7 +55,7 @@ public class NavListAdapter extends BaseAdapter { if (viewType == VIEW_TYPE_NAV) { return context.getString(NAV_TITLES[position]); } else if (viewType == VIEW_TYPE_SECTION_DIVIDER) { - return context.getString(R.string.podcasts_label); + return ""; } else { return itemAccess.getItem(position); } @@ -88,11 +89,11 @@ public class NavListAdapter extends BaseAdapter { if (viewType == VIEW_TYPE_NAV) { v = getNavView((String) getItem(position), position, convertView, parent); } else if (viewType == VIEW_TYPE_SECTION_DIVIDER) { - v = getSectionDividerView((String) getItem(position), position, convertView, parent); + v = getSectionDividerView(convertView, parent); } else { v = getFeedView(position - SUBSCRIPTION_OFFSET, convertView, parent); } - if (v != null) { + if (v != null && viewType != VIEW_TYPE_SECTION_DIVIDER) { TextView txtvTitle = (TextView) v.findViewById(R.id.txtvTitle); if (position == itemAccess.getSelectedItemIndex()) { txtvTitle.setTypeface(null, Typeface.BOLD); @@ -147,22 +148,11 @@ public class NavListAdapter extends BaseAdapter { return convertView; } - private View getSectionDividerView(String title, int position, View convertView, ViewGroup parent) { - SectionHolder holder; - if (convertView == null) { - holder = new SectionHolder(); - LayoutInflater inflater = (LayoutInflater) context - .getSystemService(Context.LAYOUT_INFLATER_SERVICE); - - convertView = inflater.inflate(R.layout.nav_section_item, parent, false); - - holder.title = (TextView) convertView.findViewById(R.id.txtvTitle); - convertView.setTag(holder); - } else { - holder = (SectionHolder) convertView.getTag(); - } + private View getSectionDividerView(View convertView, ViewGroup parent) { + LayoutInflater inflater = (LayoutInflater) context + .getSystemService(Context.LAYOUT_INFLATER_SERVICE); - holder.title.setText(title); + convertView = inflater.inflate(R.layout.nav_section_item, parent, false); convertView.setEnabled(false); convertView.setOnClickListener(null); @@ -204,10 +194,6 @@ public class NavListAdapter extends BaseAdapter { ImageView image; } - static class SectionHolder { - TextView title; - } - static class FeedHolder { TextView title; ImageView image; diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/NewEpisodesListAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/NewEpisodesListAdapter.java index a0829286c..171f82114 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/NewEpisodesListAdapter.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/NewEpisodesListAdapter.java @@ -86,9 +86,9 @@ public class NewEpisodesListAdapter extends BaseAdapter { } holder.title.setText(item.getTitle()); - holder.pubDate.setText(DateUtils.formatDateTime(context, item.getPubDate().getTime(), DateUtils.FORMAT_SHOW_DATE)); + holder.pubDate.setText(DateUtils.formatDateTime(context, item.getPubDate().getTime(), DateUtils.FORMAT_ABBREV_ALL)); if (item.isRead()) { - holder.statusUnread.setVisibility(View.GONE); + holder.statusUnread.setVisibility(View.INVISIBLE); } else { holder.statusUnread.setVisibility(View.VISIBLE); } @@ -99,6 +99,8 @@ public class NewEpisodesListAdapter extends BaseAdapter { if (media.getDuration() > 0) { holder.txtvDuration.setText(Converter.getDurationStringLong(media.getDuration())); + } else if (media.getSize() > 0) { + holder.txtvDuration.setText(Converter.byteToString(media.getSize())); } else { holder.txtvDuration.setText(""); } @@ -106,8 +108,10 @@ public class NewEpisodesListAdapter extends BaseAdapter { if (isDownloadingMedia) { holder.downloadProgress.setVisibility(View.VISIBLE); holder.txtvDuration.setVisibility(View.GONE); + holder.pubDate.setVisibility(View.GONE); } else { holder.txtvDuration.setVisibility(View.VISIBLE); + holder.pubDate.setVisibility(View.VISIBLE); holder.downloadProgress.setVisibility(View.GONE); } diff --git a/app/src/main/java/de/danoeh/antennapod/adapter/gpodnet/PodcastListAdapter.java b/app/src/main/java/de/danoeh/antennapod/adapter/gpodnet/PodcastListAdapter.java index 7bee8e861..8549f4f7a 100644 --- a/app/src/main/java/de/danoeh/antennapod/adapter/gpodnet/PodcastListAdapter.java +++ b/app/src/main/java/de/danoeh/antennapod/adapter/gpodnet/PodcastListAdapter.java @@ -39,7 +39,6 @@ public class PodcastListAdapter extends ArrayAdapter<GpodnetPodcast> { convertView = inflater.inflate(R.layout.gpodnet_podcast_listitem, parent, false); holder.title = (TextView) convertView.findViewById(R.id.txtvTitle); - holder.description = (TextView) convertView.findViewById(R.id.txtvDescription); holder.image = (ImageView) convertView.findViewById(R.id.imgvCover); convertView.setTag(holder); @@ -48,7 +47,6 @@ public class PodcastListAdapter extends ArrayAdapter<GpodnetPodcast> { } holder.title.setText(podcast.getTitle()); - holder.description.setText(podcast.getDescription()); if (StringUtils.isNoneBlank(podcast.getLogoUrl())) { PicassoProvider.getDefaultPicassoInstance(convertView.getContext()) @@ -62,7 +60,6 @@ public class PodcastListAdapter extends ArrayAdapter<GpodnetPodcast> { static class Holder { TextView title; - TextView description; ImageView image; } } diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/CompletedDownloadsFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/CompletedDownloadsFragment.java index 21e4cbd80..645e7ebd9 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/CompletedDownloadsFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/CompletedDownloadsFragment.java @@ -7,6 +7,8 @@ import android.os.Bundle; import android.support.v4.app.ListFragment; import android.view.View; import android.widget.ListView; + +import de.danoeh.antennapod.R; import de.danoeh.antennapod.adapter.DownloadedEpisodesListAdapter; import de.danoeh.antennapod.dialog.FeedItemDialog; import de.danoeh.antennapod.core.feed.EventDistributor; @@ -82,6 +84,13 @@ public class CompletedDownloadsFragment extends ListFragment { @Override public void onViewCreated(View view, Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); + + // add padding + final ListView lv = getListView(); + lv.setClipToPadding(false); + final int vertPadding = getResources().getDimensionPixelSize(R.dimen.list_vertical_padding); + lv.setPadding(0, vertPadding, 0, vertPadding); + viewCreated = true; if (itemsLoaded && getActivity() != null) { onFragmentLoaded(); diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/DownloadLogFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/DownloadLogFragment.java index 9c7fade67..c40fce351 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/DownloadLogFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/DownloadLogFragment.java @@ -5,6 +5,9 @@ import android.os.AsyncTask; import android.os.Bundle; import android.support.v4.app.ListFragment; import android.view.View; +import android.widget.ListView; + +import de.danoeh.antennapod.R; import de.danoeh.antennapod.adapter.DownloadLogAdapter; import de.danoeh.antennapod.core.feed.EventDistributor; import de.danoeh.antennapod.core.service.download.DownloadStatus; @@ -40,6 +43,13 @@ public class DownloadLogFragment extends ListFragment { @Override public void onViewCreated(View view, Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); + + // add padding + final ListView lv = getListView(); + lv.setClipToPadding(false); + final int vertPadding = getResources().getDimensionPixelSize(R.dimen.list_vertical_padding); + lv.setPadding(0, vertPadding, 0, vertPadding); + viewsCreated = true; if (itemsLoaded) { onFragmentLoaded(); diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java index ab294ecfe..15f6e85e4 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/ItemlistFragment.java @@ -350,7 +350,6 @@ public class ItemlistFragment extends ListFragment { TextView txtvAuthor = (TextView) header.findViewById(R.id.txtvAuthor); ImageView imgvCover = (ImageView) header.findViewById(R.id.imgvCover); ImageButton butShowInfo = (ImageButton) header.findViewById(R.id.butShowInfo); - ImageButton butVisitWebsite = (ImageButton) header.findViewById(R.id.butVisitWebsite); txtvTitle.setText(feed.getTitle()); txtvAuthor.setText(feed.getAuthor()); @@ -360,18 +359,6 @@ public class ItemlistFragment extends ListFragment { .fit() .into(imgvCover); - if (feed.getLink() == null) { - butVisitWebsite.setVisibility(View.INVISIBLE); - } else { - butVisitWebsite.setVisibility(View.VISIBLE); - butVisitWebsite.setOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View v) { - Uri uri = Uri.parse(feed.getLink()); - startActivity(new Intent(Intent.ACTION_VIEW, uri)); - } - }); - } butShowInfo.setOnClickListener(new View.OnClickListener() { @Override public void onClick(View v) { diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/PlaybackHistoryFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/PlaybackHistoryFragment.java index 4a07ce2b7..e226c5c4f 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/PlaybackHistoryFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/PlaybackHistoryFragment.java @@ -112,6 +112,13 @@ public class PlaybackHistoryFragment extends ListFragment { @Override public void onViewCreated(View view, Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); + + // add padding + final ListView lv = getListView(); + lv.setClipToPadding(false); + final int vertPadding = getResources().getDimensionPixelSize(R.dimen.list_vertical_padding); + lv.setPadding(0, vertPadding, 0, vertPadding); + viewsCreated = true; if (itemsLoaded) { onFragmentLoaded(); diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/RunningDownloadsFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/RunningDownloadsFragment.java index 514b05efd..f578d4338 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/RunningDownloadsFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/RunningDownloadsFragment.java @@ -4,6 +4,9 @@ import android.os.Bundle; import android.os.Handler; import android.support.v4.app.ListFragment; import android.view.View; +import android.widget.ListView; + +import de.danoeh.antennapod.R; import de.danoeh.antennapod.adapter.DownloadlistAdapter; import de.danoeh.antennapod.core.asynctask.DownloadObserver; import de.danoeh.antennapod.core.service.download.Downloader; @@ -32,6 +35,13 @@ public class RunningDownloadsFragment extends ListFragment { @Override public void onViewCreated(View view, Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); + + // add padding + final ListView lv = getListView(); + lv.setClipToPadding(false); + final int vertPadding = getResources().getDimensionPixelSize(R.dimen.list_vertical_padding); + lv.setPadding(0, vertPadding, 0, vertPadding); + final DownloadlistAdapter downloadlistAdapter = new DownloadlistAdapter(getActivity(), itemAccess); setListAdapter(downloadlistAdapter); diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/SearchFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/SearchFragment.java index 7419b42ab..0f98a2780 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/SearchFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/SearchFragment.java @@ -108,6 +108,13 @@ public class SearchFragment extends ListFragment { @Override public void onViewCreated(View view, Bundle savedInstanceState) { super.onViewCreated(view, savedInstanceState); + + // add padding + final ListView lv = getListView(); + lv.setClipToPadding(false); + final int vertPadding = getResources().getDimensionPixelSize(R.dimen.list_vertical_padding); + lv.setPadding(0, vertPadding, 0, vertPadding); + ((ActionBarActivity) getActivity()).getSupportActionBar().setTitle(R.string.search_label); viewCreated = true; if (itemsLoaded) { diff --git a/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/TagFragment.java b/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/TagFragment.java index 7e02b647f..d39b69b3b 100644 --- a/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/TagFragment.java +++ b/app/src/main/java/de/danoeh/antennapod/fragment/gpodnet/TagFragment.java @@ -1,17 +1,18 @@ package de.danoeh.antennapod.fragment.gpodnet; +import android.app.Activity; import android.os.Bundle; import org.apache.commons.lang3.Validate; +import java.util.List; + import de.danoeh.antennapod.activity.MainActivity; import de.danoeh.antennapod.core.gpoddernet.GpodnetService; import de.danoeh.antennapod.core.gpoddernet.GpodnetServiceException; import de.danoeh.antennapod.core.gpoddernet.model.GpodnetPodcast; import de.danoeh.antennapod.core.gpoddernet.model.GpodnetTag; -import java.util.List; - /** * Shows all podcasts from gpodder.net that belong to a specific tag. * Use the newInstance method of this class to create a new TagFragment. @@ -40,6 +41,11 @@ public class TagFragment extends PodcastListFragment { Validate.isTrue(args != null && args.getString("tag") != null, "args invalid"); tag = new GpodnetTag(args.getString("tag")); + } + + @Override + public void onAttach(Activity activity) { + super.onAttach(activity); ((MainActivity) getActivity()).getMainActivtyActionBar().setTitle(tag.getName()); } diff --git a/app/src/main/java/de/danoeh/antennapod/menuhandler/FeedMenuHandler.java b/app/src/main/java/de/danoeh/antennapod/menuhandler/FeedMenuHandler.java index 62ae28820..e382a5888 100644 --- a/app/src/main/java/de/danoeh/antennapod/menuhandler/FeedMenuHandler.java +++ b/app/src/main/java/de/danoeh/antennapod/menuhandler/FeedMenuHandler.java @@ -7,80 +7,73 @@ import android.util.Log; import android.view.Menu; import android.view.MenuInflater; import android.view.MenuItem; -import de.danoeh.antennapod.core.BuildConfig; + import de.danoeh.antennapod.R; +import de.danoeh.antennapod.core.BuildConfig; import de.danoeh.antennapod.core.feed.Feed; -import de.danoeh.antennapod.core.service.download.DownloadService; import de.danoeh.antennapod.core.storage.DBTasks; import de.danoeh.antennapod.core.storage.DBWriter; import de.danoeh.antennapod.core.storage.DownloadRequestException; -import de.danoeh.antennapod.core.storage.DownloadRequester; import de.danoeh.antennapod.core.util.ShareUtils; -/** Handles interactions with the FeedItemMenu. */ +/** + * Handles interactions with the FeedItemMenu. + */ public class FeedMenuHandler { - private static final String TAG = "FeedMenuHandler"; + private static final String TAG = "FeedMenuHandler"; - public static boolean onCreateOptionsMenu(MenuInflater inflater, Menu menu) { - inflater.inflate(R.menu.feedlist, menu); - return true; - } + public static boolean onCreateOptionsMenu(MenuInflater inflater, Menu menu) { + inflater.inflate(R.menu.feedlist, menu); + return true; + } - public static boolean onPrepareOptionsMenu(Menu menu, Feed selectedFeed) { + public static boolean onPrepareOptionsMenu(Menu menu, Feed selectedFeed) { if (selectedFeed == null) { return true; } - if (BuildConfig.DEBUG) - Log.d(TAG, "Preparing options menu"); - menu.findItem(R.id.mark_all_read_item).setVisible( - selectedFeed.hasNewItems(true)); - if (selectedFeed.getPaymentLink() != null && selectedFeed.getFlattrStatus().flattrable()) - menu.findItem(R.id.support_item).setVisible(true); - else - menu.findItem(R.id.support_item).setVisible(false); - MenuItem refresh = menu.findItem(R.id.refresh_item); - if (DownloadService.isRunning - && DownloadRequester.getInstance().isDownloadingFile( - selectedFeed)) { - refresh.setVisible(false); - } else { - refresh.setVisible(true); - } + if (BuildConfig.DEBUG) + Log.d(TAG, "Preparing options menu"); + menu.findItem(R.id.mark_all_read_item).setVisible( + selectedFeed.hasNewItems(true)); + if (selectedFeed.getPaymentLink() != null && selectedFeed.getFlattrStatus().flattrable()) + menu.findItem(R.id.support_item).setVisible(true); + else + menu.findItem(R.id.support_item).setVisible(false); - return true; - } + return true; + } - /** - * NOTE: This method does not handle clicks on the 'remove feed' - item. - * - * @throws DownloadRequestException - */ - public static boolean onOptionsItemClicked(Context context, MenuItem item, - Feed selectedFeed) throws DownloadRequestException { - switch (item.getItemId()) { - case R.id.refresh_item: - DBTasks.refreshFeed(context, selectedFeed); - break; - case R.id.mark_all_read_item: - DBWriter.markFeedRead(context, selectedFeed.getId()); - break; - case R.id.visit_website_item: - Uri uri = Uri.parse(selectedFeed.getLink()); - context.startActivity(new Intent(Intent.ACTION_VIEW, uri)); - break; - case R.id.support_item: - DBTasks.flattrFeedIfLoggedIn(context, selectedFeed); - break; - case R.id.share_link_item: - ShareUtils.shareFeedlink(context, selectedFeed); - break; - case R.id.share_source_item: - ShareUtils.shareFeedDownloadLink(context, selectedFeed); - break; - default: - return false; - } - return true; - } + /** + * NOTE: This method does not handle clicks on the 'remove feed' - item. + * + * @throws DownloadRequestException + */ + public static boolean onOptionsItemClicked(Context context, MenuItem item, + Feed selectedFeed) throws DownloadRequestException { + switch (item.getItemId()) { + case R.id.refresh_item: + DBTasks.refreshFeed(context, selectedFeed); + break; + case R.id.mark_all_read_item: + DBWriter.markFeedRead(context, selectedFeed.getId()); + break; + case R.id.visit_website_item: + Uri uri = Uri.parse(selectedFeed.getLink()); + context.startActivity(new Intent(Intent.ACTION_VIEW, uri)); + break; + case R.id.support_item: + DBTasks.flattrFeedIfLoggedIn(context, selectedFeed); + break; + case R.id.share_link_item: + ShareUtils.shareFeedlink(context, selectedFeed); + break; + case R.id.share_source_item: + ShareUtils.shareFeedDownloadLink(context, selectedFeed); + break; + default: + return false; + } + return true; + } } diff --git a/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java new file mode 100644 index 000000000..41930a7f2 --- /dev/null +++ b/app/src/main/java/de/danoeh/antennapod/preferences/PreferenceController.java @@ -0,0 +1,494 @@ +package de.danoeh.antennapod.preferences; + +import android.app.Activity; +import android.content.Context; +import android.content.DialogInterface; +import android.content.Intent; +import android.content.res.Resources; +import android.net.wifi.WifiConfiguration; +import android.net.wifi.WifiManager; +import android.os.Build; +import android.preference.CheckBoxPreference; +import android.preference.ListPreference; +import android.preference.Preference; +import android.preference.PreferenceScreen; +import android.util.Log; +import android.widget.Toast; + +import java.io.File; +import java.util.ArrayList; +import java.util.Arrays; +import java.util.List; + +import de.danoeh.antennapod.BuildConfig; +import de.danoeh.antennapod.R; +import de.danoeh.antennapod.activity.AboutActivity; +import de.danoeh.antennapod.activity.DirectoryChooserActivity; +import de.danoeh.antennapod.activity.PreferenceActivity; +import de.danoeh.antennapod.activity.PreferenceActivityGingerbread; +import de.danoeh.antennapod.asynctask.OpmlExportWorker; +import de.danoeh.antennapod.core.asynctask.FlattrClickWorker; +import de.danoeh.antennapod.core.preferences.GpodnetPreferences; +import de.danoeh.antennapod.core.preferences.UserPreferences; +import de.danoeh.antennapod.core.util.flattr.FlattrStatus; +import de.danoeh.antennapod.core.util.flattr.FlattrUtils; +import de.danoeh.antennapod.core.util.flattr.SimpleFlattrThing; +import de.danoeh.antennapod.dialog.AuthenticationDialog; +import de.danoeh.antennapod.dialog.AutoFlattrPreferenceDialog; +import de.danoeh.antennapod.dialog.GpodnetSetHostnameDialog; +import de.danoeh.antennapod.dialog.VariableSpeedDialog; + +/** + * Sets up a preference UI that lets the user change user preferences. + */ +public class PreferenceController { + private static final String TAG = "PreferenceController"; + public static final String PREF_FLATTR_THIS_APP = "prefFlattrThisApp"; + public static final String PREF_FLATTR_SETTINGS = "prefFlattrSettings"; + public static final String PREF_FLATTR_AUTH = "pref_flattr_authenticate"; + public static final String PREF_FLATTR_REVOKE = "prefRevokeAccess"; + public static final String PREF_AUTO_FLATTR_PREFS = "prefAutoFlattrPrefs"; + public static final String PREF_OPML_EXPORT = "prefOpmlExport"; + public static final String PREF_ABOUT = "prefAbout"; + public static final String PREF_CHOOSE_DATA_DIR = "prefChooseDataDir"; + public static final String AUTO_DL_PREF_SCREEN = "prefAutoDownloadSettings"; + public static final String PREF_PLAYBACK_SPEED_LAUNCHER = "prefPlaybackSpeedLauncher"; + public static final String PREF_GPODNET_LOGIN = "pref_gpodnet_authenticate"; + public static final String PREF_GPODNET_SETLOGIN_INFORMATION = "pref_gpodnet_setlogin_information"; + public static final String PREF_GPODNET_LOGOUT = "pref_gpodnet_logout"; + public static final String PREF_GPODNET_HOSTNAME = "pref_gpodnet_hostname"; + public static final String PREF_EXPANDED_NOTIFICATION = "prefExpandNotify"; + private static final String PREF_PERSISTENT_NOTIFICATION = "prefPersistNotify"; + + + private final PreferenceUI ui; + + private CheckBoxPreference[] selectedNetworks; + + public PreferenceController(PreferenceUI ui) { + this.ui = ui; + } + + /** + * Returns the preference activity that should be used on this device. + * + * @return PreferenceActivity if the API level is greater than 10, PreferenceActivityGingerbread otherwise. + */ + public static Class getPreferenceActivity() { + if (Build.VERSION.SDK_INT > 10) { + return PreferenceActivity.class; + } else { + return PreferenceActivityGingerbread.class; + } + } + + public void onCreate() { + final Activity activity = ui.getActivity(); + + if (android.os.Build.VERSION.SDK_INT < Build.VERSION_CODES.JELLY_BEAN) { + // disable expanded notification option on unsupported android versions + ui.findPreference(PreferenceController.PREF_EXPANDED_NOTIFICATION).setEnabled(false); + ui.findPreference(PreferenceController.PREF_EXPANDED_NOTIFICATION).setOnPreferenceClickListener( + new Preference.OnPreferenceClickListener() { + + @Override + public boolean onPreferenceClick(Preference preference) { + Toast toast = Toast.makeText(activity, R.string.pref_expand_notify_unsupport_toast, Toast.LENGTH_SHORT); + toast.show(); + return true; + } + } + ); + } + + ui.findPreference(PreferenceController.PREF_FLATTR_THIS_APP).setOnPreferenceClickListener( + new Preference.OnPreferenceClickListener() { + + @Override + public boolean onPreferenceClick(Preference preference) { + new FlattrClickWorker(activity, + new SimpleFlattrThing(activity.getString(R.string.app_name), + FlattrUtils.APP_URL, + new FlattrStatus(FlattrStatus.STATUS_QUEUE) + ) + ).executeAsync(); + + return true; + } + } + ); + + ui.findPreference(PreferenceController.PREF_FLATTR_REVOKE).setOnPreferenceClickListener( + new Preference.OnPreferenceClickListener() { + + @Override + public boolean onPreferenceClick(Preference preference) { + FlattrUtils.revokeAccessToken(activity); + checkItemVisibility(); + return true; + } + + } + ); + + ui.findPreference(PreferenceController.PREF_ABOUT).setOnPreferenceClickListener( + new Preference.OnPreferenceClickListener() { + + @Override + public boolean onPreferenceClick(Preference preference) { + activity.startActivity(new Intent( + activity, AboutActivity.class)); + return true; + } + + } + ); + + ui.findPreference(PreferenceController.PREF_OPML_EXPORT).setOnPreferenceClickListener( + new Preference.OnPreferenceClickListener() { + + @Override + public boolean onPreferenceClick(Preference preference) { + new OpmlExportWorker(activity) + .executeAsync(); + + return true; + } + } + ); + + ui.findPreference(PreferenceController.PREF_CHOOSE_DATA_DIR).setOnPreferenceClickListener( + new Preference.OnPreferenceClickListener() { + + @Override + public boolean onPreferenceClick(Preference preference) { + activity.startActivityForResult( + new Intent(activity, + DirectoryChooserActivity.class), + DirectoryChooserActivity.RESULT_CODE_DIR_SELECTED + ); + return true; + } + } + ); + ui.findPreference(UserPreferences.PREF_THEME) + .setOnPreferenceChangeListener( + new Preference.OnPreferenceChangeListener() { + + @Override + public boolean onPreferenceChange( + Preference preference, Object newValue) { + Intent i = activity.getIntent(); + i.setFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK + | Intent.FLAG_ACTIVITY_NEW_TASK); + activity.finish(); + activity.startActivity(i); + return true; + } + } + ); + ui.findPreference(UserPreferences.PREF_ENABLE_AUTODL) + .setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() { + @Override + public boolean onPreferenceChange(Preference preference, Object newValue) { + if (newValue instanceof Boolean) { + ui.findPreference(UserPreferences.PREF_ENABLE_AUTODL_WIFI_FILTER).setEnabled((Boolean) newValue); + setSelectedNetworksEnabled((Boolean) newValue && UserPreferences.isEnableAutodownloadWifiFilter()); + } + return true; + } + }); + ui.findPreference(UserPreferences.PREF_ENABLE_AUTODL_WIFI_FILTER) + .setOnPreferenceChangeListener( + new Preference.OnPreferenceChangeListener() { + + @Override + public boolean onPreferenceChange( + Preference preference, Object newValue) { + if (newValue instanceof Boolean) { + setSelectedNetworksEnabled((Boolean) newValue); + return true; + } else { + return false; + } + } + } + ); + ui.findPreference(UserPreferences.PREF_EPISODE_CACHE_SIZE) + .setOnPreferenceChangeListener( + new Preference.OnPreferenceChangeListener() { + @Override + public boolean onPreferenceChange(Preference preference, Object o) { + if (o instanceof String) { + setEpisodeCacheSizeText(UserPreferences.readEpisodeCacheSize((String) o)); + } + return true; + } + } + ); + ui.findPreference(PreferenceController.PREF_PLAYBACK_SPEED_LAUNCHER) + .setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() { + @Override + public boolean onPreferenceClick(Preference preference) { + VariableSpeedDialog.showDialog(activity); + return true; + } + }); + ui.findPreference(PreferenceController.PREF_GPODNET_SETLOGIN_INFORMATION).setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() { + @Override + public boolean onPreferenceClick(Preference preference) { + AuthenticationDialog dialog = new AuthenticationDialog(activity, + R.string.pref_gpodnet_setlogin_information_title, false, false, GpodnetPreferences.getUsername(), + null) { + + @Override + protected void onConfirmed(String username, String password, boolean saveUsernamePassword) { + GpodnetPreferences.setPassword(password); + } + }; + dialog.show(); + return true; + } + }); + ui.findPreference(PreferenceController.PREF_GPODNET_LOGOUT).setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() { + @Override + public boolean onPreferenceClick(Preference preference) { + GpodnetPreferences.logout(); + Toast toast = Toast.makeText(activity, R.string.pref_gpodnet_logout_toast, Toast.LENGTH_SHORT); + toast.show(); + updateGpodnetPreferenceScreen(); + return true; + } + }); + ui.findPreference(PreferenceController.PREF_GPODNET_HOSTNAME).setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() { + @Override + public boolean onPreferenceClick(Preference preference) { + GpodnetSetHostnameDialog.createDialog(activity).setOnDismissListener(new DialogInterface.OnDismissListener() { + @Override + public void onDismiss(DialogInterface dialog) { + updateGpodnetPreferenceScreen(); + } + }); + return true; + } + }); + + ui.findPreference(PreferenceController.PREF_AUTO_FLATTR_PREFS).setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() { + @Override + public boolean onPreferenceClick(Preference preference) { + AutoFlattrPreferenceDialog.newAutoFlattrPreferenceDialog(activity, + new AutoFlattrPreferenceDialog.AutoFlattrPreferenceDialogInterface() { + @Override + public void onCancelled() { + + } + + @Override + public void onConfirmed(boolean autoFlattrEnabled, float autoFlattrValue) { + UserPreferences.setAutoFlattrSettings(activity, autoFlattrEnabled, autoFlattrValue); + checkItemVisibility(); + } + }); + return true; + } + }); + buildUpdateIntervalPreference(); + buildAutodownloadSelectedNetworsPreference(); + setSelectedNetworksEnabled(UserPreferences + .isEnableAutodownloadWifiFilter()); + } + + public void onResume() { + checkItemVisibility(); + setEpisodeCacheSizeText(UserPreferences.getEpisodeCacheSize()); + setDataFolderText(); + updateGpodnetPreferenceScreen(); + } + + public void onActivityResult(int requestCode, int resultCode, Intent data) { + if (resultCode == DirectoryChooserActivity.RESULT_CODE_DIR_SELECTED) { + String dir = data + .getStringExtra(DirectoryChooserActivity.RESULT_SELECTED_DIR); + if (BuildConfig.DEBUG) + Log.d(TAG, "Setting data folder"); + UserPreferences.setDataFolder(dir); + } + } + + private void updateGpodnetPreferenceScreen() { + final boolean loggedIn = GpodnetPreferences.loggedIn(); + ui.findPreference(PreferenceController.PREF_GPODNET_LOGIN).setEnabled(!loggedIn); + ui.findPreference(PreferenceController.PREF_GPODNET_SETLOGIN_INFORMATION).setEnabled(loggedIn); + ui.findPreference(PreferenceController.PREF_GPODNET_LOGOUT).setEnabled(loggedIn); + ui.findPreference(PreferenceController.PREF_GPODNET_HOSTNAME).setSummary(GpodnetPreferences.getHostname()); + } + + private void buildUpdateIntervalPreference() { + final Resources res = ui.getActivity().getResources(); + + ListPreference pref = (ListPreference) ui.findPreference(UserPreferences.PREF_UPDATE_INTERVAL); + String[] values = res.getStringArray( + R.array.update_intervall_values); + String[] entries = new String[values.length]; + for (int x = 0; x < values.length; x++) { + Integer v = Integer.parseInt(values[x]); + switch (v) { + case 0: + entries[x] = res.getString(R.string.pref_update_interval_hours_manual); + break; + case 1: + entries[x] = v + + " " + + res.getString(R.string.pref_update_interval_hours_singular); + break; + default: + entries[x] = v + " " + + res.getString(R.string.pref_update_interval_hours_plural); + break; + + } + } + pref.setEntries(entries); + + } + + private void setSelectedNetworksEnabled(boolean b) { + if (selectedNetworks != null) { + for (Preference p : selectedNetworks) { + p.setEnabled(b); + } + } + } + + @SuppressWarnings("deprecation") + private void checkItemVisibility() { + + boolean hasFlattrToken = FlattrUtils.hasToken(); + + ui.findPreference(PreferenceController.PREF_FLATTR_SETTINGS).setEnabled(FlattrUtils.hasAPICredentials()); + ui.findPreference(PreferenceController.PREF_FLATTR_AUTH).setEnabled(!hasFlattrToken); + ui.findPreference(PreferenceController.PREF_FLATTR_REVOKE).setEnabled(hasFlattrToken); + ui.findPreference(PreferenceController.PREF_AUTO_FLATTR_PREFS).setEnabled(hasFlattrToken); + + ui.findPreference(UserPreferences.PREF_ENABLE_AUTODL_WIFI_FILTER) + .setEnabled(UserPreferences.isEnableAutodownload()); + setSelectedNetworksEnabled(UserPreferences.isEnableAutodownload() + && UserPreferences.isEnableAutodownloadWifiFilter()); + + } + + private void setEpisodeCacheSizeText(int cacheSize) { + final Resources res = ui.getActivity().getResources(); + + String s; + if (cacheSize == res.getInteger( + R.integer.episode_cache_size_unlimited)) { + s = res.getString(R.string.pref_episode_cache_unlimited); + } else { + s = Integer.toString(cacheSize) + + res.getString(R.string.episodes_suffix); + } + ui.findPreference(UserPreferences.PREF_EPISODE_CACHE_SIZE).setSummary(s); + } + + private void setDataFolderText() { + File f = UserPreferences.getDataFolder(ui.getActivity(), null); + if (f != null) { + ui.findPreference(PreferenceController.PREF_CHOOSE_DATA_DIR) + .setSummary(f.getAbsolutePath()); + } + } + + private void buildAutodownloadSelectedNetworsPreference() { + final Activity activity = ui.getActivity(); + + if (selectedNetworks != null) { + clearAutodownloadSelectedNetworsPreference(); + } + // get configured networks + WifiManager wifiservice = (WifiManager) activity.getSystemService(Context.WIFI_SERVICE); + List<WifiConfiguration> networks = wifiservice.getConfiguredNetworks(); + + if (networks != null) { + selectedNetworks = new CheckBoxPreference[networks.size()]; + List<String> prefValues = Arrays.asList(UserPreferences + .getAutodownloadSelectedNetworks()); + PreferenceScreen prefScreen = (PreferenceScreen) ui.findPreference(PreferenceController.AUTO_DL_PREF_SCREEN); + Preference.OnPreferenceClickListener clickListener = new Preference.OnPreferenceClickListener() { + + @Override + public boolean onPreferenceClick(Preference preference) { + if (preference instanceof CheckBoxPreference) { + String key = preference.getKey(); + ArrayList<String> prefValuesList = new ArrayList<String>( + Arrays.asList(UserPreferences + .getAutodownloadSelectedNetworks()) + ); + boolean newValue = ((CheckBoxPreference) preference) + .isChecked(); + if (BuildConfig.DEBUG) + Log.d(TAG, "Selected network " + key + + ". New state: " + newValue); + + int index = prefValuesList.indexOf(key); + if (index >= 0 && newValue == false) { + // remove network + prefValuesList.remove(index); + } else if (index < 0 && newValue == true) { + prefValuesList.add(key); + } + + UserPreferences.setAutodownloadSelectedNetworks( + activity, prefValuesList + .toArray(new String[prefValuesList + .size()]) + ); + return true; + } else { + return false; + } + } + }; + // create preference for each known network. attach listener and set + // value + for (int i = 0; i < networks.size(); i++) { + WifiConfiguration config = networks.get(i); + + CheckBoxPreference pref = new CheckBoxPreference(activity); + String key = Integer.toString(config.networkId); + pref.setTitle(config.SSID); + pref.setKey(key); + pref.setOnPreferenceClickListener(clickListener); + pref.setPersistent(false); + pref.setChecked(prefValues.contains(key)); + selectedNetworks[i] = pref; + prefScreen.addPreference(pref); + } + } else { + Log.e(TAG, "Couldn't get list of configure Wi-Fi networks"); + } + } + + private void clearAutodownloadSelectedNetworsPreference() { + if (selectedNetworks != null) { + PreferenceScreen prefScreen = (PreferenceScreen) ui.findPreference(PreferenceController.AUTO_DL_PREF_SCREEN); + + for (int i = 0; i < selectedNetworks.length; i++) { + if (selectedNetworks[i] != null) { + prefScreen.removePreference(selectedNetworks[i]); + } + } + } + } + + + public static interface PreferenceUI { + + /** + * Finds a preference based on its key. + */ + public Preference findPreference(CharSequence key); + + public Activity getActivity(); + } +} diff --git a/app/src/main/java/de/danoeh/antennapod/service/PlayerWidgetService.java b/app/src/main/java/de/danoeh/antennapod/service/PlayerWidgetService.java index 4622e2f79..55dfdc20b 100644 --- a/app/src/main/java/de/danoeh/antennapod/service/PlayerWidgetService.java +++ b/app/src/main/java/de/danoeh/antennapod/service/PlayerWidgetService.java @@ -104,12 +104,12 @@ public class PlayerWidgetService extends Service { if (progressString != null) { views.setTextViewText(R.id.txtvProgress, progressString); } - views.setImageViewResource(R.id.butPlay, R.drawable.av_pause_dark); + views.setImageViewResource(R.id.butPlay, R.drawable.ic_pause_white_24dp); if (Build.VERSION.SDK_INT >= 15) { views.setContentDescription(R.id.butPlay, getString(R.string.pause_label)); } } else { - views.setImageViewResource(R.id.butPlay, R.drawable.av_play_dark); + views.setImageViewResource(R.id.butPlay, R.drawable.ic_play_arrow_white_24dp); if (Build.VERSION.SDK_INT >= 15) { views.setContentDescription(R.id.butPlay, getString(R.string.play_label)); } @@ -120,7 +120,7 @@ public class PlayerWidgetService extends Service { views.setViewVisibility(R.id.txtvProgress, View.INVISIBLE); views.setTextViewText(R.id.txtvTitle, this.getString(R.string.no_media_playing_label)); - views.setImageViewResource(R.id.butPlay, R.drawable.av_play); + views.setImageViewResource(R.id.butPlay, R.drawable.ic_play_arrow_white_24dp); } diff --git a/app/src/main/res/layout-land/audioplayer_activity.xml b/app/src/main/res/layout-land/audioplayer_activity.xml index 8f8fdbee3..1f78902c9 100644 --- a/app/src/main/res/layout-land/audioplayer_activity.xml +++ b/app/src/main/res/layout-land/audioplayer_activity.xml @@ -36,7 +36,7 @@ android:layout_width="60dp" android:layout_height="match_parent" android:layout_alignParentLeft="true" - android:background="?attr/borderless_button" + android:background="?attr/selectableItemBackground" android:padding="4dp"/> <ImageButton @@ -45,7 +45,7 @@ android:layout_width="60dp" android:layout_height="match_parent" android:layout_alignParentRight="true" - android:background="?attr/borderless_button" + android:background="?attr/selectableItemBackground" android:padding="4dp"/> <TextView @@ -101,7 +101,7 @@ android:layout_width="80dp" android:layout_height="match_parent" android:layout_centerHorizontal="true" - android:background="?attr/borderless_button" + android:background="?attr/selectableItemBackground" android:src="?attr/av_pause"/> <ImageButton @@ -110,8 +110,8 @@ android:layout_width="60dp" android:layout_height="match_parent" android:layout_toLeftOf="@id/butPlay" - android:background="?attr/borderless_button" - android:src="?attr/av_rewind"/> + android:background="?attr/selectableItemBackground" + android:src="?attr/av_rew_big"/> <ImageButton android:id="@+id/butFF" @@ -119,15 +119,15 @@ android:layout_width="60dp" android:layout_height="match_parent" android:layout_toRightOf="@id/butPlay" - android:background="?attr/borderless_button" - android:src="?attr/av_fast_forward"/> + android:background="?attr/selectableItemBackground" + android:src="?attr/av_ff_big"/> <Button android:id="@+id/butPlaybackSpeed" android:layout_width="60dp" android:layout_height="match_parent" android:layout_toRightOf="@id/butFF" - android:background="?attr/borderless_button" + android:background="?attr/selectableItemBackground" android:src="?attr/av_fast_forward" android:textColor="@color/gray" android:textSize="@dimen/text_size_medium" @@ -183,15 +183,6 @@ </LinearLayout> - <ListView - android:id="@+id/nav_list" - android:layout_width="@dimen/drawer_width" - android:layout_height="match_parent" - android:layout_gravity="start" - android:choiceMode="singleChoice" - android:background="?attr/nav_drawer_background" - android:scrollbarStyle="outsideOverlay" - android:paddingLeft="8dp" - android:paddingRight="8dp"/> + <include layout="@layout/nav_list"/> </android.support.v4.widget.DrawerLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout-v14/directory_chooser.xml b/app/src/main/res/layout-v14/directory_chooser.xml index f0bef72e4..fb45d9937 100644 --- a/app/src/main/res/layout-v14/directory_chooser.xml +++ b/app/src/main/res/layout-v14/directory_chooser.xml @@ -61,7 +61,7 @@ android:layout_height="60dp" android:layout_alignParentLeft="true" android:layout_alignParentTop="true" - android:background="?attr/borderless_button" + android:background="?attr/selectableItemBackground" android:src="?attr/navigation_up" /> <TextView diff --git a/app/src/main/res/layout/audioplayer_activity.xml b/app/src/main/res/layout/audioplayer_activity.xml index a879aad55..770ced350 100644 --- a/app/src/main/res/layout/audioplayer_activity.xml +++ b/app/src/main/res/layout/audioplayer_activity.xml @@ -24,7 +24,7 @@ android:layout_width="60dp" android:layout_height="match_parent" android:layout_alignParentLeft="true" - android:background="?attr/borderless_button" + android:background="?attr/selectableItemBackground" android:padding="4dp"/> <ImageButton @@ -33,7 +33,7 @@ android:layout_width="60dp" android:layout_height="match_parent" android:layout_alignParentRight="true" - android:background="?attr/borderless_button" + android:background="?attr/selectableItemBackground" android:padding="4dp"/> <TextView @@ -76,7 +76,7 @@ android:layout_width="80dp" android:layout_height="match_parent" android:layout_centerHorizontal="true" - android:background="?attr/borderless_button" + android:background="?attr/selectableItemBackground" android:src="?attr/av_pause"/> <ImageButton @@ -85,8 +85,8 @@ android:layout_width="80dp" android:layout_height="match_parent" android:layout_toLeftOf="@id/butPlay" - android:background="?attr/borderless_button" - android:src="?attr/av_rewind"/> + android:background="?attr/selectableItemBackground" + android:src="?attr/av_rew_big"/> <ImageButton android:id="@+id/butFF" @@ -94,8 +94,8 @@ android:layout_width="80dp" android:layout_height="match_parent" android:layout_toRightOf="@id/butPlay" - android:background="?attr/borderless_button" - android:src="?attr/av_fast_forward"/> + android:background="?attr/selectableItemBackground" + android:src="?attr/av_ff_big"/> <Button android:id="@+id/butPlaybackSpeed" @@ -103,7 +103,7 @@ android:layout_width="80dp" android:layout_height="match_parent" android:layout_toRightOf="@id/butFF" - android:background="?attr/borderless_button" + android:background="?attr/selectableItemBackground" android:src="?attr/av_fast_forward" android:textColor="@color/gray" android:textSize="@dimen/text_size_medium" @@ -168,15 +168,6 @@ </RelativeLayout> - <ListView - android:id="@+id/nav_list" - android:layout_width="@dimen/drawer_width" - android:layout_height="match_parent" - android:layout_gravity="start" - android:choiceMode="singleChoice" - android:background="?attr/nav_drawer_background" - android:scrollbarStyle="outsideOverlay" - android:paddingLeft="8dp" - android:paddingRight="8dp"/> + <include layout="@layout/nav_list"/> </android.support.v4.widget.DrawerLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/directory_chooser.xml b/app/src/main/res/layout/directory_chooser.xml index 738c00842..7511c164a 100644 --- a/app/src/main/res/layout/directory_chooser.xml +++ b/app/src/main/res/layout/directory_chooser.xml @@ -39,7 +39,7 @@ android:layout_height="60dp" android:layout_alignParentLeft="true" android:layout_alignParentTop="true" - android:background="?attr/borderless_button" + android:background="?attr/selectableItemBackground" android:src="?attr/navigation_up" /> <TextView diff --git a/app/src/main/res/layout/downloaded_episodeslist_item.xml b/app/src/main/res/layout/downloaded_episodeslist_item.xml index 97003ce65..18db746b2 100644 --- a/app/src/main/res/layout/downloaded_episodeslist_item.xml +++ b/app/src/main/res/layout/downloaded_episodeslist_item.xml @@ -1,82 +1,69 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:orientation="horizontal" - android:layout_height="match_parent"> + android:layout_width="match_parent" + android:layout_height="@dimen/listitem_threeline_height" + android:orientation="horizontal"> + + <ImageView + android:id="@+id/imgvImage" + android:layout_width="@dimen/thumbnail_length_downloaded_item" + android:layout_height="@dimen/thumbnail_length_downloaded_item" + android:layout_gravity="center_vertical" + android:layout_marginBottom="@dimen/listitem_threeline_verticalpadding" + android:layout_marginLeft="@dimen/listitem_threeline_horizontalpadding" + android:layout_marginTop="@dimen/listitem_threeline_verticalpadding" + android:contentDescription="@string/cover_label" + android:scaleType="centerCrop" /> <RelativeLayout android:layout_width="0dp" android:layout_height="match_parent" - android:layout_weight="1" - android:layout_marginRight="8dp"> - - <ImageView - android:id="@+id/imgvImage" - android:contentDescription="@string/cover_label" - android:layout_width="@dimen/thumbnail_length_downloaded_item" - android:layout_height="@dimen/thumbnail_length_downloaded_item" - android:layout_alignParentLeft="true" - android:scaleType="centerCrop"/> - - <TextView - android:id="@+id/txtvPublished" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginLeft="8dp" - android:layout_marginRight="8dp" - android:layout_alignParentTop="true" - android:layout_toRightOf="@id/imgvImage" - android:ellipsize="end" - android:maxLines="1" - android:textColor="?android:attr/textColorTertiary" - android:textSize="@dimen/text_size_micro"/> + android:layout_marginLeft="@dimen/listitem_threeline_textleftpadding" + android:layout_marginRight="@dimen/listitem_threeline_textrightpadding" + android:layout_marginTop="@dimen/listitem_threeline_verticalpadding" + android:layout_weight="1"> <TextView android:id="@+id/txtvTitle" + style="@style/AntennaPod.TextView.ListItemPrimaryTitle" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_below="@id/txtvPublished" - android:layout_marginLeft="8dp" - android:layout_marginRight="4dp" - android:layout_marginTop="2dp" - android:layout_toRightOf="@id/imgvImage" - android:layout_centerVertical="true" + android:layout_alignParentLeft="true" android:layout_alignParentRight="true" - android:ellipsize="end" - android:lines="2" - android:textColor="?android:attr/textColorPrimary" - android:textSize="@dimen/text_size_small"/> + android:layout_alignParentTop="true" + android:layout_centerVertical="true" + android:layout_marginBottom="4dp" /> <TextView android:id="@+id/txtvSize" + style="@style/AntennaPod.TextView.ListItemSecondaryTitle" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentLeft="true" + android:layout_below="@id/txtvTitle" /> + + <TextView + android:id="@+id/txtvPublished" + style="@style/AntennaPod.TextView.ListItemSecondaryTitle" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginLeft="8dp" - android:layout_marginRight="8dp" android:layout_alignParentRight="true" - android:layout_alignParentTop="true" - android:textColor="?android:attr/textColorTertiary" - android:textSize="@dimen/text_size_micro"/> + android:layout_below="@id/txtvTitle" /> + </RelativeLayout> - <View - android:layout_width="1dp" - android:layout_height="match_parent" - android:background="@drawable/vertical_divider" - android:layout_marginTop="8dp" - android:layout_marginBottom="8dp"/> + <include layout="@layout/vertical_list_divider"/> <ImageButton android:id="@+id/butSecondaryAction" + android:layout_width="@dimen/listview_secondary_button_width" + android:layout_height="match_parent" + android:background="?attr/selectableItemBackground" + android:clickable="false" android:contentDescription="@string/remove_episode_lable" android:focusable="false" - android:clickable="false" android:focusableInTouchMode="false" - android:layout_width="@dimen/listview_secondary_button_width" - android:layout_height="match_parent" - android:background="?attr/borderless_button" - android:src="?attr/content_discard" - /> + android:src="?attr/content_discard" /> </LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/downloadlist_item.xml b/app/src/main/res/layout/downloadlist_item.xml index 49e0ea471..df6ebf762 100644 --- a/app/src/main/res/layout/downloadlist_item.xml +++ b/app/src/main/res/layout/downloadlist_item.xml @@ -1,89 +1,76 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="horizontal"> + android:layout_width="match_parent" + android:layout_height="@dimen/listitem_threeline_height" + android:orientation="horizontal"> <LinearLayout - android:layout_width="0dp" - android:layout_weight="1" - android:layout_height="match_parent" - android:orientation="vertical"> + android:layout_width="0dp" + android:layout_height="match_parent" + android:layout_weight="1" + android:orientation="vertical"> <TextView android:id="@+id/txtvTitle" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginLeft="8dp" - android:layout_marginTop="8dp" - android:textSize="@dimen/text_size_small" - android:lines="1" + android:layout_marginLeft="@dimen/listitem_threeline_horizontalpadding" + android:layout_marginTop="@dimen/listitem_threeline_verticalpadding" android:ellipsize="end" - android:textColor="?android:attr/textColorPrimary"/> - - <TextView - android:id="@+id/txtvMessage" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:layout_margin="8dp" - android:textColor="?android:attr/textColorSecondary" - android:textSize="@dimen/text_size_micro" android:lines="1" - android:ellipsize="end"/> + android:textColor="?android:attr/textColorPrimary" + android:textSize="16sp" /> <ProgressBar android:id="@+id/progProgress" style="?android:attr/progressBarStyleHorizontal" android:layout_width="match_parent" android:layout_height="16dp" - android:layout_marginLeft="8dp" - android:layout_marginRight="8dp"/> + android:layout_marginBottom="4dp" + android:layout_marginLeft="@dimen/listitem_threeline_horizontalpadding" + android:layout_marginRight="@dimen/listitem_threeline_horizontalpadding" + android:layout_marginTop="4dp" /> <RelativeLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_margin="8dp"> + android:layout_marginBottom="@dimen/listitem_threeline_verticalpadding" + android:layout_marginLeft="@dimen/listitem_threeline_horizontalpadding" + android:layout_marginRight="@dimen/listitem_threeline_horizontalpadding"> <TextView android:id="@+id/txtvDownloaded" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textSize="@dimen/text_size_small" - android:lines="1" + android:layout_alignParentLeft="true" android:ellipsize="end" + android:lines="1" android:textColor="?android:attr/textColorPrimary" - android:layout_alignParentLeft="true"/> + android:textSize="@dimen/text_size_small" /> <TextView android:id="@+id/txtvPercent" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textSize="@dimen/text_size_small" - android:lines="1" + android:layout_alignParentRight="true" android:ellipsize="end" + android:lines="1" android:textColor="?android:attr/textColorPrimary" - android:layout_alignParentRight="true"/> + android:textSize="@dimen/text_size_small" /> </RelativeLayout> </LinearLayout> - - <View - android:layout_width="1dp" - android:layout_height="match_parent" - android:background="@drawable/vertical_divider" - android:layout_marginTop="8dp" - android:layout_marginBottom="8dp"/> + <include layout="@layout/vertical_list_divider"/> <ImageButton android:id="@+id/butSecondaryAction" + android:layout_width="@dimen/listview_secondary_button_width" + android:layout_height="match_parent" + android:background="?attr/selectableItemBackground" + android:clickable="false" android:contentDescription="@string/cancel_download_label" android:focusable="false" - android:clickable="false" android:focusableInTouchMode="false" - android:layout_width="@dimen/listview_secondary_button_width" - android:layout_height="match_parent" - android:background="?attr/borderless_button" - android:src="?attr/navigation_cancel" - /> + android:src="?attr/navigation_cancel" /> </LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/downloadlog_item.xml b/app/src/main/res/layout/downloadlog_item.xml index 22d669097..c2ef93c71 100644 --- a/app/src/main/res/layout/downloadlog_item.xml +++ b/app/src/main/res/layout/downloadlog_item.xml @@ -1,61 +1,55 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" - android:layout_height="match_parent" - android:orientation="vertical" > + android:layout_height="wrap_content" + android:orientation="vertical"> <RelativeLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginBottom="4dp" - android:layout_marginLeft="8dp" - android:layout_marginRight="8dp" - android:layout_marginTop="4dp" > + android:layout_marginLeft="@dimen/listitem_threeline_horizontalpadding" + android:layout_marginRight="@dimen/listitem_threeline_horizontalpadding" + android:layout_marginTop="@dimen/listitem_threeline_verticalpadding"> <TextView android:id="@+id/txtvType" + style="@style/AntennaPod.TextView.ListItemSecondaryTitle" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentRight="true" - android:layout_marginRight="8dp" - android:textSize="@dimen/text_size_small" - android:textColor="?android:attr/textColorTertiary" /> + android:layout_marginLeft="@dimen/listitem_threeline_textleftpadding" /> <TextView android:id="@+id/txtvTitle" + style="@style/AntennaPod.TextView.ListItemPrimaryTitle" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_alignParentLeft="true" android:layout_alignParentTop="true" - android:layout_toLeftOf="@id/txtvType" - android:textColor="?android:attr/textColorPrimary" - android:textSize="@dimen/text_size_medium" - android:ellipsize="end" - android:maxLines="2" /> + android:layout_toLeftOf="@id/txtvType" /> </RelativeLayout> <RelativeLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_margin="8dp" - > - <TextView - android:id="@+id/txtvDate" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginRight="8dp" - android:lines="1" - android:textColor="?android:attr/textColorTertiary" - android:textSize="@dimen/text_size_small" - android:layout_alignParentLeft="true"/> + android:layout_marginBottom="@dimen/listitem_threeline_verticalpadding" + android:layout_marginLeft="@dimen/listitem_threeline_horizontalpadding" + android:layout_marginRight="@dimen/listitem_threeline_horizontalpadding"> - <TextView - android:id="@+id/txtvStatus" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:lines="1" - android:textSize="@dimen/text_size_small" - android:layout_alignParentRight="true"/> + <TextView + android:id="@+id/txtvDate" + style="@style/AntennaPod.TextView.ListItemSecondaryTitle" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentLeft="true" + android:layout_marginRight="8dp" /> + + <TextView + android:id="@+id/txtvStatus" + style="@style/AntennaPod.TextView.ListItemSecondaryTitle" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentRight="true" /> </RelativeLayout> @@ -63,9 +57,10 @@ android:id="@+id/txtvReason" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_marginBottom="@dimen/listitem_threeline_verticalpadding" + android:layout_marginLeft="@dimen/listitem_threeline_horizontalpadding" + android:layout_marginRight="@dimen/listitem_threeline_horizontalpadding" android:textColor="?android:attr/textColorTertiary" - android:textSize="@dimen/text_size_micro" - android:layout_marginBottom="4dp" - android:layout_marginLeft="8dp" /> + android:textSize="@dimen/text_size_micro" /> </LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/external_itemlist_item.xml b/app/src/main/res/layout/external_itemlist_item.xml deleted file mode 100644 index 20c63c2cf..000000000 --- a/app/src/main/res/layout/external_itemlist_item.xml +++ /dev/null @@ -1,115 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:tools="http://schemas.android.com/tools" - android:layout_width="match_parent" - android:layout_height="match_parent" > - - <ImageView - android:id="@+id/imgvFeedimage" - android:contentDescription="@string/cover_label" - android:layout_width="@dimen/thumbnail_length_itemlist" - android:layout_height="@dimen/thumbnail_length_itemlist" - android:layout_alignParentLeft="true" - android:scaleType="centerCrop" /> - - <ImageButton - android:id="@+id/butAction" - android:contentDescription="@string/butAction_label" - android:layout_width="48dp" - android:layout_height="match_parent" - android:layout_alignParentBottom="true" - android:layout_alignParentRight="true" - android:background="?attr/borderless_button" - android:clickable="false" - android:focusable="false" - android:focusableInTouchMode="false" - android:paddingLeft="24dp" - android:paddingRight="8dp" - android:paddingTop="16dp" - android:scaleType="fitEnd" - android:src="?attr/spinner_button" /> - - <TextView - android:id="@+id/txtvTitle" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_alignParentTop="true" - android:layout_marginLeft="8dp" - android:layout_marginRight="4dp" - android:layout_marginTop="2dp" - android:layout_toLeftOf="@id/butAction" - android:layout_toRightOf="@id/imgvFeedimage" - android:ellipsize="end" - android:lines="2" - android:textColor="?android:attr/textColorPrimary" - android:textSize="@dimen/text_size_small" /> - - <LinearLayout - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_alignParentBottom="true" - android:layout_toLeftOf="@id/butAction" - android:layout_toRightOf="@id/imgvFeedimage" - android:orientation="vertical" > - - <TextView - android:id="@+id/txtvFeedname" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginLeft="8dp" - android:layout_marginRight="8dp" - android:ellipsize="end" - android:maxLines="1" - android:textColor="?android:attr/textColorSecondary" - android:textSize="@dimen/text_size_micro" /> - - <RelativeLayout - android:id="@+id/bottom_bar" - android:layout_width="match_parent" - android:layout_height="wrap_content" > - - <TextView - android:id="@+id/txtvLenSize" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentLeft="true" - android:layout_marginLeft="8dp" - android:layout_marginRight="8dp" - android:ellipsize="end" - android:maxLines="1" - android:textColor="?android:attr/textColorTertiary" - android:textSize="@dimen/text_size_micro" /> - - <ImageView - android:id="@+id/imgvDownloadStatus" - android:layout_width="@dimen/enc_icons_size" - android:layout_height="@dimen/enc_icons_size" - android:layout_alignParentRight="true" - android:layout_marginLeft="8dp" - android:layout_marginRight="8dp" - tools:ignore="ContentDescription"/> - - <ProgressBar - android:id="@+id/pbar_episode_progress" - style="?android:attr/progressBarStyleHorizontal" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_toLeftOf="@id/imgvDownloadStatus" - android:layout_toRightOf="@id/txtvLenSize" /> - </RelativeLayout> - </LinearLayout> - - <ImageView - android:id="@+id/statusPlaying" - android:contentDescription="@string/status_playing_label" - android:layout_width="@dimen/status_indicator_width" - android:layout_height="18dp" - android:layout_alignParentRight="true" - android:layout_alignParentTop="true" - android:layout_margin="8dp" - android:background="@color/status_playing" - android:gravity="center" - android:padding="2dp" - android:src="@drawable/av_play_dark" /> - -</RelativeLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/external_player_fragment.xml b/app/src/main/res/layout/external_player_fragment.xml index f084ccac1..2b5c90847 100644 --- a/app/src/main/res/layout/external_player_fragment.xml +++ b/app/src/main/res/layout/external_player_fragment.xml @@ -4,7 +4,8 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:orientation="vertical" - android:visibility="gone"> + android:visibility="gone" + android:background="?attr/colorPrimary"> <View android:layout_width="match_parent" @@ -20,7 +21,7 @@ android:layout_width="0dp" android:layout_height="wrap_content" android:layout_weight="1" - android:background="?attr/borderless_button"> + android:background="?attr/selectableItemBackground"> <ImageView android:id="@+id/imgvCover" @@ -53,7 +54,7 @@ android:contentDescription="@string/pause_label" android:layout_width="@dimen/external_player_height" android:layout_height="@dimen/external_player_height" - android:background="?attr/borderless_button"/> + android:background="?attr/selectableItemBackground"/> </LinearLayout> </LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/feeditem_dialog.xml b/app/src/main/res/layout/feeditem_dialog.xml index e4a37d685..24abae762 100644 --- a/app/src/main/res/layout/feeditem_dialog.xml +++ b/app/src/main/res/layout/feeditem_dialog.xml @@ -34,7 +34,7 @@ android:layout_height="48dp" android:layout_weight="1" android:id="@+id/butAction1" - android:background="?attr/borderless_button" + android:background="?attr/selectableItemBackground" tools:ignore="ContentDescription"/> <ImageButton @@ -42,7 +42,7 @@ android:layout_height="48dp" android:layout_weight="1" android:id="@+id/butAction2" - android:background="?attr/borderless_button" + android:background="?attr/selectableItemBackground" tools:ignore="ContentDescription"/> <ImageButton @@ -50,7 +50,7 @@ android:layout_height="48dp" android:layout_weight="1" android:id="@+id/butMoreActions" - android:background="?attr/borderless_button" + android:background="?attr/selectableItemBackground" android:src="?attr/ic_action_overflow" android:contentDescription="@string/butAction_label"/> </LinearLayout> diff --git a/app/src/main/res/layout/feeditemlist_header.xml b/app/src/main/res/layout/feeditemlist_header.xml index 83c189bb5..fc38c6797 100644 --- a/app/src/main/res/layout/feeditemlist_header.xml +++ b/app/src/main/res/layout/feeditemlist_header.xml @@ -1,65 +1,63 @@ <?xml version="1.0" encoding="utf-8"?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:tools="http://schemas.android.com/tools" - android:layout_width="match_parent" - android:layout_height="match_parent" - tools:context="de.danoeh.antennapod.activity.MainActivity"> + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="@dimen/feeditemlist_header_height" + tools:context="de.danoeh.antennapod.activity.MainActivity"> <ImageView android:id="@+id/imgvCover" - android:contentDescription="@string/cover_label" android:layout_width="@dimen/thumbnail_length_onlinefeedview" android:layout_height="@dimen/thumbnail_length_onlinefeedview" android:layout_alignParentLeft="true" android:layout_alignParentTop="true" - android:layout_margin="4dp"/> + android:layout_centerVertical="true" + android:layout_marginBottom="16dp" + android:layout_marginLeft="16dp" + android:layout_marginTop="16dp" + android:contentDescription="@string/cover_label" /> <ImageButton - android:layout_width="48dp" - android:layout_height="48dp" android:id="@+id/butShowInfo" - android:contentDescription="@string/show_info_label" - android:src="?attr/action_about" - android:layout_alignParentRight="true" - android:layout_alignParentBottom="true" - android:background="?attr/borderless_button"/> - - <ImageButton android:layout_width="48dp" android:layout_height="48dp" - android:layout_marginRight="8dp" - android:id="@+id/butVisitWebsite" - android:contentDescription="@string/visit_website_label" - android:src="?attr/location_web_site" - android:layout_toLeftOf="@id/butShowInfo" - android:layout_alignParentBottom="true" - android:background="?attr/borderless_button"/> + android:layout_alignParentRight="true" + android:layout_alignParentTop="true" + android:layout_marginBottom="16dp" + android:layout_marginLeft="16dp" + android:layout_marginTop="8dp" + android:background="?attr/selectableItemBackground" + android:contentDescription="@string/show_info_label" + android:src="?attr/action_about" /> <TextView android:id="@+id/txtvTitle" + style="@style/AntennaPod.TextView.Heading" android:layout_width="0dp" android:layout_height="wrap_content" - android:ellipsize="end" - android:gravity="center_vertical" - android:layout_alignTop="@id/imgvCover" + android:layout_alignParentTop="true" + android:layout_marginBottom="16dp" + android:layout_marginLeft="16dp" + android:layout_marginTop="16dp" + android:layout_toLeftOf="@id/butShowInfo" android:layout_toRightOf="@id/imgvCover" - android:layout_alignParentRight="true" - android:lines="1" - style="@style/AntennaPod.TextView.Heading" - android:layout_margin="4dp"/> + android:ellipsize="end" + android:maxLines="2" /> <TextView android:id="@+id/txtvAuthor" - android:layout_width="0dp" + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_margin="4dp" android:layout_below="@id/txtvTitle" + android:layout_marginBottom="16dp" + android:layout_marginLeft="16dp" + android:layout_marginRight="16dp" android:layout_toRightOf="@id/imgvCover" - android:layout_toLeftOf="@id/butShowInfo" - android:lines="1" android:ellipsize="end" + android:lines="1" android:textColor="?android:attr/textColorSecondary" - android:textSize="@dimen/text_size_small"/> + android:textSize="@dimen/text_size_small" /> + </RelativeLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/feeditemlist_item.xml b/app/src/main/res/layout/feeditemlist_item.xml index f3701de2c..4d9f79394 100644 --- a/app/src/main/res/layout/feeditemlist_item.xml +++ b/app/src/main/res/layout/feeditemlist_item.xml @@ -1,64 +1,66 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:tools="http://schemas.android.com/tools" - android:layout_width="match_parent" - android:orientation="horizontal" - android:layout_height="match_parent"> + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="@dimen/listitem_threeline_height" + android:orientation="horizontal"> <RelativeLayout - android:layout_margin="8dp" + android:layout_width="0dp" android:layout_height="match_parent" - android:layout_weight="1" - android:paddingLeft="4dp"> + android:layout_marginLeft="@dimen/listitem_threeline_horizontalpadding" + android:layout_weight="1"> <TextView - android:id="@+id/txtvPublished" - android:layout_width="fill_parent" + android:id="@+id/statusUnread" + style="@style/AntennaPod.TextView.UnreadIndicator" + android:layout_width="wrap_content" android:layout_height="wrap_content" + android:layout_alignParentRight="true" android:layout_alignParentTop="true" - android:textColor="?android:attr/textColorTertiary" - android:textSize="@dimen/text_size_micro"/> + android:layout_margin="16dp" /> <TextView android:id="@+id/txtvItemname" - android:layout_width="fill_parent" + style="@style/AntennaPod.TextView.ListItemPrimaryTitle" + android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_below="@id/txtvPublished" + android:layout_alignParentLeft="true" + android:layout_alignParentTop="true" android:layout_marginBottom="8dp" - style="@style/AntennaPod.TextView.ListItemPrimaryTitle"/> + android:layout_marginTop="@dimen/listitem_threeline_verticalpadding" + android:layout_toLeftOf="@id/statusUnread" /> <ImageView android:id="@+id/imgvInPlaylist" - android:contentDescription="@string/in_queue_label" android:layout_width="@dimen/enc_icons_size" android:layout_height="@dimen/enc_icons_size" - android:layout_alignParentBottom="true" android:layout_alignParentRight="true" - android:padding="2dp" + android:layout_below="@id/txtvItemname" + android:layout_marginRight="4dp" + android:contentDescription="@string/in_queue_label" android:src="?attr/stat_playlist" - android:visibility="visible"/> + android:visibility="visible" /> <ImageView android:id="@+id/imgvType" android:layout_width="@dimen/enc_icons_size" android:layout_height="@dimen/enc_icons_size" - android:layout_alignParentBottom="true" + android:layout_below="@id/txtvItemname" + android:layout_marginRight="4dp" android:layout_toLeftOf="@+id/imgvInPlaylist" - android:padding="2dp" - tools:ignore="ContentDescription"/> + tools:ignore="ContentDescription" /> <TextView android:id="@+id/txtvLenSize" + style="@style/AntennaPod.TextView.ListItemSecondaryTitle" android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentLeft="true" - android:layout_below="@id/txtvItemname" - android:maxLines="2" - android:textColor="?android:attr/textColorTertiary" - android:textSize="@dimen/text_size_micro"/> + android:layout_below="@id/txtvItemname" /> <ProgressBar android:id="@+id/pbar_episode_progress" @@ -68,34 +70,22 @@ android:layout_below="@id/txtvItemname" android:layout_marginLeft="4dp" android:layout_marginRight="4dp" - android:layout_marginTop="2dp" android:layout_toLeftOf="@id/imgvType" - android:layout_toRightOf="@id/txtvLenSize"/> + android:layout_toRightOf="@id/txtvLenSize" /> + <TextView - android:id="@+id/statusUnread" + android:id="@+id/txtvPublished" + style="@style/AntennaPod.TextView.ListItemSecondaryTitle" android:layout_width="wrap_content" android:layout_height="wrap_content" - style="@style/AntennaPod.TextView.UnreadIndicator" - android:layout_alignParentRight="true" - android:layout_alignParentTop="true"/> + android:layout_below="@id/txtvItemname" + android:layout_marginRight="4dp" + android:layout_toLeftOf="@id/imgvType" /> </RelativeLayout> - <View - android:layout_width="1dp" - android:layout_height="match_parent" - android:background="@drawable/vertical_divider" - android:layout_marginTop="8dp" - android:layout_marginBottom="8dp"/> + <include layout="@layout/vertical_list_divider"/> - <ImageButton - android:id="@+id/butSecondaryAction" - android:focusable="false" - android:clickable="false" - android:focusableInTouchMode="false" - android:layout_width="@dimen/listview_secondary_button_width" - android:layout_height="match_parent" - android:background="?attr/borderless_button" - tools:ignore="ContentDescription"/> + <include layout="@layout/secondary_action"/> </LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/gpodnet_podcast_list.xml b/app/src/main/res/layout/gpodnet_podcast_list.xml index 0112754ee..be9da61e2 100644 --- a/app/src/main/res/layout/gpodnet_podcast_list.xml +++ b/app/src/main/res/layout/gpodnet_podcast_list.xml @@ -1,45 +1,49 @@ <?xml version="1.0" encoding="utf-8"?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:tools="http://schemas.android.com/tools" - android:layout_width="match_parent" - android:layout_height="match_parent"> + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="match_parent"> <GridView + android:id="@+id/gridView" android:layout_width="match_parent" android:layout_height="match_parent" - android:id="@+id/gridView" - android:stretchMode="columnWidth" + android:clipToPadding="false" + android:columnWidth="200dp" + android:gravity="center" + android:horizontalSpacing="8dp" android:numColumns="auto_fit" + android:paddingBottom="@dimen/list_vertical_padding" + android:paddingTop="@dimen/list_vertical_padding" + android:stretchMode="columnWidth" android:verticalSpacing="8dp" - android:horizontalSpacing="8dp" - android:gravity="center" - android:columnWidth="200dp" - tools:listitem="@layout/gpodnet_podcast_listitem"/> + tools:listitem="@layout/gpodnet_podcast_listitem" /> <ProgressBar + android:id="@+id/progressBar" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:id="@+id/progressBar" android:layout_centerInParent="true" - android:indeterminateOnly="true"/> + android:indeterminateOnly="true" /> <TextView + android:id="@+id/txtvError" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:id="@+id/txtvError" android:layout_centerInParent="true" - android:visibility="gone" - android:textAlignment="center" android:layout_margin="16dp" - android:textSize="@dimen/text_size_small"/> + android:textAlignment="center" + android:textSize="@dimen/text_size_small" + android:visibility="gone" /> + <Button + android:id="@+id/butRetry" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:id="@+id/butRetry" - android:text="@string/retry_label" - android:layout_margin="16dp" - android:visibility="gone" + android:layout_below="@id/txtvError" android:layout_centerHorizontal="true" - android:layout_below="@id/txtvError"/> + android:layout_margin="16dp" + android:text="@string/retry_label" + android:visibility="gone" /> </RelativeLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/gpodnet_podcast_listitem.xml b/app/src/main/res/layout/gpodnet_podcast_listitem.xml index 1f6cdd1d0..94a77dd7f 100644 --- a/app/src/main/res/layout/gpodnet_podcast_listitem.xml +++ b/app/src/main/res/layout/gpodnet_podcast_listitem.xml @@ -1,45 +1,32 @@ <?xml version="1.0" encoding="utf-8"?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_width="match_parent" + android:layout_height="@dimen/listitem_threeline_height"> + <ImageView android:id="@+id/imgvCover" - android:contentDescription="@string/cover_label" android:layout_width="@dimen/thumbnail_length_itemlist" android:layout_height="@dimen/thumbnail_length_itemlist" android:layout_alignParentLeft="true" android:layout_centerVertical="true" - android:layout_marginRight="4dip" + android:layout_marginBottom="@dimen/listitem_threeline_verticalpadding" + android:layout_marginLeft="@dimen/listitem_threeline_horizontalpadding" + android:layout_marginRight="8dp" + android:layout_marginTop="@dimen/listitem_threeline_verticalpadding" android:adjustViewBounds="true" + android:contentDescription="@string/cover_label" android:cropToPadding="true" android:scaleType="fitXY" /> - <LinearLayout + <TextView + android:id="@+id/txtvTitle" + style="@style/AntennaPod.TextView.ListItemPrimaryTitle" android:layout_width="match_parent" - android:layout_height="@dimen/thumbnail_length_itemlist" + android:layout_height="wrap_content" android:layout_centerVertical="true" + android:layout_marginBottom="@dimen/listitem_threeline_verticalpadding" + android:layout_marginRight="@dimen/listitem_threeline_horizontalpadding" android:layout_toRightOf="@id/imgvCover" - android:layout_marginRight="8dp" - android:orientation="vertical" > - - <TextView - android:id="@+id/txtvTitle" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:ellipsize="end" - android:maxLines="1" - android:textColor="?android:attr/textColorPrimary" - android:textSize="@dimen/text_size_small" /> - - <TextView - android:id="@+id/txtvDescription" - android:layout_width="match_parent" - android:layout_height="wrap_content" - android:maxLines="2" - android:ellipsize="end" - android:textColor="?android:attr/textColorTertiary" - android:textSize="@dimen/text_size_micro" /> - - </LinearLayout> + android:maxLines="1" /> </RelativeLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/itemdescription_listitem.xml b/app/src/main/res/layout/itemdescription_listitem.xml index d6a3f6a16..418271aad 100644 --- a/app/src/main/res/layout/itemdescription_listitem.xml +++ b/app/src/main/res/layout/itemdescription_listitem.xml @@ -1,27 +1,24 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent" + android:orientation="vertical"> <TextView android:id="@+id/txtvTitle" - android:layout_margin="8dp" + style="@style/AntennaPod.TextView.ListItemPrimaryTitle" android:layout_width="match_parent" android:layout_height="wrap_content" - android:lines="1" - android:ellipsize="end" - android:textColor="?android:attr/textColorPrimary" - android:textSize="@dimen/text_size_small"/> + android:layout_margin="16dp" /> <TextView android:id="@+id/txtvDescription" - android:layout_margin="8dp" + style="@style/AntennaPod.TextView.ListItemSecondaryTitle" android:layout_width="match_parent" android:layout_height="wrap_content" - android:lines="3" - android:ellipsize="end" - android:textColor="?android:attr/textColorTertiary" - android:textSize="@dimen/text_size_micro"/> + android:layout_marginBottom="16dp" + android:layout_marginLeft="16dp" + android:layout_marginRight="16dp" + android:lines="3" /> </LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/main.xml b/app/src/main/res/layout/main.xml index cfd59b87c..0a7b7ef74 100644 --- a/app/src/main/res/layout/main.xml +++ b/app/src/main/res/layout/main.xml @@ -26,15 +26,6 @@ </RelativeLayout> - <ListView - android:id="@+id/nav_list" - android:layout_width="@dimen/drawer_width" - android:layout_height="match_parent" - android:layout_gravity="start" - android:choiceMode="singleChoice" - android:background="?attr/nav_drawer_background" - android:scrollbarStyle="outsideOverlay" - android:paddingLeft="8dp" - android:paddingRight="8dp"/> + <include layout="@layout/nav_list"/> </android.support.v4.widget.DrawerLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/nav_feedlistitem.xml b/app/src/main/res/layout/nav_feedlistitem.xml index d94c9ada1..4a7cb17de 100644 --- a/app/src/main/res/layout/nav_feedlistitem.xml +++ b/app/src/main/res/layout/nav_feedlistitem.xml @@ -3,7 +3,7 @@ <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="@dimen/listitem_iconwithtext_height"> <ImageView @@ -16,8 +16,9 @@ android:adjustViewBounds="true" android:cropToPadding="true" android:scaleType="fitXY" - android:layout_marginTop="6dp" - android:layout_marginBottom="6dp"/> + android:layout_marginTop="8dp" + android:layout_marginBottom="8dp" + android:layout_marginLeft="@dimen/listitem_icon_leftpadding"/> <TextView @@ -30,10 +31,10 @@ android:textSize="@dimen/text_size_navdrawer" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginLeft="12dp" - android:layout_marginTop="14dp" - android:layout_marginBottom="14dp" - android:layout_marginRight="48dp" + android:layout_marginLeft="@dimen/listitem_iconwithtext_textleftpadding" + android:layout_marginTop="@dimen/listitem_iconwithtext_textverticalpadding" + android:layout_marginBottom="@dimen/listitem_iconwithtext_textverticalpadding" + android:layout_marginRight="@dimen/listitem_icon_rightpadding" android:layout_toRightOf="@id/imgvCover" /> </RelativeLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/nav_list.xml b/app/src/main/res/layout/nav_list.xml new file mode 100644 index 000000000..536946ca1 --- /dev/null +++ b/app/src/main/res/layout/nav_list.xml @@ -0,0 +1,14 @@ +<?xml version="1.0" encoding="utf-8"?> +<ListView xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/nav_list" + android:layout_width="@dimen/drawer_width" + android:layout_height="match_parent" + android:layout_gravity="start" + android:background="?attr/nav_drawer_background" + android:choiceMode="singleChoice" + android:clipToPadding="false" + android:divider="@android:color/transparent" + android:dividerHeight="0dp" + android:paddingBottom="@dimen/list_vertical_padding" + android:paddingTop="@dimen/list_vertical_padding" + android:scrollbarStyle="outsideOverlay" />
\ No newline at end of file diff --git a/app/src/main/res/layout/nav_listitem.xml b/app/src/main/res/layout/nav_listitem.xml index 9d70e7d7c..2559c1cd6 100644 --- a/app/src/main/res/layout/nav_listitem.xml +++ b/app/src/main/res/layout/nav_listitem.xml @@ -3,7 +3,7 @@ <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:orientation="vertical" android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_height="@dimen/listitem_iconwithtext_height"> <ImageView android:id="@+id/imgvCover" @@ -16,8 +16,9 @@ android:cropToPadding="true" android:scaleType="centerCrop" android:padding="8dp" - android:layout_marginTop="6dp" - android:layout_marginBottom="6dp"/> + android:layout_marginLeft="@dimen/listitem_icon_leftpadding" + android:layout_marginTop="8dp" + android:layout_marginBottom="8dp"/> <TextView @@ -30,9 +31,9 @@ android:textSize="@dimen/text_size_navdrawer" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_marginLeft="12dp" - android:layout_marginTop="14dp" - android:layout_marginBottom="14dp" + android:layout_marginLeft="@dimen/listitem_iconwithtext_textleftpadding" + android:layout_marginTop="@dimen/listitem_iconwithtext_textverticalpadding" + android:layout_marginBottom="@dimen/listitem_iconwithtext_textverticalpadding" android:layout_marginRight="48dp" android:layout_toRightOf="@id/imgvCover" /> @@ -47,7 +48,7 @@ android:layout_marginLeft="12dp" android:layout_marginTop="14dp" android:layout_marginBottom="14dp" - android:layout_marginRight="16dp" + android:layout_marginRight="@dimen/listitem_icon_rightpadding" android:layout_alignParentRight="true" android:layout_centerVertical="true"/> </RelativeLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/nav_section_item.xml b/app/src/main/res/layout/nav_section_item.xml index 1f2fc7e3e..6eb26291e 100644 --- a/app/src/main/res/layout/nav_section_item.xml +++ b/app/src/main/res/layout/nav_section_item.xml @@ -1,26 +1,14 @@ <?xml version="1.0" encoding="utf-8"?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:orientation="vertical" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="@android:color/transparent"> - - <TextView - android:id="@+id/txtvTitle" - android:textColor="?android:attr/textColorTertiary" - android:textSize="@dimen/text_size_small" - android:typeface="sans" - android:layout_width="wrap_content" - android:layout_height="match_parent" - android:layout_alignParentLeft="true" - android:layout_alignParentBottom="true" - android:layout_marginTop="16dp" - android:paddingBottom="4dp"/> + android:layout_width="match_parent" + android:layout_height="24dp" + android:background="@android:color/transparent" + android:orientation="vertical"> <View android:layout_width="match_parent" - android:layout_height="2dp" - android:layout_alignParentBottom="true" - android:background="@color/gray"/> + android:layout_height="1dp" + android:layout_centerVertical="true" + android:background="@color/gray" /> </RelativeLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/new_episodes_fragment.xml b/app/src/main/res/layout/new_episodes_fragment.xml index 63c712f57..c09a1cdf3 100644 --- a/app/src/main/res/layout/new_episodes_fragment.xml +++ b/app/src/main/res/layout/new_episodes_fragment.xml @@ -11,6 +11,9 @@ android:scrollbarStyle="outsideOverlay" android:layout_width="match_parent" android:layout_height="match_parent" + android:paddingTop="@dimen/list_vertical_padding" + android:paddingBottom="@dimen/list_vertical_padding" + android:clipToPadding="false" dslv:collapsed_height="2dp" dslv:drag_enabled="false" dslv:drag_scroll_start="0.33" diff --git a/app/src/main/res/layout/new_episodes_listitem.xml b/app/src/main/res/layout/new_episodes_listitem.xml index dcef1f8fc..7312f18a2 100644 --- a/app/src/main/res/layout/new_episodes_listitem.xml +++ b/app/src/main/res/layout/new_episodes_listitem.xml @@ -1,111 +1,99 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:tools="http://schemas.android.com/tools" - android:layout_width="match_parent" - android:orientation="horizontal" - android:layout_height="match_parent"> + android:layout_width="match_parent" + android:layout_height="@dimen/listitem_threeline_height" + android:orientation="horizontal"> <ImageView android:id="@+id/imgvImage" - android:contentDescription="@string/cover_label" android:layout_width="@dimen/thumbnail_length_itemlist" android:layout_height="@dimen/thumbnail_length_itemlist" - android:scaleType="centerCrop"/> + android:layout_gravity="center_vertical" + android:layout_marginBottom="@dimen/listitem_threeline_verticalpadding" + android:layout_marginLeft="@dimen/listitem_threeline_horizontalpadding" + android:layout_marginTop="@dimen/listitem_threeline_verticalpadding" + android:contentDescription="@string/cover_label" + android:scaleType="centerCrop" /> <RelativeLayout android:layout_width="0dp" android:layout_height="match_parent" - android:layout_weight="1" - android:layout_margin="4dp"> + android:layout_marginBottom="@dimen/listitem_threeline_verticalpadding" + android:layout_marginLeft="@dimen/listitem_threeline_textleftpadding" + android:layout_marginRight="@dimen/listitem_threeline_textrightpadding" + android:layout_marginTop="@dimen/listitem_threeline_verticalpadding" + android:layout_weight="1"> + <TextView - android:id="@+id/txtvPublished" - android:layout_width="0dp" + android:id="@+id/statusUnread" + style="@style/AntennaPod.TextView.UnreadIndicator" + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentTop="true" - android:layout_alignParentLeft="true" android:layout_alignParentRight="true" - android:ellipsize="end" - android:maxLines="1" - android:textColor="?android:attr/textColorTertiary" - android:textSize="@dimen/text_size_micro"/> + android:layout_alignParentTop="true" /> <TextView android:id="@+id/txtvTitle" + style="@style/AntennaPod.TextView.ListItemPrimaryTitle" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_below="@id/txtvPublished" android:layout_alignParentLeft="true" - android:layout_alignParentRight="true" - style="@style/AntennaPod.TextView.ListItemPrimaryTitle"/> - - <TextView - android:id="@+id/statusUnread" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentRight="true" android:layout_alignParentTop="true" - style="@style/AntennaPod.TextView.UnreadIndicator"/> + android:layout_toLeftOf="@id/statusUnread" /> - <LinearLayout + <RelativeLayout + android:id="@+id/bottom_bar" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_alignParentBottom="true" - android:layout_alignParentRight="true" android:layout_alignParentLeft="true" - android:orientation="vertical"> + android:layout_alignParentRight="true" + android:layout_marginTop="16dp"> + + <ImageView + android:id="@id/imgvInPlaylist" + android:layout_width="@dimen/enc_icons_size" + android:layout_height="@dimen/enc_icons_size" + android:layout_alignParentRight="true" + android:layout_marginLeft="8dp" + android:layout_marginRight="4dp" + android:contentDescription="@string/in_queue_label" + android:src="?attr/stat_playlist" /> - <RelativeLayout - android:id="@+id/bottom_bar" - android:layout_width="match_parent" - android:layout_height="wrap_content"> + <ProgressBar + android:id="@+id/pbar_download_progress" + style="?android:attr/progressBarStyleHorizontal" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_alignParentLeft="true" + android:layout_marginRight="8dp" + android:layout_toLeftOf="@id/imgvInPlaylist" + android:max="100" /> - <ImageView - android:id="@id/imgvInPlaylist" - android:contentDescription="@string/in_queue_label" - android:layout_width="@dimen/enc_icons_size" - android:layout_height="@dimen/enc_icons_size" - android:layout_alignParentRight="true" - android:src="?attr/stat_playlist"/> + <TextView + android:id="@+id/txtvDuration" + style="@style/AntennaPod.TextView.ListItemSecondaryTitle" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_alignParentLeft="true" + android:layout_toLeftOf="@id/imgvInPlaylist" /> - <ProgressBar - android:id="@+id/pbar_download_progress" - style="?android:attr/progressBarStyleHorizontal" - android:max="100" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_toLeftOf="@id/imgvInPlaylist" - android:layout_marginRight="8dp" - android:layout_alignParentLeft="true"/> + <TextView + android:id="@+id/txtvPublished" + style="@style/AntennaPod.TextView.ListItemSecondaryTitle" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentTop="true" + android:layout_toLeftOf="@id/imgvInPlaylist" + android:ellipsize="end" /> - <TextView - android:id="@+id/txtvDuration" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_toLeftOf="@id/imgvInPlaylist" - android:layout_alignParentLeft="true" - android:textColor="?android:attr/textColorTertiary" - android:textSize="@dimen/text_size_micro"/> - </RelativeLayout> - </LinearLayout> + </RelativeLayout> </RelativeLayout> - <View - android:layout_width="1dp" - android:layout_height="match_parent" - android:background="@drawable/vertical_divider" - android:layout_marginTop="8dp" - android:layout_marginBottom="8dp"/> + <include layout="@layout/vertical_list_divider"/> - <ImageButton - android:id="@+id/butSecondaryAction" - android:focusable="false" - android:clickable="false" - android:focusableInTouchMode="false" - android:layout_width="@dimen/listview_secondary_button_width" - android:layout_height="match_parent" - android:background="?attr/borderless_button" - tools:ignore="ContentDescription"/> + <include layout="@layout/secondary_action" /> </LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/onlinefeedview_header.xml b/app/src/main/res/layout/onlinefeedview_header.xml index 11ae1f644..66d3039e4 100644 --- a/app/src/main/res/layout/onlinefeedview_header.xml +++ b/app/src/main/res/layout/onlinefeedview_header.xml @@ -1,83 +1,81 @@ <?xml version="1.0" encoding="utf-8"?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_width="match_parent" + android:layout_height="match_parent"> <ImageView android:id="@+id/imgvCover" - android:contentDescription="@string/cover_label" android:layout_width="@dimen/thumbnail_length_onlinefeedview" android:layout_height="@dimen/thumbnail_length_onlinefeedview" android:layout_alignParentLeft="true" android:layout_alignParentTop="true" - android:layout_margin="4dp"/> + android:layout_marginLeft="16dp" + android:layout_marginRight="16dp" + android:layout_marginTop="16dp" + android:contentDescription="@string/cover_label" /> <TextView android:id="@+id/txtvTitle" + style="@style/AntennaPod.TextView.Heading" android:layout_width="0dp" android:layout_height="wrap_content" + android:layout_alignParentRight="true" + android:layout_marginBottom="8dp" + android:layout_marginRight="16dp" + android:layout_marginTop="16dp" + android:layout_toRightOf="@id/imgvCover" android:ellipsize="end" android:gravity="center_vertical" - android:layout_alignTop="@id/imgvCover" - android:layout_toRightOf="@id/imgvCover" - android:layout_alignParentRight="true" - android:lines="1" - style="@style/AntennaPod.TextView.Heading" - android:layout_margin="4dp"/> + android:maxLines="2" /> <TextView android:id="@+id/txtvAuthor" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_margin="4dp" android:layout_below="@id/txtvTitle" + android:layout_marginBottom="8dp" + android:layout_marginRight="16dp" android:layout_toRightOf="@id/imgvCover" - android:lines="1" android:ellipsize="end" + android:lines="1" android:textColor="?android:attr/textColorSecondary" - android:textSize="@dimen/text_size_small"/> - - <Button - android:id="@+id/butSubscribe" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_margin="4dp" - android:text="@string/subscribe_label" - android:layout_below="@id/txtvAuthor" - android:layout_alignParentRight="true" - android:focusable="false" - /> + android:textSize="@dimen/text_size_small" /> <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_below="@id/butSubscribe" + android:layout_below="@id/imgvCover" android:orientation="vertical"> <Spinner + android:id="@+id/spinnerAlternateUrls" android:layout_width="match_parent" android:layout_height="wrap_content" - android:id="@+id/spinnerAlternateUrls" - android:layout_margin="4dp" - android:textSize="@dimen/text_size_micro" - android:textColor="?android:attr/textColorPrimary"/> + android:layout_marginLeft="16dp" + android:layout_marginRight="16dp" + android:layout_marginTop="8dp" + android:textColor="?android:attr/textColorPrimary" + android:textSize="@dimen/text_size_micro" /> + <Button + android:id="@+id/butSubscribe" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_margin="16dp" + android:focusable="false" + android:text="@string/subscribe_label" /> <TextView android:id="@+id/txtvDescription" - android:layout_width="match_parent" + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:maxLines="3" - android:ellipsize="end" - android:textColor="?android:attr/textColorTertiary" - android:textSize="@dimen/text_size_micro" - android:paddingTop="16dp" - android:paddingBottom="16dp" - android:paddingLeft="8dp" - android:paddingRight="8dp" - android:layout_margin="4dp"/> + android:layout_marginBottom="16dp" + android:layout_marginLeft="16dp" + android:layout_marginRight="16dp" + android:textColor="?android:attr/textColorSecondary" + android:textSize="@dimen/text_size_small" /> </LinearLayout> </RelativeLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/player_widget.xml b/app/src/main/res/layout/player_widget.xml index b6946f7a8..47f9ec258 100644 --- a/app/src/main/res/layout/player_widget.xml +++ b/app/src/main/res/layout/player_widget.xml @@ -16,8 +16,8 @@ android:layout_height="match_parent" android:layout_alignParentRight="true" android:layout_margin="12dp" - android:background="@drawable/borderless_button_dark" - android:src="@drawable/av_play_dark" /> + android:background="?attr/selectableItemBackground" + android:src="@drawable/ic_play_arrow_white_24dp" /> <LinearLayout android:id="@+id/layout_left" @@ -25,7 +25,7 @@ android:layout_height="match_parent" android:layout_alignParentLeft="true" android:layout_toLeftOf="@id/butPlay" - android:background="@drawable/borderless_button_dark" + android:background="?attr/selectableItemBackground" android:gravity="center_vertical" android:orientation="vertical" > diff --git a/app/src/main/res/layout/queue_fragment.xml b/app/src/main/res/layout/queue_fragment.xml index 742411761..d184eb28d 100644 --- a/app/src/main/res/layout/queue_fragment.xml +++ b/app/src/main/res/layout/queue_fragment.xml @@ -1,27 +1,30 @@ <?xml version="1.0" encoding="utf-8"?> <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:dslv="http://schemas.android.com/apk/res-auto" - android:layout_width="match_parent" - android:layout_height="match_parent"> + xmlns:dslv="http://schemas.android.com/apk/res-auto" + android:layout_width="match_parent" + android:layout_height="match_parent"> <com.mobeta.android.dslv.DragSortListView android:id="@android:id/list" - android:scrollbarStyle="outsideOverlay" android:layout_width="match_parent" android:layout_height="match_parent" + android:clipToPadding="false" + android:paddingBottom="@dimen/list_vertical_padding" + android:paddingTop="@dimen/list_vertical_padding" + android:scrollbarStyle="outsideOverlay" dslv:collapsed_height="2dp" dslv:drag_enabled="true" dslv:drag_handle_id="@id/drag_handle" dslv:drag_scroll_start="0.33" dslv:float_alpha="0.6" + dslv:float_background_color="?attr/dragview_float_background" dslv:max_drag_scroll_speed="0.5" dslv:remove_enabled="false" dslv:slide_shuffle_speed="0.3" dslv:sort_enabled="true" dslv:track_drag_sort="true" - dslv:float_background_color="?attr/dragview_float_background" - dslv:use_default_controller="true"/> + dslv:use_default_controller="true" /> <TextView android:id="@id/android:empty" @@ -29,7 +32,7 @@ android:layout_height="match_parent" android:layout_gravity="center" android:gravity="center" - android:text="@string/no_items_label"/> + android:text="@string/no_items_label" /> <ProgressBar android:id="@+id/progLoading" @@ -37,6 +40,6 @@ android:layout_height="wrap_content" android:layout_gravity="center" android:indeterminateOnly="true" - android:visibility="gone"/> + android:visibility="gone" /> </FrameLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/queue_listitem.xml b/app/src/main/res/layout/queue_listitem.xml index 4a55cd466..68fb53c2c 100644 --- a/app/src/main/res/layout/queue_listitem.xml +++ b/app/src/main/res/layout/queue_listitem.xml @@ -1,96 +1,79 @@ <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:tools="http://schemas.android.com/tools" - android:layout_width="match_parent" - android:orientation="horizontal" - android:layout_height="match_parent"> + xmlns:tools="http://schemas.android.com/tools" + android:layout_width="match_parent" + android:layout_height="@dimen/listitem_threeline_height" + android:orientation="horizontal"> <ImageView + android:id="@+id/drag_handle" android:layout_width="24dp" android:layout_height="match_parent" - android:id="@+id/drag_handle" - android:src="?attr/dragview_background" - android:scaleType="center" android:layout_margin="8dp" - android:contentDescription="@string/drag_handle_content_description"/> + android:contentDescription="@string/drag_handle_content_description" + android:scaleType="center" + android:src="?attr/dragview_background" /> <ImageView android:id="@+id/imgvImage" - android:contentDescription="@string/cover_label" android:layout_width="@dimen/thumbnail_length_queue_item" android:layout_height="@dimen/thumbnail_length_queue_item" - android:scaleType="centerCrop"/> + android:layout_gravity="center_vertical" + android:layout_marginBottom="@dimen/listitem_threeline_verticalpadding" + android:layout_marginTop="@dimen/listitem_threeline_verticalpadding" + android:contentDescription="@string/cover_label" + android:scaleType="centerCrop" /> <RelativeLayout android:layout_width="0dp" android:layout_height="match_parent" - android:layout_weight="1" - android:layout_margin="8dp"> + android:layout_marginBottom="@dimen/listitem_threeline_verticalpadding" + android:layout_marginLeft="@dimen/listitem_threeline_textleftpadding" + android:layout_marginRight="@dimen/listitem_threeline_textrightpadding" + android:layout_marginTop="@dimen/listitem_threeline_verticalpadding" + android:layout_weight="1"> <TextView android:id="@+id/txtvTitle" + style="@style/AntennaPod.TextView.ListItemPrimaryTitle" android:layout_width="0dp" android:layout_height="wrap_content" - android:layout_marginBottom="4dp" - android:layout_alignParentTop="true" - android:layout_alignParentRight="true" android:layout_alignParentLeft="true" - android:ellipsize="end" - android:lines="2" - android:textColor="?android:attr/textColorPrimary" - android:textSize="@dimen/queue_title_text_size"/> + android:layout_alignParentRight="true" + android:layout_alignParentTop="true" /> - <LinearLayout + <RelativeLayout + android:id="@+id/bottom_bar" android:layout_width="0dp" android:layout_height="wrap_content" android:layout_alignParentBottom="true" - android:layout_alignParentRight="true" android:layout_alignParentLeft="true" - android:orientation="vertical"> - - <RelativeLayout - android:id="@+id/bottom_bar" - android:layout_width="match_parent" - android:layout_height="wrap_content"> + android:layout_alignParentRight="true" + android:layout_marginTop="16dp"> - <TextView - android:id="@+id/txtvPosition" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentLeft="true" - android:textColor="?android:attr/textColorTertiary" - android:textSize="@dimen/text_size_micro"/> + <TextView + android:id="@+id/txtvPosition" + style="@style/AntennaPod.TextView.ListItemSecondaryTitle" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentLeft="true" /> - <ProgressBar - android:id="@+id/pbar_download_progress" - style="?android:attr/progressBarStyleHorizontal" - android:max="100" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_alignParentRight="true" - android:layout_marginLeft="8dp" - android:layout_toRightOf="@id/txtvPosition"/> + <ProgressBar + android:id="@+id/pbar_download_progress" + style="?android:attr/progressBarStyleHorizontal" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_alignParentRight="true" + android:layout_marginLeft="8dp" + android:layout_toRightOf="@id/txtvPosition" + android:max="100" /> - </RelativeLayout> - </LinearLayout> + </RelativeLayout> </RelativeLayout> - <View - android:layout_width="1dp" - android:layout_height="match_parent" - android:background="@drawable/vertical_divider" - android:layout_marginTop="8dp" - android:layout_marginBottom="8dp"/> + <include layout="@layout/vertical_list_divider"/> - <ImageButton - android:id="@+id/butSecondaryAction" - android:focusable="false" - android:clickable="false" - android:focusableInTouchMode="false" - android:layout_width="@dimen/listview_secondary_button_width" - android:layout_height="match_parent" - android:background="?attr/borderless_button" - tools:ignore="ContentDescription"/> + <include layout="@layout/secondary_action"/> </LinearLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/searchlist_item.xml b/app/src/main/res/layout/searchlist_item.xml index b057a966d..ff4d490e9 100644 --- a/app/src/main/res/layout/searchlist_item.xml +++ b/app/src/main/res/layout/searchlist_item.xml @@ -1,43 +1,42 @@ <?xml version="1.0" encoding="utf-8"?> <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent"> + android:layout_width="match_parent" + android:layout_height="@dimen/listitem_threeline_height"> <ImageView android:id="@+id/imgvFeedimage" - android:contentDescription="@string/cover_label" android:layout_width="@dimen/thumbnail_length_itemlist" android:layout_height="@dimen/thumbnail_length_itemlist" android:layout_alignParentLeft="true" android:layout_centerVertical="true" - android:scaleType="centerCrop"/> + android:layout_marginBottom="@dimen/listitem_threeline_verticalpadding" + android:layout_marginLeft="@dimen/listitem_threeline_horizontalpadding" + android:layout_marginTop="@dimen/listitem_threeline_verticalpadding" + android:contentDescription="@string/cover_label" + android:scaleType="centerCrop" /> <LinearLayout android:layout_width="wrap_content" android:layout_height="match_parent" - android:layout_centerVertical="true" + android:layout_marginLeft="@dimen/listitem_iconwithtext_textleftpadding" + android:layout_marginRight="@dimen/listitem_threeline_verticalpadding" + android:layout_marginTop="@dimen/listitem_threeline_verticalpadding" android:layout_toRightOf="@id/imgvFeedimage" android:orientation="vertical"> <TextView android:id="@+id/txtvTitle" + style="@style/AntennaPod.TextView.ListItemPrimaryTitle" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_margin="4dp" - android:lines="2" - android:ellipsize="end" - android:textColor="?android:attr/textColorPrimary" - android:textSize="@dimen/text_size_small"/> + android:layout_marginBottom="8dp" /> <TextView android:id="@+id/txtvSubtitle" + style="@style/AntennaPod.TextView.ListItemSecondaryTitle" android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_margin="4dp" - android:lines="1" - android:ellipsize="end" - android:textColor="?android:attr/textColorTertiary" - android:textSize="@dimen/text_size_small"/> + android:lines="1" /> </LinearLayout> </RelativeLayout>
\ No newline at end of file diff --git a/app/src/main/res/layout/secondary_action.xml b/app/src/main/res/layout/secondary_action.xml new file mode 100644 index 000000000..eb1871abc --- /dev/null +++ b/app/src/main/res/layout/secondary_action.xml @@ -0,0 +1,11 @@ +<?xml version="1.0" encoding="utf-8"?> +<ImageButton xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:tools="http://schemas.android.com/tools" + android:id="@+id/butSecondaryAction" + android:layout_width="@dimen/listview_secondary_button_width" + android:layout_height="match_parent" + android:background="?attr/selectableItemBackground" + android:clickable="false" + android:focusable="false" + android:focusableInTouchMode="false" + tools:ignore="ContentDescription" />
\ No newline at end of file diff --git a/app/src/main/res/layout/vertical_list_divider.xml b/app/src/main/res/layout/vertical_list_divider.xml new file mode 100644 index 000000000..00b1752f6 --- /dev/null +++ b/app/src/main/res/layout/vertical_list_divider.xml @@ -0,0 +1,7 @@ +<?xml version="1.0" encoding="utf-8"?> +<View xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="1dp" + android:layout_height="match_parent" + android:layout_marginBottom="16dp" + android:layout_marginTop="16dp" + android:background="?android:attr/listDivider"/>
\ No newline at end of file diff --git a/app/src/main/res/menu/feedlist.xml b/app/src/main/res/menu/feedlist.xml index f8eb7232e..dfee70522 100644 --- a/app/src/main/res/menu/feedlist.xml +++ b/app/src/main/res/menu/feedlist.xml @@ -6,7 +6,7 @@ android:id="@+id/refresh_item" android:icon="?attr/navigation_refresh" android:menuCategory="container" - custom:showAsAction="ifRoom|collapseActionView" + custom:showAsAction="ifRoom" android:title="@string/refresh_label"> </item> <item diff --git a/app/src/main/res/menu/main.xml b/app/src/main/res/menu/main.xml index c5b069b40..a968f51ce 100644 --- a/app/src/main/res/menu/main.xml +++ b/app/src/main/res/menu/main.xml @@ -6,7 +6,6 @@ android:id="@+id/show_preferences" android:title="@string/settings_label" android:menuCategory="system" - android:icon="?attr/action_settings" custom:showAsAction="collapseActionView"/> diff --git a/core/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackController.java b/core/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackController.java index 6b843e040..3b791f444 100644 --- a/core/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackController.java +++ b/core/src/main/java/de/danoeh/antennapod/core/util/playback/PlaybackController.java @@ -412,9 +412,9 @@ public abstract class PlaybackController { if (PlaybackService.getCurrentMediaType() == MediaType.AUDIO) { TypedArray res = activity.obtainStyledAttributes(new int[]{ - R.attr.av_play, R.attr.av_pause}); - playResource = res.getResourceId(0, R.drawable.av_play); - pauseResource = res.getResourceId(1, R.drawable.av_pause); + R.attr.av_play_big, R.attr.av_pause_big}); + playResource = res.getResourceId(0, R.drawable.ic_play_arrow_grey600_36dp); + pauseResource = res.getResourceId(1, R.drawable.ic_pause_grey600_36dp); res.recycle(); } else { playResource = R.drawable.ic_action_play_over_video; diff --git a/core/src/main/res/drawable-hdpi/action_about.png b/core/src/main/res/drawable-hdpi/action_about.png Binary files differdeleted file mode 100644 index 8f39c428a..000000000 --- a/core/src/main/res/drawable-hdpi/action_about.png +++ /dev/null diff --git a/core/src/main/res/drawable-hdpi/action_about_dark.png b/core/src/main/res/drawable-hdpi/action_about_dark.png Binary files differdeleted file mode 100755 index 6eaf08aec..000000000 --- a/core/src/main/res/drawable-hdpi/action_about_dark.png +++ /dev/null diff --git a/core/src/main/res/drawable-hdpi/action_search.png b/core/src/main/res/drawable-hdpi/action_search.png Binary files differdeleted file mode 100644 index e6b704518..000000000 --- a/core/src/main/res/drawable-hdpi/action_search.png +++ /dev/null diff --git a/core/src/main/res/drawable-hdpi/action_search_dark.png b/core/src/main/res/drawable-hdpi/action_search_dark.png Binary files differdeleted file mode 100755 index f12e005eb..000000000 --- a/core/src/main/res/drawable-hdpi/action_search_dark.png +++ /dev/null diff --git a/core/src/main/res/drawable-hdpi/action_settings.png b/core/src/main/res/drawable-hdpi/action_settings.png Binary files differdeleted file mode 100644 index cc32e2d1d..000000000 --- a/core/src/main/res/drawable-hdpi/action_settings.png +++ /dev/null diff --git a/core/src/main/res/drawable-hdpi/action_settings_dark.png b/core/src/main/res/drawable-hdpi/action_settings_dark.png Binary files differdeleted file mode 100755 index 3e4580e05..000000000 --- a/core/src/main/res/drawable-hdpi/action_settings_dark.png +++ /dev/null diff --git a/core/src/main/res/drawable-hdpi/action_stream.png b/core/src/main/res/drawable-hdpi/action_stream.png Binary files differdeleted file mode 100644 index 8fc7a7b1e..000000000 --- a/core/src/main/res/drawable-hdpi/action_stream.png +++ /dev/null diff --git a/core/src/main/res/drawable-hdpi/action_stream_dark.png b/core/src/main/res/drawable-hdpi/action_stream_dark.png Binary files differdeleted file mode 100644 index 97b752cea..000000000 --- a/core/src/main/res/drawable-hdpi/action_stream_dark.png +++ /dev/null diff --git a/core/src/main/res/drawable-hdpi/av_download.png b/core/src/main/res/drawable-hdpi/av_download.png Binary files differdeleted file mode 100644 index 5bceafb1e..000000000 --- a/core/src/main/res/drawable-hdpi/av_download.png +++ /dev/null diff --git a/core/src/main/res/drawable-hdpi/av_download_dark.png b/core/src/main/res/drawable-hdpi/av_download_dark.png Binary files differdeleted file mode 100755 index d5bfa457c..000000000 --- a/core/src/main/res/drawable-hdpi/av_download_dark.png +++ /dev/null diff --git a/core/src/main/res/drawable-hdpi/av_fast_forward.png b/core/src/main/res/drawable-hdpi/av_fast_forward.png Binary files differdeleted file mode 100644 index 58ee5c26c..000000000 --- a/core/src/main/res/drawable-hdpi/av_fast_forward.png +++ /dev/null diff --git a/core/src/main/res/drawable-hdpi/av_fast_forward_dark.png b/core/src/main/res/drawable-hdpi/av_fast_forward_dark.png Binary files differdeleted file mode 100755 index 237c4f846..000000000 --- a/core/src/main/res/drawable-hdpi/av_fast_forward_dark.png +++ /dev/null diff --git a/core/src/main/res/drawable-hdpi/av_pause.png b/core/src/main/res/drawable-hdpi/av_pause.png Binary files differdeleted file mode 100644 index 9661cfbb0..000000000 --- a/core/src/main/res/drawable-hdpi/av_pause.png +++ /dev/null diff --git a/core/src/main/res/drawable-hdpi/av_pause_dark.png b/core/src/main/res/drawable-hdpi/av_pause_dark.png Binary files differdeleted file mode 100755 index 6b435bb0f..000000000 --- a/core/src/main/res/drawable-hdpi/av_pause_dark.png +++ /dev/null diff --git a/core/src/main/res/drawable-hdpi/av_play.png b/core/src/main/res/drawable-hdpi/av_play.png Binary files differdeleted file mode 100644 index e70f0413e..000000000 --- a/core/src/main/res/drawable-hdpi/av_play.png +++ /dev/null diff --git a/core/src/main/res/drawable-hdpi/av_play_dark.png b/core/src/main/res/drawable-hdpi/av_play_dark.png Binary files differdeleted file mode 100755 index df8a2ca28..000000000 --- a/core/src/main/res/drawable-hdpi/av_play_dark.png +++ /dev/null diff --git a/core/src/main/res/drawable-hdpi/av_rewind.png b/core/src/main/res/drawable-hdpi/av_rewind.png Binary files differdeleted file mode 100644 index e2f843ce2..000000000 --- a/core/src/main/res/drawable-hdpi/av_rewind.png +++ /dev/null diff --git a/core/src/main/res/drawable-hdpi/av_rewind_dark.png b/core/src/main/res/drawable-hdpi/av_rewind_dark.png Binary files differdeleted file mode 100755 index caf517498..000000000 --- a/core/src/main/res/drawable-hdpi/av_rewind_dark.png +++ /dev/null diff --git a/core/src/main/res/drawable-hdpi/content_discard.png b/core/src/main/res/drawable-hdpi/content_discard.png Binary files differdeleted file mode 100644 index e9ce89e04..000000000 --- a/core/src/main/res/drawable-hdpi/content_discard.png +++ /dev/null diff --git a/core/src/main/res/drawable-hdpi/content_discard_dark.png b/core/src/main/res/drawable-hdpi/content_discard_dark.png Binary files differdeleted file mode 100755 index ffd19d9e8..000000000 --- a/core/src/main/res/drawable-hdpi/content_discard_dark.png +++ /dev/null diff --git a/core/src/main/res/drawable-hdpi/content_new.png b/core/src/main/res/drawable-hdpi/content_new.png Binary files differdeleted file mode 100644 index 5741995cb..000000000 --- a/core/src/main/res/drawable-hdpi/content_new.png +++ /dev/null diff --git a/core/src/main/res/drawable-hdpi/content_new_dark.png b/core/src/main/res/drawable-hdpi/content_new_dark.png Binary files differdeleted file mode 100755 index ad8ada6bd..000000000 --- a/core/src/main/res/drawable-hdpi/content_new_dark.png +++ /dev/null diff --git a/core/src/main/res/drawable-hdpi/default_cover.png b/core/src/main/res/drawable-hdpi/default_cover.png Binary files differdeleted file mode 100644 index a6e67e2ca..000000000 --- a/core/src/main/res/drawable-hdpi/default_cover.png +++ /dev/null diff --git a/core/src/main/res/drawable-hdpi/default_cover_dark.png b/core/src/main/res/drawable-hdpi/default_cover_dark.png Binary files differdeleted file mode 100755 index 0f650ee25..000000000 --- a/core/src/main/res/drawable-hdpi/default_cover_dark.png +++ /dev/null diff --git a/core/src/main/res/drawable-hdpi/device_access_time.png b/core/src/main/res/drawable-hdpi/device_access_time.png Binary files differdeleted file mode 100644 index 001549f38..000000000 --- a/core/src/main/res/drawable-hdpi/device_access_time.png +++ /dev/null diff --git a/core/src/main/res/drawable-hdpi/device_access_time_dark.png b/core/src/main/res/drawable-hdpi/device_access_time_dark.png Binary files differdeleted file mode 100755 index 314ec9319..000000000 --- a/core/src/main/res/drawable-hdpi/device_access_time_dark.png +++ /dev/null diff --git a/core/src/main/res/drawable-hdpi/ic_action_overflow.png b/core/src/main/res/drawable-hdpi/ic_action_overflow.png Binary files differdeleted file mode 100644 index 002fc4bfb..000000000 --- a/core/src/main/res/drawable-hdpi/ic_action_overflow.png +++ /dev/null diff --git a/core/src/main/res/drawable-hdpi/ic_action_overflow_dark.png b/core/src/main/res/drawable-hdpi/ic_action_overflow_dark.png Binary files differdeleted file mode 100644 index c8792cbe2..000000000 --- a/core/src/main/res/drawable-hdpi/ic_action_overflow_dark.png +++ /dev/null diff --git a/core/src/main/res/drawable-hdpi/ic_add_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_add_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..492c8f880 --- /dev/null +++ b/core/src/main/res/drawable-hdpi/ic_add_grey600_24dp.png diff --git a/core/src/main/res/drawable-hdpi/ic_add_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_add_white_24dp.png Binary files differnew file mode 100644 index 000000000..481643ecd --- /dev/null +++ b/core/src/main/res/drawable-hdpi/ic_add_white_24dp.png diff --git a/core/src/main/res/drawable-hdpi/ic_cancel_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_cancel_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..1f4fd985f --- /dev/null +++ b/core/src/main/res/drawable-hdpi/ic_cancel_grey600_24dp.png diff --git a/core/src/main/res/drawable-hdpi/ic_cancel_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_cancel_white_24dp.png Binary files differnew file mode 100644 index 000000000..794b7b780 --- /dev/null +++ b/core/src/main/res/drawable-hdpi/ic_cancel_white_24dp.png diff --git a/core/src/main/res/drawable-hdpi/ic_delete_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_delete_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..b72a9f3c6 --- /dev/null +++ b/core/src/main/res/drawable-hdpi/ic_delete_grey600_24dp.png diff --git a/core/src/main/res/drawable-hdpi/ic_delete_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_delete_white_24dp.png Binary files differnew file mode 100644 index 000000000..a9eac0ca7 --- /dev/null +++ b/core/src/main/res/drawable-hdpi/ic_delete_white_24dp.png diff --git a/core/src/main/res/drawable-hdpi/ic_description_grey600_36dp.png b/core/src/main/res/drawable-hdpi/ic_description_grey600_36dp.png Binary files differnew file mode 100644 index 000000000..dd7d0734d --- /dev/null +++ b/core/src/main/res/drawable-hdpi/ic_description_grey600_36dp.png diff --git a/core/src/main/res/drawable-hdpi/ic_description_white_36dp.png b/core/src/main/res/drawable-hdpi/ic_description_white_36dp.png Binary files differnew file mode 100644 index 000000000..93aa3032a --- /dev/null +++ b/core/src/main/res/drawable-hdpi/ic_description_white_36dp.png diff --git a/core/src/main/res/drawable-hdpi/ic_done_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_done_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..6e42e1359 --- /dev/null +++ b/core/src/main/res/drawable-hdpi/ic_done_grey600_24dp.png diff --git a/core/src/main/res/drawable-hdpi/ic_done_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_done_white_24dp.png Binary files differnew file mode 100644 index 000000000..f42a0e2d2 --- /dev/null +++ b/core/src/main/res/drawable-hdpi/ic_done_white_24dp.png diff --git a/core/src/main/res/drawable-hdpi/ic_drawer.png b/core/src/main/res/drawable-hdpi/ic_drawer.png Binary files differdeleted file mode 100644 index c59f601ca..000000000 --- a/core/src/main/res/drawable-hdpi/ic_drawer.png +++ /dev/null diff --git a/core/src/main/res/drawable-hdpi/ic_drawer_dark.png b/core/src/main/res/drawable-hdpi/ic_drawer_dark.png Binary files differdeleted file mode 100644 index 6614ea4f4..000000000 --- a/core/src/main/res/drawable-hdpi/ic_drawer_dark.png +++ /dev/null diff --git a/core/src/main/res/drawable-hdpi/ic_expand_more_grey600_36dp.png b/core/src/main/res/drawable-hdpi/ic_expand_more_grey600_36dp.png Binary files differnew file mode 100644 index 000000000..0f0ddf717 --- /dev/null +++ b/core/src/main/res/drawable-hdpi/ic_expand_more_grey600_36dp.png diff --git a/core/src/main/res/drawable-hdpi/ic_expand_more_white_36dp.png b/core/src/main/res/drawable-hdpi/ic_expand_more_white_36dp.png Binary files differnew file mode 100644 index 000000000..724eb1f7a --- /dev/null +++ b/core/src/main/res/drawable-hdpi/ic_expand_more_white_36dp.png diff --git a/core/src/main/res/drawable-hdpi/ic_fast_forward_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_fast_forward_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..4d1c1d4ae --- /dev/null +++ b/core/src/main/res/drawable-hdpi/ic_fast_forward_grey600_24dp.png diff --git a/core/src/main/res/drawable-hdpi/ic_fast_forward_grey600_36dp.png b/core/src/main/res/drawable-hdpi/ic_fast_forward_grey600_36dp.png Binary files differnew file mode 100644 index 000000000..deeff701f --- /dev/null +++ b/core/src/main/res/drawable-hdpi/ic_fast_forward_grey600_36dp.png diff --git a/core/src/main/res/drawable-hdpi/ic_fast_forward_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_fast_forward_white_24dp.png Binary files differnew file mode 100644 index 000000000..03a54ee75 --- /dev/null +++ b/core/src/main/res/drawable-hdpi/ic_fast_forward_white_24dp.png diff --git a/core/src/main/res/drawable-hdpi/ic_fast_forward_white_36dp.png b/core/src/main/res/drawable-hdpi/ic_fast_forward_white_36dp.png Binary files differnew file mode 100644 index 000000000..60e3decf6 --- /dev/null +++ b/core/src/main/res/drawable-hdpi/ic_fast_forward_white_36dp.png diff --git a/core/src/main/res/drawable-hdpi/ic_fast_rewind_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_fast_rewind_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..9866ee629 --- /dev/null +++ b/core/src/main/res/drawable-hdpi/ic_fast_rewind_grey600_24dp.png diff --git a/core/src/main/res/drawable-hdpi/ic_fast_rewind_grey600_36dp.png b/core/src/main/res/drawable-hdpi/ic_fast_rewind_grey600_36dp.png Binary files differnew file mode 100644 index 000000000..8b9bfd34b --- /dev/null +++ b/core/src/main/res/drawable-hdpi/ic_fast_rewind_grey600_36dp.png diff --git a/core/src/main/res/drawable-hdpi/ic_fast_rewind_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_fast_rewind_white_24dp.png Binary files differnew file mode 100644 index 000000000..b4f526e62 --- /dev/null +++ b/core/src/main/res/drawable-hdpi/ic_fast_rewind_white_24dp.png diff --git a/core/src/main/res/drawable-hdpi/ic_fast_rewind_white_36dp.png b/core/src/main/res/drawable-hdpi/ic_fast_rewind_white_36dp.png Binary files differnew file mode 100644 index 000000000..5d9d35f70 --- /dev/null +++ b/core/src/main/res/drawable-hdpi/ic_fast_rewind_white_36dp.png diff --git a/core/src/main/res/drawable-hdpi/ic_file_download_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_file_download_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..c2222fb8e --- /dev/null +++ b/core/src/main/res/drawable-hdpi/ic_file_download_grey600_24dp.png diff --git a/core/src/main/res/drawable-hdpi/ic_file_download_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_file_download_white_24dp.png Binary files differnew file mode 100644 index 000000000..46aeab458 --- /dev/null +++ b/core/src/main/res/drawable-hdpi/ic_file_download_white_24dp.png diff --git a/core/src/main/res/drawable-hdpi/ic_hearing_grey600_18dp.png b/core/src/main/res/drawable-hdpi/ic_hearing_grey600_18dp.png Binary files differnew file mode 100644 index 000000000..294523814 --- /dev/null +++ b/core/src/main/res/drawable-hdpi/ic_hearing_grey600_18dp.png diff --git a/core/src/main/res/drawable-hdpi/ic_hearing_white_18dp.png b/core/src/main/res/drawable-hdpi/ic_hearing_white_18dp.png Binary files differnew file mode 100644 index 000000000..11114b568 --- /dev/null +++ b/core/src/main/res/drawable-hdpi/ic_hearing_white_18dp.png diff --git a/core/src/main/res/drawable-hdpi/ic_history_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_history_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..f87403fa5 --- /dev/null +++ b/core/src/main/res/drawable-hdpi/ic_history_grey600_24dp.png diff --git a/core/src/main/res/drawable-hdpi/ic_history_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_history_white_24dp.png Binary files differnew file mode 100644 index 000000000..b2b1332e1 --- /dev/null +++ b/core/src/main/res/drawable-hdpi/ic_history_white_24dp.png diff --git a/core/src/main/res/drawable-hdpi/ic_info_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_info_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..713a9ba9a --- /dev/null +++ b/core/src/main/res/drawable-hdpi/ic_info_grey600_24dp.png diff --git a/core/src/main/res/drawable-hdpi/ic_info_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_info_white_24dp.png Binary files differnew file mode 100644 index 000000000..f4b88742d --- /dev/null +++ b/core/src/main/res/drawable-hdpi/ic_info_white_24dp.png diff --git a/core/src/main/res/drawable-hdpi/ic_list_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_list_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..2aee6f902 --- /dev/null +++ b/core/src/main/res/drawable-hdpi/ic_list_grey600_24dp.png diff --git a/core/src/main/res/drawable-hdpi/ic_list_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_list_white_24dp.png Binary files differnew file mode 100644 index 000000000..436113d27 --- /dev/null +++ b/core/src/main/res/drawable-hdpi/ic_list_white_24dp.png diff --git a/core/src/main/res/drawable-hdpi/ic_more_vert_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_more_vert_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..e141502a6 --- /dev/null +++ b/core/src/main/res/drawable-hdpi/ic_more_vert_grey600_24dp.png diff --git a/core/src/main/res/drawable-hdpi/ic_more_vert_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_more_vert_white_24dp.png Binary files differnew file mode 100644 index 000000000..fdc4a5ad2 --- /dev/null +++ b/core/src/main/res/drawable-hdpi/ic_more_vert_white_24dp.png diff --git a/core/src/main/res/drawable-hdpi/ic_new_releases_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_new_releases_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..7a08c4138 --- /dev/null +++ b/core/src/main/res/drawable-hdpi/ic_new_releases_grey600_24dp.png diff --git a/core/src/main/res/drawable-hdpi/ic_new_releases_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_new_releases_white_24dp.png Binary files differnew file mode 100644 index 000000000..0d08f329c --- /dev/null +++ b/core/src/main/res/drawable-hdpi/ic_new_releases_white_24dp.png diff --git a/core/src/main/res/drawable-hdpi/ic_pause_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_pause_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..711e0cf94 --- /dev/null +++ b/core/src/main/res/drawable-hdpi/ic_pause_grey600_24dp.png diff --git a/core/src/main/res/drawable-hdpi/ic_pause_grey600_36dp.png b/core/src/main/res/drawable-hdpi/ic_pause_grey600_36dp.png Binary files differnew file mode 100644 index 000000000..5e884dfe8 --- /dev/null +++ b/core/src/main/res/drawable-hdpi/ic_pause_grey600_36dp.png diff --git a/core/src/main/res/drawable-hdpi/ic_pause_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_pause_white_24dp.png Binary files differnew file mode 100644 index 000000000..b4bdbb558 --- /dev/null +++ b/core/src/main/res/drawable-hdpi/ic_pause_white_24dp.png diff --git a/core/src/main/res/drawable-hdpi/ic_pause_white_36dp.png b/core/src/main/res/drawable-hdpi/ic_pause_white_36dp.png Binary files differnew file mode 100644 index 000000000..da17d12ba --- /dev/null +++ b/core/src/main/res/drawable-hdpi/ic_pause_white_36dp.png diff --git a/core/src/main/res/drawable-hdpi/ic_play_arrow_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_play_arrow_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..264416933 --- /dev/null +++ b/core/src/main/res/drawable-hdpi/ic_play_arrow_grey600_24dp.png diff --git a/core/src/main/res/drawable-hdpi/ic_play_arrow_grey600_36dp.png b/core/src/main/res/drawable-hdpi/ic_play_arrow_grey600_36dp.png Binary files differnew file mode 100644 index 000000000..8af4c6cd6 --- /dev/null +++ b/core/src/main/res/drawable-hdpi/ic_play_arrow_grey600_36dp.png diff --git a/core/src/main/res/drawable-hdpi/ic_play_arrow_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_play_arrow_white_24dp.png Binary files differnew file mode 100644 index 000000000..164385d04 --- /dev/null +++ b/core/src/main/res/drawable-hdpi/ic_play_arrow_white_24dp.png diff --git a/core/src/main/res/drawable-hdpi/ic_play_arrow_white_36dp.png b/core/src/main/res/drawable-hdpi/ic_play_arrow_white_36dp.png Binary files differnew file mode 100644 index 000000000..0cd5cb61a --- /dev/null +++ b/core/src/main/res/drawable-hdpi/ic_play_arrow_white_36dp.png diff --git a/core/src/main/res/drawable-hdpi/ic_refresh_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_refresh_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..51cc4dbd1 --- /dev/null +++ b/core/src/main/res/drawable-hdpi/ic_refresh_grey600_24dp.png diff --git a/core/src/main/res/drawable-hdpi/ic_refresh_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_refresh_white_24dp.png Binary files differnew file mode 100644 index 000000000..cd16fdd50 --- /dev/null +++ b/core/src/main/res/drawable-hdpi/ic_refresh_white_24dp.png diff --git a/core/src/main/res/drawable-hdpi/ic_remove_red_eye_grey600_18dp.png b/core/src/main/res/drawable-hdpi/ic_remove_red_eye_grey600_18dp.png Binary files differnew file mode 100644 index 000000000..c4df13afa --- /dev/null +++ b/core/src/main/res/drawable-hdpi/ic_remove_red_eye_grey600_18dp.png diff --git a/core/src/main/res/drawable-hdpi/ic_remove_red_eye_white_18dp.png b/core/src/main/res/drawable-hdpi/ic_remove_red_eye_white_18dp.png Binary files differnew file mode 100644 index 000000000..fdf524010 --- /dev/null +++ b/core/src/main/res/drawable-hdpi/ic_remove_red_eye_white_18dp.png diff --git a/core/src/main/res/drawable-hdpi/ic_search_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_search_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..ba65a135b --- /dev/null +++ b/core/src/main/res/drawable-hdpi/ic_search_grey600_24dp.png diff --git a/core/src/main/res/drawable-hdpi/ic_search_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_search_white_24dp.png Binary files differnew file mode 100644 index 000000000..a2fc5b2e7 --- /dev/null +++ b/core/src/main/res/drawable-hdpi/ic_search_white_24dp.png diff --git a/core/src/main/res/drawable-hdpi/ic_settings_input_antenna_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_settings_input_antenna_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..9c0172ad0 --- /dev/null +++ b/core/src/main/res/drawable-hdpi/ic_settings_input_antenna_grey600_24dp.png diff --git a/core/src/main/res/drawable-hdpi/ic_settings_input_antenna_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_settings_input_antenna_white_24dp.png Binary files differnew file mode 100644 index 000000000..9b5a9fb47 --- /dev/null +++ b/core/src/main/res/drawable-hdpi/ic_settings_input_antenna_white_24dp.png diff --git a/core/src/main/res/drawable-hdpi/ic_share_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_share_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..987e9b86c --- /dev/null +++ b/core/src/main/res/drawable-hdpi/ic_share_grey600_24dp.png diff --git a/core/src/main/res/drawable-hdpi/ic_share_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_share_white_24dp.png Binary files differnew file mode 100644 index 000000000..93b3c219c --- /dev/null +++ b/core/src/main/res/drawable-hdpi/ic_share_white_24dp.png diff --git a/core/src/main/res/drawable-hdpi/ic_timer_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_timer_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..a5fdd2c40 --- /dev/null +++ b/core/src/main/res/drawable-hdpi/ic_timer_grey600_24dp.png diff --git a/core/src/main/res/drawable-hdpi/ic_timer_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_timer_white_24dp.png Binary files differnew file mode 100644 index 000000000..864291fa7 --- /dev/null +++ b/core/src/main/res/drawable-hdpi/ic_timer_white_24dp.png diff --git a/core/src/main/res/drawable-hdpi/ic_toc_grey600_36dp.png b/core/src/main/res/drawable-hdpi/ic_toc_grey600_36dp.png Binary files differnew file mode 100644 index 000000000..e299eb41b --- /dev/null +++ b/core/src/main/res/drawable-hdpi/ic_toc_grey600_36dp.png diff --git a/core/src/main/res/drawable-hdpi/ic_toc_white_36dp.png b/core/src/main/res/drawable-hdpi/ic_toc_white_36dp.png Binary files differnew file mode 100644 index 000000000..bfdc05d9e --- /dev/null +++ b/core/src/main/res/drawable-hdpi/ic_toc_white_36dp.png diff --git a/core/src/main/res/drawable-hdpi/ic_web_grey600_24dp.png b/core/src/main/res/drawable-hdpi/ic_web_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..1942f3f12 --- /dev/null +++ b/core/src/main/res/drawable-hdpi/ic_web_grey600_24dp.png diff --git a/core/src/main/res/drawable-hdpi/ic_web_white_24dp.png b/core/src/main/res/drawable-hdpi/ic_web_white_24dp.png Binary files differnew file mode 100644 index 000000000..952404cbc --- /dev/null +++ b/core/src/main/res/drawable-hdpi/ic_web_white_24dp.png diff --git a/core/src/main/res/drawable-hdpi/location_web_site.png b/core/src/main/res/drawable-hdpi/location_web_site.png Binary files differdeleted file mode 100644 index 6a2bc8857..000000000 --- a/core/src/main/res/drawable-hdpi/location_web_site.png +++ /dev/null diff --git a/core/src/main/res/drawable-hdpi/location_web_site_dark.png b/core/src/main/res/drawable-hdpi/location_web_site_dark.png Binary files differdeleted file mode 100755 index e154afdbc..000000000 --- a/core/src/main/res/drawable-hdpi/location_web_site_dark.png +++ /dev/null diff --git a/core/src/main/res/drawable-hdpi/navigation_accept.png b/core/src/main/res/drawable-hdpi/navigation_accept.png Binary files differdeleted file mode 100644 index 58bf97217..000000000 --- a/core/src/main/res/drawable-hdpi/navigation_accept.png +++ /dev/null diff --git a/core/src/main/res/drawable-hdpi/navigation_accept_dark.png b/core/src/main/res/drawable-hdpi/navigation_accept_dark.png Binary files differdeleted file mode 100755 index 53cf6877e..000000000 --- a/core/src/main/res/drawable-hdpi/navigation_accept_dark.png +++ /dev/null diff --git a/core/src/main/res/drawable-hdpi/navigation_cancel.png b/core/src/main/res/drawable-hdpi/navigation_cancel.png Binary files differdeleted file mode 100644 index cde36e1fa..000000000 --- a/core/src/main/res/drawable-hdpi/navigation_cancel.png +++ /dev/null diff --git a/core/src/main/res/drawable-hdpi/navigation_cancel_dark.png b/core/src/main/res/drawable-hdpi/navigation_cancel_dark.png Binary files differdeleted file mode 100755 index 094eea589..000000000 --- a/core/src/main/res/drawable-hdpi/navigation_cancel_dark.png +++ /dev/null diff --git a/core/src/main/res/drawable-hdpi/navigation_chapters.png b/core/src/main/res/drawable-hdpi/navigation_chapters.png Binary files differdeleted file mode 100755 index b034459bc..000000000 --- a/core/src/main/res/drawable-hdpi/navigation_chapters.png +++ /dev/null diff --git a/core/src/main/res/drawable-hdpi/navigation_chapters_dark.png b/core/src/main/res/drawable-hdpi/navigation_chapters_dark.png Binary files differdeleted file mode 100755 index 7b0d4889c..000000000 --- a/core/src/main/res/drawable-hdpi/navigation_chapters_dark.png +++ /dev/null diff --git a/core/src/main/res/drawable-hdpi/navigation_collapse.png b/core/src/main/res/drawable-hdpi/navigation_collapse.png Binary files differdeleted file mode 100755 index bd405bada..000000000 --- a/core/src/main/res/drawable-hdpi/navigation_collapse.png +++ /dev/null diff --git a/core/src/main/res/drawable-hdpi/navigation_collapse_dark.png b/core/src/main/res/drawable-hdpi/navigation_collapse_dark.png Binary files differdeleted file mode 100755 index ca78f2ec0..000000000 --- a/core/src/main/res/drawable-hdpi/navigation_collapse_dark.png +++ /dev/null diff --git a/core/src/main/res/drawable-hdpi/navigation_expand.png b/core/src/main/res/drawable-hdpi/navigation_expand.png Binary files differdeleted file mode 100644 index 8225e74b7..000000000 --- a/core/src/main/res/drawable-hdpi/navigation_expand.png +++ /dev/null diff --git a/core/src/main/res/drawable-hdpi/navigation_expand_dark.png b/core/src/main/res/drawable-hdpi/navigation_expand_dark.png Binary files differdeleted file mode 100755 index 1676b104b..000000000 --- a/core/src/main/res/drawable-hdpi/navigation_expand_dark.png +++ /dev/null diff --git a/core/src/main/res/drawable-hdpi/navigation_refresh.png b/core/src/main/res/drawable-hdpi/navigation_refresh.png Binary files differdeleted file mode 100644 index 479aca465..000000000 --- a/core/src/main/res/drawable-hdpi/navigation_refresh.png +++ /dev/null diff --git a/core/src/main/res/drawable-hdpi/navigation_refresh_dark.png b/core/src/main/res/drawable-hdpi/navigation_refresh_dark.png Binary files differdeleted file mode 100755 index bb9d855f7..000000000 --- a/core/src/main/res/drawable-hdpi/navigation_refresh_dark.png +++ /dev/null diff --git a/core/src/main/res/drawable-hdpi/navigation_shownotes.png b/core/src/main/res/drawable-hdpi/navigation_shownotes.png Binary files differdeleted file mode 100755 index c5f6c97b2..000000000 --- a/core/src/main/res/drawable-hdpi/navigation_shownotes.png +++ /dev/null diff --git a/core/src/main/res/drawable-hdpi/navigation_shownotes_dark.png b/core/src/main/res/drawable-hdpi/navigation_shownotes_dark.png Binary files differdeleted file mode 100755 index e45ea1fd9..000000000 --- a/core/src/main/res/drawable-hdpi/navigation_shownotes_dark.png +++ /dev/null diff --git a/core/src/main/res/drawable-hdpi/social_share.png b/core/src/main/res/drawable-hdpi/social_share.png Binary files differdeleted file mode 100644 index 47ae18674..000000000 --- a/core/src/main/res/drawable-hdpi/social_share.png +++ /dev/null diff --git a/core/src/main/res/drawable-hdpi/social_share_dark.png b/core/src/main/res/drawable-hdpi/social_share_dark.png Binary files differdeleted file mode 100755 index c329f58da..000000000 --- a/core/src/main/res/drawable-hdpi/social_share_dark.png +++ /dev/null diff --git a/core/src/main/res/drawable-hdpi/spinner_button.9.png b/core/src/main/res/drawable-hdpi/spinner_button.9.png Binary files differdeleted file mode 100644 index fa68a137f..000000000 --- a/core/src/main/res/drawable-hdpi/spinner_button.9.png +++ /dev/null diff --git a/core/src/main/res/drawable-hdpi/spinner_button_dark.9.png b/core/src/main/res/drawable-hdpi/spinner_button_dark.9.png Binary files differdeleted file mode 100644 index 88f8765cd..000000000 --- a/core/src/main/res/drawable-hdpi/spinner_button_dark.9.png +++ /dev/null diff --git a/core/src/main/res/drawable-hdpi/stat_playlist.png b/core/src/main/res/drawable-hdpi/stat_playlist.png Binary files differdeleted file mode 100644 index 93c3f02b8..000000000 --- a/core/src/main/res/drawable-hdpi/stat_playlist.png +++ /dev/null diff --git a/core/src/main/res/drawable-hdpi/stat_playlist_dark.png b/core/src/main/res/drawable-hdpi/stat_playlist_dark.png Binary files differdeleted file mode 100644 index 972ce98b3..000000000 --- a/core/src/main/res/drawable-hdpi/stat_playlist_dark.png +++ /dev/null diff --git a/core/src/main/res/drawable-hdpi/type_audio.png b/core/src/main/res/drawable-hdpi/type_audio.png Binary files differdeleted file mode 100644 index d43e8a33c..000000000 --- a/core/src/main/res/drawable-hdpi/type_audio.png +++ /dev/null diff --git a/core/src/main/res/drawable-hdpi/type_audio_dark.png b/core/src/main/res/drawable-hdpi/type_audio_dark.png Binary files differdeleted file mode 100755 index 7b69ea56b..000000000 --- a/core/src/main/res/drawable-hdpi/type_audio_dark.png +++ /dev/null diff --git a/core/src/main/res/drawable-hdpi/type_video.png b/core/src/main/res/drawable-hdpi/type_video.png Binary files differdeleted file mode 100644 index f9467146c..000000000 --- a/core/src/main/res/drawable-hdpi/type_video.png +++ /dev/null diff --git a/core/src/main/res/drawable-hdpi/type_video_dark.png b/core/src/main/res/drawable-hdpi/type_video_dark.png Binary files differdeleted file mode 100755 index 37f3a93a2..000000000 --- a/core/src/main/res/drawable-hdpi/type_video_dark.png +++ /dev/null diff --git a/core/src/main/res/drawable-ldpi/action_stream.png b/core/src/main/res/drawable-ldpi/action_stream.png Binary files differdeleted file mode 100644 index 5ae4f3d34..000000000 --- a/core/src/main/res/drawable-ldpi/action_stream.png +++ /dev/null diff --git a/core/src/main/res/drawable-ldpi/action_stream_dark.png b/core/src/main/res/drawable-ldpi/action_stream_dark.png Binary files differdeleted file mode 100644 index f3c81fff8..000000000 --- a/core/src/main/res/drawable-ldpi/action_stream_dark.png +++ /dev/null diff --git a/core/src/main/res/drawable-ldpi/stat_playlist.png b/core/src/main/res/drawable-ldpi/stat_playlist.png Binary files differdeleted file mode 100644 index 3a702ef2f..000000000 --- a/core/src/main/res/drawable-ldpi/stat_playlist.png +++ /dev/null diff --git a/core/src/main/res/drawable-ldpi/stat_playlist_dark.png b/core/src/main/res/drawable-ldpi/stat_playlist_dark.png Binary files differdeleted file mode 100644 index b82b06f67..000000000 --- a/core/src/main/res/drawable-ldpi/stat_playlist_dark.png +++ /dev/null diff --git a/core/src/main/res/drawable-mdpi/action_about.png b/core/src/main/res/drawable-mdpi/action_about.png Binary files differdeleted file mode 100644 index 7c57436fc..000000000 --- a/core/src/main/res/drawable-mdpi/action_about.png +++ /dev/null diff --git a/core/src/main/res/drawable-mdpi/action_about_dark.png b/core/src/main/res/drawable-mdpi/action_about_dark.png Binary files differdeleted file mode 100755 index d7b7e6986..000000000 --- a/core/src/main/res/drawable-mdpi/action_about_dark.png +++ /dev/null diff --git a/core/src/main/res/drawable-mdpi/action_search.png b/core/src/main/res/drawable-mdpi/action_search.png Binary files differdeleted file mode 100644 index 3aa644048..000000000 --- a/core/src/main/res/drawable-mdpi/action_search.png +++ /dev/null diff --git a/core/src/main/res/drawable-mdpi/action_search_dark.png b/core/src/main/res/drawable-mdpi/action_search_dark.png Binary files differdeleted file mode 100755 index 587d9e0bf..000000000 --- a/core/src/main/res/drawable-mdpi/action_search_dark.png +++ /dev/null diff --git a/core/src/main/res/drawable-mdpi/action_settings.png b/core/src/main/res/drawable-mdpi/action_settings.png Binary files differdeleted file mode 100644 index dc66d914e..000000000 --- a/core/src/main/res/drawable-mdpi/action_settings.png +++ /dev/null diff --git a/core/src/main/res/drawable-mdpi/action_settings_dark.png b/core/src/main/res/drawable-mdpi/action_settings_dark.png Binary files differdeleted file mode 100755 index d3e42edcb..000000000 --- a/core/src/main/res/drawable-mdpi/action_settings_dark.png +++ /dev/null diff --git a/core/src/main/res/drawable-mdpi/action_stream.png b/core/src/main/res/drawable-mdpi/action_stream.png Binary files differdeleted file mode 100644 index 4bc7d8379..000000000 --- a/core/src/main/res/drawable-mdpi/action_stream.png +++ /dev/null diff --git a/core/src/main/res/drawable-mdpi/action_stream_dark.png b/core/src/main/res/drawable-mdpi/action_stream_dark.png Binary files differdeleted file mode 100644 index 1f4fdd186..000000000 --- a/core/src/main/res/drawable-mdpi/action_stream_dark.png +++ /dev/null diff --git a/core/src/main/res/drawable-mdpi/av_download.png b/core/src/main/res/drawable-mdpi/av_download.png Binary files differdeleted file mode 100644 index 678ecfad4..000000000 --- a/core/src/main/res/drawable-mdpi/av_download.png +++ /dev/null diff --git a/core/src/main/res/drawable-mdpi/av_download_dark.png b/core/src/main/res/drawable-mdpi/av_download_dark.png Binary files differdeleted file mode 100755 index cc4d9576b..000000000 --- a/core/src/main/res/drawable-mdpi/av_download_dark.png +++ /dev/null diff --git a/core/src/main/res/drawable-mdpi/av_fast_forward.png b/core/src/main/res/drawable-mdpi/av_fast_forward.png Binary files differdeleted file mode 100644 index 43f15a245..000000000 --- a/core/src/main/res/drawable-mdpi/av_fast_forward.png +++ /dev/null diff --git a/core/src/main/res/drawable-mdpi/av_fast_forward_dark.png b/core/src/main/res/drawable-mdpi/av_fast_forward_dark.png Binary files differdeleted file mode 100755 index fc8074cea..000000000 --- a/core/src/main/res/drawable-mdpi/av_fast_forward_dark.png +++ /dev/null diff --git a/core/src/main/res/drawable-mdpi/av_pause.png b/core/src/main/res/drawable-mdpi/av_pause.png Binary files differdeleted file mode 100644 index 01858e34d..000000000 --- a/core/src/main/res/drawable-mdpi/av_pause.png +++ /dev/null diff --git a/core/src/main/res/drawable-mdpi/av_pause_dark.png b/core/src/main/res/drawable-mdpi/av_pause_dark.png Binary files differdeleted file mode 100755 index a5aee6f2c..000000000 --- a/core/src/main/res/drawable-mdpi/av_pause_dark.png +++ /dev/null diff --git a/core/src/main/res/drawable-mdpi/av_play.png b/core/src/main/res/drawable-mdpi/av_play.png Binary files differdeleted file mode 100644 index 1e3bc97af..000000000 --- a/core/src/main/res/drawable-mdpi/av_play.png +++ /dev/null diff --git a/core/src/main/res/drawable-mdpi/av_play_dark.png b/core/src/main/res/drawable-mdpi/av_play_dark.png Binary files differdeleted file mode 100755 index 6a40cd5f7..000000000 --- a/core/src/main/res/drawable-mdpi/av_play_dark.png +++ /dev/null diff --git a/core/src/main/res/drawable-mdpi/av_rewind.png b/core/src/main/res/drawable-mdpi/av_rewind.png Binary files differdeleted file mode 100644 index a2f7f5895..000000000 --- a/core/src/main/res/drawable-mdpi/av_rewind.png +++ /dev/null diff --git a/core/src/main/res/drawable-mdpi/av_rewind_dark.png b/core/src/main/res/drawable-mdpi/av_rewind_dark.png Binary files differdeleted file mode 100755 index e555a2046..000000000 --- a/core/src/main/res/drawable-mdpi/av_rewind_dark.png +++ /dev/null diff --git a/core/src/main/res/drawable-mdpi/content_discard.png b/core/src/main/res/drawable-mdpi/content_discard.png Binary files differdeleted file mode 100644 index cedb1085b..000000000 --- a/core/src/main/res/drawable-mdpi/content_discard.png +++ /dev/null diff --git a/core/src/main/res/drawable-mdpi/content_discard_dark.png b/core/src/main/res/drawable-mdpi/content_discard_dark.png Binary files differdeleted file mode 100755 index a8ee5f253..000000000 --- a/core/src/main/res/drawable-mdpi/content_discard_dark.png +++ /dev/null diff --git a/core/src/main/res/drawable-mdpi/content_new.png b/core/src/main/res/drawable-mdpi/content_new.png Binary files differdeleted file mode 100644 index 884c9d270..000000000 --- a/core/src/main/res/drawable-mdpi/content_new.png +++ /dev/null diff --git a/core/src/main/res/drawable-mdpi/content_new_dark.png b/core/src/main/res/drawable-mdpi/content_new_dark.png Binary files differdeleted file mode 100755 index 4d5d484b3..000000000 --- a/core/src/main/res/drawable-mdpi/content_new_dark.png +++ /dev/null diff --git a/core/src/main/res/drawable-mdpi/default_cover.png b/core/src/main/res/drawable-mdpi/default_cover.png Binary files differdeleted file mode 100644 index 62adf32ab..000000000 --- a/core/src/main/res/drawable-mdpi/default_cover.png +++ /dev/null diff --git a/core/src/main/res/drawable-mdpi/default_cover_dark.png b/core/src/main/res/drawable-mdpi/default_cover_dark.png Binary files differdeleted file mode 100755 index d6235554b..000000000 --- a/core/src/main/res/drawable-mdpi/default_cover_dark.png +++ /dev/null diff --git a/core/src/main/res/drawable-mdpi/device_access_time.png b/core/src/main/res/drawable-mdpi/device_access_time.png Binary files differdeleted file mode 100644 index de9b4fb2a..000000000 --- a/core/src/main/res/drawable-mdpi/device_access_time.png +++ /dev/null diff --git a/core/src/main/res/drawable-mdpi/device_access_time_dark.png b/core/src/main/res/drawable-mdpi/device_access_time_dark.png Binary files differdeleted file mode 100755 index a09df2b99..000000000 --- a/core/src/main/res/drawable-mdpi/device_access_time_dark.png +++ /dev/null diff --git a/core/src/main/res/drawable-mdpi/ic_action_overflow.png b/core/src/main/res/drawable-mdpi/ic_action_overflow.png Binary files differdeleted file mode 100644 index 6f0fb23f4..000000000 --- a/core/src/main/res/drawable-mdpi/ic_action_overflow.png +++ /dev/null diff --git a/core/src/main/res/drawable-mdpi/ic_action_overflow_dark.png b/core/src/main/res/drawable-mdpi/ic_action_overflow_dark.png Binary files differdeleted file mode 100644 index b4a4a221f..000000000 --- a/core/src/main/res/drawable-mdpi/ic_action_overflow_dark.png +++ /dev/null diff --git a/core/src/main/res/drawable-mdpi/ic_add_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_add_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..07858bc09 --- /dev/null +++ b/core/src/main/res/drawable-mdpi/ic_add_grey600_24dp.png diff --git a/core/src/main/res/drawable-mdpi/ic_add_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_add_white_24dp.png Binary files differnew file mode 100644 index 000000000..977dd3427 --- /dev/null +++ b/core/src/main/res/drawable-mdpi/ic_add_white_24dp.png diff --git a/core/src/main/res/drawable-mdpi/ic_cancel_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_cancel_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..a7a30cc24 --- /dev/null +++ b/core/src/main/res/drawable-mdpi/ic_cancel_grey600_24dp.png diff --git a/core/src/main/res/drawable-mdpi/ic_cancel_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_cancel_white_24dp.png Binary files differnew file mode 100644 index 000000000..df332ef3c --- /dev/null +++ b/core/src/main/res/drawable-mdpi/ic_cancel_white_24dp.png diff --git a/core/src/main/res/drawable-mdpi/ic_delete_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_delete_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..e757fdb07 --- /dev/null +++ b/core/src/main/res/drawable-mdpi/ic_delete_grey600_24dp.png diff --git a/core/src/main/res/drawable-mdpi/ic_delete_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_delete_white_24dp.png Binary files differnew file mode 100644 index 000000000..e4ea52ef2 --- /dev/null +++ b/core/src/main/res/drawable-mdpi/ic_delete_white_24dp.png diff --git a/core/src/main/res/drawable-mdpi/ic_description_grey600_36dp.png b/core/src/main/res/drawable-mdpi/ic_description_grey600_36dp.png Binary files differnew file mode 100644 index 000000000..ac18b5750 --- /dev/null +++ b/core/src/main/res/drawable-mdpi/ic_description_grey600_36dp.png diff --git a/core/src/main/res/drawable-mdpi/ic_description_white_36dp.png b/core/src/main/res/drawable-mdpi/ic_description_white_36dp.png Binary files differnew file mode 100644 index 000000000..f5612717f --- /dev/null +++ b/core/src/main/res/drawable-mdpi/ic_description_white_36dp.png diff --git a/core/src/main/res/drawable-mdpi/ic_done_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_done_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..9f860915d --- /dev/null +++ b/core/src/main/res/drawable-mdpi/ic_done_grey600_24dp.png diff --git a/core/src/main/res/drawable-mdpi/ic_done_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_done_white_24dp.png Binary files differnew file mode 100644 index 000000000..e91f9048b --- /dev/null +++ b/core/src/main/res/drawable-mdpi/ic_done_white_24dp.png diff --git a/core/src/main/res/drawable-mdpi/ic_drawer.png b/core/src/main/res/drawable-mdpi/ic_drawer.png Binary files differdeleted file mode 100644 index 1ed2c56ee..000000000 --- a/core/src/main/res/drawable-mdpi/ic_drawer.png +++ /dev/null diff --git a/core/src/main/res/drawable-mdpi/ic_drawer_dark.png b/core/src/main/res/drawable-mdpi/ic_drawer_dark.png Binary files differdeleted file mode 100644 index b05c026c1..000000000 --- a/core/src/main/res/drawable-mdpi/ic_drawer_dark.png +++ /dev/null diff --git a/core/src/main/res/drawable-mdpi/ic_expand_more_grey600_36dp.png b/core/src/main/res/drawable-mdpi/ic_expand_more_grey600_36dp.png Binary files differnew file mode 100644 index 000000000..00b9f645c --- /dev/null +++ b/core/src/main/res/drawable-mdpi/ic_expand_more_grey600_36dp.png diff --git a/core/src/main/res/drawable-mdpi/ic_expand_more_white_36dp.png b/core/src/main/res/drawable-mdpi/ic_expand_more_white_36dp.png Binary files differnew file mode 100644 index 000000000..6c2476660 --- /dev/null +++ b/core/src/main/res/drawable-mdpi/ic_expand_more_white_36dp.png diff --git a/core/src/main/res/drawable-mdpi/ic_fast_forward_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_fast_forward_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..c2864a726 --- /dev/null +++ b/core/src/main/res/drawable-mdpi/ic_fast_forward_grey600_24dp.png diff --git a/core/src/main/res/drawable-mdpi/ic_fast_forward_grey600_36dp.png b/core/src/main/res/drawable-mdpi/ic_fast_forward_grey600_36dp.png Binary files differnew file mode 100644 index 000000000..4d1c1d4ae --- /dev/null +++ b/core/src/main/res/drawable-mdpi/ic_fast_forward_grey600_36dp.png diff --git a/core/src/main/res/drawable-mdpi/ic_fast_forward_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_fast_forward_white_24dp.png Binary files differnew file mode 100644 index 000000000..215099f9e --- /dev/null +++ b/core/src/main/res/drawable-mdpi/ic_fast_forward_white_24dp.png diff --git a/core/src/main/res/drawable-mdpi/ic_fast_forward_white_36dp.png b/core/src/main/res/drawable-mdpi/ic_fast_forward_white_36dp.png Binary files differnew file mode 100644 index 000000000..03a54ee75 --- /dev/null +++ b/core/src/main/res/drawable-mdpi/ic_fast_forward_white_36dp.png diff --git a/core/src/main/res/drawable-mdpi/ic_fast_rewind_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_fast_rewind_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..75adfc97e --- /dev/null +++ b/core/src/main/res/drawable-mdpi/ic_fast_rewind_grey600_24dp.png diff --git a/core/src/main/res/drawable-mdpi/ic_fast_rewind_grey600_36dp.png b/core/src/main/res/drawable-mdpi/ic_fast_rewind_grey600_36dp.png Binary files differnew file mode 100644 index 000000000..9866ee629 --- /dev/null +++ b/core/src/main/res/drawable-mdpi/ic_fast_rewind_grey600_36dp.png diff --git a/core/src/main/res/drawable-mdpi/ic_fast_rewind_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_fast_rewind_white_24dp.png Binary files differnew file mode 100644 index 000000000..a050e1bb8 --- /dev/null +++ b/core/src/main/res/drawable-mdpi/ic_fast_rewind_white_24dp.png diff --git a/core/src/main/res/drawable-mdpi/ic_fast_rewind_white_36dp.png b/core/src/main/res/drawable-mdpi/ic_fast_rewind_white_36dp.png Binary files differnew file mode 100644 index 000000000..b4f526e62 --- /dev/null +++ b/core/src/main/res/drawable-mdpi/ic_fast_rewind_white_36dp.png diff --git a/core/src/main/res/drawable-mdpi/ic_file_download_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_file_download_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..b3ef8ce73 --- /dev/null +++ b/core/src/main/res/drawable-mdpi/ic_file_download_grey600_24dp.png diff --git a/core/src/main/res/drawable-mdpi/ic_file_download_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_file_download_white_24dp.png Binary files differnew file mode 100644 index 000000000..e089466de --- /dev/null +++ b/core/src/main/res/drawable-mdpi/ic_file_download_white_24dp.png diff --git a/core/src/main/res/drawable-mdpi/ic_hearing_grey600_18dp.png b/core/src/main/res/drawable-mdpi/ic_hearing_grey600_18dp.png Binary files differnew file mode 100644 index 000000000..df26536f9 --- /dev/null +++ b/core/src/main/res/drawable-mdpi/ic_hearing_grey600_18dp.png diff --git a/core/src/main/res/drawable-mdpi/ic_hearing_white_18dp.png b/core/src/main/res/drawable-mdpi/ic_hearing_white_18dp.png Binary files differnew file mode 100644 index 000000000..0771a106d --- /dev/null +++ b/core/src/main/res/drawable-mdpi/ic_hearing_white_18dp.png diff --git a/core/src/main/res/drawable-mdpi/ic_history_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_history_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..0a62d358f --- /dev/null +++ b/core/src/main/res/drawable-mdpi/ic_history_grey600_24dp.png diff --git a/core/src/main/res/drawable-mdpi/ic_history_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_history_white_24dp.png Binary files differnew file mode 100644 index 000000000..b93da1006 --- /dev/null +++ b/core/src/main/res/drawable-mdpi/ic_history_white_24dp.png diff --git a/core/src/main/res/drawable-mdpi/ic_info_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_info_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..2537c5f42 --- /dev/null +++ b/core/src/main/res/drawable-mdpi/ic_info_grey600_24dp.png diff --git a/core/src/main/res/drawable-mdpi/ic_info_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_info_white_24dp.png Binary files differnew file mode 100644 index 000000000..34f980085 --- /dev/null +++ b/core/src/main/res/drawable-mdpi/ic_info_white_24dp.png diff --git a/core/src/main/res/drawable-mdpi/ic_list_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_list_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..c5c2fc195 --- /dev/null +++ b/core/src/main/res/drawable-mdpi/ic_list_grey600_24dp.png diff --git a/core/src/main/res/drawable-mdpi/ic_list_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_list_white_24dp.png Binary files differnew file mode 100644 index 000000000..5e51ed478 --- /dev/null +++ b/core/src/main/res/drawable-mdpi/ic_list_white_24dp.png diff --git a/core/src/main/res/drawable-mdpi/ic_more_vert_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_more_vert_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..4ed34354b --- /dev/null +++ b/core/src/main/res/drawable-mdpi/ic_more_vert_grey600_24dp.png diff --git a/core/src/main/res/drawable-mdpi/ic_more_vert_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_more_vert_white_24dp.png Binary files differnew file mode 100644 index 000000000..1d8ad18a0 --- /dev/null +++ b/core/src/main/res/drawable-mdpi/ic_more_vert_white_24dp.png diff --git a/core/src/main/res/drawable-mdpi/ic_new_releases_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_new_releases_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..494781a20 --- /dev/null +++ b/core/src/main/res/drawable-mdpi/ic_new_releases_grey600_24dp.png diff --git a/core/src/main/res/drawable-mdpi/ic_new_releases_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_new_releases_white_24dp.png Binary files differnew file mode 100644 index 000000000..36e3262a4 --- /dev/null +++ b/core/src/main/res/drawable-mdpi/ic_new_releases_white_24dp.png diff --git a/core/src/main/res/drawable-mdpi/ic_pause_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_pause_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..06abcb50b --- /dev/null +++ b/core/src/main/res/drawable-mdpi/ic_pause_grey600_24dp.png diff --git a/core/src/main/res/drawable-mdpi/ic_pause_grey600_36dp.png b/core/src/main/res/drawable-mdpi/ic_pause_grey600_36dp.png Binary files differnew file mode 100644 index 000000000..711e0cf94 --- /dev/null +++ b/core/src/main/res/drawable-mdpi/ic_pause_grey600_36dp.png diff --git a/core/src/main/res/drawable-mdpi/ic_pause_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_pause_white_24dp.png Binary files differnew file mode 100644 index 000000000..026f38854 --- /dev/null +++ b/core/src/main/res/drawable-mdpi/ic_pause_white_24dp.png diff --git a/core/src/main/res/drawable-mdpi/ic_pause_white_36dp.png b/core/src/main/res/drawable-mdpi/ic_pause_white_36dp.png Binary files differnew file mode 100644 index 000000000..b4bdbb558 --- /dev/null +++ b/core/src/main/res/drawable-mdpi/ic_pause_white_36dp.png diff --git a/core/src/main/res/drawable-mdpi/ic_play_arrow_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_play_arrow_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..4ff5decb0 --- /dev/null +++ b/core/src/main/res/drawable-mdpi/ic_play_arrow_grey600_24dp.png diff --git a/core/src/main/res/drawable-mdpi/ic_play_arrow_grey600_36dp.png b/core/src/main/res/drawable-mdpi/ic_play_arrow_grey600_36dp.png Binary files differnew file mode 100644 index 000000000..264416933 --- /dev/null +++ b/core/src/main/res/drawable-mdpi/ic_play_arrow_grey600_36dp.png diff --git a/core/src/main/res/drawable-mdpi/ic_play_arrow_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_play_arrow_white_24dp.png Binary files differnew file mode 100644 index 000000000..8d1e433a5 --- /dev/null +++ b/core/src/main/res/drawable-mdpi/ic_play_arrow_white_24dp.png diff --git a/core/src/main/res/drawable-mdpi/ic_play_arrow_white_36dp.png b/core/src/main/res/drawable-mdpi/ic_play_arrow_white_36dp.png Binary files differnew file mode 100644 index 000000000..164385d04 --- /dev/null +++ b/core/src/main/res/drawable-mdpi/ic_play_arrow_white_36dp.png diff --git a/core/src/main/res/drawable-mdpi/ic_refresh_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_refresh_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..c136c59fc --- /dev/null +++ b/core/src/main/res/drawable-mdpi/ic_refresh_grey600_24dp.png diff --git a/core/src/main/res/drawable-mdpi/ic_refresh_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_refresh_white_24dp.png Binary files differnew file mode 100644 index 000000000..235c84f1e --- /dev/null +++ b/core/src/main/res/drawable-mdpi/ic_refresh_white_24dp.png diff --git a/core/src/main/res/drawable-mdpi/ic_remove_red_eye_grey600_18dp.png b/core/src/main/res/drawable-mdpi/ic_remove_red_eye_grey600_18dp.png Binary files differnew file mode 100644 index 000000000..9e840f03e --- /dev/null +++ b/core/src/main/res/drawable-mdpi/ic_remove_red_eye_grey600_18dp.png diff --git a/core/src/main/res/drawable-mdpi/ic_remove_red_eye_white_18dp.png b/core/src/main/res/drawable-mdpi/ic_remove_red_eye_white_18dp.png Binary files differnew file mode 100644 index 000000000..0bcba825f --- /dev/null +++ b/core/src/main/res/drawable-mdpi/ic_remove_red_eye_white_18dp.png diff --git a/core/src/main/res/drawable-mdpi/ic_search_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_search_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..29954062c --- /dev/null +++ b/core/src/main/res/drawable-mdpi/ic_search_grey600_24dp.png diff --git a/core/src/main/res/drawable-mdpi/ic_search_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_search_white_24dp.png Binary files differnew file mode 100644 index 000000000..dff1e3a8a --- /dev/null +++ b/core/src/main/res/drawable-mdpi/ic_search_white_24dp.png diff --git a/core/src/main/res/drawable-mdpi/ic_settings_input_antenna_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_settings_input_antenna_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..8995d0f43 --- /dev/null +++ b/core/src/main/res/drawable-mdpi/ic_settings_input_antenna_grey600_24dp.png diff --git a/core/src/main/res/drawable-mdpi/ic_settings_input_antenna_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_settings_input_antenna_white_24dp.png Binary files differnew file mode 100644 index 000000000..c31fa8309 --- /dev/null +++ b/core/src/main/res/drawable-mdpi/ic_settings_input_antenna_white_24dp.png diff --git a/core/src/main/res/drawable-mdpi/ic_share_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_share_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..ee0248838 --- /dev/null +++ b/core/src/main/res/drawable-mdpi/ic_share_grey600_24dp.png diff --git a/core/src/main/res/drawable-mdpi/ic_share_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_share_white_24dp.png Binary files differnew file mode 100644 index 000000000..4d0197223 --- /dev/null +++ b/core/src/main/res/drawable-mdpi/ic_share_white_24dp.png diff --git a/core/src/main/res/drawable-mdpi/ic_timer_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_timer_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..186887c30 --- /dev/null +++ b/core/src/main/res/drawable-mdpi/ic_timer_grey600_24dp.png diff --git a/core/src/main/res/drawable-mdpi/ic_timer_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_timer_white_24dp.png Binary files differnew file mode 100644 index 000000000..735ed7a00 --- /dev/null +++ b/core/src/main/res/drawable-mdpi/ic_timer_white_24dp.png diff --git a/core/src/main/res/drawable-mdpi/ic_toc_grey600_36dp.png b/core/src/main/res/drawable-mdpi/ic_toc_grey600_36dp.png Binary files differnew file mode 100644 index 000000000..23bec7945 --- /dev/null +++ b/core/src/main/res/drawable-mdpi/ic_toc_grey600_36dp.png diff --git a/core/src/main/res/drawable-mdpi/ic_toc_white_36dp.png b/core/src/main/res/drawable-mdpi/ic_toc_white_36dp.png Binary files differnew file mode 100644 index 000000000..dc03b34b9 --- /dev/null +++ b/core/src/main/res/drawable-mdpi/ic_toc_white_36dp.png diff --git a/core/src/main/res/drawable-mdpi/ic_web_grey600_24dp.png b/core/src/main/res/drawable-mdpi/ic_web_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..cdbce22a7 --- /dev/null +++ b/core/src/main/res/drawable-mdpi/ic_web_grey600_24dp.png diff --git a/core/src/main/res/drawable-mdpi/ic_web_white_24dp.png b/core/src/main/res/drawable-mdpi/ic_web_white_24dp.png Binary files differnew file mode 100644 index 000000000..3602c4c48 --- /dev/null +++ b/core/src/main/res/drawable-mdpi/ic_web_white_24dp.png diff --git a/core/src/main/res/drawable-mdpi/location_web_site.png b/core/src/main/res/drawable-mdpi/location_web_site.png Binary files differdeleted file mode 100644 index f146cf997..000000000 --- a/core/src/main/res/drawable-mdpi/location_web_site.png +++ /dev/null diff --git a/core/src/main/res/drawable-mdpi/location_web_site_dark.png b/core/src/main/res/drawable-mdpi/location_web_site_dark.png Binary files differdeleted file mode 100755 index 41b56ec92..000000000 --- a/core/src/main/res/drawable-mdpi/location_web_site_dark.png +++ /dev/null diff --git a/core/src/main/res/drawable-mdpi/navigation_accept.png b/core/src/main/res/drawable-mdpi/navigation_accept.png Binary files differdeleted file mode 100644 index cf5fab3ad..000000000 --- a/core/src/main/res/drawable-mdpi/navigation_accept.png +++ /dev/null diff --git a/core/src/main/res/drawable-mdpi/navigation_accept_dark.png b/core/src/main/res/drawable-mdpi/navigation_accept_dark.png Binary files differdeleted file mode 100755 index 35cda8e11..000000000 --- a/core/src/main/res/drawable-mdpi/navigation_accept_dark.png +++ /dev/null diff --git a/core/src/main/res/drawable-mdpi/navigation_cancel.png b/core/src/main/res/drawable-mdpi/navigation_cancel.png Binary files differdeleted file mode 100644 index 9f4c3d6a2..000000000 --- a/core/src/main/res/drawable-mdpi/navigation_cancel.png +++ /dev/null diff --git a/core/src/main/res/drawable-mdpi/navigation_cancel_dark.png b/core/src/main/res/drawable-mdpi/navigation_cancel_dark.png Binary files differdeleted file mode 100755 index 3336760d5..000000000 --- a/core/src/main/res/drawable-mdpi/navigation_cancel_dark.png +++ /dev/null diff --git a/core/src/main/res/drawable-mdpi/navigation_chapters.png b/core/src/main/res/drawable-mdpi/navigation_chapters.png Binary files differdeleted file mode 100755 index b1884726c..000000000 --- a/core/src/main/res/drawable-mdpi/navigation_chapters.png +++ /dev/null diff --git a/core/src/main/res/drawable-mdpi/navigation_chapters_dark.png b/core/src/main/res/drawable-mdpi/navigation_chapters_dark.png Binary files differdeleted file mode 100755 index 1042294e4..000000000 --- a/core/src/main/res/drawable-mdpi/navigation_chapters_dark.png +++ /dev/null diff --git a/core/src/main/res/drawable-mdpi/navigation_collapse.png b/core/src/main/res/drawable-mdpi/navigation_collapse.png Binary files differdeleted file mode 100755 index 6673c7aea..000000000 --- a/core/src/main/res/drawable-mdpi/navigation_collapse.png +++ /dev/null diff --git a/core/src/main/res/drawable-mdpi/navigation_collapse_dark.png b/core/src/main/res/drawable-mdpi/navigation_collapse_dark.png Binary files differdeleted file mode 100755 index 01d6511ee..000000000 --- a/core/src/main/res/drawable-mdpi/navigation_collapse_dark.png +++ /dev/null diff --git a/core/src/main/res/drawable-mdpi/navigation_expand.png b/core/src/main/res/drawable-mdpi/navigation_expand.png Binary files differdeleted file mode 100644 index 78107862c..000000000 --- a/core/src/main/res/drawable-mdpi/navigation_expand.png +++ /dev/null diff --git a/core/src/main/res/drawable-mdpi/navigation_expand_dark.png b/core/src/main/res/drawable-mdpi/navigation_expand_dark.png Binary files differdeleted file mode 100755 index aa2b40ca0..000000000 --- a/core/src/main/res/drawable-mdpi/navigation_expand_dark.png +++ /dev/null diff --git a/core/src/main/res/drawable-mdpi/navigation_refresh.png b/core/src/main/res/drawable-mdpi/navigation_refresh.png Binary files differdeleted file mode 100644 index 63e70e178..000000000 --- a/core/src/main/res/drawable-mdpi/navigation_refresh.png +++ /dev/null diff --git a/core/src/main/res/drawable-mdpi/navigation_refresh_dark.png b/core/src/main/res/drawable-mdpi/navigation_refresh_dark.png Binary files differdeleted file mode 100755 index bd611e8e2..000000000 --- a/core/src/main/res/drawable-mdpi/navigation_refresh_dark.png +++ /dev/null diff --git a/core/src/main/res/drawable-mdpi/navigation_shownotes.png b/core/src/main/res/drawable-mdpi/navigation_shownotes.png Binary files differdeleted file mode 100755 index ec6a2bf8f..000000000 --- a/core/src/main/res/drawable-mdpi/navigation_shownotes.png +++ /dev/null diff --git a/core/src/main/res/drawable-mdpi/navigation_shownotes_dark.png b/core/src/main/res/drawable-mdpi/navigation_shownotes_dark.png Binary files differdeleted file mode 100755 index 9c748b0b5..000000000 --- a/core/src/main/res/drawable-mdpi/navigation_shownotes_dark.png +++ /dev/null diff --git a/core/src/main/res/drawable-mdpi/social_share.png b/core/src/main/res/drawable-mdpi/social_share.png Binary files differdeleted file mode 100644 index 8aa52bc7d..000000000 --- a/core/src/main/res/drawable-mdpi/social_share.png +++ /dev/null diff --git a/core/src/main/res/drawable-mdpi/social_share_dark.png b/core/src/main/res/drawable-mdpi/social_share_dark.png Binary files differdeleted file mode 100755 index 056deb57b..000000000 --- a/core/src/main/res/drawable-mdpi/social_share_dark.png +++ /dev/null diff --git a/core/src/main/res/drawable-mdpi/spinner_button.9.png b/core/src/main/res/drawable-mdpi/spinner_button.9.png Binary files differdeleted file mode 100644 index 716560bb1..000000000 --- a/core/src/main/res/drawable-mdpi/spinner_button.9.png +++ /dev/null diff --git a/core/src/main/res/drawable-mdpi/spinner_button_dark.9.png b/core/src/main/res/drawable-mdpi/spinner_button_dark.9.png Binary files differdeleted file mode 100644 index 8d7594685..000000000 --- a/core/src/main/res/drawable-mdpi/spinner_button_dark.9.png +++ /dev/null diff --git a/core/src/main/res/drawable-mdpi/stat_playlist.png b/core/src/main/res/drawable-mdpi/stat_playlist.png Binary files differdeleted file mode 100644 index 136a7a265..000000000 --- a/core/src/main/res/drawable-mdpi/stat_playlist.png +++ /dev/null diff --git a/core/src/main/res/drawable-mdpi/stat_playlist_dark.png b/core/src/main/res/drawable-mdpi/stat_playlist_dark.png Binary files differdeleted file mode 100644 index 7ed94b13c..000000000 --- a/core/src/main/res/drawable-mdpi/stat_playlist_dark.png +++ /dev/null diff --git a/core/src/main/res/drawable-mdpi/type_audio.png b/core/src/main/res/drawable-mdpi/type_audio.png Binary files differdeleted file mode 100644 index 4ec9efd97..000000000 --- a/core/src/main/res/drawable-mdpi/type_audio.png +++ /dev/null diff --git a/core/src/main/res/drawable-mdpi/type_audio_dark.png b/core/src/main/res/drawable-mdpi/type_audio_dark.png Binary files differdeleted file mode 100755 index f8dd8469c..000000000 --- a/core/src/main/res/drawable-mdpi/type_audio_dark.png +++ /dev/null diff --git a/core/src/main/res/drawable-mdpi/type_video.png b/core/src/main/res/drawable-mdpi/type_video.png Binary files differdeleted file mode 100644 index a2722b812..000000000 --- a/core/src/main/res/drawable-mdpi/type_video.png +++ /dev/null diff --git a/core/src/main/res/drawable-mdpi/type_video_dark.png b/core/src/main/res/drawable-mdpi/type_video_dark.png Binary files differdeleted file mode 100755 index aa0c320dc..000000000 --- a/core/src/main/res/drawable-mdpi/type_video_dark.png +++ /dev/null diff --git a/core/src/main/res/drawable-xhdpi/action_about.png b/core/src/main/res/drawable-xhdpi/action_about.png Binary files differdeleted file mode 100644 index 2641f142a..000000000 --- a/core/src/main/res/drawable-xhdpi/action_about.png +++ /dev/null diff --git a/core/src/main/res/drawable-xhdpi/action_about_dark.png b/core/src/main/res/drawable-xhdpi/action_about_dark.png Binary files differdeleted file mode 100755 index 4ee903f07..000000000 --- a/core/src/main/res/drawable-xhdpi/action_about_dark.png +++ /dev/null diff --git a/core/src/main/res/drawable-xhdpi/action_search.png b/core/src/main/res/drawable-xhdpi/action_search.png Binary files differdeleted file mode 100644 index 804420aee..000000000 --- a/core/src/main/res/drawable-xhdpi/action_search.png +++ /dev/null diff --git a/core/src/main/res/drawable-xhdpi/action_search_dark.png b/core/src/main/res/drawable-xhdpi/action_search_dark.png Binary files differdeleted file mode 100755 index 3549f84dd..000000000 --- a/core/src/main/res/drawable-xhdpi/action_search_dark.png +++ /dev/null diff --git a/core/src/main/res/drawable-xhdpi/action_settings.png b/core/src/main/res/drawable-xhdpi/action_settings.png Binary files differdeleted file mode 100644 index 04b65dc34..000000000 --- a/core/src/main/res/drawable-xhdpi/action_settings.png +++ /dev/null diff --git a/core/src/main/res/drawable-xhdpi/action_settings_dark.png b/core/src/main/res/drawable-xhdpi/action_settings_dark.png Binary files differdeleted file mode 100755 index 09b014834..000000000 --- a/core/src/main/res/drawable-xhdpi/action_settings_dark.png +++ /dev/null diff --git a/core/src/main/res/drawable-xhdpi/action_stream.png b/core/src/main/res/drawable-xhdpi/action_stream.png Binary files differdeleted file mode 100644 index f87f2da5e..000000000 --- a/core/src/main/res/drawable-xhdpi/action_stream.png +++ /dev/null diff --git a/core/src/main/res/drawable-xhdpi/action_stream_dark.png b/core/src/main/res/drawable-xhdpi/action_stream_dark.png Binary files differdeleted file mode 100644 index d3721318c..000000000 --- a/core/src/main/res/drawable-xhdpi/action_stream_dark.png +++ /dev/null diff --git a/core/src/main/res/drawable-xhdpi/av_download.png b/core/src/main/res/drawable-xhdpi/av_download.png Binary files differdeleted file mode 100644 index dfe81e064..000000000 --- a/core/src/main/res/drawable-xhdpi/av_download.png +++ /dev/null diff --git a/core/src/main/res/drawable-xhdpi/av_download_dark.png b/core/src/main/res/drawable-xhdpi/av_download_dark.png Binary files differdeleted file mode 100755 index bc0ced50f..000000000 --- a/core/src/main/res/drawable-xhdpi/av_download_dark.png +++ /dev/null diff --git a/core/src/main/res/drawable-xhdpi/av_fast_forward.png b/core/src/main/res/drawable-xhdpi/av_fast_forward.png Binary files differdeleted file mode 100644 index 026c3b779..000000000 --- a/core/src/main/res/drawable-xhdpi/av_fast_forward.png +++ /dev/null diff --git a/core/src/main/res/drawable-xhdpi/av_fast_forward_dark.png b/core/src/main/res/drawable-xhdpi/av_fast_forward_dark.png Binary files differdeleted file mode 100755 index 896334d47..000000000 --- a/core/src/main/res/drawable-xhdpi/av_fast_forward_dark.png +++ /dev/null diff --git a/core/src/main/res/drawable-xhdpi/av_pause.png b/core/src/main/res/drawable-xhdpi/av_pause.png Binary files differdeleted file mode 100644 index 97d6f91ac..000000000 --- a/core/src/main/res/drawable-xhdpi/av_pause.png +++ /dev/null diff --git a/core/src/main/res/drawable-xhdpi/av_pause_dark.png b/core/src/main/res/drawable-xhdpi/av_pause_dark.png Binary files differdeleted file mode 100755 index 333c1b24d..000000000 --- a/core/src/main/res/drawable-xhdpi/av_pause_dark.png +++ /dev/null diff --git a/core/src/main/res/drawable-xhdpi/av_play.png b/core/src/main/res/drawable-xhdpi/av_play.png Binary files differdeleted file mode 100644 index 2d67d31e7..000000000 --- a/core/src/main/res/drawable-xhdpi/av_play.png +++ /dev/null diff --git a/core/src/main/res/drawable-xhdpi/av_play_dark.png b/core/src/main/res/drawable-xhdpi/av_play_dark.png Binary files differdeleted file mode 100755 index 51124993d..000000000 --- a/core/src/main/res/drawable-xhdpi/av_play_dark.png +++ /dev/null diff --git a/core/src/main/res/drawable-xhdpi/av_rewind.png b/core/src/main/res/drawable-xhdpi/av_rewind.png Binary files differdeleted file mode 100644 index 57b41744d..000000000 --- a/core/src/main/res/drawable-xhdpi/av_rewind.png +++ /dev/null diff --git a/core/src/main/res/drawable-xhdpi/av_rewind_dark.png b/core/src/main/res/drawable-xhdpi/av_rewind_dark.png Binary files differdeleted file mode 100755 index 69dda127c..000000000 --- a/core/src/main/res/drawable-xhdpi/av_rewind_dark.png +++ /dev/null diff --git a/core/src/main/res/drawable-xhdpi/content_discard.png b/core/src/main/res/drawable-xhdpi/content_discard.png Binary files differdeleted file mode 100644 index 98c73da1f..000000000 --- a/core/src/main/res/drawable-xhdpi/content_discard.png +++ /dev/null diff --git a/core/src/main/res/drawable-xhdpi/content_discard_dark.png b/core/src/main/res/drawable-xhdpi/content_discard_dark.png Binary files differdeleted file mode 100755 index 412b33354..000000000 --- a/core/src/main/res/drawable-xhdpi/content_discard_dark.png +++ /dev/null diff --git a/core/src/main/res/drawable-xhdpi/content_new.png b/core/src/main/res/drawable-xhdpi/content_new.png Binary files differdeleted file mode 100644 index 9b48a63da..000000000 --- a/core/src/main/res/drawable-xhdpi/content_new.png +++ /dev/null diff --git a/core/src/main/res/drawable-xhdpi/content_new_dark.png b/core/src/main/res/drawable-xhdpi/content_new_dark.png Binary files differdeleted file mode 100755 index 23b9a1c18..000000000 --- a/core/src/main/res/drawable-xhdpi/content_new_dark.png +++ /dev/null diff --git a/core/src/main/res/drawable-xhdpi/content_remove.png b/core/src/main/res/drawable-xhdpi/content_remove.png Binary files differdeleted file mode 100644 index ca7d159fd..000000000 --- a/core/src/main/res/drawable-xhdpi/content_remove.png +++ /dev/null diff --git a/core/src/main/res/drawable-xhdpi/content_remove_dark.png b/core/src/main/res/drawable-xhdpi/content_remove_dark.png Binary files differdeleted file mode 100755 index f391760ef..000000000 --- a/core/src/main/res/drawable-xhdpi/content_remove_dark.png +++ /dev/null diff --git a/core/src/main/res/drawable-xhdpi/default_cover.png b/core/src/main/res/drawable-xhdpi/default_cover.png Binary files differdeleted file mode 100644 index c2f4578f9..000000000 --- a/core/src/main/res/drawable-xhdpi/default_cover.png +++ /dev/null diff --git a/core/src/main/res/drawable-xhdpi/default_cover_dark.png b/core/src/main/res/drawable-xhdpi/default_cover_dark.png Binary files differdeleted file mode 100755 index 3f93e4f65..000000000 --- a/core/src/main/res/drawable-xhdpi/default_cover_dark.png +++ /dev/null diff --git a/core/src/main/res/drawable-xhdpi/device_access_time.png b/core/src/main/res/drawable-xhdpi/device_access_time.png Binary files differdeleted file mode 100644 index 2beae08c3..000000000 --- a/core/src/main/res/drawable-xhdpi/device_access_time.png +++ /dev/null diff --git a/core/src/main/res/drawable-xhdpi/device_access_time_dark.png b/core/src/main/res/drawable-xhdpi/device_access_time_dark.png Binary files differdeleted file mode 100755 index c8771db97..000000000 --- a/core/src/main/res/drawable-xhdpi/device_access_time_dark.png +++ /dev/null diff --git a/core/src/main/res/drawable-xhdpi/ic_action_overflow.png b/core/src/main/res/drawable-xhdpi/ic_action_overflow.png Binary files differdeleted file mode 100644 index 7ba4e10ea..000000000 --- a/core/src/main/res/drawable-xhdpi/ic_action_overflow.png +++ /dev/null diff --git a/core/src/main/res/drawable-xhdpi/ic_action_overflow_dark.png b/core/src/main/res/drawable-xhdpi/ic_action_overflow_dark.png Binary files differdeleted file mode 100644 index 5d8af5d63..000000000 --- a/core/src/main/res/drawable-xhdpi/ic_action_overflow_dark.png +++ /dev/null diff --git a/core/src/main/res/drawable-xhdpi/ic_add_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_add_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..0d8af34b9 --- /dev/null +++ b/core/src/main/res/drawable-xhdpi/ic_add_grey600_24dp.png diff --git a/core/src/main/res/drawable-xhdpi/ic_add_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_add_white_24dp.png Binary files differnew file mode 100644 index 000000000..67042105d --- /dev/null +++ b/core/src/main/res/drawable-xhdpi/ic_add_white_24dp.png diff --git a/core/src/main/res/drawable-xhdpi/ic_cancel_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_cancel_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..ce0da2222 --- /dev/null +++ b/core/src/main/res/drawable-xhdpi/ic_cancel_grey600_24dp.png diff --git a/core/src/main/res/drawable-xhdpi/ic_cancel_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_cancel_white_24dp.png Binary files differnew file mode 100644 index 000000000..e9e9c7a53 --- /dev/null +++ b/core/src/main/res/drawable-xhdpi/ic_cancel_white_24dp.png diff --git a/core/src/main/res/drawable-xhdpi/ic_delete_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_delete_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..c6bb43e8b --- /dev/null +++ b/core/src/main/res/drawable-xhdpi/ic_delete_grey600_24dp.png diff --git a/core/src/main/res/drawable-xhdpi/ic_delete_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_delete_white_24dp.png Binary files differnew file mode 100644 index 000000000..cdb230c2f --- /dev/null +++ b/core/src/main/res/drawable-xhdpi/ic_delete_white_24dp.png diff --git a/core/src/main/res/drawable-xhdpi/ic_description_grey600_36dp.png b/core/src/main/res/drawable-xhdpi/ic_description_grey600_36dp.png Binary files differnew file mode 100644 index 000000000..50f854ea5 --- /dev/null +++ b/core/src/main/res/drawable-xhdpi/ic_description_grey600_36dp.png diff --git a/core/src/main/res/drawable-xhdpi/ic_description_white_36dp.png b/core/src/main/res/drawable-xhdpi/ic_description_white_36dp.png Binary files differnew file mode 100644 index 000000000..60d988dd4 --- /dev/null +++ b/core/src/main/res/drawable-xhdpi/ic_description_white_36dp.png diff --git a/core/src/main/res/drawable-xhdpi/ic_done_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_done_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..36ed24eec --- /dev/null +++ b/core/src/main/res/drawable-xhdpi/ic_done_grey600_24dp.png diff --git a/core/src/main/res/drawable-xhdpi/ic_done_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_done_white_24dp.png Binary files differnew file mode 100644 index 000000000..e5024472a --- /dev/null +++ b/core/src/main/res/drawable-xhdpi/ic_done_white_24dp.png diff --git a/core/src/main/res/drawable-xhdpi/ic_drawer.png b/core/src/main/res/drawable-xhdpi/ic_drawer.png Binary files differdeleted file mode 100644 index a5fa74def..000000000 --- a/core/src/main/res/drawable-xhdpi/ic_drawer.png +++ /dev/null diff --git a/core/src/main/res/drawable-xhdpi/ic_drawer_dark.png b/core/src/main/res/drawable-xhdpi/ic_drawer_dark.png Binary files differdeleted file mode 100644 index bcf49dd73..000000000 --- a/core/src/main/res/drawable-xhdpi/ic_drawer_dark.png +++ /dev/null diff --git a/core/src/main/res/drawable-xhdpi/ic_expand_more_grey600_36dp.png b/core/src/main/res/drawable-xhdpi/ic_expand_more_grey600_36dp.png Binary files differnew file mode 100644 index 000000000..921249fb2 --- /dev/null +++ b/core/src/main/res/drawable-xhdpi/ic_expand_more_grey600_36dp.png diff --git a/core/src/main/res/drawable-xhdpi/ic_expand_more_white_36dp.png b/core/src/main/res/drawable-xhdpi/ic_expand_more_white_36dp.png Binary files differnew file mode 100644 index 000000000..f00aa8bd4 --- /dev/null +++ b/core/src/main/res/drawable-xhdpi/ic_expand_more_white_36dp.png diff --git a/core/src/main/res/drawable-xhdpi/ic_fast_forward_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_fast_forward_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..6c26d6ea2 --- /dev/null +++ b/core/src/main/res/drawable-xhdpi/ic_fast_forward_grey600_24dp.png diff --git a/core/src/main/res/drawable-xhdpi/ic_fast_forward_grey600_36dp.png b/core/src/main/res/drawable-xhdpi/ic_fast_forward_grey600_36dp.png Binary files differnew file mode 100644 index 000000000..169a3b386 --- /dev/null +++ b/core/src/main/res/drawable-xhdpi/ic_fast_forward_grey600_36dp.png diff --git a/core/src/main/res/drawable-xhdpi/ic_fast_forward_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_fast_forward_white_24dp.png Binary files differnew file mode 100644 index 000000000..b7c86059b --- /dev/null +++ b/core/src/main/res/drawable-xhdpi/ic_fast_forward_white_24dp.png diff --git a/core/src/main/res/drawable-xhdpi/ic_fast_forward_white_36dp.png b/core/src/main/res/drawable-xhdpi/ic_fast_forward_white_36dp.png Binary files differnew file mode 100644 index 000000000..8aec1abb0 --- /dev/null +++ b/core/src/main/res/drawable-xhdpi/ic_fast_forward_white_36dp.png diff --git a/core/src/main/res/drawable-xhdpi/ic_fast_rewind_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_fast_rewind_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..d1db46a23 --- /dev/null +++ b/core/src/main/res/drawable-xhdpi/ic_fast_rewind_grey600_24dp.png diff --git a/core/src/main/res/drawable-xhdpi/ic_fast_rewind_grey600_36dp.png b/core/src/main/res/drawable-xhdpi/ic_fast_rewind_grey600_36dp.png Binary files differnew file mode 100644 index 000000000..ccac2c273 --- /dev/null +++ b/core/src/main/res/drawable-xhdpi/ic_fast_rewind_grey600_36dp.png diff --git a/core/src/main/res/drawable-xhdpi/ic_fast_rewind_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_fast_rewind_white_24dp.png Binary files differnew file mode 100644 index 000000000..379435f54 --- /dev/null +++ b/core/src/main/res/drawable-xhdpi/ic_fast_rewind_white_24dp.png diff --git a/core/src/main/res/drawable-xhdpi/ic_fast_rewind_white_36dp.png b/core/src/main/res/drawable-xhdpi/ic_fast_rewind_white_36dp.png Binary files differnew file mode 100644 index 000000000..857a1aaa2 --- /dev/null +++ b/core/src/main/res/drawable-xhdpi/ic_fast_rewind_white_36dp.png diff --git a/core/src/main/res/drawable-xhdpi/ic_file_download_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_file_download_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..aa89d4977 --- /dev/null +++ b/core/src/main/res/drawable-xhdpi/ic_file_download_grey600_24dp.png diff --git a/core/src/main/res/drawable-xhdpi/ic_file_download_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_file_download_white_24dp.png Binary files differnew file mode 100644 index 000000000..990dfb82b --- /dev/null +++ b/core/src/main/res/drawable-xhdpi/ic_file_download_white_24dp.png diff --git a/core/src/main/res/drawable-xhdpi/ic_hearing_grey600_18dp.png b/core/src/main/res/drawable-xhdpi/ic_hearing_grey600_18dp.png Binary files differnew file mode 100644 index 000000000..a0c760e6f --- /dev/null +++ b/core/src/main/res/drawable-xhdpi/ic_hearing_grey600_18dp.png diff --git a/core/src/main/res/drawable-xhdpi/ic_hearing_white_18dp.png b/core/src/main/res/drawable-xhdpi/ic_hearing_white_18dp.png Binary files differnew file mode 100644 index 000000000..1b8722a7f --- /dev/null +++ b/core/src/main/res/drawable-xhdpi/ic_hearing_white_18dp.png diff --git a/core/src/main/res/drawable-xhdpi/ic_history_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_history_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..a098d8d0f --- /dev/null +++ b/core/src/main/res/drawable-xhdpi/ic_history_grey600_24dp.png diff --git a/core/src/main/res/drawable-xhdpi/ic_history_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_history_white_24dp.png Binary files differnew file mode 100644 index 000000000..7681ac8b8 --- /dev/null +++ b/core/src/main/res/drawable-xhdpi/ic_history_white_24dp.png diff --git a/core/src/main/res/drawable-xhdpi/ic_info_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_info_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..9dcb234fe --- /dev/null +++ b/core/src/main/res/drawable-xhdpi/ic_info_grey600_24dp.png diff --git a/core/src/main/res/drawable-xhdpi/ic_info_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_info_white_24dp.png Binary files differnew file mode 100644 index 000000000..bee33abb7 --- /dev/null +++ b/core/src/main/res/drawable-xhdpi/ic_info_white_24dp.png diff --git a/core/src/main/res/drawable-xhdpi/ic_list_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_list_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..c51f8a258 --- /dev/null +++ b/core/src/main/res/drawable-xhdpi/ic_list_grey600_24dp.png diff --git a/core/src/main/res/drawable-xhdpi/ic_list_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_list_white_24dp.png Binary files differnew file mode 100644 index 000000000..abefc200a --- /dev/null +++ b/core/src/main/res/drawable-xhdpi/ic_list_white_24dp.png diff --git a/core/src/main/res/drawable-xhdpi/ic_more_vert_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_more_vert_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..7bc63a511 --- /dev/null +++ b/core/src/main/res/drawable-xhdpi/ic_more_vert_grey600_24dp.png diff --git a/core/src/main/res/drawable-xhdpi/ic_more_vert_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_more_vert_white_24dp.png Binary files differnew file mode 100644 index 000000000..1b04eda04 --- /dev/null +++ b/core/src/main/res/drawable-xhdpi/ic_more_vert_white_24dp.png diff --git a/core/src/main/res/drawable-xhdpi/ic_new_releases_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_new_releases_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..655658557 --- /dev/null +++ b/core/src/main/res/drawable-xhdpi/ic_new_releases_grey600_24dp.png diff --git a/core/src/main/res/drawable-xhdpi/ic_new_releases_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_new_releases_white_24dp.png Binary files differnew file mode 100644 index 000000000..00a4daa62 --- /dev/null +++ b/core/src/main/res/drawable-xhdpi/ic_new_releases_white_24dp.png diff --git a/core/src/main/res/drawable-xhdpi/ic_pause_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_pause_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..3ec598cfd --- /dev/null +++ b/core/src/main/res/drawable-xhdpi/ic_pause_grey600_24dp.png diff --git a/core/src/main/res/drawable-xhdpi/ic_pause_grey600_36dp.png b/core/src/main/res/drawable-xhdpi/ic_pause_grey600_36dp.png Binary files differnew file mode 100644 index 000000000..7efc88511 --- /dev/null +++ b/core/src/main/res/drawable-xhdpi/ic_pause_grey600_36dp.png diff --git a/core/src/main/res/drawable-xhdpi/ic_pause_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_pause_white_24dp.png Binary files differnew file mode 100644 index 000000000..14b6d17d4 --- /dev/null +++ b/core/src/main/res/drawable-xhdpi/ic_pause_white_24dp.png diff --git a/core/src/main/res/drawable-xhdpi/ic_pause_white_36dp.png b/core/src/main/res/drawable-xhdpi/ic_pause_white_36dp.png Binary files differnew file mode 100644 index 000000000..72dfa9fa6 --- /dev/null +++ b/core/src/main/res/drawable-xhdpi/ic_pause_white_36dp.png diff --git a/core/src/main/res/drawable-xhdpi/ic_play_arrow_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_play_arrow_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..689fda259 --- /dev/null +++ b/core/src/main/res/drawable-xhdpi/ic_play_arrow_grey600_24dp.png diff --git a/core/src/main/res/drawable-xhdpi/ic_play_arrow_grey600_36dp.png b/core/src/main/res/drawable-xhdpi/ic_play_arrow_grey600_36dp.png Binary files differnew file mode 100644 index 000000000..ba62a8102 --- /dev/null +++ b/core/src/main/res/drawable-xhdpi/ic_play_arrow_grey600_36dp.png diff --git a/core/src/main/res/drawable-xhdpi/ic_play_arrow_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_play_arrow_white_24dp.png Binary files differnew file mode 100644 index 000000000..a55d19922 --- /dev/null +++ b/core/src/main/res/drawable-xhdpi/ic_play_arrow_white_24dp.png diff --git a/core/src/main/res/drawable-xhdpi/ic_play_arrow_white_36dp.png b/core/src/main/res/drawable-xhdpi/ic_play_arrow_white_36dp.png Binary files differnew file mode 100644 index 000000000..043acd808 --- /dev/null +++ b/core/src/main/res/drawable-xhdpi/ic_play_arrow_white_36dp.png diff --git a/core/src/main/res/drawable-xhdpi/ic_refresh_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_refresh_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..7891efffa --- /dev/null +++ b/core/src/main/res/drawable-xhdpi/ic_refresh_grey600_24dp.png diff --git a/core/src/main/res/drawable-xhdpi/ic_refresh_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_refresh_white_24dp.png Binary files differnew file mode 100644 index 000000000..5f89fc257 --- /dev/null +++ b/core/src/main/res/drawable-xhdpi/ic_refresh_white_24dp.png diff --git a/core/src/main/res/drawable-xhdpi/ic_remove_red_eye_grey600_18dp.png b/core/src/main/res/drawable-xhdpi/ic_remove_red_eye_grey600_18dp.png Binary files differnew file mode 100644 index 000000000..7047ed7ea --- /dev/null +++ b/core/src/main/res/drawable-xhdpi/ic_remove_red_eye_grey600_18dp.png diff --git a/core/src/main/res/drawable-xhdpi/ic_remove_red_eye_white_18dp.png b/core/src/main/res/drawable-xhdpi/ic_remove_red_eye_white_18dp.png Binary files differnew file mode 100644 index 000000000..ef2023b52 --- /dev/null +++ b/core/src/main/res/drawable-xhdpi/ic_remove_red_eye_white_18dp.png diff --git a/core/src/main/res/drawable-xhdpi/ic_search_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_search_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..f9c0b2ec3 --- /dev/null +++ b/core/src/main/res/drawable-xhdpi/ic_search_grey600_24dp.png diff --git a/core/src/main/res/drawable-xhdpi/ic_search_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_search_white_24dp.png Binary files differnew file mode 100644 index 000000000..043759acd --- /dev/null +++ b/core/src/main/res/drawable-xhdpi/ic_search_white_24dp.png diff --git a/core/src/main/res/drawable-xhdpi/ic_settings_input_antenna_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_settings_input_antenna_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..c30f31017 --- /dev/null +++ b/core/src/main/res/drawable-xhdpi/ic_settings_input_antenna_grey600_24dp.png diff --git a/core/src/main/res/drawable-xhdpi/ic_settings_input_antenna_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_settings_input_antenna_white_24dp.png Binary files differnew file mode 100644 index 000000000..ea2313395 --- /dev/null +++ b/core/src/main/res/drawable-xhdpi/ic_settings_input_antenna_white_24dp.png diff --git a/core/src/main/res/drawable-xhdpi/ic_share_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_share_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..88a0edd6c --- /dev/null +++ b/core/src/main/res/drawable-xhdpi/ic_share_grey600_24dp.png diff --git a/core/src/main/res/drawable-xhdpi/ic_share_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_share_white_24dp.png Binary files differnew file mode 100644 index 000000000..dd536bca2 --- /dev/null +++ b/core/src/main/res/drawable-xhdpi/ic_share_white_24dp.png diff --git a/core/src/main/res/drawable-xhdpi/ic_timer_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_timer_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..23149552f --- /dev/null +++ b/core/src/main/res/drawable-xhdpi/ic_timer_grey600_24dp.png diff --git a/core/src/main/res/drawable-xhdpi/ic_timer_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_timer_white_24dp.png Binary files differnew file mode 100644 index 000000000..896d9dcf2 --- /dev/null +++ b/core/src/main/res/drawable-xhdpi/ic_timer_white_24dp.png diff --git a/core/src/main/res/drawable-xhdpi/ic_toc_grey600_36dp.png b/core/src/main/res/drawable-xhdpi/ic_toc_grey600_36dp.png Binary files differnew file mode 100644 index 000000000..57a60ed9f --- /dev/null +++ b/core/src/main/res/drawable-xhdpi/ic_toc_grey600_36dp.png diff --git a/core/src/main/res/drawable-xhdpi/ic_toc_white_36dp.png b/core/src/main/res/drawable-xhdpi/ic_toc_white_36dp.png Binary files differnew file mode 100644 index 000000000..aa7ee9c02 --- /dev/null +++ b/core/src/main/res/drawable-xhdpi/ic_toc_white_36dp.png diff --git a/core/src/main/res/drawable-xhdpi/ic_web_grey600_24dp.png b/core/src/main/res/drawable-xhdpi/ic_web_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..a9f5ebc33 --- /dev/null +++ b/core/src/main/res/drawable-xhdpi/ic_web_grey600_24dp.png diff --git a/core/src/main/res/drawable-xhdpi/ic_web_white_24dp.png b/core/src/main/res/drawable-xhdpi/ic_web_white_24dp.png Binary files differnew file mode 100644 index 000000000..edc590a0b --- /dev/null +++ b/core/src/main/res/drawable-xhdpi/ic_web_white_24dp.png diff --git a/core/src/main/res/drawable-xhdpi/location_web_site.png b/core/src/main/res/drawable-xhdpi/location_web_site.png Binary files differdeleted file mode 100644 index bd6b8682a..000000000 --- a/core/src/main/res/drawable-xhdpi/location_web_site.png +++ /dev/null diff --git a/core/src/main/res/drawable-xhdpi/location_web_site_dark.png b/core/src/main/res/drawable-xhdpi/location_web_site_dark.png Binary files differdeleted file mode 100755 index 9b77be967..000000000 --- a/core/src/main/res/drawable-xhdpi/location_web_site_dark.png +++ /dev/null diff --git a/core/src/main/res/drawable-xhdpi/navigation_accept.png b/core/src/main/res/drawable-xhdpi/navigation_accept.png Binary files differdeleted file mode 100644 index b8915716e..000000000 --- a/core/src/main/res/drawable-xhdpi/navigation_accept.png +++ /dev/null diff --git a/core/src/main/res/drawable-xhdpi/navigation_accept_dark.png b/core/src/main/res/drawable-xhdpi/navigation_accept_dark.png Binary files differdeleted file mode 100755 index b52dc3701..000000000 --- a/core/src/main/res/drawable-xhdpi/navigation_accept_dark.png +++ /dev/null diff --git a/core/src/main/res/drawable-xhdpi/navigation_cancel.png b/core/src/main/res/drawable-xhdpi/navigation_cancel.png Binary files differdeleted file mode 100644 index ca7d159fd..000000000 --- a/core/src/main/res/drawable-xhdpi/navigation_cancel.png +++ /dev/null diff --git a/core/src/main/res/drawable-xhdpi/navigation_cancel_dark.png b/core/src/main/res/drawable-xhdpi/navigation_cancel_dark.png Binary files differdeleted file mode 100755 index f391760ef..000000000 --- a/core/src/main/res/drawable-xhdpi/navigation_cancel_dark.png +++ /dev/null diff --git a/core/src/main/res/drawable-xhdpi/navigation_chapters.png b/core/src/main/res/drawable-xhdpi/navigation_chapters.png Binary files differdeleted file mode 100755 index d527454c6..000000000 --- a/core/src/main/res/drawable-xhdpi/navigation_chapters.png +++ /dev/null diff --git a/core/src/main/res/drawable-xhdpi/navigation_chapters_dark.png b/core/src/main/res/drawable-xhdpi/navigation_chapters_dark.png Binary files differdeleted file mode 100755 index e53d5eb16..000000000 --- a/core/src/main/res/drawable-xhdpi/navigation_chapters_dark.png +++ /dev/null diff --git a/core/src/main/res/drawable-xhdpi/navigation_collapse.png b/core/src/main/res/drawable-xhdpi/navigation_collapse.png Binary files differdeleted file mode 100755 index be6a7688c..000000000 --- a/core/src/main/res/drawable-xhdpi/navigation_collapse.png +++ /dev/null diff --git a/core/src/main/res/drawable-xhdpi/navigation_collapse_dark.png b/core/src/main/res/drawable-xhdpi/navigation_collapse_dark.png Binary files differdeleted file mode 100755 index 2ed325108..000000000 --- a/core/src/main/res/drawable-xhdpi/navigation_collapse_dark.png +++ /dev/null diff --git a/core/src/main/res/drawable-xhdpi/navigation_expand.png b/core/src/main/res/drawable-xhdpi/navigation_expand.png Binary files differdeleted file mode 100644 index 53c013b09..000000000 --- a/core/src/main/res/drawable-xhdpi/navigation_expand.png +++ /dev/null diff --git a/core/src/main/res/drawable-xhdpi/navigation_expand_dark.png b/core/src/main/res/drawable-xhdpi/navigation_expand_dark.png Binary files differdeleted file mode 100755 index 38c7b20d7..000000000 --- a/core/src/main/res/drawable-xhdpi/navigation_expand_dark.png +++ /dev/null diff --git a/core/src/main/res/drawable-xhdpi/navigation_refresh.png b/core/src/main/res/drawable-xhdpi/navigation_refresh.png Binary files differdeleted file mode 100644 index e6212cf67..000000000 --- a/core/src/main/res/drawable-xhdpi/navigation_refresh.png +++ /dev/null diff --git a/core/src/main/res/drawable-xhdpi/navigation_refresh_dark.png b/core/src/main/res/drawable-xhdpi/navigation_refresh_dark.png Binary files differdeleted file mode 100755 index a7fdc0dfc..000000000 --- a/core/src/main/res/drawable-xhdpi/navigation_refresh_dark.png +++ /dev/null diff --git a/core/src/main/res/drawable-xhdpi/navigation_shownotes.png b/core/src/main/res/drawable-xhdpi/navigation_shownotes.png Binary files differdeleted file mode 100755 index a0a156a94..000000000 --- a/core/src/main/res/drawable-xhdpi/navigation_shownotes.png +++ /dev/null diff --git a/core/src/main/res/drawable-xhdpi/navigation_shownotes_dark.png b/core/src/main/res/drawable-xhdpi/navigation_shownotes_dark.png Binary files differdeleted file mode 100755 index 95708234a..000000000 --- a/core/src/main/res/drawable-xhdpi/navigation_shownotes_dark.png +++ /dev/null diff --git a/core/src/main/res/drawable-xhdpi/social_share.png b/core/src/main/res/drawable-xhdpi/social_share.png Binary files differdeleted file mode 100644 index cdafd8abc..000000000 --- a/core/src/main/res/drawable-xhdpi/social_share.png +++ /dev/null diff --git a/core/src/main/res/drawable-xhdpi/social_share_dark.png b/core/src/main/res/drawable-xhdpi/social_share_dark.png Binary files differdeleted file mode 100755 index 15549b04e..000000000 --- a/core/src/main/res/drawable-xhdpi/social_share_dark.png +++ /dev/null diff --git a/core/src/main/res/drawable-xhdpi/spinner_button.9.png b/core/src/main/res/drawable-xhdpi/spinner_button.9.png Binary files differdeleted file mode 100644 index 3dc481e54..000000000 --- a/core/src/main/res/drawable-xhdpi/spinner_button.9.png +++ /dev/null diff --git a/core/src/main/res/drawable-xhdpi/spinner_button_dark.9.png b/core/src/main/res/drawable-xhdpi/spinner_button_dark.9.png Binary files differdeleted file mode 100644 index c43293d5c..000000000 --- a/core/src/main/res/drawable-xhdpi/spinner_button_dark.9.png +++ /dev/null diff --git a/core/src/main/res/drawable-xhdpi/stat_playlist.png b/core/src/main/res/drawable-xhdpi/stat_playlist.png Binary files differdeleted file mode 100644 index 7977e6f2a..000000000 --- a/core/src/main/res/drawable-xhdpi/stat_playlist.png +++ /dev/null diff --git a/core/src/main/res/drawable-xhdpi/stat_playlist_dark.png b/core/src/main/res/drawable-xhdpi/stat_playlist_dark.png Binary files differdeleted file mode 100644 index f32dd3780..000000000 --- a/core/src/main/res/drawable-xhdpi/stat_playlist_dark.png +++ /dev/null diff --git a/core/src/main/res/drawable-xhdpi/type_audio.png b/core/src/main/res/drawable-xhdpi/type_audio.png Binary files differdeleted file mode 100644 index 777fab84e..000000000 --- a/core/src/main/res/drawable-xhdpi/type_audio.png +++ /dev/null diff --git a/core/src/main/res/drawable-xhdpi/type_audio_dark.png b/core/src/main/res/drawable-xhdpi/type_audio_dark.png Binary files differdeleted file mode 100755 index dfd2b33c7..000000000 --- a/core/src/main/res/drawable-xhdpi/type_audio_dark.png +++ /dev/null diff --git a/core/src/main/res/drawable-xhdpi/type_video.png b/core/src/main/res/drawable-xhdpi/type_video.png Binary files differdeleted file mode 100644 index bbd1f112f..000000000 --- a/core/src/main/res/drawable-xhdpi/type_video.png +++ /dev/null diff --git a/core/src/main/res/drawable-xhdpi/type_video_dark.png b/core/src/main/res/drawable-xhdpi/type_video_dark.png Binary files differdeleted file mode 100755 index a74947459..000000000 --- a/core/src/main/res/drawable-xhdpi/type_video_dark.png +++ /dev/null diff --git a/core/src/main/res/drawable-xxhdpi/ic_action_overflow.png b/core/src/main/res/drawable-xxhdpi/ic_action_overflow.png Binary files differdeleted file mode 100644 index 5a603b6bc..000000000 --- a/core/src/main/res/drawable-xxhdpi/ic_action_overflow.png +++ /dev/null diff --git a/core/src/main/res/drawable-xxhdpi/ic_action_overflow_dark.png b/core/src/main/res/drawable-xxhdpi/ic_action_overflow_dark.png Binary files differdeleted file mode 100644 index e22049b1e..000000000 --- a/core/src/main/res/drawable-xxhdpi/ic_action_overflow_dark.png +++ /dev/null diff --git a/core/src/main/res/drawable-xxhdpi/ic_add_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_add_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..70e4e86e7 --- /dev/null +++ b/core/src/main/res/drawable-xxhdpi/ic_add_grey600_24dp.png diff --git a/core/src/main/res/drawable-xxhdpi/ic_add_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_add_white_24dp.png Binary files differnew file mode 100644 index 000000000..72cedcad4 --- /dev/null +++ b/core/src/main/res/drawable-xxhdpi/ic_add_white_24dp.png diff --git a/core/src/main/res/drawable-xxhdpi/ic_cancel_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_cancel_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..f6f7844de --- /dev/null +++ b/core/src/main/res/drawable-xxhdpi/ic_cancel_grey600_24dp.png diff --git a/core/src/main/res/drawable-xxhdpi/ic_cancel_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_cancel_white_24dp.png Binary files differnew file mode 100644 index 000000000..faa409f80 --- /dev/null +++ b/core/src/main/res/drawable-xxhdpi/ic_cancel_white_24dp.png diff --git a/core/src/main/res/drawable-xxhdpi/ic_delete_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_delete_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..4886ab1e9 --- /dev/null +++ b/core/src/main/res/drawable-xxhdpi/ic_delete_grey600_24dp.png diff --git a/core/src/main/res/drawable-xxhdpi/ic_delete_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_delete_white_24dp.png Binary files differnew file mode 100644 index 000000000..0e95e9b1d --- /dev/null +++ b/core/src/main/res/drawable-xxhdpi/ic_delete_white_24dp.png diff --git a/core/src/main/res/drawable-xxhdpi/ic_description_grey600_36dp.png b/core/src/main/res/drawable-xxhdpi/ic_description_grey600_36dp.png Binary files differnew file mode 100644 index 000000000..33df5d9d2 --- /dev/null +++ b/core/src/main/res/drawable-xxhdpi/ic_description_grey600_36dp.png diff --git a/core/src/main/res/drawable-xxhdpi/ic_description_white_36dp.png b/core/src/main/res/drawable-xxhdpi/ic_description_white_36dp.png Binary files differnew file mode 100644 index 000000000..aa5e73299 --- /dev/null +++ b/core/src/main/res/drawable-xxhdpi/ic_description_white_36dp.png diff --git a/core/src/main/res/drawable-xxhdpi/ic_done_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_done_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..c836c5490 --- /dev/null +++ b/core/src/main/res/drawable-xxhdpi/ic_done_grey600_24dp.png diff --git a/core/src/main/res/drawable-xxhdpi/ic_done_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_done_white_24dp.png Binary files differnew file mode 100644 index 000000000..f801e7ab3 --- /dev/null +++ b/core/src/main/res/drawable-xxhdpi/ic_done_white_24dp.png diff --git a/core/src/main/res/drawable-xxhdpi/ic_drawer.png b/core/src/main/res/drawable-xxhdpi/ic_drawer.png Binary files differdeleted file mode 100644 index 9c4685d6e..000000000 --- a/core/src/main/res/drawable-xxhdpi/ic_drawer.png +++ /dev/null diff --git a/core/src/main/res/drawable-xxhdpi/ic_drawer_dark.png b/core/src/main/res/drawable-xxhdpi/ic_drawer_dark.png Binary files differdeleted file mode 100644 index f7e3b3079..000000000 --- a/core/src/main/res/drawable-xxhdpi/ic_drawer_dark.png +++ /dev/null diff --git a/core/src/main/res/drawable-xxhdpi/ic_expand_more_grey600_36dp.png b/core/src/main/res/drawable-xxhdpi/ic_expand_more_grey600_36dp.png Binary files differnew file mode 100644 index 000000000..503678f1b --- /dev/null +++ b/core/src/main/res/drawable-xxhdpi/ic_expand_more_grey600_36dp.png diff --git a/core/src/main/res/drawable-xxhdpi/ic_expand_more_white_36dp.png b/core/src/main/res/drawable-xxhdpi/ic_expand_more_white_36dp.png Binary files differnew file mode 100644 index 000000000..16094f9bc --- /dev/null +++ b/core/src/main/res/drawable-xxhdpi/ic_expand_more_white_36dp.png diff --git a/core/src/main/res/drawable-xxhdpi/ic_fast_forward_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_fast_forward_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..169a3b386 --- /dev/null +++ b/core/src/main/res/drawable-xxhdpi/ic_fast_forward_grey600_24dp.png diff --git a/core/src/main/res/drawable-xxhdpi/ic_fast_forward_grey600_36dp.png b/core/src/main/res/drawable-xxhdpi/ic_fast_forward_grey600_36dp.png Binary files differnew file mode 100644 index 000000000..7b83df521 --- /dev/null +++ b/core/src/main/res/drawable-xxhdpi/ic_fast_forward_grey600_36dp.png diff --git a/core/src/main/res/drawable-xxhdpi/ic_fast_forward_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_fast_forward_white_24dp.png Binary files differnew file mode 100644 index 000000000..8aec1abb0 --- /dev/null +++ b/core/src/main/res/drawable-xxhdpi/ic_fast_forward_white_24dp.png diff --git a/core/src/main/res/drawable-xxhdpi/ic_fast_forward_white_36dp.png b/core/src/main/res/drawable-xxhdpi/ic_fast_forward_white_36dp.png Binary files differnew file mode 100644 index 000000000..b4cf934f7 --- /dev/null +++ b/core/src/main/res/drawable-xxhdpi/ic_fast_forward_white_36dp.png diff --git a/core/src/main/res/drawable-xxhdpi/ic_fast_rewind_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_fast_rewind_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..ccac2c273 --- /dev/null +++ b/core/src/main/res/drawable-xxhdpi/ic_fast_rewind_grey600_24dp.png diff --git a/core/src/main/res/drawable-xxhdpi/ic_fast_rewind_grey600_36dp.png b/core/src/main/res/drawable-xxhdpi/ic_fast_rewind_grey600_36dp.png Binary files differnew file mode 100644 index 000000000..940b5413d --- /dev/null +++ b/core/src/main/res/drawable-xxhdpi/ic_fast_rewind_grey600_36dp.png diff --git a/core/src/main/res/drawable-xxhdpi/ic_fast_rewind_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_fast_rewind_white_24dp.png Binary files differnew file mode 100644 index 000000000..857a1aaa2 --- /dev/null +++ b/core/src/main/res/drawable-xxhdpi/ic_fast_rewind_white_24dp.png diff --git a/core/src/main/res/drawable-xxhdpi/ic_fast_rewind_white_36dp.png b/core/src/main/res/drawable-xxhdpi/ic_fast_rewind_white_36dp.png Binary files differnew file mode 100644 index 000000000..751e5d1ba --- /dev/null +++ b/core/src/main/res/drawable-xxhdpi/ic_fast_rewind_white_36dp.png diff --git a/core/src/main/res/drawable-xxhdpi/ic_file_download_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_file_download_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..e61a48a4d --- /dev/null +++ b/core/src/main/res/drawable-xxhdpi/ic_file_download_grey600_24dp.png diff --git a/core/src/main/res/drawable-xxhdpi/ic_file_download_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_file_download_white_24dp.png Binary files differnew file mode 100644 index 000000000..95502de3f --- /dev/null +++ b/core/src/main/res/drawable-xxhdpi/ic_file_download_white_24dp.png diff --git a/core/src/main/res/drawable-xxhdpi/ic_hearing_grey600_18dp.png b/core/src/main/res/drawable-xxhdpi/ic_hearing_grey600_18dp.png Binary files differnew file mode 100644 index 000000000..111ed802c --- /dev/null +++ b/core/src/main/res/drawable-xxhdpi/ic_hearing_grey600_18dp.png diff --git a/core/src/main/res/drawable-xxhdpi/ic_hearing_white_18dp.png b/core/src/main/res/drawable-xxhdpi/ic_hearing_white_18dp.png Binary files differnew file mode 100644 index 000000000..417b39b81 --- /dev/null +++ b/core/src/main/res/drawable-xxhdpi/ic_hearing_white_18dp.png diff --git a/core/src/main/res/drawable-xxhdpi/ic_history_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_history_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..632a73e42 --- /dev/null +++ b/core/src/main/res/drawable-xxhdpi/ic_history_grey600_24dp.png diff --git a/core/src/main/res/drawable-xxhdpi/ic_history_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_history_white_24dp.png Binary files differnew file mode 100644 index 000000000..3e438ec4e --- /dev/null +++ b/core/src/main/res/drawable-xxhdpi/ic_history_white_24dp.png diff --git a/core/src/main/res/drawable-xxhdpi/ic_info_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_info_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..64445284b --- /dev/null +++ b/core/src/main/res/drawable-xxhdpi/ic_info_grey600_24dp.png diff --git a/core/src/main/res/drawable-xxhdpi/ic_info_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_info_white_24dp.png Binary files differnew file mode 100644 index 000000000..185d18d1a --- /dev/null +++ b/core/src/main/res/drawable-xxhdpi/ic_info_white_24dp.png diff --git a/core/src/main/res/drawable-xxhdpi/ic_list_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_list_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..ceaf36811 --- /dev/null +++ b/core/src/main/res/drawable-xxhdpi/ic_list_grey600_24dp.png diff --git a/core/src/main/res/drawable-xxhdpi/ic_list_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_list_white_24dp.png Binary files differnew file mode 100644 index 000000000..6b7e78f83 --- /dev/null +++ b/core/src/main/res/drawable-xxhdpi/ic_list_white_24dp.png diff --git a/core/src/main/res/drawable-xxhdpi/ic_more_vert_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_more_vert_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..44012b87d --- /dev/null +++ b/core/src/main/res/drawable-xxhdpi/ic_more_vert_grey600_24dp.png diff --git a/core/src/main/res/drawable-xxhdpi/ic_more_vert_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_more_vert_white_24dp.png Binary files differnew file mode 100644 index 000000000..2955c02ec --- /dev/null +++ b/core/src/main/res/drawable-xxhdpi/ic_more_vert_white_24dp.png diff --git a/core/src/main/res/drawable-xxhdpi/ic_new_releases_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_new_releases_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..3eccc24f0 --- /dev/null +++ b/core/src/main/res/drawable-xxhdpi/ic_new_releases_grey600_24dp.png diff --git a/core/src/main/res/drawable-xxhdpi/ic_new_releases_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_new_releases_white_24dp.png Binary files differnew file mode 100644 index 000000000..4a7083c57 --- /dev/null +++ b/core/src/main/res/drawable-xxhdpi/ic_new_releases_white_24dp.png diff --git a/core/src/main/res/drawable-xxhdpi/ic_pause_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_pause_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..7efc88511 --- /dev/null +++ b/core/src/main/res/drawable-xxhdpi/ic_pause_grey600_24dp.png diff --git a/core/src/main/res/drawable-xxhdpi/ic_pause_grey600_36dp.png b/core/src/main/res/drawable-xxhdpi/ic_pause_grey600_36dp.png Binary files differnew file mode 100644 index 000000000..c8ed1d00a --- /dev/null +++ b/core/src/main/res/drawable-xxhdpi/ic_pause_grey600_36dp.png diff --git a/core/src/main/res/drawable-xxhdpi/ic_pause_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_pause_white_24dp.png Binary files differnew file mode 100644 index 000000000..72dfa9fa6 --- /dev/null +++ b/core/src/main/res/drawable-xxhdpi/ic_pause_white_24dp.png diff --git a/core/src/main/res/drawable-xxhdpi/ic_pause_white_36dp.png b/core/src/main/res/drawable-xxhdpi/ic_pause_white_36dp.png Binary files differnew file mode 100644 index 000000000..76833ff7d --- /dev/null +++ b/core/src/main/res/drawable-xxhdpi/ic_pause_white_36dp.png diff --git a/core/src/main/res/drawable-xxhdpi/ic_play_arrow_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_play_arrow_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..ba62a8102 --- /dev/null +++ b/core/src/main/res/drawable-xxhdpi/ic_play_arrow_grey600_24dp.png diff --git a/core/src/main/res/drawable-xxhdpi/ic_play_arrow_grey600_36dp.png b/core/src/main/res/drawable-xxhdpi/ic_play_arrow_grey600_36dp.png Binary files differnew file mode 100644 index 000000000..1d44f8f2f --- /dev/null +++ b/core/src/main/res/drawable-xxhdpi/ic_play_arrow_grey600_36dp.png diff --git a/core/src/main/res/drawable-xxhdpi/ic_play_arrow_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_play_arrow_white_24dp.png Binary files differnew file mode 100644 index 000000000..043acd808 --- /dev/null +++ b/core/src/main/res/drawable-xxhdpi/ic_play_arrow_white_24dp.png diff --git a/core/src/main/res/drawable-xxhdpi/ic_play_arrow_white_36dp.png b/core/src/main/res/drawable-xxhdpi/ic_play_arrow_white_36dp.png Binary files differnew file mode 100644 index 000000000..fe7ea25cc --- /dev/null +++ b/core/src/main/res/drawable-xxhdpi/ic_play_arrow_white_36dp.png diff --git a/core/src/main/res/drawable-xxhdpi/ic_refresh_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_refresh_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..9c1e27d74 --- /dev/null +++ b/core/src/main/res/drawable-xxhdpi/ic_refresh_grey600_24dp.png diff --git a/core/src/main/res/drawable-xxhdpi/ic_refresh_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_refresh_white_24dp.png Binary files differnew file mode 100644 index 000000000..72128fe69 --- /dev/null +++ b/core/src/main/res/drawable-xxhdpi/ic_refresh_white_24dp.png diff --git a/core/src/main/res/drawable-xxhdpi/ic_remove_red_eye_grey600_18dp.png b/core/src/main/res/drawable-xxhdpi/ic_remove_red_eye_grey600_18dp.png Binary files differnew file mode 100644 index 000000000..259ddcd14 --- /dev/null +++ b/core/src/main/res/drawable-xxhdpi/ic_remove_red_eye_grey600_18dp.png diff --git a/core/src/main/res/drawable-xxhdpi/ic_remove_red_eye_white_18dp.png b/core/src/main/res/drawable-xxhdpi/ic_remove_red_eye_white_18dp.png Binary files differnew file mode 100644 index 000000000..ece7aeb74 --- /dev/null +++ b/core/src/main/res/drawable-xxhdpi/ic_remove_red_eye_white_18dp.png diff --git a/core/src/main/res/drawable-xxhdpi/ic_search_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_search_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..9424ae98e --- /dev/null +++ b/core/src/main/res/drawable-xxhdpi/ic_search_grey600_24dp.png diff --git a/core/src/main/res/drawable-xxhdpi/ic_search_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_search_white_24dp.png Binary files differnew file mode 100644 index 000000000..0bbeab150 --- /dev/null +++ b/core/src/main/res/drawable-xxhdpi/ic_search_white_24dp.png diff --git a/core/src/main/res/drawable-xxhdpi/ic_settings_input_antenna_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_settings_input_antenna_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..5404820db --- /dev/null +++ b/core/src/main/res/drawable-xxhdpi/ic_settings_input_antenna_grey600_24dp.png diff --git a/core/src/main/res/drawable-xxhdpi/ic_settings_input_antenna_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_settings_input_antenna_white_24dp.png Binary files differnew file mode 100644 index 000000000..19752dd44 --- /dev/null +++ b/core/src/main/res/drawable-xxhdpi/ic_settings_input_antenna_white_24dp.png diff --git a/core/src/main/res/drawable-xxhdpi/ic_share_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_share_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..89136d7c3 --- /dev/null +++ b/core/src/main/res/drawable-xxhdpi/ic_share_grey600_24dp.png diff --git a/core/src/main/res/drawable-xxhdpi/ic_share_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_share_white_24dp.png Binary files differnew file mode 100644 index 000000000..9963c6a05 --- /dev/null +++ b/core/src/main/res/drawable-xxhdpi/ic_share_white_24dp.png diff --git a/core/src/main/res/drawable-xxhdpi/ic_timer_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_timer_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..a9ae43327 --- /dev/null +++ b/core/src/main/res/drawable-xxhdpi/ic_timer_grey600_24dp.png diff --git a/core/src/main/res/drawable-xxhdpi/ic_timer_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_timer_white_24dp.png Binary files differnew file mode 100644 index 000000000..276f4e1b9 --- /dev/null +++ b/core/src/main/res/drawable-xxhdpi/ic_timer_white_24dp.png diff --git a/core/src/main/res/drawable-xxhdpi/ic_toc_grey600_36dp.png b/core/src/main/res/drawable-xxhdpi/ic_toc_grey600_36dp.png Binary files differnew file mode 100644 index 000000000..bb35c5657 --- /dev/null +++ b/core/src/main/res/drawable-xxhdpi/ic_toc_grey600_36dp.png diff --git a/core/src/main/res/drawable-xxhdpi/ic_toc_white_36dp.png b/core/src/main/res/drawable-xxhdpi/ic_toc_white_36dp.png Binary files differnew file mode 100644 index 000000000..fdbb3ac3a --- /dev/null +++ b/core/src/main/res/drawable-xxhdpi/ic_toc_white_36dp.png diff --git a/core/src/main/res/drawable-xxhdpi/ic_web_grey600_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_web_grey600_24dp.png Binary files differnew file mode 100644 index 000000000..9e70743e8 --- /dev/null +++ b/core/src/main/res/drawable-xxhdpi/ic_web_grey600_24dp.png diff --git a/core/src/main/res/drawable-xxhdpi/ic_web_white_24dp.png b/core/src/main/res/drawable-xxhdpi/ic_web_white_24dp.png Binary files differnew file mode 100644 index 000000000..fcc2d1aca --- /dev/null +++ b/core/src/main/res/drawable-xxhdpi/ic_web_white_24dp.png diff --git a/core/src/main/res/drawable/badge.xml b/core/src/main/res/drawable/badge.xml deleted file mode 100644 index f98384cb9..000000000 --- a/core/src/main/res/drawable/badge.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<shape xmlns:android="http://schemas.android.com/apk/res/android" - android:shape="rectangle" > - - <solid android:color="@color/bright_blue" /> - - <padding - android:bottom="5dip" - android:left="5dip" - android:right="5dip" - android:top="5dip" /> - -</shape>
\ No newline at end of file diff --git a/core/src/main/res/drawable/borderless_button.xml b/core/src/main/res/drawable/borderless_button.xml deleted file mode 100644 index 27d723eed..000000000 --- a/core/src/main/res/drawable/borderless_button.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_pressed="true"><shape android:shape="rectangle"> - <solid android:color="@color/selection_background_color_light" /> - </shape></item> - <item android:state_focused="true"><shape android:shape="rectangle"> - <solid android:color="@color/selection_background_color_light" /> - </shape></item> - <item><shape android:shape="rectangle"> - <solid android:color="@android:color/transparent" /> - </shape></item> - -</selector>
\ No newline at end of file diff --git a/core/src/main/res/drawable/borderless_button_dark.xml b/core/src/main/res/drawable/borderless_button_dark.xml deleted file mode 100644 index 6d263938d..000000000 --- a/core/src/main/res/drawable/borderless_button_dark.xml +++ /dev/null @@ -1,13 +0,0 @@ -<?xml version="1.0" encoding="utf-8"?> -<selector xmlns:android="http://schemas.android.com/apk/res/android"> - <item android:state_pressed="true"><shape android:shape="rectangle"> - <solid android:color="@color/selection_background_color_dark" /> - </shape></item> - <item android:state_focused="true"><shape android:shape="rectangle"> - <solid android:color="@color/selection_background_color_dark" /> - </shape></item> - <item><shape android:shape="rectangle"> - <solid android:color="@android:color/transparent" /> - </shape></item> - -</selector>
\ No newline at end of file diff --git a/core/src/main/res/drawable/horizontal_divider.9.png b/core/src/main/res/drawable/horizontal_divider.9.png Binary files differdeleted file mode 100644 index 7db0549da..000000000 --- a/core/src/main/res/drawable/horizontal_divider.9.png +++ /dev/null diff --git a/core/src/main/res/drawable/type_audio.png b/core/src/main/res/drawable/type_audio.png Binary files differdeleted file mode 100644 index 4ec9efd97..000000000 --- a/core/src/main/res/drawable/type_audio.png +++ /dev/null diff --git a/core/src/main/res/drawable/type_video.png b/core/src/main/res/drawable/type_video.png Binary files differdeleted file mode 100644 index a2722b812..000000000 --- a/core/src/main/res/drawable/type_video.png +++ /dev/null diff --git a/core/src/main/res/drawable/vertical_divider.9.png b/core/src/main/res/drawable/vertical_divider.9.png Binary files differdeleted file mode 100644 index 6a0edafb3..000000000 --- a/core/src/main/res/drawable/vertical_divider.9.png +++ /dev/null diff --git a/core/src/main/res/values-large/dimens.xml b/core/src/main/res/values-large/dimens.xml index 27b4868c7..2da283c5b 100644 --- a/core/src/main/res/values-large/dimens.xml +++ b/core/src/main/res/values-large/dimens.xml @@ -2,7 +2,7 @@ <resources> <dimen name="thumbnail_length">170dp</dimen> - <dimen name="thumbnail_length_queue_item">80dp</dimen> - <dimen name="thumbnail_length_downloaded_item">80dp</dimen> + <dimen name="thumbnail_length_queue_item">64dp</dimen> + <dimen name="thumbnail_length_downloaded_item">64dp</dimen> <dimen name="queue_title_text_size">@dimen/text_size_medium</dimen> </resources>
\ No newline at end of file diff --git a/core/src/main/res/values/attrs.xml b/core/src/main/res/values/attrs.xml index 08a8063c1..c46a2118f 100644 --- a/core/src/main/res/values/attrs.xml +++ b/core/src/main/res/values/attrs.xml @@ -3,7 +3,6 @@ <attr name="action_about" format="reference"/> <attr name="action_search" format="reference"/> - <attr name="action_settings" format="reference"/> <attr name="action_stream" format="reference"/> <attr name="av_download" format="reference"/> <attr name="av_fast_forward" format="reference"/> @@ -12,13 +11,11 @@ <attr name="av_rewind" format="reference"/> <attr name="content_discard" format="reference"/> <attr name="content_new" format="reference"/> - <attr name="default_cover" format="reference"/> <attr name="device_access_time" format="reference"/> <attr name="location_web_site" format="reference"/> <attr name="navigation_accept" format="reference"/> <attr name="navigation_cancel" format="reference"/> <attr name="navigation_expand" format="reference"/> - <attr name="navigation_collapse" format="reference"/> <attr name="navigation_refresh" format="reference"/> <attr name="navigation_up" format="reference"/> <attr name="navigation_shownotes" format="reference"/> @@ -28,16 +25,20 @@ <attr name="type_audio" format="reference"/> <attr name="type_video" format="reference"/> <attr name="borderless_button" format="reference"/> - <attr name="spinner_button" format="reference"/> <attr name="overlay_drawable" format="reference"/> <attr name="dragview_background" format="reference"/> <attr name="dragview_float_background" format="reference"/> <attr name="ic_action_overflow" format="reference"/> <attr name="ic_new" format="reference"/> + <attr name="ic_history" format="reference"/> + <attr name="av_play_big" format="reference"/> + <attr name="av_pause_big" format="reference"/> + <attr name="av_ff_big" format="reference"/> + <attr name="av_rew_big" format="reference"/> + <!-- Used in itemdescription --> <attr name="non_transparent_background" format="reference"/> <attr name="overlay_background" format="color"/> <attr name="nav_drawer_background" format="color"/> - <attr name="nav_drawer_toggle" format="reference"/> </resources>
\ No newline at end of file diff --git a/core/src/main/res/values/colors.xml b/core/src/main/res/values/colors.xml index 6b535079d..ab48fafe7 100644 --- a/core/src/main/res/values/colors.xml +++ b/core/src/main/res/values/colors.xml @@ -21,4 +21,9 @@ <color name="selection_background_color_dark">#FEBB20</color> <color name="selection_background_color_light">#FEBB20</color> + <!-- Theme colors --> + <color name="primary_light">#FFFFFF</color> + <color name="color_accent">#009EC8</color> + + </resources>
\ No newline at end of file diff --git a/core/src/main/res/values/dimens.xml b/core/src/main/res/values/dimens.xml index 1ebcdb76d..38c14b024 100644 --- a/core/src/main/res/values/dimens.xml +++ b/core/src/main/res/values/dimens.xml @@ -11,13 +11,26 @@ <dimen name="text_size_medium">18sp</dimen> <dimen name="text_size_large">22sp</dimen> <dimen name="status_indicator_width">32dp</dimen> - <dimen name="thumbnail_length_itemlist">85dp</dimen> - <dimen name="thumbnail_length_queue_item">70dp</dimen> - <dimen name="thumbnail_length_downloaded_item">70dp</dimen> - <dimen name="thumbnail_length_onlinefeedview">110dp</dimen> + <dimen name="thumbnail_length_itemlist">64dp</dimen> + <dimen name="thumbnail_length_queue_item">64dp</dimen> + <dimen name="thumbnail_length_downloaded_item">64dp</dimen> + <dimen name="thumbnail_length_onlinefeedview">100dp</dimen> + <dimen name="feeditemlist_header_height">132dp</dimen> <dimen name="thumbnail_length_navlist">42dp</dimen> <dimen name="listview_secondary_button_width">48dp</dimen> <dimen name="drawer_width">280dp</dimen> - <dimen name="queue_title_text_size">@dimen/text_size_small</dimen> + <dimen name="listitem_iconwithtext_height">56dp</dimen> + <dimen name="listitem_iconwithtext_textleftpadding">14dp</dimen> + <dimen name="listitem_iconwithtext_textverticalpadding">16dp</dimen> + + <dimen name="listitem_threeline_height">96dp</dimen> + <dimen name="listitem_threeline_textleftpadding">14dp</dimen> + <dimen name="listitem_threeline_textrightpadding">8dp</dimen> + <dimen name="listitem_threeline_verticalpadding">16dp</dimen> + <dimen name="listitem_threeline_horizontalpadding">16dp</dimen> + + <dimen name="list_vertical_padding">8dp</dimen> + <dimen name="listitem_icon_leftpadding">16dp</dimen> + <dimen name="listitem_icon_rightpadding">16dp</dimen> </resources>
\ No newline at end of file diff --git a/core/src/main/res/values/styles.xml b/core/src/main/res/values/styles.xml index b976bbf8c..8febd42ca 100644 --- a/core/src/main/res/values/styles.xml +++ b/core/src/main/res/values/styles.xml @@ -2,84 +2,84 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android"> <style name="Theme.AntennaPod.Light" parent="@style/Theme.AppCompat.Light"> - <item name="attr/action_about">@drawable/action_about</item> - <item name="attr/action_search">@drawable/action_search</item> - <item name="attr/action_settings">@drawable/action_settings</item> - <item name="attr/action_stream">@drawable/action_stream</item> - <item name="attr/av_download">@drawable/av_download</item> - <item name="attr/av_fast_forward">@drawable/av_fast_forward</item> - <item name="attr/av_pause">@drawable/av_pause</item> - <item name="attr/av_play">@drawable/av_play</item> - <item name="attr/av_rewind">@drawable/av_rewind</item> - <item name="attr/content_discard">@drawable/content_discard</item> - <item name="attr/content_new">@drawable/content_new</item> - <item name="attr/default_cover">@drawable/default_cover</item> - <item name="attr/device_access_time">@drawable/device_access_time</item> - <item name="attr/location_web_site">@drawable/location_web_site</item> - <item name="attr/navigation_accept">@drawable/navigation_accept</item> - <item name="attr/navigation_cancel">@drawable/navigation_cancel</item> - <item name="attr/navigation_expand">@drawable/navigation_expand</item> - <item name="attr/navigation_collapse">@drawable/navigation_collapse</item> - <item name="attr/navigation_refresh">@drawable/navigation_refresh</item> + <item name="colorPrimary">@color/primary_light</item> + <item name="colorAccent">@color/color_accent</item> + <item name="attr/action_about">@drawable/ic_info_grey600_24dp</item> + <item name="attr/action_search">@drawable/ic_search_grey600_24dp</item> + <item name="attr/action_stream">@drawable/ic_settings_input_antenna_grey600_24dp</item> + <item name="attr/av_download">@drawable/ic_file_download_grey600_24dp</item> + <item name="attr/av_fast_forward">@drawable/ic_fast_forward_grey600_24dp</item> + <item name="attr/av_pause">@drawable/ic_pause_grey600_24dp</item> + <item name="attr/av_play">@drawable/ic_play_arrow_grey600_24dp</item> + <item name="attr/av_rewind">@drawable/ic_fast_rewind_grey600_24dp</item> + <item name="attr/content_discard">@drawable/ic_delete_grey600_24dp</item> + <item name="attr/content_new">@drawable/ic_add_grey600_24dp</item> + <item name="attr/device_access_time">@drawable/ic_timer_grey600_24dp</item> + <item name="attr/location_web_site">@drawable/ic_web_grey600_24dp</item> + <item name="attr/navigation_accept">@drawable/ic_done_grey600_24dp</item> + <item name="attr/navigation_cancel">@drawable/ic_cancel_grey600_24dp</item> + <item name="attr/navigation_expand">@drawable/ic_expand_more_grey600_36dp</item> + <item name="attr/navigation_refresh">@drawable/ic_refresh_grey600_24dp</item> <item name="attr/navigation_up">@drawable/navigation_up</item> - <item name="attr/navigation_shownotes">@drawable/navigation_shownotes</item> - <item name="attr/navigation_chapters">@drawable/navigation_chapters</item> - <item name="attr/social_share">@drawable/social_share</item> - <item name="attr/stat_playlist">@drawable/stat_playlist</item> - <item name="attr/type_audio">@drawable/type_audio</item> - <item name="attr/type_video">@drawable/type_video</item> + <item name="attr/navigation_shownotes">@drawable/ic_description_grey600_36dp</item> + <item name="attr/navigation_chapters">@drawable/ic_toc_grey600_36dp</item> + <item name="attr/social_share">@drawable/ic_share_grey600_24dp</item> + <item name="attr/stat_playlist">@drawable/ic_list_grey600_24dp</item> + <item name="attr/type_audio">@drawable/ic_hearing_grey600_18dp</item> + <item name="attr/type_video">@drawable/ic_remove_red_eye_grey600_18dp</item> <item name="attr/non_transparent_background">@color/white</item> - <item name="attr/borderless_button">@drawable/borderless_button</item> <item name="attr/overlay_background">@color/overlay_light</item> - <item name="attr/spinner_button">@drawable/spinner_button</item> <item name="attr/overlay_drawable">@drawable/overlay_drawable</item> <item name="attr/dragview_background">@drawable/ic_drag_handle</item> <item name="attr/dragview_float_background">@color/white</item> <item name="attr/nav_drawer_background">@color/white</item> - <item name="attr/nav_drawer_toggle">@drawable/ic_drawer</item> - <item name="attr/ic_action_overflow">@drawable/ic_action_overflow</item> - <item name="attr/ic_new">@drawable/ic_new</item> + <item name="attr/ic_action_overflow">@drawable/ic_more_vert_grey600_24dp</item> + <item name="attr/ic_new">@drawable/ic_new_releases_grey600_24dp</item> + <item name="attr/ic_history">@drawable/ic_history_grey600_24dp</item> + <item name="attr/av_play_big">@drawable/ic_play_arrow_grey600_36dp</item> + <item name="attr/av_pause_big">@drawable/ic_pause_grey600_36dp</item> + <item name="attr/av_ff_big">@drawable/ic_fast_forward_grey600_36dp</item> + <item name="attr/av_rew_big">@drawable/ic_fast_rewind_grey600_36dp</item> </style> <style name="Theme.AntennaPod.Dark" parent="@style/Theme.AppCompat"> - <item name="attr/action_about">@drawable/action_about_dark</item> - <item name="attr/action_search">@drawable/action_search_dark</item> - <item name="attr/action_settings">@drawable/action_settings_dark</item> - <item name="attr/action_stream">@drawable/action_stream_dark</item> - <item name="attr/av_download">@drawable/av_download_dark</item> - <item name="attr/av_fast_forward">@drawable/av_fast_forward_dark</item> - <item name="attr/av_pause">@drawable/av_pause_dark</item> - <item name="attr/av_play">@drawable/av_play_dark</item> - <item name="attr/av_rewind">@drawable/av_rewind_dark</item> - <item name="attr/content_discard">@drawable/content_discard_dark</item> - <item name="attr/content_new">@drawable/content_new_dark</item> - <item name="attr/default_cover">@drawable/default_cover_dark</item> - <item name="attr/device_access_time">@drawable/device_access_time_dark</item> - <item name="attr/location_web_site">@drawable/location_web_site_dark</item> - <item name="attr/navigation_accept">@drawable/navigation_accept_dark</item> - <item name="attr/navigation_cancel">@drawable/navigation_cancel_dark</item> - <item name="attr/navigation_expand">@drawable/navigation_expand_dark</item> - <item name="attr/navigation_collapse">@drawable/navigation_collapse_dark</item> - <item name="attr/navigation_refresh">@drawable/navigation_refresh_dark</item> + <item name="colorAccent">@color/color_accent</item> + <item name="attr/action_about">@drawable/ic_info_white_24dp</item> + <item name="attr/action_search">@drawable/ic_search_white_24dp</item> + <item name="attr/action_stream">@drawable/ic_settings_input_antenna_white_24dp</item> + <item name="attr/av_download">@drawable/ic_file_download_white_24dp</item> + <item name="attr/av_fast_forward">@drawable/ic_fast_forward_white_24dp</item> + <item name="attr/av_pause">@drawable/ic_pause_white_24dp</item> + <item name="attr/av_play">@drawable/ic_play_arrow_white_24dp</item> + <item name="attr/av_rewind">@drawable/ic_fast_rewind_white_24dp</item> + <item name="attr/content_discard">@drawable/ic_delete_white_24dp</item> + <item name="attr/content_new">@drawable/ic_add_white_24dp</item> + <item name="attr/device_access_time">@drawable/ic_timer_white_24dp</item> + <item name="attr/location_web_site">@drawable/ic_web_white_24dp</item> + <item name="attr/navigation_accept">@drawable/ic_done_white_24dp</item> + <item name="attr/navigation_cancel">@drawable/ic_cancel_white_24dp</item> + <item name="attr/navigation_expand">@drawable/ic_expand_more_white_36dp</item> + <item name="attr/navigation_refresh">@drawable/ic_refresh_white_24dp</item> <item name="attr/navigation_up">@drawable/navigation_up_dark</item> - <item name="attr/navigation_shownotes">@drawable/navigation_shownotes_dark</item> - <item name="attr/navigation_chapters">@drawable/navigation_chapters_dark</item> - <item name="attr/social_share">@drawable/social_share_dark</item> - <item name="attr/stat_playlist">@drawable/stat_playlist_dark</item> - <item name="attr/type_audio">@drawable/type_audio_dark</item> - <item name="attr/type_video">@drawable/type_video_dark</item> + <item name="attr/navigation_shownotes">@drawable/ic_description_white_36dp</item> + <item name="attr/navigation_chapters">@drawable/ic_toc_white_36dp</item> + <item name="attr/social_share">@drawable/ic_share_white_24dp</item> + <item name="attr/stat_playlist">@drawable/ic_list_white_24dp</item> + <item name="attr/type_audio">@drawable/ic_hearing_white_18dp</item> + <item name="attr/type_video">@drawable/ic_remove_red_eye_white_18dp</item> <item name="attr/non_transparent_background">@color/black</item> - <item name="attr/borderless_button">@drawable/borderless_button_dark</item> <item name="attr/overlay_background">@color/overlay_dark</item> - <item name="attr/spinner_button">@drawable/spinner_button_dark</item> <item name="attr/overlay_drawable">@drawable/overlay_drawable_dark</item> <item name="attr/dragview_background">@drawable/ic_drag_handle_dark</item> <item name="attr/dragview_float_background">@color/black</item> <item name="attr/nav_drawer_background">#3B3B3B</item> - <item name="attr/nav_drawer_toggle">@drawable/ic_drawer_dark</item> - <item name="attr/ic_action_overflow">@drawable/ic_action_overflow_dark</item> - <item name="attr/ic_new">@drawable/ic_new_dark</item> - + <item name="attr/ic_action_overflow">@drawable/ic_more_vert_white_24dp</item> + <item name="attr/ic_new">@drawable/ic_new_releases_white_24dp</item> + <item name="attr/ic_history">@drawable/ic_history_white_24dp</item> + <item name="attr/av_play_big">@drawable/ic_play_arrow_white_36dp</item> + <item name="attr/av_pause_big">@drawable/ic_pause_white_36dp</item> + <item name="attr/av_ff_big">@drawable/ic_fast_forward_white_36dp</item> + <item name="attr/av_rew_big">@drawable/ic_fast_rewind_white_36dp</item> </style> <style name="UndoBar"> @@ -127,12 +127,19 @@ </style> <style name="AntennaPod.TextView.ListItemPrimaryTitle" parent="@android:style/TextAppearance.Small"> - <item name="android:textSize">14sp</item> + <item name="android:textSize">16sp</item> <item name="android:textColor">?android:attr/textColorPrimary</item> <item name="android:lines">2</item> <item name="android:ellipsize">end</item> </style> + <style name="AntennaPod.TextView.ListItemSecondaryTitle" parent="@android:style/TextAppearance.Small"> + <item name="android:textSize">14sp</item> + <item name="android:textColor">?android:attr/textColorSecondary</item> + <item name="android:lines">1</item> + <item name="android:ellipsize">end</item> + </style> + <style name="AntennaPod.Dialog.Title" parent="@android:style/TextAppearance.Medium"> <item name="android:textSize">@dimen/text_size_medium</item> <item name="android:textColor">?android:attr/textColorPrimary</item> |
