Skip to content

Commit 678ac9a

Browse files
konstantiniivuburoiubu
konstantiniiv
authored and
uburoiubu
committed
DROID-3618 App | Design fixes (#2370)
1 parent f32206d commit 678ac9a

File tree

17 files changed

+235
-299
lines changed

17 files changed

+235
-299
lines changed

‎app/src/main/java/com/anytypeio/anytype/ui/home/HomeScreenToolbar.kt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@ fun HomeScreenToolbar(
4646
) {
4747

4848
Image(
49-
painter = painterResource(R.drawable.ic_home_top_toolbar_back),
49+
painter = painterResource(R.drawable.ic_default_top_back),
5050
contentDescription = "Back button",
5151
modifier = Modifier
5252
.padding(start = 16.dp)
@@ -122,7 +122,7 @@ fun HomeScreenToolbar(
122122
contentDescription = "Settings icon",
123123
modifier = Modifier
124124
.align(Alignment.CenterEnd)
125-
.padding(end = 16.dp)
125+
.padding(end = 17.dp)
126126
.noRippleClickable {
127127
onSettingsClicked()
128128
}

‎app/src/main/java/com/anytypeio/anytype/ui/primitives/ObjectTypeFragment.kt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,6 @@ class ObjectTypeFragment : BaseComposeFragment() {
132132
composable(route = OBJ_TYPE_MAIN) {
133133
val showPropertiesScreen = vm.showPropertiesScreen.collectAsStateWithLifecycle().value
134134
WithSetScreen(
135-
uiEditButtonState = vm.uiEditButtonState.collectAsStateWithLifecycle().value,
136135
uiSyncStatusBadgeState = vm.uiSyncStatusBadgeState.collectAsStateWithLifecycle().value,
137136
uiIconState = vm.uiIconState.collectAsStateWithLifecycle().value,
138137
uiTitleState = vm.uiTitleState.collectAsStateWithLifecycle().value,

‎app/src/main/java/com/anytypeio/anytype/ui/primitives/WithSetScreen.kt

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,6 @@ import com.anytypeio.anytype.ui.sets.ObjectSetFragment
5252
@Composable
5353
fun WithSetScreen(
5454
//top bar
55-
uiEditButtonState: UiEditButton,
5655
uiSyncStatusBadgeState: UiSyncStatusBadgeState,
5756
uiSyncStatusState: SyncStatusWidgetState,
5857
//header
@@ -84,9 +83,6 @@ fun WithSetScreen(
8483
topBar = {
8584
TopBarContent(
8685
uiSyncStatusBadgeState = uiSyncStatusBadgeState,
87-
uiEditButtonState = uiEditButtonState,
88-
uiTitleState = uiTitleState,
89-
topBarScrollBehavior = topAppBarScrollBehavior,
9086
onTypeEvent = { typeEvent ->
9187
if (typeEvent is TypeEvent.OnBackClick) {
9288
objectSetFragment.value?.onCloseCurrentObject()

‎app/src/main/java/com/anytypeio/anytype/ui/sets/ObjectSetFragment.kt

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -184,9 +184,6 @@ open class ObjectSetFragment :
184184
private val topToolbarThreeDotsIcon: ImageView
185185
get() = binding.topToolbar.root.findViewById(R.id.ivThreeDots)
186186

187-
private val topToolbarStatusText: TextView
188-
get() = binding.topToolbar.root.findViewById(R.id.tvStatus)
189-
190187
private val addNewButton: TextView
191188
get() = binding.dataViewHeader.addNewButton
192189

@@ -1046,7 +1043,6 @@ open class ObjectSetFragment :
10461043
setBackgroundResource(R.drawable.rect_object_menu_button_default)
10471044
}
10481045
if (binding.root.currentState == R.id.start) {
1049-
topToolbarStatusText.setTextColor(Color.WHITE)
10501046
topToolbarThreeDotsIcon.apply {
10511047
imageTintList = ColorStateList.valueOf(Color.WHITE)
10521048
}
@@ -1057,7 +1053,6 @@ open class ObjectSetFragment :
10571053
topToolbarThreeDotsButton.background = null
10581054
topToolbarThreeDotsIcon.imageTintList = null
10591055
topToolbarStatusContainer.background = null
1060-
topToolbarStatusText.setTextColor(requireContext().getColor(R.color.default_status_text_color))
10611056
}
10621057

10631058
private fun observeCommands(command: ObjectSetCommand) {
@@ -1327,7 +1322,6 @@ open class ObjectSetFragment :
13271322
override fun onTransitionCompleted(motionLayout: MotionLayout?, id: Int) {
13281323
if (id == R.id.start) {
13291324
title.pauseTextWatchers { title.enableEditMode() }
1330-
topToolbarStatusText.animate().alpha(1f).setDuration(DEFAULT_ANIM_DURATION).start()
13311325
topToolbarTitle.animate().alpha(0f).setDuration(DEFAULT_ANIM_DURATION).start()
13321326
topToolbarThreeDotsButton.apply {
13331327
if (background != null) {
@@ -1340,13 +1334,11 @@ open class ObjectSetFragment :
13401334
topToolbarStatusContainer.apply {
13411335
if (background != null) {
13421336
background?.alpha = DRAWABLE_ALPHA_FULL
1343-
topToolbarStatusText.setTextColor(Color.WHITE)
13441337
}
13451338
}
13461339
}
13471340
if (id == R.id.end) {
13481341
title.pauseTextWatchers { title.enableReadMode() }
1349-
topToolbarStatusText.animate().alpha(0f).setDuration(DEFAULT_ANIM_DURATION).start()
13501342
topToolbarTitle.animate().alpha(1f).setDuration(DEFAULT_ANIM_DURATION).start()
13511343
binding.topToolbar.root.findViewById<ImageView>(R.id.ivThreeDots).apply {
13521344
imageTintList = null
@@ -1356,9 +1348,6 @@ open class ObjectSetFragment :
13561348
}
13571349
topToolbarStatusContainer.apply {
13581350
background?.alpha = DRAWABLE_ALPHA_ZERO
1359-
topToolbarStatusText.setTextColor(
1360-
context.getColor(R.color.default_status_text_color)
1361-
)
13621351
}
13631352
}
13641353
}

‎app/src/main/java/com/anytypeio/anytype/ui/widgets/collection/CollectionScreen.kt

Lines changed: 21 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ import androidx.compose.foundation.layout.PaddingValues
2828
import androidx.compose.foundation.layout.Row
2929
import androidx.compose.foundation.layout.WindowInsets
3030
import androidx.compose.foundation.layout.absolutePadding
31+
import androidx.compose.foundation.layout.fillMaxHeight
3132
import androidx.compose.foundation.layout.fillMaxSize
3233
import androidx.compose.foundation.layout.fillMaxWidth
3334
import androidx.compose.foundation.layout.height
@@ -37,6 +38,7 @@ import androidx.compose.foundation.layout.systemBars
3738
import androidx.compose.foundation.layout.width
3839
import androidx.compose.foundation.layout.windowInsetsPadding
3940
import androidx.compose.foundation.layout.wrapContentHeight
41+
import androidx.compose.foundation.layout.wrapContentSize
4042
import androidx.compose.foundation.lazy.LazyColumn
4143
import androidx.compose.foundation.lazy.items
4244
import androidx.compose.foundation.lazy.rememberLazyListState
@@ -85,6 +87,7 @@ import com.anytypeio.anytype.R
8587
import com.anytypeio.anytype.core_ui.common.keyboardAsState
8688
import com.anytypeio.anytype.core_ui.foundation.components.BottomNavigationMenu
8789
import com.anytypeio.anytype.core_ui.foundation.noRippleClickable
90+
import com.anytypeio.anytype.core_ui.foundation.noRippleThrottledClickable
8891
import com.anytypeio.anytype.core_ui.views.Caption1Regular
8992
import com.anytypeio.anytype.core_ui.views.PreviewTitle2Medium
9093
import com.anytypeio.anytype.core_ui.views.Relations3
@@ -172,19 +175,27 @@ fun TopBar(
172175
) {
173176
Box(
174177
modifier = Modifier
175-
.padding(16.dp, 0.dp)
176178
.fillMaxWidth()
177179
.height(48.dp)
178180
) {
179-
Image(
180-
painter = painterResource(R.drawable.ic_default_top_back),
181-
contentDescription = stringResource(R.string.content_desc_back_button),
181+
Box(
182182
modifier = Modifier
183-
.align(Alignment.CenterStart)
184-
.noRippleClickable { vm.onPrevClicked() }
185-
)
183+
.width(56.dp)
184+
.fillMaxHeight()
185+
.noRippleThrottledClickable {
186+
vm.onPrevClicked()
187+
},
188+
contentAlignment = Alignment.Center
189+
) {
190+
Image(
191+
modifier = Modifier.wrapContentSize(),
192+
painter = painterResource(R.drawable.ic_default_top_back),
193+
contentDescription = stringResource(R.string.content_desc_back_button)
194+
)
195+
}
186196
Text(
187-
modifier = Modifier.align(Alignment.Center),
197+
modifier = Modifier
198+
.align(Alignment.Center),
188199
text = uiState.collectionName,
189200
style = Title1,
190201
color = colorResource(id = R.color.text_primary)
@@ -194,7 +205,7 @@ fun TopBar(
194205
modifier = Modifier
195206
.align(CenterEnd)
196207
.noRippleClickable { vm.onActionClicked() }
197-
.padding(start = 16.dp, top = 12.dp, bottom = 12.dp),
208+
.padding(start = 16.dp, top = 12.dp, bottom = 12.dp, end = 16.dp),
198209
text = uiState.actionName,
199210
style = UXBody,
200211
color = colorResource(id = R.color.glyph_active)
@@ -396,7 +407,7 @@ fun SearchBar(
396407

397408
AndroidView(
398409
modifier = Modifier
399-
.padding(16.dp, 6.dp)
410+
.padding(horizontal = 16.dp, vertical = 10.dp)
400411
.fillMaxWidth(),
401412
factory = { context ->
402413
val view = LayoutInflater.from(context)

‎core-ui/src/main/java/com/anytypeio/anytype/core_ui/widgets/objectIcon/TypeIconView.kt

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -67,8 +67,10 @@ fun TypeIconView(
6767
val emoji = Emojifier.safeUri(icon.unicode)
6868
if (emoji != Emojifier.Config.EMPTY_URI) {
6969
EmojiIconView(
70+
modifier = modifier,
7071
icon = ObjectIcon.Basic.Emoji(unicode = icon.unicode),
71-
backgroundSize = backgroundSize
72+
backgroundSize = backgroundSize,
73+
iconWithoutBackgroundMaxSize = 120.dp,
7274
)
7375
} else {
7476
val (imageVector, tint) = getDefaultIconAndTint(icon)

‎core-ui/src/main/res/drawable/ic_home_top_toolbar_back.xml

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

‎core-ui/src/main/res/layout/layout_object_set_top_toolbar.xml

Lines changed: 6 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,9 @@
88

99
<FrameLayout
1010
android:id="@+id/topBackButton"
11-
android:layout_width="28dp"
12-
android:layout_height="28dp"
13-
android:layout_gravity="center_vertical"
14-
android:layout_marginStart="16dp">
11+
android:layout_width="56dp"
12+
android:layout_height="48dp"
13+
android:layout_gravity="center_vertical">
1514

1615
<ImageView
1716
android:id="@+id/ivTopBackButton"
@@ -25,37 +24,21 @@
2524
<androidx.constraintlayout.widget.ConstraintLayout
2625
android:id="@+id/statusContainer"
2726
android:layout_gravity="center_vertical|end"
28-
android:paddingStart="10dp"
29-
android:paddingEnd="10dp"
3027
android:layout_marginEnd="54dp"
31-
android:layout_width="wrap_content"
28+
android:layout_width="28dp"
3229
android:layout_height="28dp">
3330

3431
<com.anytypeio.anytype.core_ui.widgets.StatusBadgeWidget
3532
android:id="@+id/statusBadge"
3633
android:layout_width="10dp"
3734
android:layout_height="10dp"
38-
android:layout_gravity="center_vertical"
3935
android:backgroundTint="@color/orange"
4036
app:layout_constraintBottom_toBottomOf="parent"
37+
app:layout_constraintEnd_toEndOf="parent"
4138
app:layout_constraintStart_toStartOf="parent"
4239
app:layout_constraintTop_toTopOf="parent"
4340
tools:visibility="visible" />
4441

45-
<TextView
46-
android:id="@+id/tvStatus"
47-
style="@style/TextView.UXStyle.Captions.1.Regular"
48-
android:layout_width="wrap_content"
49-
android:layout_height="wrap_content"
50-
android:layout_gravity="center_vertical"
51-
android:layout_marginStart="6dp"
52-
android:textColor="@color/text_secondary"
53-
app:layout_constraintBottom_toBottomOf="parent"
54-
app:layout_constraintStart_toEndOf="@+id/statusBadge"
55-
app:layout_constraintTop_toTopOf="parent"
56-
app:layout_goneMarginStart="0dp"
57-
tools:text="Syncing" />
58-
5942
</androidx.constraintlayout.widget.ConstraintLayout>
6043

6144
<FrameLayout
@@ -93,7 +76,7 @@
9376
android:layout_width="28dp"
9477
android:layout_height="28dp"
9578
android:layout_gravity="end|center_vertical"
96-
android:layout_marginEnd="12dp">
79+
android:layout_marginEnd="14dp">
9780

9881
<ImageView
9982
android:id="@+id/ivThreeDots"

‎core-ui/src/main/res/layout/widget_object_top_toolbar.xml

Lines changed: 4 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,9 @@
55

66
<FrameLayout
77
android:id="@+id/topBackButton"
8-
android:layout_width="28dp"
9-
android:layout_height="28dp"
10-
android:layout_gravity="center_vertical"
11-
android:layout_marginStart="16dp">
8+
android:layout_width="56dp"
9+
android:layout_height="48dp"
10+
android:layout_gravity="center_vertical">
1211

1312
<ImageView
1413
android:id="@+id/ivTopBackButton"
@@ -90,7 +89,7 @@
9089
android:layout_width="28dp"
9190
android:layout_height="28dp"
9291
android:layout_gravity="end|center_vertical"
93-
android:layout_marginEnd="12dp">
92+
android:layout_marginEnd="14dp">
9493

9594
<ImageView
9695
android:id="@+id/ivThreeDots"

0 commit comments

Comments
 (0)