aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
Diffstat (limited to 'src')
-rw-r--r--src/main/java/de/pixart/messenger/ui/widget/ScannerView.java8
-rw-r--r--src/main/res/drawable/account_image_border.xml15
-rw-r--r--src/main/res/layout/activity_about.xml61
-rw-r--r--src/main/res/layout/activity_contact_details.xml2
-rw-r--r--src/main/res/layout/activity_edit_account.xml6
-rw-r--r--src/main/res/layout/activity_publish_profile_picture.xml66
-rw-r--r--src/main/res/values/colors.xml7
7 files changed, 93 insertions, 72 deletions
diff --git a/src/main/java/de/pixart/messenger/ui/widget/ScannerView.java b/src/main/java/de/pixart/messenger/ui/widget/ScannerView.java
index 0a2a80039..25b1f9f25 100644
--- a/src/main/java/de/pixart/messenger/ui/widget/ScannerView.java
+++ b/src/main/java/de/pixart/messenger/ui/widget/ScannerView.java
@@ -61,10 +61,10 @@ public class ScannerView extends View {
super(context, attrs);
final Resources res = getResources();
- maskColor = res.getColor(R.color.scan_mask);
- maskResultColor = res.getColor(R.color.scan_result_view);
- laserColor = res.getColor(R.color.scan_laser);
- dotColor = res.getColor(R.color.scan_dot);
+ maskColor = res.getColor(R.color.black54);
+ maskResultColor = res.getColor(R.color.black87);
+ laserColor = res.getColor(R.color.red500);
+ dotColor = res.getColor(R.color.orange500);
dotResultColor = res.getColor(R.color.scan_result_dots);
maskPaint = new Paint();
diff --git a/src/main/res/drawable/account_image_border.xml b/src/main/res/drawable/account_image_border.xml
new file mode 100644
index 000000000..990d02886
--- /dev/null
+++ b/src/main/res/drawable/account_image_border.xml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+ android:shape="rectangle" >
+
+ <corners android:radius="2dp" />
+
+ <padding
+ android:bottom="1.5dp"
+ android:left="1.5dp"
+ android:right="1.5dp"
+ android:top="1.5dp" />
+
+ <solid android:color="@color/black12" />
+
+</shape> \ No newline at end of file
diff --git a/src/main/res/layout/activity_about.xml b/src/main/res/layout/activity_about.xml
index 948e828fe..b4f022726 100644
--- a/src/main/res/layout/activity_about.xml
+++ b/src/main/res/layout/activity_about.xml
@@ -1,40 +1,61 @@
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
- tools:context="${applicationId}.ui.AboutActivity"
- android:background="@color/grey50"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent">
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:background="?attr/color_background_secondary"
+ tools:context="${applicationId}.ui.AboutActivity">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
- <TextView
- android:id="@+id/aboutmessage"
- android:text="@string/pref_about_message"
- android:layout_below="@+id/logo"
- android:autoLink="web"
- android:layout_width="wrap_content"
+ <android.support.v7.widget.CardView
+ android:id="@+id/LogoLayout"
+ android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:linksClickable="true"
+ android:layout_marginBottom="@dimen/activity_vertical_margin"
android:layout_marginLeft="@dimen/activity_horizontal_margin"
android:layout_marginRight="@dimen/activity_horizontal_margin"
- android:layout_marginTop="@dimen/activity_vertical_margin"
- android:paddingBottom="@dimen/activity_vertical_margin"
- android:textColor="@color/black87"
- android:textSize="?attr/TextSizeBody"
- android:typeface="monospace"
- android:fontFamily="monospace" />
+ android:layout_marginTop="@dimen/activity_vertical_margin">
<ImageView
android:id="@+id/logo"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:padding="8dp"
- android:src="@drawable/main_logo"
android:layout_alignParentTop="true"
- android:layout_centerHorizontal="true" />
+ android:layout_gravity="center_horizontal"
+ android:padding="8dp"
+ android:src="@drawable/main_logo" />
+ </android.support.v7.widget.CardView>
+
+ <android.support.v7.widget.CardView
+ android:id="@+id/aboutLayout"
+ android:layout_below="@+id/LogoLayout"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:layout_marginBottom="@dimen/activity_vertical_margin"
+ android:layout_marginLeft="@dimen/activity_horizontal_margin"
+ android:layout_marginRight="@dimen/activity_horizontal_margin"
+ android:layout_marginTop="@dimen/activity_vertical_margin">
+
+ <TextView
+ android:id="@+id/aboutmessage"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_marginLeft="@dimen/activity_horizontal_margin"
+ android:layout_marginRight="@dimen/activity_horizontal_margin"
+ android:layout_marginTop="@dimen/activity_vertical_margin"
+ android:autoLink="web"
+ android:fontFamily="monospace"
+ android:linksClickable="true"
+ android:paddingBottom="@dimen/activity_vertical_margin"
+ android:text="@string/pref_about_message"
+ android:textColor="@color/black87"
+ android:textSize="?attr/TextSizeBody"
+ android:typeface="monospace" />
+
+ </android.support.v7.widget.CardView>
</RelativeLayout>
</ScrollView>
diff --git a/src/main/res/layout/activity_contact_details.xml b/src/main/res/layout/activity_contact_details.xml
index 1cf0bdb08..4075476f9 100644
--- a/src/main/res/layout/activity_contact_details.xml
+++ b/src/main/res/layout/activity_contact_details.xml
@@ -4,7 +4,7 @@
<ScrollView
android:layout_width="fill_parent"
android:layout_height="fill_parent"
- android:background="@color/grey200">
+ android:background="?attr/color_background_secondary">
<LinearLayout
android:id="@+id/details_main_layout"
diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml
index b685e9cad..229c3c4ad 100644
--- a/src/main/res/layout/activity_edit_account.xml
+++ b/src/main/res/layout/activity_edit_account.xml
@@ -709,14 +709,14 @@
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="@string/cancel"
- android:textColor="@color/black87" />
+ android:textColor="?attr/color_text_primary" />
<View
android:layout_width="1dp"
android:layout_height="fill_parent"
android:layout_marginBottom="7dp"
android:layout_marginTop="7dp"
- android:background="@color/black12" />
+ android:background="?attr/color_text_primary" />
<Button
android:id="@+id/save_button"
@@ -726,7 +726,7 @@
android:layout_weight="1"
android:enabled="false"
android:text="@string/save"
- android:textColor="@color/black54" />
+ android:textColor="?attr/color_text_primary" />
</LinearLayout>
</RelativeLayout>
</layout> \ No newline at end of file
diff --git a/src/main/res/layout/activity_publish_profile_picture.xml b/src/main/res/layout/activity_publish_profile_picture.xml
index c6339604c..ee587086b 100644
--- a/src/main/res/layout/activity_publish_profile_picture.xml
+++ b/src/main/res/layout/activity_publish_profile_picture.xml
@@ -3,7 +3,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/grey200">
+ android:background="?attr/color_background_secondary">
<ScrollView
android:layout_width="fill_parent"
@@ -11,33 +11,29 @@
android:layout_above="@+id/button_bar"
android:layout_alignParentTop="true">
- <LinearLayout
+ <android.support.v7.widget.CardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
- android:orientation="vertical"
- android:gravity="center_horizontal">
+ android:layout_marginBottom="@dimen/activity_vertical_margin"
+ android:layout_marginLeft="@dimen/activity_horizontal_margin"
+ android:layout_marginRight="@dimen/activity_horizontal_margin"
+ android:layout_marginTop="@dimen/activity_vertical_margin">
<LinearLayout
- android:layout_width="fill_parent"
+ android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:layout_above="@+id/button_bar"
- android:layout_alignParentLeft="true"
- android:layout_alignParentRight="true"
- android:layout_below="@+id/secondary_hint"
- android:gravity="center_vertical"
- android:orientation="vertical"
- android:layout_marginRight="@dimen/activity_horizontal_margin"
- android:layout_marginLeft="@dimen/activity_horizontal_margin"
- android:layout_marginTop="@dimen/activity_vertical_margin"
- android:layout_marginBottom="@dimen/activity_vertical_margin"
- android:background="@drawable/infocard_border"
- android:padding="@dimen/card_padding_regular">
+ android:gravity="center_horizontal"
+ android:padding="@dimen/card_padding_regular"
+ android:orientation="vertical">
<LinearLayout
android:id="@+id/account_image_wrapper"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_alignParentLeft="true"
+ android:layout_alignParentRight="true"
android:layout_alignParentTop="true"
+ android:layout_below="@+id/secondary_hint"
android:layout_centerHorizontal="true"
android:layout_gravity="center_horizontal">
@@ -47,7 +43,6 @@
android:layout_height="wrap_content"
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true"
- android:layout_marginBottom="16dp"
android:adjustViewBounds="true"
android:background="@drawable/message_border"
android:contentDescription="@string/account_image_description"
@@ -63,14 +58,10 @@
android:layout_height="wrap_content"
android:layout_below="@id/account_image_wrapper"
android:layout_centerHorizontal="true"
- android:text="@string/touch_to_choose_picture"
- android:textColor="@color/black54"
- android:layout_marginLeft="@dimen/activity_horizontal_margin"
- android:layout_marginRight="@dimen/activity_horizontal_margin"
- android:layout_marginTop="@dimen/activity_vertical_margin"
- android:layout_marginBottom="@dimen/activity_vertical_margin"
android:layout_gravity="center_horizontal"
- android:textAlignment="center" />
+ android:text="@string/touch_to_choose_picture"
+ android:textAlignment="center"
+ android:textColor="?attr/color_text_primary" />
<TextView
android:id="@+id/secondary_hint"
@@ -78,27 +69,24 @@
android:layout_height="wrap_content"
android:layout_below="@id/hint"
android:layout_centerHorizontal="true"
- android:text="@string/or_long_press_for_default"
- android:textColor="@color/black54"
- android:layout_marginBottom="@dimen/activity_vertical_margin"
- android:layout_marginTop="@dimen/activity_vertical_margin"
- android:layout_marginLeft="@dimen/activity_horizontal_margin"
- android:layout_marginRight="@dimen/activity_horizontal_margin"
android:layout_gravity="center_horizontal"
- android:textAlignment="center" />
+ android:text="@string/or_long_press_for_default"
+ android:textAlignment="center"
+ android:textColor="?attr/color_text_secondary" />
<TextView
android:id="@+id/hint_or_warning"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
+ android:layout_gravity="center_horizontal"
android:layout_marginTop="8dp"
android:minLines="3"
- android:textColor="@color/black87"
- android:textSize="?attr/TextSizeBody"
android:textAlignment="center"
- android:layout_gravity="center_horizontal" />
+ android:textColor="?attr/color_text_primary"
+ android:textSize="?attr/TextSizeBody" />
</LinearLayout>
- </LinearLayout>
+ </android.support.v7.widget.CardView>
+
</ScrollView>
<LinearLayout
@@ -120,10 +108,10 @@
<View
android:layout_width="1dp"
- android:layout_height="fill_parent"
+ android:layout_height="match_parent"
android:layout_marginBottom="7dp"
android:layout_marginTop="7dp"
- android:background="@color/black12" />
+ android:background="?attr/color_text_primary" />
<Button
android:id="@+id/publish_button"
@@ -133,7 +121,7 @@
android:layout_weight="1"
android:enabled="false"
android:text="@string/publish"
- android:textColor="@color/black54" />
+ android:textColor="?attr/color_text_primary" />
</LinearLayout>
</RelativeLayout>
diff --git a/src/main/res/values/colors.xml b/src/main/res/values/colors.xml
index 2442282e3..875e50d8c 100644
--- a/src/main/res/values/colors.xml
+++ b/src/main/res/values/colors.xml
@@ -15,6 +15,7 @@
<color name="grey500">#ff9e9e9e</color>
<color name="grey800">#ff424242</color>
<color name="red800">#ffc62828</color>
+ <color name="red500">#fff44336</color>
<color name="orange500">#ffff9800</color>
<color name="bubble">#ff2e4272</color>
<color name="realwhite">#ffffffff</color>
@@ -28,9 +29,5 @@
<color name="warning_button">#fff5d9d9</color>
<!-- scanner -->
- <color name="scan_mask">#60000000</color>
- <color name="scan_laser">#cc0000</color>
- <color name="scan_dot">#ff6600</color>
- <color name="scan_result_view">#b0000000</color>
- <color name="scan_result_dots">#c099cc00</color>
+ <color name="scan_result_dots">#c04CAF50</color>
</resources>
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-24 04:01:02 +0000