d672983a90
InnerView.getToolbarColour() was expecting a @ColorRes, except all views were returning integers which were the colour value, not a pointer to the resource as they should have been. Now only one place requires a call to getResources().getColor() whereas before it was in each view. Notifications on pre 4.1 devices require a pending intent to work. This is so that when you touch the intent, it takes you somewhere meaningfull. Without it, the update process crashes.
48 lines
1.8 KiB
XML
48 lines
1.8 KiB
XML
<?xml version="1.0" encoding="utf-8"?>
|
|
|
|
<org.fdroid.fdroid.views.swap.SwapConnecting
|
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
|
xmlns:tools="http://schemas.android.com/tools"
|
|
xmlns:app="http://schemas.android.com/apk/res-auto"
|
|
android:orientation="vertical"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="match_parent">
|
|
|
|
<TextView
|
|
android:id="@+id/heading"
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:gravity="center"
|
|
android:textSize="20sp"
|
|
android:padding="30dp"
|
|
android:textAlignment="center"
|
|
tools:text="Connecting with Nexus 4" />
|
|
|
|
<ProgressBar
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:indeterminate="true"
|
|
android:layout_gravity="center" />
|
|
|
|
<TextView
|
|
android:layout_width="match_parent"
|
|
android:layout_height="wrap_content"
|
|
android:id="@+id/error"
|
|
android:textSize="20sp"
|
|
android:textAlignment="center"
|
|
android:text="@string/swap_connection_misc_error"
|
|
android:visibility="gone"
|
|
android:padding="30dp" />
|
|
|
|
<Button
|
|
android:layout_width="wrap_content"
|
|
android:layout_height="wrap_content"
|
|
android:id="@+id/back"
|
|
android:backgroundTint="@color/swap_light_blue"
|
|
app:backgroundTint="@color/swap_light_blue"
|
|
android:textColor="@android:color/white"
|
|
android:layout_gravity="center_horizontal"
|
|
android:visibility="gone"
|
|
android:text="@string/back" />
|
|
|
|
</org.fdroid.fdroid.views.swap.SwapConnecting> |