anyproto/anytype-kotlin
1
0
Fork 0
mirror of https://github.com/anyproto/anytype-kotlin.git synced 2025-06-08 05:47:05 +09:00
Code Activity

DROID-1102 App | Design | Small updates in text and icons (#3051)

Browse source
This commit is contained in:
Evgenii Kozlov 2023-03-27 20:56:11 +02:00 • committed by GitHub
parent e823ee8505
commit 054c5d0850
Signed by: github
GPG key ID: 4AEE18F83AFDEB23
15 changed files with 37 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/src/main/java/com/anytypeio/anytype/ui/settings/AboutAppFragment.kt
View file

@ -90,7 +90,7 @@ class AboutAppFragment : BaseBottomSheetComposeFragment() {
}
val fonts = FontFamily(
Font(R.font.inter_regular),
Font(R.font.inter_regular, weight = FontWeight.Normal),
Font(R.font.inter_bold, weight = FontWeight.Bold),
Font(R.font.inter_medium, weight = FontWeight.Medium),
Font(R.font.inter_semibold, weight = FontWeight.SemiBold)

5
app/src/main/java/com/anytypeio/anytype/ui/widgets/collection/CollectionScreen.kt
View file

@ -65,6 +65,7 @@ import androidx.compose.ui.platform.LocalView
import androidx.compose.ui.res.colorResource
import androidx.compose.ui.res.painterResource
import androidx.compose.ui.res.stringResource
import androidx.compose.ui.text.font.FontWeight
import androidx.compose.ui.text.style.TextOverflow
import androidx.compose.ui.unit.Density
import androidx.compose.ui.unit.dp
@ -500,7 +501,9 @@ private fun objDescriptionTextStyle() = MaterialTheme.typography.body2.copy(
@Composable
private fun objNameTextStyle() = MaterialTheme.typography.h3.copy(
fontSize = 15.sp,
color = colorResource(id = R.color.text_primary)
color = colorResource(id = R.color.text_primary),
fontWeight = FontWeight.Medium,
lineHeight = 20.sp
)
@ExperimentalMaterialApi

3
app/src/main/java/com/anytypeio/anytype/ui/widgets/menu/WidgetDropDownMenu.kt
View file

@ -182,7 +182,8 @@ fun WidgetActionButton(
style = TextStyle(
fontSize = 15.sp,
fontWeight = FontWeight.Medium,
color = colorResource(id = R.color.text_primary)
color = colorResource(id = R.color.text_primary),
lineHeight = 20.sp
)
)
}

3
app/src/main/java/com/anytypeio/anytype/ui/widgets/types/BinWidgetCard.kt
View file

@ -96,7 +96,8 @@ fun BinWidgetCard(
style = TextStyle(
fontSize = 17.sp,
color = colorResource(id = R.color.text_primary),
fontWeight = FontWeight.Bold
fontWeight = FontWeight.Bold,
lineHeight = 24.sp
)
)
}

3
app/src/main/java/com/anytypeio/anytype/ui/widgets/types/LibraryWidgetCard.kt
View file

@ -90,7 +90,8 @@ fun LibraryWidgetCard(
style = TextStyle(
fontSize = 17.sp,
color = colorResource(id = R.color.text_primary),
fontWeight = FontWeight.Bold
fontWeight = FontWeight.Bold,
lineHeight = 24.sp
)
)
}

3
app/src/main/java/com/anytypeio/anytype/ui/widgets/types/LinkWidget.kt
View file

@ -99,7 +99,8 @@ fun LinkWidgetCard(
style = TextStyle(
fontSize = 17.sp,
color = colorResource(id = R.color.text_primary),
fontWeight = FontWeight.Bold
fontWeight = FontWeight.Bold,
lineHeight = 24.sp
)
)
AnimatedVisibility(

2
app/src/main/java/com/anytypeio/anytype/ui/widgets/types/TreeWidget.kt
View file

@ -212,6 +212,7 @@ private fun TreeWidgetTreeItems(
fontSize = 15.sp,
fontWeight = FontWeight.Medium,
color = colorResource(id = R.color.text_primary),
lineHeight = 20.sp
)
)
}
@ -250,6 +251,7 @@ fun WidgetHeader(
fontSize = 17.sp,
fontWeight = FontWeight.Bold,
color = colorResource(id = R.color.text_primary),
lineHeight = 24.sp
),
maxLines = 1,
overflow = TextOverflow.Ellipsis,

2
app/src/main/res/drawable/ic_drag.xml
View file

@ -1,5 +1,5 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="36dp"
android:width="48dp"
android:height="4dp"
android:viewportWidth="36"
android:viewportHeight="4">

9
app/src/main/res/layout/dialog_keychain_phrase.xml
View file

@ -22,9 +22,10 @@
style="@style/KeychainDialogTitleStyle"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="54dp"
android:layout_marginTop="30dp"
android:layout_marginStart="20dp"
android:layout_marginEnd="20dp"
android:text="@string/back_up_your_recovery_phrase"
android:textAlignment="center"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/drag" />
@ -34,7 +35,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:layout_marginTop="24dp"
android:layout_marginTop="8dp"
android:layout_marginEnd="20dp"
android:text="@string/recovery_phrase_text"
app:layout_constraintEnd_toEndOf="parent"
@ -47,7 +48,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_marginStart="20dp"
android:layout_marginTop="34dp"
android:layout_marginTop="24dp"
android:layout_marginEnd="20dp"
android:clickable="true"
android:focusable="false"

11
app/src/main/res/layout/fragment_start_login.xml
View file

@ -36,10 +36,12 @@
android:layout_marginTop="23dp"
android:layout_marginBottom="11dp"
android:fontFamily="@font/inter_bold"
android:letterSpacing="-0.0218"
android:text="@string/organize_everything"
android:textColor="@color/black"
android:letterSpacing="-0.02"
android:lineSpacingExtra="-1sp"
android:textColor="@color/text_primary"
android:textSize="22sp"
android:lineHeight="26sp"
app:layout_constraintBottom_toTopOf="@+id/textView"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" />
@ -53,9 +55,12 @@
android:layout_marginBottom="18dp"
android:fontFamily="@font/inter_regular"
android:lineSpacingMultiplier="1.21"
android:lineHeight="22sp"
android:text="@string/start_login_text"
android:textColor="@color/black"
android:textColor="@color/text_primary"
android:textSize="15sp"
android:lineSpacingExtra="4sp"
android:letterSpacing="-0.02"
app:layout_constraintBottom_toTopOf="@+id/loginButton"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" />

4
app/src/main/res/values/strings.xml
View file

@ -87,7 +87,7 @@ Do the computation of an expensive paragraph of text on a background thread:
<string name="updates">Updates</string>
<string name="log_out">Log out</string>
<string name="recovery_phrase_text">You’ll need it to sign in. Keep it in a safe place. If you lose it, you can no longer access your account.</string>
<string name="back_up_your_recovery_phrase">Back up your recovery \nphrase</string>
<string name="back_up_your_recovery_phrase">Back up your recovery phrase</string>
<string name="i_ve_written_it_down">i\'ve written it down</string>
<string name="keychain_mock">witch collapse practice feed shame open despair creek road again ice least lake tree young address brain envelope</string>
<string name="show_and_copy_mnemonic">Show and copy phrase</string>
@ -257,7 +257,7 @@ Do the computation of an expensive paragraph of text on a background thread:
<string name="clear_cache">Clear cache</string>
<string name="download_from_node">All files will be deleted from your current device. They can be downloaded again from a backup node or another device.</string>
<string name="new_profile">new profile</string>
<string name="new_profile">New profile</string>
<string name="back_up_your_phrase">Back up</string>
<string name="anytype_analytics">Anytype Analytics</string>
<string name="anytype_analytics_msg">Understanding how people use Anytype helps us improve the product. This version of Anytype includes the analytics code that protects your privacy.\nIt doesn\'t record the actual document\'s content but still allows us to understand how you use Anytype.\nStay subscribed to our mailing list, as we will soon announce a new release that enables you to opt-out.</string>

2
app/src/main/res/values/styles.xml
View file

@ -144,7 +144,7 @@
<style name="KeychainDialogTitleStyle">
<item name="fontFamily">@font/inter_bold</item>
<item name="android:textColor">@color/text_primary</item>
<item name="android:textSize">28sp</item>
<item name="android:textSize">22sp</item>
</style>
<style name="KeychainDialogSubtitleStyle">

3
core-ui/src/main/res/layout/item_object_type_item.xml
View file

@ -29,6 +29,9 @@
android:layout_marginEnd="12dp"
android:hint="@string/untitled"
android:textColorHint="@color/text_tertiary"
android:fontFamily="@font/inter_medium"
android:lineHeight="20sp"
android:letterSpacing="-0.02"
app:layout_constraintBottom_toTopOf="@+id/tvSubtitle"
app:layout_constraintEnd_toStartOf="@+id/ic_selected"
app:layout_constraintHorizontal_bias="0.5"

3
core-ui/src/main/res/values/styles.xml
View file

@ -221,7 +221,8 @@
<style name="ModalTitleStyle">
<item name="android:textColor">@color/text_primary</item>
<item name="android:textSize">17sp</item>
<item name="android:textStyle">bold</item>
<item name="fontFamily">@font/inter_semibold</item>
<item name="lineHeight">24sp</item>
</style>
<style name="RoundedBgTextView" parent="@android:style/Widget.TextView">

1
library-page-icon-picker-widget/src/main/res/layout/item_page_icon_picker_emoji_category_header.xml
View file

@ -9,7 +9,6 @@
android:gravity="center"
android:paddingTop="12dp"
android:paddingBottom="12dp"
android:textAllCaps="true"
android:id="@+id/category"
tools:text="Smileys and people"
android:layout_height="wrap_content"