mirrors/bitwarden-android
1
0
Fork 0
mirror of https://github.com/bitwarden/android.git synced 2024-12-25 10:28:28 +03:00
Code Issues Projects Releases Packages Wiki Activity

font sizes for cipher cell on android

Browse source
This commit is contained in:
Kyle Spearrin 2019-06-10 10:02:09 -04:00
parent 337965a7f7
commit 5485bb574e
3 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/Android/Renderers/CipherViewCellRenderer.cs
View file

@ -117,6 +117,16 @@ namespace Bit.Droid.Renderers
AttachmentsIcon.Typeface = _faTypeface; AttachmentsIcon.Typeface = _faTypeface;
MoreButton.Typeface = _miTypeface; MoreButton.Typeface = _miTypeface;
var small = (float)Device.GetNamedSize(NamedSize.Small, typeof(Label));
Icon.SetTextSize(ComplexUnitType.Sp, 22.0952380952381F);
Name.SetTextSize(ComplexUnitType.Sp, (float)Device.GetNamedSize(NamedSize.Medium, typeof(Label)));
SubTitle.SetTextSize(ComplexUnitType.Sp, small);
SharedIcon.SetTextSize(ComplexUnitType.Sp, small);
AttachmentsIcon.SetTextSize(ComplexUnitType.Sp, small);
MoreButton.SetTextSize(ComplexUnitType.Sp, 25);
MoreButton.SetPadding(0, 0, 0, 0);
MoreButton.SetBackgroundColor(Xamarin.Forms.Color.Black.ToAndroid());
AddView(view); AddView(view);
} }
@ -144,7 +154,7 @@ namespace Bit.Droid.Renderers
} }
else else
{ {
SubTitle.Visibility = ViewStates.Gone; SubTitle.Visibility = ViewStates.Invisible;
} }
SharedIcon.Visibility = cipher.Shared ? ViewStates.Visible : ViewStates.Gone; SharedIcon.Visibility = cipher.Shared ? ViewStates.Visible : ViewStates.Gone;
AttachmentsIcon.Visibility = cipher.HasAttachments ? ViewStates.Visible : ViewStates.Gone; AttachmentsIcon.Visibility = cipher.HasAttachments ? ViewStates.Visible : ViewStates.Gone;

6
src/Android/Resources/layout/CipherViewCell.axml
View file

@ -15,8 +15,8 @@
android:layout_gravity="center_vertical" /> android:layout_gravity="center_vertical" />
<TextView <TextView
android:id="@+id/CipherCellIcon" android:id="@+id/CipherCellIcon"
android:layout_width="24dp" android:layout_width="26dp"
android:layout_height="24dp" android:layout_height="26dp"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:gravity="center" android:gravity="center"
android:text="[X]" /> android:text="[X]" />
@ -62,7 +62,7 @@
</LinearLayout> </LinearLayout>
<Button <Button
android:id="@+id/CipherCellButton" android:id="@+id/CipherCellButton"
android:layout_width="wrap_content" android:layout_width="40dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:text="&#xe5d4;" android:text="&#xe5d4;"
android:gravity="center"/> android:gravity="center"/>

4
src/App/Styles/Base.xaml
View file

@ -224,7 +224,7 @@
<Setter Property="VerticalTextAlignment" <Setter Property="VerticalTextAlignment"
Value="Center" /> Value="Center" />
<Setter Property="FontSize" <Setter Property="FontSize"
Value="Large" /> Value="22.0952380952381" />
<Setter Property="TextColor" <Setter Property="TextColor"
Value="{StaticResource MutedColor}" /> Value="{StaticResource MutedColor}" />
</Style> </Style>
@ -346,6 +346,8 @@
Value="Medium" /> Value="Medium" />
<Setter Property="TextColor" <Setter Property="TextColor"
Value="{StaticResource TextColor}" /> Value="{StaticResource TextColor}" />
<Setter Property="VerticalOptions"
Value="Center" />
</Style> </Style>
<Style TargetType="Label" <Style TargetType="Label"
ApplyToDerivedTypes="True" ApplyToDerivedTypes="True"