Karl/BobStore
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

WIP: Applying styles correctly to views refactored from fragments.

Browse Source
This commit is contained in:
Peter Serwylo 2015-05-23 01:25:06 +10:00
parent 38eafdeedd
commit 1b2678d6ed
4 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
F-Droid/res/layout/swap_join_wifi.xml
View File

@ -5,6 +5,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
xmlns:tools="http://schemas.android.com/tools"
android:background="@color/swap_blue"
tools:context=".views.swap.SwapActivity">
<TextView
@ -52,6 +53,7 @@
android:layout_height="wrap_content"
android:text="@string/swap_view_available_networks"
android:id="@+id/wifi_available_networks_prompt"
style="@style/SwapTheme.Wizard.Text"
android:layout_centerHorizontal="true"
android:layout_below="@id/wifi_ssid"
android:paddingBottom="20dp"/>

2
F-Droid/res/layout/swap_nfc.xml
View File

@ -4,6 +4,7 @@
android:orientation="vertical"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@color/swap_blue"
android:paddingTop="38.8dp"> <!-- 69px * 96dpi / 160dpi -->
<ImageView
@ -25,6 +26,7 @@
<CheckBox
android:id="@+id/checkbox_dont_show"
android:text="@string/swap_dont_show_again"
style="@style/SwapTheme.Wizard.Text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_below="@+id/text_description"

1
F-Droid/res/layout/swap_wifi_qr.xml
View File

@ -3,6 +3,7 @@
<org.fdroid.fdroid.views.swap.views.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">

6
F-Droid/res/values/styles.xml
View File

@ -33,9 +33,9 @@
<!-- customizations that are not API-level specific go here. -->
</style>
<style name="SwapTheme.Wizard" parent="AppThemeDark">
<item name="android:windowBackground">@drawable/swap_window_background</item>
<item name="android:actionBarStyle">@style/Widget.AppCompat.ActionBar.Solid</item>
<style name="SwapTheme.Wizard" parent="AppThemeLightWithDarkActionBar">
<!--<item name="android:windowBackground">@drawable/swap_window_background</item>-->
<!--<item name="android:actionBarStyle">@style/Widget.AppCompat.ActionBar.Solid</item>-->
<item name="android:actionButtonStyle">@style/SwapTheme.Wizard.ActionButton</item>
</style>