Skip to content

Commit 2e4a621

Browse files
probot-auto-merge[bot]probot-auto-merge[bot]
authored
Merge pull request #243 from TwidereProject/feautre/redesign-model
redesign models
2 parents dc9614e + 1d07f2e commit 2e4a621

File tree

140 files changed

+2552
-781
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

140 files changed

+2552
-781
lines changed

‎app/schemas/com.twidere.twiderex.db.CacheDatabase/20.json‎

Lines changed: 1083 additions & 0 deletions
Large diffs are not rendered by default.

‎app/src/androidTest/java/com/twidere/twiderex/repository/dm/DirectMessageRepositoryTest.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ import com.twidere.twiderex.db.mapper.toDbUser
3030
import com.twidere.twiderex.mock.MockDirectMessageService
3131
import com.twidere.twiderex.mock.MockLookUpService
3232
import com.twidere.twiderex.model.MicroBlogKey
33-
import com.twidere.twiderex.model.PlatformType
34-
import com.twidere.twiderex.model.ui.UiUser.Companion.toUi
33+
import com.twidere.twiderex.model.enums.PlatformType
34+
import com.twidere.twiderex.model.transform.toUi
3535
import com.twidere.twiderex.repository.DirectMessageRepository
3636
import kotlinx.coroutines.runBlocking
3737
import org.junit.After

‎app/src/main/kotlin/com/twidere/twiderex/action/ComposeAction.kt‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
package com.twidere.twiderex.action
2222

2323
import androidx.work.WorkManager
24-
import com.twidere.twiderex.model.ComposeData
2524
import com.twidere.twiderex.model.MicroBlogKey
26-
import com.twidere.twiderex.model.PlatformType
25+
import com.twidere.twiderex.model.enums.PlatformType
26+
import com.twidere.twiderex.model.job.ComposeData
2727
import com.twidere.twiderex.worker.compose.MastodonComposeWorker
2828
import com.twidere.twiderex.worker.compose.TwitterComposeWorker
2929
import com.twidere.twiderex.worker.draft.RemoveDraftWorker

‎app/src/main/kotlin/com/twidere/twiderex/action/DirectMessageAction.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,9 +21,9 @@
2121
package com.twidere.twiderex.action
2222

2323
import androidx.work.WorkManager
24-
import com.twidere.twiderex.model.DirectMessageDeleteData
25-
import com.twidere.twiderex.model.DirectMessageSendData
26-
import com.twidere.twiderex.model.PlatformType
24+
import com.twidere.twiderex.model.enums.PlatformType
25+
import com.twidere.twiderex.model.job.DirectMessageDeleteData
26+
import com.twidere.twiderex.model.job.DirectMessageSendData
2727
import com.twidere.twiderex.worker.dm.DirectMessageDeleteWorker
2828
import com.twidere.twiderex.worker.dm.TwitterDirectMessageSendWorker
2929

‎app/src/main/kotlin/com/twidere/twiderex/action/StatusActions.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ package com.twidere.twiderex.action
2323
import androidx.compose.runtime.compositionLocalOf
2424
import androidx.work.WorkManager
2525
import com.twidere.twiderex.model.AccountDetails
26-
import com.twidere.twiderex.model.StatusResult
26+
import com.twidere.twiderex.model.job.StatusResult
2727
import com.twidere.twiderex.model.ui.UiStatus
2828
import com.twidere.twiderex.worker.database.DeleteDbStatusWorker
2929
import com.twidere.twiderex.worker.status.DeleteStatusWorker

‎app/src/main/kotlin/com/twidere/twiderex/component/UserComponent.kt‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -97,12 +97,12 @@ import com.twidere.twiderex.component.status.UserAvatar
9797
import com.twidere.twiderex.component.status.UserName
9898
import com.twidere.twiderex.component.status.UserScreenName
9999
import com.twidere.twiderex.component.status.withAvatarClip
100-
import com.twidere.twiderex.db.model.TwitterUrlEntity
101100
import com.twidere.twiderex.di.assisted.assistedViewModel
102101
import com.twidere.twiderex.extensions.observeAsState
103102
import com.twidere.twiderex.extensions.withElevation
104103
import com.twidere.twiderex.model.MicroBlogKey
105-
import com.twidere.twiderex.model.PlatformType
104+
import com.twidere.twiderex.model.enums.PlatformType
105+
import com.twidere.twiderex.model.ui.UiUrlEntity
106106
import com.twidere.twiderex.model.ui.UiUser
107107
import com.twidere.twiderex.navigation.RootRoute
108108
import com.twidere.twiderex.navigation.twidereXSchema
@@ -275,15 +275,15 @@ private fun UserStatusTimelineFilter(
275275
Spacer(modifier = Modifier.width(UserStatusTimelineFilterDefaults.StartSpacing))
276276
Text(
277277
modifier = Modifier.weight(1f),
278-
text = if (user.statusesCount > 1) {
278+
text = if (user.metrics.status > 1) {
279279
stringResource(
280280
id = R.string.common_countable_tweet_single,
281-
user.statusesCount
281+
user.metrics.status
282282
)
283283
} else {
284284
stringResource(
285285
id = R.string.common_countable_tweet_multiple,
286-
user.statusesCount
286+
user.metrics.status
287287
)
288288
}
289289
)
@@ -732,7 +732,7 @@ fun UserMetrics(
732732
.clickable {
733733
navController.navigate(RootRoute.Following(user.userKey))
734734
},
735-
primaryText = user.friendsCount.toString(),
735+
primaryText = user.metrics.follow.toString(),
736736
secondaryText = stringResource(id = R.string.common_controls_profile_dashboard_following),
737737
)
738738
HorizontalDivider(
@@ -744,7 +744,7 @@ fun UserMetrics(
744744
.clickable {
745745
navController.navigate(RootRoute.Followers(user.userKey))
746746
},
747-
primaryText = user.followersCount.toString(),
747+
primaryText = user.metrics.fans.toString(),
748748
secondaryText = stringResource(id = R.string.common_controls_profile_dashboard_followers),
749749
)
750750
if (user.platformType == PlatformType.Twitter) {
@@ -754,7 +754,7 @@ fun UserMetrics(
754754
MetricsItem(
755755
modifier = Modifier
756756
.weight(1f),
757-
primaryText = user.listedCount.toString(),
757+
primaryText = user.metrics.listed.toString(),
758758
secondaryText = stringResource(id = R.string.common_controls_profile_dashboard_listed),
759759
)
760760
}
@@ -780,7 +780,7 @@ fun MetricsItem(
780780
fun UserDescText(
781781
modifier: Modifier = Modifier,
782782
htmlDesc: String,
783-
url: List<TwitterUrlEntity>,
783+
url: List<UiUrlEntity>,
784784
) {
785785
key(
786786
htmlDesc,

‎app/src/main/kotlin/com/twidere/twiderex/component/lazy/ui/LazyUiListsList.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ import androidx.paging.compose.items
5454
import com.twidere.twiderex.R
5555
import com.twidere.twiderex.component.lazy.loadState
5656
import com.twidere.twiderex.component.status.StatusDivider
57-
import com.twidere.twiderex.model.ListType
57+
import com.twidere.twiderex.model.enums.ListType
5858
import com.twidere.twiderex.model.ui.UiList
5959
import moe.tlaster.placeholder.TextPlaceHolder
6060
import java.util.Locale

‎app/src/main/kotlin/com/twidere/twiderex/component/lazy/ui/LazyUiUserList.kt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -101,7 +101,7 @@ fun LazyUiUserList(
101101
)
102102
Spacer(modifier = Modifier.width(UiUserListDefaults.HorizontalPadding))
103103
Text(
104-
text = it.followersCount.toString()
104+
text = it.metrics.fans.toString()
105105
)
106106
}
107107
},

‎app/src/main/kotlin/com/twidere/twiderex/component/navigation/Navigator.kt‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -26,10 +26,10 @@ import android.content.Intent.ACTION_VIEW
2626
import android.net.Uri
2727
import android.webkit.CookieManager
2828
import androidx.compose.runtime.staticCompositionLocalOf
29-
import com.twidere.twiderex.db.model.ReferenceType
30-
import com.twidere.twiderex.model.MastodonStatusType
3129
import com.twidere.twiderex.model.MicroBlogKey
32-
import com.twidere.twiderex.model.PlatformType
30+
import com.twidere.twiderex.model.enums.MastodonStatusType
31+
import com.twidere.twiderex.model.enums.PlatformType
32+
import com.twidere.twiderex.model.enums.ReferenceType
3333
import com.twidere.twiderex.model.ui.UiStatus
3434
import com.twidere.twiderex.model.ui.UiUser
3535
import com.twidere.twiderex.navigation.RootRoute

‎app/src/main/kotlin/com/twidere/twiderex/component/status/DetailedStatusComponent.kt‎

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ import androidx.compose.ui.unit.dp
4949
import com.twidere.twiderex.R
5050
import com.twidere.twiderex.component.FormattedTime
5151
import com.twidere.twiderex.extensions.humanizedCount
52-
import com.twidere.twiderex.model.PlatformType
52+
import com.twidere.twiderex.model.enums.PlatformType
5353
import com.twidere.twiderex.model.ui.UiStatus
5454

5555
@Composable
@@ -84,7 +84,7 @@ fun DetailedStatusComponent(
8484
CompositionLocalProvider(
8585
LocalContentAlpha provides ContentAlpha.disabled
8686
) {
87-
if (!status.placeString.isNullOrEmpty()) {
87+
if (status.geo.name.isNotEmpty()) {
8888
Row(
8989
modifier = Modifier
9090
.align(Alignment.CenterHorizontally)
@@ -96,7 +96,7 @@ fun DetailedStatusComponent(
9696
id = R.string.accessibility_common_status_location
9797
)
9898
)
99-
Text(text = status.placeString)
99+
Text(text = status.geo.name)
100100
}
101101
Spacer(modifier = Modifier.height(DetailedStatusDefaults.ContentSpacing))
102102
}
@@ -123,20 +123,20 @@ fun DetailedStatusComponent(
123123
horizontalArrangement = Arrangement.Center,
124124
) {
125125
StatusStatistics(
126-
count = status.replyCount,
126+
count = status.metrics.reply,
127127
icon = painterResource(id = R.drawable.ic_corner_up_left),
128128
contentDescription = stringResource(
129129
id = R.string.scene_status_reply_mutiple,
130-
status.replyCount,
130+
status.metrics.reply,
131131
),
132132
)
133133
Spacer(modifier = Modifier.width(DetailedStatusDefaults.StatusStatisticsSpacing))
134134
StatusStatistics(
135-
count = status.retweetCount,
135+
count = status.metrics.retweet,
136136
icon = painterResource(id = R.drawable.ic_repeat),
137137
contentDescription = stringResource(
138138
id = R.string.scene_status_retweet_mutiple,
139-
status.retweetCount,
139+
status.metrics.retweet,
140140
),
141141
)
142142
if (status.platformType == PlatformType.Twitter) {
@@ -149,11 +149,11 @@ fun DetailedStatusComponent(
149149
}
150150
Spacer(modifier = Modifier.width(DetailedStatusDefaults.StatusStatisticsSpacing))
151151
StatusStatistics(
152-
count = status.likeCount,
152+
count = status.metrics.like,
153153
icon = painterResource(id = R.drawable.ic_heart),
154154
contentDescription = stringResource(
155155
id = R.string.scene_status_like_multiple,
156-
status.likeCount,
156+
status.metrics.like,
157157
),
158158
)
159159
}

0 commit comments

Comments
 (0)