Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

novel impr #581

Merged
merged 1 commit into from
Mar 1, 2024
Merged

novel impr #581

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 2 additions & 2 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,8 @@ android {
applicationId "ceui.lisa.pixiv"
minSdkVersion 21
targetSdkVersion 33
versionCode 262
versionName "3.3.6"
versionCode 270
versionName "3.3.8"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

javaCompileOptions {
Expand Down
41 changes: 31 additions & 10 deletions app/src/main/java/ceui/lisa/fragments/FragmentNovelHolder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
package ceui.lisa.fragments;

import static ceui.lisa.activities.Shaft.sUserModel;

import android.content.Intent;
import android.content.res.ColorStateList;
import android.net.Uri;
Expand Down Expand Up @@ -45,6 +47,7 @@
import ceui.lisa.interfaces.Callback;
import ceui.lisa.models.NovelBean;
import ceui.lisa.models.NovelDetail;
import ceui.lisa.models.NovelSearchResponse;
import ceui.lisa.models.TagsBean;
import ceui.lisa.utils.Common;
import ceui.lisa.utils.Dev;
Expand Down Expand Up @@ -107,7 +110,7 @@ public void onFinish(boolean isTransformed) {

@Override
protected void initData() {
getNovel(mNovelBean);
displayNovel(mNovelBean);
}

public void setBackgroundColor(int color) {
Expand All @@ -121,7 +124,7 @@ public void setTextColor(int color) {
setNovelAdapter();
}

private void getNovel(NovelBean novelBean) {
private void displayNovel(NovelBean novelBean) {
mNovelBean = novelBean;
if (mNovelBean.isIs_bookmarked()) {
baseBind.like.setText(mContext.getString(R.string.string_179));
Expand Down Expand Up @@ -288,7 +291,15 @@ public boolean onTouch(View v, MotionEvent event) {
@Override
public void onClick(View view) {
baseBind.transformationLayout.finishTransform();
getNovel(novelDetail.getSeries_prev());
Retro.getAppApi().getNovelByID(sUserModel.getAccess_token(), novelDetail.getSeries_prev().getId())
.subscribeOn(Schedulers.newThread())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new NullCtrl<NovelSearchResponse>() {
@Override
public void success(NovelSearchResponse novelSearchResponse) {
displayNovel(novelSearchResponse.getNovel());
}
});
}
});
} else {
Expand All @@ -300,7 +311,15 @@ public void onClick(View view) {
@Override
public void onClick(View view) {
baseBind.transformationLayout.finishTransform();
getNovel(novelDetail.getSeries_next());
Retro.getAppApi().getNovelByID(sUserModel.getAccess_token(), novelDetail.getSeries_next().getId())
.subscribeOn(Schedulers.newThread())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(new NullCtrl<NovelSearchResponse>() {
@Override
public void success(NovelSearchResponse novelSearchResponse) {
displayNovel(novelSearchResponse.getNovel());
}
});
}
});
} else {
Expand Down Expand Up @@ -404,13 +423,15 @@ private void setNovelAdapter() {
int pageIndex = Math.min(novelDetail.getNovel_marker().getPage(),novelDetail.getParsedChapters().get(parsedSize-1).getChapterIndex());
pageIndex = Math.max(pageIndex,novelDetail.getParsedChapters().get(0).getChapterIndex());
baseBind.viewPager.scrollToPosition(pageIndex-1);
}

// 设置书签
int markerPage = mNovelDetail.getNovel_marker().getPage();
if(markerPage > 0){
baseBind.saveNovel.setImageTintList(ColorStateList.valueOf(ContextCompat.getColor(mContext, R.color.novel_marker_add)));
}else{
// 设置书签
int markerPage = mNovelDetail.getNovel_marker().getPage();
if(markerPage > 0){
baseBind.saveNovel.setImageTintList(ColorStateList.valueOf(ContextCompat.getColor(mContext, R.color.novel_marker_add)));
}else{
baseBind.saveNovel.setImageTintList(ColorStateList.valueOf(ContextCompat.getColor(mContext, R.color.novel_marker_none)));
}
} else {
baseBind.saveNovel.setImageTintList(ColorStateList.valueOf(ContextCompat.getColor(mContext, R.color.novel_marker_none)));
}

Expand Down
Loading