Merge pull request #488 from NUmeroAndDev/design_speaker_screen

Fixed of speaker screen design
DroidKaigi · Jan 18, 2019 · 3a8c32d · 3a8c32d
2 parents 80a406b + 290d260
commit 3a8c32d
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 8 deletions.
diff --git a/feature/session/src/main/res/layout/fragment_speaker.xml b/feature/session/src/main/res/layout/fragment_speaker.xml
@@ -23,9 +23,9 @@
             />
 
         <variable
-                name="timeZoneOffset"
-                type="com.soywiz.klock.DateTimeSpan"
-        />
+            name="timeZoneOffset"
+            type="com.soywiz.klock.DateTimeSpan"
+            />
     </data>
 
     <androidx.constraintlayout.widget.ConstraintLayout
@@ -47,7 +47,7 @@
                 android:layout_height="match_parent"
                 >
 
-                <androidx.emoji.widget.EmojiTextView
+                <androidx.emoji.widget.EmojiAppCompatTextView
                     android:id="@+id/speaker_name"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
@@ -71,7 +71,7 @@
                     android:layout_marginEnd="16dp"
                     android:layout_marginTop="4dp"
                     android:text="@{speaker.tagLine}"
-                    android:textAppearance="@style/TextAppearance.App.Subtitle2"
+                    android:textAppearance="@style/TextAppearance.App.Subtitle1"
                     android:textSize="16sp"
                     app:layout_constraintEnd_toStartOf="@id/speaker_image"
                     app:layout_constraintHorizontal_bias="0"
@@ -99,6 +99,8 @@
                     android:id="@+id/divider1"
                     android:layout_width="0dp"
                     android:layout_height="4dp"
+                    android:layout_marginEnd="16dp"
+                    android:layout_marginStart="16dp"
                     android:layout_marginTop="56dp"
                     android:contentDescription="@null"
                     android:layerType="software"
@@ -108,18 +110,19 @@
                     app:layout_constraintTop_toBottomOf="@id/speaker_tag_line"
                     />
 
-                <androidx.emoji.widget.EmojiTextView
-                    android:autoLink="web"
+                <androidx.emoji.widget.EmojiAppCompatTextView
                     android:id="@+id/speaker_description"
                     android:layout_width="0dp"
                     android:layout_height="wrap_content"
                     android:layout_marginEnd="16dp"
                     android:layout_marginTop="16dp"
+                    android:autoLink="web"
                     android:ellipsize="end"
                     android:includeFontPadding="false"
                     android:paddingBottom="2dp"
                     android:text="@{speaker.bio}"
                     android:textAlignment="viewStart"
+                    android:textAppearance="@style/TextAppearance.App.Body1"
                     app:layout_constraintEnd_toEndOf="parent"
                     app:layout_constraintStart_toStartOf="@id/speaker_name"
                     app:layout_constraintTop_toBottomOf="@id/divider1"
@@ -131,6 +134,8 @@
                     android:id="@+id/divider2"
                     android:layout_width="0dp"
                     android:layout_height="4dp"
+                    android:layout_marginEnd="16dp"
+                    android:layout_marginStart="16dp"
                     android:layout_marginTop="28dp"
                     android:contentDescription="@null"
                     android:layerType="software"
@@ -147,7 +152,7 @@
                     android:layout_height="wrap_content"
                     android:layout_marginTop="16dp"
                     android:text="@string/session_speaker_sessions"
-                    android:textAppearance="@style/TextAppearance.App.Subtitle1"
+                    android:textAppearance="@style/TextAppearance.Lekton.Subtitle1"
                     app:layout_constraintStart_toStartOf="@id/speaker_name"
                     app:layout_constraintTop_toBottomOf="@id/divider2"
                     />

diff --git a/frontendcomponent/androidcomponent/src/main/res/values/text_apperance.xml b/frontendcomponent/androidcomponent/src/main/res/values/text_apperance.xml
@@ -4,42 +4,49 @@
     <!-- Notosans Regular 24sp -->
     <style name="TextAppearance.App.Headline5" parent="TextAppearance.MaterialComponents.Headline5">
         <item name="android:fontFamily">@font/notosans_regular</item>
+        <item name="fontFamily">@font/notosans_regular</item>
         <item name="android:textColor">@color/gray1</item>
     </style>
 
     <!-- Notosans Medium 20sp -->
     <style name="TextAppearance.App.Headline6" parent="TextAppearance.MaterialComponents.Headline6">
         <item name="android:fontFamily">@font/notosans_medium</item>
+        <item name="fontFamily">@font/notosans_medium</item>
         <item name="android:textColor">@color/gray1</item>
     </style>
 
     <!-- Notosans Regular 16sp -->
     <style name="TextAppearance.App.Subtitle1" parent="TextAppearance.MaterialComponents.Subtitle1">
         <item name="android:fontFamily">@font/notosans_regular</item>
+        <item name="fontFamily">@font/notosans_regular</item>
         <item name="android:textColor">@color/gray1</item>
     </style>
 
     <!-- Notosans Medium 14sp -->
     <style name="TextAppearance.App.Subtitle2" parent="TextAppearance.MaterialComponents.Subtitle2">
         <item name="android:fontFamily">@font/notosans_medium</item>
+        <item name="fontFamily">@font/notosans_medium</item>
         <item name="android:textColor">@color/gray1</item>
     </style>
 
     <!-- Notosans Regular 16sp -->
     <style name="TextAppearance.App.Body1" parent="TextAppearance.MaterialComponents.Body1">
         <item name="android:fontFamily">@font/notosans_regular</item>
+        <item name="fontFamily">@font/notosans_regular</item>
         <item name="android:textColor">@color/gray1</item>
     </style>
 
     <!-- Notosans Regular 14sp -->
     <style name="TextAppearance.App.Body2" parent="TextAppearance.MaterialComponents.Body2">
         <item name="android:fontFamily">@font/notosans_regular</item>
+        <item name="fontFamily">@font/notosans_regular</item>
         <item name="android:textColor">@color/gray1</item>
     </style>
 
     <!-- Notosans Regular 12sp -->
     <style name="TextAppearance.App.Caption" parent="TextAppearance.MaterialComponents.Caption">
         <item name="android:fontFamily">@font/notosans_regular</item>
+        <item name="fontFamily">@font/notosans_regular</item>
         <item name="android:textColor">@color/gray1</item>
     </style>