Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
A
AloqaIM-Android
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Administrator
AloqaIM-Android
Commits
03a40799
Unverified
Commit
03a40799
authored
Dec 14, 2018
by
Filipe de Lima Brito
Committed by
GitHub
Dec 14, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge pull request #1922 from RocketChat/fix/crash-when-creating-channel
[Fix] Crash when creating channel
parents
a9a907ce
1f476849
Changes
15
Hide whitespace changes
Inline
Side-by-side
Showing
15 changed files
with
29 additions
and
29 deletions
+29
-29
ChatRoomFragment.kt
.../java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
+2
-2
dialog_report.xml
app/src/main/res/layout/dialog_report.xml
+1
-1
file_attachments_dialog.xml
app/src/main/res/layout/file_attachments_dialog.xml
+2
-2
fragment_authentication_log_in.xml
app/src/main/res/layout/fragment_authentication_log_in.xml
+2
-2
fragment_authentication_login_options.xml
...main/res/layout/fragment_authentication_login_options.xml
+8
-8
fragment_authentication_register_username.xml
.../res/layout/fragment_authentication_register_username.xml
+1
-1
fragment_authentication_reset_password.xml
...ain/res/layout/fragment_authentication_reset_password.xml
+1
-1
fragment_authentication_server.xml
app/src/main/res/layout/fragment_authentication_server.xml
+1
-1
fragment_authentication_sign_up.xml
app/src/main/res/layout/fragment_authentication_sign_up.xml
+1
-1
fragment_authentication_two_fa.xml
app/src/main/res/layout/fragment_authentication_two_fa.xml
+1
-1
item_message_reply.xml
app/src/main/res/layout/item_message_reply.xml
+1
-1
message_attachment_options.xml
app/src/main/res/layout/message_attachment_options.xml
+3
-3
message_composer.xml
app/src/main/res/layout/message_composer.xml
+1
-1
update_avatar_options.xml
app/src/main/res/layout/update_avatar_options.xml
+3
-3
styles.xml
app/src/main/res/values/styles.xml
+1
-1
No files found.
app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
View file @
03a40799
...
@@ -198,8 +198,8 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
...
@@ -198,8 +198,8 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
private
val
dialogView
by
lazy
{
View
.
inflate
(
context
,
R
.
layout
.
file_attachments_dialog
,
null
)
}
private
val
dialogView
by
lazy
{
View
.
inflate
(
context
,
R
.
layout
.
file_attachments_dialog
,
null
)
}
internal
val
alertDialog
by
lazy
{
AlertDialog
.
Builder
(
activity
).
setView
(
dialogView
).
create
()
}
internal
val
alertDialog
by
lazy
{
AlertDialog
.
Builder
(
activity
).
setView
(
dialogView
).
create
()
}
internal
val
imagePreview
by
lazy
{
dialogView
.
findViewById
<
ImageView
>(
R
.
id
.
image_preview
)
}
internal
val
imagePreview
by
lazy
{
dialogView
.
findViewById
<
ImageView
>(
R
.
id
.
image_preview
)
}
internal
val
sendButton
by
lazy
{
dialogView
.
findViewById
<
Button
>(
R
.
id
.
button_send
)
}
internal
val
sendButton
by
lazy
{
dialogView
.
findViewById
<
android
.
widget
.
Button
>(
R
.
id
.
button_send
)
}
internal
val
cancelButton
by
lazy
{
dialogView
.
findViewById
<
Button
>(
R
.
id
.
button_cancel
)
}
internal
val
cancelButton
by
lazy
{
dialogView
.
findViewById
<
android
.
widget
.
Button
>(
R
.
id
.
button_cancel
)
}
internal
val
description
by
lazy
{
dialogView
.
findViewById
<
EditText
>(
R
.
id
.
text_file_description
)
}
internal
val
description
by
lazy
{
dialogView
.
findViewById
<
EditText
>(
R
.
id
.
text_file_description
)
}
internal
val
audioVideoAttachment
by
lazy
{
dialogView
.
findViewById
<
FrameLayout
>(
R
.
id
.
audio_video_attachment
)
}
internal
val
audioVideoAttachment
by
lazy
{
dialogView
.
findViewById
<
FrameLayout
>(
R
.
id
.
audio_video_attachment
)
}
internal
val
textFile
by
lazy
{
dialogView
.
findViewById
<
TextView
>(
R
.
id
.
text_file_name
)
}
internal
val
textFile
by
lazy
{
dialogView
.
findViewById
<
TextView
>(
R
.
id
.
text_file_name
)
}
...
...
app/src/main/res/layout/dialog_report.xml
View file @
03a40799
...
@@ -113,7 +113,7 @@
...
@@ -113,7 +113,7 @@
app:layout_constraintTop_toBottomOf=
"@+id/edit_text_description"
app:layout_constraintTop_toBottomOf=
"@+id/edit_text_description"
tools:visibility=
"visible"
/>
tools:visibility=
"visible"
/>
<Button
<
android.widget.
Button
android:id=
"@+id/button_send_report"
android:id=
"@+id/button_send_report"
android:layout_width=
"0dp"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/file_attachments_dialog.xml
View file @
03a40799
...
@@ -79,7 +79,7 @@
...
@@ -79,7 +79,7 @@
android:layout_margin=
"16dp"
android:layout_margin=
"16dp"
android:hint=
"@string/msg_file_description"
/>
android:hint=
"@string/msg_file_description"
/>
<Button
<
android.widget.
Button
android:id=
"@+id/button_send"
android:id=
"@+id/button_send"
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
...
@@ -90,7 +90,7 @@
...
@@ -90,7 +90,7 @@
android:text=
"@string/msg_send"
android:text=
"@string/msg_send"
android:textColor=
"@color/colorWhite"
/>
android:textColor=
"@color/colorWhite"
/>
<Button
<
android.widget.
Button
android:id=
"@+id/button_cancel"
android:id=
"@+id/button_cancel"
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/fragment_authentication_log_in.xml
View file @
03a40799
...
@@ -39,7 +39,7 @@
...
@@ -39,7 +39,7 @@
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@+id/text_username_or_email"
/>
app:layout_constraintTop_toBottomOf=
"@+id/text_username_or_email"
/>
<Button
<
android.widget.
Button
android:id=
"@+id/button_log_in"
android:id=
"@+id/button_log_in"
style=
"@style/Authentication.Button"
style=
"@style/Authentication.Button"
android:layout_marginTop=
"20dp"
android:layout_marginTop=
"20dp"
...
@@ -50,7 +50,7 @@
...
@@ -50,7 +50,7 @@
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@id/text_password"
/>
app:layout_constraintTop_toBottomOf=
"@id/text_password"
/>
<Button
<
android.widget.
Button
android:id=
"@+id/button_forgot_your_password"
android:id=
"@+id/button_forgot_your_password"
style=
"@style/Authentication.Button.Borderless"
style=
"@style/Authentication.Button.Borderless"
android:layout_marginTop=
"10dp"
android:layout_marginTop=
"10dp"
...
...
app/src/main/res/layout/fragment_authentication_login_options.xml
View file @
03a40799
...
@@ -21,7 +21,7 @@
...
@@ -21,7 +21,7 @@
app:layout_constraintTop_toTopOf=
"parent"
app:layout_constraintTop_toTopOf=
"parent"
tools:visibility=
"visible"
>
tools:visibility=
"visible"
>
<Button
<
android.widget.
Button
android:id=
"@+id/button_facebook"
android:id=
"@+id/button_facebook"
style=
"?borderlessButtonStyle"
style=
"?borderlessButtonStyle"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
...
@@ -39,7 +39,7 @@
...
@@ -39,7 +39,7 @@
android:visibility=
"gone"
android:visibility=
"gone"
tools:visibility=
"visible"
/>
tools:visibility=
"visible"
/>
<Button
<
android.widget.
Button
android:id=
"@+id/button_github"
android:id=
"@+id/button_github"
style=
"?borderlessButtonStyle"
style=
"?borderlessButtonStyle"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
...
@@ -58,7 +58,7 @@
...
@@ -58,7 +58,7 @@
android:visibility=
"gone"
android:visibility=
"gone"
tools:visibility=
"visible"
/>
tools:visibility=
"visible"
/>
<Button
<
android.widget.
Button
android:id=
"@+id/button_google"
android:id=
"@+id/button_google"
style=
"?borderlessButtonStyle"
style=
"?borderlessButtonStyle"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
...
@@ -77,7 +77,7 @@
...
@@ -77,7 +77,7 @@
android:visibility=
"gone"
android:visibility=
"gone"
tools:visibility=
"visible"
/>
tools:visibility=
"visible"
/>
<Button
<
android.widget.
Button
android:id=
"@+id/button_linkedin"
android:id=
"@+id/button_linkedin"
style=
"?borderlessButtonStyle"
style=
"?borderlessButtonStyle"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
...
@@ -96,7 +96,7 @@
...
@@ -96,7 +96,7 @@
android:visibility=
"gone"
android:visibility=
"gone"
tools:visibility=
"visible"
/>
tools:visibility=
"visible"
/>
<Button
<
android.widget.
Button
android:id=
"@+id/button_gitlab"
android:id=
"@+id/button_gitlab"
style=
"?borderlessButtonStyle"
style=
"?borderlessButtonStyle"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
...
@@ -115,7 +115,7 @@
...
@@ -115,7 +115,7 @@
android:visibility=
"gone"
android:visibility=
"gone"
tools:visibility=
"visible"
/>
tools:visibility=
"visible"
/>
<Button
<
android.widget.
Button
android:id=
"@+id/button_wordpress"
android:id=
"@+id/button_wordpress"
style=
"?borderlessButtonStyle"
style=
"?borderlessButtonStyle"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
...
@@ -179,7 +179,7 @@
...
@@ -179,7 +179,7 @@
app:layout_constraintTop_toTopOf=
"@+id/button_expand_collapse_accounts"
/>
app:layout_constraintTop_toTopOf=
"@+id/button_expand_collapse_accounts"
/>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
<Button
<
android.widget.
Button
android:id=
"@+id/button_login_with_email"
android:id=
"@+id/button_login_with_email"
style=
"@style/Authentication.Button"
style=
"@style/Authentication.Button"
android:layout_marginTop=
"32dp"
android:layout_marginTop=
"32dp"
...
@@ -190,7 +190,7 @@
...
@@ -190,7 +190,7 @@
app:layout_constraintTop_toBottomOf=
"@+id/expand_more_accounts_container"
app:layout_constraintTop_toBottomOf=
"@+id/expand_more_accounts_container"
tools:visibility=
"visible"
/>
tools:visibility=
"visible"
/>
<Button
<
android.widget.
Button
android:id=
"@+id/button_create_an_account"
android:id=
"@+id/button_create_an_account"
style=
"@style/Authentication.Button.Borderless"
style=
"@style/Authentication.Button.Borderless"
android:layout_marginTop=
"10dp"
android:layout_marginTop=
"10dp"
...
...
app/src/main/res/layout/fragment_authentication_register_username.xml
View file @
03a40799
...
@@ -26,7 +26,7 @@
...
@@ -26,7 +26,7 @@
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@id/text_sign_in_to_your_server"
/>
app:layout_constraintTop_toBottomOf=
"@id/text_sign_in_to_your_server"
/>
<Button
<
android.widget.
Button
android:id=
"@+id/button_use_this_username"
android:id=
"@+id/button_use_this_username"
style=
"@style/Authentication.Button"
style=
"@style/Authentication.Button"
android:layout_marginTop=
"20dp"
android:layout_marginTop=
"20dp"
...
...
app/src/main/res/layout/fragment_authentication_reset_password.xml
View file @
03a40799
...
@@ -26,7 +26,7 @@
...
@@ -26,7 +26,7 @@
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@id/text_reset_password"
/>
app:layout_constraintTop_toBottomOf=
"@id/text_reset_password"
/>
<Button
<
android.widget.
Button
android:id=
"@+id/button_reset_password"
android:id=
"@+id/button_reset_password"
style=
"@style/Authentication.Button"
style=
"@style/Authentication.Button"
android:layout_marginTop=
"20dp"
android:layout_marginTop=
"20dp"
...
...
app/src/main/res/layout/fragment_authentication_server.xml
View file @
03a40799
...
@@ -63,7 +63,7 @@
...
@@ -63,7 +63,7 @@
android:inputType=
"text|textUri"
/>
android:inputType=
"text|textUri"
/>
</RelativeLayout>
</RelativeLayout>
<Button
<
android.widget.
Button
android:id=
"@+id/button_connect"
android:id=
"@+id/button_connect"
style=
"@style/Authentication.Button"
style=
"@style/Authentication.Button"
android:layout_marginTop=
"20dp"
android:layout_marginTop=
"20dp"
...
...
app/src/main/res/layout/fragment_authentication_sign_up.xml
View file @
03a40799
...
@@ -66,7 +66,7 @@
...
@@ -66,7 +66,7 @@
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@+id/text_password"
/>
app:layout_constraintTop_toBottomOf=
"@+id/text_password"
/>
<Button
<
android.widget.
Button
android:id=
"@+id/button_register"
android:id=
"@+id/button_register"
style=
"@style/Authentication.Button"
style=
"@style/Authentication.Button"
android:layout_marginTop=
"20dp"
android:layout_marginTop=
"20dp"
...
...
app/src/main/res/layout/fragment_authentication_two_fa.xml
View file @
03a40799
...
@@ -24,7 +24,7 @@
...
@@ -24,7 +24,7 @@
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@+id/text_two_factor_authentication"
/>
app:layout_constraintTop_toBottomOf=
"@+id/text_two_factor_authentication"
/>
<Button
<
android.widget.
Button
android:id=
"@+id/button_confirm"
android:id=
"@+id/button_confirm"
style=
"@style/Authentication.Button"
style=
"@style/Authentication.Button"
android:layout_marginTop=
"20dp"
android:layout_marginTop=
"20dp"
...
...
app/src/main/res/layout/item_message_reply.xml
View file @
03a40799
...
@@ -12,7 +12,7 @@
...
@@ -12,7 +12,7 @@
android:paddingEnd=
"@dimen/screen_edge_left_and_right_padding"
android:paddingEnd=
"@dimen/screen_edge_left_and_right_padding"
android:paddingBottom=
"@dimen/message_item_top_and_bottom_padding"
>
android:paddingBottom=
"@dimen/message_item_top_and_bottom_padding"
>
<Button
<
android.widget.
Button
android:id=
"@+id/button_message_reply"
android:id=
"@+id/button_message_reply"
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/message_attachment_options.xml
View file @
03a40799
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
android:background=
"@drawable/style_attachment_options"
android:background=
"@drawable/style_attachment_options"
android:orientation=
"vertical"
>
android:orientation=
"vertical"
>
<Button
<
android.widget.
Button
android:id=
"@+id/button_take_a_photo"
android:id=
"@+id/button_take_a_photo"
style=
"?android:attr/borderlessButtonStyle"
style=
"?android:attr/borderlessButtonStyle"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
android:gravity=
"start|center"
android:gravity=
"start|center"
android:text=
"@string/action_take_a_photo"
/>
android:text=
"@string/action_take_a_photo"
/>
<Button
<
android.widget.
Button
android:id=
"@+id/button_attach_a_file"
android:id=
"@+id/button_attach_a_file"
style=
"?android:attr/borderlessButtonStyle"
style=
"?android:attr/borderlessButtonStyle"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
...
@@ -25,7 +25,7 @@
...
@@ -25,7 +25,7 @@
android:gravity=
"start|center"
android:gravity=
"start|center"
android:text=
"@string/action_attach_a_files"
/>
android:text=
"@string/action_attach_a_files"
/>
<Button
<
android.widget.
Button
android:id=
"@+id/button_drawing"
android:id=
"@+id/button_drawing"
style=
"?android:attr/borderlessButtonStyle"
style=
"?android:attr/borderlessButtonStyle"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
...
...
app/src/main/res/layout/message_composer.xml
View file @
03a40799
...
@@ -33,7 +33,7 @@
...
@@ -33,7 +33,7 @@
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@+id/divider"
/>
app:layout_constraintTop_toBottomOf=
"@+id/divider"
/>
<Button
<
android.widget.
Button
android:id=
"@+id/button_join_chat"
android:id=
"@+id/button_join_chat"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"45dp"
android:layout_height=
"45dp"
...
...
app/src/main/res/layout/update_avatar_options.xml
View file @
03a40799
...
@@ -5,7 +5,7 @@
...
@@ -5,7 +5,7 @@
android:background=
"@drawable/style_attachment_options"
android:background=
"@drawable/style_attachment_options"
android:orientation=
"vertical"
>
android:orientation=
"vertical"
>
<Button
<
android.widget.
Button
android:id=
"@+id/button_open_gallery"
android:id=
"@+id/button_open_gallery"
style=
"?android:attr/borderlessButtonStyle"
style=
"?android:attr/borderlessButtonStyle"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
...
@@ -15,7 +15,7 @@
...
@@ -15,7 +15,7 @@
android:gravity=
"start|center"
android:gravity=
"start|center"
android:text=
"@string/action_select_photo_from_gallery"
/>
android:text=
"@string/action_select_photo_from_gallery"
/>
<Button
<
android.widget.
Button
android:id=
"@+id/button_take_a_photo"
android:id=
"@+id/button_take_a_photo"
style=
"?android:attr/borderlessButtonStyle"
style=
"?android:attr/borderlessButtonStyle"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
...
@@ -25,7 +25,7 @@
...
@@ -25,7 +25,7 @@
android:gravity=
"start|center"
android:gravity=
"start|center"
android:text=
"@string/action_take_a_photo"
/>
android:text=
"@string/action_take_a_photo"
/>
<Button
<
android.widget.
Button
android:id=
"@+id/button_reset_avatar"
android:id=
"@+id/button_reset_avatar"
style=
"?android:attr/borderlessButtonStyle"
style=
"?android:attr/borderlessButtonStyle"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
...
...
app/src/main/res/values/styles.xml
View file @
03a40799
<resources>
<resources>
<!-- Base application theme. -->
<!-- Base application theme. -->
<style
name=
"AppTheme"
parent=
"Theme.
AppCompat
.Light.NoActionBar"
>
<style
name=
"AppTheme"
parent=
"Theme.
MaterialComponents
.Light.NoActionBar"
>
<!-- Customize your theme here. -->
<!-- Customize your theme here. -->
<item
name=
"colorPrimary"
>
@color/colorPrimary
</item>
<item
name=
"colorPrimary"
>
@color/colorPrimary
</item>
<item
name=
"colorPrimaryDark"
>
@color/colorPrimaryDark
</item>
<item
name=
"colorPrimaryDark"
>
@color/colorPrimaryDark
</item>
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment