Skip to content

Commit 568b6b1

Browse files
committed
Merge pull request #31 from nativecode-dev/development
Development
2 parents 4cddcb9 + 383ef25 commit 568b6b1

File tree

7 files changed

+77
-64
lines changed

7 files changed

+77
-64
lines changed

README.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@ public class MainActivity : AppCompatFormsApplicationActivity
7676
### Current Renderers
7777
- Button ([AppCompatButton](http://developer.android.com/reference/android/support/v7/widget/AppCompatButton.html))
7878
- Entry ([AppCompatEditText](http://developer.android.com/reference/android/support/v7/widget/AppCompatEditText.html))
79+
- Picker ([AppCompatSpinner])(https://developer.android.com/reference/android/support/v7/widget/AppCompatSpinner.html)
7980
- Switch ([SwitchCompat](http://developer.android.com/reference/android/support/v7/widget/SwitchCompat.html))
8081
- MasterDetailPage (AppCompatMasterDetailRenderer)
8182

src/Demo/Demo.Droid/MainActivity.cs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99

1010
using Xamarin.Forms;
1111

12-
[Activity(ConfigurationChanges = AppConfig, MainLauncher = true, Theme = CompatThemeLightDarkActionBar)]
12+
[Activity(ConfigurationChanges = AppConfig, MainLauncher = true, Theme = CompatTheme)]
1313
public class MainActivity : AppCompatFormsApplicationActivity
1414
{
1515
private const ConfigChanges AppConfig = ConfigChanges.Orientation | ConfigChanges.ScreenSize;

src/Demo/Demo.Droid/Resources/Resource.Designer.cs

Lines changed: 26 additions & 21 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/NativeCode.Mobile.AppCompat.Renderers/Resources/Resource.Designer.cs

Lines changed: 24 additions & 21 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/NativeCode.Mobile.AppCompat/Resources/Resource.Designer.cs

Lines changed: 22 additions & 19 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

src/NativeCode.Mobile.AppCompat/Resources/values/colors.xml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,5 +9,6 @@
99
<color name="controlActivated">#2962FF</color>
1010
<color name="controlHighlight">#2962FF</color>
1111

12-
<color name="text">#000000</color>
12+
<color name="text">#FFFFFF</color>
13+
<color name="textLight">#000000</color>
1314
</resources>

src/NativeCode.Mobile.AppCompat/Resources/values/styles.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@
7575
</style>
7676

7777
<style name="Base.AppTheme.EditTextStyle.Light" parent="Widget.AppCompat.EditText">
78-
<item name="android:textColor">@color/text</item>
78+
<item name="android:textColor">@color/textLight</item>
7979
<item name="colorControlActivated">@color/controlActivated</item>
8080
<item name="colorControlHighlight">@color/controlHighlight</item>
8181
<item name="colorControlNormal">@color/controlNormal</item>

0 commit comments

Comments
 (0)