Terminaños la sección de Types, aplicando las tipografías a todos los…

… elementos relevantes del sistema, como los headlines del 1 al 6 los subtitulos 1,2 bodys 1,2, botones, overlay, captions
hall9zeha · Jan 26, 2022 · 8d82add · 8d82add
1 parent d11cd6e
commit 8d82add
Show file tree

Hide file tree

Showing 9 changed files with 72 additions and 60 deletions.
diff --git a/MaterialComponents_Themes/MDTop/.idea/misc.xml b/MaterialComponents_Themes/MDTop/.idea/misc.xml
diff --git a/MaterialComponents_Themes/MDTop/app/src/main/res/font/comfortaa.xml b/MaterialComponents_Themes/MDTop/app/src/main/res/font/comfortaa.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<font-family xmlns:app="http://schemas.android.com/apk/res-auto"
+        app:fontProviderAuthority="com.google.android.gms.fonts"
+        app:fontProviderPackage="com.google.android.gms"
+        app:fontProviderQuery="Comfortaa"
+        app:fontProviderCerts="@array/com_google_android_gms_fonts_certs">
+</font-family>
diff --git a/MaterialComponents_Themes/MDTop/app/src/main/res/font/montserrat.xml b/MaterialComponents_Themes/MDTop/app/src/main/res/font/montserrat.xml
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="utf-8"?>
+<font-family xmlns:app="http://schemas.android.com/apk/res-auto"
+        app:fontProviderAuthority="com.google.android.gms.fonts"
+        app:fontProviderPackage="com.google.android.gms"
+        app:fontProviderQuery="Montserrat"
+        app:fontProviderCerts="@array/com_google_android_gms_fonts_certs">
+</font-family>
diff --git a/MaterialComponents_Themes/MDTop/app/src/main/res/layout/activity_detalle.xml b/MaterialComponents_Themes/MDTop/app/src/main/res/layout/activity_detalle.xml
@@ -20,11 +20,11 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent"
             app:title="@string/artist_hint_nombre"
-
+            app:collapsedTitleTextAppearance="@style/TextAppearance.MyTypes.Headline6"
             app:contentScrim="@color/collapsing_toolbar_color"
             app:layout_scrollFlags="scroll|exitUntilCollapsed"
             app:toolbarId="@+id/toolbar"
-            app:expandedTitleTextAppearance="@style/TextAppearance.Design.CollapsingToolbar.Expanded.Shadow">
+            app:expandedTitleTextAppearance="@style/CollapsingToolbarExpanded">
 
             <FrameLayout
                 android:layout_width="match_parent"
@@ -65,12 +65,13 @@
                     android:text="@string/artist_hint_nombre"
                     android:transitionName="@string/transitionName"
                     android:ellipsize="end"
+                    android:letterSpacing="0.0"
                     android:textColor="@color/gray_500"
-                    android:textSize="20sp"
+                    android:textAppearance="@style/TextAppearance.MyTypes.Headline5"
                     android:layout_gravity="start|bottom"
                     android:layout_marginStart="32dp"
                     android:layout_marginEnd="32dp"
-                    android:layout_marginBottom="26dp"
+                    android:layout_marginBottom="23.5dp"
                     />
                 <de.hdodenhof.circleimageview.CircleImageView
                     android:id="@id/imgFoto"

diff --git a/MaterialComponents_Themes/MDTop/app/src/main/res/layout/item_artist.xml b/MaterialComponents_Themes/MDTop/app/src/main/res/layout/item_artist.xml
@@ -27,7 +27,6 @@
         android:layout_height="wrap_content"
         android:layout_marginStart="@dimen/item_padding_horizontal"
         android:layout_marginEnd="@dimen/item_padding_horizontal"
-
         android:hint="@string/artist_hint_nombre"
         android:textAppearance="@style/ItemLarge"
         android:transitionName="@string/transitionName"
@@ -41,6 +40,8 @@
         android:id="@+id/tvNote"
         android:transitionName="@string/transitionNote"
         android:hint="@string/artist_hint_notas"
+        android:maxLines="2"
+        android:ellipsize="end"
         android:textAppearance="@style/ItemMedium"
         android:layout_marginBottom="8dp"
         app:layout_constraintStart_toStartOf="@id/tvNombre"

diff --git a/MaterialComponents_Themes/MDTop/app/src/main/res/values-night/themes.xml b/MaterialComponents_Themes/MDTop/app/src/main/res/values-night/themes.xml
@@ -21,13 +21,20 @@
         <item name="shapeAppearanceSmallComponent">@style/ShapeAppearance.MyTheme.SmallComponent</item>
         <item name="shapeAppearanceMediumComponent">@style/ShapeAppearance.MyTheme.MediumComponent</item>
         <item name="shapeAppearanceLargeComponent">@style/ShapeAppearance.MyTheme.LargeComponent</item>
-        <!--Types-->
+        <!--Types cambiando tipografía a diferentes elementos de la aplicación-->
         <item name="textAppearanceHeadline1">@style/TextAppearance.MyTypes.Headline1</item>
         <item name="textAppearanceHeadline2">@style/TextAppearance.MyTypes.Headline2</item>
         <item name="textAppearanceHeadline3">@style/TextAppearance.MyTypes.Headline3</item>
         <item name="textAppearanceHeadline4">@style/TextAppearance.MyTypes.Headline4</item>
         <item name="textAppearanceHeadline5">@style/TextAppearance.MyTypes.Headline5</item>
         <item name="textAppearanceHeadline6">@style/TextAppearance.MyTypes.Headline6</item>
+        <item name="textAppearanceSubtitle1">@style/TextAppearance.MyTypes.Subtitle1</item>
+        <item name="textAppearanceSubtitle2">@style/TextAppearance.MyTypes.Subtitle2</item>
+        <item name="textAppearanceBody1">@style/TextAppearance.MyTypes.Body1</item>
+        <item name="textAppearanceBody2">@style/TextAppearance.MyTypes.Body2</item>
+        <item name="textAppearanceButton">@style/TextAppearance.MyTypes.Button</item>
+        <item name="textAppearanceCaption">@style/TextAppearance.MyTypes.Caption</item>
+        <item name="textAppearanceOverline">@style/TextAppearance.MyTypes.Overline</item>
         <!--Transiciones y animaciones-->
         <!--  <item name="android:windowEnterTransition">@android:transition/slide_top</item>
           <item name="android:windowExitTransition">@android:transition/slide_bottom</item>-->
@@ -58,12 +65,12 @@
         <item name="android:windowLightStatusBar" tools:ignore="NewApi">false</item>
         <item name="android:navigationBarDividerColor" tools:ignore="NewApi">?colorControlHighlight</item>
     </style>
-    <style name="ItemLarge" parent="TextAppearance.MaterialComponents.Subtitle1">
+    <style name="ItemLarge" parent="TextAppearance.MyTypes.Subtitle1">
         <item name="android:maxLines">1</item>
         <item name="titleTextColor">?android:attr/textColorPrimary</item>
 
     </style>
-    <style name="ItemMedium" parent="TextAppearance.MaterialComponents.Body2">
+    <style name="ItemMedium" parent="TextAppearance.MyTypes.Body2">
         <item name="android:maxLines">2</item>
         <item name="android:textColor">?android:attr/textColorSecondary</item>
 

diff --git a/MaterialComponents_Themes/MDTop/app/src/main/res/values/preloaded_fonts.xml b/MaterialComponents_Themes/MDTop/app/src/main/res/values/preloaded_fonts.xml
@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <array name="preloaded_fonts" translatable="false">
+        <item>@font/comfortaa</item>
+        <item>@font/montserrat</item>
         <item>@font/roboto_condensed_regular</item>
     </array>
 </resources>
diff --git a/MaterialComponents_Themes/MDTop/app/src/main/res/values/themes.xml b/MaterialComponents_Themes/MDTop/app/src/main/res/values/themes.xml
@@ -29,6 +29,13 @@
         <item name="textAppearanceHeadline4">@style/TextAppearance.MyTypes.Headline4</item>
         <item name="textAppearanceHeadline5">@style/TextAppearance.MyTypes.Headline5</item>
         <item name="textAppearanceHeadline6">@style/TextAppearance.MyTypes.Headline6</item>
+        <item name="textAppearanceSubtitle1">@style/TextAppearance.MyTypes.Subtitle1</item>
+        <item name="textAppearanceSubtitle2">@style/TextAppearance.MyTypes.Subtitle2</item>
+        <item name="textAppearanceBody1">@style/TextAppearance.MyTypes.Body1</item>
+        <item name="textAppearanceBody2">@style/TextAppearance.MyTypes.Body2</item>
+        <item name="textAppearanceButton">@style/TextAppearance.MyTypes.Button</item>
+        <item name="textAppearanceCaption">@style/TextAppearance.MyTypes.Caption</item>
+        <item name="textAppearanceOverline">@style/TextAppearance.MyTypes.Overline</item>
         <!--Transiciones y animaciones-->
       <!--  <item name="android:windowEnterTransition">@android:transition/slide_top</item>
         <item name="android:windowExitTransition">@android:transition/slide_bottom</item>-->
@@ -58,18 +65,27 @@
     <style name="MyTheme.Transition" parent="Theme.MyTheme">
         <item name="android:windowEnterTransition">@transition/slide_end</item>
     </style>
+    <!--Collapsing toolbar-->
+    <style name="CollapsingToolbarExpanded" parent="TextAppearance.MyTypes.Headline5" >
+        <item name="android:shadowDy">2</item>
+        <item name="android:shadowDx">2</item>
+        <item name="android:shadowRadius">6</item>
+        <item name="android:shadowColor">@android:color/black</item>
+
+    </style>
+
     <style name="Base.Materialtheme"  parent="Theme.MaterialComponents.DayNight.NoActionBar">
         <!--<item name="android:statusBarColor">?colorPrimaryVariant</item>-->
         <item name="android:navigationBarColor">?android:colorBackground</item>
         <item name="android:windowLightNavigationBar" tools:ignore="NewApi">true</item>
         <item name="android:navigationBarDividerColor" tools:ignore="NewApi">?colorControlHighlight</item>
     </style>
-    <style name="ItemLarge" parent="TextAppearance.MaterialComponents.Subtitle1">
+    <style name="ItemLarge" parent="TextAppearance.MyTypes.Subtitle1">
         <item name="android:maxLines">1</item>
         <item name="titleTextColor">?android:attr/textColorPrimary</item>
 
     </style>
-    <style name="ItemMedium" parent="TextAppearance.MaterialComponents.Body2">
+    <style name="ItemMedium" parent="TextAppearance.MyTypes.Body2">
         <item name="android:maxLines">2</item>
         <item name="android:textColor">?android:attr/textColorSecondary</item>
 

diff --git a/MaterialComponents_Themes/MDTop/app/src/main/res/values/types.xml b/MaterialComponents_Themes/MDTop/app/src/main/res/values/types.xml
@@ -30,69 +30,40 @@
         <item name="android:fontFamily">@font/roboto_condensed_regular</item>
         <item name="android:textSize">20sp</item>
     </style>
-   <!-- <style name="TextAppearance.MyTypes.Headline1" parent="TextAppearance.MaterialComponents.Headline1">
-        <item name="fontFamily">@font/roboto_condensed_regular</item>
-        <item name="android:fontFamily">@font/roboto_condensed_regular</item>
-        <item name="android:textSize">112sp</item>
-    </style>
-    <style name="TextAppearance.MyTypes.Headline2" parent="TextAppearance.MaterialComponents.Headline2">
-        <item name="fontFamily">@font/roboto_condensed_regular</item>
-        <item name="android:fontFamily">@font/roboto_condensed_regular</item>
-        <item name="android:textSize">70sp</item>
-    </style>
-    <style name="TextAppearance.MyTypes.Headline3" parent="TextAppearance.MaterialComponents.Headline3">
-        <item name="fontFamily">@font/roboto_condensed_regular</item>
-        <item name="android:fontFamily">@font/roboto_condensed_regular</item>
-        <item name="android:textSize">56sp</item>
-    </style>
-    <style name="TextAppearance.MyTypes.Headline4" parent="TextAppearance.MaterialComponents.Headline4">
-        <item name="fontFamily">@font/roboto_condensed_regular</item>
-        <item name="android:fontFamily">@font/roboto_condensed_regular</item>
-        <item name="android:textSize">40sp</item>
-    </style>
-    <style name="TextAppearance.MyTypes.Headline5" parent="TextAppearance.MaterialComponents.Headline5">
-        <item name="fontFamily">@font/roboto_condensed_regular</item>
-        <item name="android:fontFamily">@font/roboto_condensed_regular</item>
-        <item name="android:textSize">28sp</item>
-    </style>
-    <style name="TextAppearance.MyTypes.Headline6" parent="TextAppearance.MaterialComponents.Headline6">
-        <item name="fontFamily">@font/roboto_condensed_regular</item>
-        <item name="android:fontFamily">@font/roboto_condensed_regular</item>
-        <item name="android:textSize">23sp</item>
-    </style>
     <style name="TextAppearance.MyTypes.Subtitle1" parent="TextAppearance.MaterialComponents.Subtitle1">
         <item name="fontFamily">@font/roboto_condensed_regular</item>
         <item name="android:fontFamily">@font/roboto_condensed_regular</item>
-        <item name="android:textSize">19sp</item>
+        <item name="android:textSize">16sp</item>
     </style>
     <style name="TextAppearance.MyTypes.Subtitle2" parent="TextAppearance.MaterialComponents.Subtitle2">
         <item name="fontFamily">@font/roboto_condensed_regular</item>
         <item name="android:fontFamily">@font/roboto_condensed_regular</item>
-        <item name="android:textSize">16sp</item>
+        <item name="android:textSize">14sp</item>
     </style>
     <style name="TextAppearance.MyTypes.Body1" parent="TextAppearance.MaterialComponents.Body1">
-        <item name="fontFamily">@font/anton</item>
-        <item name="android:fontFamily">@font/anton</item>
-        <item name="android:textSize">12sp</item>
+        <item name="fontFamily">@font/comfortaa</item>
+        <item name="android:fontFamily">@font/comfortaa</item>
+        <item name="android:textSize">16sp</item>
     </style>
     <style name="TextAppearance.MyTypes.Body2" parent="TextAppearance.MaterialComponents.Body2">
-        <item name="fontFamily">@font/anton</item>
-        <item name="android:fontFamily">@font/anton</item>
-        <item name="android:textSize">10sp</item>
+        <item name="fontFamily">@font/comfortaa</item>
+        <item name="android:fontFamily">@font/comfortaa</item>
+        <item name="android:textSize">12sp</item>
     </style>
     <style name="TextAppearance.MyTypes.Button" parent="TextAppearance.MaterialComponents.Button">
-        <item name="fontFamily">@font/anton</item>
-        <item name="android:fontFamily">@font/anton</item>
-        <item name="android:textSize">10sp</item>
+        <item name="fontFamily">@font/comfortaa</item>
+        <item name="android:fontFamily">@font/comfortaa</item>
+        <item name="android:textSize">14sp</item>
+        <item name="android:letterSpacing">0.04</item>
     </style>
-    <style name="TextAppearance.MyTypes.Caption" parent="TextAppearance.MaterialComponents.Caption">
-        <item name="fontFamily">@font/anton</item>
-        <item name="android:fontFamily">@font/anton</item>
-        <item name="android:textSize">9sp</item>
+       <style name="TextAppearance.MyTypes.Caption" parent="TextAppearance.MaterialComponents.Caption">
+        <item name="fontFamily">@font/comfortaa</item>
+        <item name="android:fontFamily">@font/comfortaa</item>
+        <item name="android:textSize">11sp</item>
     </style>
     <style name="TextAppearance.MyTypes.Overline" parent="TextAppearance.MaterialComponents.Overline">
-        <item name="fontFamily">@font/anton</item>
-        <item name="android:fontFamily">@font/anton</item>
-        <item name="android:textSize">7sp</item>
-    </style>-->
+        <item name="fontFamily">@font/comfortaa</item>
+        <item name="android:fontFamily">@font/comfortaa</item>
+        <item name="android:textSize">10sp</item>
+    </style>
 </resources>