Android-builders-club/OsmAnd
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

hide textInArea

Browse source
This commit is contained in:
Chumva 2018-08-08 17:59:36 +03:00
parent 488685a656
commit 3c7c950e34
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
OsmAnd-telegram/res/layout/my_location_sharing_chat.xml
View file

@ -94,8 +94,10 @@
android:paddingRight="@dimen/content_padding_half" android:paddingRight="@dimen/content_padding_half"
android:textColor="?attr/ctrl_active_color" android:textColor="?attr/ctrl_active_color"
android:textSize="14sp" android:textSize="14sp"
android:visibility="gone"
app:typeface="@string/font_roboto_medium" app:typeface="@string/font_roboto_medium"
tools:text="+ 30 min" /> tools:text="+ 30 min"
tools:visibility="visible" />
</LinearLayout> </LinearLayout>

9
OsmAnd-telegram/src/net/osmand/telegram/ui/MyLocationTabFragment.kt
View file

@ -111,9 +111,6 @@ class MyLocationTabFragment : Fragment(), TelegramListener {
setImageResource(R.drawable.img_my_location_user) setImageResource(R.drawable.img_my_location_user)
} }
imageContainer = mainView.findViewById<FrameLayout>(R.id.image_container)
titleContainer = mainView.findViewById<LinearLayout>(R.id.title_container)
optionsBtn = mainView.findViewById<ImageView>(R.id.options).apply { optionsBtn = mainView.findViewById<ImageView>(R.id.options).apply {
setImageDrawable(app.uiUtils.getThemedIcon(R.drawable.ic_action_other_menu)) setImageDrawable(app.uiUtils.getThemedIcon(R.drawable.ic_action_other_menu))
setOnClickListener { showPopupMenu() } setOnClickListener { showPopupMenu() }
@ -123,7 +120,10 @@ class MyLocationTabFragment : Fragment(), TelegramListener {
setImageDrawable(app.uiUtils.getThemedIcon(R.drawable.ic_action_other_menu)) setImageDrawable(app.uiUtils.getThemedIcon(R.drawable.ic_action_other_menu))
setOnClickListener { showPopupMenu() } setOnClickListener { showPopupMenu() }
} }
imageContainer = mainView.findViewById<FrameLayout>(R.id.image_container)
titleContainer = mainView.findViewById<LinearLayout>(R.id.title_container)
textContainer = mainView.findViewById<LinearLayout>(R.id.text_container).apply { textContainer = mainView.findViewById<LinearLayout>(R.id.text_container).apply {
if (Build.VERSION.SDK_INT >= 16) { if (Build.VERSION.SDK_INT >= 16) {
layoutTransition.enableTransitionType(LayoutTransition.CHANGING) layoutTransition.enableTransitionType(LayoutTransition.CHANGING)
@ -564,7 +564,6 @@ class MyLocationTabFragment : Fragment(), TelegramListener {
Date(System.currentTimeMillis() + (content.expiresIn * 1000)) Date(System.currentTimeMillis() + (content.expiresIn * 1000))
val df = SimpleDateFormat("HH:mm", Locale.getDefault()) val df = SimpleDateFormat("HH:mm", Locale.getDefault())
val formattedDate = df.format(currentTime) val formattedDate = df.format(currentTime)
holder.textInArea?.text = "+ 30 min"
holder.stopSharingFirstPart?.text = time holder.stopSharingFirstPart?.text = time
holder.stopSharingSecondPart?.text = formattedDate holder.stopSharingSecondPart?.text = formattedDate
} }