diff --git a/DatePicker/src/main/java/cn/aigestudio/datepicker/bizs/calendars/DPCNCalendar.java b/DatePicker/src/main/java/cn/aigestudio/datepicker/bizs/calendars/DPCNCalendar.java
index 6373339..b5b15c8 100644
--- a/DatePicker/src/main/java/cn/aigestudio/datepicker/bizs/calendars/DPCNCalendar.java
+++ b/DatePicker/src/main/java/cn/aigestudio/datepicker/bizs/calendars/DPCNCalendar.java
@@ -1,7 +1,6 @@
package cn.aigestudio.datepicker.bizs.calendars;
import android.text.TextUtils;
-
import java.util.Collections;
import java.util.HashMap;
import java.util.HashSet;
@@ -10,305 +9,420 @@
/**
* 中国月历
*
- * Calendar of China
+ *
Calendar of China
*
* @author AigeStudio 2015-06-16
*/
public class DPCNCalendar extends DPCalendar {
- private static final int[] FIRST_DAY_OF_LUNAR_IN_GREGORIAN = {1897, 0x75aa, 0x156a, 0x1096d, 0x95c, 0x14ae, 0xaa4d, 0x1a4c, 0x1b2a, 0x8d55, 0xad4, 0x135a, 0x495d, 0x95c, 0xd49b, 0x149a, 0x1a4a, 0xbaa5, 0x16a8, 0x1ad4, 0x52da, 0x12b6, 0xe937, 0x92e, 0x1496, 0xb64b, 0xd4a, 0xda8, 0x95b5, 0x56c, 0x12ae, 0x492f, 0x92e, 0xcc96, 0x1a94, 0x1d4a, 0xada9, 0xb5a, 0x56c, 0x726e, 0x125c, 0xf92d, 0x192a, 0x1a94, 0xdb4a, 0x16aa, 0xad4, 0x955b, 0x4ba, 0x125a, 0x592b, 0x152a, 0xf695, 0xd94, 0x16aa, 0xaab5, 0x9b4, 0x14b6, 0x6a57, 0xa56, 0x1152a, 0x1d2a, 0xd54, 0xd5aa, 0x156a, 0x96c, 0x94ae, 0x14ae, 0xa4c, 0x7d26, 0x1b2a, 0xeb55, 0xad4, 0x12da, 0xa95d, 0x95a, 0x149a, 0x9a4d, 0x1a4a, 0x11aa5, 0x16a8, 0x16d4, 0xd2da, 0x12b6, 0x936, 0x9497, 0x1496, 0x1564b, 0xd4a, 0xda8, 0xd5b4, 0x156c, 0x12ae, 0xa92f, 0x92e, 0xc96, 0x6d4a, 0x1d4a, 0x10d65, 0xb58, 0x156c, 0xb26d, 0x125c, 0x192c, 0x9a95, 0x1a94, 0x1b4a, 0x4b55, 0xad4, 0xf55b, 0x4ba, 0x125a, 0xb92b, 0x152a, 0x1694, 0x96aa, 0x15aa, 0x12ab5, 0x974, 0x14b6, 0xca57, 0xa56, 0x1526, 0x8e95, 0xd54, 0x15aa, 0x49b5, 0x96c, 0xd4ae, 0x149c, 0x1a4c, 0xbd26, 0x1aa6, 0xb54, 0x6d6a, 0x12da, 0x1695d, 0x95a, 0x149a, 0xda4b, 0x1a4a, 0x1aa4, 0xbb54, 0x16b4, 0xada, 0x495b, 0x936, 0xf497, 0x1496, 0x154a, 0xb6a5, 0xda4, 0x15b4, 0x6ab6, 0x126e, 0x1092f, 0x92e, 0xc96, 0xcd4a, 0x1d4a, 0xd64, 0x956c, 0x155c, 0x125c, 0x792e, 0x192c, 0xfa95, 0x1a94, 0x1b4a, 0xab55, 0xad4, 0x14da, 0x8a5d, 0xa5a, 0x1152b, 0x152a, 0x1694, 0xd6aa, 0x15aa, 0xab4, 0x94ba, 0x14b6, 0xa56, 0x7527, 0xd26, 0xee53, 0xd54, 0x15aa, 0xa9b5, 0x96c, 0x14ae, 0x8a4e, 0x1a4c, 0x11d26, 0x1aa4, 0x1b54, 0xcd6a, 0xada, 0x95c, 0x949d, 0x149a, 0x1a2a, 0x5b25, 0x1aa4, 0xfb52};
-
- private static final int[] DAYS_AND_LEAP_MONTH_OF_LUNAR = {1897, 0xed436, 0xed64a, 0xed83f, 0xeda53, 0xedc48, 0xede3d, 0xee050, 0xee244, 0xee439, 0xee64d, 0xee842, 0xeea36, 0xeec4a, 0xeee3e, 0xef052, 0xef246, 0xef43a, 0xef64e, 0xef843, 0xefa37, 0xefc4b, 0xefe41, 0xf0054, 0xf0248, 0xf043c, 0xf0650, 0xf0845, 0xf0a38, 0xf0c4d, 0xf0e42, 0xf1037, 0xf124a, 0xf143e, 0xf1651, 0xf1846, 0xf1a3a, 0xf1c4e, 0xf1e44, 0xf2038, 0xf224b, 0xf243f, 0xf2653, 0xf2848, 0xf2a3b, 0xf2c4f, 0xf2e45, 0xf3039, 0xf324d, 0xf3442, 0xf3636, 0xf384a, 0xf3a3d, 0xf3c51, 0xf3e46, 0xf403b, 0xf424e, 0xf4443, 0xf4638, 0xf484c, 0xf4a3f, 0xf4c52, 0xf4e48, 0xf503c, 0xf524f, 0xf5445, 0xf5639, 0xf584d, 0xf5a42, 0xf5c35, 0xf5e49, 0xf603e, 0xf6251, 0xf6446, 0xf663b, 0xf684f, 0xf6a43, 0xf6c37, 0xf6e4b, 0xf703f, 0xf7252, 0xf7447, 0xf763c, 0xf7850, 0xf7a45, 0xf7c39, 0xf7e4d, 0xf8042, 0xf8254, 0xf8449, 0xf863d, 0xf8851, 0xf8a46, 0xf8c3b, 0xf8e4f, 0xf9044, 0xf9237, 0xf944a, 0xf963f, 0xf9853, 0xf9a47, 0xf9c3c, 0xf9e50, 0xfa045, 0xfa238, 0xfa44c, 0xfa641, 0xfa836, 0xfaa49, 0xfac3d, 0xfae52, 0xfb047, 0xfb23a, 0xfb44e, 0xfb643, 0xfb837, 0xfba4a, 0xfbc3f, 0xfbe53, 0xfc048, 0xfc23c, 0xfc450, 0xfc645, 0xfc839, 0xfca4c, 0xfcc41, 0xfce36, 0xfd04a, 0xfd23d, 0xfd451, 0xfd646, 0xfd83a, 0xfda4d, 0xfdc43, 0xfde37, 0xfe04b, 0xfe23f, 0xfe453, 0xfe648, 0xfe83c, 0xfea4f, 0xfec44, 0xfee38, 0xff04c, 0xff241, 0xff436, 0xff64a, 0xff83e, 0xffa51, 0xffc46, 0xffe3a, 0x10004e, 0x100242, 0x100437, 0x10064b, 0x100841, 0x100a53, 0x100c48, 0x100e3c, 0x10104f, 0x101244, 0x101438, 0x10164c, 0x101842, 0x101a35, 0x101c49, 0x101e3d, 0x102051, 0x102245, 0x10243a, 0x10264e, 0x102843, 0x102a37, 0x102c4b, 0x102e3f, 0x103053, 0x103247, 0x10343b, 0x10364f, 0x103845, 0x103a38, 0x103c4c, 0x103e42, 0x104036, 0x104249, 0x10443d, 0x104651, 0x104846, 0x104a3a, 0x104c4e, 0x104e43, 0x105038, 0x10524a, 0x10543e, 0x105652, 0x105847, 0x105a3b, 0x105c4f, 0x105e45, 0x106039, 0x10624c, 0x106441, 0x106635, 0x106849, 0x106a3d};
-
- private static final String[] NUMBER_CAPITAL = {"零", "一", "二", "三", "四", "五", "六", "七", "八", "九"};
-
- private static final String[] LUNAR_HEADER = {"初", "十", "廿", "卅", "正", "腊", "冬", "闰"};
-
- private static final String[][] FESTIVAL_G = {
- {"元旦"},
- {"世界湿地日", "情人节"},
- {"全国爱耳日", "青年志愿者服务日", "国际妇女节", "保护母亲河日", "中国植树节", "白色情人节&国际警察日", "世界消费者权益日", "世界森林日&世界睡眠日", "世界水日", "世界气象日", "世界防治结核病日"},
- {"愚人节", "清明节", "世界卫生日", "世界地球日", "世界知识产权日"},
- {"国际劳动节", "世界哮喘日", "中国青年节", "世界红十字日", "国际护士节", "国际家庭日", "世界电信日", "全国学生营养日", "国际生物多样性日", "国际牛奶日", "世界无烟日"},
- {"国际儿童节", "世界环境日", "全国爱眼日", "世界防治荒漠化日", "国际奥林匹克日", "全国土地日", "国际禁毒日"},
- {"中国共产党诞生日&国际建筑日", "中国抗战纪念日", "世界人口日"},
- {"中国解放军建军节", "国际青年节"},
- {"抗战胜利日", "国际扫盲日", "中国教师节", "中国脑健康日&臭氧层保护日", "全国爱牙日", "世界停火日", "世界旅游日"},
- {"国庆节&国际老年人日", "世界动物日", "世界教师日", "全国高血压日", "世界邮政日", "世界精神卫生日", "世界标准日", "国际盲人节&世界农村妇女日", "世界粮食日", "国际消除贫困日", "联合国日&世界发展新闻日", "中国男性健康日", "万圣节"},
- {"中国记者节", "消防宣传日", "世界糖尿病日", "国际大学生节", "消除对妇女暴力日"},
- {"世界爱滋病日", "世界残疾人日", "全国法制宣传日", "世界足球日", "圣诞节"}};
-
- private static final int[][] FESTIVAL_G_DATE = {
- {1},
- {2, 14},
- {3, 5, 8, 9, 12, 14, 15, 21, 22, 23, 24},
- {1, 5, 7, 22, 26},
- {1, 3, 4, 8, 12, 15, 17, 20, 22, 23, 31},
- {1, 5, 6, 17, 23, 25, 26},
- {1, 7, 11},
- {1, 12},
- {3, 8, 10, 16, 20, 21, 27},
- {1, 4, 5, 8, 9, 10, 14, 15, 16, 17, 24, 29, 31},
- {8, 9, 14, 17, 25},
- {1, 3, 4, 9, 25}};
-
- private static final String[][] FESTIVAL_L = {{"春节", "元宵节"},
- {},
- {},
- {},
- {"端午节"},
- {},
- {"乞巧节"},
- {"中秋节"},
- {"重阳节"},
- {},
- {},
- {"腊八节", "扫房日"}};
-
- private static final int[][] FESTIVAL_L_DATE = {
- {1, 15},
- {},
- {},
- {},
- {5},
- {},
- {7},
- {15},
- {9},
- {},
- {},
- {8, 24}};
-
- private static final String[][] HOLIDAY = {{"1", "2", "3"}, {"18", "19", "20", "21", "22", "23", "24"}, {""}, {"4", "5", "6"}, {"1", "2", "3"}, {"20", "21", "22"}, {""}, {""}, {"3", "4", "5", "26", "27"}, {"1", "2", "3", "4", "5", "6", "7"}, {""}, {""}};
-
- private static final String[][] DEFERRED = {{"4"}, {"15", "16", "17", "25", "26", "27", "28"}, {""}, {""}, {""}, {""}, {""}, {""}, {"6", "28", "29", "30"}, {"8", "9", "10"}, {""}, {""}};
-
- private static final String SOLAR_TERM[][] = {{"小寒", "大寒"}, {"立春", "雨水"}, {"惊蛰", "春分"}, {"清明", "谷雨"}, {"立夏", "小满"}, {"芒种", "夏至"}, {"小暑", "大暑"}, {"立秋", "处暑"}, {"白露", "秋分"}, {"寒露", "霜降"}, {"立冬", "小雪"}, {"大雪", "冬至"}};
-
- private final HashMap CACHE_SOLAR_TERM = new HashMap<>();
-
- private SolarTerm mSolarTerm = new SolarTerm();
-
- private class G {
- int d;
- int m;
- int y;
+ private static final int[] FIRST_DAY_OF_LUNAR_IN_GREGORIAN = {
+ 1897, 0x75aa, 0x156a, 0x1096d, 0x95c, 0x14ae, 0xaa4d, 0x1a4c, 0x1b2a, 0x8d55, 0xad4, 0x135a,
+ 0x495d, 0x95c, 0xd49b, 0x149a, 0x1a4a, 0xbaa5, 0x16a8, 0x1ad4, 0x52da, 0x12b6, 0xe937, 0x92e,
+ 0x1496, 0xb64b, 0xd4a, 0xda8, 0x95b5, 0x56c, 0x12ae, 0x492f, 0x92e, 0xcc96, 0x1a94, 0x1d4a,
+ 0xada9, 0xb5a, 0x56c, 0x726e, 0x125c, 0xf92d, 0x192a, 0x1a94, 0xdb4a, 0x16aa, 0xad4, 0x955b,
+ 0x4ba, 0x125a, 0x592b, 0x152a, 0xf695, 0xd94, 0x16aa, 0xaab5, 0x9b4, 0x14b6, 0x6a57, 0xa56,
+ 0x1152a, 0x1d2a, 0xd54, 0xd5aa, 0x156a, 0x96c, 0x94ae, 0x14ae, 0xa4c, 0x7d26, 0x1b2a, 0xeb55,
+ 0xad4, 0x12da, 0xa95d, 0x95a, 0x149a, 0x9a4d, 0x1a4a, 0x11aa5, 0x16a8, 0x16d4, 0xd2da, 0x12b6,
+ 0x936, 0x9497, 0x1496, 0x1564b, 0xd4a, 0xda8, 0xd5b4, 0x156c, 0x12ae, 0xa92f, 0x92e, 0xc96,
+ 0x6d4a, 0x1d4a, 0x10d65, 0xb58, 0x156c, 0xb26d, 0x125c, 0x192c, 0x9a95, 0x1a94, 0x1b4a, 0x4b55,
+ 0xad4, 0xf55b, 0x4ba, 0x125a, 0xb92b, 0x152a, 0x1694, 0x96aa, 0x15aa, 0x12ab5, 0x974, 0x14b6,
+ 0xca57, 0xa56, 0x1526, 0x8e95, 0xd54, 0x15aa, 0x49b5, 0x96c, 0xd4ae, 0x149c, 0x1a4c, 0xbd26,
+ 0x1aa6, 0xb54, 0x6d6a, 0x12da, 0x1695d, 0x95a, 0x149a, 0xda4b, 0x1a4a, 0x1aa4, 0xbb54, 0x16b4,
+ 0xada, 0x495b, 0x936, 0xf497, 0x1496, 0x154a, 0xb6a5, 0xda4, 0x15b4, 0x6ab6, 0x126e, 0x1092f,
+ 0x92e, 0xc96, 0xcd4a, 0x1d4a, 0xd64, 0x956c, 0x155c, 0x125c, 0x792e, 0x192c, 0xfa95, 0x1a94,
+ 0x1b4a, 0xab55, 0xad4, 0x14da, 0x8a5d, 0xa5a, 0x1152b, 0x152a, 0x1694, 0xd6aa, 0x15aa, 0xab4,
+ 0x94ba, 0x14b6, 0xa56, 0x7527, 0xd26, 0xee53, 0xd54, 0x15aa, 0xa9b5, 0x96c, 0x14ae, 0x8a4e,
+ 0x1a4c, 0x11d26, 0x1aa4, 0x1b54, 0xcd6a, 0xada, 0x95c, 0x949d, 0x149a, 0x1a2a, 0x5b25, 0x1aa4,
+ 0xfb52
+ };
+
+ private static final int[] DAYS_AND_LEAP_MONTH_OF_LUNAR = {
+ 1897, 0xed436, 0xed64a, 0xed83f, 0xeda53, 0xedc48, 0xede3d, 0xee050, 0xee244, 0xee439, 0xee64d,
+ 0xee842, 0xeea36, 0xeec4a, 0xeee3e, 0xef052, 0xef246, 0xef43a, 0xef64e, 0xef843, 0xefa37,
+ 0xefc4b, 0xefe41, 0xf0054, 0xf0248, 0xf043c, 0xf0650, 0xf0845, 0xf0a38, 0xf0c4d, 0xf0e42,
+ 0xf1037, 0xf124a, 0xf143e, 0xf1651, 0xf1846, 0xf1a3a, 0xf1c4e, 0xf1e44, 0xf2038, 0xf224b,
+ 0xf243f, 0xf2653, 0xf2848, 0xf2a3b, 0xf2c4f, 0xf2e45, 0xf3039, 0xf324d, 0xf3442, 0xf3636,
+ 0xf384a, 0xf3a3d, 0xf3c51, 0xf3e46, 0xf403b, 0xf424e, 0xf4443, 0xf4638, 0xf484c, 0xf4a3f,
+ 0xf4c52, 0xf4e48, 0xf503c, 0xf524f, 0xf5445, 0xf5639, 0xf584d, 0xf5a42, 0xf5c35, 0xf5e49,
+ 0xf603e, 0xf6251, 0xf6446, 0xf663b, 0xf684f, 0xf6a43, 0xf6c37, 0xf6e4b, 0xf703f, 0xf7252,
+ 0xf7447, 0xf763c, 0xf7850, 0xf7a45, 0xf7c39, 0xf7e4d, 0xf8042, 0xf8254, 0xf8449, 0xf863d,
+ 0xf8851, 0xf8a46, 0xf8c3b, 0xf8e4f, 0xf9044, 0xf9237, 0xf944a, 0xf963f, 0xf9853, 0xf9a47,
+ 0xf9c3c, 0xf9e50, 0xfa045, 0xfa238, 0xfa44c, 0xfa641, 0xfa836, 0xfaa49, 0xfac3d, 0xfae52,
+ 0xfb047, 0xfb23a, 0xfb44e, 0xfb643, 0xfb837, 0xfba4a, 0xfbc3f, 0xfbe53, 0xfc048, 0xfc23c,
+ 0xfc450, 0xfc645, 0xfc839, 0xfca4c, 0xfcc41, 0xfce36, 0xfd04a, 0xfd23d, 0xfd451, 0xfd646,
+ 0xfd83a, 0xfda4d, 0xfdc43, 0xfde37, 0xfe04b, 0xfe23f, 0xfe453, 0xfe648, 0xfe83c, 0xfea4f,
+ 0xfec44, 0xfee38, 0xff04c, 0xff241, 0xff436, 0xff64a, 0xff83e, 0xffa51, 0xffc46, 0xffe3a,
+ 0x10004e, 0x100242, 0x100437, 0x10064b, 0x100841, 0x100a53, 0x100c48, 0x100e3c, 0x10104f,
+ 0x101244, 0x101438, 0x10164c, 0x101842, 0x101a35, 0x101c49, 0x101e3d, 0x102051, 0x102245,
+ 0x10243a, 0x10264e, 0x102843, 0x102a37, 0x102c4b, 0x102e3f, 0x103053, 0x103247, 0x10343b,
+ 0x10364f, 0x103845, 0x103a38, 0x103c4c, 0x103e42, 0x104036, 0x104249, 0x10443d, 0x104651,
+ 0x104846, 0x104a3a, 0x104c4e, 0x104e43, 0x105038, 0x10524a, 0x10543e, 0x105652, 0x105847,
+ 0x105a3b, 0x105c4f, 0x105e45, 0x106039, 0x10624c, 0x106441, 0x106635, 0x106849, 0x106a3d
+ };
+
+ private static final String[] NUMBER_CAPITAL = {"零", "一", "二", "三", "四", "五", "六", "七", "八", "九"};
+
+ private static final String[] LUNAR_HEADER = {"初", "十", "廿", "卅", "正", "腊", "冬", "闰"};
+
+ private static final String[][] FESTIVAL_G = {
+ {"元旦"},
+ {"世界湿地日", "情人节"},
+ {
+ "全国爱耳日",
+ "青年志愿者服务日",
+ "国际妇女节",
+ "保护母亲河日",
+ "中国植树节",
+ "白色情人节&国际警察日",
+ "世界消费者权益日",
+ "世界森林日&世界睡眠日",
+ "世界水日",
+ "世界气象日",
+ "世界防治结核病日"
+ },
+ {"愚人节", "清明节", "世界卫生日", "世界地球日", "世界知识产权日"},
+ {
+ "国际劳动节",
+ "世界哮喘日",
+ "中国青年节",
+ "世界红十字日",
+ "国际护士节",
+ "国际家庭日",
+ "世界电信日",
+ "全国学生营养日",
+ "国际生物多样性日",
+ "国际牛奶日",
+ "世界无烟日"
+ },
+ {"国际儿童节", "世界环境日", "全国爱眼日", "世界防治荒漠化日", "国际奥林匹克日", "全国土地日", "国际禁毒日"},
+ {"中国共产党诞生日&国际建筑日", "中国抗战纪念日", "世界人口日"},
+ {"中国解放军建军节", "国际青年节"},
+ {"抗战胜利日", "国际扫盲日", "中国教师节", "中国脑健康日&臭氧层保护日", "全国爱牙日", "世界停火日", "世界旅游日"},
+ {
+ "国庆节&国际老年人日",
+ "世界动物日",
+ "世界教师日",
+ "全国高血压日",
+ "世界邮政日",
+ "世界精神卫生日",
+ "世界标准日",
+ "国际盲人节&世界农村妇女日",
+ "世界粮食日",
+ "国际消除贫困日",
+ "联合国日&世界发展新闻日",
+ "中国男性健康日",
+ "万圣节"
+ },
+ {"中国记者节", "消防宣传日", "世界糖尿病日", "国际大学生节", "消除对妇女暴力日"},
+ {"世界爱滋病日", "世界残疾人日", "全国法制宣传日", "世界足球日", "圣诞节"}
+ };
+
+ private static final int[][] FESTIVAL_G_DATE = {
+ {1},
+ {2, 14},
+ {3, 5, 8, 9, 12, 14, 15, 21, 22, 23, 24},
+ {1, 5, 7, 22, 26},
+ {1, 3, 4, 8, 12, 15, 17, 20, 22, 23, 31},
+ {1, 5, 6, 17, 23, 25, 26},
+ {1, 7, 11},
+ {1, 12},
+ {3, 8, 10, 16, 20, 21, 27},
+ {1, 4, 5, 8, 9, 10, 14, 15, 16, 17, 24, 29, 31},
+ {8, 9, 14, 17, 25},
+ {1, 3, 4, 9, 25}
+ };
+
+ private static final String[][] FESTIVAL_L = {
+ {"春节", "元宵节"}, {}, {}, {}, {"端午节"}, {}, {"乞巧节"}, {"中秋节"}, {"重阳节"}, {}, {}, {"腊八节", "扫房日"}
+ };
+
+ private static final int[][] FESTIVAL_L_DATE = {
+ {1, 15},
+ {},
+ {},
+ {},
+ {5},
+ {},
+ {7},
+ {15},
+ {9},
+ {},
+ {},
+ {8, 24}
+ };
+
+ private static final String[][] HOLIDAY = {
+ {"1", "2", "3"},
+ {"18", "19", "20", "21", "22", "23", "24"},
+ {""},
+ {"4", "5", "6"},
+ {"1", "2", "3"},
+ {"20", "21", "22"},
+ {""},
+ {""},
+ {"3", "4", "5", "26", "27"},
+ {"1", "2", "3", "4", "5", "6", "7"},
+ {""},
+ {""}
+ };
+
+ private static final String[][] DEFERRED = {
+ {"4"},
+ {"15", "16", "17", "25", "26", "27", "28"},
+ {""},
+ {""},
+ {""},
+ {""},
+ {""},
+ {""},
+ {"6", "28", "29", "30"},
+ {"8", "9", "10"},
+ {""},
+ {""}
+ };
+
+ private static final String SOLAR_TERM[][] = {
+ {"小寒", "大寒"},
+ {"立春", "雨水"},
+ {"惊蛰", "春分"},
+ {"清明", "谷雨"},
+ {"立夏", "小满"},
+ {"芒种", "夏至"},
+ {"小暑", "大暑"},
+ {"立秋", "处暑"},
+ {"白露", "秋分"},
+ {"寒露", "霜降"},
+ {"立冬", "小雪"},
+ {"大雪", "冬至"}
+ };
+
+ private final HashMap CACHE_SOLAR_TERM = new HashMap<>();
+
+ private SolarTerm mSolarTerm = new SolarTerm();
+
+ private class G {
+ int d;
+ int m;
+ int y;
+ }
+
+ private class L {
+ int d;
+ int m;
+ int y;
+
+ boolean isLeap;
+ }
+
+ @Override
+ public String[][] buildMonthFestival(int year, int month) {
+ return buildMonthL(year, month);
+ }
+
+ @Override
+ public Set buildMonthHoliday(int year, int month) {
+ Set tmp = new HashSet<>();
+ if (year == 2015) {
+ Collections.addAll(tmp, HOLIDAY[month - 1]);
}
-
- private class L {
- int d;
- int m;
- int y;
-
- boolean isLeap;
+ return tmp;
+ }
+
+ private String[][] buildMonthL(int year, int month) {
+ String[][] gregorianMonth = buildMonthG(year, month);
+ G g = new G();
+ String tmp[][] = new String[6][7];
+ for (int i = 0; i < tmp.length; i++) {
+ for (int j = 0; j < tmp[0].length; j++) {
+ tmp[i][j] = "";
+ if (!TextUtils.isEmpty(gregorianMonth[i][j])) {
+ g.y = year;
+ g.m = month;
+ g.d = Integer.valueOf(gregorianMonth[i][j]);
+ L l = null;
+ String result = "";
+ if (year >= 1900 && year <= 2100) {
+ l = GTL(g);
+ result = getFestivalL(l.m, l.d);
+ }
+ if (TextUtils.isEmpty(result)) {
+ result = getFestivalG(g.m, g.d);
+ if (TextUtils.isEmpty(result)) {
+ result = getSolarTerm(year, month, g.d);
+ if (null != l && TextUtils.isEmpty(result)) {
+ char[] c = String.valueOf(l.d).toCharArray();
+ tmp[i][j] = lNumToStr(c);
+ } else {
+ tmp[i][j] = result;
+ }
+ } else {
+ tmp[i][j] = result + "F";
+ }
+ } else {
+ tmp[i][j] = result + "F";
+ }
+ }
+ }
}
-
- @Override
- public String[][] buildMonthFestival(int year, int month) {
- return buildMonthL(year, month);
+ return tmp;
+ }
+
+ /**
+ * 判断某年某月某日是否为节气
+ *
+ * @param year 公历年
+ * @param month 公历月
+ * @param day 公历日
+ * @return ...
+ */
+ public boolean isSolarTerm(int year, int month, int day) {
+ return null == getSolarTerm(year, month, day);
+ }
+
+ /**
+ * 判断某月某日是否为补休
+ *
+ * @param year 公历年
+ * @param month 公历月
+ * @param day 公历日
+ * @return ...
+ */
+ public boolean isDeferred(int year, int month, int day) {
+ if (year == 2015) {
+ String[] deferredOfMonth = DEFERRED[month - 1];
+ for (String s : deferredOfMonth) {
+ if (!TextUtils.isEmpty(s) && Integer.valueOf(s) == day) return true;
+ }
}
-
- @Override
- public Set buildMonthHoliday(int year, int month) {
- Set tmp = new HashSet<>();
- if (year == 2015) {
- Collections.addAll(tmp, HOLIDAY[month - 1]);
- }
- return tmp;
+ return false;
+ }
+
+ private String getSolarTerm(int year, int month, int day) {
+ String[][] tmp = CACHE_SOLAR_TERM.get(year);
+ if (null == tmp) {
+ tmp = mSolarTerm.buildSolarTerm(year);
+ CACHE_SOLAR_TERM.put(year, tmp);
}
-
- private String[][] buildMonthL(int year, int month) {
- String[][] gregorianMonth = buildMonthG(year, month);
- G g = new G();
- String tmp[][] = new String[6][7];
- for (int i = 0; i < tmp.length; i++) {
- for (int j = 0; j < tmp[0].length; j++) {
- tmp[i][j] = "";
- if (!TextUtils.isEmpty(gregorianMonth[i][j])) {
- g.y = year;
- g.m = month;
- g.d = Integer.valueOf(gregorianMonth[i][j]);
- L l = null;
- String result = "";
- if (year >= 1900 && year <= 2100) {
- l = GTL(g);
- result = getFestivalL(l.m, l.d);
- }
- if (TextUtils.isEmpty(result)) {
- result = getFestivalG(g.m, g.d);
- if (TextUtils.isEmpty(result)) {
- result = getSolarTerm(year, month, g.d);
- if (null != l && TextUtils.isEmpty(result)) {
- char[] c = String.valueOf(l.d).toCharArray();
- tmp[i][j] = lNumToStr(c);
- } else {
- tmp[i][j] = result;
- }
- } else {
- tmp[i][j] = result + "F";
- }
- } else {
- tmp[i][j] = result + "F";
- }
- }
- }
- }
- return tmp;
+ String[] STOfMonth = tmp[month - 1];
+ if (Integer.valueOf(STOfMonth[0]) == day) {
+ return SOLAR_TERM[month - 1][0];
+ } else if (Integer.valueOf(STOfMonth[1]) == day) {
+ return SOLAR_TERM[month - 1][1];
}
-
- /**
- * 判断某年某月某日是否为节气
- *
- * @param year 公历年
- * @param month 公历月
- * @param day 公历日
- * @return ...
- */
- public boolean isSolarTerm(int year, int month, int day) {
- return null == getSolarTerm(year, month, day);
+ return "";
+ }
+
+ private String getFestivalL(int month, int day) {
+ String tmp = "";
+ int[] daysInMonth = FESTIVAL_L_DATE[month - 1];
+ for (int i = 0; i < daysInMonth.length; i++) {
+ if (day == daysInMonth[i]) {
+ tmp = FESTIVAL_L[month - 1][i];
+ }
}
-
- /**
- * 判断某月某日是否为补休
- *
- * @param year 公历年
- * @param month 公历月
- * @param day 公历日
- * @return ...
- */
- public boolean isDeferred(int year, int month, int day) {
- if (year == 2015) {
- String[] deferredOfMonth = DEFERRED[month - 1];
- for (String s : deferredOfMonth) {
- if (!TextUtils.isEmpty(s) && Integer.valueOf(s) == day) return true;
- }
- }
- return false;
+ return tmp;
+ }
+
+ private String getFestivalG(int month, int day) {
+ String tmp = "";
+ int[] daysInMonth = FESTIVAL_G_DATE[month - 1];
+ for (int i = 0; i < daysInMonth.length; i++) {
+ if (day == daysInMonth[i]) {
+ tmp = FESTIVAL_G[month - 1][i];
+ }
}
-
- private String getSolarTerm(int year, int month, int day) {
- String[][] tmp = CACHE_SOLAR_TERM.get(year);
- if (null == tmp) {
- tmp = mSolarTerm.buildSolarTerm(year);
- CACHE_SOLAR_TERM.put(year, tmp);
- }
- String[] STOfMonth = tmp[month - 1];
- if (Integer.valueOf(STOfMonth[0]) == day) {
- return SOLAR_TERM[month - 1][0];
- } else if (Integer.valueOf(STOfMonth[1]) == day) {
- return SOLAR_TERM[month - 1][1];
- }
- return "";
+ return tmp;
+ }
+
+ private L GTL(G g) {
+ int index = g.y - DAYS_AND_LEAP_MONTH_OF_LUNAR[0];
+ int data = (g.y << 9) | (g.m << 5) | (g.d);
+ int lunarFirstDayInGregorian;
+ if (DAYS_AND_LEAP_MONTH_OF_LUNAR[index] > data) {
+ index--;
}
-
- private String getFestivalL(int month, int day) {
- String tmp = "";
- int[] daysInMonth = FESTIVAL_L_DATE[month - 1];
- for (int i = 0; i < daysInMonth.length; i++) {
- if (day == daysInMonth[i]) {
- tmp = FESTIVAL_L[month - 1][i];
- }
- }
- return tmp;
+ lunarFirstDayInGregorian = DAYS_AND_LEAP_MONTH_OF_LUNAR[index];
+
+ int y = getBitInt(lunarFirstDayInGregorian, 12, 9);
+ int m = getBitInt(lunarFirstDayInGregorian, 4, 5);
+ int d = getBitInt(lunarFirstDayInGregorian, 5, 0);
+
+ long offset = GToNum(g.y, g.m, g.d) - GToNum(y, m, d);
+ int days = FIRST_DAY_OF_LUNAR_IN_GREGORIAN[index];
+ int leap = getBitInt(days, 4, 13);
+
+ int lunarY = index + DAYS_AND_LEAP_MONTH_OF_LUNAR[0];
+ int lunarM = 1;
+ int lunarD;
+ offset += 1;
+
+ for (int i = 0; i < 13; i++) {
+ int dm = getBitInt(days, 1, 12 - i) == 1 ? 30 : 29;
+ if (offset > dm) {
+ lunarM++;
+ offset -= dm;
+ } else {
+ break;
+ }
}
-
- private String getFestivalG(int month, int day) {
- String tmp = "";
- int[] daysInMonth = FESTIVAL_G_DATE[month - 1];
- for (int i = 0; i < daysInMonth.length; i++) {
- if (day == daysInMonth[i]) {
- tmp = FESTIVAL_G[month - 1][i];
- }
- }
- return tmp;
+ lunarD = (int) (offset);
+ L l = new L();
+ l.y = lunarY;
+ l.m = lunarM;
+ l.isLeap = false;
+ if (leap != 0 && lunarM > leap) {
+ l.m = lunarM - 1;
+ if (lunarM == leap + 1) {
+ l.isLeap = true;
+ }
}
-
- private L GTL(G g) {
- int index = g.y - DAYS_AND_LEAP_MONTH_OF_LUNAR[0];
- int data = (g.y << 9) | (g.m << 5) | (g.d);
- int lunarFirstDayInGregorian;
- if (DAYS_AND_LEAP_MONTH_OF_LUNAR[index] > data) {
- index--;
+ l.d = lunarD;
+ return l;
+ }
+
+ private String lNumToStr(char[] c) {
+ StringBuilder result = new StringBuilder();
+ if (c.length == 1) {
+ for (int i = 1; i < 10; i++) {
+ if (c[0] == String.valueOf(i).charAt(0)) {
+ result.setLength(0);
+ result.append(LUNAR_HEADER[0] + NUMBER_CAPITAL[i]);
}
- lunarFirstDayInGregorian = DAYS_AND_LEAP_MONTH_OF_LUNAR[index];
-
- int y = getBitInt(lunarFirstDayInGregorian, 12, 9);
- int m = getBitInt(lunarFirstDayInGregorian, 4, 5);
- int d = getBitInt(lunarFirstDayInGregorian, 5, 0);
-
- long offset = GToNum(g.y, g.m, g.d) - GToNum(y, m, d);
- int days = FIRST_DAY_OF_LUNAR_IN_GREGORIAN[index];
- int leap = getBitInt(days, 4, 13);
-
- int lunarY = index + DAYS_AND_LEAP_MONTH_OF_LUNAR[0];
- int lunarM = 1;
- int lunarD;
- offset += 1;
-
- for (int i = 0; i < 13; i++) {
- int dm = getBitInt(days, 1, 12 - i) == 1 ? 30 : 29;
- if (offset > dm) {
- lunarM++;
- offset -= dm;
- } else {
- break;
+ }
+ } else {
+ if (c[0] == '1') {
+ if (c[1] == '0') {
+ result.setLength(0);
+ result.append(LUNAR_HEADER[0] + LUNAR_HEADER[1]);
+ } else {
+ for (int i = 1; i < 10; i++) {
+ if (c[1] == String.valueOf(i).charAt(0)) {
+ result.setLength(0);
+ result.append(LUNAR_HEADER[1] + NUMBER_CAPITAL[i]);
}
+ }
}
- lunarD = (int) (offset);
- L l = new L();
- l.y = lunarY;
- l.m = lunarM;
- l.isLeap = false;
- if (leap != 0 && lunarM > leap) {
- l.m = lunarM - 1;
- if (lunarM == leap + 1) {
- l.isLeap = true;
+ } else if (c[0] == '2') {
+ if (c[1] == '0') {
+ result.append(LUNAR_HEADER[2] + LUNAR_HEADER[1]);
+ } else {
+ for (int i = 1; i < 10; i++) {
+ if (c[1] == String.valueOf(i).charAt(0)) {
+ result.append(LUNAR_HEADER[2] + NUMBER_CAPITAL[i]);
}
+ }
}
- l.d = lunarD;
- return l;
- }
-
- private String lNumToStr(char[] c) {
- String result = "";
- if (c.length == 1) {
- for (int i = 1; i < 10; i++) {
- if (c[0] == String.valueOf(i).charAt(0)) {
- result = LUNAR_HEADER[0] + NUMBER_CAPITAL[i];
- }
- }
+ } else {
+ if (c[1] == '0') {
+ result.append(LUNAR_HEADER[3] + LUNAR_HEADER[1]);
} else {
- if (c[0] == '1') {
- if (c[1] == '0') {
- result = LUNAR_HEADER[0] + LUNAR_HEADER[1];
- } else {
- for (int i = 1; i < 10; i++) {
- if (c[1] == String.valueOf(i).charAt(0)) {
- result = LUNAR_HEADER[1] + NUMBER_CAPITAL[i];
- }
- }
- }
- } else if (c[0] == '2') {
- if (c[1] == '0') {
- result = LUNAR_HEADER[2] + LUNAR_HEADER[1];
- } else {
- for (int i = 1; i < 10; i++) {
- if (c[1] == String.valueOf(i).charAt(0)) {
- result = LUNAR_HEADER[2] + NUMBER_CAPITAL[i];
- }
- }
- }
- } else {
- if (c[1] == '0') {
- result = LUNAR_HEADER[3] + LUNAR_HEADER[1];
- } else {
- for (int i = 1; i < 10; i++) {
- if (c[1] == String.valueOf(i).charAt(0)) {
- result = LUNAR_HEADER[3] + NUMBER_CAPITAL[i];
- }
- }
- }
+ for (int i = 1; i < 10; i++) {
+ if (c[1] == String.valueOf(i).charAt(0)) {
+ result.append(LUNAR_HEADER[3] + NUMBER_CAPITAL[i]);
}
+ }
}
- return result;
+ }
}
+ return result.toString();
+ }
}
diff --git a/Demo/src/main/java/cn/aigestudio/datepicker/demo/MainActivity.java b/Demo/src/main/java/cn/aigestudio/datepicker/demo/MainActivity.java
index a6354c6..1f93f96 100644
--- a/Demo/src/main/java/cn/aigestudio/datepicker/demo/MainActivity.java
+++ b/Demo/src/main/java/cn/aigestudio/datepicker/demo/MainActivity.java
@@ -14,181 +14,134 @@
import android.view.WindowManager;
import android.widget.Button;
import android.widget.Toast;
-
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
import cn.aigestudio.datepicker.bizs.calendars.DPCManager;
import cn.aigestudio.datepicker.bizs.decors.DPDecor;
import cn.aigestudio.datepicker.cons.DPMode;
import cn.aigestudio.datepicker.views.DatePicker;
+import java.util.ArrayList;
+import java.util.List;
/**
- * Demo应用的主Activity
- * The main activity of demo
+ * Demo应用的主Activity The main activity of demo
*
* @author AigeStudio 2015-03-26
*/
public class MainActivity extends Activity {
- @Override
- protected void onCreate(Bundle savedInstanceState) {
- super.onCreate(savedInstanceState);
- requestWindowFeature(Window.FEATURE_NO_TITLE);
- getWindow().setFlags(WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
- setContentView(R.layout.activity_main);
-
-// // 默认多选模式
-// DatePicker picker = (DatePicker) findViewById(R.id.main_dp);
-// picker.setDate(2015, 7);
-// picker.setOnDateSelectedListener(new DatePicker.OnDateSelectedListener() {
-// @Override
-// public void onDateSelected(List date) {
-// String result = "";
-// Iterator iterator = date.iterator();
-// while (iterator.hasNext()) {
-// result += iterator.next();
-// if (iterator.hasNext()) {
-// result += "\n";
-// }
-// }
-// Toast.makeText(MainActivity.this, result, Toast.LENGTH_LONG).show();
-// }
-// });
+ @Override
+ protected void onCreate(Bundle savedInstanceState) {
+ super.onCreate(savedInstanceState);
+ requestWindowFeature(Window.FEATURE_NO_TITLE);
+ getWindow()
+ .setFlags(
+ WindowManager.LayoutParams.FLAG_FULLSCREEN, WindowManager.LayoutParams.FLAG_FULLSCREEN);
+ setContentView(R.layout.activity_main);
- // 自定义背景绘制示例 Example of custom date's background
-// List tmp = new ArrayList<>();
-// tmp.add("2015-7-1");
-// tmp.add("2015-7-8");
-// tmp.add("2015-7-16");
-// DPCManager.getInstance().setDecorBG(tmp);
-//
-// DatePicker picker = (DatePicker) findViewById(R.id.main_dp);
-// picker.setDate(2015, 7);
-// picker.setDPDecor(new DPDecor() {
-// @Override
-// public void drawDecorBG(Canvas canvas, Rect rect, Paint paint) {
-// paint.setColor(Color.RED);
-// canvas.drawCircle(rect.centerX(), rect.centerY(), rect.width() / 2F, paint);
-// }
-// });
-// picker.setOnDateSelectedListener(new DatePicker.OnDateSelectedListener() {
-// @Override
-// public void onDateSelected(List date) {
-// String result = "";
-// Iterator iterator = date.iterator();
-// while (iterator.hasNext()) {
-// result += iterator.next();
-// if (iterator.hasNext()) {
-// result += "\n";
-// }
-// }
-// Toast.makeText(MainActivity.this, result, Toast.LENGTH_LONG).show();
-// }
-// });
+ // 自定义前景装饰物绘制示例 Example of custom date's foreground decor
+ List tmpTL = new ArrayList<>();
+ tmpTL.add("2015-10-5");
+ tmpTL.add("2015-10-6");
+ tmpTL.add("2015-10-7");
+ tmpTL.add("2015-10-8");
+ tmpTL.add("2015-10-9");
+ tmpTL.add("2015-10-10");
+ tmpTL.add("2015-10-11");
+ DPCManager.getInstance().setDecorTL(tmpTL);
- // 自定义前景装饰物绘制示例 Example of custom date's foreground decor
- List tmpTL = new ArrayList<>();
- tmpTL.add("2015-10-5");
- tmpTL.add("2015-10-6");
- tmpTL.add("2015-10-7");
- tmpTL.add("2015-10-8");
- tmpTL.add("2015-10-9");
- tmpTL.add("2015-10-10");
- tmpTL.add("2015-10-11");
- DPCManager.getInstance().setDecorTL(tmpTL);
+ List tmpTR = new ArrayList<>();
+ tmpTR.add("2015-10-10");
+ tmpTR.add("2015-10-11");
+ tmpTR.add("2015-10-12");
+ tmpTR.add("2015-10-13");
+ tmpTR.add("2015-10-14");
+ tmpTR.add("2015-10-15");
+ tmpTR.add("2015-10-16");
+ DPCManager.getInstance().setDecorTR(tmpTR);
- List tmpTR = new ArrayList<>();
- tmpTR.add("2015-10-10");
- tmpTR.add("2015-10-11");
- tmpTR.add("2015-10-12");
- tmpTR.add("2015-10-13");
- tmpTR.add("2015-10-14");
- tmpTR.add("2015-10-15");
- tmpTR.add("2015-10-16");
- DPCManager.getInstance().setDecorTR(tmpTR);
-
- DatePicker picker = (DatePicker) findViewById(R.id.main_dp);
- picker.setDate(2015, 10);
- picker.setFestivalDisplay(false);
- picker.setTodayDisplay(false);
- picker.setHolidayDisplay(false);
- picker.setDeferredDisplay(false);
- picker.setMode(DPMode.NONE);
- picker.setDPDecor(new DPDecor() {
- @Override
- public void drawDecorTL(Canvas canvas, Rect rect, Paint paint, String data) {
- super.drawDecorTL(canvas, rect, paint, data);
- switch (data) {
- case "2015-10-5":
- case "2015-10-7":
- case "2015-10-9":
- case "2015-10-11":
- paint.setColor(Color.GREEN);
- canvas.drawRect(rect, paint);
- break;
- default:
- paint.setColor(Color.RED);
- canvas.drawCircle(rect.centerX(), rect.centerY(), rect.width() / 2, paint);
- break;
- }
+ DatePicker picker = (DatePicker) findViewById(R.id.main_dp);
+ picker.setDate(2015, 10);
+ picker.setFestivalDisplay(false);
+ picker.setTodayDisplay(false);
+ picker.setHolidayDisplay(false);
+ picker.setDeferredDisplay(false);
+ picker.setMode(DPMode.NONE);
+ picker.setDPDecor(
+ new DPDecor() {
+ @Override
+ public void drawDecorTL(Canvas canvas, Rect rect, Paint paint, String data) {
+ super.drawDecorTL(canvas, rect, paint, data);
+ switch (data) {
+ case "2015-10-5":
+ case "2015-10-7":
+ case "2015-10-9":
+ case "2015-10-11":
+ paint.setColor(Color.GREEN);
+ canvas.drawRect(rect, paint);
+ break;
+ default:
+ paint.setColor(Color.RED);
+ canvas.drawCircle(rect.centerX(), rect.centerY(), rect.width() / 2, paint);
+ break;
}
+ }
- @Override
- public void drawDecorTR(Canvas canvas, Rect rect, Paint paint, String data) {
- super.drawDecorTR(canvas, rect, paint, data);
- switch (data) {
- case "2015-10-10":
- case "2015-10-11":
- case "2015-10-12":
- paint.setColor(Color.BLUE);
- canvas.drawCircle(rect.centerX(), rect.centerY(), rect.width() / 2, paint);
- break;
- default:
- paint.setColor(Color.YELLOW);
- canvas.drawRect(rect, paint);
- break;
- }
+ @Override
+ public void drawDecorTR(Canvas canvas, Rect rect, Paint paint, String data) {
+ super.drawDecorTR(canvas, rect, paint, data);
+ switch (data) {
+ case "2015-10-10":
+ case "2015-10-11":
+ case "2015-10-12":
+ paint.setColor(Color.BLUE);
+ canvas.drawCircle(rect.centerX(), rect.centerY(), rect.width() / 2, paint);
+ break;
+ default:
+ paint.setColor(Color.YELLOW);
+ canvas.drawRect(rect, paint);
+ break;
}
+ }
});
-// picker.setOnDateSelectedListener(new DatePicker.OnDateSelectedListener() {
-// @Override
-// public void onDateSelected(List date) {
-// String result = "";
-// Iterator iterator = date.iterator();
-// while (iterator.hasNext()) {
-// result += iterator.next();
-// if (iterator.hasNext()) {
-// result += "\n";
-// }
-// }
-// Toast.makeText(MainActivity.this, result, Toast.LENGTH_LONG).show();
-// }
-// });
+ // picker.setOnDateSelectedListener(new DatePicker.OnDateSelectedListener() {
+ // @Override
+ // public void onDateSelected(List date) {
+ // String result = "";
+ // Iterator iterator = date.iterator();
+ // while (iterator.hasNext()) {
+ // result += iterator.next();
+ // if (iterator.hasNext()) {
+ // result += "\n";
+ // }
+ // }
+ // Toast.makeText(MainActivity.this, result, Toast.LENGTH_LONG).show();
+ // }
+ // });
- // 对话框下的DatePicker示例 Example in dialog
- Button btnPick = (Button) findViewById(R.id.main_btn);
- btnPick.setOnClickListener(new View.OnClickListener() {
- @Override
- public void onClick(View v) {
- final AlertDialog dialog = new AlertDialog.Builder(MainActivity.this).create();
- dialog.show();
- DatePicker picker = new DatePicker(MainActivity.this);
- picker.setDate(2015, 10);
- picker.setMode(DPMode.SINGLE);
- picker.setOnDatePickedListener(new DatePicker.OnDatePickedListener() {
- @Override
- public void onDatePicked(String date) {
- Toast.makeText(MainActivity.this, date, Toast.LENGTH_LONG).show();
- dialog.dismiss();
- }
+ // 对话框下的DatePicker示例 Example in dialog
+ Button btnPick = (Button) findViewById(R.id.main_btn);
+ btnPick.setOnClickListener(
+ new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ final AlertDialog dialog = new AlertDialog.Builder(MainActivity.this).create();
+ dialog.show();
+ DatePicker picker = new DatePicker(MainActivity.this);
+ picker.setDate(2015, 10);
+ picker.setMode(DPMode.SINGLE);
+ picker.setOnDatePickedListener(
+ new DatePicker.OnDatePickedListener() {
+ @Override
+ public void onDatePicked(String date) {
+ Toast.makeText(MainActivity.this, date, Toast.LENGTH_LONG).show();
+ dialog.dismiss();
+ }
});
- ViewGroup.LayoutParams params = new ViewGroup.LayoutParams(
- ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
- dialog.getWindow().setContentView(picker, params);
- dialog.getWindow().setGravity(Gravity.CENTER);
- }
+ ViewGroup.LayoutParams params =
+ new ViewGroup.LayoutParams(
+ ViewGroup.LayoutParams.MATCH_PARENT, ViewGroup.LayoutParams.WRAP_CONTENT);
+ dialog.getWindow().setContentView(picker, params);
+ dialog.getWindow().setGravity(Gravity.CENTER);
+ }
});
- }
+ }
}