aboutsummaryrefslogtreecommitdiffstats
path: root/src/main/res
diff options
context:
space:
mode:
Diffstat (limited to 'src/main/res')
-rw-r--r--src/main/res/layout/activity_about.xml2
-rw-r--r--src/main/res/layout/contact_key.xml1
-rw-r--r--src/main/res/layout/fragment_conversation.xml4
-rw-r--r--src/main/res/layout/message_sent.xml3
-rw-r--r--src/main/res/values/strings.xml2
-rw-r--r--src/main/res/xml/preferences.xml8
6 files changed, 11 insertions, 9 deletions
diff --git a/src/main/res/layout/activity_about.xml b/src/main/res/layout/activity_about.xml
index 8f1113ad..142087c0 100644
--- a/src/main/res/layout/activity_about.xml
+++ b/src/main/res/layout/activity_about.xml
@@ -1,6 +1,6 @@
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
- tools:context="eu.siacs.conversations.ui.AboutActivity"
+ tools:context="de.thedevstack.conversationsplus.ui.AboutActivity"
android:background="@color/grey50"
android:layout_width="fill_parent"
android:layout_height="fill_parent">
diff --git a/src/main/res/layout/contact_key.xml b/src/main/res/layout/contact_key.xml
index 03246ccb..bf818001 100644
--- a/src/main/res/layout/contact_key.xml
+++ b/src/main/res/layout/contact_key.xml
@@ -55,6 +55,7 @@
android:src="?attr/icon_remove"
android:visibility="gone" />
+
<Switch
android:id="@+id/tgl_trust"
android:visibility="invisible"
diff --git a/src/main/res/layout/fragment_conversation.xml b/src/main/res/layout/fragment_conversation.xml
index d14091fd..c3a86616 100644
--- a/src/main/res/layout/fragment_conversation.xml
+++ b/src/main/res/layout/fragment_conversation.xml
@@ -39,7 +39,7 @@
android:layout_alignParentLeft="true"
android:background="@color/grey50" >
- <eu.siacs.conversations.ui.EditMessage
+ <de.thedevstack.conversationsplus.ui.EditMessage
android:id="@+id/textinput"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@@ -58,7 +58,7 @@
android:textColor="@color/primaryText" >
<requestFocus />
- </eu.siacs.conversations.ui.EditMessage>
+ </de.thedevstack.conversationsplus.ui.EditMessage>
<ImageButton
android:id="@+id/textSendButton"
diff --git a/src/main/res/layout/message_sent.xml b/src/main/res/layout/message_sent.xml
index b74347d4..723a29e2 100644
--- a/src/main/res/layout/message_sent.xml
+++ b/src/main/res/layout/message_sent.xml
@@ -19,6 +19,7 @@
android:layout_alignParentBottom="true"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
+ android:visibility="gone"
app:riv_corner_radius="2dp" />
<LinearLayout
@@ -26,7 +27,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
- android:layout_toLeftOf="@+id/message_photo"
+ android:layout_alignParentRight="true"
android:background="@drawable/message_bubble_sent"
android:minHeight="53dp"
android:layout_marginLeft="-4dp"
diff --git a/src/main/res/values/strings.xml b/src/main/res/values/strings.xml
index 11bed337..13662994 100644
--- a/src/main/res/values/strings.xml
+++ b/src/main/res/values/strings.xml
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
- <string name="app_name" translatable="false">Conversations</string>
+ <string name="app_name" translatable="false">Conversations+</string>
<string name="action_settings">Settings</string>
<string name="action_add">New conversation</string>
<string name="action_accounts">Manage accounts</string>
diff --git a/src/main/res/xml/preferences.xml b/src/main/res/xml/preferences.xml
index f0de762b..17c56bf7 100644
--- a/src/main/res/xml/preferences.xml
+++ b/src/main/res/xml/preferences.xml
@@ -99,13 +99,13 @@
android:key="enable_quiet_hours"
android:summary="@string/pref_quiet_hours_summary"
android:title="@string/title_pref_enable_quiet_hours" />
- <eu.siacs.conversations.ui.TimePreference
+ <de.thedevstack.conversationsplus.ui.TimePreference
android:dependency="enable_quiet_hours"
android:key="quiet_hours_start"
android:negativeButtonText="@string/cancel"
android:positiveButtonText="@string/set"
android:title="@string/title_pref_quiet_hours_start_time" />
- <eu.siacs.conversations.ui.TimePreference
+ <de.thedevstack.conversationsplus.ui.TimePreference
android:dependency="enable_quiet_hours"
android:key="quiet_hours_end"
android:negativeButtonText="@string/cancel"
@@ -243,7 +243,7 @@
android:key="keep_foreground_service"
android:summary="@string/pref_keep_foreground_service_summary"
android:title="@string/pref_keep_foreground_service"/>
- <eu.siacs.conversations.ui.ExportLogsPreference
+ <de.thedevstack.conversationsplus.ui.ExportLogsPreference
android:key="export_logs"
android:summary="@string/pref_export_logs_summary"
android:title="@string/pref_export_logs"/>
@@ -264,7 +264,7 @@
android:summary="@string/pref_never_send_crash_summary"
android:title="@string/pref_never_send_crash"/>
</PreferenceCategory>
- <eu.siacs.conversations.ui.AboutPreference
+ <de.thedevstack.conversationsplus.ui.AboutPreference
android:summary="@string/pref_about_conversations_summary"
android:title="@string/title_activity_about"/>
</PreferenceScreen>