Commit 71ca4677 authored by Christophe Deschamps's avatar Christophe Deschamps
Browse files

Info button move


Former-commit-id: 0a8984a36b3b6d2c018d426aeb541e691fa88b2b
parent 50da0615
......@@ -49,10 +49,6 @@ class RemoteQrAccountFragment : GenericFragment() {
})
binding.root.infobutton.setOnClickListener {
binding.root.infotext.toogleVisible()
}
return binding.root
}
......
......@@ -5,12 +5,16 @@ import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import kotlinx.android.synthetic.main.fragment_assistant_remote_qr.view.*
import kotlinx.android.synthetic.main.fragment_assistant_remote_root.view.*
import kotlinx.android.synthetic.main.fragment_assistant_remote_root.view.infobutton
import kotlinx.android.synthetic.main.fragment_assistant_remote_root.view.infotext
import kotlinx.android.synthetic.main.widget_round_rect_button.view.*
import org.lindoor.GenericFragment
import org.lindoor.R
import org.lindoor.databinding.FragmentAssistantRemoteRootBinding.inflate
import org.lindoor.utils.DialogUtil
import org.lindoor.utils.extensions.toogleVisible
import permissions.dispatcher.NeedsPermission
import permissions.dispatcher.OnNeverAskAgain
import permissions.dispatcher.OnPermissionDenied
......@@ -33,6 +37,11 @@ class RemoteRootFragment : GenericFragment() {
binding.root.qr.root.setOnClickListener {
openQRCodeViewWithPermissionCheck()
}
binding.root.infobutton.setOnClickListener {
binding.root.infotext.toogleVisible()
}
return binding.root
}
......
......@@ -64,14 +64,6 @@ class RemoteUrlAccountFragment : GenericFragment() {
DialogUtil.error("failed_creating_pushgateway")
})
binding.root.infobutton.setOnClickListener {
binding.root.infotext.toogleVisible()
}
binding.root.setOnClickListener {
binding.root.infotext.invisible()
}
return binding.root
}
......
......@@ -34,24 +34,6 @@
android:layout_marginTop="40dp"
android:layout_centerHorizontal="true"/>
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/infobutton"
icon='@{"icons/informations"}'
backgroundeffect='@{"info_bubble"}'
tint='@{"color_c"}'
android:scaleType="centerInside"
app:elevation="10dp"
app:fabCustomSize="20dp"
app:maxImageSize="9dp"
android:layout_marginTop="-21dp"
android:layout_width="20dp"
android:layout_marginStart="-10dp"
android:layout_height="20dp"
android:layout_toEndOf="@+id/title"
android:layout_alignTop="@+id/title" />
<TextView
android:id="@+id/subtitle"
style='@{"view_sub_title"}'
......@@ -62,19 +44,6 @@
android:layout_centerHorizontal="true"
android:layout_marginTop="33dp" />
<TextView
android:id="@+id/infotext"
android:padding="10dp"
style='@{"info_bubble"}'
text='@{"assistant_remote_prov_from_qr_infobubble"}'
backgoundcolor='@{"color_n"}'
android:layout_width="210dp"
android:layout_height="wrap_content"
android:layout_below="@+id/infobutton"
android:layout_alignEnd="@+id/title"
android:visibility="invisible"
/>
</RelativeLayout>
......
......@@ -9,7 +9,7 @@
<TextView
android:id="@+id/title"
android:layout_width="300dp"
android:layout_width="wrap_content"
android:layout_height="40dp"
android:layout_marginTop="40dp"
app:layout_constraintBottom_toTopOf="@id/url"
......@@ -17,9 +17,29 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_chainStyle="packed"
android:text="toto titi"
style='@{"view_main_title"}'
text='@{"assistant_remote_prov"}' />
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/infobutton"
icon='@{"icons/informations"}'
backgroundeffect='@{"info_bubble"}'
tint='@{"color_c"}'
android:scaleType="centerInside"
app:elevation="10dp"
app:fabCustomSize="20dp"
app:maxImageSize="9dp"
android:layout_width="20dp"
android:layout_height="20dp"
android:translationY="20dp"
app:layout_constraintStart_toEndOf="@id/title"
app:layout_constraintBottom_toTopOf="@id/title" />
<org.lindoor.ui.widgets.LRoundRectButton
android:id="@+id/url"
android:clickable="true"
......@@ -49,6 +69,19 @@
text='@{"assistant_remote_qr"}'
/>
<TextView
android:id="@+id/infotext"
android:padding="10dp"
style='@{"info_bubble"}'
text='@{"assistant_remote_prov_from_url_infobubble"}'
backgoundcolor='@{"color_n"}'
android:layout_width="210dp"
android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@+id/infobutton"
app:layout_constraintEnd_toEndOf="@+id/title"
android:visibility="invisible"
/>
......
......@@ -55,37 +55,6 @@
/>
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/infobutton"
icon='@{"icons/informations"}'
backgroundeffect='@{"info_bubble"}'
tint='@{"color_c"}'
android:scaleType="centerInside"
app:elevation="10dp"
app:fabCustomSize="20dp"
app:maxImageSize="9dp"
android:layout_marginTop="-21dp"
android:layout_width="20dp"
android:layout_marginStart="-10dp"
android:layout_height="20dp"
android:layout_toEndOf="@+id/title"
android:layout_alignTop="@+id/title" />
<TextView
android:id="@+id/infotext"
android:padding="10dp"
style='@{"info_bubble"}'
text='@{"assistant_remote_prov_from_url_infobubble"}'
backgoundcolor='@{"color_n"}'
android:layout_width="210dp"
android:layout_height="wrap_content"
android:layout_below="@+id/infobutton"
android:layout_alignEnd="@+id/title"
android:visibility="invisible"
/>
</RelativeLayout>
</layout>
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment