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
27717fd0
Unverified
Commit
27717fd0
authored
Nov 30, 2018
by
Rafael Kellermann Streit
Committed by
GitHub
Nov 30, 2018
Browse files
Options
Browse Files
Download
Plain Diff
Merge branch 'develop' into room-info
parents
a0058ba9
ed59ccbf
Changes
4
Hide whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
23 additions
and
8 deletions
+23
-8
CrashlyticsTree.kt
...c/foss/java/chat/rocket/android/helper/CrashlyticsTree.kt
+2
-6
ic_camera.xml
app/src/main/res/drawable/ic_camera.xml
+19
-0
message_attachment_options.xml
app/src/main/res/layout/message_attachment_options.xml
+1
-1
CrashlyticsTree.kt
...c/play/java/chat/rocket/android/helper/CrashlyticsTree.kt
+1
-1
No files found.
app/src/foss/java/chat/rocket/android/helper/CrashlyticsTree.kt
View file @
27717fd0
package
chat.rocket.android.helper
import
timber.log.Timber
import
android.util.Log
// Production logger... Just ignore it
class
CrashlyticsTree
:
Timber
.
Tree
()
{
override
fun
log
(
priority
:
Int
,
tag
:
String
?,
message
:
String
,
throwable
:
Throwable
?)
{
Log
.
println
(
priority
,
tag
,
message
)
if
(
throwable
!=
null
)
{
Log
.
e
(
tag
,
throwable
.
toString
())
}
throwable
?.
printStackTrace
()
}
}
app/src/main/res/drawable/ic_camera.xml
0 → 100644
View file @
27717fd0
<vector
xmlns:android=
"http://schemas.android.com/apk/res/android"
android:width=
"20dp"
android:height=
"18dp"
android:viewportWidth=
"20"
android:viewportHeight=
"18"
>
<path
android:fillColor=
"#1D74F5"
android:fillType=
"nonZero"
android:pathData=
"M10,10m-3.2,0a3.2,3.2 0,1 1,6.4 0a3.2,3.2 0,1 1,-6.4 0"
android:strokeWidth=
"1"
android:strokeColor=
"#00000000"
/>
<path
android:fillColor=
"#1D74F5"
android:fillType=
"nonZero"
android:pathData=
"M7,0L5.17,2L2,2C0.9,2 0,2.9 0,4L0,16C0,17.1 0.9,18 2,18L18,18C19.1,18 20,17.1 20,16L20,4C20,2.9 19.1,2 18,2L14.83,2L13,0L7,0ZM10,15C7.24,15 5,12.76 5,10C5,7.24 7.24,5 10,5C12.76,5 15,7.24 15,10C15,12.76 12.76,15 10,15Z"
android:strokeWidth=
"1"
android:strokeColor=
"#00000000"
/>
</vector>
\ No newline at end of file
app/src/main/res/layout/message_attachment_options.xml
View file @
27717fd0
...
...
@@ -11,7 +11,7 @@
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:drawablePadding=
"20dp"
android:drawableStart=
"@drawable/ic_
photo_camera_black_24dp
"
android:drawableStart=
"@drawable/ic_
camera
"
android:gravity=
"start|center"
android:text=
"@string/action_take_a_photo"
/>
...
...
app/src/play/java/chat/rocket/android/helper/CrashlyticsTree.kt
View file @
27717fd0
...
...
@@ -6,7 +6,7 @@ import timber.log.Timber
class
CrashlyticsTree
:
Timber
.
Tree
()
{
override
fun
log
(
priority
:
Int
,
tag
:
String
?,
message
:
String
,
throwable
:
Throwable
?)
{
Crashlytics
.
log
(
priority
,
tag
,
message
)
Crashlytics
.
log
(
message
)
if
(
throwable
!=
null
)
{
Crashlytics
.
logException
(
throwable
)
...
...
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