Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-15 12:19:54 +01:00
Code Issues Projects Releases Wiki Activity

Use same layout and behaviour for creating groups and forums.

Browse Source
This commit is contained in:
akwizgran
2017-06-30 17:23:19 +01:00
parent 613a7fe376
commit 9146488c7d
5 changed files with 97 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
briar-android/src/main/res/layout/activity_create_forum.xml
View File

@@ -1,37 +1,30 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout
xmlns:android="http://schemas.android.com/apk/res/android"
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center_horizontal"
android:padding="20dp" >
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:gravity="center"
android:textSize="@dimen/text_size_medium"
android:text="@string/choose_forum_name" />
android:orientation="vertical"
android:layout_margin="@dimen/margin_large">
<EditText
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/createForumNameEntry"
android:maxLines="1"
android:inputType="text|textCapSentences" />
android:inputType="text|textCapSentences"
android:hint="@string/choose_forum_hint" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/createForumFeedback"
android:gravity="center"
android:paddingLeft="50dp"
android:paddingRight="50dp" />
android:gravity="center" />
<Button
style="@style/BriarButton"
android:id="@+id/createForumButton"
android:enabled="false"
android:text="@string/create_forum_button" />
<ProgressBar

15
briar-android/src/main/res/layout/fragment_create_group.xml
View File

@@ -3,22 +3,27 @@
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="center_horizontal"
android:orientation="vertical"
android:padding="@dimen/margin_medium">
android:layout_margin="@dimen/margin_large">
<EditText
android:id="@+id/name"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
android:gravity="bottom"
android:layout_height="wrap_content"
android:maxLines="1"
android:inputType="text|textCapSentences"
android:hint="@string/groups_create_group_hint"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/feedback"
android:gravity="center" />
<Button
android:id="@+id/button"
style="@style/BriarButton"
android:id="@+id/button"
android:enabled="false"
android:text="@string/groups_create_group_button"/>

2
briar-android/src/main/res/values/strings.xml
View File

@@ -205,7 +205,7 @@
<!-- Forums -->
<string name="no_forums">You don\'t have any forums yet.\n\nWhy don\'t you create a new one yourself by tapping the + icon at the top?\n\nYou can also ask your contacts to share forums with you.</string>
<string name="create_forum_title">New Forum</string>
<string name="choose_forum_name">Choose a name for your forum:</string>
<string name="choose_forum_hint">Choose a name for your forum</string>
<string name="create_forum_button">Create Forum</string>
<string name="forum_created_toast">Forum created</string>
<string name="no_forum_posts">This forum is empty.\n\nUse the pen icon at the top to compose the first post.\n\nFeeling lonely here? Share this forum with more of your contacts!</string>