Merge pull request #2598 from orionlee/upgrade_android_gradle_plugin_v3

Upgrade android gradle plugin v3
This commit is contained in:
Martin Fietz 2018-04-01 23:19:44 +02:00 committed by GitHub
commit 894c7b6360
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 270 additions and 266 deletions

View File

@ -1,7 +1,6 @@
import org.apache.tools.ant.filters.ReplaceTokens
apply plugin: "com.android.application"
apply plugin: "me.tatarka.retrolambda"
apply plugin: 'com.github.triplet.play'
apply plugin: 'com.getkeepsafe.dexcount'
@ -113,10 +112,13 @@ android {
additionalParameters "--no-version-vectors"
}
flavorDimensions "market"
productFlavors {
free {
dimension "market"
}
play {
dimension "market"
}
}
@ -126,58 +128,58 @@ android {
}
configurations {
freeDebugCompile
freeReleaseCompile
playDebugCompile
playReleaseCompile
freeDebugImplementation
freeReleaseImplementation
playDebugImplementation
playReleaseImplementation
}
dependencies {
freeDebugCompile project(path: ":core", configuration: "freeDebug")
freeReleaseCompile project(path: ":core", configuration: "freeRelease")
freeImplementation project(":core")
// free build hack: skip some dependencies
if (!doFreeBuild()) {
playDebugCompile project(path: ":core", configuration: "playDebug")
playReleaseCompile project(path: ":core", configuration: "playRelease")
playImplementation project(":core")
} else {
System.out.println("app: free build hack, skipping some dependencies")
}
compile "com.android.support:support-v4:$supportVersion"
compile "com.android.support:appcompat-v7:$supportVersion"
compile "com.android.support:design:$supportVersion"
compile "com.android.support:gridlayout-v7:$supportVersion"
compile "com.android.support:percent:$supportVersion"
compile "com.android.support:recyclerview-v7:$supportVersion"
compile "org.apache.commons:commons-lang3:$commonslangVersion"
compile("org.shredzone.flattr4j:flattr4j-core:$flattr4jVersion") {
implementation "com.android.support:support-v4:$supportVersion"
implementation "com.android.support:appcompat-v7:$supportVersion"
implementation "com.android.support:design:$supportVersion"
implementation "com.android.support:gridlayout-v7:$supportVersion"
implementation "com.android.support:percent:$supportVersion"
implementation "com.android.support:recyclerview-v7:$supportVersion"
implementation "org.apache.commons:commons-lang3:$commonslangVersion"
implementation("org.shredzone.flattr4j:flattr4j-core:$flattr4jVersion") {
exclude group: "org.json", module: "json"
}
compile "commons-io:commons-io:$commonsioVersion"
compile "org.jsoup:jsoup:$jsoupVersion"
compile "com.github.bumptech.glide:glide:$glideVersion"
compile "com.squareup.okhttp3:okhttp:$okhttpVersion"
compile "com.squareup.okhttp3:okhttp-urlconnection:$okhttpVersion"
compile "com.squareup.okio:okio:$okioVersion"
compile "de.greenrobot:eventbus:$eventbusVersion"
compile "io.reactivex:rxandroid:$rxAndroidVersion"
compile "io.reactivex:rxjava:$rxJavaVersion"
implementation "commons-io:commons-io:$commonsioVersion"
implementation "org.jsoup:jsoup:$jsoupVersion"
implementation "com.github.bumptech.glide:glide:$glideVersion"
implementation "com.squareup.okhttp3:okhttp:$okhttpVersion"
implementation "com.squareup.okhttp3:okhttp-urlconnection:$okhttpVersion"
implementation "com.squareup.okio:okio:$okioVersion"
implementation "de.greenrobot:eventbus:$eventbusVersion"
implementation "io.reactivex:rxandroid:$rxAndroidVersion"
implementation "io.reactivex:rxjava:$rxJavaVersion"
// And ProGuard rules for RxJava!
compile "com.artemzin.rxjava:proguard-rules:$rxJavaRulesVersion"
compile "com.joanzapata.iconify:android-iconify-fontawesome:$iconifyVersion"
compile "com.joanzapata.iconify:android-iconify-material:$iconifyVersion"
compile("com.afollestad.material-dialogs:commons:$materialDialogsVersion") {
implementation "com.artemzin.rxjava:proguard-rules:$rxJavaRulesVersion"
implementation "com.joanzapata.iconify:android-iconify-fontawesome:$iconifyVersion"
implementation "com.joanzapata.iconify:android-iconify-material:$iconifyVersion"
implementation("com.afollestad.material-dialogs:commons:$materialDialogsVersion") {
transitive = true
}
compile "com.yqritc:recyclerview-flexibledivider:$recyclerviewFlexibledividerVersion"
compile("com.githang:viewpagerindicator:2.5@aar") {
implementation "com.yqritc:recyclerview-flexibledivider:$recyclerviewFlexibledividerVersion"
implementation("com.githang:viewpagerindicator:2.5@aar") {
exclude module: "support-v4"
}
compile "com.github.shts:TriangleLabelView:$triangleLabelViewVersion"
implementation "com.github.shts:TriangleLabelView:$triangleLabelViewVersion"
compile "com.github.AntennaPod:AntennaPod-AudioPlayer:$audioPlayerVersion"
implementation "com.github.AntennaPod:AntennaPod-AudioPlayer:$audioPlayerVersion"
compile 'com.github.mfietz:fyydlin:v0.3'
implementation 'com.github.mfietz:fyydlin:v0.3'
androidTestImplementation "com.jayway.android.robotium:robotium-solo:$robotiumSoloVersion"
}
play {

View File

@ -4,12 +4,11 @@ buildscript {
repositories {
jcenter()
mavenCentral()
google()
}
dependencies {
classpath "com.android.tools.build:gradle:2.3.3"
classpath "me.tatarka:gradle-retrolambda:3.7.0"
classpath "me.tatarka.retrolambda.projectlombok:lombok.ast:0.2.3.a2"
classpath "com.github.triplet.gradle:play-publisher:1.1.4"
classpath "com.android.tools.build:gradle:3.0.1"
classpath "com.github.triplet.gradle:play-publisher:1.2.0"
// Exclude the version that the android plugin depends on.
configurations.classpath.exclude group: "com.android.tools.external.lombok"
}
@ -18,6 +17,7 @@ buildscript {
allprojects {
repositories {
jcenter()
google()
}
}
@ -38,7 +38,7 @@ subprojects {
project.ext {
compileSdkVersion = 25
buildToolsVersion = "25.0.3"
buildToolsVersion = "27.0.3"
minSdkVersion = 14
targetSdkVersion = 25

View File

@ -3,7 +3,8 @@ general:
- app/build/outputs/apk
machine:
environment:
GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx2048m -XX:+HeapDumpOnOutOfMemoryError"'
GRADLE_OPTS: '-Dorg.gradle.jvmargs="-Xmx1536m -XX:MaxPermSize=512m -XX:+HeapDumpOnOutOfMemoryError"'
_JAVA_OPTIONS: "-Xms256m -Xmx1280m -XX:MaxPermSize=350m"
java:
version: oraclejdk8
dependencies:
@ -12,11 +13,11 @@ dependencies:
- ~/android
pre:
- echo y | android update sdk --no-ui --all --filter "tool,extra-android-m2repository,extra-android-support,extra-google-google_play_services,extra-google-m2repository,android-25"
- echo y | android update sdk --no-ui --all --filter "build-tools-25.0.3"
- echo y | android update sdk --no-ui --all --filter "build-tools-27.0.3"
override:
- echo override dependencies
test:
override:
- ./gradlew assembleDebug -PdisablePreDex:
timeout: 1800
timeout: 1800

View File

@ -1,5 +1,4 @@
apply plugin: "com.android.library"
apply plugin: "me.tatarka.retrolambda"
android {
compileSdkVersion rootProject.ext.compileSdkVersion
@ -30,11 +29,13 @@ android {
targetCompatibility JavaVersion.VERSION_1_8
}
publishNonDefault true
flavorDimensions "market"
productFlavors {
free {
dimension "market"
}
play {
dimension "market"
}
}
@ -46,32 +47,32 @@ repositories {
}
dependencies {
compile "com.android.support:support-v4:$supportVersion"
compile "com.android.support:appcompat-v7:$supportVersion"
compile "org.apache.commons:commons-lang3:$commonslangVersion"
compile ("org.shredzone.flattr4j:flattr4j-core:$flattr4jVersion") {
implementation "com.android.support:support-v4:$supportVersion"
implementation "com.android.support:appcompat-v7:$supportVersion"
implementation "org.apache.commons:commons-lang3:$commonslangVersion"
implementation ("org.shredzone.flattr4j:flattr4j-core:$flattr4jVersion") {
exclude group: "org.json", module: "json"
}
compile "commons-io:commons-io:$commonsioVersion"
compile "com.jayway.android.robotium:robotium-solo:$robotiumSoloVersion"
compile "org.jsoup:jsoup:$jsoupVersion"
compile "com.github.bumptech.glide:glide:$glideVersion"
compile "com.github.bumptech.glide:okhttp3-integration:$glideOkhttpIntegrationVersion@aar"
compile "com.squareup.okhttp3:okhttp:$okhttpVersion"
compile "com.squareup.okhttp3:okhttp-urlconnection:$okhttpVersion"
compile "com.squareup.okio:okio:$okioVersion"
compile "de.greenrobot:eventbus:$eventbusVersion"
compile "io.reactivex:rxandroid:$rxAndroidVersion"
implementation "commons-io:commons-io:$commonsioVersion"
implementation "com.jayway.android.robotium:robotium-solo:$robotiumSoloVersion"
implementation "org.jsoup:jsoup:$jsoupVersion"
implementation "com.github.bumptech.glide:glide:$glideVersion"
implementation "com.github.bumptech.glide:okhttp3-integration:$glideOkhttpIntegrationVersion@aar"
implementation "com.squareup.okhttp3:okhttp:$okhttpVersion"
implementation "com.squareup.okhttp3:okhttp-urlconnection:$okhttpVersion"
implementation "com.squareup.okio:okio:$okioVersion"
implementation "de.greenrobot:eventbus:$eventbusVersion"
implementation "io.reactivex:rxandroid:$rxAndroidVersion"
compile "com.github.AntennaPod:AntennaPod-AudioPlayer:$audioPlayerVersion"
implementation "com.github.AntennaPod:AntennaPod-AudioPlayer:$audioPlayerVersion"
// Add casting features
// free build hack: skip some dependencies
if (!doFreeBuild()) {
playCompile "com.google.android.libraries.cast.companionlibrary:ccl:$castCompanionLibVer"
compile "com.android.support:mediarouter-v7:$supportVersion"
playCompile "com.google.android.gms:play-services-cast:$playServicesVersion"
compile "com.google.android.support:wearable:$wearableSupportVersion"
playApi "com.google.android.libraries.cast.companionlibrary:ccl:$castCompanionLibVer"
api "com.android.support:mediarouter-v7:$supportVersion"
playApi "com.google.android.gms:play-services-cast:$playServicesVersion"
api "com.google.android.support:wearable:$wearableSupportVersion"
} else {
System.out.println("core: free build hack, skipping some dependencies")
}

View File

@ -11,57 +11,57 @@
<item name="progressBarTheme">@style/ProgressBarLight</item>
<item name="buttonStyle">@style/Widget.AntennaPod.Button</item>
<item name="alertDialogTheme">@style/AntennaPod.Dialog.Light</item>
<item name="attr/action_bar_icon_color">@color/grey600</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/feed">@drawable/ic_feed_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/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/overlay_background">@color/overlay_light</item>
<item name="attr/overlay_drawable">@drawable/overlay_drawable</item>
<item name="attr/dragview_background">@drawable/ic_drag_vertical_grey600_48dp</item>
<item name="attr/dragview_float_background">@color/white</item>
<item name="attr/nav_drawer_background">@color/white</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/ic_folder">@drawable/ic_folder_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>
<item name="attr/av_skip_big">@drawable/ic_skip_grey600_36dp</item>
<item name="attr/ic_fav">@drawable/ic_star_border_grey600_24dp</item>
<item name="attr/ic_unfav">@drawable/ic_star_grey600_24dp</item>
<item name="attr/ic_settings">@drawable/ic_settings_grey600_24dp</item>
<item name="attr/ic_lock_open">@drawable/ic_lock_open_grey600_24dp</item>
<item name="attr/ic_lock_closed">@drawable/ic_lock_closed_grey600_24dp</item>
<item name="attr/ic_filter">@drawable/ic_filter_grey600_24dp</item>
<item name="attr/ic_sleep">@drawable/ic_sleep_grey600_24dp</item>
<item name="attr/ic_sleep_off">@drawable/ic_sleep_off_grey600_24dp</item>
<item name="attr/ic_check_box">@drawable/ic_check_box_grey600_24dp</item>
<item name="attr/ic_check_box_outline">@drawable/ic_check_box_outline_blank_grey600_24dp</item>
<item name="attr/ic_indeterminate_check_box">@drawable/ic_indeterminate_check_box_grey600_24dp</item>
<item name="attr/ic_sort">@drawable/ic_sort_grey600_24dp</item>
<item name="attr/ic_sd_storage">@drawable/ic_sd_storage_grey600_36dp</item>
<item name="attr/ic_create_new_folder">@drawable/ic_create_new_folder_grey600_24dp</item>
<item name="attr/ic_cast_disconnect">@drawable/ic_cast_disconnect_grey600_36dp</item>
<item type="attr" name="action_bar_icon_color">@color/grey600</item>
<item type="attr" name="action_about">@drawable/ic_info_grey600_24dp</item>
<item type="attr" name="action_search">@drawable/ic_search_grey600_24dp</item>
<item type="attr" name="action_stream">@drawable/ic_settings_input_antenna_grey600_24dp</item>
<item type="attr" name="av_download">@drawable/ic_file_download_grey600_24dp</item>
<item type="attr" name="av_fast_forward">@drawable/ic_fast_forward_grey600_24dp</item>
<item type="attr" name="av_pause">@drawable/ic_pause_grey600_24dp</item>
<item type="attr" name="av_play">@drawable/ic_play_arrow_grey600_24dp</item>
<item type="attr" name="av_rewind">@drawable/ic_fast_rewind_grey600_24dp</item>
<item type="attr" name="content_discard">@drawable/ic_delete_grey600_24dp</item>
<item type="attr" name="content_new">@drawable/ic_add_grey600_24dp</item>
<item type="attr" name="feed">@drawable/ic_feed_grey600_24dp</item>
<item type="attr" name="location_web_site">@drawable/ic_web_grey600_24dp</item>
<item type="attr" name="navigation_accept">@drawable/ic_done_grey600_24dp</item>
<item type="attr" name="navigation_cancel">@drawable/ic_cancel_grey600_24dp</item>
<item type="attr" name="navigation_expand">@drawable/ic_expand_more_grey600_36dp</item>
<item type="attr" name="navigation_refresh">@drawable/ic_refresh_grey600_24dp</item>
<item type="attr" name="navigation_up">@drawable/navigation_up</item>
<item type="attr" name="social_share">@drawable/ic_share_grey600_24dp</item>
<item type="attr" name="stat_playlist">@drawable/ic_list_grey600_24dp</item>
<item type="attr" name="type_audio">@drawable/ic_hearing_grey600_18dp</item>
<item type="attr" name="type_video">@drawable/ic_remove_red_eye_grey600_18dp</item>
<item type="attr" name="non_transparent_background">@color/white</item>
<item type="attr" name="overlay_background">@color/overlay_light</item>
<item type="attr" name="overlay_drawable">@drawable/overlay_drawable</item>
<item type="attr" name="dragview_background">@drawable/ic_drag_vertical_grey600_48dp</item>
<item type="attr" name="dragview_float_background">@color/white</item>
<item type="attr" name="nav_drawer_background">@color/white</item>
<item type="attr" name="ic_new">@drawable/ic_new_releases_grey600_24dp</item>
<item type="attr" name="ic_history">@drawable/ic_history_grey600_24dp</item>
<item type="attr" name="ic_folder">@drawable/ic_folder_grey600_24dp</item>
<item type="attr" name="av_play_big">@drawable/ic_play_arrow_grey600_36dp</item>
<item type="attr" name="av_pause_big">@drawable/ic_pause_grey600_36dp</item>
<item type="attr" name="av_ff_big">@drawable/ic_fast_forward_grey600_36dp</item>
<item type="attr" name="av_rew_big">@drawable/ic_fast_rewind_grey600_36dp</item>
<item type="attr" name="av_skip_big">@drawable/ic_skip_grey600_36dp</item>
<item type="attr" name="ic_fav">@drawable/ic_star_border_grey600_24dp</item>
<item type="attr" name="ic_unfav">@drawable/ic_star_grey600_24dp</item>
<item type="attr" name="ic_settings">@drawable/ic_settings_grey600_24dp</item>
<item type="attr" name="ic_lock_open">@drawable/ic_lock_open_grey600_24dp</item>
<item type="attr" name="ic_lock_closed">@drawable/ic_lock_closed_grey600_24dp</item>
<item type="attr" name="ic_filter">@drawable/ic_filter_grey600_24dp</item>
<item type="attr" name="ic_sleep">@drawable/ic_sleep_grey600_24dp</item>
<item type="attr" name="ic_sleep_off">@drawable/ic_sleep_off_grey600_24dp</item>
<item type="attr" name="ic_check_box">@drawable/ic_check_box_grey600_24dp</item>
<item type="attr" name="ic_check_box_outline">@drawable/ic_check_box_outline_blank_grey600_24dp</item>
<item type="attr" name="ic_indeterminate_check_box">@drawable/ic_indeterminate_check_box_grey600_24dp</item>
<item type="attr" name="ic_sort">@drawable/ic_sort_grey600_24dp</item>
<item type="attr" name="ic_sd_storage">@drawable/ic_sd_storage_grey600_36dp</item>
<item type="attr" name="ic_create_new_folder">@drawable/ic_create_new_folder_grey600_24dp</item>
<item type="attr" name="ic_cast_disconnect">@drawable/ic_cast_disconnect_grey600_36dp</item>
</style>
<style name="Theme.AntennaPod.Dark" parent="Theme.Base.AntennaPod.Dark">
@ -74,57 +74,57 @@
<item name="buttonStyle">@style/Widget.AntennaPod.Button</item>
<item name="progressBarTheme">@style/ProgressBarDark</item>
<item name="alertDialogTheme">@style/AntennaPod.Dialog.Dark</item>
<item name="attr/action_bar_icon_color">@color/white</item>
<item name="attr/action_about">@drawable/ic_info_white_24dp</item>g
<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/feed">@drawable/ic_feed_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/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/overlay_background">@color/overlay_dark</item>
<item name="attr/overlay_drawable">@drawable/overlay_drawable_dark</item>
<item name="attr/dragview_background">@drawable/ic_drag_vertical_white_48dp</item>
<item name="attr/dragview_float_background">@color/black</item>
<item name="attr/nav_drawer_background">#3B3B3B</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/ic_folder">@drawable/ic_folder_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>
<item name="attr/av_skip_big">@drawable/ic_skip_white_36dp</item>
<item name="attr/ic_fav">@drawable/ic_star_border_white_24dp</item>
<item name="attr/ic_unfav">@drawable/ic_star_white_24dp</item>
<item name="attr/ic_settings">@drawable/ic_settings_white_24dp</item>
<item name="attr/ic_lock_open">@drawable/ic_lock_open_white_24dp</item>
<item name="attr/ic_lock_closed">@drawable/ic_lock_closed_white_24dp</item>
<item name="attr/ic_filter">@drawable/ic_filter_white_24dp</item>
<item name="attr/ic_sleep">@drawable/ic_sleep_white_24dp</item>
<item name="attr/ic_sleep_off">@drawable/ic_sleep_off_white_24dp</item>
<item name="attr/ic_check_box">@drawable/ic_check_box_white_24dp</item>
<item name="attr/ic_check_box_outline">@drawable/ic_check_box_outline_blank_white_24dp</item>
<item name="attr/ic_indeterminate_check_box">@drawable/ic_indeterminate_check_box_white_24dp</item>
<item name="attr/ic_sort">@drawable/ic_sort_white_24dp</item>
<item name="attr/ic_sd_storage">@drawable/ic_sd_storage_white_36dp</item>
<item name="attr/ic_create_new_folder">@drawable/ic_create_new_folder_white_24dp</item>
<item name="attr/ic_cast_disconnect">@drawable/ic_cast_disconnect_white_36dp</item>
<item type="attr" name="action_bar_icon_color">@color/white</item>
<item type="attr" name="action_about">@drawable/ic_info_white_24dp</item>g
<item type="attr" name="action_search">@drawable/ic_search_white_24dp</item>
<item type="attr" name="action_stream">@drawable/ic_settings_input_antenna_white_24dp</item>
<item type="attr" name="av_download">@drawable/ic_file_download_white_24dp</item>
<item type="attr" name="av_fast_forward">@drawable/ic_fast_forward_white_24dp</item>
<item type="attr" name="av_pause">@drawable/ic_pause_white_24dp</item>
<item type="attr" name="av_play">@drawable/ic_play_arrow_white_24dp</item>
<item type="attr" name="av_rewind">@drawable/ic_fast_rewind_white_24dp</item>
<item type="attr" name="content_discard">@drawable/ic_delete_white_24dp</item>
<item type="attr" name="content_new">@drawable/ic_add_white_24dp</item>
<item type="attr" name="feed">@drawable/ic_feed_white_24dp</item>
<item type="attr" name="location_web_site">@drawable/ic_web_white_24dp</item>
<item type="attr" name="navigation_accept">@drawable/ic_done_white_24dp</item>
<item type="attr" name="navigation_cancel">@drawable/ic_cancel_white_24dp</item>
<item type="attr" name="navigation_expand">@drawable/ic_expand_more_white_36dp</item>
<item type="attr" name="navigation_refresh">@drawable/ic_refresh_white_24dp</item>
<item type="attr" name="navigation_up">@drawable/navigation_up_dark</item>
<item type="attr" name="social_share">@drawable/ic_share_white_24dp</item>
<item type="attr" name="stat_playlist">@drawable/ic_list_white_24dp</item>
<item type="attr" name="type_audio">@drawable/ic_hearing_white_18dp</item>
<item type="attr" name="type_video">@drawable/ic_remove_red_eye_white_18dp</item>
<item type="attr" name="non_transparent_background">@color/black</item>
<item type="attr" name="overlay_background">@color/overlay_dark</item>
<item type="attr" name="overlay_drawable">@drawable/overlay_drawable_dark</item>
<item type="attr" name="dragview_background">@drawable/ic_drag_vertical_white_48dp</item>
<item type="attr" name="dragview_float_background">@color/black</item>
<item type="attr" name="nav_drawer_background">#3B3B3B</item>
<item type="attr" name="ic_new">@drawable/ic_new_releases_white_24dp</item>
<item type="attr" name="ic_history">@drawable/ic_history_white_24dp</item>
<item type="attr" name="ic_folder">@drawable/ic_folder_white_24dp</item>
<item type="attr" name="av_play_big">@drawable/ic_play_arrow_white_36dp</item>
<item type="attr" name="av_pause_big">@drawable/ic_pause_white_36dp</item>
<item type="attr" name="av_ff_big">@drawable/ic_fast_forward_white_36dp</item>
<item type="attr" name="av_rew_big">@drawable/ic_fast_rewind_white_36dp</item>
<item type="attr" name="av_skip_big">@drawable/ic_skip_white_36dp</item>
<item type="attr" name="ic_fav">@drawable/ic_star_border_white_24dp</item>
<item type="attr" name="ic_unfav">@drawable/ic_star_white_24dp</item>
<item type="attr" name="ic_settings">@drawable/ic_settings_white_24dp</item>
<item type="attr" name="ic_lock_open">@drawable/ic_lock_open_white_24dp</item>
<item type="attr" name="ic_lock_closed">@drawable/ic_lock_closed_white_24dp</item>
<item type="attr" name="ic_filter">@drawable/ic_filter_white_24dp</item>
<item type="attr" name="ic_sleep">@drawable/ic_sleep_white_24dp</item>
<item type="attr" name="ic_sleep_off">@drawable/ic_sleep_off_white_24dp</item>
<item type="attr" name="ic_check_box">@drawable/ic_check_box_white_24dp</item>
<item type="attr" name="ic_check_box_outline">@drawable/ic_check_box_outline_blank_white_24dp</item>
<item type="attr" name="ic_indeterminate_check_box">@drawable/ic_indeterminate_check_box_white_24dp</item>
<item type="attr" name="ic_sort">@drawable/ic_sort_white_24dp</item>
<item type="attr" name="ic_sd_storage">@drawable/ic_sd_storage_white_36dp</item>
<item type="attr" name="ic_create_new_folder">@drawable/ic_create_new_folder_white_24dp</item>
<item type="attr" name="ic_cast_disconnect">@drawable/ic_cast_disconnect_white_36dp</item>
</style>
<style name="Theme.AntennaPod.Light.NoTitle" parent="Theme.Base.AntennaPod.Light.NoTitle">
@ -139,56 +139,56 @@
<item name="colorAccent">@color/holo_blue_light</item>
<item name="buttonStyle">@style/Widget.AntennaPod.Button</item>
<item name="alertDialogTheme">@style/AntennaPod.Dialog.Light</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/feed">@drawable/ic_feed_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/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/overlay_background">@color/overlay_light</item>
<item name="attr/overlay_drawable">@drawable/overlay_drawable</item>
<item name="attr/dragview_background">@drawable/ic_drag_vertical_grey600_48dp</item>
<item name="attr/dragview_float_background">@color/white</item>
<item name="attr/nav_drawer_background">@color/white</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/ic_folder">@drawable/ic_folder_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>
<item name="attr/av_skip_big">@drawable/ic_skip_grey600_36dp</item>
<item name="attr/ic_fav">@drawable/ic_star_border_grey600_24dp</item>
<item name="attr/ic_unfav">@drawable/ic_star_grey600_24dp</item>
<item name="attr/ic_settings">@drawable/ic_settings_grey600_24dp</item>
<item name="attr/ic_lock_open">@drawable/ic_lock_open_grey600_24dp</item>
<item name="attr/ic_lock_closed">@drawable/ic_lock_closed_grey600_24dp</item>
<item name="attr/ic_filter">@drawable/ic_filter_grey600_24dp</item>
<item name="attr/ic_sleep">@drawable/ic_sleep_grey600_24dp</item>
<item name="attr/ic_sleep_off">@drawable/ic_sleep_off_grey600_24dp</item>
<item name="attr/ic_check_box">@drawable/ic_check_box_grey600_24dp</item>
<item name="attr/ic_check_box_outline">@drawable/ic_check_box_outline_blank_grey600_24dp</item>
<item name="attr/ic_indeterminate_check_box">@drawable/ic_indeterminate_check_box_grey600_24dp</item>
<item name="attr/ic_sort">@drawable/ic_sort_grey600_24dp</item>
<item name="attr/ic_sd_storage">@drawable/ic_sd_storage_grey600_36dp</item>
<item name="attr/ic_create_new_folder">@drawable/ic_create_new_folder_grey600_24dp</item>
<item name="attr/ic_cast_disconnect">@drawable/ic_cast_disconnect_grey600_36dp</item>
<item type="attr" name="action_about">@drawable/ic_info_grey600_24dp</item>
<item type="attr" name="action_search">@drawable/ic_search_grey600_24dp</item>
<item type="attr" name="action_stream">@drawable/ic_settings_input_antenna_grey600_24dp</item>
<item type="attr" name="av_download">@drawable/ic_file_download_grey600_24dp</item>
<item type="attr" name="av_fast_forward">@drawable/ic_fast_forward_grey600_24dp</item>
<item type="attr" name="av_pause">@drawable/ic_pause_grey600_24dp</item>
<item type="attr" name="av_play">@drawable/ic_play_arrow_grey600_24dp</item>
<item type="attr" name="av_rewind">@drawable/ic_fast_rewind_grey600_24dp</item>
<item type="attr" name="content_discard">@drawable/ic_delete_grey600_24dp</item>
<item type="attr" name="content_new">@drawable/ic_add_grey600_24dp</item>
<item type="attr" name="feed">@drawable/ic_feed_grey600_24dp</item>
<item type="attr" name="location_web_site">@drawable/ic_web_grey600_24dp</item>
<item type="attr" name="navigation_accept">@drawable/ic_done_grey600_24dp</item>
<item type="attr" name="navigation_cancel">@drawable/ic_cancel_grey600_24dp</item>
<item type="attr" name="navigation_expand">@drawable/ic_expand_more_grey600_36dp</item>
<item type="attr" name="navigation_refresh">@drawable/ic_refresh_grey600_24dp</item>
<item type="attr" name="navigation_up">@drawable/navigation_up</item>
<item type="attr" name="social_share">@drawable/ic_share_grey600_24dp</item>
<item type="attr" name="stat_playlist">@drawable/ic_list_grey600_24dp</item>
<item type="attr" name="type_audio">@drawable/ic_hearing_grey600_18dp</item>
<item type="attr" name="type_video">@drawable/ic_remove_red_eye_grey600_18dp</item>
<item type="attr" name="non_transparent_background">@color/white</item>
<item type="attr" name="overlay_background">@color/overlay_light</item>
<item type="attr" name="overlay_drawable">@drawable/overlay_drawable</item>
<item type="attr" name="dragview_background">@drawable/ic_drag_vertical_grey600_48dp</item>
<item type="attr" name="dragview_float_background">@color/white</item>
<item type="attr" name="nav_drawer_background">@color/white</item>
<item type="attr" name="ic_new">@drawable/ic_new_releases_grey600_24dp</item>
<item type="attr" name="ic_history">@drawable/ic_history_grey600_24dp</item>
<item type="attr" name="ic_folder">@drawable/ic_folder_grey600_24dp</item>
<item type="attr" name="av_play_big">@drawable/ic_play_arrow_grey600_36dp</item>
<item type="attr" name="av_pause_big">@drawable/ic_pause_grey600_36dp</item>
<item type="attr" name="av_ff_big">@drawable/ic_fast_forward_grey600_36dp</item>
<item type="attr" name="av_rew_big">@drawable/ic_fast_rewind_grey600_36dp</item>
<item type="attr" name="av_skip_big">@drawable/ic_skip_grey600_36dp</item>
<item type="attr" name="ic_fav">@drawable/ic_star_border_grey600_24dp</item>
<item type="attr" name="ic_unfav">@drawable/ic_star_grey600_24dp</item>
<item type="attr" name="ic_settings">@drawable/ic_settings_grey600_24dp</item>
<item type="attr" name="ic_lock_open">@drawable/ic_lock_open_grey600_24dp</item>
<item type="attr" name="ic_lock_closed">@drawable/ic_lock_closed_grey600_24dp</item>
<item type="attr" name="ic_filter">@drawable/ic_filter_grey600_24dp</item>
<item type="attr" name="ic_sleep">@drawable/ic_sleep_grey600_24dp</item>
<item type="attr" name="ic_sleep_off">@drawable/ic_sleep_off_grey600_24dp</item>
<item type="attr" name="ic_check_box">@drawable/ic_check_box_grey600_24dp</item>
<item type="attr" name="ic_check_box_outline">@drawable/ic_check_box_outline_blank_grey600_24dp</item>
<item type="attr" name="ic_indeterminate_check_box">@drawable/ic_indeterminate_check_box_grey600_24dp</item>
<item type="attr" name="ic_sort">@drawable/ic_sort_grey600_24dp</item>
<item type="attr" name="ic_sd_storage">@drawable/ic_sd_storage_grey600_36dp</item>
<item type="attr" name="ic_create_new_folder">@drawable/ic_create_new_folder_grey600_24dp</item>
<item type="attr" name="ic_cast_disconnect">@drawable/ic_cast_disconnect_grey600_36dp</item>
</style>
<style name="Theme.AntennaPod.Dark.NoTitle" parent="Theme.Base.AntennaPod.Dark.NoTitle">
@ -203,56 +203,56 @@
<item name="colorControlNormal">@color/white</item>
<item name="buttonStyle">@style/Widget.AntennaPod.Button</item>
<item name="alertDialogTheme">@style/AntennaPod.Dialog.Dark</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/feed">@drawable/ic_feed_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/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/overlay_background">@color/overlay_dark</item>
<item name="attr/overlay_drawable">@drawable/overlay_drawable_dark</item>
<item name="attr/dragview_background">@drawable/ic_drag_vertical_white_48dp</item>
<item name="attr/dragview_float_background">@color/black</item>
<item name="attr/nav_drawer_background">#3B3B3B</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/ic_folder">@drawable/ic_folder_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>
<item name="attr/av_skip_big">@drawable/ic_skip_white_36dp</item>
<item name="attr/ic_fav">@drawable/ic_star_border_white_24dp</item>
<item name="attr/ic_unfav">@drawable/ic_star_white_24dp</item>
<item name="attr/ic_settings">@drawable/ic_settings_white_24dp</item>
<item name="attr/ic_lock_open">@drawable/ic_lock_open_white_24dp</item>
<item name="attr/ic_lock_closed">@drawable/ic_lock_closed_white_24dp</item>
<item name="attr/ic_filter">@drawable/ic_filter_white_24dp</item>
<item name="attr/ic_sleep">@drawable/ic_sleep_white_24dp</item>
<item name="attr/ic_sleep_off">@drawable/ic_sleep_off_white_24dp</item>
<item name="attr/ic_check_box">@drawable/ic_check_box_white_24dp</item>
<item name="attr/ic_check_box_outline">@drawable/ic_check_box_outline_blank_white_24dp</item>
<item name="attr/ic_indeterminate_check_box">@drawable/ic_indeterminate_check_box_white_24dp</item>
<item name="attr/ic_sort">@drawable/ic_sort_white_24dp</item>
<item name="attr/ic_sd_storage">@drawable/ic_sd_storage_white_36dp</item>
<item name="attr/ic_create_new_folder">@drawable/ic_create_new_folder_white_24dp</item>
<item name="attr/ic_cast_disconnect">@drawable/ic_cast_disconnect_white_36dp</item>
<item type="attr" name="action_about">@drawable/ic_info_white_24dp</item>
<item type="attr" name="action_search">@drawable/ic_search_white_24dp</item>
<item type="attr" name="action_stream">@drawable/ic_settings_input_antenna_white_24dp</item>
<item type="attr" name="av_download">@drawable/ic_file_download_white_24dp</item>
<item type="attr" name="av_fast_forward">@drawable/ic_fast_forward_white_24dp</item>
<item type="attr" name="av_pause">@drawable/ic_pause_white_24dp</item>
<item type="attr" name="av_play">@drawable/ic_play_arrow_white_24dp</item>
<item type="attr" name="av_rewind">@drawable/ic_fast_rewind_white_24dp</item>
<item type="attr" name="content_discard">@drawable/ic_delete_white_24dp</item>
<item type="attr" name="content_new">@drawable/ic_add_white_24dp</item>
<item type="attr" name="feed">@drawable/ic_feed_white_24dp</item>
<item type="attr" name="location_web_site">@drawable/ic_web_white_24dp</item>
<item type="attr" name="navigation_accept">@drawable/ic_done_white_24dp</item>
<item type="attr" name="navigation_cancel">@drawable/ic_cancel_white_24dp</item>
<item type="attr" name="navigation_expand">@drawable/ic_expand_more_white_36dp</item>
<item type="attr" name="navigation_refresh">@drawable/ic_refresh_white_24dp</item>
<item type="attr" name="navigation_up">@drawable/navigation_up_dark</item>
<item type="attr" name="social_share">@drawable/ic_share_white_24dp</item>
<item type="attr" name="stat_playlist">@drawable/ic_list_white_24dp</item>
<item type="attr" name="type_audio">@drawable/ic_hearing_white_18dp</item>
<item type="attr" name="type_video">@drawable/ic_remove_red_eye_white_18dp</item>
<item type="attr" name="non_transparent_background">@color/black</item>
<item type="attr" name="overlay_background">@color/overlay_dark</item>
<item type="attr" name="overlay_drawable">@drawable/overlay_drawable_dark</item>
<item type="attr" name="dragview_background">@drawable/ic_drag_vertical_white_48dp</item>
<item type="attr" name="dragview_float_background">@color/black</item>
<item type="attr" name="nav_drawer_background">#3B3B3B</item>
<item type="attr" name="ic_new">@drawable/ic_new_releases_white_24dp</item>
<item type="attr" name="ic_history">@drawable/ic_history_white_24dp</item>
<item type="attr" name="ic_folder">@drawable/ic_folder_white_24dp</item>
<item type="attr" name="av_play_big">@drawable/ic_play_arrow_white_36dp</item>
<item type="attr" name="av_pause_big">@drawable/ic_pause_white_36dp</item>
<item type="attr" name="av_ff_big">@drawable/ic_fast_forward_white_36dp</item>
<item type="attr" name="av_rew_big">@drawable/ic_fast_rewind_white_36dp</item>
<item type="attr" name="av_skip_big">@drawable/ic_skip_white_36dp</item>
<item type="attr" name="ic_fav">@drawable/ic_star_border_white_24dp</item>
<item type="attr" name="ic_unfav">@drawable/ic_star_white_24dp</item>
<item type="attr" name="ic_settings">@drawable/ic_settings_white_24dp</item>
<item type="attr" name="ic_lock_open">@drawable/ic_lock_open_white_24dp</item>
<item type="attr" name="ic_lock_closed">@drawable/ic_lock_closed_white_24dp</item>
<item type="attr" name="ic_filter">@drawable/ic_filter_white_24dp</item>
<item type="attr" name="ic_sleep">@drawable/ic_sleep_white_24dp</item>
<item type="attr" name="ic_sleep_off">@drawable/ic_sleep_off_white_24dp</item>
<item type="attr" name="ic_check_box">@drawable/ic_check_box_white_24dp</item>
<item type="attr" name="ic_check_box_outline">@drawable/ic_check_box_outline_blank_white_24dp</item>
<item type="attr" name="ic_indeterminate_check_box">@drawable/ic_indeterminate_check_box_white_24dp</item>
<item type="attr" name="ic_sort">@drawable/ic_sort_white_24dp</item>
<item type="attr" name="ic_sd_storage">@drawable/ic_sd_storage_white_36dp</item>
<item type="attr" name="ic_create_new_folder">@drawable/ic_create_new_folder_white_24dp</item>
<item type="attr" name="ic_cast_disconnect">@drawable/ic_cast_disconnect_white_36dp</item>
</style>
<style name="Theme.AntennaPod.Dark.Splash" parent="Theme.AppCompat.NoActionBar">