ui: update theme, add night mode support
Change-Id: Id7de59c49e45b0e914dae257b8f539537170300a
diff --git a/ring-android/app/src/main/res/layout/activity_account_settings.xml b/ring-android/app/src/main/res/layout/activity_account_settings.xml
index f410290..7b58296 100644
--- a/ring-android/app/src/main/res/layout/activity_account_settings.xml
+++ b/ring-android/app/src/main/res/layout/activity_account_settings.xml
@@ -21,9 +21,7 @@
android:minHeight="?attr/actionBarSize"
android:popupTheme="@style/Theme.MaterialComponents.Light.NoActionBar"
android:theme="@style/ThemeOverlay.MaterialComponents.Dark.ActionBar"
- android:titleTextAppearance="@style/ToolbarTitle"
- app:contentInsetStart="72dp"
- app:titleTextAppearance="@style/ToolbarTitle" />
+ app:contentInsetStart="72dp" />
<com.google.android.material.tabs.TabLayout
android:id="@+id/sliding_tabs"
diff --git a/ring-android/app/src/main/res/layout/activity_contact_details.xml b/ring-android/app/src/main/res/layout/activity_contact_details.xml
index 478509e..d86b981 100644
--- a/ring-android/app/src/main/res/layout/activity_contact_details.xml
+++ b/ring-android/app/src/main/res/layout/activity_contact_details.xml
@@ -5,23 +5,29 @@
xmlns:tools="http://schemas.android.com/tools"
tools:context=".client.ContactDetailsActivity">
- <data>
- <variable
- name="presenter"
- type="cx.ring.client.ContactDetailsActivity" />
- </data>
-
<androidx.coordinatorlayout.widget.CoordinatorLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:fitsSystemWindows="true">
+ <androidx.recyclerview.widget.RecyclerView
+ android:id="@+id/contact_action_list"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:clipToPadding="false"
+ android:nestedScrollingEnabled="true"
+ android:paddingTop="8dp"
+ app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
+ app:layout_behavior="@string/appbar_scrolling_view_behavior"
+ tools:listitem="@layout/item_contact_action" />
+
<com.google.android.material.appbar.AppBarLayout
android:id="@+id/app_bar"
+ style="@style/Widget.MaterialComponents.AppBarLayout.Surface"
android:layout_width="match_parent"
android:layout_height="@dimen/app_bar_height"
android:fitsSystemWindows="true"
- android:theme="@style/AppTheme.AppBarOverlay">
+ android:theme="@style/Theme.MaterialComponents">
<com.google.android.material.appbar.CollapsingToolbarLayout
android:id="@+id/toolbar_layout"
@@ -30,36 +36,31 @@
android:fitsSystemWindows="true"
app:contentScrim="?attr/colorPrimary"
app:layout_scrollFlags="scroll|exitUntilCollapsed"
- app:toolbarId="@+id/toolbar">
+ app:statusBarScrim="?attr/colorPrimary"
+ app:titleTextColor="@color/colorOnPrimary"
+ app:toolbarId="@id/toolbar"
+ android:elevation="@dimen/toolbar_elevation">
<ImageView
android:id="@+id/contact_image"
android:layout_width="match_parent"
android:layout_height="match_parent"
+ android:fitsSystemWindows="true"
android:scaleType="centerCrop"
app:layout_collapseMode="parallax"
tools:src="@drawable/jami_banner" />
- <androidx.appcompat.widget.Toolbar
+ <com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
app:layout_collapseMode="pin"
- app:popupTheme="@style/AppTheme.PopupOverlay" />
+ app:popupTheme="@style/AppTheme.PopupOverlay"
+ app:titleTextColor="@color/colorOnPrimary" />
</com.google.android.material.appbar.CollapsingToolbarLayout>
</com.google.android.material.appbar.AppBarLayout>
- <androidx.recyclerview.widget.RecyclerView
- android:paddingTop="8dp"
- android:id="@+id/contact_action_list"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:nestedScrollingEnabled="true"
- app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
- app:layout_behavior="@string/appbar_scrolling_view_behavior"
- tools:listitem="@layout/item_contact_action"/>
-
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/fab"
android:layout_width="wrap_content"
@@ -67,7 +68,14 @@
android:layout_margin="@dimen/fab_margin"
app:layout_anchor="@id/app_bar"
app:layout_anchorGravity="bottom|end"
- app:srcCompat="@drawable/ic_chat_white" />
+ app:srcCompat="@drawable/baseline_chat_24" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>
+
+ <data>
+
+ <variable
+ name="presenter"
+ type="cx.ring.client.ContactDetailsActivity" />
+ </data>
</layout>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/layout/activity_conversation.xml b/ring-android/app/src/main/res/layout/activity_conversation.xml
index 7bbbb84..a8dc8b0 100644
--- a/ring-android/app/src/main/res/layout/activity_conversation.xml
+++ b/ring-android/app/src/main/res/layout/activity_conversation.xml
@@ -1,33 +1,37 @@
<?xml version="1.0" encoding="utf-8"?>
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout
+ xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="#ebeff0"
tools:context=".client.ConversationActivity">
- <androidx.appcompat.widget.Toolbar
+ <com.google.android.material.appbar.AppBarLayout
+ android:id="@+id/toolbar_layout"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ app:layout_constraintTop_toTopOf="parent">
+
+ <com.google.android.material.appbar.MaterialToolbar
android:id="@+id/main_toolbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
- android:background="@color/color_primary_light"
android:elevation="4dp"
- android:minHeight="?attr/actionBarSize"
- android:popupTheme="@style/Theme.MaterialComponents.Light.NoActionBar"
- android:theme="@style/ThemeOverlay.MaterialComponents.Dark.ActionBar"
+ android:height="?attr/actionBarSize"
+ style="@style/Widget.MaterialComponents.Toolbar.Surface"
app:contentInsetStart="72dp"
app:elevation="4dp"
- app:subtitleTextAppearance="@style/TextAppearance.Widget.AppCompat.Toolbar.Subtitle"
- app:titleMarginStart="24dp"
- app:titleTextAppearance="@style/TextAppearance.Widget.AppCompat.Toolbar.Title" />
+ app:titleMarginStart="24dp"/>
+
+ </com.google.android.material.appbar.AppBarLayout>
<FrameLayout
android:id="@+id/main_frame"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@id/main_toolbar"
- android:layout_alignParentStart="true" />
-</RelativeLayout>
\ No newline at end of file
+ android:layout_alignParentStart="true"/>
+</androidx.coordinatorlayout.widget.CoordinatorLayout>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/layout/activity_home.xml b/ring-android/app/src/main/res/layout/activity_home.xml
index 39c21ce..356f3be 100644
--- a/ring-android/app/src/main/res/layout/activity_home.xml
+++ b/ring-android/app/src/main/res/layout/activity_home.xml
@@ -29,88 +29,71 @@
android:saveEnabled="false"
tools:context=".client.HomeActivity">
- <RelativeLayout
+ <androidx.coordinatorlayout.widget.CoordinatorLayout
android:id="@+id/content_frame"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:paddingEnd="0dp"
android:paddingStart="@dimen/drawer_content_padding">
- <androidx.appcompat.widget.Toolbar
- android:id="@+id/main_toolbar"
+ <com.google.android.material.appbar.AppBarLayout
+ android:id="@+id/app_bar"
+ style="@style/Widget.MaterialComponents.AppBarLayout.Surface"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_alignParentStart="true"
- android:layout_alignParentTop="true"
- android:background="@color/color_primary_light"
- android:elevation="@dimen/toolbar_elevation"
- android:minHeight="?attr/actionBarSize"
- android:popupTheme="@style/Theme.MaterialComponents.Light.NoActionBar"
- android:theme="@style/ThemeOverlay.MaterialComponents.Dark.ActionBar"
- android:titleTextAppearance="@style/ToolbarTitle"
- app:contentInsetStart="@dimen/toolbar_content_inset"
- app:elevation="@dimen/toolbar_elevation"
- app:titleTextAppearance="@style/ToolbarTitle" />
+ android:minHeight="?attr/actionBarSize">
- <LinearLayout
- android:id="@+id/toolbar_spacer"
- android:layout_width="match_parent"
- android:layout_height="72sp"
- android:layout_below="@+id/main_toolbar"
- android:background="@color/color_primary_light"
- android:elevation="@dimen/toolbar_elevation"
- android:gravity="center_vertical"
- android:orientation="horizontal"
- android:paddingEnd="0dp"
- android:paddingStart="@dimen/toolbar_content_inset"
- android:visibility="gone">
+ <com.google.android.material.appbar.CollapsingToolbarLayout
+ android:id="@+id/toolbar_layout"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ app:layout_scrollFlags="noScroll"
+ app:toolbarId="@id/toolbar"
+ app:collapsedTitleGravity="bottom"
+ app:titleTextColor="@color/textColorPrimary"
+ app:expandedTitleMarginStart="72dp"
+ app:expandedTitleTextAppearance="@style/TextAppearance.MaterialComponents.Headline6">
- <TextView
- android:id="@+id/toolbar_spacer_title"
- style="@style/ToolbarTitle"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/menu_item_accounts"
- android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" />
+ <com.google.android.material.appbar.MaterialToolbar
+ android:id="@+id/main_toolbar"
+ android:layout_width="match_parent"
+ android:layout_height="?attr/actionBarSize"
+ app:contentInsetStart="@dimen/toolbar_content_inset"
+ app:layout_collapseMode="pin"/>
+ </com.google.android.material.appbar.CollapsingToolbarLayout>
- </LinearLayout>
+ </com.google.android.material.appbar.AppBarLayout>
+
+ <com.google.android.material.floatingactionbutton.FloatingActionButton
+ android:id="@+id/action_button"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginStart="@dimen/fab_margin_mini"
+ app:elevation="6dp"
+ app:fabSize="mini"
+ app:layout_anchor="@id/app_bar"
+ app:layout_anchorGravity="bottom"
+ app:pressedTranslationZ="12dp"
+ app:rippleColor="@android:color/white"
+ app:srcCompat="@drawable/baseline_add_24" />
<FrameLayout
android:id="@+id/main_frame"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_alignParentStart="true"
- android:layout_below="@+id/toolbar_spacer"
- android:orientation="vertical" />
+ android:layout_below="@id/main_toolbar"
+ android:orientation="vertical"
+ app:layout_behavior="@string/appbar_scrolling_view_behavior" />
- <com.google.android.material.floatingactionbutton.FloatingActionButton
- android:id="@+id/action_button"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignBottom="@+id/toolbar_spacer"
- android:layout_alignParentStart="true"
- android:layout_marginStart="@dimen/action_button_lpadding"
- android:layout_marginBottom="@dimen/action_button_bpadding"
- android:adjustViewBounds="false"
- android:baselineAlignBottom="false"
- android:visibility="gone"
- app:elevation="6dp"
- app:fabSize="mini"
- app:pressedTranslationZ="12dp"
- app:rippleColor="@android:color/white"
- app:srcCompat="@drawable/ic_add_white" />
-
- </RelativeLayout>
+ </androidx.coordinatorlayout.widget.CoordinatorLayout>
<com.google.android.material.navigation.NavigationView
android:id="@+id/left_drawer"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:layout_gravity="start"
- android:fitsSystemWindows="true"
- android:theme="@style/AppThemeBase"
- android:windowBackground="@color/white"
- app:itemTextColor="?android:textColorPrimary">
+ android:fitsSystemWindows="true">
<FrameLayout
android:id="@+id/navigation_container"
diff --git a/ring-android/app/src/main/res/layout/activity_launch.xml b/ring-android/app/src/main/res/layout/activity_launch.xml
index 71b0568..1bcada3 100644
--- a/ring-android/app/src/main/res/layout/activity_launch.xml
+++ b/ring-android/app/src/main/res/layout/activity_launch.xml
@@ -2,7 +2,7 @@
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/white"
+ android:background="@color/background"
android:orientation="vertical"
android:padding="88dp">
diff --git a/ring-android/app/src/main/res/layout/activity_qrcode.xml b/ring-android/app/src/main/res/layout/activity_qrcode.xml
index 5a63250..d8a8ef1 100644
--- a/ring-android/app/src/main/res/layout/activity_qrcode.xml
+++ b/ring-android/app/src/main/res/layout/activity_qrcode.xml
@@ -10,22 +10,21 @@
android:id="@+id/qrAppBar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:theme="@style/AppTheme.AppBarOverlay">
+ android:elevation="@dimen/toolbar_elevation"
+ style="@style/Widget.MaterialComponents.AppBarLayout.Surface">
- <androidx.appcompat.widget.Toolbar
+ <com.google.android.material.appbar.MaterialToolbar
android:id="@+id/qrToolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:layout_weight="1"
- android:background="?attr/colorPrimary"
app:layout_scrollFlags="scroll|enterAlways"
app:popupTheme="@style/AppTheme" />
<com.google.android.material.tabs.TabLayout
android:id="@+id/tabs"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:background="?attr/colorPrimary" />
+ android:layout_height="wrap_content"/>
</com.google.android.material.appbar.AppBarLayout>
<androidx.viewpager.widget.ViewPager
diff --git a/ring-android/app/src/main/res/layout/activity_ringtone.xml b/ring-android/app/src/main/res/layout/activity_ringtone.xml
index c78ae12..6723e4b 100644
--- a/ring-android/app/src/main/res/layout/activity_ringtone.xml
+++ b/ring-android/app/src/main/res/layout/activity_ringtone.xml
@@ -89,7 +89,7 @@
android:layout_width="24dp"
android:layout_height="24dp"
android:layout_marginEnd="12dp"
- android:src="@drawable/ic_graphic_eq_black_24dp"
+ android:src="@drawable/baseline_graphic_eq_24"
android:tint="@color/color_primary_light"
android:visibility="invisible"
app:layout_constraintBottom_toBottomOf="parent"
diff --git a/ring-android/app/src/main/res/layout/add_new_device_layout.xml b/ring-android/app/src/main/res/layout/add_new_device_layout.xml
index a8f0d01..e0cb790 100644
--- a/ring-android/app/src/main/res/layout/add_new_device_layout.xml
+++ b/ring-android/app/src/main/res/layout/add_new_device_layout.xml
@@ -24,13 +24,12 @@
android:layout_gravity="bottom"
android:clipToPadding="false"
android:paddingTop="20dp"
- android:theme="@style/Wizard"
tools:showIn="@layout/frag_acc_summary">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="@color/color_primary_dark"
+ android:background="@color/colorPrimary"
android:elevation="4dp"
android:orientation="vertical">
@@ -41,7 +40,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:text="@string/account_link_export_button"
- android:textColor="@color/white" />
+ android:textColor="@color/colorOnPrimary" />
<cx.ring.views.LinkNewDeviceLayout
android:id="@+id/linkaccount_container"
@@ -66,9 +65,9 @@
android:paddingLeft="16dp"
android:paddingTop="5dp"
android:paddingRight="16dp"
- android:paddingBottom="0dp"
+ android:paddingBottom="8dp"
android:text="@string/account_link_export_info"
- android:textColor="@color/text_color_primary_dark"
+ android:textColor="@color/colorOnPrimary"
android:textIsSelectable="true"
android:textSize="14sp" />
@@ -76,8 +75,8 @@
android:id="@+id/password_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:textColorHint="@color/text_color_secondary_dark"
- app:passwordToggleTint="@color/text_color_secondary_dark"
+ android:textColorHint="@color/colorPrimary"
+ app:passwordToggleTint="@color/colorPrimary"
android:paddingLeft="16dp"
android:paddingRight="16dp"
app:passwordToggleEnabled="true">
@@ -87,19 +86,21 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:hint="@string/account_enter_password"
- android:textColor="@color/text_color_primary_dark"
- android:backgroundTint="@color/text_color_secondary_dark"
+ android:textColor="@color/colorPrimary"
+ android:backgroundTint="@color/colorOnPrimary"
android:imeOptions="actionDone"
android:inputType="textPassword" />
</com.google.android.material.textfield.TextInputLayout>
<com.google.android.material.button.MaterialButton
android:id="@+id/btn_start_export"
+ style="@style/Widget.MaterialComponents.Button"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:text="@string/account_start_export_button"
- android:textColor="@color/white" />
+ app:backgroundTint="@color/colorSecondary"
+ android:textColor="@color/colorOnSecondary"/>
<com.google.android.material.button.MaterialButton
android:id="@+id/btn_end_export"
@@ -108,7 +109,7 @@
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:text="@string/account_end_export_button"
- android:textColor="@color/white"
+ android:textColor="@color/colorOnPrimary"
android:visibility="gone" />
</LinearLayout>
diff --git a/ring-android/app/src/main/res/layout/camerapicker.xml b/ring-android/app/src/main/res/layout/camerapicker.xml
index 006a8e7..3333559 100644
--- a/ring-android/app/src/main/res/layout/camerapicker.xml
+++ b/ring-android/app/src/main/res/layout/camerapicker.xml
@@ -19,6 +19,6 @@
android:padding="16dp"
app:backgroundTint="@color/holo_green_dark"
app:rippleColor="@android:color/white"
- app:srcCompat="@drawable/ic_photo_camera"
+ app:srcCompat="@drawable/baseline_photo_camera_24"
app:useCompatPadding="true" />
</RelativeLayout>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/layout/dialog_profile.xml b/ring-android/app/src/main/res/layout/dialog_profile.xml
index 29045a2..c94ef3f 100644
--- a/ring-android/app/src/main/res/layout/dialog_profile.xml
+++ b/ring-android/app/src/main/res/layout/dialog_profile.xml
@@ -45,9 +45,11 @@
android:layout_toStartOf="@+id/anchor"
android:contentDescription="@string/open_the_gallery"
android:text="@string/open_the_gallery"
- app:backgroundTint="@color/light"
+ style="@style/Widget.MaterialComponents.FloatingActionButton"
+ app:tint="@color/colorPrimary"
+ app:backgroundTint="@color/surface"
app:rippleColor="@android:color/white"
- app:srcCompat="@drawable/ic_insert_photo" />
+ app:srcCompat="@drawable/baseline_insert_photo_24" />
<View
android:id="@+id/anchor"
@@ -64,9 +66,11 @@
android:layout_toEndOf="@+id/anchor"
android:contentDescription="@string/take_a_photo"
android:text="@string/take_a_photo"
- app:backgroundTint="@color/light"
+ app:tint="@color/colorPrimary"
+ style="@style/Widget.MaterialComponents.FloatingActionButton"
+ app:backgroundTint="@color/surface"
app:rippleColor="@android:color/white"
- app:srcCompat="@drawable/ic_photo_camera" />
+ app:srcCompat="@drawable/baseline_photo_camera_24" />
</RelativeLayout>
diff --git a/ring-android/app/src/main/res/layout/frag_about.xml b/ring-android/app/src/main/res/layout/frag_about.xml
index cfc03e9..173dd4e 100644
--- a/ring-android/app/src/main/res/layout/frag_about.xml
+++ b/ring-android/app/src/main/res/layout/frag_about.xml
@@ -58,7 +58,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/version_section"
- android:textColor="@color/color_primary_dark"
+ android:textColor="@color/textColorAccent"
android:textSize="18sp" />
<TextView
@@ -84,7 +84,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/contribute_section"
- android:textColor="@color/color_primary_dark"
+ android:textColor="@color/textColorAccent"
android:textSize="18sp" />
<TextView
@@ -107,7 +107,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/copyright_section"
- android:textColor="@color/color_primary_dark"
+ android:textColor="@color/textColorAccent"
android:textSize="18sp" />
<TextView
@@ -134,7 +134,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/section_license"
- android:textColor="@color/color_primary_dark"
+ android:textColor="@color/textColorAccent"
android:textSize="18sp" />
<TextView
@@ -162,7 +162,7 @@
android:layout_height="wrap_content"
android:clickable="false"
android:text="@string/feedback_section"
- android:textColor="@color/color_primary_dark"
+ android:textColor="@color/textColorAccent"
android:textSize="18sp" />
<TextView
@@ -187,7 +187,7 @@
android:layout_height="wrap_content"
android:gravity="center_vertical"
android:text="@string/sponsor_section"
- android:textColor="@color/color_primary_dark"
+ android:textColor="@color/textColorAccent"
android:textSize="15sp" />
<ImageView
@@ -203,15 +203,14 @@
</LinearLayout>
- <androidx.appcompat.widget.AppCompatButton
+ <com.google.android.material.button.MaterialButton
android:id="@+id/credits"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:paddingLeft="24dp"
android:paddingRight="24dp"
- android:text="@string/credits"
- android:theme="@style/ButtonColoredInverse" />
+ android:text="@string/credits" />
</LinearLayout>
</ScrollView>
diff --git a/ring-android/app/src/main/res/layout/frag_acc_home_create.xml b/ring-android/app/src/main/res/layout/frag_acc_home_create.xml
index 5856b82..ebb8d10 100644
--- a/ring-android/app/src/main/res/layout/frag_acc_home_create.xml
+++ b/ring-android/app/src/main/res/layout/frag_acc_home_create.xml
@@ -35,26 +35,25 @@
android:paddingRight="16dp"
android:paddingBottom="24dp"
android:text="@string/help_ring"
- android:textColor="@color/text_color_primary"
android:textSize="14sp" />
<com.google.android.material.button.MaterialButton
android:id="@+id/ring_create_btn"
+ style="@style/Widget.MaterialComponents.Button"
android:layout_width="300dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginBottom="16dp"
- android:text="@string/account_new_button"
- android:theme="@style/ButtonColored" />
+ android:text="@string/account_new_button" />
<com.google.android.material.button.MaterialButton
android:id="@+id/ring_add_account"
+ style="@style/Widget.MaterialComponents.Button"
android:layout_width="300dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginBottom="16dp"
- android:text="@string/account_link_button"
- android:theme="@style/ButtonColored" />
+ android:text="@string/account_link_button" />
<com.google.android.material.button.MaterialButton
android:id="@+id/ring_import_account"
diff --git a/ring-android/app/src/main/res/layout/frag_acc_import_archive.xml b/ring-android/app/src/main/res/layout/frag_acc_import_archive.xml
index 69a0bc3..77cc965 100644
--- a/ring-android/app/src/main/res/layout/frag_acc_import_archive.xml
+++ b/ring-android/app/src/main/res/layout/frag_acc_import_archive.xml
@@ -3,8 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:theme="@style/Wizard">
+ android:layout_height="match_parent">
<cx.ring.views.BoundedScrollView
android:id="@+id/scrollview"
@@ -31,7 +30,6 @@
android:layout_marginBottom="24dp"
android:paddingStart="4dp"
android:text="@string/account_link_title"
- android:textColor="@color/text_color_primary"
android:textSize="24sp" />
<TextView
@@ -42,7 +40,6 @@
android:paddingEnd="4dp"
android:paddingBottom="8dp"
android:text="@string/help_password_enter"
- android:textColor="@color/text_color_primary"
android:textSize="14sp" />
<com.google.android.material.textfield.TextInputLayout
@@ -68,7 +65,6 @@
android:paddingEnd="16dp"
android:paddingBottom="8dp"
android:text="@string/help_pin_enter"
- android:textColor="@color/text_color_primary"
android:textSize="14sp" />
<com.google.android.material.textfield.TextInputLayout
diff --git a/ring-android/app/src/main/res/layout/frag_acc_profile_create.xml b/ring-android/app/src/main/res/layout/frag_acc_profile_create.xml
index a95b4bd..21df94f 100644
--- a/ring-android/app/src/main/res/layout/frag_acc_profile_create.xml
+++ b/ring-android/app/src/main/res/layout/frag_acc_profile_create.xml
@@ -3,8 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:theme="@style/Wizard">
+ android:layout_height="match_parent">
<cx.ring.views.BoundedScrollView
android:id="@+id/scrollview"
@@ -31,7 +30,6 @@
android:layout_marginTop="24dp"
android:gravity="center"
android:text="@string/account_creation_profile"
- android:textColor="@color/text_color_primary"
android:textSize="24sp" />
<TextView
@@ -70,7 +68,7 @@
android:text="@string/take_a_photo"
app:backgroundTint="@color/light"
app:rippleColor="@android:color/white"
- app:srcCompat="@drawable/ic_photo_camera" />
+ app:srcCompat="@drawable/baseline_photo_camera_24" />
<Space
android:id="@+id/anchor"
@@ -89,7 +87,7 @@
android:text="@string/open_the_gallery"
app:backgroundTint="@color/light"
app:rippleColor="@android:color/white"
- app:srcCompat="@drawable/ic_insert_photo" />
+ app:srcCompat="@drawable/baseline_insert_photo_24" />
</RelativeLayout>
@@ -105,9 +103,7 @@
android:paddingEnd="16dp"
android:paddingStart="16dp"
android:paddingTop="16dp"
- android:textAlignment="center"
- android:textColor="@color/text_color_primary"
- android:textColorHint="@color/text_color_primary" />
+ android:textAlignment="center" />
</LinearLayout>
diff --git a/ring-android/app/src/main/res/layout/frag_acc_ring_create.xml b/ring-android/app/src/main/res/layout/frag_acc_ring_create.xml
index 41a2ac9..78b9d7f 100644
--- a/ring-android/app/src/main/res/layout/frag_acc_ring_create.xml
+++ b/ring-android/app/src/main/res/layout/frag_acc_ring_create.xml
@@ -4,7 +4,6 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:theme="@style/Wizard"
tools:context="cx.ring.account.AccountWizardActivity">
<cx.ring.views.BoundedScrollView
@@ -32,7 +31,6 @@
android:layout_marginTop="24dp"
android:layout_marginBottom="24dp"
android:text="@string/account_creation_ring"
- android:textColor="@color/text_color_primary"
android:textSize="24sp" />
<Switch
@@ -42,8 +40,7 @@
android:checked="true"
android:paddingTop="16dp"
android:paddingBottom="16dp"
- android:text="@string/register_username"
- android:textColor="@color/text_color_primary" />
+ android:text="@string/register_username" />
<androidx.constraintlayout.widget.ConstraintLayout
android:id="@+id/ring_username_box"
@@ -105,8 +102,7 @@
android:layout_height="wrap_content"
android:paddingTop="16dp"
android:paddingBottom="16dp"
- android:text="Choose a password for enhanced security"
- android:textColor="@color/text_color_primary" />
+ android:text="Choose a password for enhanced security" />
<LinearLayout
android:id="@+id/ring_password_box"
@@ -120,8 +116,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
- android:text="@string/help_password_choose"
- android:textColor="@color/text_color_primary" />
+ android:text="@string/help_password_choose" />
<com.google.android.material.textfield.TextInputLayout
android:id="@+id/password_txt_box"
@@ -163,8 +158,7 @@
android:checked="true"
android:paddingTop="16dp"
android:paddingBottom="16dp"
- android:text="Use push notifications"
- android:textColor="@color/text_color_primary" />
+ android:text="Use push notifications" />
</LinearLayout>
diff --git a/ring-android/app/src/main/res/layout/frag_acc_ring_link.xml b/ring-android/app/src/main/res/layout/frag_acc_ring_link.xml
index 9b616b7..8ed012a 100644
--- a/ring-android/app/src/main/res/layout/frag_acc_ring_link.xml
+++ b/ring-android/app/src/main/res/layout/frag_acc_ring_link.xml
@@ -3,8 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:theme="@style/Wizard">
+ android:layout_height="match_parent">
<cx.ring.views.BoundedScrollView
android:id="@+id/scrollview"
@@ -31,7 +30,6 @@
android:layout_marginBottom="24dp"
android:paddingStart="4dp"
android:text="@string/account_link_title"
- android:textColor="@color/text_color_primary"
android:textSize="24sp" />
<TextView
@@ -42,7 +40,6 @@
android:paddingEnd="4dp"
android:paddingBottom="8dp"
android:text="@string/help_password_enter"
- android:textColor="@color/text_color_primary"
android:textSize="14sp" />
<com.google.android.material.textfield.TextInputLayout
@@ -70,7 +67,6 @@
android:paddingEnd="16dp"
android:paddingBottom="8dp"
android:text="@string/help_pin_enter"
- android:textColor="@color/text_color_primary"
android:textSize="14sp" />
<com.google.android.material.textfield.TextInputLayout
diff --git a/ring-android/app/src/main/res/layout/frag_acc_sip_create.xml b/ring-android/app/src/main/res/layout/frag_acc_sip_create.xml
index 941b521..8a7c8c6 100644
--- a/ring-android/app/src/main/res/layout/frag_acc_sip_create.xml
+++ b/ring-android/app/src/main/res/layout/frag_acc_sip_create.xml
@@ -24,7 +24,6 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:theme="@style/Wizard"
android:orientation="vertical">
<cx.ring.views.BoundedScrollView
@@ -49,7 +48,7 @@
android:layout_marginTop="24dp"
android:layout_marginBottom="16dp"
android:text="@string/help_sip_title"
- android:textColor="@color/text_color_primary"
+ android:textColor="@color/textColorPrimary"
android:textSize="24sp" />
<TextView
@@ -58,7 +57,7 @@
android:layout_marginTop="16dp"
android:layout_marginBottom="16dp"
android:text="@string/help_sip"
- android:textColor="@color/text_color_primary"
+ android:textColor="@color/textColorPrimary"
android:textSize="14sp" />
<com.google.android.material.textfield.TextInputLayout
diff --git a/ring-android/app/src/main/res/layout/frag_acc_summary.xml b/ring-android/app/src/main/res/layout/frag_acc_summary.xml
index 46cb534..116de4e 100644
--- a/ring-android/app/src/main/res/layout/frag_acc_summary.xml
+++ b/ring-android/app/src/main/res/layout/frag_acc_summary.xml
@@ -224,7 +224,7 @@
android:id="@+id/device_list"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:divider="#DDDDDD"
+ android:divider="@color/surface"
android:dividerHeight="1dp"
android:footerDividersEnabled="true"
android:headerDividersEnabled="true"
@@ -238,7 +238,7 @@
android:gravity="center"
android:text="@string/empty_account_list"
android:textAppearance="?android:attr/textAppearanceMedium"
- android:textColor="@color/text_color_secondary"
+ android:textColor="@color/textColorSecondary"
android:visibility="gone" />
</FrameLayout>
diff --git a/ring-android/app/src/main/res/layout/frag_account_migration.xml b/ring-android/app/src/main/res/layout/frag_account_migration.xml
index 14bc5ed..94f836d 100644
--- a/ring-android/app/src/main/res/layout/frag_account_migration.xml
+++ b/ring-android/app/src/main/res/layout/frag_account_migration.xml
@@ -26,18 +26,19 @@
tools:context=".account.AccountWizardActivity">
<cx.ring.views.BoundedLinearLayout
- style="@style/AccountFormContainer"
android:layout_gravity="center_horizontal"
android:animateLayoutChanges="false"
android:descendantFocusability="beforeDescendants"
android:focusableInTouchMode="true"
android:orientation="vertical"
- app:bounded_width="320dp">
+ app:bounded_width="320dp"
+ android:layout_height="wrap_content"
+ android:layout_width="wrap_content">
<androidx.cardview.widget.CardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_marginBottom="16dp"
+ android:layout_margin="16dp"
android:animateLayoutChanges="false">
<RelativeLayout
@@ -67,7 +68,7 @@
android:paddingRight="16dp"
android:paddingTop="24dp"
android:text="@string/ring_account"
- android:textColor="@color/text_color_primary"
+ android:textColor="@color/textColorPrimary"
android:textSize="24sp" />
<TextView
@@ -81,50 +82,39 @@
android:paddingRight="16dp"
android:paddingTop="16dp"
android:text="@string/account_migration"
- android:textColor="@color/text_color_primary"
+ android:textColor="@color/textColorPrimary"
android:textSize="14sp" />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@id/textView"
- android:background="@color/color_primary_light"
android:orientation="vertical">
- <LinearLayout
+ <com.google.android.material.textfield.TextInputLayout
android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:background="@color/color_primary_light"
- android:orientation="vertical">
+ android:layout_height="wrap_content"
+ app:passwordToggleEnabled="true">
- <com.google.android.material.textfield.TextInputLayout
+ <com.google.android.material.textfield.TextInputEditText
+ android:id="@+id/ring_password"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- app:passwordToggleEnabled="true">
+ android:layout_marginBottom="8dp"
+ android:layout_marginLeft="12dp"
+ android:layout_marginRight="12dp"
+ android:hint="@string/prompt_password"
+ android:imeOptions="actionNext"
+ android:inputType="textPassword" />
+ </com.google.android.material.textfield.TextInputLayout>
- <com.google.android.material.textfield.TextInputEditText
- android:id="@+id/ring_password"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_marginBottom="8dp"
- android:layout_marginLeft="12dp"
- android:layout_marginRight="12dp"
- android:hint="@string/prompt_password"
- android:imeOptions="actionNext"
- android:inputType="textPassword" />
- </com.google.android.material.textfield.TextInputLayout>
-
- </LinearLayout>
-
- <Button
+ <com.google.android.material.button.MaterialButton
android:id="@+id/ring_migrate_btn"
- style="?attr/borderlessButtonStyle"
+ style="@style/Widget.MaterialComponents.Button.TextButton.Dialog.Flush"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
- android:background="?android:attr/selectableItemBackground"
- android:text="@string/update_account"
- android:textColor="@color/text_color_primary_dark" />
+ android:text="@string/update_account" />
</LinearLayout>
</RelativeLayout>
diff --git a/ring-android/app/src/main/res/layout/frag_accounts_list.xml b/ring-android/app/src/main/res/layout/frag_accounts_list.xml
index 0fc4641..151b891 100644
--- a/ring-android/app/src/main/res/layout/frag_accounts_list.xml
+++ b/ring-android/app/src/main/res/layout/frag_accounts_list.xml
@@ -40,7 +40,7 @@
<FrameLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="@color/white"
+ android:background="?android:attr/colorBackground"
android:clipToPadding="false"
android:elevation="2dp">
@@ -49,20 +49,20 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:dividerHeight="1px"
- android:visibility="visible"
android:focusable="false"
- android:nestedScrollingEnabled="false"/>
+ android:nestedScrollingEnabled="false"
+ android:visibility="visible"
+ tools:listitem="@layout/item_account_pref" />
<TextView
android:id="@+id/empty_account_list"
android:layout_width="wrap_content"
android:layout_height="72dp"
- android:layout_centerInParent="true"
android:layout_gravity="center"
android:gravity="center"
android:text="@string/empty_account_list"
android:textAppearance="?android:attr/textAppearanceMedium"
- android:textColor="@color/text_color_secondary"
+ android:textColor="@color/textColorSecondary"
android:visibility="gone" />
</FrameLayout>
diff --git a/ring-android/app/src/main/res/layout/frag_call.xml b/ring-android/app/src/main/res/layout/frag_call.xml
index dbfbf60..cba46e4 100644
--- a/ring-android/app/src/main/res/layout/frag_call.xml
+++ b/ring-android/app/src/main/res/layout/frag_call.xml
@@ -183,7 +183,7 @@
app:fabSize="normal"
app:pressedTranslationZ="12dp"
app:rippleColor="@android:color/white"
- app:srcCompat="@drawable/ic_call_white"
+ app:srcCompat="@drawable/baseline_call_24"
app:useCompatPadding="true" />
</LinearLayout>
@@ -211,7 +211,7 @@
android:onClick="@{() -> presenter.cameraFlip()}"
android:padding="16dp"
android:tint="@color/white"
- app:srcCompat="@drawable/ic_camera_front_white" />
+ app:srcCompat="@drawable/baseline_camera_front_24" />
<cx.ring.views.CheckableImageButton
android:id="@+id/call_mic_btn"
diff --git a/ring-android/app/src/main/res/layout/frag_conversation.xml b/ring-android/app/src/main/res/layout/frag_conversation.xml
index 053a112..e5fc3bd 100644
--- a/ring-android/app/src/main/res/layout/frag_conversation.xml
+++ b/ring-android/app/src/main/res/layout/frag_conversation.xml
@@ -3,267 +3,285 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools">
- <data>
+ <FrameLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ tools:context=".client.ConversationActivity">
+ <RelativeLayout
+ android:id="@+id/conversationLayout"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="@color/background"
+ android:clipToPadding="false"
+ android:paddingTop="?attr/actionBarSize">
+
+ <LinearLayout
+ android:id="@+id/trustRequestMessageLayout"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignParentTop="true"
+ android:orientation="vertical"
+ android:visibility="visible">
+
+ <TextView
+ android:id="@+id/tvTrustRequestMessage"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:background="@color/surface"
+ android:textColor="@color/textColorPrimary"
+ android:gravity="center"
+ android:padding="30dp"
+ tools:text="Jean is not in your contacts yet" />
+
+ <View
+ android:layout_width="match_parent"
+ android:layout_height="1dp"
+ android:background="@color/lighter_gray" />
+
+ </LinearLayout>
+
+ <LinearLayout
+ android:id="@+id/ongoingcall_pane"
+ android:layout_width="match_parent"
+ android:layout_height="48dp"
+ android:background="#e3c1c1"
+ android:gravity="center"
+ android:onClick="@{() -> presenter.onClick()}"
+ android:visibility="gone">
+
+ <TextView
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_margin="10dp"
+ android:text="@string/conversation_action_go_to_call"
+ android:textAppearance="?android:attr/textAppearanceMedium"
+ android:textColor="@color/textColorPrimary" />
+ </LinearLayout>
+
+ <ProgressBar
+ android:id="@+id/pb_loading"
+ android:layout_width="64dp"
+ android:layout_height="64dp"
+ android:layout_centerInParent="true"
+ android:indeterminate="true" />
+
+ <androidx.recyclerview.widget.RecyclerView
+ android:id="@+id/hist_list"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_below="@+id/trustRequestMessageLayout"
+ android:layout_alignParentStart="true"
+ android:layout_alignParentEnd="true"
+ android:layout_alignParentBottom="true"
+ android:clipToPadding="false"
+ android:divider="@null"
+ android:listSelector="@color/transparent"
+ android:paddingTop="8dp"
+ android:paddingBottom="60dp"
+ android:transcriptMode="normal"
+ app:layoutManager="LinearLayoutManager"
+ app:stackFromEnd="true"
+ tools:listitem="@layout/item_conv_msg_peer" />
+
+ </RelativeLayout>
+
+ <RelativeLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:clipToPadding="false"
+ android:fitsSystemWindows="true">
+
+ <androidx.cardview.widget.CardView
+ android:id="@+id/unknownContactPrompt"
+ style="?android:attr/buttonBarStyle"
+ android:layout_width="match_parent"
+ android:layout_height="42dp"
+ android:layout_alignParentBottom="true"
+ android:layout_marginLeft="8dp"
+ android:layout_marginRight="8dp"
+ android:layout_marginBottom="12dp"
+ android:padding="0dp"
+ android:visibility="gone"
+ app:cardBackgroundColor="#4CAF50"
+ app:cardCornerRadius="@dimen/conversation_message_input_radius">
+
+ <Button
+ android:id="@+id/btnAddContact"
+ style="@style/Widget.MaterialComponents.Button.TextButton"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_margin="0dp"
+ android:background="?attr/selectableItemBackground"
+ android:gravity="center"
+ android:onClick="@{() -> presenter.addContact()}"
+ android:padding="0dp"
+ android:text="@string/ab_action_contact_add"
+ android:textColor="@color/white" />
+ </androidx.cardview.widget.CardView>
+
+ <androidx.cardview.widget.CardView
+ android:id="@+id/trustRequestPrompt"
+ style="?android:attr/buttonBarStyle"
+ android:layout_width="match_parent"
+ android:layout_height="42dp"
+ android:layout_alignParentBottom="true"
+ android:layout_marginLeft="8dp"
+ android:layout_marginRight="8dp"
+ android:layout_marginBottom="12dp"
+ android:padding="0dp"
+ android:visibility="gone"
+ app:cardCornerRadius="@dimen/conversation_message_input_radius">
+
+ <LinearLayout
+ style="?android:attr/buttonBarStyle"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:layout_margin="0dp"
+ android:orientation="horizontal"
+ android:padding="0dp"
+ android:weightSum="3">
+
+ <Button
+ android:id="@+id/btnBlock"
+ style="@style/Widget.MaterialComponents.Button.TextButton"
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="1"
+ android:background="?attr/selectableItemBackground"
+ android:gravity="center"
+ android:onClick="@{() -> presenter.blockContactRequest()}"
+ android:text="@string/block"
+ android:textColor="@color/color_primary_dark" />
+
+ <Button
+ android:id="@+id/btnRefuse"
+ style="@style/Widget.MaterialComponents.Button.TextButton"
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="1"
+ android:background="?attr/selectableItemBackground"
+ android:gravity="center"
+ android:onClick="@{() -> presenter.refuseContactRequest()}"
+ android:text="@string/refuse"
+ android:textColor="@color/color_primary_dark" />
+
+ <Button
+ android:id="@+id/btnAccept"
+ style="@style/Widget.MaterialComponents.Button.TextButton"
+ android:layout_width="0dp"
+ android:layout_height="match_parent"
+ android:layout_weight="1"
+ android:background="?attr/selectableItemBackground"
+ android:gravity="center"
+ android:onClick="@{() -> presenter.acceptContactRequest()}"
+ android:text="@string/accept"
+ android:textColor="#4CAF50" />
+ </LinearLayout>
+ </androidx.cardview.widget.CardView>
+
+ <androidx.cardview.widget.CardView
+ android:id="@+id/cvMessageInput"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_alignParentBottom="true"
+ android:layout_marginLeft="8dp"
+ android:layout_marginRight="8dp"
+ android:layout_marginBottom="8dp"
+ android:visibility="gone"
+ app:cardCornerRadius="@dimen/conversation_message_input_radius"
+ app:cardElevation="4dp"
+ tools:visibility="visible">
+
+ <LinearLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:gravity="center"
+ android:orientation="horizontal"
+ android:paddingStart="4dp">
+
+ <ImageButton
+ android:id="@+id/send_data"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:background="?selectableItemBackgroundBorderless"
+ android:contentDescription="@string/send_file"
+ android:onClick="@{() -> presenter.selectFile()}"
+ android:padding="8dp"
+ android:tint="@android:color/darker_gray"
+ app:srcCompat="@drawable/baseline_upload_24" />
+
+ <ImageButton
+ android:id="@+id/btn_take_picture"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:layout_marginEnd="5dp"
+ android:background="?selectableItemBackgroundBorderless"
+ android:contentDescription="@string/take_a_photo"
+ android:onClick="@{() -> presenter.takePicture()}"
+ android:padding="8dp"
+ android:tint="@android:color/darker_gray"
+ app:srcCompat="@drawable/baseline_photo_camera_24" />
+
+ <ProgressBar
+ android:id="@+id/pb_data_transfer"
+ android:layout_width="30dp"
+ android:layout_height="30dp"
+ android:indeterminate="true"
+ android:visibility="gone" />
+
+ <Spinner
+ android:id="@+id/number_selector"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:visibility="gone"
+ tools:listitem="@layout/item_number_selected" />
+
+ <cx.ring.views.MessageEditText
+ android:id="@+id/msg_input_txt"
+ android:layout_width="0dp"
+ android:layout_height="wrap_content"
+ android:layout_weight="1"
+ android:background="@null"
+ android:hint="@string/write_a_message"
+ android:imeOptions="actionSend|flagNoExtractUi"
+ android:importantForAutofill="no"
+ android:inputType="textShortMessage|textImeMultiLine|text|textMultiLine|textCapSentences"
+ android:maxLines="5"
+ android:padding="8dp" />
+
+ <TextView
+ android:id="@+id/emoji_send"
+ style="?attr/borderlessButtonStyle"
+ android:layout_width="50dp"
+ android:layout_height="match_parent"
+ android:background="?selectableItemBackgroundBorderless"
+ android:onClick="@{() -> presenter.sendEmoji()}"
+ android:padding="0dp"
+ android:text="@string/conversation_default_emoji"
+ android:textSize="18sp" />
+
+ <ImageButton
+ android:id="@+id/msg_send"
+ android:layout_width="wrap_content"
+ android:layout_height="match_parent"
+ android:background="?selectableItemBackgroundBorderless"
+ android:contentDescription="@string/send_message"
+ android:onClick="@{() -> presenter.sendMessageText()}"
+ android:padding="8dp"
+ android:tint="@android:color/darker_gray"
+ android:visibility="gone"
+ app:srcCompat="@drawable/baseline_send_24" />
+
+ </LinearLayout>
+ </androidx.cardview.widget.CardView>
+ </RelativeLayout>
+
+ </FrameLayout>
+
+ <data>
<variable
name="presenter"
type="cx.ring.fragments.ConversationFragment" />
</data>
-
- <RelativeLayout
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:background="@color/grey_25">
-
- <ProgressBar
- android:id="@+id/pb_loading"
- android:layout_width="64dp"
- android:layout_height="64dp"
- android:layout_centerInParent="true"
- android:indeterminate="true" />
-
- <LinearLayout
- android:id="@+id/trustRequestMessageLayout"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_alignParentTop="true"
- android:orientation="vertical"
- android:visibility="gone">
-
- <TextView
- android:id="@+id/tvTrustRequestMessage"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:background="@color/white"
- android:gravity="center"
- android:padding="30dp"
- tools:text="Jean is not in your contacts yet" />
-
- <View
- android:layout_width="match_parent"
- android:layout_height="1dp"
- android:background="@color/lighter_gray" />
-
- </LinearLayout>
-
- <androidx.recyclerview.widget.RecyclerView
- android:id="@+id/hist_list"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_below="@+id/trustRequestMessageLayout"
- android:layout_alignParentStart="true"
- android:layout_alignParentEnd="true"
- android:layout_alignParentBottom="true"
- android:clipToPadding="false"
- android:divider="@null"
- android:listSelector="@color/transparent"
- android:paddingTop="8dp"
- android:paddingBottom="60dp"
- android:transcriptMode="normal"
- app:layoutManager="LinearLayoutManager"
- app:stackFromEnd="true"
- tools:listitem="@layout/item_conv_msg_peer" />
-
- <LinearLayout
- android:id="@+id/ongoingcall_pane"
- android:layout_width="match_parent"
- android:layout_height="48dp"
- android:layout_below="@id/main_toolbar"
- android:background="#e3c1c1"
- android:gravity="center"
- android:onClick="@{() -> presenter.onClick()}"
- android:visibility="gone">
-
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_margin="10dp"
- android:text="@string/conversation_action_go_to_call"
- android:textAppearance="?android:attr/textAppearanceMedium"
- android:textColor="@color/text_color_primary" />
- </LinearLayout>
-
- <androidx.cardview.widget.CardView
- android:id="@+id/unknownContactPrompt"
- style="?android:attr/buttonBarStyle"
- android:layout_width="match_parent"
- android:layout_height="42dp"
- android:layout_alignParentBottom="true"
- android:layout_marginLeft="8dp"
- android:layout_marginRight="8dp"
- android:layout_marginBottom="12dp"
- android:padding="0dp"
- android:visibility="gone"
- app:cardBackgroundColor="#4CAF50"
- app:cardCornerRadius="@dimen/radius_message_input">
-
- <Button
- android:id="@+id/btnAddContact"
- style="@style/Widget.MaterialComponents.Button.TextButton"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_margin="0dp"
- android:background="?attr/selectableItemBackground"
- android:gravity="center"
- android:onClick="@{() -> presenter.addContact()}"
- android:padding="0dp"
- android:text="@string/ab_action_contact_add"
- android:textColor="@color/white" />
- </androidx.cardview.widget.CardView>
-
- <androidx.cardview.widget.CardView
- android:id="@+id/trustRequestPrompt"
- style="?android:attr/buttonBarStyle"
- android:layout_width="match_parent"
- android:layout_height="42dp"
- android:layout_alignParentBottom="true"
- android:layout_marginLeft="8dp"
- android:layout_marginRight="8dp"
- android:layout_marginBottom="12dp"
- android:padding="0dp"
- android:visibility="gone"
- app:cardCornerRadius="@dimen/radius_message_input">
-
- <LinearLayout
- style="?android:attr/buttonBarStyle"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:layout_margin="0dp"
- android:orientation="horizontal"
- android:padding="0dp"
- android:weightSum="3">
-
- <Button
- android:id="@+id/btnBlock"
- style="@style/Widget.MaterialComponents.Button.TextButton"
- android:layout_width="0dp"
- android:layout_height="match_parent"
- android:layout_weight="1"
- android:background="?attr/selectableItemBackground"
- android:gravity="center"
- android:onClick="@{() -> presenter.blockContactRequest()}"
- android:text="@string/block"
- android:textColor="@color/color_primary_dark" />
-
- <Button
- android:id="@+id/btnRefuse"
- style="@style/Widget.MaterialComponents.Button.TextButton"
- android:layout_width="0dp"
- android:layout_height="match_parent"
- android:layout_weight="1"
- android:background="?attr/selectableItemBackground"
- android:gravity="center"
- android:onClick="@{() -> presenter.refuseContactRequest()}"
- android:text="@string/refuse"
- android:textColor="@color/color_primary_dark" />
-
- <Button
- android:id="@+id/btnAccept"
- style="@style/Widget.MaterialComponents.Button.TextButton"
- android:layout_width="0dp"
- android:layout_height="match_parent"
- android:layout_weight="1"
- android:background="?attr/selectableItemBackground"
- android:gravity="center"
- android:onClick="@{() -> presenter.acceptContactRequest()}"
- android:text="@string/accept"
- android:textColor="#4CAF50" />
- </LinearLayout>
- </androidx.cardview.widget.CardView>
-
- <androidx.cardview.widget.CardView
- android:id="@+id/cvMessageInput"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_alignParentBottom="true"
- android:layout_marginLeft="8dp"
- android:layout_marginRight="8dp"
- android:layout_marginBottom="8dp"
- android:visibility="gone"
- app:cardCornerRadius="@dimen/radius_message_input"
- app:cardElevation="6dp"
- tools:visibility="visible">
-
- <LinearLayout
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:gravity="center"
- android:orientation="horizontal">
-
- <Spinner
- android:id="@+id/number_selector"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:visibility="visible"
- tools:listitem="@layout/item_number_selected"
- tools:visibility="gone" />
-
- <ImageButton
- android:id="@+id/send_data"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:background="?selectableItemBackgroundBorderless"
- android:contentDescription="@string/send_file"
- android:onClick="@{() -> presenter.selectFile()}"
- android:padding="8dp"
- android:tint="@android:color/darker_gray"
- app:srcCompat="@drawable/ic_upload_black" />
-
- <ImageButton
- android:id="@+id/btn_take_picture"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:layout_marginEnd="5dp"
- android:background="?selectableItemBackgroundBorderless"
- android:contentDescription="@string/take_a_photo"
- android:onClick="@{() -> presenter.takePicture()}"
- android:padding="8dp"
- android:tint="@android:color/darker_gray"
- app:srcCompat="@drawable/ic_photo_camera" />
-
- <cx.ring.views.MessageEditText
- android:id="@+id/msg_input_txt"
- android:layout_width="0dp"
- android:layout_height="wrap_content"
- android:layout_weight="1"
- android:background="@null"
- android:hint="@string/write_a_message"
- android:imeOptions="actionSend|flagNoExtractUi"
- android:importantForAutofill="no"
- android:inputType="textShortMessage|textImeMultiLine|text|textMultiLine|textCapSentences"
- android:maxLines="5"
- android:padding="8dp" />
-
- <ProgressBar
- android:id="@+id/pb_data_transfer"
- android:layout_width="30dp"
- android:layout_height="30dp"
- android:indeterminate="true"
- android:visibility="gone" />
-
- <TextView
- android:id="@+id/emoji_send"
- style="?attr/borderlessButtonStyle"
- android:layout_width="50dp"
- android:layout_height="match_parent"
- android:background="?selectableItemBackgroundBorderless"
- android:onClick="@{() -> presenter.sendEmoji()}"
- android:padding="0dp"
- android:text="@string/conversation_default_emoji"
- android:textSize="18sp" />
-
- <ImageButton
- android:id="@+id/msg_send"
- android:layout_width="wrap_content"
- android:layout_height="match_parent"
- android:background="?selectableItemBackgroundBorderless"
- android:contentDescription="@string/send_message"
- android:onClick="@{() -> presenter.sendMessageText()}"
- android:padding="8dp"
- android:tint="@android:color/darker_gray"
- android:visibility="gone"
- app:srcCompat="@drawable/ic_send_black" />
- </LinearLayout>
- </androidx.cardview.widget.CardView>
- </RelativeLayout>
</layout>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/layout/frag_navigation.xml b/ring-android/app/src/main/res/layout/frag_navigation.xml
index d0e99d0..3f3120c 100644
--- a/ring-android/app/src/main/res/layout/frag_navigation.xml
+++ b/ring-android/app/src/main/res/layout/frag_navigation.xml
@@ -4,8 +4,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:theme="@style/AppThemeBase">
+ android:layout_height="wrap_content">
<LinearLayout
android:layout_width="match_parent"
@@ -16,7 +15,6 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/color_primary_dark"
-
android:paddingTop="30dp"
android:theme="@style/MenuHeader">
@@ -48,7 +46,7 @@
android:layout_toEndOf="@+id/anchor"
app:backgroundTint="@color/transparent_light"
app:fabSize="mini"
- app:srcCompat="@drawable/ic_action_edit" />
+ app:srcCompat="@drawable/baseline_edit_24"/>
</RelativeLayout>
@@ -69,9 +67,9 @@
</RelativeLayout>
- <androidx.appcompat.widget.AppCompatButton
+ <com.google.android.material.button.MaterialButton
android:id="@+id/addaccount_btn"
- style="@style/Widget.AppCompat.Button.Borderless"
+ style="@style/Widget.MaterialComponents.Button"
android:layout_width="wrap_content"
android:layout_height="72dp"
android:layout_alignParentEnd="true"
@@ -80,7 +78,8 @@
android:layout_toEndOf="@+id/profile_container"
android:gravity="center"
android:text="@string/action_create"
- android:visibility="gone" />
+ android:visibility="gone"
+ app:backgroundTint="@color/transparent"/>
</RelativeLayout>
@@ -94,14 +93,14 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:nestedScrollingEnabled="false"
- tools:targetApi="lollipop" />
+ tools:listitem="@layout/item_menu" />
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/drawer_accounts"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:nestedScrollingEnabled="false"
- tools:targetApi="lollipop" />
+ tools:listitem="@layout/item_account" />
</FrameLayout>
diff --git a/ring-android/app/src/main/res/layout/frag_pending_contact_requests.xml b/ring-android/app/src/main/res/layout/frag_pending_contact_requests.xml
index 0527b99..b07d665 100644
--- a/ring-android/app/src/main/res/layout/frag_pending_contact_requests.xml
+++ b/ring-android/app/src/main/res/layout/frag_pending_contact_requests.xml
@@ -17,7 +17,7 @@
android:singleLine="true"
android:text="@string/contact_request_account"
android:textAppearance="?android:attr/textAppearanceMedium"
- android:textColor="@color/text_color_primary"
+ android:textColor="@color/textColorPrimary"
android:visibility="gone" />
<androidx.recyclerview.widget.RecyclerView
diff --git a/ring-android/app/src/main/res/layout/frag_settings.xml b/ring-android/app/src/main/res/layout/frag_settings.xml
index 94a3dc3..dece55f 100644
--- a/ring-android/app/src/main/res/layout/frag_settings.xml
+++ b/ring-android/app/src/main/res/layout/frag_settings.xml
@@ -31,135 +31,69 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
- android:padding="@dimen/padding_small">
+ android:paddingTop="8dp"
+ android:paddingBottom="8dp">
+
+ <RelativeLayout
+ android:id="@+id/settings_dark_theme_layout"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:padding="16dp">
+
+ <ImageView
+ android:id="@+id/theme_image"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentStart="true"
+ android:layout_centerVertical="true"
+ android:layout_gravity="start"
+ android:contentDescription="@string/pref_darkTheme_summary"
+ android:src="@drawable/baseline_invert_colors_24"
+ android:layout_marginEnd="32dp"/>
+
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_centerVertical="true"
+ android:layout_toStartOf="@id/settings_dark_theme"
+ android:layout_toEndOf="@id/theme_image"
+ android:orientation="vertical">
+
+ <TextView
+ style="@style/ListPrimary"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:lines="1"
+ android:text="@string/pref_darkTheme_title" />
+
+ <TextView
+ style="@style/ListSecondary"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/pref_darkTheme_summary" />
+
+ </LinearLayout>
+
+ <Switch
+ android:id="@+id/settings_dark_theme"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentEnd="true"
+ android:checked="false"
+ android:layout_marginStart="16dp"/>
+
+ </RelativeLayout>
+
<!-- Network settings -->
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:padding="8dp"
- android:text="@string/pref_category_network"
- android:textColor="@color/color_primary_dark"
- android:textSize="18sp" />
-
- <RelativeLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal"
- android:padding="8dp">
-
-
- <ImageView
- android:id="@+id/network_image"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentStart="true"
- android:layout_centerVertical="true"
- android:layout_gravity="start"
- android:contentDescription="@string/pref_mobileData_summary"
- app:srcCompat="@drawable/baseline_perm_data_setting_24px" />
-
-
- <LinearLayout
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_centerVertical="true"
- android:layout_toStartOf="@id/settings_mobile_data"
- android:layout_toEndOf="@id/network_image"
- android:orientation="vertical"
- android:paddingLeft="16dp"
- android:paddingRight="16dp">
-
- <TextView
- style="@style/ListPrimary"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:lines="1"
- android:text="@string/pref_mobileData_title" />
-
- <TextView
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="@string/pref_mobileData_summary" />
-
- </LinearLayout>
-
- <Switch
- android:id="@+id/settings_mobile_data"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentEnd="true"
- android:checked="false" />
-
- </RelativeLayout>
-
-
- <RelativeLayout
- android:id="@+id/settings_push_notifications_layout"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:orientation="horizontal"
- android:padding="8dp">
-
- <ImageView
- android:id="@+id/push_image"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentStart="true"
- android:layout_centerVertical="true"
- android:layout_gravity="start"
- android:contentDescription="@string/pref_pushNotifications_summary"
- android:src="@drawable/baseline_notification_important_24" />
-
- <LinearLayout
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_centerVertical="true"
- android:layout_toStartOf="@id/settings_push_notifications"
- android:layout_toEndOf="@id/push_image"
- android:orientation="vertical"
- android:paddingLeft="16dp"
- android:paddingRight="16dp">
-
- <TextView
- style="@style/ListPrimary"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:lines="1"
- android:text="@string/pref_pushNotifications_title" />
-
- <TextView
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:text="@string/pref_pushNotifications_summary" />
-
- </LinearLayout>
-
- <Switch
- android:id="@+id/settings_push_notifications"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentEnd="true"
- android:checked="false" />
-
- </RelativeLayout>
-
- <TextView
- android:id="@+id/settings_video"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:padding="8dp"
- android:text="@string/pref_category_video"
- android:textColor="@color/color_primary_dark"
- android:textSize="18sp" />
-
<RelativeLayout
android:id="@+id/settings_video_layout"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
- android:padding="8dp">
+ android:padding="16dp">
<ImageView
android:id="@+id/hwenc_image"
@@ -169,9 +103,8 @@
android:layout_centerVertical="true"
android:layout_gravity="start"
android:contentDescription="@string/pref_hwEncode_summary"
- android:tint="@color/black"
- app:srcCompat="@drawable/baseline_memory_24" />
-
+ app:srcCompat="@drawable/baseline_memory_24"
+ android:layout_marginEnd="32dp"/>
<LinearLayout
android:layout_width="wrap_content"
@@ -179,8 +112,7 @@
android:layout_centerVertical="true"
android:layout_toEndOf="@id/hwenc_image"
android:orientation="vertical"
- android:paddingLeft="16dp"
- android:paddingRight="16dp">
+ android:layout_marginEnd="16dp">
<TextView
style="@style/ListPrimary"
@@ -202,36 +134,32 @@
<!-- Contacts settings -->
+ <!--
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="8dp"
android:text="@string/pref_category_contacts"
- android:textColor="@color/color_primary_dark"
- android:textSize="18sp" />
+ android:textColor="@color/textColorAccent"
+ android:textSize="18sp"
+ android:layout_marginStart="64dp" />
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
- android:padding="8dp"
- android:weightSum="1">
+ android:padding="16dp">
- <LinearLayout
+ <ImageView
android:id="@+id/contacts_image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_gravity="start"
+ android:contentDescription="@string/pref_systemContacts_summary"
+ app:srcCompat="@drawable/baseline_group_24"
android:layout_alignParentStart="true"
- android:layout_centerVertical="true">
-
- <ImageView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="start"
- android:contentDescription="@string/pref_systemContacts_summary"
- app:srcCompat="@drawable/ic_group_black" />
-
- </LinearLayout>
+ android:layout_centerVertical="true"
+ android:layout_marginEnd="32dp"/>
<LinearLayout
android:layout_width="wrap_content"
@@ -239,9 +167,7 @@
android:layout_centerVertical="true"
android:layout_toStartOf="@+id/settings_contacts"
android:layout_toEndOf="@+id/contacts_image"
- android:orientation="vertical"
- android:paddingLeft="16dp"
- android:paddingRight="16dp">
+ android:orientation="vertical">
<TextView
style="@style/ListPrimary"
@@ -262,9 +188,10 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
- android:checked="false" />
+ android:checked="false"
+ android:layout_marginStart="16dp" />
- </RelativeLayout>
+ </RelativeLayout>-->
<!-- System settings -->
@@ -273,31 +200,77 @@
android:layout_height="wrap_content"
android:padding="8dp"
android:text="@string/pref_category_system"
- android:textColor="@color/color_primary_dark"
- android:textSize="18sp" />
+ android:textColor="@color/textColorAccent"
+ android:textSize="18sp"
+ android:layout_marginStart="64dp" />
+
+ <RelativeLayout
+ android:id="@+id/settings_push_notifications_layout"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:orientation="horizontal"
+ android:padding="16dp">
+
+ <ImageView
+ android:id="@+id/push_image"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentStart="true"
+ android:layout_centerVertical="true"
+ android:layout_gravity="start"
+ android:contentDescription="@string/pref_pushNotifications_summary"
+ android:src="@drawable/baseline_notification_important_24"
+ android:layout_marginEnd="32dp"/>
+
+ <LinearLayout
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_centerVertical="true"
+ android:layout_toStartOf="@id/settings_push_notifications"
+ android:layout_toEndOf="@id/push_image"
+ android:orientation="vertical">
+
+ <TextView
+ style="@style/ListPrimary"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:lines="1"
+ android:text="@string/pref_pushNotifications_title" />
+
+ <TextView
+ style="@style/ListSecondary"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:text="@string/pref_pushNotifications_summary" />
+
+ </LinearLayout>
+
+ <Switch
+ android:id="@+id/settings_push_notifications"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentEnd="true"
+ android:checked="false"
+ android:layout_marginStart="16dp"/>
+
+ </RelativeLayout>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
- android:padding="8dp"
- android:weightSum="1">
+ android:padding="16dp">
- <LinearLayout
+ <ImageView
android:id="@+id/system_dialer_image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_gravity="start"
+ android:contentDescription="@string/pref_systemDialer_summary"
+ app:srcCompat="@drawable/baseline_dialpad_24"
android:layout_alignParentStart="true"
- android:layout_centerVertical="true">
-
- <ImageView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="start"
- android:contentDescription="@string/pref_systemDialer_summary"
- app:srcCompat="@drawable/ic_dialpad_black" />
-
- </LinearLayout>
+ android:layout_centerVertical="true"
+ android:layout_marginEnd="32dp" />
<LinearLayout
android:layout_width="wrap_content"
@@ -305,9 +278,7 @@
android:layout_centerVertical="true"
android:layout_toStartOf="@+id/settings_place_call"
android:layout_toEndOf="@+id/system_dialer_image"
- android:orientation="vertical"
- android:paddingLeft="16dp"
- android:paddingRight="16dp">
+ android:orientation="vertical">
<TextView
style="@style/ListPrimary"
@@ -329,7 +300,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
- android:checked="false" />
+ android:checked="false"
+ android:layout_marginStart="16dp" />
</RelativeLayout>
@@ -337,25 +309,18 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal"
- android:padding="8dp"
- android:weightSum="1">
+ android:padding="16dp">
- <LinearLayout
+ <ImageView
android:id="@+id/system_startOnBoot_image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_gravity="start"
+ android:contentDescription="@string/pref_startOnBoot_summary"
+ app:srcCompat="@drawable/baseline_android_24"
android:layout_alignParentStart="true"
- android:layout_centerVertical="true">
-
-
- <ImageView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="start"
- android:contentDescription="@string/pref_startOnBoot_summary"
- app:srcCompat="@drawable/ic_android_black" />
-
- </LinearLayout>
+ android:layout_centerVertical="true"
+ android:layout_marginEnd="32dp"/>
<LinearLayout
android:layout_width="wrap_content"
@@ -363,9 +328,7 @@
android:layout_centerVertical="true"
android:layout_toStartOf="@+id/settings_startup"
android:layout_toEndOf="@+id/system_startOnBoot_image"
- android:orientation="vertical"
- android:paddingLeft="16dp"
- android:paddingRight="16dp">
+ android:orientation="vertical">
<TextView
style="@style/ListPrimary"
@@ -387,7 +350,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
- android:checked="false" />
+ android:checked="false"
+ android:layout_marginStart="16dp" />
</RelativeLayout>
@@ -397,24 +361,18 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="horizontal"
- android:padding="8dp"
- android:weightSum="1">
+ android:padding="16dp">
- <LinearLayout
+ <ImageView
android:id="@+id/system_persistNotification_image"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_gravity="start"
+ android:contentDescription="@string/pref_persistNotification_summary"
+ android:src="@drawable/baseline_dns_24"
android:layout_alignParentStart="true"
- android:layout_centerVertical="true">
-
- <ImageView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_gravity="start"
- android:contentDescription="@string/pref_persistNotification_summary"
- android:src="@drawable/baseline_notification_important_24" />
-
- </LinearLayout>
+ android:layout_centerVertical="true"
+ android:layout_marginEnd="32dp"/>
<LinearLayout
android:layout_width="wrap_content"
@@ -422,9 +380,7 @@
android:layout_centerVertical="true"
android:layout_toStartOf="@+id/settings_persistNotification"
android:layout_toEndOf="@+id/system_persistNotification_image"
- android:orientation="vertical"
- android:paddingLeft="16dp"
- android:paddingRight="16dp">
+ android:orientation="vertical">
<TextView
style="@style/ListPrimary"
@@ -446,7 +402,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
- android:checked="false" />
+ android:checked="false"
+ android:layout_marginStart="16dp"/>
</RelativeLayout>
@@ -454,32 +411,49 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="8dp"
+ android:layout_marginStart="64dp"
android:text="@string/pref_category_privacy"
- android:textColor="@color/color_primary_dark"
+ android:textColor="@color/textColorAccent"
android:textSize="18sp" />
- <LinearLayout
+ <RelativeLayout
android:id="@+id/settings_clear_history"
android:layout_width="match_parent"
- android:layout_height="wrap_content"
+ android:layout_height="match_parent"
+ android:orientation="horizontal"
+ android:weightSum="1"
android:background="?attr/selectableItemBackground"
- android:orientation="vertical"
- android:padding="8dp">
+ android:padding="16dp">
+
+ <ImageView
+ android:id="@+id/system_clear_history_image"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="start"
+ android:contentDescription="@string/pref_clearHistory_summary"
+ android:src="@drawable/baseline_clear_all_24"
+ android:layout_alignParentStart="true"
+ android:layout_centerVertical="true"
+ android:layout_marginEnd="32dp" />
<TextView
style="@style/ListPrimary"
+ android:id="@+id/system_clear_history_title"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:ellipsize="end"
android:lines="1"
- android:text="@string/pref_clearHistory_title" />
+ android:text="@string/pref_clearHistory_title"
+ android:layout_toEndOf="@+id/system_clear_history_image"/>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:text="@string/pref_clearHistory_summary" />
+ android:text="@string/pref_clearHistory_summary"
+ android:layout_toEndOf="@+id/system_clear_history_image"
+ android:layout_below="@id/system_clear_history_title"/>
- </LinearLayout>
+ </RelativeLayout>
</LinearLayout>
</cx.ring.views.BoundedScrollView>
diff --git a/ring-android/app/src/main/res/layout/frag_share.xml b/ring-android/app/src/main/res/layout/frag_share.xml
index 826ba48..32683ac 100644
--- a/ring-android/app/src/main/res/layout/frag_share.xml
+++ b/ring-android/app/src/main/res/layout/frag_share.xml
@@ -29,7 +29,7 @@
android:layout_marginBottom="8dp"
android:gravity="center"
android:text="@string/share_message"
- android:textColor="@color/text_color_primary"
+ android:textColor="@color/textColorPrimary"
android:textSize="16sp"
app:layout_constraintBottom_toTopOf="@+id/share_button"
app:layout_constraintEnd_toEndOf="@+id/share_button"
diff --git a/ring-android/app/src/main/res/layout/frag_sharewith.xml b/ring-android/app/src/main/res/layout/frag_sharewith.xml
index a1881a9..0256e74 100644
--- a/ring-android/app/src/main/res/layout/frag_sharewith.xml
+++ b/ring-android/app/src/main/res/layout/frag_sharewith.xml
@@ -7,15 +7,13 @@
android:layout_height="match_parent"
android:orientation="vertical">
- <androidx.appcompat.widget.Toolbar
+ <com.google.android.material.appbar.MaterialToolbar
android:id="@+id/toolbar"
+ style="@style/Widget.MaterialComponents.Toolbar.Surface"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:background="?attr/colorPrimary"
- android:elevation="4dp"
- android:minHeight="?attr/actionBarSize"
- android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
- app:title="Share with..." />
+ android:elevation="0dp"
+ android:minHeight="?attr/actionBarSize" />
<FrameLayout
android:layout_width="match_parent"
@@ -34,7 +32,7 @@
android:background="@null"
android:inputType="textMultiLine"
android:singleLine="false"
- android:textColor="@color/text_color_primary"
+ android:textColor="@color/textColorPrimary"
android:visibility="gone"
tools:text="Test text message" />
diff --git a/ring-android/app/src/main/res/layout/frag_smartlist.xml b/ring-android/app/src/main/res/layout/frag_smartlist.xml
index 8e3353a..729f9ff 100644
--- a/ring-android/app/src/main/res/layout/frag_smartlist.xml
+++ b/ring-android/app/src/main/res/layout/frag_smartlist.xml
@@ -41,26 +41,26 @@
android:layout_alignParentEnd="true"
android:layout_gravity="end"
android:scaleType="fitCenter"
- app:srcCompat="@drawable/ic_settings_white" />
+ android:tint="@color/white"
+ app:srcCompat="@drawable/baseline_settings_24" />
<TextView
android:id="@+id/error_msg_txt"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_centerVertical="true"
android:layout_centerHorizontal="true"
- android:layout_toStartOf="@+id/error_image_view"
+ android:layout_centerVertical="true"
+ android:layout_toStartOf="@id/error_image_view"
android:gravity="center_vertical|center_horizontal"
android:textColor="@color/white"
android:textSize="14sp" />
</RelativeLayout>
-
<LinearLayout
android:id="@+id/newcontact_element"
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:layout_below="@+id/error_msg_pane"
+ android:layout_below="@id/error_msg_pane"
android:orientation="vertical"
android:paddingTop="8dp"
android:visibility="gone"
@@ -78,11 +78,35 @@
</LinearLayout>
- <RelativeLayout
+ <androidx.coordinatorlayout.widget.CoordinatorLayout
+ android:id="@+id/list_coordinator"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_below="@id/newcontact_element">
+ <RelativeLayout
+ android:layout_width="match_parent"
+ android:layout_height="match_parent">
+
+ <ProgressBar
+ android:id="@+id/loading_indicator"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_above="@id/empty_text_view"
+ android:layout_centerInParent="true" />
+
+ <TextView
+ android:id="@+id/empty_text_view"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_centerInParent="true"
+ android:gravity="center"
+ android:visibility="gone"
+ tools:text="0 conversations"
+ tools:visibility="visible" />
+
+ </RelativeLayout>
+
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/confs_list"
android:layout_width="match_parent"
@@ -93,41 +117,21 @@
android:elevation="2dp"
android:paddingTop="8dp"
android:paddingBottom="8dp"
- tools:listitem="@layout/item_smartlist" />
+ tools:listitem="@layout/item_smartlist"/>
- <TextView
- android:id="@+id/empty_text_view"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:layout_centerInParent="true"
- android:gravity="center"
- android:visibility="gone"
- tools:text="0 conversations"
- tools:visibility="visible" />
-
- <ProgressBar
- android:id="@+id/loading_indicator"
+ <com.google.android.material.floatingactionbutton.ExtendedFloatingActionButton
+ android:id="@+id/newconv_fab"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_above="@+id/empty_text_view"
- android:layout_centerInParent="true" />
- </RelativeLayout>
+ android:layout_alignWithParentIfMissing="false"
+ android:layout_gravity="bottom|end"
+ android:layout_margin="@dimen/fab_margin"
+ android:elevation="6dp"
+ android:text="@string/start_conversation"
+ app:elevation="6dp"
+ app:icon="@drawable/baseline_add_24"
+ app:pressedTranslationZ="12dp"
+ app:layout_anchorGravity="bottom|right|end"/>
- <com.google.android.material.floatingactionbutton.FloatingActionButton
- android:id="@+id/newconv_fab"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:layout_alignParentBottom="true"
- android:layout_alignParentEnd="true"
- android:layout_alignWithParentIfMissing="false"
- android:layout_gravity="bottom|end"
- android:layout_margin="@dimen/fab_compat_margin"
- android:layout_marginTop="40dp"
- android:elevation="6dp"
- app:backgroundTint="@color/color_primary_light"
- app:elevation="6dp"
- app:pressedTranslationZ="12dp"
- app:rippleColor="@color/color_primary_dark"
- app:srcCompat="@drawable/ic_dialpad_white" />
-
+ </androidx.coordinatorlayout.widget.CoordinatorLayout>
</RelativeLayout>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/layout/item_account.xml b/ring-android/app/src/main/res/layout/item_account.xml
index ab946d9..204b38a 100644
--- a/ring-android/app/src/main/res/layout/item_account.xml
+++ b/ring-android/app/src/main/res/layout/item_account.xml
@@ -38,8 +38,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
- android:layout_toEndOf="@+id/account_photo"
- android:layout_toStartOf="@+id/account_disabled"
+ android:layout_toEndOf="@id/account_photo"
+ android:layout_toStartOf="@id/account_disabled"
android:ellipsize="end"
android:lines="1"
android:textAppearance="@style/ListPrimary"
@@ -50,10 +50,10 @@
style="@style/TextAppearance.MaterialComponents.Subtitle2"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_alignBaseline="@+id/account_alias"
+ android:layout_alignBaseline="@id/account_alias"
android:layout_alignWithParentIfMissing="true"
android:layout_marginStart="8dp"
- android:layout_toStartOf="@+id/loading_indicator"
+ android:layout_toStartOf="@id/loading_indicator"
android:text="@string/account_disabled_indicator"
android:textStyle="italic" />
@@ -62,9 +62,9 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentStart="false"
- android:layout_below="@+id/account_alias"
- android:layout_toEndOf="@+id/account_photo"
- android:layout_toStartOf="@+id/loading_indicator"
+ android:layout_below="@id/account_alias"
+ android:layout_toEndOf="@id/account_photo"
+ android:layout_toStartOf="@id/loading_indicator"
android:ellipsize="middle"
android:singleLine="true"
android:textAppearance="@style/ListSecondary"
@@ -78,7 +78,7 @@
android:layout_alignWithParentIfMissing="true"
android:layout_centerVertical="true"
android:layout_marginStart="16dp"
- android:layout_toStartOf="@+id/error_indicator"
+ android:layout_toStartOf="@id/error_indicator"
android:visibility="gone" />
<ImageView
@@ -93,6 +93,6 @@
android:focusableInTouchMode="false"
android:tint="@color/error_red"
android:visibility="gone"
- app:srcCompat="@drawable/ic_error_white" />
+ app:srcCompat="@drawable/baseline_error_24" />
</RelativeLayout>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/layout/item_account_pref.xml b/ring-android/app/src/main/res/layout/item_account_pref.xml
index 38eac8e..3649abe 100644
--- a/ring-android/app/src/main/res/layout/item_account_pref.xml
+++ b/ring-android/app/src/main/res/layout/item_account_pref.xml
@@ -7,28 +7,36 @@
android:minHeight="72dp"
android:background="?android:attr/selectableItemBackground">
+ <ImageView
+ android:id="@+id/account_photo"
+ android:layout_width="40dp"
+ android:layout_height="40dp"
+ android:layout_centerVertical="true"
+ android:layout_marginStart="16dp"
+ android:layout_marginEnd="16dp"
+ android:layout_alignParentStart="true"
+ tools:src="@drawable/ic_contact_picture_fallback" />
+
<TextView
android:id="@+id/account_alias"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
- android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
+ android:layout_toEndOf="@id/account_photo"
android:layout_toStartOf="@id/error_indicator"
android:focusable="false"
android:gravity="start"
android:textAlignment="viewStart"
android:textAppearance="@style/ListPrimary"
- tools:text="Ring account" />
+ tools:text="Jami account" />
<TextView
android:id="@+id/account_host"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_alignParentStart="true"
- android:layout_below="@+id/account_alias"
- android:layout_marginStart="16dp"
+ android:layout_below="@id/account_alias"
+ android:layout_toEndOf="@id/account_photo"
android:layout_toStartOf="@id/error_indicator"
android:ellipsize="middle"
android:focusable="false"
@@ -44,13 +52,13 @@
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_margin="16dp"
- android:layout_toStartOf="@+id/account_checked"
+ android:layout_toStartOf="@id/account_checked"
android:clickable="false"
android:focusable="false"
android:focusableInTouchMode="false"
android:tint="@color/error_red"
android:visibility="gone"
- app:srcCompat="@drawable/ic_error_white" />
+ app:srcCompat="@drawable/baseline_error_24" />
<ProgressBar
android:id="@+id/loading_indicator"
@@ -59,9 +67,10 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
- android:layout_marginEnd="16dp"
- android:layout_toStartOf="@+id/account_checked"
- android:visibility="gone" />
+ android:layout_toStartOf="@id/account_checked"
+ android:layout_marginStart="16dp"
+ android:visibility="gone"
+ tools:visibility="visible"/>
<CheckBox
android:id="@+id/account_checked"
@@ -69,7 +78,7 @@
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
- android:layout_margin="16dp"
+ android:layout_marginStart="16dp"
android:focusable="false" />
</RelativeLayout>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/layout/item_account_selected.xml b/ring-android/app/src/main/res/layout/item_account_selected.xml
index 55df4f6..64deb10 100644
--- a/ring-android/app/src/main/res/layout/item_account_selected.xml
+++ b/ring-android/app/src/main/res/layout/item_account_selected.xml
@@ -16,7 +16,7 @@
android:layout_height="wrap_content"
android:layout_alignParentStart="true"
android:layout_alignParentTop="true"
- android:layout_toStartOf="@+id/account_disabled"
+ android:layout_toStartOf="@id/account_disabled"
android:ellipsize="end"
android:fontFamily="sans-serif-medium"
android:lines="1"
@@ -29,10 +29,10 @@
style="@style/TextAppearance.AppCompat.Small.Inverse"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_alignBaseline="@+id/account_alias"
+ android:layout_alignBaseline="@id/account_alias"
android:layout_alignWithParentIfMissing="true"
android:layout_marginStart="8dp"
- android:layout_toStartOf="@+id/loading_indicator"
+ android:layout_toStartOf="@id/loading_indicator"
android:text="@string/account_disabled_indicator"
android:textStyle="italic" />
@@ -41,8 +41,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentStart="true"
- android:layout_below="@+id/account_alias"
- android:layout_toStartOf="@+id/loading_indicator"
+ android:layout_below="@id/account_alias"
+ android:layout_toStartOf="@id/loading_indicator"
android:ellipsize="middle"
android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceSmall"
@@ -57,7 +57,7 @@
android:layout_alignWithParentIfMissing="true"
android:layout_centerVertical="true"
android:layout_marginStart="16dp"
- android:layout_toStartOf="@+id/error_indicator" />
+ android:layout_toStartOf="@id/error_indicator" />
<ImageView
android:id="@+id/error_indicator"
@@ -66,10 +66,10 @@
android:layout_alignParentTop="false"
android:layout_centerVertical="true"
android:layout_marginStart="16dp"
- android:layout_toStartOf="@+id/account_selected_arrow"
+ android:layout_toStartOf="@id/account_selected_arrow"
android:clickable="false"
android:focusable="false"
- app:srcCompat="@drawable/ic_error_white" />
+ app:srcCompat="@drawable/baseline_error_24" />
<ImageView
android:id="@+id/account_selected_arrow"
diff --git a/ring-android/app/src/main/res/layout/item_codec.xml b/ring-android/app/src/main/res/layout/item_codec.xml
index d4f2894..c7e1f4a 100644
--- a/ring-android/app/src/main/res/layout/item_codec.xml
+++ b/ring-android/app/src/main/res/layout/item_codec.xml
@@ -31,7 +31,7 @@
android:layout_marginEnd="16dp"
android:layout_marginStart="16dp"
android:gravity="center_vertical"
- android:textColor="@color/text_color_primary"
+ android:textColor="@color/textColorPrimary"
android:textSize="16sp"
tools:text="H.264" />
@@ -44,7 +44,7 @@
android:layout_toEndOf="@id/codec_name"
android:layout_toStartOf="@id/codec_checked"
android:gravity="center_vertical"
- android:textColor="@color/text_color_secondary"
+ android:textColor="@color/textColorSecondary"
android:textSize="12sp"
tools:text="32000" />
diff --git a/ring-android/app/src/main/res/layout/item_contact.xml b/ring-android/app/src/main/res/layout/item_contact.xml
index d97481b..f58d22a 100644
--- a/ring-android/app/src/main/res/layout/item_contact.xml
+++ b/ring-android/app/src/main/res/layout/item_contact.xml
@@ -56,7 +56,7 @@
android:maxLines="1"
android:singleLine="true"
android:textAlignment="viewStart"
- android:textColor="@color/text_color_primary"
+ android:textColor="@color/textColorPrimary"
android:textIsSelectable="false"
android:textSize="16sp"
tools:text="display name" />
@@ -67,11 +67,9 @@
android:layout_height="wrap_content"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
- android:alpha="0.54"
android:background="?selectableItemBackgroundBorderless"
android:contentDescription="@string/contact_quick_call_description"
android:padding="16dp"
- android:tint="@color/black"
- app:srcCompat="@drawable/ic_videocam_white" />
+ app:srcCompat="@drawable/baseline_videocam_24" />
</RelativeLayout>
diff --git a/ring-android/app/src/main/res/layout/item_contact_action.xml b/ring-android/app/src/main/res/layout/item_contact_action.xml
index d01b5d0..24e369e 100644
--- a/ring-android/app/src/main/res/layout/item_contact_action.xml
+++ b/ring-android/app/src/main/res/layout/item_contact_action.xml
@@ -24,8 +24,8 @@
android:background="@null"
android:padding="4dp"
android:scaleType="fitCenter"
- android:tint="@color/grey_800"
- tools:src="@drawable/ic_call_white" />
+ android:tint="@color/colorPrimary"
+ tools:src="@drawable/baseline_call_24" />
<TextView
android:id="@+id/action_title"
@@ -40,7 +40,7 @@
android:scrollHorizontally="true"
android:singleLine="true"
android:textAlignment="viewStart"
- android:textColor="@color/text_color_primary"
+ android:textColor="@color/textColorPrimary"
android:textSize="16sp"
tools:text="Start Audio Call" />
diff --git a/ring-android/app/src/main/res/layout/item_contact_blacklist.xml b/ring-android/app/src/main/res/layout/item_contact_blacklist.xml
index c6e83eb..a788355 100644
--- a/ring-android/app/src/main/res/layout/item_contact_blacklist.xml
+++ b/ring-android/app/src/main/res/layout/item_contact_blacklist.xml
@@ -29,7 +29,7 @@
android:gravity="start"
android:singleLine="true"
android:textAlignment="viewStart"
- android:textColor="@color/text_color_primary"
+ android:textColor="@color/textColorPrimary"
android:textIsSelectable="false"
android:textSize="16sp"
tools:text="display name" />
@@ -43,6 +43,6 @@
android:background="?selectableItemBackgroundBorderless"
android:contentDescription="@string/contact_unblock"
android:padding="16dp"
- app:srcCompat="@drawable/ic_person_add_black" />
+ app:srcCompat="@drawable/baseline_person_add_24" />
</RelativeLayout>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/layout/item_conv_audio.xml b/ring-android/app/src/main/res/layout/item_conv_audio.xml
index 6e0bbaf..77d0fb7 100644
--- a/ring-android/app/src/main/res/layout/item_conv_audio.xml
+++ b/ring-android/app/src/main/res/layout/item_conv_audio.xml
@@ -75,7 +75,7 @@
android:scrollHorizontally="true"
android:singleLine="true"
android:textAppearance="@android:style/TextAppearance.Medium"
- android:textColor="@color/text_color_secondary"
+ android:textColor="@color/textColorSecondary"
tools:text="2:03 / 2:45" />
</LinearLayout>
@@ -87,7 +87,7 @@
android:layout_marginStart="72dp"
android:layout_marginEnd="8dp"
android:maxWidth="200dp"
- android:textColor="@color/text_color_secondary"
+ android:textColor="@color/textColorSecondary"
android:textSize="12sp"
tools:text="1 mo - 12 mars" />
diff --git a/ring-android/app/src/main/res/layout/item_conv_call.xml b/ring-android/app/src/main/res/layout/item_conv_call.xml
index 39b4def..07bba5c 100644
--- a/ring-android/app/src/main/res/layout/item_conv_call.xml
+++ b/ring-android/app/src/main/res/layout/item_conv_call.xml
@@ -46,7 +46,7 @@
android:layout_marginLeft="12dp"
android:layout_marginRight="12dp"
android:alpha="0.75"
- app:srcCompat="@drawable/ic_call_missed_incoming_black" />
+ app:srcCompat="@drawable/baseline_call_missed_24" />
<LinearLayout
android:layout_width="match_parent"
@@ -61,7 +61,7 @@
android:marqueeRepeatLimit="marquee_forever"
android:scrollHorizontally="true"
android:singleLine="false"
- android:textColor="@color/text_color_primary"
+ android:textColor="@color/textColorPrimary"
android:textSize="14sp"
tools:text="Appel manqué" />
@@ -69,7 +69,7 @@
android:id="@+id/call_details_txt"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textColor="@color/text_color_secondary"
+ android:textColor="@color/textColorSecondary"
android:textSize="12sp"
tools:text="Adrien - 12 mars" />
</LinearLayout>
diff --git a/ring-android/app/src/main/res/layout/item_conv_contact.xml b/ring-android/app/src/main/res/layout/item_conv_contact.xml
index 0f2cde0..aad79d5 100644
--- a/ring-android/app/src/main/res/layout/item_conv_contact.xml
+++ b/ring-android/app/src/main/res/layout/item_conv_contact.xml
@@ -60,7 +60,7 @@
android:marqueeRepeatLimit="marquee_forever"
android:scrollHorizontally="true"
android:singleLine="false"
- android:textColor="@color/text_color_primary"
+ android:textColor="@color/textColorPrimary"
android:textSize="14sp"
tools:text="@string/hist_contact_added" />
@@ -68,7 +68,7 @@
android:id="@+id/contact_event_details_txt"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:textColor="@color/text_color_secondary"
+ android:textColor="@color/textColorSecondary"
android:textSize="12sp"
tools:text="Adrien - 12 mars" />
diff --git a/ring-android/app/src/main/res/layout/item_conv_file.xml b/ring-android/app/src/main/res/layout/item_conv_file.xml
index 01836cb..db8fca3 100644
--- a/ring-android/app/src/main/res/layout/item_conv_file.xml
+++ b/ring-android/app/src/main/res/layout/item_conv_file.xml
@@ -48,7 +48,7 @@
android:layout_gravity="center_vertical"
android:layout_marginStart="12dp"
android:layout_marginEnd="4dp"
- app:srcCompat="@drawable/ic_clip_black" />
+ app:srcCompat="@drawable/baseline_attach_file_24" />
<LinearLayout
android:layout_width="wrap_content"
@@ -69,7 +69,7 @@
android:scrollHorizontally="true"
android:singleLine="true"
android:textAppearance="@android:style/TextAppearance.Medium"
- android:textColor="@color/text_color_primary"
+ android:textColor="@color/textColorPrimary"
tools:text="test.jpg" />
<TextView
@@ -80,7 +80,7 @@
android:layout_marginEnd="8dp"
android:layout_marginBottom="8dp"
android:maxWidth="200dp"
- android:textColor="@color/text_color_secondary"
+ android:textColor="@color/textColorSecondary"
android:textSize="12sp"
tools:text="1 mo - 12 mars" />
diff --git a/ring-android/app/src/main/res/layout/item_conv_image.xml b/ring-android/app/src/main/res/layout/item_conv_image.xml
index f90fb91..d02b1e2 100644
--- a/ring-android/app/src/main/res/layout/item_conv_image.xml
+++ b/ring-android/app/src/main/res/layout/item_conv_image.xml
@@ -54,7 +54,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="4dp"
- android:textColor="@color/text_color_secondary"
+ android:textColor="@color/textColorSecondary"
android:textSize="14sp"
tools:text="@string/message_sending" />
</LinearLayout>
diff --git a/ring-android/app/src/main/res/layout/item_conv_msg_me.xml b/ring-android/app/src/main/res/layout/item_conv_msg_me.xml
index 3d9c8a4..5e300c5 100644
--- a/ring-android/app/src/main/res/layout/item_conv_msg_me.xml
+++ b/ring-android/app/src/main/res/layout/item_conv_msg_me.xml
@@ -65,7 +65,7 @@
android:layout_alignEnd="@id/msg_txt"
android:layout_marginEnd="4dp"
android:layout_marginBottom="4dp"
- android:textColor="@color/text_color_secondary"
+ android:textColor="@color/textColorSecondary"
android:textSize="14sp"
tools:text="@string/message_sending" />
diff --git a/ring-android/app/src/main/res/layout/item_conv_msg_peer.xml b/ring-android/app/src/main/res/layout/item_conv_msg_peer.xml
index 5d41f49..8e79cfc 100644
--- a/ring-android/app/src/main/res/layout/item_conv_msg_peer.xml
+++ b/ring-android/app/src/main/res/layout/item_conv_msg_peer.xml
@@ -60,7 +60,7 @@
android:paddingBottom="@dimen/padding_small"
android:scrollHorizontally="true"
android:singleLine="false"
- android:textColor="@color/text_color_primary"
+ android:textColor="@color/textColorPrimary"
android:textIsSelectable="true"
android:textSize="16sp"
tools:text="yo" />
@@ -72,7 +72,7 @@
android:layout_below="@+id/msg_txt"
android:layout_marginBottom="4dp"
android:layout_toEndOf="@id/photo"
- android:textColor="@color/text_color_secondary"
+ android:textColor="@color/textColorSecondary"
android:textSize="14sp"
tools:text="@string/time_just_now" />
diff --git a/ring-android/app/src/main/res/layout/item_conv_video.xml b/ring-android/app/src/main/res/layout/item_conv_video.xml
index 27c3db1..b0cf7fe 100644
--- a/ring-android/app/src/main/res/layout/item_conv_video.xml
+++ b/ring-android/app/src/main/res/layout/item_conv_video.xml
@@ -63,7 +63,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginBottom="4dp"
- android:textColor="@color/text_color_secondary"
+ android:textColor="@color/textColorSecondary"
android:textSize="14sp"
tools:text="@string/message_sending" />
</LinearLayout>
diff --git a/ring-android/app/src/main/res/layout/item_device.xml b/ring-android/app/src/main/res/layout/item_device.xml
index aa7c566..f1c6e15 100644
--- a/ring-android/app/src/main/res/layout/item_device.xml
+++ b/ring-android/app/src/main/res/layout/item_device.xml
@@ -27,7 +27,7 @@
android:layout_height="wrap_content"
android:layout_alignParentStart="true"
android:layout_centerVertical="true"
- app:srcCompat="@drawable/ic_desktop_windows_black" />
+ app:srcCompat="@drawable/baseline_desktop_windows_24" />
<TextView
android:id="@+id/txt_device_label"
@@ -77,8 +77,7 @@
android:background="?selectableItemBackgroundBorderless"
android:contentDescription="@string/account_device_revoke"
android:padding="8dp"
- android:tint="@color/black"
- app:srcCompat="@drawable/ic_action_edit" />
+ app:srcCompat="@drawable/baseline_edit_24" />
<ImageButton
android:id="@+id/revoke_button"
diff --git a/ring-android/app/src/main/res/layout/item_menu.xml b/ring-android/app/src/main/res/layout/item_menu.xml
index a928581..21c97f4 100644
--- a/ring-android/app/src/main/res/layout/item_menu.xml
+++ b/ring-android/app/src/main/res/layout/item_menu.xml
@@ -7,14 +7,14 @@
android:background="?android:attr/selectableItemBackground"
android:drawSelectorOnTop="true">
- <androidx.appcompat.widget.AppCompatImageView
+ <ImageView
android:id="@+id/navigation_item_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_marginStart="16dp"
android:alpha="0.54"
- tools:src="@drawable/ic_home_black" />
+ tools:src="@drawable/baseline_home_24"/>
<TextView
android:id="@+id/navigation_item_title"
@@ -23,10 +23,9 @@
android:layout_centerVertical="true"
android:layout_marginEnd="16dp"
android:layout_marginStart="72dp"
- android:alpha="0.87"
android:fontFamily="sans-serif-medium"
android:gravity="center_vertical"
- android:textColor="@color/black"
+ android:textColor="@color/textColorSecondary"
android:textSize="14sp"
tools:text="Home" />
diff --git a/ring-android/app/src/main/res/layout/item_number.xml b/ring-android/app/src/main/res/layout/item_number.xml
index 8c86c37..eebf918 100644
--- a/ring-android/app/src/main/res/layout/item_number.xml
+++ b/ring-android/app/src/main/res/layout/item_number.xml
@@ -35,7 +35,7 @@
android:layout_alignParentTop="false"
android:layout_centerVertical="true"
android:layout_marginEnd="8dp"
- app:srcCompat="@drawable/ic_dialer_sip_black" />
+ app:srcCompat="@drawable/baseline_dialer_sip_24" />
<TextView
android:id="@+id/number_txt"
@@ -49,7 +49,7 @@
android:marqueeRepeatLimit="marquee_forever"
android:scrollHorizontally="true"
android:singleLine="true"
- android:textColor="@color/text_color_primary"
+ android:textColor="@color/textColorPrimary"
android:textSize="16sp"
tools:text="+15142792035" />
@@ -60,7 +60,7 @@
android:layout_below="@+id/number_txt"
android:layout_marginEnd="8dp"
android:layout_toEndOf="@+id/number_icon"
- android:textColor="@color/text_color_secondary"
+ android:textColor="@color/textColorSecondary"
android:textSize="12sp"
tools:text="Inde" />
diff --git a/ring-android/app/src/main/res/layout/item_number_selected.xml b/ring-android/app/src/main/res/layout/item_number_selected.xml
index 9b95320..dd1c5b9 100644
--- a/ring-android/app/src/main/res/layout/item_number_selected.xml
+++ b/ring-android/app/src/main/res/layout/item_number_selected.xml
@@ -34,6 +34,6 @@
android:layout_alignParentTop="false"
android:layout_centerVertical="true"
android:layout_marginEnd="8dp"
- app:srcCompat="@drawable/ic_dialer_sip_black" />
+ app:srcCompat="@drawable/baseline_dialer_sip_24" />
</RelativeLayout>
\ No newline at end of file
diff --git a/ring-android/app/src/main/res/layout/item_smartlist.xml b/ring-android/app/src/main/res/layout/item_smartlist.xml
index f5a67dc..edba5a1 100644
--- a/ring-android/app/src/main/res/layout/item_smartlist.xml
+++ b/ring-android/app/src/main/res/layout/item_smartlist.xml
@@ -65,7 +65,7 @@
android:scrollHorizontally="true"
android:singleLine="true"
android:textAlignment="viewStart"
- android:textColor="@color/text_color_primary"
+ android:textColor="@color/textColorPrimary"
android:textSize="16sp"
tools:text="Test test" />
@@ -78,7 +78,7 @@
android:gravity="start"
android:maxLines="1"
android:textAlignment="viewStart"
- android:textColor="@color/text_color_secondary"
+ android:textColor="@color/textColorSecondary"
android:textSize="14sp"
tools:text="Ongoing call of 56 secs" />
@@ -88,7 +88,7 @@
android:layout_height="wrap_content"
android:layout_alignBaseline="@+id/conv_participant"
android:layout_alignParentEnd="true"
- android:textColor="@color/text_color_secondary"
+ android:textColor="@color/textColorSecondary"
android:textSize="12sp"
tools:text="2 days ago" />
diff --git a/ring-android/app/src/main/res/layout/tv_frag_call.xml b/ring-android/app/src/main/res/layout/tv_frag_call.xml
index 96b95aa..512b429 100644
--- a/ring-android/app/src/main/res/layout/tv_frag_call.xml
+++ b/ring-android/app/src/main/res/layout/tv_frag_call.xml
@@ -173,7 +173,7 @@
app:elevation="6dp"
app:pressedTranslationZ="12dp"
app:rippleColor="@android:color/white"
- app:srcCompat="@drawable/ic_call_white"
+ app:srcCompat="@drawable/baseline_call_24"
app:useCompatPadding="true" />
</LinearLayout>