diff options
Diffstat (limited to '')
| -rw-r--r-- | res/drawable-hdpi/ic_action_copy.png | bin | 717 -> 381 bytes | |||
| -rw-r--r-- | res/drawable-mdpi/ic_action_copy.png | bin | 585 -> 288 bytes | |||
| -rw-r--r-- | res/drawable-xhdpi/ic_action_copy.png | bin | 763 -> 353 bytes | |||
| -rw-r--r-- | res/drawable-xxhdpi/ic_action_copy.png | bin | 1040 -> 470 bytes | |||
| -rw-r--r-- | res/drawable/section_header.xml | 11 | ||||
| -rw-r--r-- | res/layout/activity_contact_details.xml | 162 | ||||
| -rw-r--r-- | res/layout/activity_edit_account.xml | 108 | ||||
| -rw-r--r-- | res/layout/activity_muc_details.xml | 77 | ||||
| -rw-r--r-- | res/values-nl/styles.xml | 19 | ||||
| -rw-r--r-- | res/values/styles.xml | 11 |
10 files changed, 181 insertions, 207 deletions
diff --git a/res/drawable-hdpi/ic_action_copy.png b/res/drawable-hdpi/ic_action_copy.png Binary files differindex b47bb69c..22327391 100644 --- a/res/drawable-hdpi/ic_action_copy.png +++ b/res/drawable-hdpi/ic_action_copy.png diff --git a/res/drawable-mdpi/ic_action_copy.png b/res/drawable-mdpi/ic_action_copy.png Binary files differindex 75788f1f..71348202 100644 --- a/res/drawable-mdpi/ic_action_copy.png +++ b/res/drawable-mdpi/ic_action_copy.png diff --git a/res/drawable-xhdpi/ic_action_copy.png b/res/drawable-xhdpi/ic_action_copy.png Binary files differindex a45423f6..5ddf1513 100644 --- a/res/drawable-xhdpi/ic_action_copy.png +++ b/res/drawable-xhdpi/ic_action_copy.png diff --git a/res/drawable-xxhdpi/ic_action_copy.png b/res/drawable-xxhdpi/ic_action_copy.png Binary files differindex 3a0e8449..a0508df8 100644 --- a/res/drawable-xxhdpi/ic_action_copy.png +++ b/res/drawable-xxhdpi/ic_action_copy.png 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 @@ -<?xml version="1.0" encoding="utf-8"?> -<shape xmlns:android="http://schemas.android.com/apk/res/android" - android:shape="rectangle" > - - <size - android:height="1.5dp" - android:width="2000dp" /> - - <solid android:color="@color/divider" /> - -</shape>
\ 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 @@ <?xml version="1.0" encoding="utf-8"?> -<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="@color/secondarybackground" - android:orientation="vertical" > +<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:background="@color/secondarybackground" > - <RelativeLayout + <LinearLayout android:layout_width="fill_parent" android:layout_height="wrap_content" - android:layout_margin="8dp" - android:background="@drawable/infocard_border" - android:padding="8dp" > - - <QuickContactBadge - android:id="@+id/details_contact_badge" - android:layout_width="72dp" - android:layout_height="72dp" - android:layout_alignParentTop="true" - android:scaleType="centerCrop" /> + android:orientation="vertical" > - <LinearLayout - android:id="@+id/details_jidbox" - android:layout_width="wrap_content" + <RelativeLayout + android:layout_width="fill_parent" android:layout_height="wrap_content" - android:layout_marginLeft="16dp" - android:layout_toRightOf="@+id/details_contact_badge" - android:orientation="vertical" > + android:layout_margin="8dp" + android:background="@drawable/infocard_border" + android:padding="16dp" > - <TextView - android:id="@+id/details_contactjid" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:singleLine="true" - android:text="@string/account_settings_example_jabber_id" - android:textColor="@color/primarytext" - android:textSize="?attr/TextSizeHeadline" - android:textStyle="bold" /> + <QuickContactBadge + android:id="@+id/details_contact_badge" + android:layout_width="72dp" + android:layout_height="72dp" + android:layout_alignParentTop="true" + android:scaleType="centerCrop" /> <LinearLayout + android:id="@+id/details_jidbox" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:orientation="horizontal" > + android:layout_marginLeft="16dp" + android:layout_toRightOf="@+id/details_contact_badge" + android:orientation="vertical" > <TextView - android:id="@+id/details_contactstatus" + android:id="@+id/details_contactjid" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:textColor="@color/secondarytext" - android:textSize="?attr/TextSizeBody" /> + android:text="@string/account_settings_example_jabber_id" + android:textColor="@color/primarytext" + android:textSize="?attr/TextSizeHeadline" + android:textStyle="bold" /> - <TextView + <LinearLayout + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:orientation="horizontal" > + + <TextView + android:id="@+id/details_contactstatus" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textColor="@color/secondarytext" + android:textSize="?attr/TextSizeBody" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:text=" · " + android:textColor="@color/secondarytext" + android:textSize="?attr/TextSizeBody" /> + + <TextView + android:id="@+id/details_lastseen" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:singleLine="true" + android:textColor="@color/secondarytext" + android:textSize="?attr/TextSizeBody" /> + </LinearLayout> + + <CheckBox + android:id="@+id/details_send_presence" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text=" · " - android:textColor="@color/secondarytext" + android:layout_marginTop="8dp" + android:text="@string/send_presence_updates" + android:textColor="@color/primarytext" android:textSize="?attr/TextSizeBody" /> - <TextView - android:id="@+id/details_lastseen" + <CheckBox + android:id="@+id/details_receive_presence" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:singleLine="true" - android:textColor="@color/secondarytext" + android:text="@string/receive_presence_updates" + android:textColor="@color/primarytext" android:textSize="?attr/TextSizeBody" /> </LinearLayout> - <CheckBox - android:id="@+id/details_send_presence" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:layout_marginTop="8dp" - android:text="@string/send_presence_updates" - android:textColor="@color/primarytext" - android:textSize="?attr/TextSizeBody" /> - - <CheckBox - android:id="@+id/details_receive_presence" + <TextView + android:id="@+id/details_account" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="@string/receive_presence_updates" - android:textColor="@color/primarytext" - android:textSize="?attr/TextSizeBody" /> - </LinearLayout> + 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" /> + </RelativeLayout> - <TextView - android:id="@+id/details_account" - android:layout_width="wrap_content" + <LinearLayout + android:id="@+id/details_contact_keys" + android:layout_width="fill_parent" android:layout_height="wrap_content" - 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" /> - </RelativeLayout> - - <LinearLayout - android:id="@+id/details_contact_keys" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_margin="8dp" - android:background="@drawable/infocard_border" - android:divider="?android:dividerHorizontal" - android:orientation="vertical" - android:padding="8dp" - android:showDividers="middle" > + android:layout_margin="8dp" + android:background="@drawable/infocard_border" + android:divider="?android:dividerHorizontal" + android:orientation="vertical" + android:padding="8dp" + android:showDividers="middle" > + </LinearLayout> </LinearLayout> -</LinearLayout>
\ No newline at end of file +</ScrollView>
\ 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 @@ <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/primarybackground" > + android:background="@color/secondarybackground" > <ScrollView android:layout_width="fill_parent" @@ -19,8 +19,10 @@ android:id="@+id/editor" android:layout_width="fill_parent" android:layout_height="wrap_content" + android:layout_margin="8dp" + android:background="@drawable/infocard_border" android:orientation="vertical" - android:padding="8dp" > + android:padding="16dp" > <TextView android:layout_width="wrap_content" @@ -34,7 +36,10 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:hint="@string/account_settings_example_jabber_id" - android:inputType="textEmailAddress" /> + android:inputType="textEmailAddress" + android:textColor="@color/primarytext" + android:textColorHint="@color/secondarytext" + android:textSize="?attr/TextSizeBody" /> <TextView android:layout_width="wrap_content" @@ -49,7 +54,10 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:hint="@string/password" - android:inputType="textPassword" /> + android:inputType="textPassword" + android:textColor="@color/primarytext" + android:textColorHint="@color/secondarytext" + android:textSize="?attr/TextSizeBody" /> <CheckBox android:id="@+id/account_register_new" @@ -76,31 +84,25 @@ android:layout_marginTop="8dp" android:hint="@string/confirm_password" android:inputType="textPassword" - android:visibility="gone" /> + android:visibility="gone" + android:textColor="@color/primarytext" + android:textColorHint="@color/secondarytext" + android:textSize="?attr/TextSizeBody" /> </LinearLayout> - <LinearLayout + <LinearLayout android:id="@+id/stats" android:layout_width="fill_parent" android:layout_height="fill_parent" - android:layout_marginTop="8dp" + android:layout_margin="8dp" + android:background="@drawable/infocard_border" android:orientation="vertical" android:padding="16dp" android:visibility="gone" > - <TextView - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:gravity="center_horizontal" - android:text="@string/additional_information" - android:textColor="@color/secondarytext" - android:textSize="?attr/TextSizeHeadline" - android:textStyle="bold" /> - <TableLayout android:layout_width="match_parent" android:layout_height="wrap_content" - android:layout_marginTop="8dp" android:stretchColumns="1" > <TableRow @@ -110,13 +112,17 @@ <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="@string/server_info_session_established" /> + android:text="@string/server_info_session_established" + android:textColor="@color/primarytext" + android:textSize="?attr/TextSizeBody" /> <TextView android:id="@+id/session_est" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="right" /> + android:layout_gravity="right" + android:textColor="@color/primarytext" + android:textSize="?attr/TextSizeBody" /> </TableRow> <TableRow @@ -127,13 +133,16 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:text="@string/server_info_pep" - android:textColor="@color/primarytext" /> + android:textColor="@color/primarytext" + android:textSize="?attr/TextSizeBody" /> <TextView android:id="@+id/server_info_pep" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="right" /> + android:layout_gravity="right" + android:textColor="@color/primarytext" + android:textSize="?attr/TextSizeBody" /> </TableRow> <TableRow @@ -143,13 +152,17 @@ <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="@string/server_info_stream_management" /> + android:text="@string/server_info_stream_management" + android:textColor="@color/primarytext" + android:textSize="?attr/TextSizeBody" /> <TextView android:id="@+id/server_info_sm" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="right" /> + android:layout_gravity="right" + android:textColor="@color/primarytext" + android:textSize="?attr/TextSizeBody" /> </TableRow> <TableRow @@ -159,59 +172,64 @@ <TextView android:layout_width="wrap_content" android:layout_height="wrap_content" - android:text="@string/server_info_carbon_messages" /> + android:text="@string/server_info_carbon_messages" + android:textColor="@color/primarytext" + android:textSize="?attr/TextSizeBody" /> <TextView android:id="@+id/server_info_carbons" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:layout_gravity="right" /> + android:layout_gravity="right" + android:textColor="@color/primarytext" + android:textSize="?attr/TextSizeBody" /> </TableRow> </TableLayout> - <TextView - android:id="@+id/otr_fingerprint_headline" - android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:layout_marginTop="16dp" - android:gravity="center_horizontal" - android:text="@string/otr_fingerprint" - android:textColor="@color/secondarytext" - android:textSize="?attr/TextSizeHeadline" - android:textStyle="bold" /> + <RelativeLayout android:layout_width="wrap_content" android:layout_height="match_parent" - android:layout_marginTop="8dp"> + android:id="@+id/otr_fingerprint_box" + android:layout_marginTop="32dp"> + <LinearLayout android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_alignParentLeft="true" android:layout_toLeftOf="@+id/action_copy_to_clipboard" - android:orientation="vertical" - android:layout_centerVertical="true"> + android:orientation="vertical"> <TextView android:id="@+id/otr_fingerprint" android:layout_width="wrap_content" android:layout_height="wrap_content" + android:textColor="@color/primarytext" android:textSize="?attr/TextSizeBody" android:typeface="monospace" /> + + <TextView + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:textColor="@color/secondarytext" + android:textSize="?attr/TextSizeInfo" + android:text="@string/otr_fingerprint"/> </LinearLayout> <ImageButton android:id="@+id/action_copy_to_clipboard" - android:layout_width="32dp" - android:layout_height="32dp" - android:background="?android:selectableItemBackground" + android:layout_width="wrap_content" + android:layout_height="wrap_content" android:layout_alignParentRight="true" android:layout_centerVertical="true" - android:padding="4dp" - android:scaleType="fitXY" + android:background="?android:selectableItemBackground" + android:padding="8dp" android:src="@drawable/ic_action_copy" - android:visibility="invisible" /> + android:visibility="visible" /> </RelativeLayout> + + </LinearLayout> </LinearLayout> </ScrollView> @@ -251,4 +269,4 @@ android:textColor="@color/secondarytext" /> </LinearLayout> -</RelativeLayout> +</RelativeLayout>
\ 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 @@ <?xml version="1.0" encoding="utf-8"?> <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="match_parent" - android:layout_height="match_parent" - android:background="@color/primarybackground" > + android:layout_width="fill_parent" + android:layout_height="fill_parent" + android:background="@color/secondarybackground" > <LinearLayout - android:layout_width="wrap_content" + android:layout_width="fill_parent" android:layout_height="wrap_content" android:orientation="vertical" > - <TextView - style="@style/sectionHeader" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:padding="8dp" - android:text="@string/muc_details_conference" /> + <LinearLayout + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_margin="8dp" + android:background="@drawable/infocard_border" + android:orientation="vertical" + android:padding="16dp" > <TextView android:id="@+id/muc_jabberid" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:padding="8dp" - android:singleLine="true" android:text="@string/account_settings_example_jabber_id" android:textColor="@color/primarytext" - android:textSize="?attr/TextSizeBody" /> - - <TextView - style="@style/sectionHeader" - android:layout_width="wrap_content" - android:layout_height="wrap_content" - android:paddingLeft="8dp" - android:paddingRight="8dp" - android:paddingTop="8dp" - android:text="@string/you" /> - + android:textSize="?attr/TextSizeHeadline" + android:textStyle="bold" + android:layout_marginBottom="16dp"/> + <RelativeLayout android:layout_width="fill_parent" - android:layout_height="wrap_content" - android:background="?android:attr/activatedBackgroundIndicator" - android:padding="8dp" - android:paddingBottom="8dp" > + android:layout_height="wrap_content"> <ImageView android:id="@+id/your_photo" @@ -85,22 +74,26 @@ android:padding="8dp" android:src="@drawable/ic_action_edit_dark" /> </RelativeLayout> - - <LinearLayout - android:id="@+id/muc_more_details" - android:layout_width="fill_parent" - android:layout_height="fill_parent" - android:orientation="vertical" > - - <TextView - android:id="@+id/muc_participants_header" - style="@style/sectionHeader" + <TextView + android:id="@+id/details_account" android:layout_width="wrap_content" android:layout_height="wrap_content" - android:paddingLeft="8dp" - android:paddingRight="8dp" - android:paddingTop="8dp" - android:text="@string/muc_details_other_members" /> + android:layout_gravity="right" + android:layout_marginTop="32dp" + android:text="@string/using_account" + android:textColor="@color/secondarytext" + android:textSize="?attr/TextSizeInfo" /> + </LinearLayout> + + <LinearLayout + android:id="@+id/muc_more_details" + android:layout_width="fill_parent" + android:layout_height="wrap_content" + android:layout_margin="8dp" + android:background="@drawable/infocard_border" + android:orientation="vertical" + android:padding="8dp" > + <LinearLayout android:id="@+id/muc_members" @@ -111,7 +104,6 @@ android:orientation="vertical" android:showDividers="middle" > </LinearLayout> - </LinearLayout> <Button android:id="@+id/invite" @@ -123,4 +115,5 @@ android:text="@string/invite_contact" /> </LinearLayout> +</LinearLayout> </ScrollView>
\ No newline at end of file diff --git a/res/values-nl/styles.xml b/res/values-nl/styles.xml deleted file mode 100644 index 1468283e..00000000 --- a/res/values-nl/styles.xml +++ /dev/null @@ -1,19 +0,0 @@ -<resources xmlns:android="http://schemas.android.com/apk/res/android"> - - <style name="sectionHeader" parent="android:Widget.Holo.Light.TextView"> - <item name="android:drawableBottom">@drawable/section_header</item> - <item name="android:drawablePadding">4dp</item> - <item name="android:layout_marginTop">8dp</item> - <item name="android:textSize">14sp</item> - <item name="android:textAllCaps">true</item> - <item name="android:textColor">#5b5b5b</item> - <item name="android:textStyle">bold</item> - </style> - - <style name="Divider"> - <item name="android:layout_width">match_parent</item> - <item name="android:layout_height">1.5dp</item> - <item name="android:background">#b7b7b7</item> - </style> - -</resources>
\ No newline at end of file diff --git a/res/values/styles.xml b/res/values/styles.xml index a827fe36..64bde770 100644 --- a/res/values/styles.xml +++ b/res/values/styles.xml @@ -1,15 +1,4 @@ <resources xmlns:android="http://schemas.android.com/apk/res/android"> - - <style name="sectionHeader" parent="android:Widget.Holo.Light.TextView"> - <item name="android:drawableBottom">@drawable/section_header</item> - <item name="android:drawablePadding">4dp</item> - <item name="android:layout_marginTop">8dp</item> - <item name="android:textSize">14sp</item> - <item name="android:textAllCaps">true</item> - <item name="android:textColor">@color/primarytext</item> - <item name="android:textStyle">bold</item> - </style> - <style name="Divider"> <item name="android:layout_width">match_parent</item> <item name="android:layout_height">1.5dp</item> |
