-
Notifications
You must be signed in to change notification settings - Fork 258
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #98 from victorhaggqvist/major-update
Major update
- Loading branch information
Showing
53 changed files
with
2,258 additions
and
1,233 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file was deleted.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,24 +1,44 @@ | ||
| apply plugin: 'com.android.application' | ||
|
|
||
| android { | ||
| compileSdkVersion 21 | ||
| buildToolsVersion '21.1.2' | ||
| compileSdkVersion 22 | ||
| buildToolsVersion '23.0.1' | ||
|
|
||
| defaultConfig { | ||
| applicationId "fr.gaulupeau.apps.InThePoche" | ||
| minSdkVersion 8 | ||
| targetSdkVersion 21 | ||
| targetSdkVersion 22 | ||
| versionCode 11 | ||
| versionName "1.8" | ||
| } | ||
|
|
||
| buildTypes { | ||
| release { | ||
| minifyEnabled false | ||
| proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' | ||
| } | ||
| } | ||
|
|
||
| sourceSets { | ||
| main { | ||
| java { | ||
| srcDir 'src/main/java' | ||
| srcDir 'src-gen' | ||
| } | ||
| } | ||
| } | ||
|
|
||
| lintOptions { | ||
| abortOnError false | ||
| } | ||
| } | ||
|
|
||
| dependencies { | ||
| compile 'com.android.support:appcompat-v7:21.+' | ||
| compile 'com.android.support:appcompat-v7:22.+' | ||
| compile 'com.android.support:recyclerview-v7:22.+' | ||
| compile 'com.android.support:design:22.+' | ||
| compile 'de.greenrobot:greendao:2.0.0' | ||
| compile 'com.facebook.stetho:stetho:1.2.0' | ||
| compile 'com.squareup.okhttp:okhttp:2.5.0' | ||
| compile 'com.facebook.stetho:stetho-okhttp:1.2.0' | ||
| } |
123 changes: 123 additions & 0 deletions
123
app/src-gen/fr/gaulupeau/apps/Poche/entity/Article.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,123 @@ | ||
| package fr.gaulupeau.apps.Poche.entity; | ||
|
|
||
| // THIS CODE IS GENERATED BY greenDAO, DO NOT EDIT. Enable "keep" sections if you want to edit. | ||
| /** | ||
| * Entity mapped to table "ARTICLE". | ||
| */ | ||
| public class Article { | ||
|
|
||
| private Long id; | ||
| private Integer articleId; | ||
| private String content; | ||
| private String author; | ||
| private String title; | ||
| private String url; | ||
| private Boolean archive; | ||
| private Boolean sync; | ||
| private java.util.Date updateDate; | ||
|
|
||
| public Article() { | ||
| } | ||
|
|
||
| public Article(Long id) { | ||
| this.id = id; | ||
| } | ||
|
|
||
| public Article(Long id, Integer articleId, String content, String author, String title, String url, Boolean archive, Boolean sync, java.util.Date updateDate) { | ||
| this.id = id; | ||
| this.articleId = articleId; | ||
| this.content = content; | ||
| this.author = author; | ||
| this.title = title; | ||
| this.url = url; | ||
| this.archive = archive; | ||
| this.sync = sync; | ||
| this.updateDate = updateDate; | ||
| } | ||
|
|
||
| public Long getId() { | ||
| return id; | ||
| } | ||
|
|
||
| public void setId(Long id) { | ||
| this.id = id; | ||
| } | ||
|
|
||
| public Integer getArticleId() { | ||
| return articleId; | ||
| } | ||
|
|
||
| public void setArticleId(Integer articleId) { | ||
| this.articleId = articleId; | ||
| } | ||
|
|
||
| public String getContent() { | ||
| return content; | ||
| } | ||
|
|
||
| public void setContent(String content) { | ||
| this.content = content; | ||
| } | ||
|
|
||
| public String getAuthor() { | ||
| return author; | ||
| } | ||
|
|
||
| public void setAuthor(String author) { | ||
| this.author = author; | ||
| } | ||
|
|
||
| public String getTitle() { | ||
| return title; | ||
| } | ||
|
|
||
| public void setTitle(String title) { | ||
| this.title = title; | ||
| } | ||
|
|
||
| public String getUrl() { | ||
| return url; | ||
| } | ||
|
|
||
| public void setUrl(String url) { | ||
| this.url = url; | ||
| } | ||
|
|
||
| public Boolean getArchive() { | ||
| return archive; | ||
| } | ||
|
|
||
| public void setArchive(Boolean archive) { | ||
| this.archive = archive; | ||
| } | ||
|
|
||
| public Boolean getSync() { | ||
| return sync; | ||
| } | ||
|
|
||
| public void setSync(Boolean sync) { | ||
| this.sync = sync; | ||
| } | ||
|
|
||
| public java.util.Date getUpdateDate() { | ||
| return updateDate; | ||
| } | ||
|
|
||
| public void setUpdateDate(java.util.Date updateDate) { | ||
| this.updateDate = updateDate; | ||
| } | ||
|
|
||
| @Override | ||
| public String toString() { | ||
| return "Article{" + | ||
| "id=" + id + | ||
| ", articleId=" + articleId + | ||
| ", author='" + author + '\'' + | ||
| ", title='" + title + '\'' + | ||
| ", url='" + url + '\'' + | ||
| ", archive=" + archive + | ||
| ", sync=" + sync + | ||
| ", updateDate=" + updateDate + | ||
| '}'; | ||
| } | ||
| } |
Oops, something went wrong.