diff --git a/app/build/outputs/apk/debug/app-debug.apk b/app/build/outputs/apk/debug/app-debug.apk new file mode 100644 index 0000000..8b51db3 Binary files /dev/null and b/app/build/outputs/apk/debug/app-debug.apk differ diff --git a/app/build/outputs/apk/debug/output-metadata.json b/app/build/outputs/apk/debug/output-metadata.json new file mode 100644 index 0000000..1e52d57 --- /dev/null +++ b/app/build/outputs/apk/debug/output-metadata.json @@ -0,0 +1,18 @@ +{ + "version": 2, + "artifactType": { + "type": "APK", + "kind": "Directory" + }, + "applicationId": "com.yyy.djk.dropdownmenu", + "variantName": "debug", + "elements": [ + { + "type": "SINGLE", + "filters": [], + "versionCode": 1, + "versionName": "1.0", + "outputFile": "app-debug.apk" + } + ] +} \ No newline at end of file diff --git a/app/src/main/java/com/yyy/djk/dropdownmenu/MainActivity.java b/app/src/main/java/com/yyy/djk/dropdownmenu/MainActivity.java index 674bd1e..7cf2b1e 100644 --- a/app/src/main/java/com/yyy/djk/dropdownmenu/MainActivity.java +++ b/app/src/main/java/com/yyy/djk/dropdownmenu/MainActivity.java @@ -26,9 +26,9 @@ public class MainActivity extends AppCompatActivity { private String headers[] = {"城市", "年龄", "性别", "星座"}; private List popupViews = new ArrayList<>(); - private GirdDropDownAdapter cityAdapter; - private ListDropDownAdapter ageAdapter; - private ListDropDownAdapter sexAdapter; + private ConstellationAdapter cityAdapter; + private ConstellationAdapter ageAdapter; + private ConstellationAdapter sexAdapter; private ConstellationAdapter constellationAdapter; private String citys[] = {"不限", "武汉", "北京", "上海", "成都", "广州", "深圳", "重庆", "天津", "西安", "南京", "杭州"}; @@ -49,20 +49,20 @@ protected void onCreate(Bundle savedInstanceState) { private void initView() { //init city menu final ListView cityView = new ListView(this); - cityAdapter = new GirdDropDownAdapter(this, Arrays.asList(citys)); + cityAdapter = new ConstellationAdapter(this, Arrays.asList(citys)); cityView.setDividerHeight(0); cityView.setAdapter(cityAdapter); //init age menu final ListView ageView = new ListView(this); ageView.setDividerHeight(0); - ageAdapter = new ListDropDownAdapter(this, Arrays.asList(ages)); + ageAdapter = new ConstellationAdapter(this, Arrays.asList(ages)); ageView.setAdapter(ageAdapter); //init sex menu final ListView sexView = new ListView(this); sexView.setDividerHeight(0); - sexAdapter = new ListDropDownAdapter(this, Arrays.asList(sexs)); + sexAdapter = new ConstellationAdapter(this, Arrays.asList(sexs)); sexView.setAdapter(sexAdapter); //init constellation diff --git a/build.gradle b/build.gradle index 9372bc7..5c5bc92 100644 --- a/build.gradle +++ b/build.gradle @@ -2,9 +2,11 @@ buildscript { repositories { jcenter() + google() } dependencies { - classpath 'com.android.tools.build:gradle:2.3.1' +// classpath 'com.android.tools.build:gradle:2.3.1' + classpath 'com.android.tools.build:gradle:4.2.1' classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5' // Add this line // NOTE: Do not place your application dependencies here; they belong @@ -14,6 +16,7 @@ buildscript { allprojects { repositories { jcenter() + google() } } diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index 645ca7c..3280eb6 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ -#Tue Apr 11 16:01:41 CST 2017 +#Fri Feb 18 11:51:14 CST 2022 distributionBase=GRADLE_USER_HOME +distributionUrl=https\://services.gradle.org/distributions/gradle-6.7.1-bin.zip distributionPath=wrapper/dists -zipStoreBase=GRADLE_USER_HOME zipStorePath=wrapper/dists -distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip +zipStoreBase=GRADLE_USER_HOME diff --git a/library/src/main/java/com/yyydjk/library/DropDownMenu.java b/library/src/main/java/com/yyydjk/library/DropDownMenu.java index fa3a8f2..baf7a90 100644 --- a/library/src/main/java/com/yyydjk/library/DropDownMenu.java +++ b/library/src/main/java/com/yyydjk/library/DropDownMenu.java @@ -153,7 +153,7 @@ private void addTab(@NonNull List tabTexts, int i) { tab.setEllipsize(TextUtils.TruncateAt.END); tab.setGravity(Gravity.CENTER); tab.setTextSize(TypedValue.COMPLEX_UNIT_PX,menuTextSize); - tab.setLayoutParams(new LayoutParams(0, ViewGroup.LayoutParams.WRAP_CONTENT, 1.0f)); +// tab.setLayoutParams(new LayoutParams(0, ViewGroup.LayoutParams.WRAP_CONTENT, 1.0f)); tab.setTextColor(textUnselectedColor); tab.setCompoundDrawablesWithIntrinsicBounds(null, null, getResources().getDrawable(menuUnselectedIcon), null); tab.setText(tabTexts.get(i));