Skip to content

Commit 4e41ed5

Browse files
committed
updated dependencies
1 parent b69b4dc commit 4e41ed5

33 files changed

Lines changed: 168 additions & 377 deletions

app/build.gradle

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,12 +61,12 @@ dependencies {
6161
implementation "com.android.support:recyclerview-v7:$supportLibVersion"
6262
implementation 'io.reactivex.rxjava2:rxandroid:2.1.1'
6363
implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
64-
implementation 'androidx.appcompat:appcompat:1.1.0'
65-
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
66-
implementation 'com.google.android.material:material:1.1.0'
64+
implementation 'androidx.appcompat:appcompat:1.2.0'
65+
implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
66+
implementation 'com.google.android.material:material:1.2.1'
6767
testImplementation 'junit:junit:4.13'
68-
androidTestImplementation 'androidx.test:runner:1.2.0'
69-
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
68+
androidTestImplementation 'androidx.test:runner:1.3.0'
69+
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
7070

7171
implementation 'com.github.android-promise:commons:1.1-beta02'
7272
implementation 'io.reactivex.rxjava2:rxjava:2.2.17'

app/schemas/promise.base.AppDatabase/1.yml

Lines changed: 0 additions & 108 deletions
This file was deleted.

app/schemas/promise.base.AppDatabase/2.yml

Lines changed: 4 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ tableMetaData:
4040
columnName: "uId"
4141
nullable: true
4242
- fieldName: "title"
43-
columnName: "title"
43+
columnName: "ttl"
4444
nullable: true
4545
- fieldName: "body"
4646
columnName: "body"
@@ -93,8 +93,8 @@ tableMetaData:
9393
- fieldName: "thumbnailUrl"
9494
columnName: "thumbnailUrl"
9595
nullable: true
96-
- fieldName: "post"
97-
columnName: "post"
96+
- fieldName: "photoPost"
97+
columnName: "photoPost"
9898
nullable: true
9999
migrations: []
100100
- tableName: "users"
@@ -111,19 +111,4 @@ tableMetaData:
111111
- fieldName: "names"
112112
columnName: "names"
113113
nullable: true
114-
migrations:
115-
- versionChange:
116-
fromVersion: 1
117-
toVersion: 2
118-
field: "emailColumn"
119-
action: "CREATE"
120-
- versionChange:
121-
fromVersion: 1
122-
toVersion: 2
123-
field: "photoUrlColumn"
124-
action: "CREATE"
125-
- versionChange:
126-
fromVersion: 1
127-
toVersion: 2
128-
field: "likedinProfileUrlColumn"
129-
action: "CREATE"
114+
migrations: []

app/src/main/java/promise/base/AppDatabase.kt

Lines changed: 6 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@ package promise.base
1515

1616
import promise.base.comment.Like
1717
import promise.base.comment.PostComment
18-
import promise.base.comment.PostCommentDao
1918
import promise.base.photo.Photo
2019
import promise.base.post.Post
2120
import promise.base.session.User
@@ -34,20 +33,17 @@ import promise.utils.Visitor
3433
Todo::class,
3534
Like::class,
3635
User::class
37-
]
36+
],
37+
version = 2
3838
)
3939
abstract class AppDatabase(fastDatabase: FastDatabase)
4040
: PromiseDatabase(fastDatabase) {
4141

4242
init {
43-
fastDatabase.accept(object : Visitor<FastDatabase, Unit> {
44-
override fun visit(t: FastDatabase) {
45-
t.setErrorHandler {
46-
LogUtil.e(TAG, "database error: ${it.path}")
47-
}
48-
t.fallBackToDestructiveMigration()
49-
}
50-
})
43+
fastDatabase.setErrorHandler {
44+
LogUtil.e(TAG, "database error: ${it.path}")
45+
}
46+
fastDatabase.fallBackToDestructiveMigration()
5147
}
5248

5349
//abstract fun getPostCommentsDao(): PostCommentDao

app/src/main/java/promise/base/ID.kt

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -27,17 +27,10 @@ class ID() : Parcelable {
2727
parcel.writeString(id)
2828
}
2929

30-
override fun describeContents(): Int {
31-
return 0
32-
}
30+
override fun describeContents(): Int = 0
3331

3432
companion object CREATOR : Parcelable.Creator<ID> {
35-
override fun createFromParcel(parcel: Parcel): ID {
36-
return ID(parcel)
37-
}
38-
39-
override fun newArray(size: Int): Array<ID?> {
40-
return arrayOfNulls(size)
41-
}
33+
override fun createFromParcel(parcel: Parcel): ID = ID(parcel)
34+
override fun newArray(size: Int): Array<ID?> = arrayOfNulls(size)
4235
}
4336
}

app/src/main/java/promise/base/comment/Like.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,6 @@
2727
import promise.database.PrimaryKeyAutoIncrement;
2828

2929
@Entity
30-
3130
public class Like implements Identifiable<Integer>, Parcelable {
3231
private ID uId;
3332

@@ -50,11 +49,12 @@ public void setType(String type) {
5049
@NonNull
5150
@Override
5251
public String toString() {
53-
return
54-
"Like{" +
55-
",id = '" + uId + '\'' +
56-
57-
"}";
52+
return "Like{" +
53+
"uId=" + uId +
54+
", post=" + post +
55+
", id=" + id +
56+
", type='" + type + '\'' +
57+
'}';
5858
}
5959

6060
public ID getUId() {

app/src/main/java/promise/base/comment/PostComment.java

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,8 @@
33
import android.annotation.SuppressLint;
44
import android.os.Parcel;
55

6+
import androidx.annotation.NonNull;
7+
68
import org.jetbrains.annotations.NotNull;
79

810
import promise.base.ID;
@@ -11,7 +13,9 @@
1113
import promise.database.HasOne;
1214
import promise.db.ActiveRecord;
1315

14-
@Entity
16+
@Entity(
17+
generateRelations = false
18+
)
1519
public class PostComment extends ActiveRecord<PostComment> {
1620
private String name;
1721
private ID uId;
@@ -63,6 +67,7 @@ public void setPostCommentId(String postCommentId) {
6367
this.postCommentId = postCommentId;
6468
}
6569

70+
@NonNull
6671
@Override
6772
public String toString() {
6873
return

app/src/main/java/promise/base/photo/Photo.kt

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
package promise.base.photo
22

3-
import android.annotation.SuppressLint
43
import android.os.Parcel
54
import android.os.Parcelable
65
import promise.base.post.Post
@@ -14,42 +13,34 @@ class Photo() : ActiveRecord<Photo>() {
1413
var title: String? = null
1514
var url: String? = null
1615
var thumbnailUrl: String? = null
16+
1717
@HasOne
18-
var post: Post? = null
18+
var photoPost: Post? = null
1919

2020
constructor(parcel: Parcel) : this() {
2121
albumId = parcel.readValue(Int::class.java.classLoader) as? Int
2222
title = parcel.readString()
2323
url = parcel.readString()
2424
thumbnailUrl = parcel.readString()
25-
post = parcel.readParcelable(Post::class.java.classLoader)
25+
photoPost = parcel.readParcelable(Post::class.java.classLoader)
2626
}
2727

28-
override fun getEntity(): Photo {
29-
return this
30-
}
28+
override fun getEntity(): Photo = this
3129

3230
override fun writeToParcel(parcel: Parcel, flags: Int) {
3331
super.writeToParcel(parcel, flags)
3432
parcel.writeValue(albumId)
3533
parcel.writeString(title)
3634
parcel.writeString(url)
3735
parcel.writeString(thumbnailUrl)
38-
parcel.writeParcelable(post, flags)
36+
parcel.writeParcelable(photoPost, flags)
3937
}
4038

41-
override fun describeContents(): Int {
42-
return 0
43-
}
39+
override fun describeContents(): Int = 0
4440

4541
companion object CREATOR : Parcelable.Creator<Photo> {
46-
override fun createFromParcel(parcel: Parcel): Photo {
47-
return Photo(parcel)
48-
}
49-
50-
override fun newArray(size: Int): Array<Photo?> {
51-
return arrayOfNulls(size)
52-
}
42+
override fun createFromParcel(parcel: Parcel): Photo = Photo(parcel)
43+
override fun newArray(size: Int): Array<Photo?> = arrayOfNulls(size)
5344
}
5445

5546
}

app/src/main/java/promise/base/post/Post.java

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -7,20 +7,26 @@
77

88
import org.jetbrains.annotations.NotNull;
99

10+
import java.util.ArrayList;
1011
import java.util.Date;
1112
import java.util.List;
1213

1314
import promise.base.ID;
1415
import promise.base.comment.Like;
1516
import promise.base.comment.PostComment;
1617
import promise.base.photo.Photo;
18+
import promise.database.ColumnInfo;
1719
import promise.database.Entity;
1820
import promise.database.HasMany;
1921
import promise.db.ActiveRecord;
2022

2123
@Entity
2224
public class Post extends ActiveRecord<Post> {
25+
26+
@ColumnInfo(unique = true)
2327
private ID uId;
28+
29+
@ColumnInfo(columnName = "ttl", length = 40, unique = true)
2430
private String title;
2531
private String body;
2632
private int userId;
@@ -29,6 +35,7 @@ public class Post extends ActiveRecord<Post> {
2935
private Date publishedDate;
3036
@HasMany
3137
private List<PostComment> comments;
38+
3239
@HasMany
3340
private List<Photo> photos;
3441
@HasMany

app/src/main/java/promise/base/post/PostRepository.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,9 @@ interface PostRepository {
2929
}
3030

3131
@Singleton
32-
class PostRepositoryImpl @Inject constructor(
32+
class PostRepositoryImpl
33+
@Inject
34+
constructor(
3335
private var postRelationsDao: PostRelationsDao,
3436
private var postsTable: PostsTable) : PostRepository {
3537
init {

0 commit comments

Comments
 (0)