wip: mark items as the user scrolls past them (#62)

This commit is contained in:
Athou
2013-05-05 19:35:07 +02:00
parent 38ce8f9dec
commit e0d6be4d01
8 changed files with 106 additions and 5 deletions

View File

@@ -43,8 +43,9 @@ public class UserSettings extends AbstractModel {
private ViewMode viewMode;
private boolean showRead;
private boolean scrollMarks;
private boolean socialButtons;
private boolean test;
@Lob
@Column(length = Integer.MAX_VALUE)
@@ -106,4 +107,20 @@ public class UserSettings extends AbstractModel {
this.viewMode = viewMode;
}
public boolean isScrollMarks() {
return scrollMarks;
}
public void setScrollMarks(boolean scrollMarks) {
this.scrollMarks = scrollMarks;
}
public boolean isTest() {
return test;
}
public void setTest(boolean test) {
this.test = test;
}
}

View File

@@ -30,6 +30,9 @@ public class Settings implements Serializable {
@ApiProperty(value = "user wants social buttons (facebook, twitter, ...) shown", required = true)
private boolean socialButtons;
@ApiProperty(value = "In expanded view, scroll through entries mark them as read", required = true)
private boolean scrollMarks;
@ApiProperty(value = "user's custom css for the website")
private String customCss;
@@ -81,4 +84,12 @@ public class Settings implements Serializable {
this.viewMode = viewMode;
}
public boolean isScrollMarks() {
return scrollMarks;
}
public void setScrollMarks(boolean scrollMarks) {
this.scrollMarks = scrollMarks;
}
}

View File

@@ -43,6 +43,7 @@ public class UserREST extends AbstractResourceREST {
s.setViewMode(settings.getViewMode().name());
s.setShowRead(settings.isShowRead());
s.setSocialButtons(settings.isSocialButtons());
s.setScrollMarks(settings.isScrollMarks());
s.setCustomCss(settings.getCustomCss());
} else {
s.setReadingMode(ReadingMode.unread.name());
@@ -50,6 +51,7 @@ public class UserREST extends AbstractResourceREST {
s.setViewMode(ViewMode.title.name());
s.setShowRead(true);
s.setSocialButtons(true);
s.setScrollMarks(true);
}
return s;
}
@@ -69,7 +71,9 @@ public class UserREST extends AbstractResourceREST {
s.setReadingOrder(ReadingOrder.valueOf(settings.getReadingOrder()));
s.setShowRead(settings.isShowRead());
s.setViewMode(ViewMode.valueOf(settings.getViewMode()));
s.setScrollMarks(settings.isScrollMarks());
s.setCustomCss(settings.getCustomCss());
s.setSocialButtons(settings.isSocialButtons());
userSettingsDAO.saveOrUpdate(s);
return Response.ok(Status.OK).build();