Merge remote-tracking branch 'origin/dev' into dev
This commit is contained in:
commit
22dccaa24b
40 changed files with 561 additions and 165 deletions
|
@ -125,6 +125,7 @@
|
|||
android:id="@+id/statisticList"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:orientation="vertical"
|
||||
android:nestedScrollingEnabled="true"
|
||||
tools:listitem="@layout/item_chart" />
|
||||
</LinearLayout>
|
||||
|
|
7
app/src/main/res/values-v23/themes.xml
Normal file
7
app/src/main/res/values-v23/themes.xml
Normal file
|
@ -0,0 +1,7 @@
|
|||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<resources>
|
||||
|
||||
<style name="Theme.Dantotsu" parent="Theme.Base">
|
||||
<item name="android:windowLightStatusBar">false</item>
|
||||
</style>
|
||||
</resources>
|
|
@ -486,6 +486,7 @@
|
|||
|
||||
<string name="read_on_dantotsu">Read on Dantotsu</string>
|
||||
<string name="watch_on_dantotsu">Watch on Dantotsu</string>
|
||||
<string name="view_profile_in_dantotsu">View Profile in Dantotsu</string>
|
||||
<string name="continue_episode">"Continue : Episode "</string>
|
||||
<string name="continue_chapter">"Continue : "</string>
|
||||
<string name="episode">"Episode "</string>
|
||||
|
|
|
@ -29,10 +29,6 @@
|
|||
</item>
|
||||
</style>
|
||||
|
||||
<style name="Theme.Dantotsu" parent="Theme.Base">
|
||||
<item name="android:windowLightStatusBar">false</item>
|
||||
</style>
|
||||
|
||||
<style name="Theme.Dantotsu.NoActionBar">
|
||||
<item name="windowActionBar">false</item>
|
||||
<item name="windowNoTitle">true</item>
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue