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
622c1dc9
Commit
622c1dc9
authored
Dec 12, 2018
by
Filipe de Lima Brito
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Fix some errors while inflating some classes. Updates theme style
parent
93c2c33d
Changes
14
Show whitespace changes
Inline
Side-by-side
Showing
14 changed files
with
28 additions
and
28 deletions
+28
-28
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
No files found.
app/src/main/java/chat/rocket/android/chatroom/ui/ChatRoomFragment.kt
View file @
622c1dc9
...
...
@@ -198,8 +198,8 @@ class ChatRoomFragment : Fragment(), ChatRoomView, EmojiKeyboardListener, EmojiR
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
imagePreview
by
lazy
{
dialogView
.
findViewById
<
ImageView
>(
R
.
id
.
image_preview
)
}
internal
val
sendButton
by
lazy
{
dialogView
.
findViewById
<
Button
>(
R
.
id
.
button_send
)
}
internal
val
cancelButton
by
lazy
{
dialogView
.
findViewById
<
Button
>(
R
.
id
.
button_cancel
)
}
internal
val
sendButton
by
lazy
{
dialogView
.
findViewById
<
android
.
widget
.
Button
>(
R
.
id
.
button_send
)
}
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
audioVideoAttachment
by
lazy
{
dialogView
.
findViewById
<
FrameLayout
>(
R
.
id
.
audio_video_attachment
)
}
internal
val
textFile
by
lazy
{
dialogView
.
findViewById
<
TextView
>(
R
.
id
.
text_file_name
)
}
...
...
app/src/main/res/layout/dialog_report.xml
View file @
622c1dc9
...
...
@@ -113,7 +113,7 @@
app:layout_constraintTop_toBottomOf=
"@+id/edit_text_description"
tools:visibility=
"visible"
/>
<Button
<
android.widget.
Button
android:id=
"@+id/button_send_report"
android:layout_width=
"0dp"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/file_attachments_dialog.xml
View file @
622c1dc9
...
...
@@ -79,7 +79,7 @@
android:layout_margin=
"16dp"
android:hint=
"@string/msg_file_description"
/>
<Button
<
android.widget.
Button
android:id=
"@+id/button_send"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
@@ -90,7 +90,7 @@
android:text=
"@string/msg_send"
android:textColor=
"@color/colorWhite"
/>
<Button
<
android.widget.
Button
android:id=
"@+id/button_cancel"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/fragment_authentication_log_in.xml
View file @
622c1dc9
...
...
@@ -39,7 +39,7 @@
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@+id/text_username_or_email"
/>
<Button
<
android.widget.
Button
android:id=
"@+id/button_log_in"
style=
"@style/Authentication.Button"
android:layout_marginTop=
"20dp"
...
...
@@ -50,7 +50,7 @@
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@id/text_password"
/>
<Button
<
android.widget.
Button
android:id=
"@+id/button_forgot_your_password"
style=
"@style/Authentication.Button.Borderless"
android:layout_marginTop=
"10dp"
...
...
app/src/main/res/layout/fragment_authentication_login_options.xml
View file @
622c1dc9
...
...
@@ -21,7 +21,7 @@
app:layout_constraintTop_toTopOf=
"parent"
tools:visibility=
"visible"
>
<Button
<
android.widget.
Button
android:id=
"@+id/button_facebook"
style=
"?borderlessButtonStyle"
android:layout_width=
"match_parent"
...
...
@@ -39,7 +39,7 @@
android:visibility=
"gone"
tools:visibility=
"visible"
/>
<Button
<
android.widget.
Button
android:id=
"@+id/button_github"
style=
"?borderlessButtonStyle"
android:layout_width=
"match_parent"
...
...
@@ -58,7 +58,7 @@
android:visibility=
"gone"
tools:visibility=
"visible"
/>
<Button
<
android.widget.
Button
android:id=
"@+id/button_google"
style=
"?borderlessButtonStyle"
android:layout_width=
"match_parent"
...
...
@@ -77,7 +77,7 @@
android:visibility=
"gone"
tools:visibility=
"visible"
/>
<Button
<
android.widget.
Button
android:id=
"@+id/button_linkedin"
style=
"?borderlessButtonStyle"
android:layout_width=
"match_parent"
...
...
@@ -96,7 +96,7 @@
android:visibility=
"gone"
tools:visibility=
"visible"
/>
<Button
<
android.widget.
Button
android:id=
"@+id/button_gitlab"
style=
"?borderlessButtonStyle"
android:layout_width=
"match_parent"
...
...
@@ -115,7 +115,7 @@
android:visibility=
"gone"
tools:visibility=
"visible"
/>
<Button
<
android.widget.
Button
android:id=
"@+id/button_wordpress"
style=
"?borderlessButtonStyle"
android:layout_width=
"match_parent"
...
...
@@ -179,7 +179,7 @@
app:layout_constraintTop_toTopOf=
"@+id/button_expand_collapse_accounts"
/>
</androidx.constraintlayout.widget.ConstraintLayout>
<Button
<
android.widget.
Button
android:id=
"@+id/button_login_with_email"
style=
"@style/Authentication.Button"
android:layout_marginTop=
"32dp"
...
...
@@ -190,7 +190,7 @@
app:layout_constraintTop_toBottomOf=
"@+id/expand_more_accounts_container"
tools:visibility=
"visible"
/>
<Button
<
android.widget.
Button
android:id=
"@+id/button_create_an_account"
style=
"@style/Authentication.Button.Borderless"
android:layout_marginTop=
"10dp"
...
...
app/src/main/res/layout/fragment_authentication_register_username.xml
View file @
622c1dc9
...
...
@@ -26,7 +26,7 @@
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@id/text_sign_in_to_your_server"
/>
<Button
<
android.widget.
Button
android:id=
"@+id/button_use_this_username"
style=
"@style/Authentication.Button"
android:layout_marginTop=
"20dp"
...
...
app/src/main/res/layout/fragment_authentication_reset_password.xml
View file @
622c1dc9
...
...
@@ -26,7 +26,7 @@
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@id/text_reset_password"
/>
<Button
<
android.widget.
Button
android:id=
"@+id/button_reset_password"
style=
"@style/Authentication.Button"
android:layout_marginTop=
"20dp"
...
...
app/src/main/res/layout/fragment_authentication_server.xml
View file @
622c1dc9
...
...
@@ -63,7 +63,7 @@
android:inputType=
"text|textUri"
/>
</RelativeLayout>
<Button
<
android.widget.
Button
android:id=
"@+id/button_connect"
style=
"@style/Authentication.Button"
android:layout_marginTop=
"20dp"
...
...
app/src/main/res/layout/fragment_authentication_sign_up.xml
View file @
622c1dc9
...
...
@@ -66,7 +66,7 @@
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@+id/text_password"
/>
<Button
<
android.widget.
Button
android:id=
"@+id/button_register"
style=
"@style/Authentication.Button"
android:layout_marginTop=
"20dp"
...
...
app/src/main/res/layout/fragment_authentication_two_fa.xml
View file @
622c1dc9
...
...
@@ -24,7 +24,7 @@
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@+id/text_two_factor_authentication"
/>
<Button
<
android.widget.
Button
android:id=
"@+id/button_confirm"
style=
"@style/Authentication.Button"
android:layout_marginTop=
"20dp"
...
...
app/src/main/res/layout/item_message_reply.xml
View file @
622c1dc9
...
...
@@ -12,7 +12,7 @@
android:paddingEnd=
"@dimen/screen_edge_left_and_right_padding"
android:paddingBottom=
"@dimen/message_item_top_and_bottom_padding"
>
<Button
<
android.widget.
Button
android:id=
"@+id/button_message_reply"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
...
...
app/src/main/res/layout/message_attachment_options.xml
View file @
622c1dc9
...
...
@@ -5,7 +5,7 @@
android:background=
"@drawable/style_attachment_options"
android:orientation=
"vertical"
>
<Button
<
android.widget.
Button
android:id=
"@+id/button_take_a_photo"
style=
"?android:attr/borderlessButtonStyle"
android:layout_width=
"match_parent"
...
...
@@ -15,7 +15,7 @@
android:gravity=
"start|center"
android:text=
"@string/action_take_a_photo"
/>
<Button
<
android.widget.
Button
android:id=
"@+id/button_attach_a_file"
style=
"?android:attr/borderlessButtonStyle"
android:layout_width=
"match_parent"
...
...
@@ -25,7 +25,7 @@
android:gravity=
"start|center"
android:text=
"@string/action_attach_a_files"
/>
<Button
<
android.widget.
Button
android:id=
"@+id/button_drawing"
style=
"?android:attr/borderlessButtonStyle"
android:layout_width=
"match_parent"
...
...
app/src/main/res/layout/message_composer.xml
View file @
622c1dc9
...
...
@@ -33,7 +33,7 @@
app:layout_constraintStart_toStartOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@+id/divider"
/>
<Button
<
android.widget.
Button
android:id=
"@+id/button_join_chat"
android:layout_width=
"match_parent"
android:layout_height=
"45dp"
...
...
app/src/main/res/layout/update_avatar_options.xml
View file @
622c1dc9
...
...
@@ -5,7 +5,7 @@
android:background=
"@drawable/style_attachment_options"
android:orientation=
"vertical"
>
<Button
<
android.widget.
Button
android:id=
"@+id/button_open_gallery"
style=
"?android:attr/borderlessButtonStyle"
android:layout_width=
"match_parent"
...
...
@@ -15,7 +15,7 @@
android:gravity=
"start|center"
android:text=
"@string/action_select_photo_from_gallery"
/>
<Button
<
android.widget.
Button
android:id=
"@+id/button_take_a_photo"
style=
"?android:attr/borderlessButtonStyle"
android:layout_width=
"match_parent"
...
...
@@ -25,7 +25,7 @@
android:gravity=
"start|center"
android:text=
"@string/action_take_a_photo"
/>
<Button
<
android.widget.
Button
android:id=
"@+id/button_reset_avatar"
style=
"?android:attr/borderlessButtonStyle"
android:layout_width=
"match_parent"
...
...
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