widget 中的calender属性加上sobot

sobot_widget/src/main/java/com/sobot/widget/ui/calenderview/CustomWeekBar.java

@@ -49,7 +49,7 @@ public class CustomWeekBar extends WeekBar {
      * @return 或者周文本
      */
     private String getWeekString(int index, int weekStart) {
-        String[] weeks = getContext().getResources().getStringArray(R.array.week_string_array);
+        String[] weeks = getContext().getResources().getStringArray(R.array.sobot_week_string_array);
 
         if (weekStart == 1) {
             return weeks[index];

sobot_widget/src/main/java/com/sobot/widget/ui/calenderview/DefaultYearView.java

@@ -39,7 +39,7 @@ public class DefaultYearView extends YearView {
 
         String text = getContext()
                 .getResources()
-                .getStringArray(R.array.month_string_array)[month - 1];
+                .getStringArray(R.array.sobot_month_string_array)[month - 1];
 
         canvas.drawText(text,
                 x + mItemWidth / 2 - mTextPadding,
@@ -50,7 +50,7 @@ public class DefaultYearView extends YearView {
     @SuppressWarnings("IntegerDivisionInFloatingPointContext")
     @Override
     protected void onDrawWeek(Canvas canvas, int week, int x, int y, int width, int height) {
-        String text = getContext().getResources().getStringArray(R.array.year_view_week_string_array)[week];
+        String text = getContext().getResources().getStringArray(R.array.sobot_year_view_week_string_array)[week];
         canvas.drawText(text,
                 x + width / 2,
                 y + mWeekTextBaseLine,

sobot_widget/src/main/java/com/sobot/widget/ui/calenderview/LunarCalendar.java

@@ -37,11 +37,11 @@ public final class LunarCalendar {
         }
         TrunkBranchAnnals.init(context);
         SolarTermUtil.init(context);
-        MONTH_STR = context.getResources().getStringArray(R.array.lunar_first_of_month);
-        TRADITION_FESTIVAL_STR = context.getResources().getStringArray(R.array.tradition_festival);
-        DAY_STR = context.getResources().getStringArray(R.array.lunar_str);
-        SPECIAL_FESTIVAL_STR = context.getResources().getStringArray(R.array.special_festivals);
-        SOLAR_CALENDAR = context.getResources().getStringArray(R.array.solar_festival);
+        MONTH_STR = context.getResources().getStringArray(R.array.sobot_lunar_first_of_month);
+        TRADITION_FESTIVAL_STR = context.getResources().getStringArray(R.array.sobot_tradition_festival);
+        DAY_STR = context.getResources().getStringArray(R.array.sobot_lunar_str);
+        SPECIAL_FESTIVAL_STR = context.getResources().getStringArray(R.array.sobot_special_festivals);
+        SOLAR_CALENDAR = context.getResources().getStringArray(R.array.sobot_solar_festival);
     }
 
     /**

sobot_widget/src/main/java/com/sobot/widget/ui/calenderview/SolarTermUtil.java

@@ -28,7 +28,7 @@ public final class SolarTermUtil {
 
 
     static void init(Context context) {
-        SOLAR_TERMS = context.getResources().getStringArray(R.array.solar_term);
+        SOLAR_TERMS = context.getResources().getStringArray(R.array.sobot_solar_term);
     }
 
     /**

sobot_widget/src/main/java/com/sobot/widget/ui/calenderview/TrunkBranchAnnals.java

@@ -28,8 +28,8 @@ public final class TrunkBranchAnnals {
         if (TRUNK_STR != null) {
             return;
         }
-        TRUNK_STR = context.getResources().getStringArray(R.array.trunk_string_array);
-        BRANCH_STR = context.getResources().getStringArray(R.array.branch_string_array);
+        TRUNK_STR = context.getResources().getStringArray(R.array.sobot_trunk_string_array);
+        BRANCH_STR = context.getResources().getStringArray(R.array.sobot_branch_string_array);
 
     }
 

sobot_widget/src/main/java/com/sobot/widget/ui/calenderview/WeekBar.java

@@ -127,7 +127,7 @@ public class WeekBar extends LinearLayout {
      * @return 或者周文本
      */
     private String getWeekString(int index, int weekStart) {
-        String[] weeks = getContext().getResources().getStringArray(R.array.week_string_array);
+        String[] weeks = getContext().getResources().getStringArray(R.array.sobot_week_string_array);
 
         if (weekStart == CalendarViewDelegate.WEEK_START_WITH_SUN) {
             return weeks[index];

sobot_widget/src/main/res/layout/sobot_custom_week_bar.xml

@@ -16,7 +16,7 @@
         android:layout_height="match_parent"
         android:layout_weight="1"
         android:gravity="center"
-        android:text="@string/sun"
+        android:text="@string/sobot_sun"
         android:textColor="@color/sobot_common_gray1"
         android:textSize="12sp" />
 
@@ -25,7 +25,7 @@
         android:layout_height="match_parent"
         android:layout_weight="1"
         android:gravity="center"
-        android:text="@string/mon"
+        android:text="@string/sobot_mon"
         android:textColor="@color/sobot_common_gray1"
         android:textSize="12sp" />
 
@@ -34,7 +34,7 @@
         android:layout_height="match_parent"
         android:layout_weight="1"
         android:gravity="center"
-        android:text="@string/tue"
+        android:text="@string/sobot_tue"
         android:textColor="@color/sobot_common_gray1"
         android:textSize="12sp" />
 
@@ -43,7 +43,7 @@
         android:layout_height="match_parent"
         android:layout_weight="1"
         android:gravity="center"
-        android:text="@string/wed"
+        android:text="@string/sobot_wed"
         android:textColor="@color/sobot_common_gray1"
         android:textSize="12sp" />
 
@@ -52,7 +52,7 @@
         android:layout_height="match_parent"
         android:layout_weight="1"
         android:gravity="center"
-        android:text="@string/thu"
+        android:text="@string/sobot_thu"
         android:textColor="@color/sobot_common_gray1"
         android:textSize="12sp" />
 
@@ -61,7 +61,7 @@
         android:layout_height="match_parent"
         android:layout_weight="1"
         android:gravity="center"
-        android:text="@string/fri"
+        android:text="@string/sobot_fri"
         android:textColor="@color/sobot_common_gray1"
         android:textSize="12sp" />
 
@@ -70,7 +70,7 @@
         android:layout_height="match_parent"
         android:layout_weight="1"
         android:gravity="center"
-        android:text="@string/sat"
+        android:text="@string/sobot_sat"
         android:textColor="@color/sobot_common_gray1"
         android:textSize="12sp" />
 </merge>
\ No newline at end of file

sobot_widget/src/main/res/layout/sobot_week_bar.xml

@@ -16,7 +16,7 @@
         android:layout_height="match_parent"
         android:layout_weight="1"
         android:gravity="center"
-        android:text="@string/sun"
+        android:text="@string/sobot_sun"
         android:textColor="#333333"
         android:textSize="12sp" />
 
@@ -25,7 +25,7 @@
         android:layout_height="match_parent"
         android:layout_weight="1"
         android:gravity="center"
-        android:text="@string/mon"
+        android:text="@string/sobot_mon"
         android:textColor="#333333"
         android:textSize="12sp" />
 
@@ -34,7 +34,7 @@
         android:layout_height="match_parent"
         android:layout_weight="1"
         android:gravity="center"
-        android:text="@string/tue"
+        android:text="@string/sobot_tue"
         android:textColor="#333333"
         android:textSize="12sp" />
 
@@ -43,7 +43,7 @@
         android:layout_height="match_parent"
         android:layout_weight="1"
         android:gravity="center"
-        android:text="@string/wed"
+        android:text="@string/sobot_wed"
         android:textSize="12sp" />
 
     <TextView
@@ -51,7 +51,7 @@
         android:layout_height="match_parent"
         android:layout_weight="1"
         android:gravity="center"
-        android:text="@string/thu"
+        android:text="@string/sobot_thu"
         android:textColor="#333333"
         android:textSize="12sp" />
 
@@ -60,7 +60,7 @@
         android:layout_height="match_parent"
         android:layout_weight="1"
         android:gravity="center"
-        android:text="@string/fri"
+        android:text="@string/sobot_fri"
         android:textColor="#333333"
         android:textSize="12sp" />
 
@@ -69,7 +69,7 @@
         android:layout_height="match_parent"
         android:layout_weight="1"
         android:gravity="center"
-        android:text="@string/sat"
+        android:text="@string/sobot_sat"
         android:textColor="#333333"
         android:textSize="12sp" />
 </merge>
\ No newline at end of file

sobot_widget/src/main/res/values-en/strings_calender.xml

 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
-    <string-array name="lunar_first_of_month">
+    <string-array name="sobot_lunar_first_of_month">
         <item>春节</item>
         <item>二月</item>
         <item>三月</item>
@@ -15,7 +15,7 @@
         <item>腊月</item>
     </string-array>
 
-    <string-array name="tradition_festival">
+    <string-array name="sobot_tradition_festival">
         <item>除夕</item>
         <item>0101春节</item>
         <item>0115元宵</item>
@@ -25,7 +25,7 @@
         <item>0909重阳</item>
     </string-array>
 
-    <string-array name="lunar_str">
+    <string-array name="sobot_lunar_str">
         <item>初一</item>
         <item>初二</item>
         <item>初三</item>
@@ -58,7 +58,7 @@
         <item>三十</item>
     </string-array>
 
-    <string-array name="solar_festival" tools:ignore="InconsistentArrays">
+    <string-array name="sobot_solar_festival" tools:ignore="InconsistentArrays">
         <item>0101元旦</item>
         <item>0214情人节</item>
         <item>0308妇女节</item>
@@ -79,7 +79,7 @@
         <item>1225圣诞节</item>
     </string-array>
 
-    <string-array name="solar_term">
+    <string-array name="sobot_solar_term">
         <item>春分</item>
         <item>清明</item>
         <item>谷雨</item>
@@ -106,21 +106,21 @@
         <item>惊蛰</item>
     </string-array>
 
-    <string-array name="special_festivals">
+    <string-array name="sobot_special_festivals">
         <item>母亲节</item>
         <item>父亲节</item>
         <item>感恩节</item>
     </string-array>
 
-    <string name="sun">Sun</string>
-    <string name="mon">Mon</string>
-    <string name="tue">Tue</string>
-    <string name="wed">Wed</string>
-    <string name="thu">Thu</string>
-    <string name="fri">Fri</string>
-    <string name="sat">Sat</string>
+    <string name="sobot_sun">Sun</string>
+    <string name="sobot_mon">Mon</string>
+    <string name="sobot_tue">Tue</string>
+    <string name="sobot_wed">Wed</string>
+    <string name="sobot_thu">Thu</string>
+    <string name="sobot_fri">Fri</string>
+    <string name="sobot_sat">Sat</string>
 
-    <string-array name="week_string_array">
+    <string-array name="sobot_week_string_array">
         <item>Sun</item>
         <item>Mon</item>
         <item>Tue</item>
@@ -130,7 +130,7 @@
         <item>Sat</item>
     </string-array>
 
-    <string-array name="year_view_week_string_array">
+    <string-array name="sobot_year_view_week_string_array">
         <item>S</item>
         <item>M</item>
         <item>T</item>
@@ -140,7 +140,7 @@
         <item>S</item>
     </string-array>
 
-    <string-array name="month_string_array">
+    <string-array name="sobot_month_string_array">
         <item>JAN</item>
         <item>FEB</item>
         <item>MAR</item>
@@ -155,7 +155,7 @@
         <item>DEC</item>
     </string-array>
 
-    <integer-array name="trunk_integer_array">
+    <integer-array name="sobot_trunk_integer_array">
         <item>1</item>
         <item>2</item>
         <item>3</item>
@@ -169,7 +169,7 @@
 
     </integer-array>
 
-    <string-array name="trunk_string_array">
+    <string-array name="sobot_trunk_string_array">
         <item>辛</item>
         <item>壬</item>
         <item>癸</item>
@@ -182,7 +182,7 @@
         <item>庚</item>
     </string-array>
 
-    <integer-array name="branch_integer_array">
+    <integer-array name="sobot_branch_integer_array">
         <item>1</item>
         <item>2</item>
         <item>3</item>
@@ -197,7 +197,7 @@
         <item>12</item>
     </integer-array>
 
-    <string-array name="branch_string_array">
+    <string-array name="sobot_branch_string_array">
         <item>酉</item>
         <item>戌</item>
         <item>亥</item>

sobot_widget/src/main/res/values/strings_calender.xml

 <?xml version="1.0" encoding="utf-8"?>
 <resources xmlns:tools="http://schemas.android.com/tools">
-    <string-array name="lunar_first_of_month">
+    <string-array name="sobot_lunar_first_of_month">
         <item>春节</item>
         <item>二月</item>
         <item>三月</item>
@@ -15,7 +15,7 @@
         <item>腊月</item>
     </string-array>
 
-    <string-array name="tradition_festival">
+    <string-array name="sobot_tradition_festival">
         <item>除夕</item>
         <item>0101春节</item>
         <item>0115元宵</item>
@@ -25,7 +25,7 @@
         <item>0909重阳</item>
     </string-array>
 
-    <string-array name="lunar_str">
+    <string-array name="sobot_lunar_str">
         <item>初一</item>
         <item>初二</item>
         <item>初三</item>
@@ -58,7 +58,7 @@
         <item>三十</item>
     </string-array>
 
-    <string-array name="solar_festival" tools:ignore="InconsistentArrays">
+    <string-array name="sobot_solar_festival" tools:ignore="InconsistentArrays">
         <item>0101元旦</item>
         <item>0214情人节</item>
         <item>0308妇女节</item>
@@ -79,7 +79,7 @@
         <item>1225圣诞节</item>
     </string-array>
 
-    <string-array name="solar_term">
+    <string-array name="sobot_solar_term">
         <item>春分</item>
         <item>清明</item>
         <item>谷雨</item>
@@ -106,22 +106,22 @@
         <item>惊蛰</item>
     </string-array>
 
-    <string-array name="special_festivals">
+    <string-array name="sobot_special_festivals">
         <item>母亲节</item>
         <item>父亲节</item>
         <item>感恩节</item>
     </string-array>
 
-    <string name="sun">日</string>
-    <string name="mon">一</string>
-    <string name="tue">二</string>
-    <string name="wed">三</string>
-    <string name="thu">四</string>
-    <string name="fri">五</string>
-    <string name="sat">六</string>
+    <string name="sobot_sun">日</string>
+    <string name="sobot_mon">一</string>
+    <string name="sobot_tue">二</string>
+    <string name="sobot_wed">三</string>
+    <string name="sobot_thu">四</string>
+    <string name="sobot_fri">五</string>
+    <string name="sobot_sat">六</string>
 
 
-    <string-array name="week_string_array">
+    <string-array name="sobot_week_string_array">
         <item>周日</item>
         <item>周一</item>
         <item>周二</item>
@@ -131,7 +131,7 @@
         <item>周六</item>
     </string-array>
 
-    <string-array name="year_view_week_string_array">
+    <string-array name="sobot_year_view_week_string_array">
         <item>日</item>
         <item>一</item>
         <item>二</item>
@@ -141,7 +141,7 @@
         <item>六</item>
     </string-array>
 
-    <string-array name="month_string_array">
+    <string-array name="sobot_month_string_array">
         <item>1月</item>
         <item>2月</item>
         <item>3月</item>
@@ -156,7 +156,7 @@
         <item>12月</item>
     </string-array>
 
-    <integer-array name="trunk_integer_array">
+    <integer-array name="sobot_trunk_integer_array">
         <item>1</item>
         <item>2</item>
         <item>3</item>
@@ -170,7 +170,7 @@
 
     </integer-array>
 
-    <string-array name="trunk_string_array">
+    <string-array name="sobot_trunk_string_array">
         <item>辛</item>
         <item>壬</item>
         <item>癸</item>
@@ -183,7 +183,7 @@
         <item>庚</item>
     </string-array>
 
-    <integer-array name="branch_integer_array">
+    <integer-array name="sobot_branch_integer_array">
         <item>1</item>
         <item>2</item>
         <item>3</item>
@@ -198,7 +198,7 @@
         <item>12</item>
     </integer-array>
 
-    <string-array name="branch_string_array">
+    <string-array name="sobot_branch_string_array">
         <item>酉</item>
         <item>戌</item>
         <item>亥</item>