Merge branch '2dust:master' into master
This commit is contained in:
101 files changed
+551
-125
No files matched your search
@@ -165,6 +165,7 @@
|
||||
<item>Tiếng Việt</item>
|
||||
<item>Русский</item>
|
||||
<item>فارسی</item>
|
||||
<item>عربي</item>
|
||||
</string-array>
|
||||
|
||||
|
||||
@@ -176,5 +177,6 @@
|
||||
<item>vi</item>
|
||||
<item>ru</item>
|
||||
<item>fa</item>
|
||||
<item>ar</item>
|
||||
</string-array>
|
||||
</resources>
|
||||
@@ -2,17 +2,17 @@
|
||||
<resources>
|
||||
<color name="colorPing">#009966</color>
|
||||
<color name="colorPingRed">#FF0099</color>
|
||||
<color name="colorSubscription">#247BA0</color>
|
||||
<color name="colorSelected">#009966</color>
|
||||
<color name="colorUnselected">#999999</color>
|
||||
<color name="colorWhite">#CFD8DC</color>
|
||||
<color name="colorBlack">#212121</color>
|
||||
<color name="color_fab_orange">#f97910</color>
|
||||
|
||||
<!-- <color name="colorPrimary">#008577</color>-->
|
||||
<!-- <color name="colorPrimaryDark">#00574B</color>-->
|
||||
<color name="colorPrimary">#2B2B2B</color>
|
||||
<color name="colorPrimaryDark">#161616</color>
|
||||
<color name="colorAccent">#D81B60</color>
|
||||
<color name="color_switch_fab_grey">#CDCDCD</color>
|
||||
<color name="color_fab_grey">#9C9C9C</color>
|
||||
<color name="color_secondary">#727272</color>
|
||||
<color name="colorSelected">#000000</color>
|
||||
<color name="colorUnselected">#FFFFFF</color>
|
||||
|
||||
<color name="colorPrimary">#FFFFFF</color>
|
||||
<color name="colorPrimaryDark">#000000</color>
|
||||
<color name="colorAccent">#000000</color>
|
||||
<color name="colorBg">#FFFFFF</color>
|
||||
<color name="colorText">#000000</color>
|
||||
</resources>
|
||||
@@ -1,6 +1,6 @@
|
||||
<resources>
|
||||
|
||||
<style name="AppThemeDayNight" parent="Theme.AppCompat.DayNight.DarkActionBar">
|
||||
<style name="AppThemeDayNight" parent="Theme.AppCompat.DayNight">
|
||||
<item name="colorPrimary">@color/colorPrimary</item>
|
||||
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
|
||||
<item name="colorAccent">@color/colorAccent</item>
|
||||
@@ -8,6 +8,7 @@
|
||||
<item name="colorMainText">@color/colorText</item>
|
||||
<item name="android:statusBarColor">@color/colorPrimary</item>
|
||||
<item name="android:navigationBarColor">@color/colorPrimary</item>
|
||||
<item name="colorControlNormal">@color/colorAccent</item>
|
||||
</style>
|
||||
|
||||
<style name="AppThemeDayNight.NoActionBar" parent="AppThemeDayNight">
|
||||
@@ -34,9 +35,4 @@
|
||||
<item name="android:colorBackgroundCacheHint">@null</item>
|
||||
<item name="android:windowIsTranslucent">true</item>
|
||||
</style>
|
||||
|
||||
<style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" />
|
||||
|
||||
<style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" />
|
||||
|
||||
</resources>
|
||||
Reference in new issue
Block a user