From 37ab3e6f1b38a6bb7ec992edfe5e54a263be91b0 Mon Sep 17 00:00:00 2001 From: tehcneko <7741672-NekoInverter@users.noreply.gitlab.com> Date: Fri, 21 Jan 2022 17:24:31 +0800 Subject: [PATCH] Optimize build speed --- .../hippo/ehviewer/ui/GalleryActivity.java | 2 +- .../ui/scene/GalleryCommentsScene.java | 2 +- .../ehviewer/ui/scene/GalleryDetailScene.java | 2 +- .../hippo/ehviewer/widget/SearchLayout.java | 22 +++++++------------ .../java/com/hippo/widget/CuteSpinner.java | 4 ++-- gradle.properties | 5 ++++- 6 files changed, 17 insertions(+), 20 deletions(-) diff --git a/app/src/main/java/com/hippo/ehviewer/ui/GalleryActivity.java b/app/src/main/java/com/hippo/ehviewer/ui/GalleryActivity.java index a455ba719..d858e51d8 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/GalleryActivity.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/GalleryActivity.java @@ -371,7 +371,7 @@ public class GalleryActivity extends EhActivity implements SeekBar.OnSeekBarChan .setScrollInterval(Settings.getShowPageInterval() ? resources.getDimensionPixelOffset(R.dimen.gallery_scroll_interval) : 0) .setPageMinHeight(resources.getDimensionPixelOffset(R.dimen.gallery_page_min_height)) .setPageInfoInterval(resources.getDimensionPixelOffset(R.dimen.gallery_page_info_interval)) - .setProgressColor(ResourcesUtils.getAttrColor(this, R.attr.colorPrimary)) + .setProgressColor(ResourcesUtils.getAttrColor(this, androidx.appcompat.R.attr.colorPrimary)) .setProgressSize(resources.getDimensionPixelOffset(R.dimen.gallery_progress_size)) .setPageTextColor(ResourcesKt.resolveColor(getTheme(), android.R.attr.textColorSecondary)) .setPageTextSize(resources.getDimensionPixelOffset(R.dimen.gallery_page_text_size)) diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryCommentsScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryCommentsScene.java index 3e2d3cf7e..7f080b4c4 100644 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryCommentsScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryCommentsScene.java @@ -334,7 +334,7 @@ public final class GalleryCommentsScene extends ToolbarScene LinearDividerItemDecoration decoration = new LinearDividerItemDecoration( LinearDividerItemDecoration.VERTICAL, ResourcesKt.resolveColor(getTheme(), R.attr.dividerColor), LayoutUtils.dp2pix(context, 1)); - decoration.setPadding(ResourcesUtils.getAttrDimensionPixelOffset(context, R.attr.dialogPreferredPadding)); + decoration.setPadding(ResourcesUtils.getAttrDimensionPixelOffset(context, androidx.appcompat.R.attr.dialogPreferredPadding)); rv.addItemDecoration(decoration); rv.setClipToPadding(false); builder.setView(rv).show(); diff --git a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java index db2cfea32..aa60480e6 100755 --- a/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java +++ b/app/src/main/java/com/hippo/ehviewer/ui/scene/GalleryDetailScene.java @@ -832,7 +832,7 @@ public class GalleryDetailScene extends BaseScene implements View.OnClickListene } if ((oldState == STATE_INIT || oldState == STATE_FAILED || oldState == STATE_REFRESH) && - (state == STATE_NORMAL || state == STATE_REFRESH_HEADER) && ResourcesKt.resolveBoolean(getTheme(), R.attr.isLightTheme, false)) { + (state == STATE_NORMAL || state == STATE_REFRESH_HEADER) && ResourcesKt.resolveBoolean(getTheme(), androidx.appcompat.R.attr.isLightTheme, false)) { if (!createCircularReveal()) { SimpleHandler.getInstance().post(this::createCircularReveal); } diff --git a/app/src/main/java/com/hippo/ehviewer/widget/SearchLayout.java b/app/src/main/java/com/hippo/ehviewer/widget/SearchLayout.java index 9e010347b..47a4adc00 100644 --- a/app/src/main/java/com/hippo/ehviewer/widget/SearchLayout.java +++ b/app/src/main/java/com/hippo/ehviewer/widget/SearchLayout.java @@ -240,20 +240,14 @@ public class SearchLayout extends EasyRecyclerView implements CompoundButton.OnC switch (mSearchMode) { case SEARCH_MODE_NORMAL: int nsMode = mNormalSearchMode.getCheckedRadioButtonId(); - switch (nsMode) { - default: - case R.id.search_normal_search: - urlBuilder.setMode(ListUrlBuilder.MODE_NORMAL); - break; - case R.id.search_subscription_search: - urlBuilder.setMode(ListUrlBuilder.MODE_SUBSCRIPTION); - break; - case R.id.search_specify_uploader: - urlBuilder.setMode(ListUrlBuilder.MODE_UPLOADER); - break; - case R.id.search_specify_tag: - urlBuilder.setMode(ListUrlBuilder.MODE_TAG); - break; + if (nsMode == R.id.search_subscription_search) { + urlBuilder.setMode(ListUrlBuilder.MODE_SUBSCRIPTION); + } else if (nsMode == R.id.search_specify_uploader) { + urlBuilder.setMode(ListUrlBuilder.MODE_UPLOADER); + } else if (nsMode == R.id.search_specify_tag) { + urlBuilder.setMode(ListUrlBuilder.MODE_TAG); + } else { + urlBuilder.setMode(ListUrlBuilder.MODE_NORMAL); } urlBuilder.setKeyword(query); urlBuilder.setCategory(mCategoryTable.getCategory()); diff --git a/app/src/main/java/com/hippo/widget/CuteSpinner.java b/app/src/main/java/com/hippo/widget/CuteSpinner.java index 60ed2aab7..1df26de89 100644 --- a/app/src/main/java/com/hippo/widget/CuteSpinner.java +++ b/app/src/main/java/com/hippo/widget/CuteSpinner.java @@ -61,11 +61,11 @@ public class CuteSpinner extends AppCompatSpinner { private void init(Context context, AttributeSet attrs, int defStyleAttr) { TypedArray a = context.obtainStyledAttributes(attrs, androidx.appcompat.R.styleable.Spinner, defStyleAttr, 0); - final CharSequence[] entries = a.getTextArray(R.styleable.Spinner_android_entries); + final CharSequence[] entries = a.getTextArray(androidx.appcompat.R.styleable.Spinner_android_entries); if (entries != null) { final ArrayAdapter adapter = new ArrayAdapter<>(context, R.layout.item_cute_spinner_item, entries); - adapter.setDropDownViewResource(R.layout.support_simple_spinner_dropdown_item); + adapter.setDropDownViewResource(androidx.appcompat.R.layout.support_simple_spinner_dropdown_item); setAdapter(adapter); } a.recycle(); diff --git a/gradle.properties b/gradle.properties index f78fe6dce..d7123a9c2 100644 --- a/gradle.properties +++ b/gradle.properties @@ -17,6 +17,9 @@ # This option should only be used with decoupled projects. More details, visit # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # org.gradle.parallel=true - android.useAndroidX=true android.enableJetifier=true +android.experimental.enableNewResourceShrinker=true +android.experimental.enableNewResourceShrinker.preciseShrinking=true +android.enableAppCompileTimeRClass=true +android.nonTransitiveRClass=true