diff --git a/app/build.gradle b/app/build.gradle index f58091f..d75ad26 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -25,7 +25,7 @@ android { dependencies { implementation fileTree(dir: "libs", include: ["*.jar"]) implementation project(":xtableview") - implementation 'androidx.appcompat:appcompat:1.1.0' + implementation 'androidx.appcompat:appcompat:1.2.0' implementation 'androidx.constraintlayout:constraintlayout:1.1.3' testImplementation 'junit:junit:4.12' androidTestImplementation 'androidx.test.ext:junit:1.1.1' diff --git a/build.gradle b/build.gradle index 6754c23..0cbb447 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { } dependencies { classpath "com.android.tools.build:gradle:4.0.1" - + classpath 'com.github.dcendents:android-maven-gradle-plugin:2.1' // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } diff --git a/xtableview/build.gradle b/xtableview/build.gradle index 28ef20b..9764936 100644 --- a/xtableview/build.gradle +++ b/xtableview/build.gradle @@ -1,4 +1,5 @@ apply plugin: 'com.android.library' +apply plugin: 'com.github.dcendents.android-maven' android { compileSdkVersion 30 @@ -23,7 +24,7 @@ android { dependencies { compileOnly fileTree(dir: "libs", include: ["*.jar"]) - implementation 'androidx.appcompat:appcompat:1.1.0' + implementation 'androidx.appcompat:appcompat:1.2.0' implementation 'androidx.recyclerview:recyclerview:1.1.0' implementation 'com.android.support.constraint:constraint-layout:1.1.3' testCompileOnly 'junit:junit:4.12' diff --git a/xtableview/src/main/java/com/zjy/xtableview/widget/swipe/SwipeMenuView.java b/xtableview/src/main/java/com/zjy/xtableview/widget/swipe/SwipeMenuView.java index 416f367..9029a73 100644 --- a/xtableview/src/main/java/com/zjy/xtableview/widget/swipe/SwipeMenuView.java +++ b/xtableview/src/main/java/com/zjy/xtableview/widget/swipe/SwipeMenuView.java @@ -71,7 +71,7 @@ public void onClick(View v) { if (v instanceof LinearLayout) { ((LinearLayout) v).getChildAt(0).setVisibility(VISIBLE); TextView menuTv = (TextView) ((LinearLayout) v).getChildAt(0); - menuTv.setText("确认删除"); + menuTv.setText("Confirm delete"); } } } @@ -88,7 +88,7 @@ public void resetMenu() { menuTag.setConfirm(false); } if (menuTv instanceof TextView) { - ((TextView) menuTv).setText("删除"); + ((TextView) menuTv).setText("Delete"); } } } \ No newline at end of file diff --git a/xtableview/src/main/res/drawable-xhdpi/table_view_ic_delete.png b/xtableview/src/main/res/drawable-xhdpi/table_view_ic_delete.png deleted file mode 100644 index 6fb4b69..0000000 Binary files a/xtableview/src/main/res/drawable-xhdpi/table_view_ic_delete.png and /dev/null differ diff --git a/xtableview/src/main/res/layout/table_swipe_menu_layout.xml b/xtableview/src/main/res/layout/table_swipe_menu_layout.xml index b77bfb5..a62f0bf 100644 --- a/xtableview/src/main/res/layout/table_swipe_menu_layout.xml +++ b/xtableview/src/main/res/layout/table_swipe_menu_layout.xml @@ -10,11 +10,9 @@ android:layout_width="wrap_content" android:layout_height="wrap_content" android:layout_gravity="center" - android:drawableStart="@drawable/table_view_ic_delete" - android:drawableLeft="@drawable/table_view_ic_delete" android:drawablePadding="6dp" android:gravity="center" - android:text="删除" + android:text="Delete" android:textColor="@color/table_swipe_delete_txt_color" android:textSize="13sp" />