Skip to content

Commit 19eb00c

Browse files
author
“gujinjie”
committed
update :change package name to fix same package name in one project
1 parent 04363a7 commit 19eb00c

5 files changed

Lines changed: 13 additions & 14 deletions

File tree

app/src/main/java/com/jaygoo/demo/MainActivity.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@
55
import android.view.View;
66
import android.widget.Toast;
77

8-
import com.jaygoo.widget.MultiSelectPopWindow;
8+
import com.jaygoo.selector.MultiSelectPopWindow;
99

1010
import java.util.ArrayList;
1111

library/library.iml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -67,14 +67,6 @@
6767
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
6868
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
6969
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
70-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
71-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
72-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
73-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
74-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
75-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
76-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
77-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
7870
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
7971
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
8072
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
@@ -83,6 +75,14 @@
8375
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
8476
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
8577
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
78+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
79+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
80+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
81+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
82+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
83+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
84+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
85+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
8686
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/annotations" />
8787
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
8888
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/bundles" />

library/src/main/AndroidManifest.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
2-
package="com.jaygoo.widget">
2+
package="com.jaygoo.selector">
33

44
<application android:allowBackup="true"
55
android:label="@string/app_name"

library/src/main/java/com/jaygoo/widget/MultiSelectListAdapter.java renamed to library/src/main/java/com/jaygoo/selector/MultiSelectListAdapter.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
package com.jaygoo.widget;
1+
package com.jaygoo.selector;
22

33
import android.support.v7.widget.RecyclerView;
44
import android.view.LayoutInflater;

library/src/main/java/com/jaygoo/widget/MultiSelectPopWindow.java renamed to library/src/main/java/com/jaygoo/selector/MultiSelectPopWindow.java

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,6 @@
1-
package com.jaygoo.widget;
1+
package com.jaygoo.selector;
22

33
import android.app.Activity;
4-
import android.content.Context;
54
import android.graphics.drawable.ColorDrawable;
65
import android.support.v7.widget.LinearLayoutManager;
76
import android.support.v7.widget.RecyclerView;
@@ -284,7 +283,7 @@ private void setTextColor(TextView tv, int color){
284283
}
285284
}
286285

287-
private void dismiss() {
286+
public void dismiss() {
288287
if (mPopupWindow != null){
289288
mPopupWindow.dismiss();
290289
}

0 commit comments

Comments
 (0)