diff options
Diffstat (limited to 'src/main')
48 files changed, 70 insertions, 50 deletions
diff --git a/src/main/res/drawable-hdpi/ic_add_white_24dp.png b/src/main/res/drawable-hdpi/ic_add_white_24dp.png Binary files differdeleted file mode 100644 index 67049815b..000000000 --- a/src/main/res/drawable-hdpi/ic_add_white_24dp.png +++ /dev/null diff --git a/src/main/res/drawable-hdpi/ic_crop_white_24dp.png b/src/main/res/drawable-hdpi/ic_crop_white_24dp.png Binary files differdeleted file mode 100644 index 81bb32417..000000000 --- a/src/main/res/drawable-hdpi/ic_crop_white_24dp.png +++ /dev/null diff --git a/src/main/res/drawable-hdpi/ic_keyboard_arrow_down_white_24dp.png b/src/main/res/drawable-hdpi/ic_keyboard_arrow_down_white_24dp.png Binary files differdeleted file mode 100644 index bbb4fb4dc..000000000 --- a/src/main/res/drawable-hdpi/ic_keyboard_arrow_down_white_24dp.png +++ /dev/null diff --git a/src/main/res/drawable-hdpi/ic_keyboard_arrow_up_white_24dp.png b/src/main/res/drawable-hdpi/ic_keyboard_arrow_up_white_24dp.png Binary files differdeleted file mode 100644 index dea898838..000000000 --- a/src/main/res/drawable-hdpi/ic_keyboard_arrow_up_white_24dp.png +++ /dev/null diff --git a/src/main/res/drawable-hdpi/ic_resend_grey600_48dp.png b/src/main/res/drawable-hdpi/ic_resend_grey600_48dp.png Binary files differdeleted file mode 100644 index d9914e274..000000000 --- a/src/main/res/drawable-hdpi/ic_resend_grey600_48dp.png +++ /dev/null diff --git a/src/main/res/drawable-hdpi/ic_unlink_white_24dp.png b/src/main/res/drawable-hdpi/ic_unlink_white_24dp.png Binary files differdeleted file mode 100644 index 44b1cdbc9..000000000 --- a/src/main/res/drawable-hdpi/ic_unlink_white_24dp.png +++ /dev/null diff --git a/src/main/res/drawable-mdpi/ic_add_white_24dp.png b/src/main/res/drawable-mdpi/ic_add_white_24dp.png Binary files differdeleted file mode 100644 index b2d14f3cb..000000000 --- a/src/main/res/drawable-mdpi/ic_add_white_24dp.png +++ /dev/null diff --git a/src/main/res/drawable-mdpi/ic_crop_white_24dp.png b/src/main/res/drawable-mdpi/ic_crop_white_24dp.png Binary files differdeleted file mode 100644 index e3128d043..000000000 --- a/src/main/res/drawable-mdpi/ic_crop_white_24dp.png +++ /dev/null diff --git a/src/main/res/drawable-mdpi/ic_keyboard_arrow_down_white_24dp.png b/src/main/res/drawable-mdpi/ic_keyboard_arrow_down_white_24dp.png Binary files differdeleted file mode 100644 index ef8a4b6a4..000000000 --- a/src/main/res/drawable-mdpi/ic_keyboard_arrow_down_white_24dp.png +++ /dev/null diff --git a/src/main/res/drawable-mdpi/ic_keyboard_arrow_up_white_24dp.png b/src/main/res/drawable-mdpi/ic_keyboard_arrow_up_white_24dp.png Binary files differdeleted file mode 100644 index a2e4baad0..000000000 --- a/src/main/res/drawable-mdpi/ic_keyboard_arrow_up_white_24dp.png +++ /dev/null diff --git a/src/main/res/drawable-mdpi/ic_resend_grey600_48dp.png b/src/main/res/drawable-mdpi/ic_resend_grey600_48dp.png Binary files differdeleted file mode 100644 index b8f644358..000000000 --- a/src/main/res/drawable-mdpi/ic_resend_grey600_48dp.png +++ /dev/null diff --git a/src/main/res/drawable-mdpi/ic_unlink_white_24dp.png b/src/main/res/drawable-mdpi/ic_unlink_white_24dp.png Binary files differdeleted file mode 100644 index 3368d18ff..000000000 --- a/src/main/res/drawable-mdpi/ic_unlink_white_24dp.png +++ /dev/null diff --git a/src/main/res/drawable-xhdpi/ic_add_white_24dp.png b/src/main/res/drawable-xhdpi/ic_add_white_24dp.png Binary files differdeleted file mode 100644 index bcd24f2d9..000000000 --- a/src/main/res/drawable-xhdpi/ic_add_white_24dp.png +++ /dev/null diff --git a/src/main/res/drawable-xhdpi/ic_crop_white_24dp.png b/src/main/res/drawable-xhdpi/ic_crop_white_24dp.png Binary files differdeleted file mode 100644 index 4b198e7d3..000000000 --- a/src/main/res/drawable-xhdpi/ic_crop_white_24dp.png +++ /dev/null diff --git a/src/main/res/drawable-xhdpi/ic_keyboard_arrow_down_white_24dp.png b/src/main/res/drawable-xhdpi/ic_keyboard_arrow_down_white_24dp.png Binary files differdeleted file mode 100644 index 058cebb7f..000000000 --- a/src/main/res/drawable-xhdpi/ic_keyboard_arrow_down_white_24dp.png +++ /dev/null diff --git a/src/main/res/drawable-xhdpi/ic_keyboard_arrow_up_white_24dp.png b/src/main/res/drawable-xhdpi/ic_keyboard_arrow_up_white_24dp.png Binary files differdeleted file mode 100644 index ae36d91e1..000000000 --- a/src/main/res/drawable-xhdpi/ic_keyboard_arrow_up_white_24dp.png +++ /dev/null diff --git a/src/main/res/drawable-xhdpi/ic_resend_grey600_48dp.png b/src/main/res/drawable-xhdpi/ic_resend_grey600_48dp.png Binary files differdeleted file mode 100644 index fac337fc9..000000000 --- a/src/main/res/drawable-xhdpi/ic_resend_grey600_48dp.png +++ /dev/null diff --git a/src/main/res/drawable-xhdpi/ic_unlink_white_24dp.png b/src/main/res/drawable-xhdpi/ic_unlink_white_24dp.png Binary files differdeleted file mode 100644 index 855f395da..000000000 --- a/src/main/res/drawable-xhdpi/ic_unlink_white_24dp.png +++ /dev/null diff --git a/src/main/res/drawable-xxhdpi/ic_add_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_add_white_24dp.png Binary files differdeleted file mode 100644 index 94789119f..000000000 --- a/src/main/res/drawable-xxhdpi/ic_add_white_24dp.png +++ /dev/null diff --git a/src/main/res/drawable-xxhdpi/ic_crop_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_crop_white_24dp.png Binary files differdeleted file mode 100644 index b39ab2379..000000000 --- a/src/main/res/drawable-xxhdpi/ic_crop_white_24dp.png +++ /dev/null diff --git a/src/main/res/drawable-xxhdpi/ic_keyboard_arrow_down_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_keyboard_arrow_down_white_24dp.png Binary files differdeleted file mode 100644 index f9622b7be..000000000 --- a/src/main/res/drawable-xxhdpi/ic_keyboard_arrow_down_white_24dp.png +++ /dev/null diff --git a/src/main/res/drawable-xxhdpi/ic_keyboard_arrow_up_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_keyboard_arrow_up_white_24dp.png Binary files differdeleted file mode 100644 index ce4aa5602..000000000 --- a/src/main/res/drawable-xxhdpi/ic_keyboard_arrow_up_white_24dp.png +++ /dev/null diff --git a/src/main/res/drawable-xxhdpi/ic_resend_grey600_48dp.png b/src/main/res/drawable-xxhdpi/ic_resend_grey600_48dp.png Binary files differdeleted file mode 100644 index adc177a21..000000000 --- a/src/main/res/drawable-xxhdpi/ic_resend_grey600_48dp.png +++ /dev/null diff --git a/src/main/res/drawable-xxhdpi/ic_unlink_white_24dp.png b/src/main/res/drawable-xxhdpi/ic_unlink_white_24dp.png Binary files differdeleted file mode 100644 index e6f80c309..000000000 --- a/src/main/res/drawable-xxhdpi/ic_unlink_white_24dp.png +++ /dev/null diff --git a/src/main/res/drawable-xxxhdpi/ic_add_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_add_white_24dp.png Binary files differdeleted file mode 100644 index d1c0a1d79..000000000 --- a/src/main/res/drawable-xxxhdpi/ic_add_white_24dp.png +++ /dev/null diff --git a/src/main/res/drawable-xxxhdpi/ic_crop_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_crop_white_24dp.png Binary files differdeleted file mode 100644 index 7bce6ed00..000000000 --- a/src/main/res/drawable-xxxhdpi/ic_crop_white_24dp.png +++ /dev/null diff --git a/src/main/res/drawable-xxxhdpi/ic_keyboard_arrow_down_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_keyboard_arrow_down_white_24dp.png Binary files differdeleted file mode 100644 index 30948d983..000000000 --- a/src/main/res/drawable-xxxhdpi/ic_keyboard_arrow_down_white_24dp.png +++ /dev/null diff --git a/src/main/res/drawable-xxxhdpi/ic_keyboard_arrow_up_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_keyboard_arrow_up_white_24dp.png Binary files differdeleted file mode 100644 index 42615516b..000000000 --- a/src/main/res/drawable-xxxhdpi/ic_keyboard_arrow_up_white_24dp.png +++ /dev/null diff --git a/src/main/res/drawable-xxxhdpi/ic_resend_grey600_48dp.png b/src/main/res/drawable-xxxhdpi/ic_resend_grey600_48dp.png Binary files differdeleted file mode 100644 index 86e9193e8..000000000 --- a/src/main/res/drawable-xxxhdpi/ic_resend_grey600_48dp.png +++ /dev/null diff --git a/src/main/res/drawable-xxxhdpi/ic_unlink_white_24dp.png b/src/main/res/drawable-xxxhdpi/ic_unlink_white_24dp.png Binary files differdeleted file mode 100644 index c4c12dce0..000000000 --- a/src/main/res/drawable-xxxhdpi/ic_unlink_white_24dp.png +++ /dev/null diff --git a/src/main/res/layout/activity_about.xml b/src/main/res/layout/activity_about.xml index e05b74549..4da63e957 100644 --- a/src/main/res/layout/activity_about.xml +++ b/src/main/res/layout/activity_about.xml @@ -1,8 +1,9 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:card_view="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="?attr/color_background_secondary" + android:background="?attr/color_background_tertiary" android:orientation="vertical" tools:context="de.pixart.messenger.ui.AboutActivity"> @@ -24,7 +25,7 @@ android:layout_marginLeft="@dimen/activity_horizontal_margin" android:layout_marginRight="@dimen/activity_horizontal_margin" android:layout_marginTop="@dimen/activity_vertical_margin" - android:background="?attr/color_background_primary"> + card_view:cardBackgroundColor="?attr/color_background_secondary"> <ImageView android:id="@+id/logo" @@ -45,8 +46,8 @@ android:layout_marginLeft="@dimen/activity_horizontal_margin" android:layout_marginRight="@dimen/activity_horizontal_margin" android:layout_marginTop="@dimen/activity_vertical_margin" - android:background="?attr/color_background_primary" - android:orientation="vertical"> + android:orientation="vertical" + card_view:cardBackgroundColor="?attr/color_background_secondary"> <LinearLayout android:layout_width="match_parent" @@ -101,7 +102,7 @@ android:layout_marginLeft="@dimen/activity_horizontal_margin" android:layout_marginRight="@dimen/activity_horizontal_margin" android:layout_marginTop="@dimen/activity_vertical_margin" - android:background="?attr/color_background_primary"> + card_view:cardBackgroundColor="?attr/color_background_secondary"> <TextView android:id="@+id/libraries" diff --git a/src/main/res/layout/activity_change_password.xml b/src/main/res/layout/activity_change_password.xml index f6dfc5d0e..6bd7f2d0d 100644 --- a/src/main/res/layout/activity_change_password.xml +++ b/src/main/res/layout/activity_change_password.xml @@ -3,7 +3,7 @@ xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="?attr/color_background_secondary"> + android:background="?attr/color_background_tertiary"> <include layout="@layout/toolbar" /> @@ -19,7 +19,8 @@ android:layout_marginBottom="@dimen/activity_vertical_margin" android:layout_marginLeft="@dimen/activity_horizontal_margin" android:layout_marginRight="@dimen/activity_horizontal_margin" - android:layout_marginTop="@dimen/activity_vertical_margin"> + android:layout_marginTop="@dimen/activity_vertical_margin" + android:background="?attr/color_background_tertiary"> <LinearLayout android:layout_width="match_parent" diff --git a/src/main/res/layout/activity_choose_contact.xml b/src/main/res/layout/activity_choose_contact.xml index 26f1c7494..5c4df667e 100644 --- a/src/main/res/layout/activity_choose_contact.xml +++ b/src/main/res/layout/activity_choose_contact.xml @@ -13,7 +13,7 @@ <FrameLayout android:layout_width="match_parent" android:layout_height="match_parent" - android:background="?attr/color_background_secondary"> + android:background="?attr/color_background_tertiary"> <ListView android:id="@+id/choose_contact_list" diff --git a/src/main/res/layout/activity_contact_details.xml b/src/main/res/layout/activity_contact_details.xml index a6a720995..268071fbd 100644 --- a/src/main/res/layout/activity_contact_details.xml +++ b/src/main/res/layout/activity_contact_details.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> -<layout xmlns:android="http://schemas.android.com/apk/res/android"> +<layout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:card_view="http://schemas.android.com/apk/res-auto"> <LinearLayout android:layout_width="match_parent" android:layout_height="match_parent" - android:background="?attr/color_background_secondary" + android:background="?attr/color_background_tertiary" android:orientation="vertical"> <include @@ -27,7 +28,8 @@ android:layout_marginBottom="@dimen/activity_vertical_margin" android:layout_marginLeft="@dimen/activity_horizontal_margin" android:layout_marginRight="@dimen/activity_horizontal_margin" - android:layout_marginTop="@dimen/activity_vertical_margin"> + android:layout_marginTop="@dimen/activity_vertical_margin" + card_view:cardBackgroundColor="?attr/color_background_secondary"> <LinearLayout android:layout_width="match_parent" @@ -196,7 +198,8 @@ android:layout_marginBottom="@dimen/activity_vertical_margin" android:layout_marginLeft="@dimen/activity_horizontal_margin" android:layout_marginRight="@dimen/activity_horizontal_margin" - android:layout_marginTop="@dimen/activity_vertical_margin"> + android:layout_marginTop="@dimen/activity_vertical_margin" + card_view:cardBackgroundColor="?attr/color_background_secondary"> <RelativeLayout android:layout_width="fill_parent" @@ -239,7 +242,8 @@ android:layout_marginBottom="@dimen/activity_vertical_margin" android:layout_marginLeft="@dimen/activity_horizontal_margin" android:layout_marginRight="@dimen/activity_horizontal_margin" - android:layout_marginTop="@dimen/activity_vertical_margin"> + android:layout_marginTop="@dimen/activity_vertical_margin" + card_view:cardBackgroundColor="?attr/color_background_secondary"> <LinearLayout android:layout_width="match_parent" @@ -285,7 +289,8 @@ android:layout_marginBottom="@dimen/activity_vertical_margin" android:layout_marginLeft="@dimen/activity_horizontal_margin" android:layout_marginRight="@dimen/activity_horizontal_margin" - android:layout_marginTop="@dimen/activity_vertical_margin"> + android:layout_marginTop="@dimen/activity_vertical_margin" + card_view:cardBackgroundColor="?attr/color_background_secondary"> <LinearLayout android:layout_width="match_parent" diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml index 02d03b941..275a1d894 100644 --- a/src/main/res/layout/activity_edit_account.xml +++ b/src/main/res/layout/activity_edit_account.xml @@ -1,12 +1,13 @@ <?xml version="1.0" encoding="utf-8"?> <layout xmlns:android="http://schemas.android.com/apk/res/android" xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:card_view="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"> <RelativeLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:background="?attr/color_background_secondary"> + android:background="?attr/color_background_tertiary"> <include android:id="@+id/toolbar" @@ -32,9 +33,9 @@ android:layout_marginLeft="@dimen/activity_horizontal_margin" android:layout_marginRight="@dimen/activity_horizontal_margin" android:layout_marginTop="@dimen/activity_vertical_margin" - android:background="@drawable/infocard_border" android:orientation="vertical" - android:padding="@dimen/card_padding_regular"> + android:padding="@dimen/card_padding_regular" + card_view:cardBackgroundColor="?attr/color_background_secondary"> <RelativeLayout android:layout_width="match_parent" @@ -203,7 +204,8 @@ android:layout_marginLeft="@dimen/activity_horizontal_margin" android:layout_marginRight="@dimen/activity_horizontal_margin" android:layout_marginTop="@dimen/activity_vertical_margin" - android:visibility="gone"> + android:visibility="gone" + card_view:cardBackgroundColor="?attr/color_background_secondary"> <LinearLayout android:layout_width="match_parent" @@ -652,7 +654,8 @@ android:layout_marginLeft="@dimen/activity_horizontal_margin" android:layout_marginRight="@dimen/activity_horizontal_margin" android:layout_marginTop="@dimen/activity_vertical_margin" - android:visibility="gone"> + android:visibility="gone" + card_view:cardBackgroundColor="?attr/color_background_secondary"> <LinearLayout android:layout_width="match_parent" diff --git a/src/main/res/layout/activity_manage_accounts.xml b/src/main/res/layout/activity_manage_accounts.xml index 2dc266bf3..5bba9308d 100644 --- a/src/main/res/layout/activity_manage_accounts.xml +++ b/src/main/res/layout/activity_manage_accounts.xml @@ -2,7 +2,7 @@ <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="fill_parent" android:layout_height="fill_parent" - android:background="?attr/color_background_secondary" + android:background="?attr/color_background_tertiary" android:orientation="vertical"> <include layout="@layout/toolbar" /> @@ -12,6 +12,6 @@ android:layout_width="fill_parent" android:layout_height="wrap_content" android:divider="@android:color/transparent" - android:dividerHeight="0dp"></ListView> + android:dividerHeight="0dp" /> </LinearLayout>
\ No newline at end of file diff --git a/src/main/res/layout/activity_media_browser.xml b/src/main/res/layout/activity_media_browser.xml index 149f2c164..0a28968ed 100644 --- a/src/main/res/layout/activity_media_browser.xml +++ b/src/main/res/layout/activity_media_browser.xml @@ -4,7 +4,7 @@ <LinearLayout android:layout_width="match_parent" android:layout_height="match_parent" - android:background="?attr/color_background_primary" + android:background="?attr/color_background_tertiary" android:orientation="vertical"> <include diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml index b46ad8032..e1ac744ea 100644 --- a/src/main/res/layout/activity_muc_details.xml +++ b/src/main/res/layout/activity_muc_details.xml @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="utf-8"?> <layout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto"> + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:card_view="http://schemas.android.com/tools"> <LinearLayout android:layout_width="match_parent" android:layout_height="match_parent" - android:background="?attr/color_background_secondary" + android:background="?attr/color_background_tertiary" android:orientation="vertical"> <include @@ -29,7 +30,8 @@ android:layout_marginLeft="@dimen/activity_horizontal_margin" android:layout_marginRight="@dimen/activity_horizontal_margin" android:layout_marginTop="@dimen/activity_vertical_margin" - android:orientation="vertical"> + android:orientation="vertical" + card_view:cardBackgroundColor="?attr/color_background_secondary"> <LinearLayout android:layout_width="match_parent" @@ -282,7 +284,8 @@ android:layout_marginBottom="@dimen/activity_vertical_margin" android:layout_marginLeft="@dimen/activity_horizontal_margin" android:layout_marginRight="@dimen/activity_horizontal_margin" - android:layout_marginTop="@dimen/activity_vertical_margin"> + android:layout_marginTop="@dimen/activity_vertical_margin" + card_view:cardBackgroundColor="?attr/color_background_secondary"> <LinearLayout android:layout_width="match_parent" @@ -328,7 +331,8 @@ android:layout_marginLeft="@dimen/activity_horizontal_margin" android:layout_marginRight="@dimen/activity_horizontal_margin" android:layout_marginTop="@dimen/activity_vertical_margin" - android:orientation="vertical"> + android:orientation="vertical" + card_view:cardBackgroundColor="?attr/color_background_secondary"> <LinearLayout android:layout_width="match_parent" @@ -429,7 +433,8 @@ android:layout_marginLeft="@dimen/activity_horizontal_margin" android:layout_marginRight="@dimen/activity_horizontal_margin" android:layout_marginTop="@dimen/activity_vertical_margin" - android:orientation="vertical"> + android:orientation="vertical" + card_view:cardBackgroundColor="?attr/color_background_secondary"> <LinearLayout android:layout_width="match_parent" diff --git a/src/main/res/layout/activity_publish_profile_picture.xml b/src/main/res/layout/activity_publish_profile_picture.xml index 90dde5b01..1db8a159d 100644 --- a/src/main/res/layout/activity_publish_profile_picture.xml +++ b/src/main/res/layout/activity_publish_profile_picture.xml @@ -1,11 +1,12 @@ <?xml version="1.0" encoding="utf-8"?> <layout xmlns:android="http://schemas.android.com/apk/res/android" - xmlns:app="http://schemas.android.com/apk/res-auto"> + xmlns:app="http://schemas.android.com/apk/res-auto" + xmlns:card_view="http://schemas.android.com/tools"> <RelativeLayout android:layout_width="match_parent" android:layout_height="match_parent" - android:background="?attr/color_background_secondary"> + android:background="?attr/color_background_tertiary"> <include android:id="@+id/toolbar" @@ -18,7 +19,8 @@ android:layout_marginBottom="@dimen/activity_vertical_margin" android:layout_marginLeft="@dimen/activity_horizontal_margin" android:layout_marginRight="@dimen/activity_horizontal_margin" - android:layout_marginTop="@dimen/activity_vertical_margin"> + android:layout_marginTop="@dimen/activity_vertical_margin" + card_view:cardBackgroundColor="?attr/color_background_secondary"> <LinearLayout android:layout_width="match_parent" diff --git a/src/main/res/layout/activity_show_locaction.xml b/src/main/res/layout/activity_show_locaction.xml index b7a98765f..6b560c2a7 100644 --- a/src/main/res/layout/activity_show_locaction.xml +++ b/src/main/res/layout/activity_show_locaction.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="?attr/color_background_secondary"> + android:background="?attr/color_background_tertiary"> <include android:id="@+id/toolbar" @@ -18,7 +18,7 @@ <WebView android:id="@+id/webView" android:layout_width="match_parent" - android:layout_height="match_parent"></WebView> + android:layout_height="match_parent" /> </LinearLayout> <android.support.design.widget.FloatingActionButton diff --git a/src/main/res/layout/activity_trust_keys.xml b/src/main/res/layout/activity_trust_keys.xml index 2fe9250f1..7b6ee2fda 100644 --- a/src/main/res/layout/activity_trust_keys.xml +++ b/src/main/res/layout/activity_trust_keys.xml @@ -1,10 +1,11 @@ <?xml version="1.0" encoding="utf-8"?> -<layout xmlns:android="http://schemas.android.com/apk/res/android"> +<layout xmlns:android="http://schemas.android.com/apk/res/android" + xmlns:card_view="http://schemas.android.com/apk/res-auto"> <RelativeLayout android:layout_width="match_parent" android:layout_height="match_parent" - android:background="?attr/color_background_secondary"> + android:background="?attr/color_background_tertiary"> <include android:id="@+id/toolbar" @@ -29,7 +30,8 @@ android:layout_marginLeft="@dimen/activity_horizontal_margin" android:layout_marginRight="@dimen/activity_horizontal_margin" android:layout_marginTop="@dimen/activity_vertical_margin" - android:visibility="gone"> + android:visibility="gone" + card_view:cardBackgroundColor="?attr/color_background_secondary"> <LinearLayout android:layout_width="match_parent" @@ -100,7 +102,8 @@ android:layout_marginLeft="@dimen/activity_horizontal_margin" android:layout_marginRight="@dimen/activity_horizontal_margin" android:layout_marginTop="@dimen/activity_vertical_margin" - android:visibility="gone"> + android:visibility="gone" + card_view:cardBackgroundColor="?attr/color_background_secondary"> <LinearLayout android:layout_width="match_parent" diff --git a/src/main/res/layout/activity_updater.xml b/src/main/res/layout/activity_updater.xml index 9fe33c0c9..7dc7bae15 100644 --- a/src/main/res/layout/activity_updater.xml +++ b/src/main/res/layout/activity_updater.xml @@ -3,7 +3,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="?attr/color_background_secondary" + android:background="?attr/color_background_tertiary" tools:context="${applicationId}.ui.UpdaterActivity"> <include xmlns:android="http://schemas.android.com/apk/res/android" diff --git a/src/main/res/layout/activity_verify_otr.xml b/src/main/res/layout/activity_verify_otr.xml index 899b2fa31..70f9d8e6c 100644 --- a/src/main/res/layout/activity_verify_otr.xml +++ b/src/main/res/layout/activity_verify_otr.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="?attr/color_background_secondary"> + android:background="?attr/color_background_tertiary"> <ScrollView android:layout_width="fill_parent" diff --git a/src/main/res/layout/contact.xml b/src/main/res/layout/contact.xml index f5bd1506b..9635d4c47 100644 --- a/src/main/res/layout/contact.xml +++ b/src/main/res/layout/contact.xml @@ -42,7 +42,7 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_marginLeft="-2dp" - android:orientation="horizontal"></com.wefika.flowlayout.FlowLayout> + android:orientation="horizontal" /> <TextView android:id="@+id/key" diff --git a/src/main/res/layout/dialog_show_password.xml b/src/main/res/layout/dialog_show_password.xml index 7d73f0dec..116a3e05b 100644 --- a/src/main/res/layout/dialog_show_password.xml +++ b/src/main/res/layout/dialog_show_password.xml @@ -3,19 +3,19 @@ android:layout_width="match_parent" android:layout_height="match_parent" android:orientation="vertical" + android:paddingBottom="?attr/dialog_vertical_padding" android:paddingLeft="?attr/dialog_horizontal_padding" android:paddingRight="?attr/dialog_horizontal_padding" - android:paddingBottom="?attr/dialog_vertical_padding" android:paddingTop="?attr/dialog_vertical_padding"> <TextView android:id="@+id/password" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:typeface="monospace" - android:textSize="?attr/TextSizeBody" - android:fontFamily="monospace" android:layout_gravity="center_horizontal" - android:textColor="@color/black87"></TextView> + android:fontFamily="monospace" + android:textColor="@color/black87" + android:textSize="?attr/TextSizeBody" + android:typeface="monospace" /> </LinearLayout>
\ No newline at end of file diff --git a/src/main/res/layout/fragment_conversation.xml b/src/main/res/layout/fragment_conversation.xml index 16f48bde2..eca67f91e 100644 --- a/src/main/res/layout/fragment_conversation.xml +++ b/src/main/res/layout/fragment_conversation.xml @@ -22,7 +22,7 @@ android:listSelector="@android:color/transparent" android:stackFromBottom="true" android:transcriptMode="normal" - tools:listitem="@layout/message_sent"></ListView> + tools:listitem="@layout/message_sent" /> <android.support.design.widget.FloatingActionButton android:id="@+id/scroll_to_bottom_button" @@ -92,7 +92,7 @@ android:requiresFadingEdge="horizontal" android:visibility="gone" app:layoutManager="android.support.v7.widget.LinearLayoutManager" - tools:listitem="@layout/media_preview"></android.support.v7.widget.RecyclerView> + tools:listitem="@layout/media_preview" /> <de.pixart.messenger.ui.widget.EditMessage android:id="@+id/textinput" diff --git a/src/main/res/layout/keys_card.xml b/src/main/res/layout/keys_card.xml index 555e80348..7374c7eda 100644 --- a/src/main/res/layout/keys_card.xml +++ b/src/main/res/layout/keys_card.xml @@ -28,7 +28,7 @@ android:id="@+id/foreign_keys_details" android:layout_width="fill_parent" android:layout_height="wrap_content" - android:orientation="vertical"></LinearLayout> + android:orientation="vertical" /> <TextView android:id="@+id/no_keys_to_accept" diff --git a/src/main/res/values/themes.xml b/src/main/res/values/themes.xml index 50cf8e93a..bbfaf6060 100644 --- a/src/main/res/values/themes.xml +++ b/src/main/res/values/themes.xml @@ -258,7 +258,7 @@ <item name="icon_save" type="reference">@drawable/ic_save_white_24dp</item> <item name="icon_done" type="reference">@drawable/ic_done_black_24dp</item> <item name="icon_group" type="reference">@drawable/ic_group_white_24dp</item> - <item name="icon_new" type="reference">@drawable/ic_add_white_24dp</item> + <item name="icon_new" type="reference">@drawable/ic_contacts_white_24dp</item> <item name="icon_quote" type="reference">@drawable/ic_reply_white_24dp</item> <item name="icon_refresh" type="reference">@drawable/ic_refresh_white_24dp</item> <item name="icon_new_attachment" type="reference">@drawable/ic_attach_file_white_24dp</item> @@ -318,7 +318,7 @@ <item name="colorPrimary">@color/primary</item> <item name="colorPrimaryDark">@color/primary_dark</item> <item name="colorAccent">@color/accent</item> - <item name="color_background_primary">@color/grey800</item> + <item name="color_background_primary">@color/grey700</item> <item name="divider">@color/white12</item> <item name="TextSizeBody2">14sp</item> <item name="TextSizeDisplay2">45sp</item> |
