Merge branch 'feature/slider' into 'master'

Feature/slider



See merge request !20
This commit is contained in:
pengfeizhou
2019-11-20 21:05:00 +08:00
8 changed files with 409 additions and 6 deletions

View File

@@ -0,0 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingLeft="15dp"
android:paddingRight="15dp">
<TextView
android:id="@+id/tv_msg"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginTop="15dp"
android:layout_marginBottom="15dp" />
<EditText
android:id="@+id/edit_input"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:theme="@style/Theme.Doric.Modal.Prompt.EditText" />
</LinearLayout>

View File

@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="Theme.Doric.Modal" parent="android:Theme.Material.Light.Dialog.Alert" />
</resources>

View File

@@ -0,0 +1,15 @@
<resources>
<style name="Theme.Doric.Modal" parent="android:style/Theme.Holo.Light.Dialog">
<item name="android:windowBackground">@android:color/transparent</item>
</style>
<style name="Theme.Doric.Modal.Alert" parent="Theme.Doric.Modal" />
<style name="Theme.Doric.Modal.Confirm" parent="Theme.Doric.Modal" />
<style name="Theme.Doric.Modal.Prompt" parent="Theme.Doric.Modal" />
<style name="Theme.Doric.Modal.Prompt.EditText" parent="Theme.AppCompat.Light" />
</resources>