4a8ff47fce
The Toolbar is the new thing from Google which acts as an ActionBar. It is not a special view like the action bar is, it is implemented and added to your layout the same as any view. The InnerView classes of the swap workflow have the choice of what colour to make the toolbar, so that they can distinguish themselves as per the mockups (some deep blue, others bright blue). Added icons for close, but they don't do anything yet. Minor tweaks to layout so that it looks more like the latest mockups.
57 lines
2.2 KiB
XML
57 lines
2.2 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
|
|
<org.fdroid.fdroid.views.swap.WifiQrView
|
|
xmlns:tools="http://schemas.android.com/tools"
|
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
|
android:background="@color/swap_blue"
|
|
android:layout_height="match_parent"
|
|
android:layout_width="wrap_content">
|
|
|
|
<LinearLayout android:orientation="vertical"
|
|
android:gravity="center"
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content">
|
|
|
|
<ImageView
|
|
android:layout_width="250dp"
|
|
android:layout_height="250dp"
|
|
android:maxHeight="20dp"
|
|
android:id="@+id/wifi_qr_code"
|
|
tools:src="@drawable/swap_qr_example"/>
|
|
|
|
<TextView
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:id="@+id/textView"
|
|
android:text="@string/swap_scan_or_type_url"
|
|
style="@style/SwapTheme.Wizard.MainText"/>
|
|
|
|
<!--
|
|
<Button style="@style/SwapTheme.Wizard.OptionButton"
|
|
android:id="@+id/btn_not_working"
|
|
android:text="@string/swap_wifi_qr_not_working"
|
|
android:layout_alignParentBottom="true" />
|
|
-->
|
|
|
|
<TextView
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:id="@+id/device_ip_address"
|
|
tools:text="http://255.255.255.255:8888"
|
|
style="@style/SwapTheme.Wizard.LocalIpAddress"/>
|
|
|
|
<Button style="@style/SwapTheme.Wizard.OptionButton"
|
|
android:text="@string/open_qr_code_scanner"
|
|
android:layout_gravity="center"
|
|
android:id="@+id/btn_qr_scanner"/>
|
|
|
|
<!-- Mark as "gone" for now, until it appears in a future mockup. Don't comment it out,
|
|
because then we'd need to modify the code which adds a listener for it too. -->
|
|
<Button style="@style/SwapTheme.Wizard.OptionButton"
|
|
android:id="@+id/btn_cancel_swap"
|
|
android:visibility="gone"
|
|
android:text="@string/cancel" />
|
|
|
|
</LinearLayout>
|
|
|
|
</org.fdroid.fdroid.views.swap.WifiQrView> |