Skip to content

Commit cb5f72c

Browse files
committed
Merge remote-tracking branch 'origin/master'
* origin/master: 修改版本号至0.1.1 修复ActionMode与AppBar重复出现
2 parents ed45b7e + f61c020 commit cb5f72c

File tree

3 files changed

+5
-4
lines changed

3 files changed

+5
-4
lines changed

app/src/main/res/values/colors.xml

-1
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
<color name="editor_backgroud">#ffffffff</color>
1010
<color name="current_row_backgroud">#ffccddff</color>
1111
<color name="syntax_error">#ffdd4b39</color>
12-
<color name="background_material_dark">#ececec</color>
1312
<color name="night_color">#000000</color>
1413
<color name="light_color">#ffffff</color>
1514
<color name="light_color2">#ff87cefa</color>

app/src/main/res/values/styles.xml

+3-1
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@
66
<item name="colorPrimary">@color/colorPrimary</item>
77
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
88
<item name="colorAccent">@color/white</item>
9-
<item name="android:colorBackground">@color/background_material_dark</item>
9+
<item name="android:colorBackground">@color/background_material_light</item>
10+
<item name="windowActionModeOverlay">true</item>
11+
<item name="actionModeBackground">@color/background_material_dark</item>
1012
</style>
1113

1214
<style name="AppTheme.NoActionBar">

build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -24,8 +24,8 @@ buildscript {
2424
ext.compileSdkVer = '23'
2525
ext.minSdkVer = '15'
2626
ext.targetSdkVer = '23'
27-
ext.verCode = '1'
28-
ext.verName = '0.1.0'
27+
ext.verCode = '2'
28+
ext.verName = '0.1.1'
2929
repositories {
3030
jcenter()
3131
maven { url 'http://maven.oschina.net/content/groups/public/' }

0 commit comments

Comments
 (0)