diff options
Diffstat (limited to 'src/main/res')
-rw-r--r-- | src/main/res/layout/activity_recording.xml | 91 | ||||
-rw-r--r-- | src/main/res/values/attrs.xml | 1 | ||||
-rw-r--r-- | src/main/res/values/strings.xml | 1 | ||||
-rw-r--r-- | src/main/res/values/styles.xml | 6 | ||||
-rw-r--r-- | src/main/res/values/themes.xml | 45 |
5 files changed, 100 insertions, 44 deletions
diff --git a/src/main/res/layout/activity_recording.xml b/src/main/res/layout/activity_recording.xml index c8f83b0e0..35097fef4 100644 --- a/src/main/res/layout/activity_recording.xml +++ b/src/main/res/layout/activity_recording.xml @@ -1,52 +1,55 @@ <?xml version="1.0" encoding="utf-8"?> -<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:background="?attr/color_background_primary"> +<layout xmlns:android="http://schemas.android.com/apk/res/android"> - <LinearLayout - android:id="@+id/button_bar" - android:layout_width="fill_parent" + <RelativeLayout + android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_alignParentLeft="true" - android:layout_alignParentStart="true" - android:layout_below="@+id/timer"> + android:background="?attr/color_background_primary"> - <Button - android:id="@+id/cancel_button" - style="@style/Widget.Conversations.Button.Borderless" - android:layout_width="0dp" + <LinearLayout + android:id="@+id/button_bar" + android:layout_width="fill_parent" android:layout_height="wrap_content" - android:layout_weight="1" - android:text="@string/cancel" - android:textColor="?attr/colorAccent" /> + android:layout_alignParentLeft="true" + android:layout_alignParentStart="true" + android:layout_below="@+id/timer"> - <View - android:layout_width="1dp" - android:layout_height="fill_parent" - android:layout_marginBottom="7dp" - android:layout_marginTop="7dp" - android:textColor="?attr/colorAccent" /> + <Button + android:id="@+id/cancel_button" + style="@style/Widget.Conversations.Button.Borderless" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:text="@string/cancel" + android:textColor="?attr/colorAccent" /> - <Button - android:id="@+id/share_button" - style="@style/Widget.Conversations.Button.Borderless" - android:layout_width="0dp" - android:layout_height="wrap_content" - android:layout_weight="1" - android:text="@string/share" - android:textColor="?attr/colorAccent" /> - </LinearLayout> + <View + android:layout_width="1dp" + android:layout_height="fill_parent" + android:layout_marginBottom="7dp" + android:layout_marginTop="7dp" + android:textColor="?attr/colorAccent" /> - <TextView - android:id="@+id/timer" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_alignParentTop="true" - android:layout_centerHorizontal="true" - android:text="0:00.0" - android:textColor="?attr/colorAccent" - android:textSize="50sp" - android:textStyle="bold" - android:typeface="monospace" /> -</RelativeLayout>
\ No newline at end of file + <Button + android:id="@+id/share_button" + style="@style/Widget.Conversations.Button.Borderless" + android:layout_width="0dp" + android:layout_height="wrap_content" + android:layout_weight="1" + android:text="@string/share" + android:textColor="?attr/colorAccent" /> + </LinearLayout> + + <TextView + android:id="@+id/timer" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_alignParentTop="true" + android:layout_centerHorizontal="true" + android:text="0:00.0" + android:textColor="?attr/colorAccent" + android:textSize="50sp" + android:textStyle="bold" + android:typeface="monospace" /> + </RelativeLayout> +</layout>
\ No newline at end of file diff --git a/src/main/res/values/attrs.xml b/src/main/res/values/attrs.xml index f6c2e5fed..6cb9893ea 100644 --- a/src/main/res/values/attrs.xml +++ b/src/main/res/values/attrs.xml @@ -7,6 +7,7 @@ <attr name="TextSizeSubhead" format="dimension" /> <attr name="TextSizeBody1" format="dimension" /> <attr name="TextSizeBody2" format="dimension" /> + <attr name="TextSizeDisplay2" format="dimension"/> <attr name="TextSizeInput" format="dimension" /> <attr name="TextSeparation" format="dimension" /> <attr name="TextSizeBody" format="dimension" /> diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml index 3b176f4f3..585e87a4b 100644 --- a/src/main/res/values/strings.xml +++ b/src/main/res/values/strings.xml @@ -779,4 +779,5 @@ <string name="large">Large</string> <string name="create_shortcut">Create Shortcut</string> <string name="not_encrypted_for_this_device">Message was not encrypted for this device.</string> + <string name="no_microphone_permission">Conversations needs access to the microphone</string> </resources> diff --git a/src/main/res/values/styles.xml b/src/main/res/values/styles.xml index e3038c62e..e67e4db1e 100644 --- a/src/main/res/values/styles.xml +++ b/src/main/res/values/styles.xml @@ -1,5 +1,11 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android" xmlns:tools="http://schemas.android.com/tools"> + <style name="TextAppearance.Conversations.Display2.Monospace" parent="TextAppearance.AppCompat.Display2"> + <item name="android:textSize">?TextSizeDisplay2</item> + <item name="android:fontFamily" tools:targetApi="jelly_bean">monospace</item> + <item name="android:typeface">monospace</item> + </style> + <style name="TextAppearance.Conversations.Title" parent="TextAppearance.AppCompat.Title"> <item name="android:textSize">?TextSizeTitle</item> </style> diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml index 0eb408e09..2860b5c59 100644 --- a/src/main/res/values/themes.xml +++ b/src/main/res/values/themes.xml @@ -247,6 +247,7 @@ <item name="TextSizeCaption">12sp</item> <item name="TextSizeBody1">14sp</item> <item name="TextSizeBody2">14sp</item> + <item name="TextSizeDisplay2">45sp</item> <item name="TextSizeSubhead">16sp</item> <item name="TextSizeTitle">20sp</item> <item name="TextSizeInput">16sp</item> @@ -270,6 +271,7 @@ <item name="TextSizeCaption">12sp</item> <item name="TextSizeBody1">14sp</item> <item name="TextSizeBody2">14sp</item> + <item name="TextSizeDisplay2">45sp</item> <item name="TextSizeSubhead">16sp</item> <item name="TextSizeTitle">20sp</item> <item name="TextSizeInput">16sp</item> @@ -286,6 +288,49 @@ <item name="android:background">@color/grey900</item> </style> + + <style name="ConversationsTheme.Dialog" parent="@style/Theme.AppCompat.Light.Dialog"> + <item name="colorPrimary">@color/primary</item> + <item name="colorPrimaryDark">@color/primary_dark</item> + <item name="colorAccent">@color/accent</item> + <item name="color_background_primary">@color/grey50</item> + <item name="divider">@color/black12</item> + <item name="TextSizeBody2">14sp</item> + <item name="TextSizeDisplay2">45sp</item> + <item name="android:windowNoTitle">true</item> + </style> + + <style name="ConversationsTheme.Dark.Dialog" parent="@style/Theme.AppCompat.Dialog"> + <item name="colorPrimary">@color/primary</item> + <item name="colorPrimaryDark">@color/primary_dark</item> + <item name="colorAccent">@color/accent</item> + <item name="color_background_primary">@color/grey800</item> + <item name="divider">@color/white12</item> + <item name="TextSizeBody2">14sp</item> + <item name="TextSizeDisplay2">45sp</item> + <item name="android:windowNoTitle">true</item> + </style> + + <style name="ConversationsTheme.Dialog.Medium" parent="ConversationsTheme.Dialog"> + <item name="TextSizeBody2">16sp</item> + <item name="TextSizeDisplay2">51sp</item> + </style> + + <style name="ConversationsTheme.Dark.Dialog.Medium" parent="ConversationsTheme.Dark.Dialog"> + <item name="TextSizeBody2">16sp</item> + <item name="TextSizeDisplay2">51sp</item> + </style> + + <style name="ConversationsTheme.Dialog.Large" parent="ConversationsTheme.Dialog"> + <item name="TextSizeBody2">18sp</item> + <item name="TextSizeDisplay2">56sp</item> + </style> + + <style name="ConversationsTheme.Dark.Dialog.Large" parent="ConversationsTheme.Dark.Dialog"> + <item name="TextSizeBody2">18sp</item> + <item name="TextSizeTitle">56sp</item> + </style> + <style name="ConversationsTheme.FullScreen" parent="@style/Theme.AppCompat.Light"> <item name="colorPrimary">@color/primary</item> <item name="colorPrimaryDark">@color/primary_dark</item> |