From 0e7dd8919ae2811063057f18a4db4156c771448a Mon Sep 17 00:00:00 2001
From: 陈奇 <1650699704@qq.com>
Date: Fri, 07 Dec 2018 16:54:04 +0800
Subject: [PATCH] [*]添加了微信登陆
---
app/src/main/res/values/styles.xml | 58 +++++++++++++++++++++++++++++++++++++++++++++++++++++-----
1 files changed, 53 insertions(+), 5 deletions(-)
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 7131f49..1b5d8c3 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -1,30 +1,40 @@
<resources>
<!-- Base application theme. -->
- <style name="AppTheme" parent="Base.Theme.Design">
- </style>
+ <!--<style name="AppTheme" parent="Base.Theme.Design">-->
+ <!--<item name="android:windowContentTransitions">true</item>-->
+ <!--</style>-->
<!-- Base application theme. -->
- <style name="Base.Theme.Design" parent="Theme.AppCompat.Light.NoActionBar">
+ <style name="Base.Theme.Design" parent="Theme.AppCompat.NoActionBar">
<!-- Customize your theme here. -->
<item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/colorAccent</item>
</style>
+
<style name="AppWelcomeTheme" parent="Base.Theme.Design">
<!-- All customizations that are NOT specific to a particular API-level can go here. -->
<item name="android:windowBackground">@mipmap/welcome</item>
<item name="android:windowNoTitle">true</item>
<item name="android:windowFullscreen">true</item>
+ <item name="android:windowContentTransitions">true</item>
</style>
<style name="AppTheme.NoActionBar">
<item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item>
+ <item name="android:windowContentTransitions">true</item>
</style>
- <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
+ <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar">
+ <item name="android:windowContentTransitions">true</item>
- <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
+ </style>
+
+ <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light">
+ <item name="android:windowContentTransitions">true</item>
+
+ </style>
<style name="tab_rb_style">
@@ -39,4 +49,42 @@
<item name="android:textSize">12sp</item>
<item name="android:background">@drawable/black_rect_bg</item>
</style>
+
+ <style name="button_style">
+ <item name="android:stateListAnimator">@animator/button_pregress</item>
+ </style>
+
+ <!-- Navigation Header winxin-->
+ <style name="NavPage">
+ <item name="android:layout_width">fill_parent</item>
+ <item name="android:layout_height">fill_parent</item>
+ <item name="android:orientation">vertical</item>
+ <item name="android:gravity">center_horizontal</item>
+ <!-- <item name="android:background">@drawable/nav_page</item> -->
+ <item name="android:background">@color/navpage</item>
+ </style>
+
+ <style name="MMButton">
+ <item name="android:layout_height">wrap_content</item>
+ <item name="android:layout_width">wrap_content</item>
+ <item name="android:textSize">16dp</item>
+ <item name="android:background">@null</item>
+ <item name="android:minHeight">40dp</item>
+ <item name="android:minWidth">40dp</item>
+ </style>
+
+
+ <style name="MMLineButton" parent="@style/MMButton">
+ <item name="android:layout_width">fill_parent</item>
+ <item name="android:layout_height">wrap_content</item>
+ </style>
+
+ <style name="MMLineActionButton" parent="@style/MMLineButton">
+ <item name="android:background">@drawable/btn_style_one</item>
+ <item name="android:shadowColor">#000000</item>
+ <item name="android:shadowDy">1.2</item>
+ <item name="android:shadowDx">1.2</item>
+ <item name="android:shadowRadius">1</item>
+ </style>
+
</resources>
--
Gitblit v1.8.0