renamed colors
This commit is contained in:
parent
84bfe8c721
commit
ffffca10f0
|
@ -178,7 +178,7 @@ public class NotificationService {
|
||||||
}
|
}
|
||||||
|
|
||||||
private void setNotificationColor(final Builder mBuilder) {
|
private void setNotificationColor(final Builder mBuilder) {
|
||||||
mBuilder.setColor(mXmppConnectionService.getResources().getColor(R.color.primary));
|
mBuilder.setColor(mXmppConnectionService.getResources().getColor(R.color.green500));
|
||||||
}
|
}
|
||||||
|
|
||||||
private void updateNotification(final boolean notify) {
|
private void updateNotification(final boolean notify) {
|
||||||
|
|
|
@ -334,14 +334,14 @@ public abstract class XmppActivity extends Activity {
|
||||||
super.onCreate(savedInstanceState);
|
super.onCreate(savedInstanceState);
|
||||||
metrics = getResources().getDisplayMetrics();
|
metrics = getResources().getDisplayMetrics();
|
||||||
ExceptionHelper.init(getApplicationContext());
|
ExceptionHelper.init(getApplicationContext());
|
||||||
mPrimaryTextColor = getResources().getColor(R.color.primarytext);
|
mPrimaryTextColor = getResources().getColor(R.color.black87);
|
||||||
mSecondaryTextColor = getResources().getColor(R.color.secondarytext);
|
mSecondaryTextColor = getResources().getColor(R.color.black54);
|
||||||
mColorRed = getResources().getColor(R.color.red);
|
mColorRed = getResources().getColor(R.color.red500);
|
||||||
mColorOrange = getResources().getColor(R.color.orange);
|
mColorOrange = getResources().getColor(R.color.orange500);
|
||||||
mColorGreen = getResources().getColor(R.color.green);
|
mColorGreen = getResources().getColor(R.color.green500);
|
||||||
mPrimaryColor = getResources().getColor(R.color.primary);
|
mPrimaryColor = getResources().getColor(R.color.green500);
|
||||||
mPrimaryBackgroundColor = getResources().getColor(R.color.primarybackground);
|
mPrimaryBackgroundColor = getResources().getColor(R.color.grey50);
|
||||||
mSecondaryBackgroundColor = getResources().getColor(R.color.secondarybackground);
|
mSecondaryBackgroundColor = getResources().getColor(R.color.grey200);
|
||||||
this.mTheme = findTheme();
|
this.mTheme = findTheme();
|
||||||
setTheme(this.mTheme);
|
setTheme(this.mTheme);
|
||||||
this.mUsingEnterKey = usingEnterKey();
|
this.mUsingEnterKey = usingEnterKey();
|
||||||
|
@ -719,10 +719,6 @@ public abstract class XmppActivity extends Activity {
|
||||||
return this.mColorRed;
|
return this.mColorRed;
|
||||||
}
|
}
|
||||||
|
|
||||||
public int getPrimaryColor() {
|
|
||||||
return this.mPrimaryColor;
|
|
||||||
}
|
|
||||||
|
|
||||||
public int getOnlineColor() {
|
public int getOnlineColor() {
|
||||||
return this.mColorGreen;
|
return this.mColorGreen;
|
||||||
}
|
}
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
<shape xmlns:android="http://schemas.android.com/apk/res/android" >
|
<shape xmlns:android="http://schemas.android.com/apk/res/android" >
|
||||||
|
|
||||||
<gradient
|
<gradient
|
||||||
android:endColor="@color/divider"
|
android:endColor="@color/black12"
|
||||||
android:startColor="@android:color/transparent" />
|
android:startColor="@android:color/transparent" />
|
||||||
|
|
||||||
<size
|
<size
|
||||||
|
|
|
@ -2,6 +2,6 @@
|
||||||
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
<shape xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
android:shape="rectangle" >
|
android:shape="rectangle" >
|
||||||
|
|
||||||
<solid android:color="@color/divider" />
|
<solid android:color="@color/black12" />
|
||||||
|
|
||||||
</shape>
|
</shape>
|
|
@ -1,13 +1,13 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<shape xmlns:android="http://schemas.android.com/apk/res/android" >
|
<shape xmlns:android="http://schemas.android.com/apk/res/android" >
|
||||||
|
|
||||||
<solid android:color="@color/primarybackground" />
|
<solid android:color="@color/grey50" />
|
||||||
|
|
||||||
<corners android:radius="2dp" />
|
<corners android:radius="2dp" />
|
||||||
|
|
||||||
<stroke
|
<stroke
|
||||||
android:width="0.5dp"
|
android:width="0.5dp"
|
||||||
android:color="@color/divider" >
|
android:color="@color/black12" >
|
||||||
</stroke>
|
</stroke>
|
||||||
|
|
||||||
<padding
|
<padding
|
||||||
|
|
|
@ -10,6 +10,6 @@
|
||||||
android:right="1.5dp"
|
android:right="1.5dp"
|
||||||
android:top="1.5dp" />
|
android:top="1.5dp" />
|
||||||
|
|
||||||
<solid android:color="@color/divider" />
|
<solid android:color="@color/black12" />
|
||||||
|
|
||||||
</shape>
|
</shape>
|
|
@ -1,7 +1,7 @@
|
||||||
<?xml version="1.0" encoding="UTF-8"?>
|
<?xml version="1.0" encoding="UTF-8"?>
|
||||||
<shape xmlns:android="http://schemas.android.com/apk/res/android" >
|
<shape xmlns:android="http://schemas.android.com/apk/res/android" >
|
||||||
|
|
||||||
<solid android:color="@color/darkbackground" />
|
<solid android:color="@color/grey800" />
|
||||||
|
|
||||||
<corners android:radius="8dip" />
|
<corners android:radius="8dip" />
|
||||||
|
|
||||||
|
|
|
@ -9,15 +9,15 @@
|
||||||
android:layout_width="0dp"
|
android:layout_width="0dp"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
android:background="@color/primarybackground"
|
android:background="@color/grey50"
|
||||||
android:orientation="vertical" >
|
android:orientation="vertical" >
|
||||||
|
|
||||||
<de.timroes.android.listview.EnhancedListView
|
<de.timroes.android.listview.EnhancedListView
|
||||||
android:id="@+id/list"
|
android:id="@+id/list"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="fill_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:background="@color/primarybackground"
|
android:background="@color/grey50"
|
||||||
android:divider="@color/divider"
|
android:divider="@color/black12"
|
||||||
android:dividerHeight="1dp" />
|
android:dividerHeight="1dp" />
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
|
|
|
@ -32,7 +32,7 @@
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:scrollHorizontally="false"
|
android:scrollHorizontally="false"
|
||||||
android:singleLine="true"
|
android:singleLine="true"
|
||||||
android:textColor="@color/primarytext"
|
android:textColor="@color/black87"
|
||||||
android:textSize="?attr/TextSizeHeadline" />
|
android:textSize="?attr/TextSizeHeadline" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
|
@ -40,7 +40,7 @@
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="@string/account_status_unknown"
|
android:text="@string/account_status_unknown"
|
||||||
android:textColor="@color/secondarytext"
|
android:textColor="@color/black54"
|
||||||
android:textSize="?attr/TextSizeBody"
|
android:textSize="?attr/TextSizeBody"
|
||||||
android:textStyle="bold" />
|
android:textStyle="bold" />
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
|
@ -14,6 +14,8 @@
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:focusable="true"
|
android:focusable="true"
|
||||||
android:inputType="textEmailAddress|textNoSuggestions"
|
android:inputType="textEmailAddress|textNoSuggestions"
|
||||||
android:textColor="@color/ondarktext" />
|
android:textColor="@color/white"
|
||||||
|
android:textColorHint="@color/white70"
|
||||||
|
android:hint="@string/search_for_contacts_or_groups"/>
|
||||||
|
|
||||||
</RelativeLayout>
|
</RelativeLayout>
|
|
@ -1,7 +1,7 @@
|
||||||
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
|
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
xmlns:tools="http://schemas.android.com/tools"
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
tools:context="eu.siacs.conversations.ui.AboutActivity"
|
tools:context="eu.siacs.conversations.ui.AboutActivity"
|
||||||
android:background="@color/primarybackground"
|
android:background="@color/grey50"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="fill_parent"
|
||||||
android:layout_height="fill_parent">
|
android:layout_height="fill_parent">
|
||||||
|
|
||||||
|
@ -15,7 +15,7 @@
|
||||||
android:layout_marginRight="@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:paddingBottom="@dimen/activity_vertical_margin"
|
android:paddingBottom="@dimen/activity_vertical_margin"
|
||||||
android:textColor="@color/primarytext"
|
android:textColor="@color/black87"
|
||||||
android:textSize="?attr/TextSizeBody"
|
android:textSize="?attr/TextSizeBody"
|
||||||
android:typeface="monospace"/>
|
android:typeface="monospace"/>
|
||||||
</ScrollView>
|
</ScrollView>
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:background="@color/primarybackground">
|
android:background="@color/grey50">
|
||||||
|
|
||||||
<ScrollView
|
<ScrollView
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="fill_parent"
|
||||||
|
@ -22,7 +22,7 @@
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="@string/current_password"
|
android:text="@string/current_password"
|
||||||
android:textColor="@color/primarytext"
|
android:textColor="@color/black87"
|
||||||
android:textSize="?attr/TextSizeBody"/>
|
android:textSize="?attr/TextSizeBody"/>
|
||||||
|
|
||||||
<EditText
|
<EditText
|
||||||
|
@ -32,15 +32,15 @@
|
||||||
android:layout_marginBottom="8dp"
|
android:layout_marginBottom="8dp"
|
||||||
android:hint="@string/password"
|
android:hint="@string/password"
|
||||||
android:inputType="textPassword"
|
android:inputType="textPassword"
|
||||||
android:textColor="@color/primarytext"
|
android:textColor="@color/black87"
|
||||||
android:textColorHint="@color/secondarytext"
|
android:textColorHint="@color/black54"
|
||||||
android:textSize="?attr/TextSizeBody"/>
|
android:textSize="?attr/TextSizeBody"/>
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="@string/new_password"
|
android:text="@string/new_password"
|
||||||
android:textColor="@color/primarytext"
|
android:textColor="@color/black87"
|
||||||
android:textSize="?attr/TextSizeBody"/>
|
android:textSize="?attr/TextSizeBody"/>
|
||||||
|
|
||||||
<EditText
|
<EditText
|
||||||
|
@ -50,15 +50,15 @@
|
||||||
android:layout_marginBottom="8dp"
|
android:layout_marginBottom="8dp"
|
||||||
android:hint="@string/password"
|
android:hint="@string/password"
|
||||||
android:inputType="textPassword"
|
android:inputType="textPassword"
|
||||||
android:textColor="@color/primarytext"
|
android:textColor="@color/black87"
|
||||||
android:textColorHint="@color/secondarytext"
|
android:textColorHint="@color/black54"
|
||||||
android:textSize="?attr/TextSizeBody"/>
|
android:textSize="?attr/TextSizeBody"/>
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="@string/account_settings_confirm_password"
|
android:text="@string/account_settings_confirm_password"
|
||||||
android:textColor="@color/primarytext"
|
android:textColor="@color/black87"
|
||||||
android:textSize="?attr/TextSizeBody"/>
|
android:textSize="?attr/TextSizeBody"/>
|
||||||
|
|
||||||
<EditText
|
<EditText
|
||||||
|
@ -67,8 +67,8 @@
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:hint="@string/password"
|
android:hint="@string/password"
|
||||||
android:inputType="textPassword"
|
android:inputType="textPassword"
|
||||||
android:textColor="@color/primarytext"
|
android:textColor="@color/black87"
|
||||||
android:textColorHint="@color/secondarytext"
|
android:textColorHint="@color/black54"
|
||||||
android:textSize="?attr/TextSizeBody"/>
|
android:textSize="?attr/TextSizeBody"/>
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
</ScrollView>
|
</ScrollView>
|
||||||
|
@ -94,7 +94,7 @@
|
||||||
android:layout_height="fill_parent"
|
android:layout_height="fill_parent"
|
||||||
android:layout_marginBottom="7dp"
|
android:layout_marginBottom="7dp"
|
||||||
android:layout_marginTop="7dp"
|
android:layout_marginTop="7dp"
|
||||||
android:background="@color/divider"/>
|
android:background="@color/black12"/>
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/right_button"
|
android:id="@+id/right_button"
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
|
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="fill_parent"
|
||||||
android:layout_height="fill_parent"
|
android:layout_height="fill_parent"
|
||||||
android:background="@color/secondarybackground" >
|
android:background="@color/grey200" >
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="fill_parent"
|
||||||
|
@ -39,7 +39,7 @@
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="@string/account_settings_example_jabber_id"
|
android:text="@string/account_settings_example_jabber_id"
|
||||||
android:textColor="@color/primarytext"
|
android:textColor="@color/black87"
|
||||||
android:textSize="?attr/TextSizeHeadline"
|
android:textSize="?attr/TextSizeHeadline"
|
||||||
android:textStyle="bold" />
|
android:textStyle="bold" />
|
||||||
|
|
||||||
|
@ -61,7 +61,7 @@
|
||||||
android:id="@+id/details_lastseen"
|
android:id="@+id/details_lastseen"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:textColor="@color/secondarytext"
|
android:textColor="@color/black54"
|
||||||
android:textSize="?attr/TextSizeBody" />
|
android:textSize="?attr/TextSizeBody" />
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
|
@ -78,7 +78,7 @@
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="8dp"
|
android:layout_marginTop="8dp"
|
||||||
android:text="@string/send_presence_updates"
|
android:text="@string/send_presence_updates"
|
||||||
android:textColor="@color/primarytext"
|
android:textColor="@color/black87"
|
||||||
android:textSize="?attr/TextSizeBody" />
|
android:textSize="?attr/TextSizeBody" />
|
||||||
|
|
||||||
<CheckBox
|
<CheckBox
|
||||||
|
@ -86,7 +86,7 @@
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="@string/receive_presence_updates"
|
android:text="@string/receive_presence_updates"
|
||||||
android:textColor="@color/primarytext"
|
android:textColor="@color/black87"
|
||||||
android:textSize="?attr/TextSizeBody" />
|
android:textSize="?attr/TextSizeBody" />
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
|
@ -98,7 +98,7 @@
|
||||||
android:layout_below="@+id/details_jidbox"
|
android:layout_below="@+id/details_jidbox"
|
||||||
android:layout_marginTop="32dp"
|
android:layout_marginTop="32dp"
|
||||||
android:text="@string/using_account"
|
android:text="@string/using_account"
|
||||||
android:textColor="@color/secondarytext"
|
android:textColor="@color/black54"
|
||||||
android:textSize="?attr/TextSizeInfo" />
|
android:textSize="?attr/TextSizeInfo" />
|
||||||
</RelativeLayout>
|
</RelativeLayout>
|
||||||
|
|
||||||
|
|
|
@ -3,7 +3,7 @@
|
||||||
xmlns:tools="http://schemas.android.com/tools"
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:background="@color/secondarybackground" >
|
android:background="@color/grey200" >
|
||||||
|
|
||||||
<ScrollView
|
<ScrollView
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="fill_parent"
|
||||||
|
@ -42,7 +42,7 @@
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="@string/account_settings_jabber_id"
|
android:text="@string/account_settings_jabber_id"
|
||||||
android:textColor="@color/primarytext"
|
android:textColor="@color/black87"
|
||||||
android:textSize="?attr/TextSizeBody" />
|
android:textSize="?attr/TextSizeBody" />
|
||||||
|
|
||||||
<AutoCompleteTextView
|
<AutoCompleteTextView
|
||||||
|
@ -51,8 +51,8 @@
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:hint="@string/account_settings_example_jabber_id"
|
android:hint="@string/account_settings_example_jabber_id"
|
||||||
android:inputType="textEmailAddress"
|
android:inputType="textEmailAddress"
|
||||||
android:textColor="@color/primarytext"
|
android:textColor="@color/black87"
|
||||||
android:textColorHint="@color/secondarytext"
|
android:textColorHint="@color/black54"
|
||||||
android:textSize="?attr/TextSizeBody" />
|
android:textSize="?attr/TextSizeBody" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
|
@ -60,7 +60,7 @@
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="8dp"
|
android:layout_marginTop="8dp"
|
||||||
android:text="@string/account_settings_password"
|
android:text="@string/account_settings_password"
|
||||||
android:textColor="@color/primarytext"
|
android:textColor="@color/black87"
|
||||||
android:textSize="?attr/TextSizeBody" />
|
android:textSize="?attr/TextSizeBody" />
|
||||||
|
|
||||||
<EditText
|
<EditText
|
||||||
|
@ -69,8 +69,8 @@
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:hint="@string/password"
|
android:hint="@string/password"
|
||||||
android:inputType="textPassword"
|
android:inputType="textPassword"
|
||||||
android:textColor="@color/primarytext"
|
android:textColor="@color/black87"
|
||||||
android:textColorHint="@color/secondarytext"
|
android:textColorHint="@color/black54"
|
||||||
android:textSize="?attr/TextSizeBody" />
|
android:textSize="?attr/TextSizeBody" />
|
||||||
|
|
||||||
<CheckBox
|
<CheckBox
|
||||||
|
@ -79,7 +79,7 @@
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="8dp"
|
android:layout_marginTop="8dp"
|
||||||
android:text="@string/register_account"
|
android:text="@string/register_account"
|
||||||
android:textColor="@color/primarytext"
|
android:textColor="@color/black87"
|
||||||
android:textSize="?attr/TextSizeBody" />
|
android:textSize="?attr/TextSizeBody" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
|
@ -87,7 +87,7 @@
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="@string/account_settings_confirm_password"
|
android:text="@string/account_settings_confirm_password"
|
||||||
android:textColor="@color/primarytext"
|
android:textColor="@color/black87"
|
||||||
android:textSize="?attr/TextSizeBody"
|
android:textSize="?attr/TextSizeBody"
|
||||||
android:visibility="gone" />
|
android:visibility="gone" />
|
||||||
|
|
||||||
|
@ -99,8 +99,8 @@
|
||||||
android:hint="@string/confirm_password"
|
android:hint="@string/confirm_password"
|
||||||
android:inputType="textPassword"
|
android:inputType="textPassword"
|
||||||
android:visibility="gone"
|
android:visibility="gone"
|
||||||
android:textColor="@color/primarytext"
|
android:textColor="@color/black87"
|
||||||
android:textColorHint="@color/secondarytext"
|
android:textColorHint="@color/black54"
|
||||||
android:textSize="?attr/TextSizeBody" />
|
android:textSize="?attr/TextSizeBody" />
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
</RelativeLayout>
|
</RelativeLayout>
|
||||||
|
@ -132,7 +132,7 @@
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="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:textColor="@color/black87"
|
||||||
android:textSize="?attr/TextSizeBody" />
|
android:textSize="?attr/TextSizeBody" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
|
@ -140,7 +140,7 @@
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_gravity="right"
|
android:layout_gravity="right"
|
||||||
android:textColor="@color/primarytext"
|
android:textColor="@color/black87"
|
||||||
android:textSize="?attr/TextSizeBody"
|
android:textSize="?attr/TextSizeBody"
|
||||||
tools:ignore="RtlHardcoded"/>
|
tools:ignore="RtlHardcoded"/>
|
||||||
</TableRow>
|
</TableRow>
|
||||||
|
@ -161,7 +161,7 @@
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="@string/server_info_pep"
|
android:text="@string/server_info_pep"
|
||||||
android:textColor="@color/primarytext"
|
android:textColor="@color/black87"
|
||||||
android:textSize="?attr/TextSizeBody" />
|
android:textSize="?attr/TextSizeBody" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
|
@ -169,7 +169,7 @@
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_gravity="right"
|
android:layout_gravity="right"
|
||||||
android:textColor="@color/primarytext"
|
android:textColor="@color/black87"
|
||||||
android:textSize="?attr/TextSizeBody"
|
android:textSize="?attr/TextSizeBody"
|
||||||
tools:ignore="RtlHardcoded"/>
|
tools:ignore="RtlHardcoded"/>
|
||||||
</TableRow>
|
</TableRow>
|
||||||
|
@ -182,7 +182,7 @@
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="@string/server_info_blocking"
|
android:text="@string/server_info_blocking"
|
||||||
android:textColor="@color/primarytext"
|
android:textColor="@color/black87"
|
||||||
android:textSize="?attr/TextSizeBody" />
|
android:textSize="?attr/TextSizeBody" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
|
@ -190,7 +190,7 @@
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_gravity="right"
|
android:layout_gravity="right"
|
||||||
android:textColor="@color/primarytext"
|
android:textColor="@color/black87"
|
||||||
android:textSize="?attr/TextSizeBody"
|
android:textSize="?attr/TextSizeBody"
|
||||||
tools:ignore="RtlHardcoded"/>
|
tools:ignore="RtlHardcoded"/>
|
||||||
</TableRow>
|
</TableRow>
|
||||||
|
@ -203,7 +203,7 @@
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="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:textColor="@color/black87"
|
||||||
android:textSize="?attr/TextSizeBody" />
|
android:textSize="?attr/TextSizeBody" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
|
@ -211,7 +211,7 @@
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_gravity="right"
|
android:layout_gravity="right"
|
||||||
android:textColor="@color/primarytext"
|
android:textColor="@color/black87"
|
||||||
android:textSize="?attr/TextSizeBody"
|
android:textSize="?attr/TextSizeBody"
|
||||||
tools:ignore="RtlHardcoded"/>
|
tools:ignore="RtlHardcoded"/>
|
||||||
</TableRow>
|
</TableRow>
|
||||||
|
@ -224,7 +224,7 @@
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="@string/server_info_roster_version"
|
android:text="@string/server_info_roster_version"
|
||||||
android:textColor="@color/primarytext"
|
android:textColor="@color/black87"
|
||||||
android:textSize="?attr/TextSizeBody" />
|
android:textSize="?attr/TextSizeBody" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
|
@ -232,7 +232,7 @@
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_gravity="right"
|
android:layout_gravity="right"
|
||||||
android:textColor="@color/primarytext"
|
android:textColor="@color/black87"
|
||||||
android:textSize="?attr/TextSizeBody"
|
android:textSize="?attr/TextSizeBody"
|
||||||
tools:ignore="RtlHardcoded"/>
|
tools:ignore="RtlHardcoded"/>
|
||||||
</TableRow>
|
</TableRow>
|
||||||
|
@ -245,7 +245,7 @@
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="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:textColor="@color/black87"
|
||||||
android:textSize="?attr/TextSizeBody" />
|
android:textSize="?attr/TextSizeBody" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
|
@ -253,7 +253,7 @@
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_gravity="right"
|
android:layout_gravity="right"
|
||||||
android:textColor="@color/primarytext"
|
android:textColor="@color/black87"
|
||||||
android:textSize="?attr/TextSizeBody"
|
android:textSize="?attr/TextSizeBody"
|
||||||
tools:ignore="RtlHardcoded"/>
|
tools:ignore="RtlHardcoded"/>
|
||||||
</TableRow>
|
</TableRow>
|
||||||
|
@ -266,7 +266,7 @@
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="@string/server_info_mam"
|
android:text="@string/server_info_mam"
|
||||||
android:textColor="@color/primarytext"
|
android:textColor="@color/black87"
|
||||||
android:textSize="?attr/TextSizeBody" />
|
android:textSize="?attr/TextSizeBody" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
|
@ -274,7 +274,7 @@
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_gravity="right"
|
android:layout_gravity="right"
|
||||||
android:textColor="@color/primarytext"
|
android:textColor="@color/black87"
|
||||||
android:textSize="?attr/TextSizeBody"
|
android:textSize="?attr/TextSizeBody"
|
||||||
tools:ignore="RtlHardcoded"/>
|
tools:ignore="RtlHardcoded"/>
|
||||||
</TableRow>
|
</TableRow>
|
||||||
|
@ -287,7 +287,7 @@
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="@string/server_info_csi"
|
android:text="@string/server_info_csi"
|
||||||
android:textColor="@color/primarytext"
|
android:textColor="@color/black87"
|
||||||
android:textSize="?attr/TextSizeBody" />
|
android:textSize="?attr/TextSizeBody" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
|
@ -295,7 +295,7 @@
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_gravity="right"
|
android:layout_gravity="right"
|
||||||
android:textColor="@color/primarytext"
|
android:textColor="@color/black87"
|
||||||
android:textSize="?attr/TextSizeBody"
|
android:textSize="?attr/TextSizeBody"
|
||||||
tools:ignore="RtlHardcoded"/>
|
tools:ignore="RtlHardcoded"/>
|
||||||
</TableRow>
|
</TableRow>
|
||||||
|
@ -318,14 +318,14 @@
|
||||||
android:id="@+id/otr_fingerprint"
|
android:id="@+id/otr_fingerprint"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:textColor="@color/primarytext"
|
android:textColor="@color/black87"
|
||||||
android:textSize="?attr/TextSizeBody"
|
android:textSize="?attr/TextSizeBody"
|
||||||
android:typeface="monospace" />
|
android:typeface="monospace" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:textColor="@color/secondarytext"
|
android:textColor="@color/black54"
|
||||||
android:textSize="?attr/TextSizeInfo"
|
android:textSize="?attr/TextSizeInfo"
|
||||||
android:text="@string/otr_fingerprint"/>
|
android:text="@string/otr_fingerprint"/>
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
@ -363,14 +363,14 @@
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
android:text="@string/cancel"
|
android:text="@string/cancel"
|
||||||
android:textColor="@color/primarytext" />
|
android:textColor="@color/black87" />
|
||||||
|
|
||||||
<View
|
<View
|
||||||
android:layout_width="1dp"
|
android:layout_width="1dp"
|
||||||
android:layout_height="fill_parent"
|
android:layout_height="fill_parent"
|
||||||
android:layout_marginBottom="7dp"
|
android:layout_marginBottom="7dp"
|
||||||
android:layout_marginTop="7dp"
|
android:layout_marginTop="7dp"
|
||||||
android:background="@color/divider" />
|
android:background="@color/black12" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/save_button"
|
android:id="@+id/save_button"
|
||||||
|
@ -380,7 +380,7 @@
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
android:enabled="false"
|
android:enabled="false"
|
||||||
android:text="@string/save"
|
android:text="@string/save"
|
||||||
android:textColor="@color/secondarytext" />
|
android:textColor="@color/black54" />
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
</RelativeLayout>
|
</RelativeLayout>
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
|
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="fill_parent"
|
||||||
android:layout_height="fill_parent"
|
android:layout_height="fill_parent"
|
||||||
android:background="@color/secondarybackground">
|
android:background="@color/grey200">
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="fill_parent"
|
||||||
|
@ -26,7 +26,7 @@
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginBottom="16dp"
|
android:layout_marginBottom="16dp"
|
||||||
android:text="@string/account_settings_example_jabber_id"
|
android:text="@string/account_settings_example_jabber_id"
|
||||||
android:textColor="@color/primarytext"
|
android:textColor="@color/black87"
|
||||||
android:textSize="?attr/TextSizeHeadline"
|
android:textSize="?attr/TextSizeHeadline"
|
||||||
android:textStyle="bold"/>
|
android:textStyle="bold"/>
|
||||||
|
|
||||||
|
@ -56,7 +56,7 @@
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:singleLine="true"
|
android:singleLine="true"
|
||||||
android:textColor="@color/primarytext"
|
android:textColor="@color/black87"
|
||||||
android:textSize="?attr/TextSizeHeadline"/>
|
android:textSize="?attr/TextSizeHeadline"/>
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
|
@ -64,7 +64,7 @@
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:singleLine="true"
|
android:singleLine="true"
|
||||||
android:textColor="@color/primarytext"
|
android:textColor="@color/black87"
|
||||||
android:textSize="?attr/TextSizeBody"/>
|
android:textSize="?attr/TextSizeBody"/>
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
|
@ -88,7 +88,7 @@
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="@string/private_conference"
|
android:text="@string/private_conference"
|
||||||
android:layout_centerVertical="true"
|
android:layout_centerVertical="true"
|
||||||
android:textColor="@color/primarytext"
|
android:textColor="@color/black87"
|
||||||
android:textSize="?attr/TextSizeBody"
|
android:textSize="?attr/TextSizeBody"
|
||||||
android:layout_alignParentLeft="true"
|
android:layout_alignParentLeft="true"
|
||||||
android:layout_toLeftOf="@+id/change_conference_button"
|
android:layout_toLeftOf="@+id/change_conference_button"
|
||||||
|
@ -113,7 +113,7 @@
|
||||||
android:layout_gravity="right"
|
android:layout_gravity="right"
|
||||||
android:layout_marginTop="32dp"
|
android:layout_marginTop="32dp"
|
||||||
android:text="@string/using_account"
|
android:text="@string/using_account"
|
||||||
android:textColor="@color/secondarytext"
|
android:textColor="@color/black54"
|
||||||
android:textSize="?attr/TextSizeInfo"/>
|
android:textSize="?attr/TextSizeInfo"/>
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:background="@color/primarybackground" >
|
android:background="@color/grey50" >
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:id="@+id/account_image_wrapper"
|
android:id="@+id/account_image_wrapper"
|
||||||
|
@ -27,7 +27,7 @@
|
||||||
android:layout_below="@id/account_image_wrapper"
|
android:layout_below="@id/account_image_wrapper"
|
||||||
android:layout_centerHorizontal="true"
|
android:layout_centerHorizontal="true"
|
||||||
android:text="@string/touch_to_choose_picture"
|
android:text="@string/touch_to_choose_picture"
|
||||||
android:textColor="@color/secondarytext" />
|
android:textColor="@color/black54" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
android:id="@+id/secondary_hint"
|
android:id="@+id/secondary_hint"
|
||||||
|
@ -36,7 +36,7 @@
|
||||||
android:layout_below="@id/hint"
|
android:layout_below="@id/hint"
|
||||||
android:layout_centerHorizontal="true"
|
android:layout_centerHorizontal="true"
|
||||||
android:text="@string/or_long_press_for_default"
|
android:text="@string/or_long_press_for_default"
|
||||||
android:textColor="@color/secondarytext" />
|
android:textColor="@color/black54" />
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:id="@+id/button_bar"
|
android:id="@+id/button_bar"
|
||||||
|
@ -53,14 +53,14 @@
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
android:text="@string/cancel"
|
android:text="@string/cancel"
|
||||||
android:textColor="@color/primarytext" />
|
android:textColor="@color/black87" />
|
||||||
|
|
||||||
<View
|
<View
|
||||||
android:layout_width="1dp"
|
android:layout_width="1dp"
|
||||||
android:layout_height="fill_parent"
|
android:layout_height="fill_parent"
|
||||||
android:layout_marginBottom="7dp"
|
android:layout_marginBottom="7dp"
|
||||||
android:layout_marginTop="7dp"
|
android:layout_marginTop="7dp"
|
||||||
android:background="@color/divider" />
|
android:background="@color/black12" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/publish_button"
|
android:id="@+id/publish_button"
|
||||||
|
@ -70,7 +70,7 @@
|
||||||
android:layout_weight="1"
|
android:layout_weight="1"
|
||||||
android:enabled="false"
|
android:enabled="false"
|
||||||
android:text="@string/publish"
|
android:text="@string/publish"
|
||||||
android:textColor="@color/secondarytext" />
|
android:textColor="@color/black54" />
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
|
@ -89,7 +89,7 @@
|
||||||
android:id="@+id/account"
|
android:id="@+id/account"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:textColor="@color/primarytext"
|
android:textColor="@color/black87"
|
||||||
android:textSize="?attr/TextSizeHeadline" />
|
android:textSize="?attr/TextSizeHeadline" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
|
@ -99,7 +99,7 @@
|
||||||
android:layout_marginTop="8dp"
|
android:layout_marginTop="8dp"
|
||||||
android:minLines="3"
|
android:minLines="3"
|
||||||
android:text="@string/publish_avatar_explanation"
|
android:text="@string/publish_avatar_explanation"
|
||||||
android:textColor="@color/primarytext"
|
android:textColor="@color/black87"
|
||||||
android:textSize="?attr/TextSizeBody" />
|
android:textSize="?attr/TextSizeBody" />
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
|
|
|
@ -3,6 +3,6 @@
|
||||||
android:id="@+id/start_conversation_view_pager"
|
android:id="@+id/start_conversation_view_pager"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:background="@color/primarybackground" >
|
android:background="@color/grey50" >
|
||||||
|
|
||||||
</android.support.v4.view.ViewPager>
|
</android.support.v4.view.ViewPager>
|
|
@ -2,7 +2,7 @@
|
||||||
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:background="@color/primarybackground">
|
android:background="@color/grey50">
|
||||||
|
|
||||||
<ScrollView
|
<ScrollView
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="fill_parent"
|
||||||
|
@ -34,7 +34,7 @@
|
||||||
android:id="@+id/your_fingerprint"
|
android:id="@+id/your_fingerprint"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:textColor="@color/primarytext"
|
android:textColor="@color/black87"
|
||||||
android:textSize="?attr/TextSizeBody"
|
android:textSize="?attr/TextSizeBody"
|
||||||
android:typeface="monospace"/>
|
android:typeface="monospace"/>
|
||||||
|
|
||||||
|
@ -42,7 +42,7 @@
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="@string/your_fingerprint"
|
android:text="@string/your_fingerprint"
|
||||||
android:textColor="@color/secondarytext"
|
android:textColor="@color/black54"
|
||||||
android:textSize="?attr/TextSizeInfo"/>
|
android:textSize="?attr/TextSizeInfo"/>
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
|
@ -50,7 +50,7 @@
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="20dp"
|
android:layout_marginTop="20dp"
|
||||||
android:textColor="@color/primarytext"
|
android:textColor="@color/black87"
|
||||||
android:textSize="?attr/TextSizeBody"
|
android:textSize="?attr/TextSizeBody"
|
||||||
android:typeface="monospace"/>
|
android:typeface="monospace"/>
|
||||||
|
|
||||||
|
@ -59,7 +59,7 @@
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginBottom="20dp"
|
android:layout_marginBottom="20dp"
|
||||||
android:text="@string/remote_fingerprint"
|
android:text="@string/remote_fingerprint"
|
||||||
android:textColor="@color/secondarytext"
|
android:textColor="@color/black54"
|
||||||
android:textSize="?attr/TextSizeInfo"/>
|
android:textSize="?attr/TextSizeInfo"/>
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
@ -77,7 +77,7 @@
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_gravity="center_horizontal"
|
android:layout_gravity="center_horizontal"
|
||||||
android:text="@string/verified"
|
android:text="@string/verified"
|
||||||
android:textColor="@color/primarytext"
|
android:textColor="@color/black87"
|
||||||
android:textSize="?attr/TextSizeHeadline"
|
android:textSize="?attr/TextSizeHeadline"
|
||||||
android:textStyle="bold"
|
android:textStyle="bold"
|
||||||
android:visibility="gone"/>
|
android:visibility="gone"/>
|
||||||
|
@ -87,7 +87,7 @@
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginBottom="8dp"
|
android:layout_marginBottom="8dp"
|
||||||
android:textColor="@color/primarytext"
|
android:textColor="@color/black87"
|
||||||
android:textSize="?attr/TextSizeBody"
|
android:textSize="?attr/TextSizeBody"
|
||||||
android:textStyle="bold"
|
android:textStyle="bold"
|
||||||
android:visibility="gone"/>
|
android:visibility="gone"/>
|
||||||
|
@ -99,8 +99,8 @@
|
||||||
android:layout_marginBottom="8dp"
|
android:layout_marginBottom="8dp"
|
||||||
android:hint="@string/shared_secret_hint"
|
android:hint="@string/shared_secret_hint"
|
||||||
android:inputType="textAutoComplete"
|
android:inputType="textAutoComplete"
|
||||||
android:textColor="@color/primarytext"
|
android:textColor="@color/black87"
|
||||||
android:textColorHint="@color/secondarytext"
|
android:textColorHint="@color/black54"
|
||||||
android:textSize="?attr/TextSizeBody"/>
|
android:textSize="?attr/TextSizeBody"/>
|
||||||
|
|
||||||
<EditText
|
<EditText
|
||||||
|
@ -110,8 +110,8 @@
|
||||||
android:layout_marginTop="8dp"
|
android:layout_marginTop="8dp"
|
||||||
android:hint="@string/shared_secret_secret"
|
android:hint="@string/shared_secret_secret"
|
||||||
android:inputType="textPassword"
|
android:inputType="textPassword"
|
||||||
android:textColor="@color/primarytext"
|
android:textColor="@color/black87"
|
||||||
android:textColorHint="@color/secondarytext"
|
android:textColorHint="@color/black54"
|
||||||
android:textSize="?attr/TextSizeBody"/>
|
android:textSize="?attr/TextSizeBody"/>
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
@ -137,7 +137,7 @@
|
||||||
android:layout_height="fill_parent"
|
android:layout_height="fill_parent"
|
||||||
android:layout_marginBottom="7dp"
|
android:layout_marginBottom="7dp"
|
||||||
android:layout_marginTop="7dp"
|
android:layout_marginTop="7dp"
|
||||||
android:background="@color/divider"/>
|
android:background="@color/black12"/>
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
android:id="@+id/right_button"
|
android:id="@+id/right_button"
|
||||||
|
|
|
@ -27,7 +27,7 @@
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:singleLine="true"
|
android:singleLine="true"
|
||||||
android:textColor="@color/primarytext"
|
android:textColor="@color/black87"
|
||||||
android:textSize="?attr/TextSizeHeadline" />
|
android:textSize="?attr/TextSizeHeadline" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
|
@ -35,7 +35,7 @@
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:singleLine="true"
|
android:singleLine="true"
|
||||||
android:textColor="@color/primarytext"
|
android:textColor="@color/black87"
|
||||||
android:textSize="?attr/TextSizeBody" />
|
android:textSize="?attr/TextSizeBody" />
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:id="@+id/tags"
|
android:id="@+id/tags"
|
||||||
|
@ -48,7 +48,7 @@
|
||||||
android:id="@+id/key"
|
android:id="@+id/key"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:textColor="@color/primarytext"
|
android:textColor="@color/black87"
|
||||||
android:textSize="?attr/TextSizeHeadline"
|
android:textSize="?attr/TextSizeHeadline"
|
||||||
android:typeface="monospace"
|
android:typeface="monospace"
|
||||||
android:visibility="gone" />
|
android:visibility="gone" />
|
||||||
|
|
|
@ -15,7 +15,7 @@
|
||||||
android:id="@+id/key"
|
android:id="@+id/key"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:textColor="@color/primarytext"
|
android:textColor="@color/black87"
|
||||||
android:textSize="?attr/TextSizeBody"
|
android:textSize="?attr/TextSizeBody"
|
||||||
android:typeface="monospace" />
|
android:typeface="monospace" />
|
||||||
|
|
||||||
|
@ -23,7 +23,7 @@
|
||||||
android:id="@+id/key_type"
|
android:id="@+id/key_type"
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:textColor="@color/secondarytext"
|
android:textColor="@color/black54"
|
||||||
android:textSize="?attr/TextSizeInfo"/>
|
android:textSize="?attr/TextSizeInfo"/>
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
|
|
|
@ -6,13 +6,13 @@
|
||||||
<View
|
<View
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="fill_parent"
|
||||||
android:layout_height="fill_parent"
|
android:layout_height="fill_parent"
|
||||||
android:background="@color/primary"/>
|
android:background="@color/green500"/>
|
||||||
|
|
||||||
<FrameLayout
|
<FrameLayout
|
||||||
android:id="@+id/swipeable_item"
|
android:id="@+id/swipeable_item"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="fill_parent"
|
||||||
android:layout_height="fill_parent"
|
android:layout_height="fill_parent"
|
||||||
android:background="@color/primarybackground">
|
android:background="@color/grey50">
|
||||||
|
|
||||||
<RelativeLayout
|
<RelativeLayout
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="fill_parent"
|
||||||
|
@ -42,7 +42,7 @@
|
||||||
android:layout_alignLeft="@+id/conversation_lastwrapper"
|
android:layout_alignLeft="@+id/conversation_lastwrapper"
|
||||||
android:layout_toLeftOf="@+id/conversation_lastupdate"
|
android:layout_toLeftOf="@+id/conversation_lastupdate"
|
||||||
android:singleLine="true"
|
android:singleLine="true"
|
||||||
android:textColor="@color/primarytext"
|
android:textColor="@color/black87"
|
||||||
android:textSize="?attr/TextSizeHeadline"
|
android:textSize="?attr/TextSizeHeadline"
|
||||||
android:typeface="sans" />
|
android:typeface="sans" />
|
||||||
|
|
||||||
|
@ -60,14 +60,14 @@
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:scrollHorizontally="false"
|
android:scrollHorizontally="false"
|
||||||
android:singleLine="true"
|
android:singleLine="true"
|
||||||
android:textColor="@color/primarytext"
|
android:textColor="@color/black87"
|
||||||
android:textSize="?attr/TextSizeBody" />
|
android:textSize="?attr/TextSizeBody" />
|
||||||
|
|
||||||
<ImageView
|
<ImageView
|
||||||
android:id="@+id/conversation_lastimage"
|
android:id="@+id/conversation_lastimage"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="fill_parent"
|
||||||
android:layout_height="36dp"
|
android:layout_height="36dp"
|
||||||
android:background="@color/primarytext"
|
android:background="@color/black87"
|
||||||
android:scaleType="centerCrop" />
|
android:scaleType="centerCrop" />
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
|
@ -78,7 +78,7 @@
|
||||||
android:layout_alignBaseline="@+id/conversation_name"
|
android:layout_alignBaseline="@+id/conversation_name"
|
||||||
android:layout_alignParentRight="true"
|
android:layout_alignParentRight="true"
|
||||||
android:gravity="right"
|
android:gravity="right"
|
||||||
android:textColor="@color/secondarytext"
|
android:textColor="@color/black54"
|
||||||
android:textSize="?attr/TextSizeInfo" />
|
android:textSize="?attr/TextSizeInfo" />
|
||||||
</RelativeLayout>
|
</RelativeLayout>
|
||||||
</RelativeLayout>
|
</RelativeLayout>
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="@string/your_account"
|
android:text="@string/your_account"
|
||||||
android:textColor="@color/primarytext"
|
android:textColor="@color/black87"
|
||||||
android:textSize="?attr/TextSizeBody" />
|
android:textSize="?attr/TextSizeBody" />
|
||||||
|
|
||||||
<Spinner
|
<Spinner
|
||||||
|
@ -24,7 +24,7 @@
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="8dp"
|
android:layout_marginTop="8dp"
|
||||||
android:text="@string/account_settings_jabber_id"
|
android:text="@string/account_settings_jabber_id"
|
||||||
android:textColor="@color/primarytext"
|
android:textColor="@color/black87"
|
||||||
android:textSize="?attr/TextSizeBody" />
|
android:textSize="?attr/TextSizeBody" />
|
||||||
|
|
||||||
<AutoCompleteTextView
|
<AutoCompleteTextView
|
||||||
|
@ -33,7 +33,7 @@
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:hint="@string/account_settings_example_jabber_id"
|
android:hint="@string/account_settings_example_jabber_id"
|
||||||
android:inputType="textEmailAddress"
|
android:inputType="textEmailAddress"
|
||||||
android:textColor="@color/primarytext"
|
android:textColor="@color/black87"
|
||||||
android:textColorHint="@color/secondarytext" />
|
android:textColorHint="@color/black54" />
|
||||||
|
|
||||||
</LinearLayout>
|
</LinearLayout>
|
|
@ -3,7 +3,7 @@
|
||||||
xmlns:tools="http://schemas.android.com/tools"
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
android:layout_width="match_parent"
|
android:layout_width="match_parent"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:background="@color/secondarybackground" >
|
android:background="@color/grey200" >
|
||||||
|
|
||||||
<ListView
|
<ListView
|
||||||
android:id="@+id/messages_view"
|
android:id="@+id/messages_view"
|
||||||
|
@ -12,7 +12,7 @@
|
||||||
android:layout_above="@+id/snackbar"
|
android:layout_above="@+id/snackbar"
|
||||||
android:layout_alignParentLeft="true"
|
android:layout_alignParentLeft="true"
|
||||||
android:layout_alignParentTop="true"
|
android:layout_alignParentTop="true"
|
||||||
android:background="@color/secondarybackground"
|
android:background="@color/grey200"
|
||||||
android:divider="@null"
|
android:divider="@null"
|
||||||
android:dividerHeight="0dp"
|
android:dividerHeight="0dp"
|
||||||
android:listSelector="@android:color/transparent"
|
android:listSelector="@android:color/transparent"
|
||||||
|
@ -27,7 +27,7 @@
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_alignParentBottom="true"
|
android:layout_alignParentBottom="true"
|
||||||
android:layout_alignParentLeft="true"
|
android:layout_alignParentLeft="true"
|
||||||
android:background="@color/primarybackground" >
|
android:background="@color/grey50" >
|
||||||
|
|
||||||
<eu.siacs.conversations.ui.EditMessage
|
<eu.siacs.conversations.ui.EditMessage
|
||||||
android:id="@+id/textinput"
|
android:id="@+id/textinput"
|
||||||
|
@ -35,7 +35,7 @@
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_alignParentLeft="true"
|
android:layout_alignParentLeft="true"
|
||||||
android:layout_toLeftOf="@+id/textSendButton"
|
android:layout_toLeftOf="@+id/textSendButton"
|
||||||
android:background="@color/primarybackground"
|
android:background="@color/grey50"
|
||||||
android:ems="10"
|
android:ems="10"
|
||||||
android:imeOptions="flagNoExtractUi|actionSend"
|
android:imeOptions="flagNoExtractUi|actionSend"
|
||||||
android:inputType="textShortMessage|textMultiLine|textCapSentences"
|
android:inputType="textShortMessage|textMultiLine|textCapSentences"
|
||||||
|
@ -45,7 +45,7 @@
|
||||||
android:paddingLeft="8dp"
|
android:paddingLeft="8dp"
|
||||||
android:paddingRight="8dp"
|
android:paddingRight="8dp"
|
||||||
android:paddingTop="12dp"
|
android:paddingTop="12dp"
|
||||||
android:textColor="@color/primarytext" >
|
android:textColor="@color/black87" >
|
||||||
|
|
||||||
<requestFocus />
|
<requestFocus />
|
||||||
</eu.siacs.conversations.ui.EditMessage>
|
</eu.siacs.conversations.ui.EditMessage>
|
||||||
|
@ -80,7 +80,7 @@
|
||||||
android:layout_centerVertical="true"
|
android:layout_centerVertical="true"
|
||||||
android:layout_toLeftOf="@+id/snackbar_action"
|
android:layout_toLeftOf="@+id/snackbar_action"
|
||||||
android:paddingLeft="24dp"
|
android:paddingLeft="24dp"
|
||||||
android:textColor="@color/ondarktext"
|
android:textColor="@color/white"
|
||||||
android:textSize="?attr/TextSizeBody" />
|
android:textSize="?attr/TextSizeBody" />
|
||||||
|
|
||||||
<TextView
|
<TextView
|
||||||
|
@ -94,7 +94,7 @@
|
||||||
android:paddingRight="24dp"
|
android:paddingRight="24dp"
|
||||||
android:paddingTop="16dp"
|
android:paddingTop="16dp"
|
||||||
android:textAllCaps="true"
|
android:textAllCaps="true"
|
||||||
android:textColor="@color/ondarktext"
|
android:textColor="@color/white"
|
||||||
android:textSize="?attr/TextSizeBody"
|
android:textSize="?attr/TextSizeBody"
|
||||||
android:textStyle="bold" />
|
android:textStyle="bold" />
|
||||||
</RelativeLayout>
|
</RelativeLayout>
|
||||||
|
|
|
@ -7,15 +7,15 @@
|
||||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
android:layout_width="@dimen/conversations_overview_width"
|
android:layout_width="@dimen/conversations_overview_width"
|
||||||
android:layout_height="match_parent"
|
android:layout_height="match_parent"
|
||||||
android:background="@color/primarybackground"
|
android:background="@color/grey50"
|
||||||
android:orientation="vertical" >
|
android:orientation="vertical" >
|
||||||
|
|
||||||
<de.timroes.android.listview.EnhancedListView
|
<de.timroes.android.listview.EnhancedListView
|
||||||
android:id="@+id/list"
|
android:id="@+id/list"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="fill_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:background="@color/primarybackground"
|
android:background="@color/grey50"
|
||||||
android:divider="@color/divider"
|
android:divider="@color/black12"
|
||||||
android:dividerHeight="1dp" />
|
android:dividerHeight="1dp" />
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
||||||
|
|
|
@ -10,7 +10,7 @@
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:text="@string/your_account"
|
android:text="@string/your_account"
|
||||||
android:textColor="@color/primarytext"
|
android:textColor="@color/black87"
|
||||||
android:textSize="?attr/TextSizeBody" />
|
android:textSize="?attr/TextSizeBody" />
|
||||||
|
|
||||||
<Spinner
|
<Spinner
|
||||||
|
@ -24,7 +24,7 @@
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="8dp"
|
android:layout_marginTop="8dp"
|
||||||
android:text="@string/conference_address"
|
android:text="@string/conference_address"
|
||||||
android:textColor="@color/primarytext"
|
android:textColor="@color/black87"
|
||||||
android:textSize="?attr/TextSizeBody" />
|
android:textSize="?attr/TextSizeBody" />
|
||||||
|
|
||||||
<AutoCompleteTextView
|
<AutoCompleteTextView
|
||||||
|
@ -33,8 +33,8 @@
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:hint="@string/conference_address_example"
|
android:hint="@string/conference_address_example"
|
||||||
android:inputType="textEmailAddress"
|
android:inputType="textEmailAddress"
|
||||||
android:textColor="@color/primarytext"
|
android:textColor="@color/black87"
|
||||||
android:textColorHint="@color/secondarytext" />
|
android:textColorHint="@color/black54" />
|
||||||
|
|
||||||
<CheckBox
|
<CheckBox
|
||||||
android:id="@+id/bookmark"
|
android:id="@+id/bookmark"
|
||||||
|
|
|
@ -7,7 +7,7 @@
|
||||||
android:paddingLeft="4dp"
|
android:paddingLeft="4dp"
|
||||||
android:paddingRight="4dp"
|
android:paddingRight="4dp"
|
||||||
android:textSize="?attr/TextSizeInfo"
|
android:textSize="?attr/TextSizeInfo"
|
||||||
android:textColor="@color/ondarktext"
|
android:textColor="@color/white"
|
||||||
android:textAllCaps="true"
|
android:textAllCaps="true"
|
||||||
android:layout_marginRight="8dp"
|
android:layout_marginRight="8dp"
|
||||||
/>
|
/>
|
|
@ -3,13 +3,13 @@
|
||||||
xmlns:tools="http://schemas.android.com/tools"
|
xmlns:tools="http://schemas.android.com/tools"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="fill_parent"
|
||||||
android:layout_height="fill_parent"
|
android:layout_height="fill_parent"
|
||||||
android:background="@color/primarybackground" >
|
android:background="@color/grey50" >
|
||||||
|
|
||||||
<ListView
|
<ListView
|
||||||
android:id="@+id/account_list"
|
android:id="@+id/account_list"
|
||||||
android:layout_width="fill_parent"
|
android:layout_width="fill_parent"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:divider="@color/divider"
|
android:divider="@color/black12"
|
||||||
android:dividerHeight="1dp" >
|
android:dividerHeight="1dp" >
|
||||||
</ListView>
|
</ListView>
|
||||||
|
|
||||||
|
|
|
@ -21,7 +21,7 @@
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="fill_parent"
|
android:layout_height="fill_parent"
|
||||||
android:background="@color/primarybackground"
|
android:background="@color/grey50"
|
||||||
android:gravity="center_vertical"
|
android:gravity="center_vertical"
|
||||||
android:orientation="vertical"
|
android:orientation="vertical"
|
||||||
android:paddingBottom="4dp"
|
android:paddingBottom="4dp"
|
||||||
|
@ -34,7 +34,7 @@
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:adjustViewBounds="true"
|
android:adjustViewBounds="true"
|
||||||
android:background="@color/primarytext"
|
android:background="@color/black87"
|
||||||
android:paddingBottom="2dp"
|
android:paddingBottom="2dp"
|
||||||
android:scaleType="centerCrop" />
|
android:scaleType="centerCrop" />
|
||||||
|
|
||||||
|
@ -43,7 +43,7 @@
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:autoLink="web"
|
android:autoLink="web"
|
||||||
android:textColor="@color/primarytext"
|
android:textColor="@color/black87"
|
||||||
android:textSize="?attr/TextSizeBody" />
|
android:textSize="?attr/TextSizeBody" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
|
@ -77,7 +77,7 @@
|
||||||
android:layout_gravity="center_vertical"
|
android:layout_gravity="center_vertical"
|
||||||
android:gravity="center_vertical"
|
android:gravity="center_vertical"
|
||||||
android:text="@string/sending"
|
android:text="@string/sending"
|
||||||
android:textColor="@color/secondarytext"
|
android:textColor="@color/black54"
|
||||||
android:textSize="?attr/TextSizeInfo" />
|
android:textSize="?attr/TextSizeInfo" />
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
</LinearLayout>
|
</LinearLayout>
|
||||||
|
|
|
@ -21,7 +21,7 @@
|
||||||
<LinearLayout
|
<LinearLayout
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="fill_parent"
|
android:layout_height="fill_parent"
|
||||||
android:background="@color/primarybackground"
|
android:background="@color/grey50"
|
||||||
android:gravity="center_vertical"
|
android:gravity="center_vertical"
|
||||||
android:orientation="vertical"
|
android:orientation="vertical"
|
||||||
android:paddingBottom="4dp"
|
android:paddingBottom="4dp"
|
||||||
|
@ -34,7 +34,7 @@
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:adjustViewBounds="true"
|
android:adjustViewBounds="true"
|
||||||
android:background="@color/primarytext"
|
android:background="@color/black87"
|
||||||
android:paddingBottom="2dp"
|
android:paddingBottom="2dp"
|
||||||
android:scaleType="centerCrop" />
|
android:scaleType="centerCrop" />
|
||||||
|
|
||||||
|
@ -43,7 +43,7 @@
|
||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:autoLink="web"
|
android:autoLink="web"
|
||||||
android:textColor="@color/primarytext"
|
android:textColor="@color/black87"
|
||||||
android:textSize="?attr/TextSizeBody" />
|
android:textSize="?attr/TextSizeBody" />
|
||||||
|
|
||||||
<Button
|
<Button
|
||||||
|
@ -68,7 +68,7 @@
|
||||||
android:layout_gravity="center_vertical"
|
android:layout_gravity="center_vertical"
|
||||||
android:gravity="center_vertical"
|
android:gravity="center_vertical"
|
||||||
android:text="@string/sending"
|
android:text="@string/sending"
|
||||||
android:textColor="@color/secondarytext"
|
android:textColor="@color/black54"
|
||||||
android:textSize="?attr/TextSizeInfo" />
|
android:textSize="?attr/TextSizeInfo" />
|
||||||
|
|
||||||
<ImageView
|
<ImageView
|
||||||
|
|
|
@ -28,7 +28,7 @@
|
||||||
android:layout_toEndOf="@+id/message_photo"
|
android:layout_toEndOf="@+id/message_photo"
|
||||||
android:layout_toRightOf="@+id/message_photo"
|
android:layout_toRightOf="@+id/message_photo"
|
||||||
android:text="@string/contact_has_read_up_to_this_point"
|
android:text="@string/contact_has_read_up_to_this_point"
|
||||||
android:textColor="@color/secondarytext"
|
android:textColor="@color/black54"
|
||||||
android:textSize="?attr/TextSizeInfo"
|
android:textSize="?attr/TextSizeInfo"
|
||||||
android:textStyle="italic"/>
|
android:textStyle="italic"/>
|
||||||
|
|
||||||
|
|
|
@ -11,7 +11,7 @@
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:ems="10"
|
android:ems="10"
|
||||||
android:inputType="textPersonName"
|
android:inputType="textPersonName"
|
||||||
android:textColor="@color/primarytext" >
|
android:textColor="@color/black87" >
|
||||||
|
|
||||||
<requestFocus />
|
<requestFocus />
|
||||||
</EditText>
|
</EditText>
|
||||||
|
|
|
@ -2,8 +2,8 @@
|
||||||
<resources>
|
<resources>
|
||||||
|
|
||||||
<style name="ConversationsTheme" parent="@android:style/Theme.Material.Light.DarkActionBar">
|
<style name="ConversationsTheme" parent="@android:style/Theme.Material.Light.DarkActionBar">
|
||||||
<item name="android:colorPrimary">@color/primary</item>
|
<item name="android:colorPrimary">@color/green500</item>
|
||||||
<item name="android:colorPrimaryDark">@color/primarydark</item>
|
<item name="android:colorPrimaryDark">@color/green700</item>
|
||||||
<item name="android:colorAccent">@color/accent</item>
|
<item name="android:colorAccent">@color/accent</item>
|
||||||
|
|
||||||
<item name="TextSizeInfo">12sp</item>
|
<item name="TextSizeInfo">12sp</item>
|
||||||
|
|
|
@ -1,18 +1,16 @@
|
||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<resources>
|
<resources>
|
||||||
|
<color name="green500">#ff259b24</color>
|
||||||
<color name="primary" type="color">#ff259b24</color>
|
<color name="green700">#ff0a7e07</color>
|
||||||
<color name="primarydark" type="color">#ff0a7e07</color>
|
|
||||||
<color name="accent">#ff0091ea</color>
|
<color name="accent">#ff0091ea</color>
|
||||||
<color name="primarytext" type="color">#de000000</color>
|
<color name="black87">#de000000</color>
|
||||||
<color name="secondarytext" type="color">#8a000000</color>
|
<color name="black54">#8a000000</color>
|
||||||
<color name="ondarktext" type="color">#fffafafa</color>
|
<color name="black12">#1f000000</color>
|
||||||
<color name="primarybackground" type="color">#fffafafa</color>
|
<color name="white">#ffffffff</color>
|
||||||
<color name="secondarybackground" type="color">#ffeeeeee</color>
|
<color name="white70">#b2ffffff</color>
|
||||||
<color name="darkbackground" type="color">#ff323232</color>
|
<color name="grey50">#fffafafa</color>
|
||||||
<color name="divider">#1f000000</color>
|
<color name="grey200">#ffeeeeee</color>
|
||||||
<color name="red">#fff44336</color>
|
<color name="grey800">#ff424242</color>
|
||||||
<color name="orange">#ffff9800</color>
|
<color name="red500">#fff44336</color>
|
||||||
<color name="green">#ff259b24</color>
|
<color name="orange500">#ffff9800</color>
|
||||||
|
|
||||||
</resources>
|
</resources>
|
|
@ -479,4 +479,5 @@
|
||||||
<string name="recently_used">Most recently used</string>
|
<string name="recently_used">Most recently used</string>
|
||||||
<string name="choose_quick_action">Choose quick action</string>
|
<string name="choose_quick_action">Choose quick action</string>
|
||||||
<string name="file_not_found_on_remote_host">File not found on remote server</string>
|
<string name="file_not_found_on_remote_host">File not found on remote server</string>
|
||||||
|
<string name="search_for_contacts_or_groups">Search for contacts or groups</string>
|
||||||
</resources>
|
</resources>
|
||||||
|
|
|
@ -2,7 +2,7 @@
|
||||||
<style name="Divider">
|
<style name="Divider">
|
||||||
<item name="android:layout_width">match_parent</item>
|
<item name="android:layout_width">match_parent</item>
|
||||||
<item name="android:layout_height">1.5dp</item>
|
<item name="android:layout_height">1.5dp</item>
|
||||||
<item name="android:background">@color/divider</item>
|
<item name="android:background">@color/black12</item>
|
||||||
</style>
|
</style>
|
||||||
<style name="Tag">
|
<style name="Tag">
|
||||||
|
|
||||||
|
|
|
@ -38,8 +38,8 @@
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<style name="ConversationsActionBar" parent="@android:style/Widget.Holo.Light.ActionBar.Solid.Inverse">
|
<style name="ConversationsActionBar" parent="@android:style/Widget.Holo.Light.ActionBar.Solid.Inverse">
|
||||||
<item name="android:background">@color/primary</item>
|
<item name="android:background">@color/green500</item>
|
||||||
<item name="android:backgroundStacked">@color/primarydark</item>
|
<item name="android:backgroundStacked">@color/green700</item>
|
||||||
<item name="android:displayOptions">showHome|homeAsUp|showTitle</item>
|
<item name="android:displayOptions">showHome|homeAsUp|showTitle</item>
|
||||||
<item name="android:icon">@android:color/transparent</item>
|
<item name="android:icon">@android:color/transparent</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
Loading…
Reference in New Issue