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
35fc58a7
Commit
35fc58a7
authored
Apr 29, 2019
by
Cool-fire
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
removed hardcoded string
parent
1750d2e4
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
5 additions
and
4 deletions
+5
-4
UserDetailsPresenter.kt
.../android/userdetails/presentation/UserDetailsPresenter.kt
+1
-1
UserDetailsView.kt
...ocket/android/userdetails/presentation/UserDetailsView.kt
+1
-1
UserDetailsFragment.kt
...chat/rocket/android/userdetails/ui/UserDetailsFragment.kt
+2
-2
strings.xml
app/src/main/res/values/strings.xml
+1
-0
No files found.
app/src/main/java/chat/rocket/android/userdetails/presentation/UserDetailsPresenter.kt
View file @
35fc58a7
...
...
@@ -62,7 +62,7 @@ class UserDetailsPresenter @Inject constructor(
if
(
avatarUrl
!=
null
||
username
!=
null
||
name
!=
null
||
utcOffset
!=
null
)
{
view
.
showUserDetailsAndActions
(
avatarUrl
=
avatarUrl
,
avatarUrl
=
avatarUrl
.
toString
()
,
name
=
name
,
username
=
username
,
status
=
userEntity
.
status
,
...
...
app/src/main/java/chat/rocket/android/userdetails/presentation/UserDetailsView.kt
View file @
35fc58a7
...
...
@@ -16,7 +16,7 @@ interface UserDetailsView : LoadingView, MessageView {
* @param isVideoCallAllowed True if the video call is allowed, false otherwise.
*/
fun
showUserDetailsAndActions
(
avatarUrl
:
String
?
,
avatarUrl
:
String
,
name
:
String
?,
username
:
String
?,
status
:
String
?,
...
...
app/src/main/java/chat/rocket/android/userdetails/ui/UserDetailsFragment.kt
View file @
35fc58a7
...
...
@@ -79,7 +79,7 @@ class UserDetailsFragment : Fragment(), UserDetailsView {
}
override
fun
showUserDetailsAndActions
(
avatarUrl
:
String
?
,
avatarUrl
:
String
,
name
:
String
?,
username
:
String
?,
status
:
String
?,
...
...
@@ -103,7 +103,7 @@ class UserDetailsFragment : Fragment(), UserDetailsView {
val
userStatus
=
if
(
status
!=
null
)
status
.
substring
(
0
,
1
).
toUpperCase
()
+
status
.
substring
(
1
)
else
""
text_description_status
.
text
=
userStatus
val
userUtcOffset
=
if
(
utcOffset
!=
"null"
)
utcOffset
else
"None"
val
userUtcOffset
=
if
(
utcOffset
.
equals
(
"null"
))
getString
(
R
.
string
.
user_timezone_none
)
else
utcOffset
text_description_timezone
.
text
=
userUtcOffset
text_video_call
.
isVisible
=
isVideoCallAllowed
...
...
app/src/main/res/values/strings.xml
View file @
35fc58a7
...
...
@@ -381,6 +381,7 @@ https://github.com/RocketChat/java-code-styles/blob/master/CODING_STYLE.md#strin
<string
name=
"timezone"
>
Timezone
</string>
<string
name=
"status"
translatable=
"false"
>
Status: %1$s
</string>
<string
name=
"user_detail_status"
translatable=
"false"
>
Status
</string>
<string
name=
"user_timezone_none"
translatable=
"false"
>
None
</string>
<!-- Report -->
<string
name=
"submit"
>
Submit
</string>
...
...
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