Merge remote-tracking branch 'origin/master'
This commit is contained in:
commit
b3e9836d7c
@ -1,8 +1,8 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<resources>
|
<resources>
|
||||||
<color name="colorPrimary">#3F51B5</color>
|
<color name="colorPrimary">#FF8D41</color>
|
||||||
<color name="colorPrimaryDark">#303F9F</color>
|
<color name="colorPrimaryDark">#FF8D41</color>
|
||||||
<color name="colorAccent">#FF4081</color>
|
<color name="colorAccent">#FF8D41</color>
|
||||||
|
|
||||||
<!--fulive demo 主配色-->
|
<!--fulive demo 主配色-->
|
||||||
<color name="primary_background">#050F14</color>
|
<color name="primary_background">#050F14</color>
|
||||||
|
@ -1,12 +1,14 @@
|
|||||||
<?xml version="1.0" encoding="utf-8"?>
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
<resources>
|
<resources>
|
||||||
|
|
||||||
<style name="AppTheme" parent="Theme.AppCompat.Light.NoActionBar">
|
<style name="AppTheme" parent="Base.Theme.NoActionBar">
|
||||||
<item name="colorPrimary">@color/colorPrimary</item>
|
<item name="colorPrimary">@color/colorPrimary</item>
|
||||||
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
|
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
|
||||||
<item name="colorAccent">@color/colorAccent</item>
|
<item name="colorAccent">@color/colorAccent</item>
|
||||||
<item name="android:colorBackground">@color/background</item>
|
<item name="android:colorBackground">@color/background</item>
|
||||||
<item name="android:windowAnimationStyle">@style/Animation</item>
|
<item name="android:windowAnimationStyle">@style/Animation</item>
|
||||||
|
<!-- Status bar color. -->
|
||||||
|
<item name="android:statusBarColor" >@color/colorPrimary</item>
|
||||||
</style>
|
</style>
|
||||||
|
|
||||||
<style name="dialog" parent="AppTheme">
|
<style name="dialog" parent="AppTheme">
|
||||||
|
@ -114,18 +114,19 @@
|
|||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_marginTop="5dp"
|
android:layout_marginTop="5dp"
|
||||||
|
android:gravity="center_vertical"
|
||||||
android:orientation="horizontal">
|
android:orientation="horizontal">
|
||||||
|
|
||||||
|
|
||||||
<ImageView
|
<ImageView
|
||||||
android:id="@+id/sex"
|
android:id="@+id/sex"
|
||||||
android:layout_width="18dp"
|
android:layout_width="15dp"
|
||||||
android:layout_height="18dp" />
|
android:layout_height="15dp" />
|
||||||
|
|
||||||
<ImageView
|
<ImageView
|
||||||
android:id="@+id/level"
|
android:id="@+id/level"
|
||||||
android:layout_width="50dp"
|
android:layout_width="42dp"
|
||||||
android:layout_height="18dp"
|
android:layout_height="14dp"
|
||||||
android:scaleType="fitXY"
|
android:scaleType="fitXY"
|
||||||
android:layout_marginLeft="5dp" />
|
android:layout_marginLeft="5dp" />
|
||||||
|
|
||||||
|
@ -14,8 +14,9 @@
|
|||||||
android:layout_width="wrap_content"
|
android:layout_width="wrap_content"
|
||||||
android:layout_height="wrap_content"
|
android:layout_height="wrap_content"
|
||||||
android:layout_gravity="center"
|
android:layout_gravity="center"
|
||||||
android:paddingLeft="13dp"
|
android:paddingLeft="15dp"
|
||||||
android:text="主播"
|
android:text="主播"
|
||||||
|
android:layout_marginBottom="1dp"
|
||||||
android:textColor="@color/white"
|
android:textColor="@color/white"
|
||||||
android:textSize="10sp" />
|
android:textSize="10sp" />
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user