diff --git a/app/build.gradle.kts b/app/build.gradle.kts index 7255c46..22796a7 100644 --- a/app/build.gradle.kts +++ b/app/build.gradle.kts @@ -185,7 +185,7 @@ dependencies { coreLibraryDesugaring("com.android.tools:desugar_jdk_libs:2.0.4") implementation("com.jakewharton.timber:timber:5.0.1") - debugImplementation("com.squareup.leakcanary:leakcanary-android:2.13") +// debugImplementation("com.squareup.leakcanary:leakcanary-android:2.13") implementation ("com.airbnb.android:lottie-compose:6.3.0") diff --git a/app/schemas/com.peterchege.blogger.core.room.database.BloggerDatabase/1.json b/app/schemas/com.peterchege.blogger.core.room.database.BloggerDatabase/1.json index e2e7bab..9fbcd1a 100644 --- a/app/schemas/com.peterchege.blogger.core.room.database.BloggerDatabase/1.json +++ b/app/schemas/com.peterchege.blogger.core.room.database.BloggerDatabase/1.json @@ -2,7 +2,7 @@ "formatVersion": 1, "database": { "version": 1, - "identityHash": "0f7ac3e7a64cca8217499c7bc54968e7", + "identityHash": "4708ea216b6d29847b0133dbc574f806", "entities": [ { "tableName": "draftPost", @@ -180,7 +180,7 @@ }, { "tableName": "followers", - "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userId` TEXT NOT NULL, `email` TEXT NOT NULL, `fullName` TEXT NOT NULL, `imageUrl` TEXT NOT NULL, `password` TEXT NOT NULL, `username` TEXT NOT NULL, `createdAt` TEXT NOT NULL, `updatedAt` TEXT NOT NULL, `_count` TEXT NOT NULL, PRIMARY KEY(`userId`))", + "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userId` TEXT NOT NULL, `email` TEXT NOT NULL, `fullName` TEXT NOT NULL, `imageUrl` TEXT NOT NULL, `username` TEXT NOT NULL, `createdAt` TEXT NOT NULL, `updatedAt` TEXT NOT NULL, `_count` TEXT NOT NULL, PRIMARY KEY(`userId`))", "fields": [ { "fieldPath": "userId", @@ -206,12 +206,6 @@ "affinity": "TEXT", "notNull": true }, - { - "fieldPath": "password", - "columnName": "password", - "affinity": "TEXT", - "notNull": true - }, { "fieldPath": "username", "columnName": "username", @@ -280,7 +274,7 @@ }, { "tableName": "followings", - "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userId` TEXT NOT NULL, `email` TEXT NOT NULL, `fullName` TEXT NOT NULL, `imageUrl` TEXT NOT NULL, `password` TEXT NOT NULL, `username` TEXT NOT NULL, `createdAt` TEXT NOT NULL, `updatedAt` TEXT NOT NULL, `_count` TEXT NOT NULL, PRIMARY KEY(`userId`))", + "createSql": "CREATE TABLE IF NOT EXISTS `${TABLE_NAME}` (`userId` TEXT NOT NULL, `email` TEXT NOT NULL, `fullName` TEXT NOT NULL, `imageUrl` TEXT NOT NULL, `username` TEXT NOT NULL, `createdAt` TEXT NOT NULL, `updatedAt` TEXT NOT NULL, `_count` TEXT NOT NULL, PRIMARY KEY(`userId`))", "fields": [ { "fieldPath": "userId", @@ -306,12 +300,6 @@ "affinity": "TEXT", "notNull": true }, - { - "fieldPath": "password", - "columnName": "password", - "affinity": "TEXT", - "notNull": true - }, { "fieldPath": "username", "columnName": "username", @@ -350,7 +338,7 @@ "views": [], "setupQueries": [ "CREATE TABLE IF NOT EXISTS room_master_table (id INTEGER PRIMARY KEY,identity_hash TEXT)", - "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '0f7ac3e7a64cca8217499c7bc54968e7')" + "INSERT OR REPLACE INTO room_master_table (id,identity_hash) VALUES(42, '4708ea216b6d29847b0133dbc574f806')" ] } } \ No newline at end of file diff --git a/app/src/main/java/com/peterchege/blogger/core/api/responses/models/FollowerUser.kt b/app/src/main/java/com/peterchege/blogger/core/api/responses/models/FollowerUser.kt index 960059e..fca9386 100644 --- a/app/src/main/java/com/peterchege/blogger/core/api/responses/models/FollowerUser.kt +++ b/app/src/main/java/com/peterchege/blogger/core/api/responses/models/FollowerUser.kt @@ -25,7 +25,6 @@ data class FollowerUser( val email: String, val fullName: String, val imageUrl: String, - val password: String, val username: String, val createdAt:String, val updatedAt:String, diff --git a/app/src/main/java/com/peterchege/blogger/core/api/responses/models/PostAuthor.kt b/app/src/main/java/com/peterchege/blogger/core/api/responses/models/PostAuthor.kt index 9bc53ea..5ead63c 100644 --- a/app/src/main/java/com/peterchege/blogger/core/api/responses/models/PostAuthor.kt +++ b/app/src/main/java/com/peterchege/blogger/core/api/responses/models/PostAuthor.kt @@ -26,7 +26,6 @@ data class PostAuthor( val userId: String, val email: String, val username: String, - val password: String, val fullName: String, val imageUrl: String, val createdAt: String, diff --git a/app/src/main/java/com/peterchege/blogger/core/api/responses/models/User.kt b/app/src/main/java/com/peterchege/blogger/core/api/responses/models/User.kt index 62f7948..89060db 100644 --- a/app/src/main/java/com/peterchege/blogger/core/api/responses/models/User.kt +++ b/app/src/main/java/com/peterchege/blogger/core/api/responses/models/User.kt @@ -24,7 +24,6 @@ data class User( val email: String, val fullName: String, val imageUrl: String, - val password: String, val username: String, val createdAt:String, val updatedAt:String, diff --git a/app/src/main/java/com/peterchege/blogger/core/datastore/serializers/UserInfoSerializer.kt b/app/src/main/java/com/peterchege/blogger/core/datastore/serializers/UserInfoSerializer.kt index 0b4a32f..569fa6f 100644 --- a/app/src/main/java/com/peterchege/blogger/core/datastore/serializers/UserInfoSerializer.kt +++ b/app/src/main/java/com/peterchege/blogger/core/datastore/serializers/UserInfoSerializer.kt @@ -49,7 +49,6 @@ object UserInfoSerializer : Serializer { userId = "", fullName = "", email = "", - password = "", username = "", imageUrl = "", deviceTokens = emptyList(), diff --git a/app/src/main/java/com/peterchege/blogger/core/fake/DummyNotifications.kt b/app/src/main/java/com/peterchege/blogger/core/fake/DummyNotifications.kt index 6599f4f..9007a73 100644 --- a/app/src/main/java/com/peterchege/blogger/core/fake/DummyNotifications.kt +++ b/app/src/main/java/com/peterchege/blogger/core/fake/DummyNotifications.kt @@ -19,7 +19,7 @@ val dummyNotifications = (1..20).map { imageUrl = "https://ui-avatars.com/api/?background=719974&color=fff&name=Peter+Chege&bold=true&fontsize=0.6", createdAt = "2023-12-02T18:55:36.935Z", updatedAt = "2023-12-02T18:55:36.935Z", - password = "2023-12-02T18:55:36.935Z", + ), notificationReceiver = PostAuthor( userId = "1234567", @@ -29,7 +29,6 @@ val dummyNotifications = (1..20).map { imageUrl = "https://ui-avatars.com/api/?background=719974&color=fff&name=Peter+Chege&bold=true&fontsize=0.6", createdAt = "2023-12-02T18:55:36.935Z", updatedAt = "2023-12-02T18:55:36.935Z", - password = "2023-12-02T18:55:36.935Z", ), notificationPostId = UUID.randomUUID().toString(), notificationCommentId = null, diff --git a/app/src/main/java/com/peterchege/blogger/core/fake/DummyPosts.kt b/app/src/main/java/com/peterchege/blogger/core/fake/DummyPosts.kt index be0a723..1f9325d 100644 --- a/app/src/main/java/com/peterchege/blogger/core/fake/DummyPosts.kt +++ b/app/src/main/java/com/peterchege/blogger/core/fake/DummyPosts.kt @@ -26,7 +26,6 @@ val dummyPostList = listOf( imageUrl = "https://ui-avatars.com/api/?background=719974&color=fff&name=Peter+Chege&bold=true&fontsize=0.6", createdAt = "2023-12-02T18:55:36.935Z", updatedAt = "2023-12-02T18:55:36.935Z", - password = "2023-12-02T18:55:36.935Z", ), count = PostCount(likes = 5, comments = 2, views = 3), isLiked = true @@ -47,7 +46,6 @@ val dummyPostList = listOf( imageUrl = "https://ui-avatars.com/api/?background=719974&color=fff&name=Peter+Chege&bold=true&fontsize=0.6", createdAt = "2023-12-02T18:55:36.935Z", updatedAt = "2023-12-02T18:55:36.935Z", - password = "2023-12-02T18:55:36.935Z", ), count = PostCount(likes = 10, comments = 4, views = 2), isSaved = true diff --git a/app/src/main/java/com/peterchege/blogger/core/room/entities/FollowerUserEntity.kt b/app/src/main/java/com/peterchege/blogger/core/room/entities/FollowerUserEntity.kt index bd68e4e..d774241 100644 --- a/app/src/main/java/com/peterchege/blogger/core/room/entities/FollowerUserEntity.kt +++ b/app/src/main/java/com/peterchege/blogger/core/room/entities/FollowerUserEntity.kt @@ -27,7 +27,6 @@ data class FollowerUserEntity( val email: String, val fullName: String, val imageUrl: String, - val password: String, val username: String, val createdAt:String, val updatedAt:String, diff --git a/app/src/main/java/com/peterchege/blogger/core/room/entities/FollowingUserEntity.kt b/app/src/main/java/com/peterchege/blogger/core/room/entities/FollowingUserEntity.kt index 8a34470..4d5635a 100644 --- a/app/src/main/java/com/peterchege/blogger/core/room/entities/FollowingUserEntity.kt +++ b/app/src/main/java/com/peterchege/blogger/core/room/entities/FollowingUserEntity.kt @@ -26,7 +26,6 @@ data class FollowingUserEntity( val email: String, val fullName: String, val imageUrl: String, - val password: String, val username: String, val createdAt:String, val updatedAt:String, diff --git a/app/src/main/java/com/peterchege/blogger/domain/mappers/FollowerMappers.kt b/app/src/main/java/com/peterchege/blogger/domain/mappers/FollowerMappers.kt index 883079f..ef5f5ab 100644 --- a/app/src/main/java/com/peterchege/blogger/domain/mappers/FollowerMappers.kt +++ b/app/src/main/java/com/peterchege/blogger/domain/mappers/FollowerMappers.kt @@ -26,7 +26,6 @@ fun FollowerUser.toUser(): User { email = email, fullName = fullName, imageUrl = imageUrl, - password = password, username = username, createdAt = createdAt, updatedAt= updatedAt, @@ -42,7 +41,6 @@ fun User.toFollower(): FollowerUser { email = email, fullName = fullName, imageUrl = imageUrl, - password = password, username = username, createdAt = createdAt, updatedAt= updatedAt, @@ -56,7 +54,6 @@ fun User.toFollowerEntity(): FollowerUserEntity { email = email, fullName = fullName, imageUrl = imageUrl, - password = password, username = username, createdAt = createdAt, updatedAt= updatedAt, @@ -70,7 +67,6 @@ fun FollowerUser.toFollowerEntity(): FollowerUserEntity { email = email, fullName = fullName, imageUrl = imageUrl, - password = password, username = username, createdAt = createdAt, updatedAt= updatedAt, @@ -83,7 +79,6 @@ fun FollowerUserEntity.toFollower(): FollowerUser { email = email, fullName = fullName, imageUrl = imageUrl, - password = password, username = username, createdAt = createdAt, updatedAt= updatedAt, @@ -97,7 +92,6 @@ fun FollowerUserEntity.toUser(): User { email = email, fullName = fullName, imageUrl = imageUrl, - password = password, username = username, createdAt = createdAt, updatedAt= updatedAt, diff --git a/app/src/main/java/com/peterchege/blogger/domain/mappers/FollowingMappers.kt b/app/src/main/java/com/peterchege/blogger/domain/mappers/FollowingMappers.kt index bf61763..525edcd 100644 --- a/app/src/main/java/com/peterchege/blogger/domain/mappers/FollowingMappers.kt +++ b/app/src/main/java/com/peterchege/blogger/domain/mappers/FollowingMappers.kt @@ -26,7 +26,6 @@ fun User.toFollowingEntity(): FollowingUserEntity { email = email, fullName = fullName, imageUrl = imageUrl, - password = password, username = username, createdAt = createdAt, updatedAt= updatedAt, @@ -40,7 +39,7 @@ fun FollowerUser.toFollowingEntity(): FollowingUserEntity { email = email, fullName = fullName, imageUrl = imageUrl, - password = password, + username = username, createdAt = createdAt, updatedAt= updatedAt, @@ -53,7 +52,6 @@ fun FollowingUserEntity.toFollower(): FollowerUser { email = email, fullName = fullName, imageUrl = imageUrl, - password = password, username = username, createdAt = createdAt, updatedAt= updatedAt, @@ -67,7 +65,6 @@ fun FollowingUserEntity.toUser(): User { email = email, fullName = fullName, imageUrl = imageUrl, - password = password, username = username, createdAt = createdAt, updatedAt= updatedAt, diff --git a/app/src/main/java/com/peterchege/blogger/presentation/components/ArticleCard.kt b/app/src/main/java/com/peterchege/blogger/presentation/components/ArticleCard.kt index 366b29f..4f586c5 100644 --- a/app/src/main/java/com/peterchege/blogger/presentation/components/ArticleCard.kt +++ b/app/src/main/java/com/peterchege/blogger/presentation/components/ArticleCard.kt @@ -82,7 +82,6 @@ fun ArticleCardPreview() { userId = "", email = "", username = "", - password = "", createdAt = "", updatedAt = "", imageUrl = "", diff --git a/app/src/main/java/com/peterchege/blogger/presentation/components/NotifcationCard.kt b/app/src/main/java/com/peterchege/blogger/presentation/components/NotifcationCard.kt index 9d771ba..e058d37 100644 --- a/app/src/main/java/com/peterchege/blogger/presentation/components/NotifcationCard.kt +++ b/app/src/main/java/com/peterchege/blogger/presentation/components/NotifcationCard.kt @@ -157,7 +157,6 @@ fun NotificationCardPreview() { userId = "", email = "", username = "", - password = "", createdAt = "2023-12-02T18:55:36.935Z", updatedAt = "2023-12-02T18:55:36.935Z", imageUrl = "", @@ -167,7 +166,6 @@ fun NotificationCardPreview() { userId = "", email = "", username = "", - password = "", createdAt = "2023-12-02T18:55:36.935Z", updatedAt = "2023-12-02T18:55:36.935Z", imageUrl = "", diff --git a/app/src/main/java/com/peterchege/blogger/presentation/screens/profile/ProfileScreen.kt b/app/src/main/java/com/peterchege/blogger/presentation/screens/profile/ProfileScreen.kt index 75b1a29..946ce1b 100644 --- a/app/src/main/java/com/peterchege/blogger/presentation/screens/profile/ProfileScreen.kt +++ b/app/src/main/java/com/peterchege/blogger/presentation/screens/profile/ProfileScreen.kt @@ -407,7 +407,6 @@ fun ProfileScreenPreview1() { imageUrl = "https://ui-avatars.com/api/?background=719974&color=fff&name=Peter+Chege&bold=true&fontsize=0.6", createdAt = "2023-12-02T18:55:36.935Z", updatedAt = "2023-12-02T18:55:36.935Z", - password = "2023-12-02T18:55:36.935Z", count = UserCount( followers = 10, post = dummyPostList.size, @@ -453,7 +452,6 @@ fun ProfileScreenPreview2() { imageUrl = "https://ui-avatars.com/api/?background=719974&color=fff&name=Peter+Chege&bold=true&fontsize=0.6", createdAt = "2023-12-02T18:55:36.935Z", updatedAt = "2023-12-02T18:55:36.935Z", - password = "2023-12-02T18:55:36.935Z", count = UserCount( followers = 10, post = dummyPostList.size,