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
7440d0b0
Commit
7440d0b0
authored
Jan 08, 2019
by
Filipe de Lima Brito
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Remove unused layout and improves the showing/hidding toobar anim.
parent
b8ee33a4
Changes
4
Show whitespace changes
Inline
Side-by-side
Showing
4 changed files
with
30 additions
and
48 deletions
+30
-48
UserDetailsFragment.kt
...chat/rocket/android/userdetails/ui/UserDetailsFragment.kt
+22
-7
Ui.kt
app/src/main/java/chat/rocket/android/util/extensions/Ui.kt
+7
-2
app_bar_chat_details.xml
app/src/main/res/layout/app_bar_chat_details.xml
+0
-29
fragment_user_details.xml
app/src/main/res/layout/fragment_user_details.xml
+1
-10
No files found.
app/src/main/java/chat/rocket/android/userdetails/ui/UserDetailsFragment.kt
View file @
7440d0b0
package
chat.rocket.android.userdetails.ui
package
chat.rocket.android.userdetails.ui
import
android.os.Bundle
import
android.os.Bundle
import
android.os.Handler
import
android.view.LayoutInflater
import
android.view.LayoutInflater
import
android.view.View
import
android.view.View
import
android.view.ViewGroup
import
android.view.ViewGroup
import
androidx.core.content.ContextCompat
import
androidx.core.view.isVisible
import
androidx.core.view.isVisible
import
androidx.fragment.app.Fragment
import
androidx.fragment.app.Fragment
import
chat.rocket.android.R
import
chat.rocket.android.R
import
chat.rocket.android.analytics.AnalyticsManager
import
chat.rocket.android.analytics.AnalyticsManager
import
chat.rocket.android.analytics.event.ScreenViewEvent
import
chat.rocket.android.analytics.event.ScreenViewEvent
import
chat.rocket.android.chatroom.ui.ChatRoomActivity
import
chat.rocket.android.chatroom.ui.ChatRoomActivity
import
chat.rocket.android.emoji.internal.GlideApp
import
chat.rocket.android.userdetails.presentation.UserDetailsPresenter
import
chat.rocket.android.userdetails.presentation.UserDetailsPresenter
import
chat.rocket.android.userdetails.presentation.UserDetailsView
import
chat.rocket.android.userdetails.presentation.UserDetailsView
import
chat.rocket.android.util.extensions.inflate
import
chat.rocket.android.util.extensions.inflate
...
@@ -45,6 +46,7 @@ class UserDetailsFragment : Fragment(), UserDetailsView {
...
@@ -45,6 +46,7 @@ class UserDetailsFragment : Fragment(), UserDetailsView {
@Inject
@Inject
lateinit
var
analyticsManager
:
AnalyticsManager
lateinit
var
analyticsManager
:
AnalyticsManager
private
lateinit
var
userId
:
String
private
lateinit
var
userId
:
String
private
val
handler
=
Handler
()
override
fun
onCreate
(
savedInstanceState
:
Bundle
?)
{
override
fun
onCreate
(
savedInstanceState
:
Bundle
?)
{
super
.
onCreate
(
savedInstanceState
)
super
.
onCreate
(
savedInstanceState
)
...
@@ -74,6 +76,11 @@ class UserDetailsFragment : Fragment(), UserDetailsView {
...
@@ -74,6 +76,11 @@ class UserDetailsFragment : Fragment(), UserDetailsView {
analyticsManager
.
logScreenView
(
ScreenViewEvent
.
UserDetails
)
analyticsManager
.
logScreenView
(
ScreenViewEvent
.
UserDetails
)
}
}
override
fun
onDestroyView
()
{
handler
.
removeCallbacksAndMessages
(
null
)
super
.
onDestroyView
()
}
override
fun
showUserDetails
(
override
fun
showUserDetails
(
avatarUrl
:
String
,
avatarUrl
:
String
,
name
:
String
,
name
:
String
,
...
@@ -83,8 +90,9 @@ class UserDetailsFragment : Fragment(), UserDetailsView {
...
@@ -83,8 +90,9 @@ class UserDetailsFragment : Fragment(), UserDetailsView {
)
{
)
{
val
requestBuilder
=
Glide
.
with
(
this
).
load
(
avatarUrl
)
val
requestBuilder
=
Glide
.
with
(
this
).
load
(
avatarUrl
)
requestBuilder
.
apply
(
RequestOptions
.
bitmapTransform
(
MultiTransformation
(
BlurTransformation
(),
CenterCrop
())))
requestBuilder
.
apply
(
.
into
(
image_blur
)
RequestOptions
.
bitmapTransform
(
MultiTransformation
(
BlurTransformation
(),
CenterCrop
()))
).
into
(
image_blur
)
requestBuilder
.
apply
(
RequestOptions
.
bitmapTransform
(
RoundedCorners
(
14
)))
requestBuilder
.
apply
(
RequestOptions
.
bitmapTransform
(
RoundedCorners
(
14
)))
.
into
(
image_avatar
)
.
into
(
image_avatar
)
...
@@ -119,10 +127,17 @@ class UserDetailsFragment : Fragment(), UserDetailsView {
...
@@ -119,10 +127,17 @@ class UserDetailsFragment : Fragment(), UserDetailsView {
override
fun
showGenericErrorMessage
()
=
showMessage
(
getString
(
R
.
string
.
msg_generic_error
))
override
fun
showGenericErrorMessage
()
=
showMessage
(
getString
(
R
.
string
.
msg_generic_error
))
private
fun
setupToolbar
()
{
private
fun
setupToolbar
()
{
handler
.
postDelayed
({
with
(
activity
as
ChatRoomActivity
)
{
with
(
activity
as
ChatRoomActivity
)
{
view
?.
let
{
setLightStatusBar
(
it
)
}
view
?.
let
{
setLightStatusBar
(
it
,
ContextCompat
.
getColor
(
this
,
R
.
color
.
whitesmoke
)
)
}
toolbar
.
isVisible
=
false
toolbar
.
isVisible
=
false
}
}
},
400
)
}
}
private
fun
setupListeners
()
{
private
fun
setupListeners
()
{
...
...
app/src/main/java/chat/rocket/android/util/extensions/Ui.kt
View file @
7440d0b0
...
@@ -11,6 +11,7 @@ import android.view.View
...
@@ -11,6 +11,7 @@ import android.view.View
import
android.view.ViewGroup
import
android.view.ViewGroup
import
android.view.inputmethod.InputMethodManager
import
android.view.inputmethod.InputMethodManager
import
android.widget.Toast
import
android.widget.Toast
import
androidx.annotation.ColorInt
import
androidx.annotation.LayoutRes
import
androidx.annotation.LayoutRes
import
androidx.annotation.MenuRes
import
androidx.annotation.MenuRes
import
androidx.annotation.StringRes
import
androidx.annotation.StringRes
...
@@ -22,12 +23,16 @@ import androidx.fragment.app.Fragment
...
@@ -22,12 +23,16 @@ import androidx.fragment.app.Fragment
import
androidx.fragment.app.FragmentActivity
import
androidx.fragment.app.FragmentActivity
import
chat.rocket.android.R
import
chat.rocket.android.R
fun
FragmentActivity
.
setLightStatusBar
(
view
:
View
)
{
fun
FragmentActivity
.
setLightStatusBar
(
view
:
View
,
@ColorInt
color
:
Int
=
0
)
{
if
(
Build
.
VERSION
.
SDK_INT
>=
Build
.
VERSION_CODES
.
M
)
{
if
(
Build
.
VERSION
.
SDK_INT
>=
Build
.
VERSION_CODES
.
M
)
{
var
flags
=
view
.
systemUiVisibility
var
flags
=
view
.
systemUiVisibility
flags
=
flags
or
View
.
SYSTEM_UI_FLAG_LIGHT_STATUS_BAR
flags
=
flags
or
View
.
SYSTEM_UI_FLAG_LIGHT_STATUS_BAR
view
.
systemUiVisibility
=
flags
view
.
systemUiVisibility
=
flags
window
.
statusBarColor
=
ContextCompat
.
getColor
(
this
,
R
.
color
.
colorWhite
)
window
.
statusBarColor
=
if
(
color
==
0
)
{
ContextCompat
.
getColor
(
this
,
R
.
color
.
colorWhite
)
}
else
{
color
}
}
}
}
}
...
...
app/src/main/res/layout/app_bar_chat_details.xml
deleted
100644 → 0
View file @
b8ee33a4
<?xml version="1.0" encoding="utf-8"?>
<com.google.android.material.appbar.AppBarLayout
xmlns:android=
"http://schemas.android.com/apk/res/android"
xmlns:app=
"http://schemas.android.com/apk/res-auto"
xmlns:tools=
"http://schemas.android.com/tools"
android:layout_width=
"match_parent"
android:layout_height=
"wrap_content"
android:background=
"@color/colorPrimary"
android:theme=
"@style/Theme.AppCompat.Light.NoActionBar"
>
<androidx.appcompat.widget.Toolbar
android:id=
"@+id/toolbar"
android:layout_width=
"match_parent"
android:layout_height=
"?attr/actionBarSize"
app:layout_scrollFlags=
"scroll|enterAlways"
app:navigationIcon=
"@drawable/ic_close_white_24dp"
app:popupTheme=
"@style/ThemeOverlay.AppCompat.Light"
app:theme=
"@style/ThemeOverlay.AppCompat.Dark.ActionBar"
>
<TextView
android:id=
"@+id/toolbar_title"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:drawablePadding=
"@dimen/text_view_drawable_padding"
android:ellipsize=
"end"
android:maxLines=
"1"
android:textColor=
"@color/colorWhite"
android:textSize=
"18sp"
android:textStyle=
"bold"
tools:text=
"@string/title_channel_details"
/>
</androidx.appcompat.widget.Toolbar>
</com.google.android.material.appbar.AppBarLayout>
\ No newline at end of file
app/src/main/res/layout/fragment_user_details.xml
View file @
7440d0b0
...
@@ -112,15 +112,6 @@
...
@@ -112,15 +112,6 @@
app:layout_constraintTop_toBottomOf=
"@+id/text_title_timezone"
app:layout_constraintTop_toBottomOf=
"@+id/text_title_timezone"
tools:text=
"(UTC-2) 11:08 AM"
/>
tools:text=
"(UTC-2) 11:08 AM"
/>
<View
android:id=
"@+id/view_gray_bottom"
android:layout_width=
"match_parent"
android:layout_height=
"0dp"
android:layout_marginTop=
"16dp"
android:background=
"#FFF3f4f5"
app:layout_constraintBottom_toBottomOf=
"parent"
app:layout_constraintTop_toBottomOf=
"@+id/text_description_timezone"
/>
<com.wang.avi.AVLoadingIndicatorView
<com.wang.avi.AVLoadingIndicatorView
android:id=
"@+id/view_loading"
android:id=
"@+id/view_loading"
style=
"@style/Authentication.AVLoadingIndicatorView"
style=
"@style/Authentication.AVLoadingIndicatorView"
...
@@ -134,6 +125,6 @@
...
@@ -134,6 +125,6 @@
android:id=
"@+id/group_user_details"
android:id=
"@+id/group_user_details"
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
app:constraint_referenced_ids=
"image_blur, image_avatar, text_name, text_username, text_message, text_title_status, text_description_status, text_title_timezone, text_description_timezone
, view_gray_bottom
"
/>
app:constraint_referenced_ids=
"image_blur, image_avatar, text_name, text_username, text_message, text_title_status, text_description_status, text_title_timezone, text_description_timezone"
/>
</androidx.constraintlayout.widget.ConstraintLayout>
</androidx.constraintlayout.widget.ConstraintLayout>
</ScrollView>
</ScrollView>
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