diff --git a/build.gradle b/build.gradle index cdb1aef3f..00a9a615b 100644 --- a/build.gradle +++ b/build.gradle @@ -7,7 +7,7 @@ buildscript { google() } dependencies { - classpath 'com.android.tools.build:gradle:3.3.2' + classpath 'com.android.tools.build:gradle:3.5.1' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } @@ -20,7 +20,7 @@ allprojects { projectVersionCode = 402 projectVersionName = '3.7.8' - globalCompileSdkVersion = 26 + globalCompileSdkVersion = 29 globalBuildToolsVersion = '28.0.3' } @@ -36,7 +36,7 @@ allprojects { subprojects { buildscript { ext { - kotlinVersion = '1.3.0' + kotlinVersion = '1.3.50' pluginVersions = [ AndroidSvgDrawable: '3.0.0', PlayServices : '3.1.1', diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 7a69447f4..1037cc00b 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Sun Aug 13 19:49:14 CST 2017 +#Thu Oct 24 17:45:27 JST 2019 distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-4.10.1-all.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-5.4.1-all.zip diff --git a/twidere.component.common/build.gradle b/twidere.component.common/build.gradle index 8a4efac10..771e1c6e3 100644 --- a/twidere.component.common/build.gradle +++ b/twidere.component.common/build.gradle @@ -50,7 +50,7 @@ android { defaultConfig { minSdkVersion 14 - targetSdkVersion 26 + targetSdkVersion 29 versionCode projectVersionCode versionName projectVersionName } diff --git a/twidere.component.nyan/build.gradle b/twidere.component.nyan/build.gradle index 362b61684..d1125c0a0 100644 --- a/twidere.component.nyan/build.gradle +++ b/twidere.component.nyan/build.gradle @@ -28,7 +28,7 @@ android { defaultConfig { minSdkVersion 14 - targetSdkVersion 26 + targetSdkVersion 29 versionCode 1 versionName "1.0" } diff --git a/twidere/build.gradle b/twidere/build.gradle index a8206494a..94ab0b1cf 100644 --- a/twidere/build.gradle +++ b/twidere/build.gradle @@ -1,23 +1,19 @@ -import fr.avianey.androidsvgdrawable.gradle.SvgDrawableTask - apply plugin: 'com.android.application' apply plugin: 'kotlin-android' apply plugin: 'kotlin-kapt' apply plugin: 'kotlin-android-extensions' -apply plugin: 'androidsvgdrawable' +apply plugin: 'imgenie' buildscript { repositories { + maven { url 'https://jitpack.io' } jcenter() } dependencies { classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlinVersion}" classpath "org.jetbrains.kotlin:kotlin-android-extensions:${kotlinVersion}" - classpath("fr.avianey.androidsvgdrawable:gradle-plugin:${pluginVersions['AndroidSvgDrawable']}") { - // should be excluded to avoid conflict - exclude group: 'xerces' - } + classpath 'com.github.mariotaku:imgenie-plugin:0.0.5' // START Non-FOSS component classpath "com.google.gms:google-services:${pluginVersions['PlayServices']}" @@ -33,7 +29,7 @@ android { defaultConfig { applicationId "org.mariotaku.twidere" minSdkVersion 14 - targetSdkVersion 26 + targetSdkVersion 29 versionCode projectVersionCode versionName projectVersionName multiDexEnabled true @@ -108,7 +104,6 @@ android { sourceSets.each { it.res.srcDirs += project.files("src/${it.name}/res-localized") - it.res.srcDirs += project.files("src/${it.name}/res-svg2png") it.java.srcDirs += "src/${it.name}/kotlin" } @@ -270,38 +265,6 @@ dependencies { implementation "nl.komponents.kovenant:kovenant-combine:${libVersions['Kovenant']}" } -task svgToDrawable(type: SvgDrawableTask) { - // specify where to pick SVG from - from = files(android.sourceSets.collect { "src/${it.name}/svg/drawable" }) - // specify the android res folder - to = file('src/main/res-svg2png') - // override files only if necessary - overwriteMode = 'ifModified' - // let generate PNG for the following densities only - targetedDensities = ['hdpi', 'mdpi', 'xhdpi', 'xxhdpi', 'xxxhdpi'] - // relative path of the file specifying nine patch specs - ninePatchConfig = file('src/main/svg/drawable/9patch.json') - // output format of the generated resources - outputFormat = 'PNG' - - outputType = 'drawable' -} - -task svgToMipmap(type: SvgDrawableTask) { - // specify where to pick SVG from - from = files(android.sourceSets.collect { "src/${it.name}/svg/mipmap" }) - // specify the android res folder - to = file('src/main/res-svg2png') - // override files only if necessary - overwriteMode = 'ifModified' - // let generate PNG for the following densities only - targetedDensities = ['hdpi', 'mdpi', 'xhdpi', 'xxhdpi', 'xxxhdpi'] - // output format of the generated resources - outputFormat = 'PNG' - - outputType = 'mipmap' -} - // START Non-FOSS component apply plugin: 'com.google.gms.google-services' // END Non-FOSS component \ No newline at end of file diff --git a/twidere/src/main/svg/drawable/ic_account_logo_fanfou-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_account_logo_fanfou.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_account_logo_fanfou-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_account_logo_fanfou.svg diff --git a/twidere/src/main/svg/drawable/ic_account_logo_mastodon-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_account_logo_mastodon.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_account_logo_mastodon-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_account_logo_mastodon.svg diff --git a/twidere/src/main/svg/drawable/ic_account_logo_statusnet-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_account_logo_statusnet.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_account_logo_statusnet-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_account_logo_statusnet.svg diff --git a/twidere/src/main/svg/drawable/ic_account_logo_twitter-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_account_logo_twitter.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_account_logo_twitter-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_account_logo_twitter.svg diff --git a/twidere/src/main/svg/drawable/ic_action_accounts-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_action_accounts.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_action_accounts-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_action_accounts.svg diff --git a/twidere/src/main/svg/drawable/ic_action_add-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_action_add.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_action_add-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_action_add.svg diff --git a/twidere/src/main/svg/drawable/ic_action_add_to_list-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_action_add_to_list.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_action_add_to_list-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_action_add_to_list.svg diff --git a/twidere/src/main/svg/drawable/ic_action_at-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_action_at.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_action_at-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_action_at.svg diff --git a/twidere/src/main/svg/drawable/ic_action_attachment-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_action_attachment.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_action_attachment-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_action_attachment.svg diff --git a/twidere/src/main/svg/drawable/ic_action_back-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_action_back.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_action_back-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_action_back.svg diff --git a/twidere/src/main/svg/drawable/ic_action_cake-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_action_cake.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_action_cake-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_action_cake.svg diff --git a/twidere/src/main/svg/drawable/ic_action_camcorder-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_action_camcorder.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_action_camcorder-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_action_camcorder.svg diff --git a/twidere/src/main/svg/drawable/ic_action_cancel-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_action_cancel.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_action_cancel-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_action_cancel.svg diff --git a/twidere/src/main/svg/drawable/ic_action_confirm-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_action_confirm.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_action_confirm-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_action_confirm.svg diff --git a/twidere/src/main/svg/drawable/ic_action_content_warning-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_action_content_warning.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_action_content_warning-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_action_content_warning.svg diff --git a/twidere/src/main/svg/drawable/ic_action_copy-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_action_copy.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_action_copy-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_action_copy.svg diff --git a/twidere/src/main/svg/drawable/ic_action_delete-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_action_delete.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_action_delete-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_action_delete.svg diff --git a/twidere/src/main/svg/drawable/ic_action_draft-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_action_draft.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_action_draft-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_action_draft.svg diff --git a/twidere/src/main/svg/drawable/ic_action_edit_query-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_action_edit_query.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_action_edit_query-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_action_edit_query.svg diff --git a/twidere/src/main/svg/drawable/ic_action_file-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_action_file.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_action_file-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_action_file.svg diff --git a/twidere/src/main/svg/drawable/ic_action_filter-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_action_filter.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_action_filter-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_action_filter.svg diff --git a/twidere/src/main/svg/drawable/ic_action_gif-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_action_gif.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_action_gif-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_action_gif.svg diff --git a/twidere/src/main/svg/drawable/ic_action_heart-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_action_heart.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_action_heart-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_action_heart.svg diff --git a/twidere/src/main/svg/drawable/ic_action_home-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_action_home.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_action_home-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_action_home.svg diff --git a/twidere/src/main/svg/drawable/ic_action_import-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_action_import.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_action_import-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_action_import.svg diff --git a/twidere/src/main/svg/drawable/ic_action_infinity-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_action_infinity.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_action_infinity-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_action_infinity.svg diff --git a/twidere/src/main/svg/drawable/ic_action_info-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_action_info.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_action_info-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_action_info.svg diff --git a/twidere/src/main/svg/drawable/ic_action_link-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_action_link.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_action_link-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_action_link.svg diff --git a/twidere/src/main/svg/drawable/ic_action_location-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_action_location.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_action_location-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_action_location.svg diff --git a/twidere/src/main/svg/drawable/ic_action_location_off-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_action_location_off.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_action_location_off-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_action_location_off.svg diff --git a/twidere/src/main/svg/drawable/ic_action_lock-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_action_lock.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_action_lock-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_action_lock.svg diff --git a/twidere/src/main/svg/drawable/ic_action_more_horizontal-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_action_more_horizontal.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_action_more_horizontal-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_action_more_horizontal.svg diff --git a/twidere/src/main/svg/drawable/ic_action_more_vertical-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_action_more_vertical.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_action_more_vertical-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_action_more_vertical.svg diff --git a/twidere/src/main/svg/drawable/ic_action_notification-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_action_notification.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_action_notification-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_action_notification.svg diff --git a/twidere/src/main/svg/drawable/ic_action_pause-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_action_pause.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_action_pause-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_action_pause.svg diff --git a/twidere/src/main/svg/drawable/ic_action_pin-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_action_pin.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_action_pin-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_action_pin.svg diff --git a/twidere/src/main/svg/drawable/ic_action_play_arrow-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_action_play_arrow.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_action_play_arrow-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_action_play_arrow.svg diff --git a/twidere/src/main/svg/drawable/ic_action_qr-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_action_qr.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_action_qr-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_action_qr.svg diff --git a/twidere/src/main/svg/drawable/ic_action_qr_scan-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_action_qr_scan.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_action_qr_scan-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_action_qr_scan.svg diff --git a/twidere/src/main/svg/drawable/ic_action_refresh-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_action_refresh.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_action_refresh-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_action_refresh.svg diff --git a/twidere/src/main/svg/drawable/ic_action_reply-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_action_reply.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_action_reply-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_action_reply.svg diff --git a/twidere/src/main/svg/drawable/ic_action_retweet-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_action_retweet.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_action_retweet-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_action_retweet.svg diff --git a/twidere/src/main/svg/drawable/ic_action_search-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_action_search.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_action_search-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_action_search.svg diff --git a/twidere/src/main/svg/drawable/ic_action_send-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_action_send.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_action_send-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_action_send.svg diff --git a/twidere/src/main/svg/drawable/ic_action_settings-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_action_settings.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_action_settings-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_action_settings.svg diff --git a/twidere/src/main/svg/drawable/ic_action_share-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_action_share.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_action_share-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_action_share.svg diff --git a/twidere/src/main/svg/drawable/ic_action_speaker_max-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_action_speaker_max.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_action_speaker_max-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_action_speaker_max.svg diff --git a/twidere/src/main/svg/drawable/ic_action_speaker_muted-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_action_speaker_muted.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_action_speaker_muted-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_action_speaker_muted.svg diff --git a/twidere/src/main/svg/drawable/ic_action_star-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_action_star.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_action_star-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_action_star.svg diff --git a/twidere/src/main/svg/drawable/ic_action_streaming-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_action_streaming.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_action_streaming-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_action_streaming.svg diff --git a/twidere/src/main/svg/drawable/ic_action_sync-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_action_sync.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_action_sync-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_action_sync.svg diff --git a/twidere/src/main/svg/drawable/ic_action_tablet-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_action_tablet.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_action_tablet-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_action_tablet.svg diff --git a/twidere/src/main/svg/drawable/ic_action_time-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_action_time.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_action_time-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_action_time.svg diff --git a/twidere/src/main/svg/drawable/ic_action_unpin-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_action_unpin.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_action_unpin-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_action_unpin.svg diff --git a/twidere/src/main/svg/drawable/ic_action_users-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_action_users.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_action_users-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_action_users.svg diff --git a/twidere/src/main/svg/drawable/ic_action_visibility_off-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_action_visibility_off.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_action_visibility_off-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_action_visibility_off.svg diff --git a/twidere/src/main/svg/drawable/ic_action_visibility_on-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_action_visibility_on.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_action_visibility_on-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_action_visibility_on.svg diff --git a/twidere/src/main/svg/drawable/ic_action_web-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_action_web.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_action_web-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_action_web.svg diff --git a/twidere/src/main/svg/drawable/ic_action_web_lock-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_action_web_lock.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_action_web_lock-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_action_web_lock.svg diff --git a/twidere/src/main/svg/drawable/ic_activity_action_favorite-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_activity_action_favorite.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_activity_action_favorite-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_activity_action_favorite.svg diff --git a/twidere/src/main/svg/drawable/ic_activity_action_like-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_activity_action_like.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_activity_action_like-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_activity_action_like.svg diff --git a/twidere/src/main/svg/drawable/ic_activity_action_media_tagged-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_activity_action_media_tagged.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_activity_action_media_tagged-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_activity_action_media_tagged.svg diff --git a/twidere/src/main/svg/drawable/ic_activity_action_pinned-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_activity_action_pinned.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_activity_action_pinned-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_activity_action_pinned.svg diff --git a/twidere/src/main/svg/drawable/ic_activity_action_poll-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_activity_action_poll.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_activity_action_poll-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_activity_action_poll.svg diff --git a/twidere/src/main/svg/drawable/ic_btn_grid_item_edit-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_btn_grid_item_edit.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_btn_grid_item_edit-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_btn_grid_item_edit.svg diff --git a/twidere/src/main/svg/drawable/ic_btn_grid_item_remove-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_btn_grid_item_remove.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_btn_grid_item_remove-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_btn_grid_item_remove.svg diff --git a/twidere/src/main/svg/drawable/ic_card_media_play-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_card_media_play.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_card_media_play-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_card_media_play.svg diff --git a/twidere/src/main/svg/drawable/ic_indicator_arrow_left-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_indicator_arrow_left.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_indicator_arrow_left-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_indicator_arrow_left.svg diff --git a/twidere/src/main/svg/drawable/ic_indicator_arrow_right-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_indicator_arrow_right.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_indicator_arrow_right-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_indicator_arrow_right.svg diff --git a/twidere/src/main/svg/drawable/ic_info_accounts-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_info_accounts.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_info_accounts-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_info_accounts.svg diff --git a/twidere/src/main/svg/drawable/ic_info_draft-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_info_draft.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_info_draft-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_info_draft.svg diff --git a/twidere/src/main/svg/drawable/ic_info_error_blocked-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_info_error_blocked.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_info_error_blocked-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_info_error_blocked.svg diff --git a/twidere/src/main/svg/drawable/ic_info_error_generic-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_info_error_generic.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_info_error_generic-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_info_error_generic.svg diff --git a/twidere/src/main/svg/drawable/ic_info_info_generic-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_info_info_generic.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_info_info_generic-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_info_info_generic.svg diff --git a/twidere/src/main/svg/drawable/ic_info_locked-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_info_locked.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_info_locked-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_info_locked.svg diff --git a/twidere/src/main/svg/drawable/ic_info_refresh-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_info_refresh.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_info_refresh-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_info_refresh.svg diff --git a/twidere/src/main/svg/drawable/ic_info_search-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_info_search.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_info_search-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_info_search.svg diff --git a/twidere/src/main/svg/drawable/ic_label_gallery-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_label_gallery.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_label_gallery-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_label_gallery.svg diff --git a/twidere/src/main/svg/drawable/ic_label_location-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_label_location.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_label_location-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_label_location.svg diff --git a/twidere/src/main/svg/drawable/ic_label_poll-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_label_poll.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_label_poll-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_label_poll.svg diff --git a/twidere/src/main/svg/drawable/ic_label_video-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_label_video.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_label_video-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_label_video.svg diff --git a/twidere/src/main/svg/drawable/ic_label_warning-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_label_warning.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_label_warning-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_label_warning.svg diff --git a/twidere/src/main/svg/drawable/ic_message_convertion_type_group-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_message_convertion_type_group.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_message_convertion_type_group-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_message_convertion_type_group.svg diff --git a/twidere/src/main/svg/drawable/ic_message_type_outgoing-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_message_type_outgoing.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_message_type_outgoing-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_message_type_outgoing.svg diff --git a/twidere/src/main/svg/drawable/ic_message_type_speaker_muted-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_message_type_speaker_muted.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_message_type_speaker_muted-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_message_type_speaker_muted.svg diff --git a/twidere/src/main/svg/drawable/ic_profile_image_default_group-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_profile_image_default_group.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_profile_image_default_group-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_profile_image_default_group.svg diff --git a/twidere/src/main/svg/drawable/ic_stat_draft-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_stat_draft.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_stat_draft-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_stat_draft.svg diff --git a/twidere/src/main/svg/drawable/ic_stat_gift-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_stat_gift.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_stat_gift-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_stat_gift.svg diff --git a/twidere/src/main/svg/drawable/ic_stat_info-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_stat_info.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_stat_info-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_stat_info.svg diff --git a/twidere/src/main/svg/drawable/ic_stat_mention-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_stat_mention.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_stat_mention-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_stat_mention.svg diff --git a/twidere/src/main/svg/drawable/ic_stat_message-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_stat_message.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_stat_message-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_stat_message.svg diff --git a/twidere/src/main/svg/drawable/ic_stat_notification-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_stat_notification.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_stat_notification-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_stat_notification.svg diff --git a/twidere/src/main/svg/drawable/ic_stat_refresh-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_stat_refresh.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_stat_refresh-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_stat_refresh.svg diff --git a/twidere/src/main/svg/drawable/ic_stat_send-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_stat_send.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_stat_send-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_stat_send.svg diff --git a/twidere/src/main/svg/drawable/ic_stat_streaming-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_stat_streaming.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_stat_streaming-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_stat_streaming.svg diff --git a/twidere/src/main/svg/drawable/ic_user_type_protected-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_user_type_protected.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_user_type_protected-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_user_type_protected.svg diff --git a/twidere/src/main/svg/drawable/ic_user_type_verified-mdpi.svg b/twidere/src/main/images/drawable-mdpi/ic_user_type_verified.svg similarity index 100% rename from twidere/src/main/svg/drawable/ic_user_type_verified-mdpi.svg rename to twidere/src/main/images/drawable-mdpi/ic_user_type_verified.svg diff --git a/twidere/src/main/svg/mipmap/ic_shortcut_camera_adaptive_foreground-mdpi.svg b/twidere/src/main/images/mipmap-mdpi/ic_shortcut_camera_adaptive_foreground.svg similarity index 100% rename from twidere/src/main/svg/mipmap/ic_shortcut_camera_adaptive_foreground-mdpi.svg rename to twidere/src/main/images/mipmap-mdpi/ic_shortcut_camera_adaptive_foreground.svg diff --git a/twidere/src/main/svg/mipmap/ic_shortcut_compose_adaptive_foreground-mdpi.svg b/twidere/src/main/images/mipmap-mdpi/ic_shortcut_compose_adaptive_foreground.svg similarity index 100% rename from twidere/src/main/svg/mipmap/ic_shortcut_compose_adaptive_foreground-mdpi.svg rename to twidere/src/main/images/mipmap-mdpi/ic_shortcut_compose_adaptive_foreground.svg diff --git a/twidere/src/main/svg/mipmap/ic_shortcut_favorite_adaptive_foreground-mdpi.svg b/twidere/src/main/images/mipmap-mdpi/ic_shortcut_favorite_adaptive_foreground.svg similarity index 100% rename from twidere/src/main/svg/mipmap/ic_shortcut_favorite_adaptive_foreground-mdpi.svg rename to twidere/src/main/images/mipmap-mdpi/ic_shortcut_favorite_adaptive_foreground.svg diff --git a/twidere/src/main/svg/mipmap/ic_shortcut_gallery_adaptive_foreground-mdpi.svg b/twidere/src/main/images/mipmap-mdpi/ic_shortcut_gallery_adaptive_foreground.svg similarity index 100% rename from twidere/src/main/svg/mipmap/ic_shortcut_gallery_adaptive_foreground-mdpi.svg rename to twidere/src/main/images/mipmap-mdpi/ic_shortcut_gallery_adaptive_foreground.svg diff --git a/twidere/src/main/svg/mipmap/ic_shortcut_like_adaptive_foreground-mdpi.svg b/twidere/src/main/images/mipmap-mdpi/ic_shortcut_like_adaptive_foreground.svg similarity index 100% rename from twidere/src/main/svg/mipmap/ic_shortcut_like_adaptive_foreground-mdpi.svg rename to twidere/src/main/images/mipmap-mdpi/ic_shortcut_like_adaptive_foreground.svg diff --git a/twidere/src/main/svg/mipmap/ic_shortcut_list_adaptive_foreground-mdpi.svg b/twidere/src/main/images/mipmap-mdpi/ic_shortcut_list_adaptive_foreground.svg similarity index 100% rename from twidere/src/main/svg/mipmap/ic_shortcut_list_adaptive_foreground-mdpi.svg rename to twidere/src/main/images/mipmap-mdpi/ic_shortcut_list_adaptive_foreground.svg diff --git a/twidere/src/main/svg/mipmap/ic_shortcut_user_adaptive_foreground-mdpi.svg b/twidere/src/main/images/mipmap-mdpi/ic_shortcut_user_adaptive_foreground.svg similarity index 100% rename from twidere/src/main/svg/mipmap/ic_shortcut_user_adaptive_foreground-mdpi.svg rename to twidere/src/main/images/mipmap-mdpi/ic_shortcut_user_adaptive_foreground.svg