From d61e4cce1075e3561406be96b402def5f90dcd58 Mon Sep 17 00:00:00 2001 From: iNPUTmice Date: Mon, 13 Oct 2014 14:36:19 +0200 Subject: reworked muc details and contact details a bit --- art/ic_action_copy.svg | 108 -------------- art/render.rb | 2 +- res/drawable-hdpi/ic_action_copy.png | Bin 717 -> 381 bytes res/drawable-mdpi/ic_action_copy.png | Bin 585 -> 288 bytes res/drawable-xhdpi/ic_action_copy.png | Bin 763 -> 353 bytes res/drawable-xxhdpi/ic_action_copy.png | Bin 1040 -> 470 bytes res/drawable/section_header.xml | 11 -- res/layout/activity_contact_details.xml | 162 +++++++++++---------- res/layout/activity_edit_account.xml | 108 ++++++++------ res/layout/activity_muc_details.xml | 77 +++++----- res/values-nl/styles.xml | 19 --- res/values/styles.xml | 11 -- .../ui/ConferenceDetailsActivity.java | 3 + .../conversations/ui/EditAccountActivity.java | 12 +- 14 files changed, 190 insertions(+), 323 deletions(-) delete mode 100644 art/ic_action_copy.svg delete mode 100644 res/drawable/section_header.xml delete mode 100644 res/values-nl/styles.xml diff --git a/art/ic_action_copy.svg b/art/ic_action_copy.svg deleted file mode 100644 index 485fd2ed..00000000 --- a/art/ic_action_copy.svg +++ /dev/null @@ -1,108 +0,0 @@ - - - - - - - - - - image/svg+xml - - - - - - - - - - - - - - - diff --git a/art/render.rb b/art/render.rb index a78a2f47..f2d66b9a 100755 --- a/art/render.rb +++ b/art/render.rb @@ -1,6 +1,6 @@ #!/bin/env ruby resolutions={'mdpi'=> 1, 'hdpi' => 1.5, 'xhdpi' => 2, 'xxhdpi' => 3} -images = { 'conversations.svg' => ['ic_launcher', 48], 'conversations_baloon.svg' => ['ic_activity', 32], 'conversations_mono.svg' => ['ic_notification', 24], 'ic_received_indicator.svg' => ['ic_received_indicator', 12], 'ic_action_copy.svg' => ['ic_action_copy', 32] } +images = { 'conversations.svg' => ['ic_launcher', 48], 'conversations_baloon.svg' => ['ic_activity', 32], 'conversations_mono.svg' => ['ic_notification', 24], 'ic_received_indicator.svg' => ['ic_received_indicator', 12] } images.each do |source, result| resolutions.each do |name, factor| size = factor * result[1] diff --git a/res/drawable-hdpi/ic_action_copy.png b/res/drawable-hdpi/ic_action_copy.png index b47bb69c..22327391 100644 Binary files a/res/drawable-hdpi/ic_action_copy.png and b/res/drawable-hdpi/ic_action_copy.png differ diff --git a/res/drawable-mdpi/ic_action_copy.png b/res/drawable-mdpi/ic_action_copy.png index 75788f1f..71348202 100644 Binary files a/res/drawable-mdpi/ic_action_copy.png and b/res/drawable-mdpi/ic_action_copy.png differ diff --git a/res/drawable-xhdpi/ic_action_copy.png b/res/drawable-xhdpi/ic_action_copy.png index a45423f6..5ddf1513 100644 Binary files a/res/drawable-xhdpi/ic_action_copy.png and b/res/drawable-xhdpi/ic_action_copy.png differ diff --git a/res/drawable-xxhdpi/ic_action_copy.png b/res/drawable-xxhdpi/ic_action_copy.png index 3a0e8449..a0508df8 100644 Binary files a/res/drawable-xxhdpi/ic_action_copy.png and b/res/drawable-xxhdpi/ic_action_copy.png differ diff --git a/res/drawable/section_header.xml b/res/drawable/section_header.xml deleted file mode 100644 index 9db04f90..00000000 --- a/res/drawable/section_header.xml +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - \ No newline at end of file diff --git a/res/layout/activity_contact_details.xml b/res/layout/activity_contact_details.xml index 1dceab53..f7cb2198 100644 --- a/res/layout/activity_contact_details.xml +++ b/res/layout/activity_contact_details.xml @@ -1,110 +1,114 @@ - + - - - + android:orientation="vertical" > - + android:layout_margin="8dp" + android:background="@drawable/infocard_border" + android:padding="16dp" > - + + android:layout_marginLeft="16dp" + android:layout_toRightOf="@+id/details_contact_badge" + android:orientation="vertical" > + android:text="@string/account_settings_example_jabber_id" + android:textColor="@color/primarytext" + android:textSize="?attr/TextSizeHeadline" + android:textStyle="bold" /> - + + + + + + + + + - - - - - + android:layout_alignParentRight="true" + android:layout_below="@+id/details_jidbox" + android:layout_marginTop="32dp" + android:text="@string/using_account" + android:textColor="@color/secondarytext" + android:textSize="?attr/TextSizeInfo" /> + - - - - + android:layout_margin="8dp" + android:background="@drawable/infocard_border" + android:divider="?android:dividerHorizontal" + android:orientation="vertical" + android:padding="8dp" + android:showDividers="middle" > + - \ No newline at end of file + \ No newline at end of file diff --git a/res/layout/activity_edit_account.xml b/res/layout/activity_edit_account.xml index 91bda7b1..97289628 100644 --- a/res/layout/activity_edit_account.xml +++ b/res/layout/activity_edit_account.xml @@ -2,7 +2,7 @@ + android:background="@color/secondarybackground" > + android:padding="16dp" > + android:inputType="textEmailAddress" + android:textColor="@color/primarytext" + android:textColorHint="@color/secondarytext" + android:textSize="?attr/TextSizeBody" /> + android:inputType="textPassword" + android:textColor="@color/primarytext" + android:textColorHint="@color/secondarytext" + android:textSize="?attr/TextSizeBody" /> + android:visibility="gone" + android:textColor="@color/primarytext" + android:textColorHint="@color/secondarytext" + android:textSize="?attr/TextSizeBody" /> - - - + android:text="@string/server_info_session_established" + android:textColor="@color/primarytext" + android:textSize="?attr/TextSizeBody" /> + android:layout_gravity="right" + android:textColor="@color/primarytext" + android:textSize="?attr/TextSizeBody" /> + android:textColor="@color/primarytext" + android:textSize="?attr/TextSizeBody" /> + android:layout_gravity="right" + android:textColor="@color/primarytext" + android:textSize="?attr/TextSizeBody" /> + android:text="@string/server_info_stream_management" + android:textColor="@color/primarytext" + android:textSize="?attr/TextSizeBody" /> + android:layout_gravity="right" + android:textColor="@color/primarytext" + android:textSize="?attr/TextSizeBody" /> + android:text="@string/server_info_carbon_messages" + android:textColor="@color/primarytext" + android:textSize="?attr/TextSizeBody" /> + android:layout_gravity="right" + android:textColor="@color/primarytext" + android:textSize="?attr/TextSizeBody" /> - + + android:id="@+id/otr_fingerprint_box" + android:layout_marginTop="32dp"> + + android:orientation="vertical"> + + + android:visibility="visible" /> + + @@ -251,4 +269,4 @@ android:textColor="@color/secondarytext" /> - + \ No newline at end of file diff --git a/res/layout/activity_muc_details.xml b/res/layout/activity_muc_details.xml index 1a676548..f689f10d 100644 --- a/res/layout/activity_muc_details.xml +++ b/res/layout/activity_muc_details.xml @@ -1,46 +1,35 @@ + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:background="@color/secondarybackground" > - + - - - + android:textSize="?attr/TextSizeHeadline" + android:textStyle="bold" + android:layout_marginBottom="16dp"/> + + android:layout_height="wrap_content"> - - - - + android:layout_gravity="right" + android:layout_marginTop="32dp" + android:text="@string/using_account" + android:textColor="@color/secondarytext" + android:textSize="?attr/TextSizeInfo" /> + + + + -