moparisthebest/Conversations
1
0
Fork 0
mirror of https://github.com/moparisthebest/Conversations synced 2024-11-24 01:32:17 -05:00
Code Issues Releases Wiki Activity

uniformed colors. made colors a little material

Browse Source
This commit is contained in:
iNPUTmice 2014-07-08 11:41:19 +02:00
parent 37a8b87235
commit 3ac70d4b86
23 changed files with 107 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
res/drawable/es_slidingpane_shadow.xml
View File

@ -1,7 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android" >
<gradient
android:endColor="#cccccc"
android:startColor="#00000000" />
android:endColor="@color/divider"
android:startColor="@android:color/transparent" />
<size android:width="3.0dp" android:height="0.5dp" />
</shape>

2
res/drawable/message_border.xml
View File

@ -2,5 +2,5 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle">
<corners android:radius="2dp"/>
<padding android:left="1.5dp" android:right="1.5dp" android:top="1.5dp" android:bottom="1.5dp"/>
<solid android:color="#cecece"/>
<solid android:color="@color/divider"/>
</shape>

4
res/drawable/section_header.xml
View File

@ -4,7 +4,7 @@
<size
android:height="1.5dp"
android:width="1000dp" />
android:width="2000dp" />
<solid android:color="#b7b7b7" />
<solid android:color="@color/divider" />
</shape>

7
res/layout-sw320dp/fragment_conversations_overview.xml
View File

@ -7,16 +7,16 @@
android:layout_width="288dp"
android:layout_height="match_parent"
android:orientation="vertical"
android:background="#eeeeee"
android:background="@color/primarybackground"
>
<ListView
android:id="@+id/list"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:divider="#b5b5b5"
android:divider="@color/divider"
android:dividerHeight="1dp"
android:background="#eeeeee"
android:background="@color/primarybackground"
/>
</LinearLayout>
@ -25,7 +25,6 @@
android:layout_width="fill_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="#e5e5e5"
android:orientation="vertical">
</LinearLayout>
</android.support.v4.widget.SlidingPaneLayout>

7
res/layout-sw360dp/fragment_conversations_overview.xml
View File

@ -7,16 +7,16 @@
android:layout_width="324dp"
android:layout_height="match_parent"
android:orientation="vertical"
android:background="#eeeeee"
android:background="@color/primarybackground"
>
<ListView
android:id="@+id/list"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:divider="#b5b5b5"
android:divider="@color/divider"
android:dividerHeight="1dp"
android:background="#eeeeee"
android:background="@color/primarybackground"
/>
</LinearLayout>
@ -25,7 +25,6 @@
android:layout_width="fill_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="#e5e5e5"
android:orientation="vertical">
</LinearLayout>
</android.support.v4.widget.SlidingPaneLayout>

7
res/layout-sw384dp/fragment_conversations_overview.xml
View File

@ -7,16 +7,16 @@
android:layout_width="345dp"
android:layout_height="match_parent"
android:orientation="vertical"
android:background="#eeeeee"
android:background="@color/primarybackground"
>
<ListView
android:id="@+id/list"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:divider="#b5b5b5"
android:divider="@color/divider"
android:dividerHeight="1dp"
android:background="#eeeeee"
android:background="@color/primarybackground"
/>
</LinearLayout>
@ -25,7 +25,6 @@
android:layout_width="fill_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="#e5e5e5"
android:orientation="vertical">
</LinearLayout>
</android.support.v4.widget.SlidingPaneLayout>

7
res/layout-sw600dp/fragment_conversations_overview.xml
View File

@ -7,16 +7,16 @@
android:layout_width="240dp"
android:layout_height="match_parent"
android:orientation="vertical"
android:background="#eeeeee"
android:background="@color/primarybackground"
>
<ListView
android:id="@+id/list"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:divider="#b5b5b5"
android:divider="@color/divider"
android:dividerHeight="1dp"
android:background="#eeeeee"
android:background="@color/primarybackground"
/>
</LinearLayout>
@ -25,7 +25,6 @@
android:layout_width="fill_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="#e5e5e5"
android:orientation="vertical">
</LinearLayout>
</android.support.v4.widget.SlidingPaneLayout>

7
res/layout-sw720dp/fragment_conversations_overview.xml
View File

@ -7,16 +7,16 @@
android:layout_width="288dp"
android:layout_height="match_parent"
android:orientation="vertical"
android:background="#eeeeee"
android:background="@color/primarybackground"
>
<ListView
android:id="@+id/list"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:divider="#b5b5b5"
android:divider="@color/divider"
android:dividerHeight="1dp"
android:background="#eeeeee"
android:background="@color/primarybackground"
/>
</LinearLayout>
@ -25,7 +25,6 @@
android:layout_width="fill_parent"
android:layout_height="match_parent"
android:layout_weight="1"
android:background="#e5e5e5"
android:orientation="vertical">
</LinearLayout>
</android.support.v4.widget.SlidingPaneLayout>

5
res/layout/account_row.xml
View File

@ -20,6 +20,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="18sp"
android:textColor="@color/primarytext"
android:singleLine="true"
android:scrollHorizontally="false"/>
@ -35,14 +36,14 @@
android:layout_height="wrap_content"
android:text="@string/account_status"
android:textStyle="bold"
android:textSize="14sp" />
android:textSize="14sp"
android:textColor="@color/primarytext"/>
<TextView
android:id="@+id/account_status"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="4dp"
android:textColor="#669900"
android:text="@string/account_status_unknown"
android:textStyle="bold"
android:textSize="14sp"/>

26
res/layout/activity_contact_details.xml
View File

@ -2,7 +2,7 @@
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#e5e5e5">
android:background="@color/primarybackground">
<LinearLayout
android:layout_width="match_parent"
@ -14,7 +14,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="8dp"
android:text="@string/action_contact_details" />
android:text="@string/action_contact_details"
android:textColor="@color/primarytext"/>
<RelativeLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -43,8 +44,8 @@
android:layout_height="wrap_content"
android:paddingLeft="8dp"
android:singleLine="true"
android:textColor="#5b5b5b"
android:textSize="14sp" />
android:textSize="14sp"
android:textColor="@color/primarytext"/>
<TextView
android:id="@+id/details_contactstatus"
@ -52,6 +53,7 @@
android:layout_height="wrap_content"
android:paddingLeft="16dp"
android:textSize="18sp"
android:textColor="@color/primarytext"
android:textStyle="bold" />
<TextView
android:id="@+id/details_lastseen"
@ -59,8 +61,8 @@
android:layout_height="wrap_content"
android:paddingLeft="8dp"
android:singleLine="true"
android:textColor="#5b5b5b"
android:textSize="14sp" />
android:textSize="14sp"
android:textColor="@color/primarytext"/>
</LinearLayout>
</RelativeLayout>
@ -71,20 +73,22 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="8dp"
android:text="@string/your_account" />
android:text="@string/your_account"
android:textColor="@color/primarytext"/>
<TextView
android:id="@+id/details_account"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="8dp"
android:textSize="14sp"
android:textColor="#5b5b5b" />
android:textColor="@color/primarytext" />
<TextView
style="@style/sectionHeader"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="8dp"
android:text="@string/subscriptions" />
android:text="@string/subscriptions"
android:textColor="@color/primarytext"/>
<CheckBox
android:id="@+id/details_send_presence"
@ -92,7 +96,7 @@
android:layout_height="wrap_content"
android:text="@string/send_presence_updates"
android:textSize="14sp"
android:textColor="#5b5b5b" />
android:textColor="@color/primarytext" />
<CheckBox
android:id="@+id/details_receive_presence"
@ -100,7 +104,7 @@
android:layout_height="wrap_content"
android:text="@string/receive_presence_updates"
android:textSize="14sp"
android:textColor="#5b5b5b" />
android:textColor="@color/primarytext" />
<TextView
android:id="@+id/ask_again"

27
res/layout/activity_muc_details.xml
View File

@ -2,7 +2,7 @@
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#e5e5e5">
android:background="@color/secondarybackground">
<LinearLayout
android:layout_width="wrap_content"
@ -13,11 +13,12 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:padding="8dp"
android:text="@string/muc_details_conference" />
android:text="@string/muc_details_conference"
android:textColor="@color/primarytext"/>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#eee" >
android:background="@color/primarybackground" >
<EditText
@ -26,7 +27,7 @@
android:layout_height="48dp"
android:layout_alignParentLeft="true"
android:layout_toLeftOf="@+id/muc_edit_subject"
android:background="#eee"
android:background="@color/primarybackground"
android:ems="10"
android:hint="@string/muc_details_conference_subject"
android:inputType="textAutoComplete"
@ -52,8 +53,8 @@
android:layout_height="wrap_content"
android:padding="8dp"
android:singleLine="true"
android:textColor="#5b5b5b"
android:textSize="14sp"/>
android:textSize="14sp"
android:textColor="@color/primarytext"/>
<TextView
style="@style/sectionHeader"
@ -62,12 +63,13 @@
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:paddingTop="8dp"
android:text="@string/muc_details_your_nickname" />
android:text="@string/muc_details_your_nickname"
android:textColor="@color/primarytext"/>
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="#eee" >
android:background="@color/primarybackground" >
<EditText
@ -76,7 +78,7 @@
android:layout_height="48dp"
android:layout_alignParentLeft="true"
android:layout_toLeftOf="@+id/muc_edit_nick"
android:background="#eee"
android:background="@color/primarybackground"
android:ems="10"
android:hint="@string/muc_details_your_nickname"
android:inputType="textEmailAddress"
@ -103,7 +105,7 @@
android:padding="8dp"
android:singleLine="true"
android:textSize="14sp"
android:textColor="#5b5b5b"/>
android:textColor="@color/primarytext"/>
<LinearLayout
android:id="@+id/muc_more_details"
@ -119,12 +121,13 @@
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:paddingTop="8dp"
android:text="@string/muc_details_other_members" />
android:text="@string/muc_details_other_members"
android:textColor="@color/primarytext"/>
<LinearLayout
android:id="@+id/muc_members"
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:orientation="vertical"
android:divider="?android:dividerHorizontal"

6
res/layout/contact.xml
View File

@ -25,23 +25,23 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="18sp"
android:textColor="#5b5b5b"
android:textColor="@color/primarytext"
android:singleLine="true"
/>
<TextView
android:id="@+id/contact_jid"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="#5b5b5b"
android:singleLine="true"
android:textSize="14sp"
android:textColor="@color/primarytext"
/>
<TextView
android:id="@+id/key"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="18sp"
android:textColor="#5b5b5b"
android:textColor="@color/primarytext"
android:typeface="monospace"
android:visibility="gone"
/>

4
res/layout/contact_key.xml
View File

@ -10,13 +10,13 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textSize="18sp"
android:textColor="#5b5b5b"
android:textColor="@color/primarytext"
android:typeface="monospace"
/>
<TextView
android:id="@+id/key_type"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="#5b5b5b"
android:textColor="@color/secondarytext"
/>
</LinearLayout>

11
res/layout/conversation_list_row.xml
View File

@ -25,8 +25,8 @@
android:layout_alignLeft="@+id/conversation_lastwrapper"
android:layout_toLeftOf="@+id/conversation_lastupdate"
android:singleLine="true"
android:textColor="#636363"
android:textSize="18sp"
android:textColor="@color/primarytext"
android:typeface="sans" />
<LinearLayout
@ -41,9 +41,8 @@
android:id="@+id/conversation_lastmsg"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:textColor="#636363"
android:textSize="14sp"
android:textColor="@color/primarytext"
android:singleLine="true"
android:scrollHorizontally="false"
/>
@ -52,7 +51,7 @@
android:id="@+id/conversation_lastimage"
android:layout_width="fill_parent"
android:layout_height="36dp"
android:background="#333333"
android:background="@color/primarytext"
android:scaleType="centerCrop" />
</LinearLayout>
@ -63,8 +62,8 @@
android:layout_alignBaseline="@+id/conversation_name"
android:layout_alignParentRight="true"
android:gravity="right"
android:textColor="#636363"
android:textSize="12sp" />
android:textSize="12sp"
android:textColor="@color/secondarytext"/>
</RelativeLayout>

21
res/layout/dialog_verify_otr.xml
View File

@ -12,7 +12,7 @@
android:layout_height="wrap_content"
android:paddingTop="8dp"
android:text="Jabber ID"
android:textColor="#33B5E5"
android:textColor="@color/primarytext"
android:textSize="18sp"/>
<TextView
@ -20,13 +20,14 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingLeft="8dp"
android:textSize="14sp" />
android:textSize="14sp"
android:textColor="@color/secondarytext"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingTop="8dp"
android:text="OTR fingerprint"
android:textColor="#33B5E5"
android:text="@string/otr_fingerprint"
android:textColor="@color/primarytext"
android:textSize="18sp"/>
<TextView
@ -35,14 +36,15 @@
android:layout_height="wrap_content"
android:paddingLeft="8dp"
android:textSize="14sp"
android:typeface="monospace"/>
android:typeface="monospace"
android:textColor="@color/secondarytext"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:paddingTop="8dp"
android:text="Your fingerprint"
android:textColor="#33B5E5"
android:textSize="18sp"/>
android:text="@string/your_fingerprint"
android:textSize="18sp"
android:textColor="@color/primarytext"/>
<TextView
android:id="@+id/verify_otr_yourprint"
@ -50,5 +52,6 @@
android:layout_height="wrap_content"
android:paddingLeft="8dp"
android:textSize="14sp"
android:typeface="monospace"/>
android:typeface="monospace"
android:textColor="@color/secondarytext"/>
</LinearLayout>

2
res/layout/edit_contact_name.xml
View File

@ -10,7 +10,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/enter_new_name"
android:textColor="#5b5b5b"
android:textColor="@color/primarytext"
android:textSize="18sp" />
<EditText

11
res/layout/fragment_conversation.xml
View File

@ -3,7 +3,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="#e5e5e5" >
android:background="@color/primarybackground" >
<RelativeLayout
android:id="@+id/textsend"
@ -11,7 +11,7 @@
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_alignParentLeft="true"
android:background="#eee" >
android:background="@color/primarybackground" >
<EditText
android:id="@+id/textinput"
@ -19,7 +19,7 @@
android:layout_height="wrap_content"
android:layout_alignParentLeft="true"
android:layout_toLeftOf="@+id/textSendButton"
android:background="#eee"
android:background="@color/primarybackground"
android:ems="10"
android:inputType="textShortMessage|textMultiLine|textCapSentences"
android:minHeight="48dp"
@ -27,7 +27,8 @@
android:paddingBottom="12dp"
android:paddingLeft="8dp"
android:paddingRight="8dp"
android:paddingTop="12dp" >
android:paddingTop="12dp"
android:textColor="@color/primarytext">
<requestFocus />
</EditText>
@ -49,7 +50,7 @@
android:layout_above="@+id/textsend"
android:layout_alignParentLeft="true"
android:layout_below="@+id/info_box"
android:background="#e5e5e5"
android:background="@color/secondarybackground"
android:divider="@null"
android:dividerHeight="0dp"
android:listSelector="@android:color/transparent"

3
res/layout/manage_accounts.xml
View File

@ -8,7 +8,8 @@
android:id="@+id/account_list"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
tools:listitem="@layout/account_row">
android:divider="@color/divider"
android:dividerHeight="1dp">
</ListView>
</LinearLayout>

12
res/layout/message_recieved.xml
View File

@ -20,7 +20,7 @@
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:background="#ededed"
android:background="@color/primarybackground"
android:orientation="vertical"
android:gravity="center_vertical"
android:paddingTop="4dp"
@ -35,7 +35,7 @@
android:adjustViewBounds="true"
android:paddingBottom="2dp"
android:scaleType="fitXY"
android:background="#333333"
android:background="@color/primarytext"
/>
<TextView
@ -44,8 +44,8 @@
android:layout_height="wrap_content"
android:autoLink="web"
android:textIsSelectable="true"
android:textColor="#333333"
android:textSize="14sp"/>
android:textSize="14sp"
android:textColor="@color/primarytext"/>
<Button
android:id="@+id/download_button"
@ -79,8 +79,8 @@
android:layout_gravity="center_vertical"
android:gravity="center_vertical"
android:text="@string/sending"
android:textColor="#8e8e8e"
android:textSize="12sp" />
android:textSize="12sp"
android:textColor="@color/secondarytext"/>
</LinearLayout>
</LinearLayout>
</LinearLayout>

12
res/layout/message_sent.xml
View File

@ -20,7 +20,7 @@
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="fill_parent"
android:background="#ededed"
android:background="@color/primarybackground"
android:orientation="vertical"
android:gravity="center_vertical"
android:paddingTop="4dp"
@ -35,7 +35,7 @@
android:adjustViewBounds="true"
android:paddingBottom="2dp"
android:scaleType="fitXY"
android:background="#333333"
android:background="@color/primarytext"
/>
<TextView
@ -44,8 +44,8 @@
android:layout_height="wrap_content"
android:autoLink="web"
android:textIsSelectable="true"
android:textColor="#333333"
android:textSize="14sp" />
android:textSize="14sp"
android:textColor="@color/primarytext"/>
<LinearLayout
android:layout_width="wrap_content"
@ -61,8 +61,8 @@
android:layout_gravity="center_vertical"
android:gravity="center_vertical"
android:text="@string/sending"
android:textColor="#8e8e8e"
android:textSize="12sp" />
android:textSize="12sp"
android:textColor="@color/secondarytext"/>
<ImageView
android:id="@+id/security_indicator"

19
res/values-fr/styles.xml
View File

@ -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>

9
res/values/colors.xml Normal file
View File

@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<color name="primarytext" type="color">#de000000</color>
<color name="secondarytext" type="color">#8a000000</color>
<color name="primarybackground" type="color">#fffafafa</color>
<color name="secondarybackground" type="color">#ffeeeeee</color>
<color name="divider">#1f000000</color>
<color name="red">#ffe51c23</color>
</resources>

2
res/values/strings.xml
View File

@ -250,4 +250,6 @@
<string name="openpgp_click_to_decrypt">Click here to enter passphrase and decrypt messages</string>
<string name="reception_failed">Reception failed</string>
<string name="no_muc_server_found">No suitable Conference Server found</string>
<string name="your_fingerprint">Your fingerprint</string>
<string name="otr_fingerprint">OTR fingerprint</string>
</resources>