Skip to content

Commit 4b8c51d

Browse files
committed
implementing MD in test.xml
1 parent e6602b3 commit 4b8c51d

File tree

5 files changed

+61
-8
lines changed

5 files changed

+61
-8
lines changed

app/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -28,6 +28,7 @@ dependencies {
2828
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
2929
implementation 'com.google.android.material:material:1.2.0-alpha05'
3030
testImplementation 'junit:junit:4.12'
31+
implementation 'com.android.support:cardview-v7:27.1.1'
3132
androidTestImplementation 'androidx.test.ext:junit:1.1.1'
3233
androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
3334

app/src/main/java/com/citrix/taskshiftonandroid/MainActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ public class MainActivity extends AppCompatActivity {
1616
@Override
1717
protected void onCreate(Bundle savedInstanceState) {
1818
super.onCreate(savedInstanceState);
19-
setContentView(R.layout.activity_main);
19+
setContentView(R.layout.test);
2020

2121
//creat listview object
2222
ListView taskList = (ListView) findViewById(R.id.lv_main);
@@ -50,6 +50,6 @@ protected void onCreate(Bundle savedInstanceState) {
5050
new int[] {R.id.taskPicture,R.id.taskTicketId,R.id.taskType, R.id.taskSummary}
5151
);
5252

53-
taskList.setAdapter(adapter);
53+
//taskList.setAdapter(adapter);
5454
}
5555
}
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<selector xmlns:android="http://schemas.android.com/apk/res/android">
3+
4+
</selector>

app/src/main/res/layout/singletask.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,10 +30,10 @@
3030
android:layout_alignParentEnd="true"
3131
android:layout_alignParentRight="true"
3232
android:layout_alignParentBottom="true"
33-
android:layout_marginLeft="0dp"
34-
android:layout_marginEnd="212dp"
35-
android:layout_marginRight="212dp"
36-
android:layout_marginBottom="61dp"
33+
android:layout_marginLeft="13dp"
34+
android:layout_marginEnd="211dp"
35+
android:layout_marginRight="211dp"
36+
android:layout_marginBottom="58dp"
3737
android:layout_toRightOf="@id/taskType"
3838
android:text="TextView"
3939
android:textSize="16sp" />

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

Lines changed: 50 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,58 @@
1-
<resources>
1+
<resources xmlns:tools="http://schemas.android.com/tools">
22
<!-- Base application theme. -->
3-
<style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
3+
<style name="AppTheme" parent="Theme.MaterialComponents.Light">
44
<!-- Customize your theme here. -->
55
<item name="colorPrimary">@color/colorPrimary</item>
66
<item name="colorPrimaryDark">@color/colorPrimaryDark</item>
77
<item name="colorAccent">@color/colorAccent</item>
8+
9+
//add from MD
10+
<item name="materialCardViewStyle">@style/AppCard</item>
11+
<item name="shapeAppearanceMediumComponent">@style/ShapeAppearance.App.MediumComponent</item>
12+
//for button _test
13+
<item name="android:stateListAnimator" tools:ignore="NewApi">@animator/mtrl_btn_state_list_anim</item>
14+
<!-- Original AppCompat attributes. -->
15+
<item name="textAppearanceHeadline1">@style/TextAppearance.MaterialComponents.Headline1</item>
16+
<item name="textAppearanceHeadline2">@style/TextAppearance.MaterialComponents.Headline2</item>
17+
<item name="textAppearanceHeadline3">@style/TextAppearance.MaterialComponents.Headline3</item>
18+
<item name="textAppearanceHeadline4">@style/TextAppearance.MaterialComponents.Headline4</item>
19+
<item name="textAppearanceHeadline5">@style/TextAppearance.MaterialComponents.Headline5</item>
20+
<item name="textAppearanceHeadline6">@style/TextAppearance.MaterialComponents.Headline6</item>
21+
<item name="textAppearanceSubtitle1">@style/TextAppearance.MaterialComponents.Subtitle1</item>
22+
<item name="textAppearanceSubtitle2">@style/TextAppearance.MaterialComponents.Subtitle2</item>
23+
<item name="textAppearanceBody1">@style/TextAppearance.MaterialComponents.Body1</item>
24+
<item name="textAppearanceBody2">@style/TextAppearance.MaterialComponents.Body2</item>
25+
<item name="textAppearanceCaption">@style/TextAppearance.MaterialComponents.Caption</item>
26+
<item name="textAppearanceButton">@style/TextAppearance.MaterialComponents.Button</item>
27+
<item name="textAppearanceOverline">@style/TextAppearance.MaterialComponents.Overline</item>
28+
29+
//字体
30+
</style>
31+
32+
33+
//md尝试换主题
34+
35+
36+
//md
37+
<style name="ShapeAppearance.App.MediumComponent" parent="ShapeAppearance.MaterialComponents.MediumComponent">
38+
39+
</style>
40+
41+
//md控制全局卡片
42+
<style name="AppCard" parent="Widget.MaterialComponents.CardView">
43+
<item name="cardElevation">8dp</item>
44+
<item name="cardCornerRadius">18dp</item>
45+
</style>
46+
47+
48+
//button更新_test
49+
<style name="Widget.MaterialComponents.Button.TextButton.Dialog">
50+
<item name="android:minWidth">@dimen/mtrl_btn_dialog_btn_min_width</item>
51+
<item name="android:lines">1</item>
52+
<item name="android:ellipsize">end</item>
53+
<item name="android:singleLine">true</item>
54+
<item name="android:layout_marginStart">@dimen/mtrl_btn_text_btn_padding_left</item>
55+
<item name="android:layout_marginLeft">@dimen/mtrl_btn_text_btn_padding_left</item>
856
</style>
957

1058
</resources>

0 commit comments

Comments
 (0)