Archives/Athou_commafeed
1
0
Fork 1
mirror of https://github.com/Athou/commafeed.git synced 2026-03-21 21:37:29 +00:00
Code Issues Packages Projects Releases Wiki Activity

initial expanded view support (#62)

Browse Source
This commit is contained in:
Athou
2013-05-04 21:12:51 +02:00
parent d2da4d2b7d
commit dcd8ab951f
7 changed files with 54 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/com/commafeed/backend/model/UserSettings.java
View File

@@ -22,6 +22,10 @@ public class UserSettings extends AbstractModel {
asc, desc
}
public enum ViewMode {
title, expanded
}
@OneToOne
@JoinColumn(name = "user_id", nullable = false)
private User user;
@@ -34,6 +38,10 @@ public class UserSettings extends AbstractModel {
@Column(nullable = false)
private ReadingOrder readingOrder;
@Enumerated(EnumType.STRING)
@Column(nullable = false)
private ViewMode viewMode;
private boolean showRead;
private boolean socialButtons;
@@ -90,4 +98,12 @@ public class UserSettings extends AbstractModel {
this.socialButtons = socialButtons;
}
public ViewMode getViewMode() {
return viewMode;
}
public void setViewMode(ViewMode viewMode) {
this.viewMode = viewMode;
}
}

11
src/main/java/com/commafeed/frontend/model/Settings.java
View File

@@ -21,6 +21,9 @@ public class Settings implements Serializable {
@ApiProperty(value = "user reads entries in ascending or descending order", allowableValues = "asc,desc", required = true)
private String readingOrder;
@ApiProperty(value = "user viewing mode, either title-only or expande view", allowableValues = "title,expanded", required = true)
private String viewMode;
@ApiProperty(value = "user wants category and feeds with no unread entries shown", required = true)
private boolean showRead;
@@ -70,4 +73,12 @@ public class Settings implements Serializable {
this.socialButtons = socialButtons;
}
public String getViewMode() {
return viewMode;
}
public void setViewMode(String viewMode) {
this.viewMode = viewMode;
}
}

4
src/main/java/com/commafeed/frontend/rest/resources/UserREST.java
View File

@@ -18,6 +18,7 @@ import com.commafeed.backend.model.UserRole.Role;
import com.commafeed.backend.model.UserSettings;
import com.commafeed.backend.model.UserSettings.ReadingMode;
import com.commafeed.backend.model.UserSettings.ReadingOrder;
import com.commafeed.backend.model.UserSettings.ViewMode;
import com.commafeed.frontend.model.Settings;
import com.commafeed.frontend.model.UserModel;
import com.commafeed.frontend.model.request.ProfileModificationRequest;
@@ -39,12 +40,14 @@ public class UserREST extends AbstractResourceREST {
if (settings != null) {
s.setReadingMode(settings.getReadingMode().name());
s.setReadingOrder(settings.getReadingOrder().name());
s.setViewMode(settings.getViewMode().name());
s.setShowRead(settings.isShowRead());
s.setSocialButtons(settings.isSocialButtons());
s.setCustomCss(settings.getCustomCss());
} else {
s.setReadingMode(ReadingMode.unread.name());
s.setReadingOrder(ReadingOrder.desc.name());
s.setViewMode(ViewMode.title.name());
s.setShowRead(true);
s.setSocialButtons(true);
}
@@ -65,6 +68,7 @@ public class UserREST extends AbstractResourceREST {
s.setReadingMode(ReadingMode.valueOf(settings.getReadingMode()));
s.setReadingOrder(ReadingOrder.valueOf(settings.getReadingOrder()));
s.setShowRead(settings.isShowRead());
s.setViewMode(ViewMode.valueOf(settings.getViewMode()));
s.setCustomCss(settings.getCustomCss());
userSettingsDAO.saveOrUpdate(s);
return Response.ok(Status.OK).build();