Skip to content
Snippets Groups Projects
Commit bcf25dac authored by Emma Falkiewitz's avatar Emma Falkiewitz Committed by Adrien Béraud
Browse files

dimens: add standard text size

Change-Id: Id496bf13a2b5e8724f25481293eade13021c0f5a
parent 2e0ef123
No related branches found
No related tags found
No related merge requests found
......@@ -48,7 +48,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
android:layout_marginBottom="16dp"
android:layout_alignParentStart="true"
android:textColor="@color/colorPrimary"
android:textSize="18sp"
android:textSize="@dimen/text_size_xlarge"
android:textStyle="bold"
tools:text="@string/profile" />
......@@ -60,7 +60,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
android:layout_gravity="end"
android:layout_marginEnd="12dp"
android:textColor="@color/white"
android:textSize="12sp"
android:textSize="@dimen/text_size_small"
app:showText="true"
app:status="@string/account_status_offline" />
......@@ -125,7 +125,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
android:singleLine="true"
android:maxLines="1"
android:textColor="@color/colorPrimary"
android:textSize="18sp"
android:textSize="@dimen/text_size_xlarge"
android:textStyle="bold" />
<com.google.android.material.chip.Chip
......@@ -289,7 +289,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
android:gravity="center_vertical"
android:text="@string/menu_item_settings"
android:textColor="@color/colorPrimary"
android:textSize="18sp"
android:textSize="@dimen/text_size_xlarge"
android:textStyle="bold" />
<ListView
......
......@@ -121,7 +121,7 @@ along with this program; if not, write to the Free Software
android:text="@string/qr_code"
android:textColor="@color/colorPrimary"
android:textSize="16sp"
android:textSize="@dimen/text_size_large"
app:drawableStartCompat="@drawable/baseline_qr_code_2_black_24dp"
app:drawableTint="@color/colorPrimary" />
......@@ -147,7 +147,7 @@ along with this program; if not, write to the Free Software
android:drawablePadding="8dp"
android:text="@string/new_swarm"
android:textColor="@color/colorPrimary"
android:textSize="16sp"
android:textSize="@dimen/text_size_large"
app:drawableStartCompat="@drawable/baseline_group_add_24"
app:drawableTint="@color/colorPrimary" />
......
......@@ -99,7 +99,7 @@ along with this program; if not, write to the Free Software
android:textColor="@color/text_color_primary_dark"
android:textColorHighlight="@color/conversation_primary_selection"
android:textColorLink="@color/text_color_primary_dark"
android:textSize="16sp"
android:textSize="@dimen/text_size_large"
android:theme="@style/OutgoingTextView"
tools:text="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod" />
......@@ -127,7 +127,7 @@ along with this program; if not, write to the Free Software
android:textColorHighlight="@color/conversation_primary_selection"
android:textColorLink="@color/text_color_primary_dark"
android:textIsSelectable="true"
android:textSize="16sp"
android:textSize="@dimen/text_size_large"
android:theme="@style/OutgoingTextView"
tools:text="yo this is the test of a long long text can not be_found_message" />
......
......@@ -71,7 +71,7 @@ along with this program; if not, write to the Free Software
android:textColor="@color/colorOnSurface"
android:textColorHighlight="@color/conversation_primary_selection"
android:textColorLink="@color/text_color_primary_dark"
android:textSize="16sp"
android:textSize="@dimen/text_size_large"
android:visibility="gone"
tools:text="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod"
tools:visibility="visible" />
......@@ -99,7 +99,7 @@ along with this program; if not, write to the Free Software
android:textColor="@color/colorOnSurface"
android:textColorLink="@color/link_peer_color"
android:textIsSelectable="true"
android:textSize="16sp"
android:textSize="@dimen/text_size_large"
tools:text="Lorem ipsum dolor sit amet, consectetur adipiscing elit, sed do eiusmod" />
<include
......
......@@ -56,7 +56,7 @@ along with this program; if not, write to the Free Software
android:singleLine="true"
android:textAlignment="viewStart"
android:textColor="?attr/colorOnSurface"
android:textSize="15sp"
android:textSize="@dimen/text_size_medium"
android:textStyle="bold"
tools:text="Person Name" />
......@@ -73,7 +73,7 @@ along with this program; if not, write to the Free Software
android:maxLines="1"
android:textAlignment="viewStart"
android:textColor="@color/textColorSecondary"
android:textSize="13sp"
android:textSize="@dimen/text_size_small"
tools:text="Ongoing call of 56 secs" />
<TextView
......@@ -83,7 +83,7 @@ along with this program; if not, write to the Free Software
android:layout_below="@+id/conv_participant"
android:fontFamily="@font/ubuntu_regular"
android:textColor="?attr/colorOnSurface"
android:textSize="13sp"
android:textSize="@dimen/text_size_small"
android:textStyle="bold"
tools:text="2 days ago" />
......
......@@ -119,8 +119,8 @@ along with this program; if not, write to the Free Software
<dimen name="menu_icon_size">16dp</dimen>
<!-- JamiId -->
<dimen name="jami_id_small_font_size">14px</dimen>
<dimen name="jami_id_regular_font_size">20px</dimen>
<dimen name="jami_id_small_font_size">14dp</dimen>
<dimen name="jami_id_regular_font_size">20dp</dimen>
<dimen name="jami_id_edit_text_drawable_size">24dp</dimen>
<!-- WelcomeJami -->
......@@ -132,4 +132,10 @@ along with this program; if not, write to the Free Software
<dimen name="message_details_margin">18dp</dimen>
<dimen name="message_display_name_textsize">12sp</dimen>
<!--Text size-->
<dimen name="text_size_small">13sp</dimen>
<dimen name="text_size_medium">15sp</dimen>
<dimen name="text_size_large">16sp</dimen>
<dimen name="text_size_xlarge">18sp</dimen>
</resources>
\ No newline at end of file
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment