aboutsummaryrefslogtreecommitdiffstats
path: root/res/layout
diff options
context:
space:
mode:
Diffstat (limited to 'res/layout')
-rw-r--r--res/layout/activity_choose_contact.xml13
-rw-r--r--res/layout/activity_muc_details.xml237
-rw-r--r--res/layout/cert_warning.xml41
-rw-r--r--res/layout/edit_contact_name.xml28
-rw-r--r--res/layout/fragment_conversation.xml3
-rw-r--r--res/layout/quickedit.xml18
6 files changed, 141 insertions, 199 deletions
diff --git a/res/layout/activity_choose_contact.xml b/res/layout/activity_choose_contact.xml
new file mode 100644
index 00000000..248a7822
--- /dev/null
+++ b/res/layout/activity_choose_contact.xml
@@ -0,0 +1,13 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ xmlns:tools="http://schemas.android.com/tools"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent" >
+
+ <ListView
+ android:id="@+id/choose_contact_list"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ tools:listitem="@layout/contact" />
+
+</LinearLayout> \ No newline at end of file
diff --git a/res/layout/activity_muc_details.xml b/res/layout/activity_muc_details.xml
index 15f09c7c..49b4cef3 100644
--- a/res/layout/activity_muc_details.xml
+++ b/res/layout/activity_muc_details.xml
@@ -2,147 +2,126 @@
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
- android:background="@color/secondarybackground">
-
-<LinearLayout
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:orientation="vertical" >
- <TextView
- style="@style/sectionHeader"
+ android:background="@color/primarybackground" >
+
+ <LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
- android:padding="8dp"
- android:text="@string/muc_details_conference"
- android:textColor="@color/primarytext"/>
- <RelativeLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:background="@color/primarybackground" >
-
+ android:orientation="vertical" >
- <EditText
- android:id="@+id/muc_subject"
+ <TextView
+ style="@style/sectionHeader"
android:layout_width="wrap_content"
- android:layout_height="48dp"
- android:layout_alignParentLeft="true"
- android:layout_toLeftOf="@+id/muc_edit_subject"
- android:background="@color/primarybackground"
- android:ems="10"
- android:hint="@string/muc_details_conference_subject"
- android:inputType="textAutoComplete"
- android:paddingBottom="12dp"
- android:paddingLeft="8dp"
- android:paddingRight="8dp"
- android:paddingTop="12dp" />
-
- <ImageButton
- android:id="@+id/muc_edit_subject"
- android:layout_width="48dp"
- android:layout_height="48dp"
- android:layout_alignParentRight="true"
- android:layout_alignParentTop="true"
- android:layout_centerVertical="true"
- android:background="?android:selectableItemBackground"
+ android:layout_height="wrap_content"
android:padding="8dp"
- android:src="@drawable/ic_action_edit" />
- </RelativeLayout>
- <TextView
- android:id="@+id/muc_jabberid"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:padding="8dp"
- android:singleLine="true"
- android:textSize="14sp"
- android:textColor="@color/primarytext"/>
+ android:text="@string/muc_details_conference" />
- <TextView
- style="@style/sectionHeader"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:paddingLeft="8dp"
- android:paddingRight="8dp"
- android:paddingTop="8dp"
- android:text="@string/muc_details_your_nickname"
- android:textColor="@color/primarytext"/>
-
- <RelativeLayout
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:background="@color/primarybackground" >
-
+ <TextView
+ android:id="@+id/muc_jabberid"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:padding="8dp"
+ android:singleLine="true"
+ android:text="@string/account_settings_example_jabber_id"
+ android:textColor="@color/primarytext"
+ android:textSize="14sp"/>
- <EditText
- android:id="@+id/muc_your_nick"
+ <TextView
+ style="@style/sectionHeader"
android:layout_width="wrap_content"
- android:layout_height="48dp"
- android:layout_alignParentLeft="true"
- android:layout_toLeftOf="@+id/muc_edit_nick"
- android:background="@color/primarybackground"
- android:ems="10"
- android:hint="@string/muc_details_your_nickname"
- android:inputType="textEmailAddress"
- android:paddingBottom="12dp"
+ android:layout_height="wrap_content"
android:paddingLeft="8dp"
android:paddingRight="8dp"
- android:paddingTop="12dp" />
-
- <ImageButton
- android:id="@+id/muc_edit_nick"
- android:layout_width="48dp"
- android:layout_height="48dp"
- android:layout_alignParentRight="true"
- android:layout_alignParentTop="true"
- android:layout_centerVertical="true"
- android:background="?android:selectableItemBackground"
+ android:paddingTop="8dp"
+ android:text="@string/you" />
+
+ <RelativeLayout
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:background="?android:attr/activatedBackgroundIndicator"
android:padding="8dp"
- android:src="@drawable/ic_action_edit" />
- </RelativeLayout>
- <TextView
- android:id="@+id/muc_role"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:padding="8dp"
- android:singleLine="true"
- android:textSize="14sp"
- android:textColor="@color/primarytext"/>
-
- <LinearLayout
- android:id="@+id/muc_more_details"
- android:layout_width="fill_parent"
- android:layout_height="fill_parent"
- android:orientation="vertical">
-
- <TextView
- android:id="@+id/muc_participants_header"
- style="@style/sectionHeader"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:paddingLeft="8dp"
- android:paddingRight="8dp"
- android:paddingTop="8dp"
- android:text="@string/muc_details_other_members"
- android:textColor="@color/primarytext"/>
+ android:paddingBottom="8dp" >
- <LinearLayout
- android:id="@+id/muc_members"
- android:layout_width="fill_parent"
- android:layout_height="0dp"
- android:layout_weight="1"
- android:orientation="vertical"
- android:divider="?android:dividerHorizontal"
- android:showDividers="middle"
- >
- </LinearLayout>
+ <ImageView
+ android:id="@+id/your_photo"
+ android:layout_width="48dp"
+ android:layout_height="48dp"
+ android:layout_alignParentLeft="true"
+ android:src="@drawable/ic_profile" >
+ </ImageView>
+
+ <LinearLayout
+ android:layout_width="fill_parent"
+ android:layout_height="wrap_content"
+ android:layout_centerVertical="true"
+ android:layout_toRightOf="@+id/your_photo"
+ android:orientation="vertical"
+ android:paddingLeft="8dp" >
+
+ <TextView
+ android:id="@+id/muc_your_nick"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:singleLine="true"
+ android:textColor="@color/primarytext"
+ android:textSize="18sp" />
+
+ <TextView
+ android:id="@+id/muc_role"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:singleLine="true"
+ android:textColor="@color/primarytext"
+ android:textSize="14sp" />
+ </LinearLayout>
+
+ <ImageButton
+ android:id="@+id/edit_nick_button"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_alignParentRight="true"
+ android:layout_centerVertical="true"
+ android:background="?android:selectableItemBackground"
+ android:src="@drawable/ic_action_edit_dark"
+ android:padding="8dp"/>
+
+ </RelativeLayout>
+
+ <LinearLayout
+ android:id="@+id/muc_more_details"
+ android:layout_width="fill_parent"
+ android:layout_height="fill_parent"
+ android:orientation="vertical" >
+
+ <TextView
+ android:id="@+id/muc_participants_header"
+ style="@style/sectionHeader"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:paddingLeft="8dp"
+ android:paddingRight="8dp"
+ android:paddingTop="8dp"
+ android:text="@string/muc_details_other_members" />
+
+ <LinearLayout
+ android:id="@+id/muc_members"
+ android:layout_width="fill_parent"
+ android:layout_height="0dp"
+ android:layout_weight="1"
+ android:divider="?android:dividerHorizontal"
+ android:orientation="vertical"
+ android:showDividers="middle" >
+ </LinearLayout>
+ </LinearLayout>
+
+ <Button
+ android:id="@+id/invite"
+ style="?android:attr/buttonStyleSmall"
+ android:layout_width="wrap_content"
+ android:layout_height="wrap_content"
+ android:layout_gravity="center_horizontal"
+ android:layout_marginTop="24dp"
+ android:text="@string/invite_contact" />
</LinearLayout>
- <Button
- android:layout_marginTop="24dp"
- android:id="@+id/invite"
- style="?android:attr/buttonStyleSmall"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/invite_contacts"
- android:layout_gravity="center_horizontal"/>
-</LinearLayout>
</ScrollView> \ No newline at end of file
diff --git a/res/layout/cert_warning.xml b/res/layout/cert_warning.xml
deleted file mode 100644
index fffe3266..00000000
--- a/res/layout/cert_warning.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical"
- android:padding="8dp">
-
- <TextView
- android:id="@+id/hint"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textSize="14sp"/>
-
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textColor="#FFe92727"
- android:textStyle="bold"
- android:textSize="14sp"
- android:text="Do not connect unless you know exactly what you are doing"
- android:paddingTop="8dp"
- android:paddingBottom="8dp"/>
-
- <TextView
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:textSize="14sp"
- android:text="The SHA1 fingerprint is:" />
-
- <TextView
- android:layout_gravity="center_horizontal"
- android:paddingTop="8dp"
- android:paddingBottom="8dp"
- android:id="@+id/sha"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:typeface="monospace"
- android:textStyle="bold"
- android:textSize="18sp"/>
-
-</LinearLayout>
diff --git a/res/layout/edit_contact_name.xml b/res/layout/edit_contact_name.xml
deleted file mode 100644
index 42f0fb88..00000000
--- a/res/layout/edit_contact_name.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
- android:layout_width="match_parent"
- android:layout_height="match_parent"
- android:orientation="vertical"
- android:padding="8dp">
-
- <TextView
- android:id="@+id/textView1"
- android:layout_width="wrap_content"
- android:layout_height="wrap_content"
- android:text="@string/enter_new_name"
- android:textColor="@color/primarytext"
- android:textSize="18sp" />
-
- <EditText
- android:paddingTop="16dp"
- android:paddingBottom="8dp"
- android:id="@+id/editText1"
- android:layout_width="match_parent"
- android:layout_height="wrap_content"
- android:ems="10"
- android:inputType="textPersonName" >
-
- <requestFocus />
- </EditText>
-
-</LinearLayout>
diff --git a/res/layout/fragment_conversation.xml b/res/layout/fragment_conversation.xml
index b712c304..2d612984 100644
--- a/res/layout/fragment_conversation.xml
+++ b/res/layout/fragment_conversation.xml
@@ -81,7 +81,8 @@
android:layout_centerVertical="true"
android:paddingLeft="24dp"
android:textColor="@color/ondarktext"
- android:textSize="14sp" />
+ android:textSize="14sp"
+ android:layout_toLeftOf="@+id/snackbar_action"/>
<TextView
android:id="@+id/snackbar_action"
diff --git a/res/layout/quickedit.xml b/res/layout/quickedit.xml
new file mode 100644
index 00000000..07a7ac3b
--- /dev/null
+++ b/res/layout/quickedit.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+ android:layout_width="match_parent"
+ android:layout_height="match_parent"
+ android:orientation="vertical"
+ android:padding="16dp">
+ <EditText
+ android:id="@+id/editor"
+ android:layout_width="match_parent"
+ android:layout_height="wrap_content"
+ android:ems="10"
+ android:inputType="textPersonName"
+ android:textColor="@color/primarytext">
+
+ <requestFocus />
+ </EditText>
+
+</LinearLayout>
generated by cgit v1.2.3 (git 2.25.1) at 2024-07-01 18:59:30 +0000