Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion app/build.gradle.kts
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,8 @@ android {
buildConfigField("String", "BASE_URL", gradleLocalProperties(rootDir).getProperty("debug.base.url"))
}
release {
isMinifyEnabled = false
isMinifyEnabled = true
isShrinkResources = true
proguardFiles(
getDefaultProguardFile("proguard-android-optimize.txt"),
"proguard-rules.pro",
Expand Down
11 changes: 10 additions & 1 deletion app/proguard-rules.pro
Original file line number Diff line number Diff line change
Expand Up @@ -18,4 +18,13 @@

# If you keep the line number information, uncomment this to
# hide the original source file name.
#-renamesourcefileattribute SourceFile
#-renamesourcefileattribute SourceFile

# kakao login
-keep class com.kakao.sdk.**.model.* { <fields>; }
-keep class * extends com.google.gson.TypeAdapter

# https://github.com/square/okhttp/pull/6792
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

a: 이건 뭔가요?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

이거 카카오 디벨로퍼스에서 제공하는 코드를 그대로 긁어온거라 출처 같습니다

-dontwarn org.bouncycastle.jsse.**
-dontwarn org.conscrypt.*
-dontwarn org.openjsse.**
Binary file modified app/src/main/res/drawable-xhdpi/bg_novel_detail_tooltip_frame.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/drawable-xhdpi/ic_novel_detail_genre_frame.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/drawable-xhdpi/ic_novel_detail_tooltip.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/drawable-xhdpi/ic_novel_rating_star_filled.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/drawable-xhdpi/ic_novel_rating_star_unfilled.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/drawable-xhdpi/img_load_fail.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/drawable-xhdpi/img_loading_thumbnail.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/drawable-xhdpi/img_login_1.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/drawable-xhdpi/img_login_2.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/drawable-xhdpi/img_login_3.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/drawable-xhdpi/img_login_4.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/drawable-xhdpi/img_login_request.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/drawable-xhdpi/img_my_library_empty_cat.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/drawable-xhdpi/img_novel_info_none.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/drawable-xhdpi/img_splash_background.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/drawable-xxhdpi/ic_novel_detail_genre_frame.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/drawable-xxhdpi/ic_novel_detail_tooltip.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/drawable-xxhdpi/ic_novel_rating_star_filled.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/drawable-xxhdpi/ic_novel_rating_star_unfilled.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/drawable-xxhdpi/img_load_fail.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/drawable-xxhdpi/img_loading_thumbnail.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified app/src/main/res/drawable-xxhdpi/img_login_1.png
Binary file modified app/src/main/res/drawable-xxhdpi/img_login_2.png
Binary file modified app/src/main/res/drawable-xxhdpi/img_login_3.png
Binary file modified app/src/main/res/drawable-xxhdpi/img_login_4.png
Binary file modified app/src/main/res/drawable-xxhdpi/img_login_request.png
Binary file modified app/src/main/res/drawable-xxhdpi/img_my_library_empty_cat.png
Binary file modified app/src/main/res/drawable-xxhdpi/img_novel_info_none.png
Binary file modified app/src/main/res/drawable-xxhdpi/img_splash_background.png
Binary file modified app/src/main/res/drawable-xxxhdpi/img_login_1.png
Binary file modified app/src/main/res/drawable-xxxhdpi/img_login_2.png
Binary file modified app/src/main/res/drawable-xxxhdpi/img_login_3.png
Binary file modified app/src/main/res/drawable-xxxhdpi/img_login_4.png
Binary file modified app/src/main/res/drawable-xxxhdpi/img_login_request.png
Binary file modified app/src/main/res/drawable-xxxhdpi/img_my_library_empty_cat.png
Binary file modified app/src/main/res/drawable-xxxhdpi/img_splash_background.png
Binary file modified app/src/main/res/drawable/bg_novel_detail_tooltip_frame.png
Binary file modified app/src/main/res/drawable/ic_novel_detail_genre_frame.png
Binary file modified app/src/main/res/drawable/ic_novel_detail_interest_deselected.png
Binary file modified app/src/main/res/drawable/ic_novel_detail_tooltip.png
Binary file modified app/src/main/res/drawable/ic_novel_rating_star_filled.png
Binary file modified app/src/main/res/drawable/ic_novel_rating_star_unfilled.png
Binary file modified app/src/main/res/drawable/img_blocked_users_avatar_test.png
Diff not rendered.
Binary file modified app/src/main/res/drawable/img_load_fail.png
Binary file modified app/src/main/res/drawable/img_loading_thumbnail.png
Binary file modified app/src/main/res/drawable/img_login_1.png
Binary file modified app/src/main/res/drawable/img_login_2.png
Binary file modified app/src/main/res/drawable/img_login_3.png
Binary file modified app/src/main/res/drawable/img_login_4.png
Binary file modified app/src/main/res/drawable/img_login_request.png
Diff not rendered.
Binary file modified app/src/main/res/drawable/img_novel_info_none.png
Binary file modified app/src/main/res/drawable/img_splash_background.png
Binary file modified app/src/main/res/drawable/img_user_pofile.png
4 changes: 2 additions & 2 deletions app/src/main/res/layout/item_detail_explore_result.xml
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:src="@drawable/img_explore_test_cover" />
tools:src="@drawable/img_loading_thumbnail" />

<ImageView
android:id="@+id/iv_detail_explore_result_interested"
Expand Down Expand Up @@ -111,4 +111,4 @@
app:layout_constraintTop_toBottomOf="@id/tv_detail_explore_result_novel_title"
tools:text="이보라" />
</androidx.constraintlayout.widget.ConstraintLayout>
</layout>
</layout>
4 changes: 2 additions & 2 deletions app/src/main/res/layout/item_normal_explore.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:src="@drawable/img_normal_explore_test_cover" />
tools:src="@drawable/img_loading_thumbnail" />

<TextView
android:id="@+id/tv_normal_explore_result_title"
Expand Down Expand Up @@ -120,4 +120,4 @@
app:layout_constraintTop_toBottomOf="@id/tv_normal_explore_result_title"
tools:hint="김명지손명지 박명지 이명지, 안녕하세요, 작가 손입니다. 반갑스빈다." />
</androidx.constraintlayout.widget.ConstraintLayout>
</layout>
</layout>
4 changes: 2 additions & 2 deletions app/src/main/res/layout/item_popular_novel.xml
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/tv_popular_novel_title"
tools:src="@drawable/img_normal_explore_test_cover" />
tools:src="@drawable/img_loading_thumbnail" />

<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/cl_popular_novel_in_short"
Expand Down Expand Up @@ -160,4 +160,4 @@

</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</layout>
</layout>
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:src="@drawable/img_normal_explore_test_cover" />
tools:src="@drawable/img_loading_thumbnail" />

<ImageView
android:id="@+id/iv_taste_novel_interest"
Expand Down Expand Up @@ -106,4 +106,4 @@
tools:text="이보라" />

</androidx.constraintlayout.widget.ConstraintLayout>
</layout>
</layout>
2 changes: 1 addition & 1 deletion app/src/main/res/layout/item_search_novel.xml
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,7 @@
app:layout_constraintHorizontal_chainStyle="packed"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:src="@drawable/img_normal_explore_test_cover" />
tools:src="@drawable/img_loading_thumbnail" />

<TextView
android:id="@+id/tv_create_feed_search_novel_title"
Expand Down
4 changes: 2 additions & 2 deletions app/src/main/res/layout/item_soso_pick.xml
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
android:layout_height="180dp"
android:layout_marginEnd="6dp"
android:contentDescription="@null"
android:src="@drawable/img_explore_test_cover"
android:src="@drawable/img_loading_thumbnail"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
Expand All @@ -50,4 +50,4 @@
app:layout_constraintTop_toBottomOf="@id/iv_explore_soso_pick_novel_cover"
tools:hint="네가 죽어야 내가 살아 왜냐면 나는 악독한 악역 영애니까" />
</androidx.constraintlayout.widget.ConstraintLayout>
</layout>
</layout>
2 changes: 1 addition & 1 deletion app/src/main/res/layout/item_storage_novel.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:src="@drawable/img_normal_explore_test_cover" />
tools:src="@drawable/img_loading_thumbnail" />

<TextView
android:id="@+id/tv_storage_novel_title"
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/item_user_interest_feed.xml
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
android:layout_marginStart="16dp"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:src="@drawable/img_normal_explore_test_cover" />
tools:src="@drawable/img_loading_thumbnail" />

<LinearLayout
android:id="@+id/ll_user_interest_rating"
Expand Down
Loading