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
24c8acd3
Commit
24c8acd3
authored
May 14, 2019
by
Filipe de Lima Brito
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop' of github.com:RocketChat/Rocket.Chat.Android into develop
parents
89d4f617
ad9e42ed
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
3 additions
and
2 deletions
+3
-2
build.gradle
app/build.gradle
+1
-1
fragment_profile.xml
app/src/main/res/layout/fragment_profile.xml
+1
-1
DrawActivity.kt
...ain/java/chat/rocket/android/draw/main/ui/DrawActivity.kt
+1
-0
No files found.
app/build.gradle
View file @
24c8acd3
...
@@ -204,4 +204,4 @@ task compileSdk(type: Exec) {
...
@@ -204,4 +204,4 @@ task compileSdk(type: Exec) {
preBuild
.
dependsOn
compileSdk
preBuild
.
dependsOn
compileSdk
if
(
isPlay
)
{
if
(
isPlay
)
{
apply
plugin:
'com.google.gms.google-services'
apply
plugin:
'com.google.gms.google-services'
}
}
\ No newline at end of file
app/src/main/res/layout/fragment_profile.xml
View file @
24c8acd3
...
@@ -73,7 +73,7 @@
...
@@ -73,7 +73,7 @@
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"48dp"
android:layout_height=
"48dp"
android:layout_marginTop=
"16dp"
android:layout_marginTop=
"16dp"
android:layout_marginBottom=
"
16
dp"
android:layout_marginBottom=
"
32
dp"
android:drawableStart=
"@drawable/ic_email_black_20dp"
android:drawableStart=
"@drawable/ic_email_black_20dp"
android:hint=
"@string/msg_email"
android:hint=
"@string/msg_email"
android:inputType=
"textEmailAddress"
/>
android:inputType=
"textEmailAddress"
/>
...
...
draw/src/main/java/chat/rocket/android/draw/main/ui/DrawActivity.kt
View file @
24c8acd3
...
@@ -44,6 +44,7 @@ class DrawingActivity : DaggerAppCompatActivity(), DrawView {
...
@@ -44,6 +44,7 @@ class DrawingActivity : DaggerAppCompatActivity(), DrawView {
.
show
()
.
show
()
}
}
private
fun
setupListeners
()
{
private
fun
setupListeners
()
{
custom_draw_view
.
setOnTouchListener
{
view
,
event
->
custom_draw_view
.
setOnTouchListener
{
view
,
event
->
custom_draw_view
.
onTouch
(
custom_draw_view
.
onTouch
(
...
...
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