とりあえずカレンダーを表示した。第二弾。

diff --git a/app/src/main/java/net/osdn/gokigen/pkremote/calendar/CalendarFragment.java b/app/src/main/java/net/osdn/gokigen/pkremote/calendar/CalendarFragment.java
index 7bbf45b..c28761d 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/pkremote/calendar/CalendarFragment.java
+++ b/app/src/main/java/net/osdn/gokigen/pkremote/calendar/CalendarFragment.java
@@ -1,7 +1,6 @@
 package net.osdn.gokigen.pkremote.calendar;
 
 import android.app.Activity;
-import android.app.Dialog;
 import android.content.Context;
 import android.os.Bundle;
 import android.os.Vibrator;
@@ -29,10 +28,11 @@ import java.util.Locale;
 import androidx.annotation.NonNull;
 import androidx.appcompat.app.AppCompatActivity;
 import androidx.fragment.app.Fragment;
+import androidx.fragment.app.FragmentManager;
 
 import static android.content.Context.VIBRATOR_SERVICE;
 
-public class CalendarFragment extends Fragment  implements View.OnClickListener
+public class CalendarFragment extends Fragment  implements View.OnClickListener, TargetMonthSetDialog.Callback
 {
     private final String TAG = this.toString();
 
@@ -43,9 +43,9 @@ public class CalendarFragment extends Fragment  implements View.OnClickListener
 
     private Context context = null;
 
-    private int showYear = 2017;
-    private int showMonth = 11;
-    private int showDay = 11;
+//    private int showYear = 2017;
+//    private int showMonth = 11;
+//    private int showDay = 11;
 
     private int currentYear = 0;
     private int currentMonth = 0;
@@ -275,19 +275,13 @@ public class CalendarFragment extends Fragment  implements View.OnClickListener
             }
             else if (id == R.id.showDayYear)
             {
-                // 日付ピッカーを出したい。
+                // 年・月 ピッカーを出す
                 Log.v(TAG, "SELECT YEAR/MONTH LABEL.");
-                /*
-                Calendar calendar = Calendar.getInstance();
-                int year = calendar.get(Calendar.YEAR);
-                int month = calendar.get(Calendar.MONTH) + 1;
-                int day = calendar.get(Calendar.DAY_OF_MONTH);
-                decideDate(year, month, day);
-                */
+                pickYearMonth();
             }
             else
             {
-                // 日付を選択した処理
+                // 日付を選択した処理... 画面遷移
                 Log.v(TAG, "onClick : " + id);
             }
         }
@@ -297,6 +291,28 @@ public class CalendarFragment extends Fragment  implements View.OnClickListener
         }
     }
 
+    private void pickYearMonth()
+    {
+        try
+        {
+            TargetMonthSetDialog dialog2 = TargetMonthSetDialog.newInstance(getString(R.string.information_month_picker), currentYear, currentMonth, this);
+            FragmentManager manager = getFragmentManager();
+            if (manager != null)
+            {
+                dialog2.show(manager, "dialog2");
+            }
+            else
+            {
+                Log.v(TAG, "FragmentManager is NULL...");
+            }
+        }
+        catch (Exception e)
+        {
+            e.printStackTrace();
+        }
+    }
+
+
     /**
      *  月の動きボタンを移動させる
      *
@@ -363,6 +379,17 @@ public class CalendarFragment extends Fragment  implements View.OnClickListener
     {
         try
         {
+            if (currentMonth > 12)
+            {
+                currentMonth = 1;
+                currentYear++;
+            }
+            if (currentMonth < 1)
+            {
+                currentMonth = 12;
+                currentYear--;
+            }
+
             Calendar calendar = new GregorianCalendar();
             calendar.set(currentYear, currentMonth - 1, 1);
             int week = getStartCalendarIndex(calendar);
@@ -437,7 +464,6 @@ public class CalendarFragment extends Fragment  implements View.OnClickListener
         return (week);
     }
 
-
     /**
      *   カレンダーの設定
      *
@@ -540,10 +566,11 @@ public class CalendarFragment extends Fragment  implements View.OnClickListener
     }
 
 
-    /**
+    /*
      *   日時情報を設定する
      *
      */
+/*
     public void decideDate(int year, int month, int day)
     {
         showYear = year;
@@ -552,8 +579,9 @@ public class CalendarFragment extends Fragment  implements View.OnClickListener
 
         updateDateList();
     }
+*/
 
-    /**
+    /*
      *   一覧を指定した日付のものに更新する
      *
      */
@@ -573,6 +601,7 @@ public class CalendarFragment extends Fragment  implements View.OnClickListener
      *   一覧を今日の日付に更新する
      *
      */
+/*
     private void moveToToday()
     {
         Calendar calendar = Calendar.getInstance();
@@ -582,6 +611,7 @@ public class CalendarFragment extends Fragment  implements View.OnClickListener
 
         updateDateList();
     }
+*/
 
     /**
      *  一覧表示情報を更新する
@@ -593,4 +623,23 @@ public class CalendarFragment extends Fragment  implements View.OnClickListener
 
     }
 
-}
\ No newline at end of file
+    /**
+     *  年・月 ダイアログの結果を反映させる
+     *
+     */
+    @Override
+    public void dataSetYearMonth(int year, int month)
+    {
+        Log.v(TAG, "dataSetYearMonth : " + year + " / " + month);
+        currentYear = year;
+        currentMonth = month;
+
+        setCalendarLabels(myView);
+    }
+
+    @Override
+    public void dataSetCancelled()
+    {
+        Log.v(TAG, "dataSetCancelled");
+    }
+}

diff --git a/app/src/main/java/net/osdn/gokigen/pkremote/calendar/TargetMonthSetDialog.java b/app/src/main/java/net/osdn/gokigen/pkremote/calendar/TargetMonthSetDialog.java
new file mode 100644 (file)
index 0000000..b2a8fe5
--- /dev/null
+++ b/app/src/main/java/net/osdn/gokigen/pkremote/calendar/TargetMonthSetDialog.java
@@ -0,0 +1,176 @@
+package net.osdn.gokigen.pkremote.calendar;
+
+import android.app.Activity;
+import android.app.AlertDialog;
+import android.app.Dialog;
+import android.content.DialogInterface;
+import android.os.Bundle;
+import android.util.Log;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.NumberPicker;
+import android.widget.TextView;
+
+import net.osdn.gokigen.pkremote.R;
+
+import androidx.annotation.NonNull;
+import androidx.fragment.app.DialogFragment;
+
+/**
+ *    年と月を開くダイアログ
+ *
+ */
+public class TargetMonthSetDialog extends DialogFragment
+{
+    private final String TAG = toString();
+    private static final int YEAR_LIMIT_MIN = 2010;
+    private static final int YEAR_LIMIT_MAX = 2050;
+    private static final int MONTH_LIMIT_MIN = 1;
+    private static final int MONTH_LIMIT_MAX = 12;
+
+    private String title = "";
+    private int yearNum = 0;
+    private int monthNum = 0;
+    private Callback callback = null;
+    private Dialog myDialog = null;
+
+    /**
+     *
+     *
+     */
+    public static TargetMonthSetDialog newInstance(String title, int year, int month, Callback callback)
+    {
+        TargetMonthSetDialog instance = new TargetMonthSetDialog();
+        instance.prepare(title, year, month, callback);
+
+        // パラメータはBundleにまとめておく
+        Bundle arguments = new Bundle();
+        arguments.putString("title", title);
+        //arguments.putString("message", message);
+        instance.setArguments(arguments);
+
+        return (instance);
+    }
+
+    /**
+     *
+     *
+     */
+    private void prepare(String title, int yearNum, int monthNum, Callback callback)
+    {
+        this.title = title;
+        this.yearNum = yearNum;
+        this.monthNum = monthNum;
+        this.callback = callback;
+    }
+
+    /**
+     *
+     *
+     */
+    @Override
+    public @NonNull Dialog onCreateDialog(Bundle savedInstanceState)
+    {
+        Log.v(TAG, "show " +   yearNum + " / " + monthNum + " ");
+
+        Activity activity = getActivity();
+
+        // 確認ダイアログの生成
+        //final AlertDialog.Builder alertDialog = new AlertDialog.Builder(new ContextThemeWrapper(activity, R.style.wear2_dialog_theme));
+        final AlertDialog.Builder alertDialog = new AlertDialog.Builder(activity);
+
+        // Get the layout inflater
+        LayoutInflater inflater = activity.getLayoutInflater();
+        final View alertView = inflater.inflate(R.layout.target_month_picker, null, false);
+        alertDialog.setView(alertView);
+
+        final TextView titleText = alertView.findViewById(R.id.information_picker);
+        final NumberPicker month = alertView.findViewById(R.id.number_picker_month);
+        final NumberPicker year = alertView.findViewById(R.id.number_picker_year);
+
+        try
+        {
+            if (title != null)
+            {
+                titleText.setText(title);
+            }
+            month.setMinValue(MONTH_LIMIT_MIN);
+            month.setMaxValue(MONTH_LIMIT_MAX);
+            year.setMinValue(YEAR_LIMIT_MIN);
+            year.setMaxValue(YEAR_LIMIT_MAX);
+
+            month.setValue(monthNum);
+            year.setValue(yearNum);
+        }
+        catch (Exception e)
+        {
+            e.printStackTrace();
+        }
+
+        alertDialog.setCancelable(true);
+
+        // ボタンを設定する（実行ボタン）
+        alertDialog.setPositiveButton(activity.getString(R.string.dialog_positive_execute),
+                new DialogInterface.OnClickListener() {
+                    public void onClick(DialogInterface dialog, int which)
+                    {
+                        try
+                        {
+                            Log.v(TAG, "ENTRY [" + year.getValue() + " / " + month.getValue() + "] ");
+                            callback.dataSetYearMonth(year.getValue(), month.getValue());
+                        }
+                        catch (Exception e)
+                        {
+                            e.printStackTrace();
+                            callback.dataSetCancelled();
+                        }
+                        dialog.dismiss();
+                    }
+                });
+
+        // ボタンを設定する (キャンセルボタン）
+        alertDialog.setNegativeButton(activity.getString(R.string.dialog_negative_cancel),
+                new DialogInterface.OnClickListener() {
+                    public void onClick(DialogInterface dialog, int which)
+                    {
+                        try
+                        {
+                            callback.dataSetCancelled();
+                        }
+                        catch (Exception e)
+                        {
+                            e.printStackTrace();
+                        }
+                        dialog.cancel();
+                    }
+                });
+
+        myDialog = alertDialog.create();
+        return (myDialog);
+    }
+
+    /**
+     *
+     *
+     */
+    @Override
+    public void onPause()
+    {
+        super.onPause();
+        Log.v(TAG, "AlertDialog::onPause()");
+        if (myDialog != null)
+        {
+            myDialog.cancel();
+        }
+    }
+
+    /**
+     *  コールバックインタフェースの定義
+     *
+     */
+    public interface Callback
+    {
+        void dataSetYearMonth(int year, int month); // OKを選択したとき
+        void dataSetCancelled();  // キャンセルしたとき
+    }
+}

diff --git a/app/src/main/res/layout/fragment_calendar.xml b/app/src/main/res/layout/fragment_calendar.xml
index e4f3238..f28fe4a 100644 (file)
--- a/app/src/main/res/layout/fragment_calendar.xml
+++ b/app/src/main/res/layout/fragment_calendar.xml
@@ -1,1293 +1,1301 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
+<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/ScrollView"
     android:layout_height="match_parent"
+    android:layout_width="match_parent"
     android:layout_alignParentTop="true"
     android:layout_alignParentLeft="true"
-    android:layout_alignParentStart="true">
-    <LinearLayout
-        android:id="@+id/move_label"
-        android:orientation="horizontal"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        >
-        <ImageButton
-            android:id="@+id/showPreviousMonth"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:scaleType="fitCenter"
-            android:background="@xml/larrowbuttonstyle"
-            android:contentDescription="@string/button"
-            android:text="@string/blank"
-            android:visibility="visible">
-        </ImageButton>
-        <TextView
-            android:id="@+id/showDayYear"
-            android:textSize="10pt"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:layout_weight="8"
-            android:text="@string/blank"
-            />
-        <Button
-            android:id="@+id/todaySelectButton"
-            android:textSize="8pt"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:layout_weight="2"
-            android:text="@string/today">
-        </Button>
-        <ImageButton
-            android:id="@+id/showNextMonth"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:scaleType="fitCenter"
-            android:background="@xml/rarrowbuttonstyle"
-            android:contentDescription="@string/button"
-            android:text="@string/blank"
-            android:visibility="visible">
-        </ImageButton>
-    </LinearLayout>
+    android:layout_alignParentStart="true"
+    >
+    <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+        android:orientation="vertical"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content" >
+        <LinearLayout
+            android:id="@+id/move_label"
+            android:orientation="horizontal"
+            android:layout_width="fill_parent"
+            android:layout_height="fill_parent"
+            android:layout_weight="1"
+            >
+            <ImageButton
+                android:id="@+id/showPreviousMonth"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:layout_weight="1"
+                android:scaleType="fitCenter"
+                android:background="@xml/larrowbuttonstyle"
+                android:contentDescription="@string/button"
+                android:text="@string/blank"
+                android:visibility="visible">
+            </ImageButton>
 
-    <LinearLayout
-        android:id="@+id/week_label"
-        android:orientation="horizontal"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:background="@color/background_translucent_dark"
-        >
+            <TextView
+                android:id="@+id/showDayYear"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:layout_gravity="bottom"
+                android:layout_weight="8"
+                android:gravity="center_horizontal|center_vertical"
+                android:text="@string/blank"
+                android:textAlignment="center"
+                android:textSize="10pt" />
+            <Button
+                android:id="@+id/todaySelectButton"
+                android:textSize="8pt"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:layout_weight="2"
+                android:text="@string/now">
+            </Button>
+            <ImageButton
+                android:id="@+id/showNextMonth"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:layout_weight="1"
+                android:scaleType="fitCenter"
+                android:background="@xml/rarrowbuttonstyle"
+                android:contentDescription="@string/button"
+                android:text="@string/blank"
+                android:visibility="visible">
+            </ImageButton>
+        </LinearLayout>
 
-        <TextView
-            android:id="@+id/SundayLabel"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:adjustViewBounds = "true"
-            android:scaleType="fitCenter"
-            android:layout_gravity="center_horizontal"
-            android:gravity="center"
-            android:textSize="6pt"
-            android:text="@string/sundayLabel"
-            >
-        </TextView>
-        <TextView
-            android:id="@+id/MondayLabel"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:adjustViewBounds = "true"
-            android:scaleType="fitCenter"
-            android:layout_gravity="center_horizontal"
-            android:gravity="center"
-            android:text="@string/mondayLabel"
-            android:textSize="6pt"
-            >
-        </TextView>
-        <TextView
-            android:id="@+id/TuesdayLabel"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:adjustViewBounds = "true"
-            android:scaleType="fitCenter"
-            android:layout_gravity="center_horizontal"
-            android:gravity="center"
-            android:text="@string/tuesdayLabel"
-            android:textSize="6pt"
-            >
-        </TextView>
-        <TextView
-            android:id="@+id/WednesdayLabel"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:adjustViewBounds = "true"
-            android:scaleType="fitCenter"
-            android:layout_gravity="center_horizontal"
-            android:gravity="center"
-            android:text="@string/wednesdayLabel"
-            android:textSize="6pt"
-            >
-        </TextView>
-        <TextView
-            android:id="@+id/ThursdayLabel"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:adjustViewBounds = "true"
-            android:scaleType="fitCenter"
-            android:layout_gravity="center_horizontal"
-            android:gravity="center"
-            android:text="@string/thursdayLabel"
-            android:textSize="6pt"
-            >
-        </TextView>
-        <TextView
-            android:id="@+id/FridayLabel"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:adjustViewBounds = "true"
-            android:scaleType="fitCenter"
-            android:layout_gravity="center_horizontal"
-            android:gravity="center"
-            android:text="@string/fridayLabel"
-            android:textSize="6pt"
-            >
-        </TextView>
-        <TextView
-            android:id="@+id/SaturdayLabel"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
+        <LinearLayout
+            android:id="@+id/week_label"
+            android:orientation="horizontal"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:adjustViewBounds = "true"
-            android:scaleType="fitCenter"
-            android:layout_gravity="center_horizontal"
-            android:gravity="center"
-            android:text="@string/saturdayLabel"
-            android:textSize="7pt"
+            android:background="@color/background_translucent_dark"
             >
-    </TextView>
-    </LinearLayout>
 
-    <LinearLayout
-        android:id="@+id/week_one_row_label"
-        android:orientation="horizontal"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:background="@color/background_translucent_dark"
-        >
-
-        <TextView
-            android:id="@+id/DayLabel00"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:adjustViewBounds = "true"
-            android:scaleType="fitCenter"
-            android:layout_gravity="center_horizontal"
-            android:gravity="center"
-            android:textSize="8pt"
-            android:text="@string/dummy"
-            >
-        </TextView>
-        <TextView
-            android:id="@+id/DayLabel01"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:adjustViewBounds = "true"
-            android:scaleType="fitCenter"
-            android:layout_gravity="center_horizontal"
-            android:gravity="center"
-            android:text="@string/dummy"
-            android:textSize="8pt"
-            >
-        </TextView>
-        <TextView
-            android:id="@+id/DayLabel02"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:adjustViewBounds = "true"
-            android:scaleType="fitCenter"
-            android:layout_gravity="center_horizontal"
-            android:gravity="center"
-            android:text="@string/dummy"
-            android:textSize="8pt"
-            >
-        </TextView>
-        <TextView
-            android:id="@+id/DayLabel03"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:adjustViewBounds = "true"
-            android:scaleType="fitCenter"
-            android:layout_gravity="center_horizontal"
-            android:gravity="center"
-            android:text="@string/dummy"
-            android:textSize="8pt"
-            >
-        </TextView>
-        <TextView
-            android:id="@+id/DayLabel04"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:adjustViewBounds = "true"
-            android:scaleType="fitCenter"
-            android:layout_gravity="center_horizontal"
-            android:gravity="center"
-            android:text="@string/dummy"
-            android:textSize="8pt"
-            >
-        </TextView>
-        <TextView
-            android:id="@+id/DayLabel05"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:adjustViewBounds = "true"
-            android:scaleType="fitCenter"
-            android:layout_gravity="center_horizontal"
-            android:gravity="center"
-            android:text="@string/dummy"
-            android:textSize="8pt"
-            >
-        </TextView>
-        <TextView
-            android:id="@+id/DayLabel06"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:adjustViewBounds = "true"
-            android:scaleType="fitCenter"
-            android:layout_gravity="center_horizontal"
-            android:gravity="center"
-            android:text="@string/dummy"
-            android:textSize="8pt"
-            >
-        </TextView>
-    </LinearLayout>
+            <TextView
+                android:id="@+id/SundayLabel"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:layout_weight="1"
+                android:adjustViewBounds = "true"
+                android:scaleType="fitCenter"
+                android:layout_gravity="center_horizontal"
+                android:gravity="center"
+                android:textSize="6pt"
+                android:text="@string/sundayLabel"
+                >
+            </TextView>
+            <TextView
+                android:id="@+id/MondayLabel"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:layout_weight="1"
+                android:adjustViewBounds = "true"
+                android:scaleType="fitCenter"
+                android:layout_gravity="center_horizontal"
+                android:gravity="center"
+                android:text="@string/mondayLabel"
+                android:textSize="6pt"
+                >
+            </TextView>
+            <TextView
+                android:id="@+id/TuesdayLabel"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:layout_weight="1"
+                android:adjustViewBounds = "true"
+                android:scaleType="fitCenter"
+                android:layout_gravity="center_horizontal"
+                android:gravity="center"
+                android:text="@string/tuesdayLabel"
+                android:textSize="6pt"
+                >
+            </TextView>
+            <TextView
+                android:id="@+id/WednesdayLabel"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:layout_weight="1"
+                android:adjustViewBounds = "true"
+                android:scaleType="fitCenter"
+                android:layout_gravity="center_horizontal"
+                android:gravity="center"
+                android:text="@string/wednesdayLabel"
+                android:textSize="6pt"
+                >
+            </TextView>
+            <TextView
+                android:id="@+id/ThursdayLabel"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:layout_weight="1"
+                android:adjustViewBounds = "true"
+                android:scaleType="fitCenter"
+                android:layout_gravity="center_horizontal"
+                android:gravity="center"
+                android:text="@string/thursdayLabel"
+                android:textSize="6pt"
+                >
+            </TextView>
+            <TextView
+                android:id="@+id/FridayLabel"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:layout_weight="1"
+                android:adjustViewBounds = "true"
+                android:scaleType="fitCenter"
+                android:layout_gravity="center_horizontal"
+                android:gravity="center"
+                android:text="@string/fridayLabel"
+                android:textSize="6pt"
+                >
+            </TextView>
+            <TextView
+                android:id="@+id/SaturdayLabel"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:layout_weight="1"
+                android:adjustViewBounds = "true"
+                android:scaleType="fitCenter"
+                android:layout_gravity="center_horizontal"
+                android:gravity="center"
+                android:text="@string/saturdayLabel"
+                android:textSize="7pt"
+                >
+            </TextView>
+        </LinearLayout>
 
-    <LinearLayout
-        android:id="@+id/week_one_row"
-        android:orientation="horizontal"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        style="?android:attr/buttonBarStyle"
-        android:layout_weight="2"
-        >
-        <Button
-            android:id="@+id/Calendar00"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:adjustViewBounds = "true"
-            android:scaleType="fitCenter"
-            android:layout_weight="1"
-            android:textSize="8pt"
-            style="?android:attr/buttonBarButtonStyle"
-            >
-        </Button>
-        <Button
-            android:id="@+id/Calendar01"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:adjustViewBounds = "true"
-            android:scaleType="fitCenter"
-            android:layout_weight="1"
-            android:textSize="8pt"
-            style="?android:attr/buttonBarButtonStyle"
-            >
-        </Button>
-        <Button
-            android:id="@+id/Calendar02"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:adjustViewBounds = "true"
-            android:scaleType="fitCenter"
-            android:layout_weight="1"
-            android:textSize="8pt"
-            style="?android:attr/buttonBarButtonStyle"
-            >
-        </Button>
-        <Button
-            android:id="@+id/Calendar03"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:adjustViewBounds = "true"
-            android:scaleType="fitCenter"
-            android:layout_weight="1"
-            android:textSize="8pt"
-            style="?android:attr/buttonBarButtonStyle"
-            >
-        </Button>
-        <Button
-            android:id="@+id/Calendar04"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:adjustViewBounds = "true"
-            android:scaleType="fitCenter"
-            android:layout_weight="1"
-            android:textSize="8pt"
-            style="?android:attr/buttonBarButtonStyle"
-            >
-        </Button>
-        <Button
-            android:id="@+id/Calendar05"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:adjustViewBounds = "true"
-            android:scaleType="fitCenter"
-            android:layout_weight="1"
-            android:textSize="8pt"
-            style="?android:attr/buttonBarButtonStyle"
-            >
-        </Button>
-        <Button
-            android:id="@+id/Calendar06"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:adjustViewBounds = "true"
-            android:scaleType="fitCenter"
+        <LinearLayout
+            android:id="@+id/week_one_row_label"
+            android:orientation="horizontal"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:textSize="8pt"
-            style="?android:attr/buttonBarButtonStyle"
+            android:background="@color/background_translucent_dark"
             >
-        </Button>
-    </LinearLayout>
 
-    <LinearLayout
-        android:id="@+id/week_two_row_label"
-        android:orientation="horizontal"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:background="@color/background_translucent_dark"
-        >
+            <TextView
+                android:id="@+id/DayLabel00"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:layout_weight="1"
+                android:adjustViewBounds = "true"
+                android:scaleType="fitCenter"
+                android:layout_gravity="center_horizontal"
+                android:gravity="center"
+                android:textSize="7pt"
+                android:text="@string/dummy"
+                >
+            </TextView>
+            <TextView
+                android:id="@+id/DayLabel01"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:layout_weight="1"
+                android:adjustViewBounds = "true"
+                android:scaleType="fitCenter"
+                android:layout_gravity="center_horizontal"
+                android:gravity="center"
+                android:text="@string/dummy"
+                android:textSize="7pt"
+                >
+            </TextView>
+            <TextView
+                android:id="@+id/DayLabel02"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:layout_weight="1"
+                android:adjustViewBounds = "true"
+                android:scaleType="fitCenter"
+                android:layout_gravity="center_horizontal"
+                android:gravity="center"
+                android:text="@string/dummy"
+                android:textSize="7pt"
+                >
+            </TextView>
+            <TextView
+                android:id="@+id/DayLabel03"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:layout_weight="1"
+                android:adjustViewBounds = "true"
+                android:scaleType="fitCenter"
+                android:layout_gravity="center_horizontal"
+                android:gravity="center"
+                android:text="@string/dummy"
+                android:textSize="7pt"
+                >
+            </TextView>
+            <TextView
+                android:id="@+id/DayLabel04"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:layout_weight="1"
+                android:adjustViewBounds = "true"
+                android:scaleType="fitCenter"
+                android:layout_gravity="center_horizontal"
+                android:gravity="center"
+                android:text="@string/dummy"
+                android:textSize="7pt"
+                >
+            </TextView>
+            <TextView
+                android:id="@+id/DayLabel05"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:layout_weight="1"
+                android:adjustViewBounds = "true"
+                android:scaleType="fitCenter"
+                android:layout_gravity="center_horizontal"
+                android:gravity="center"
+                android:text="@string/dummy"
+                android:textSize="7pt"
+                >
+            </TextView>
+            <TextView
+                android:id="@+id/DayLabel06"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:layout_weight="1"
+                android:adjustViewBounds = "true"
+                android:scaleType="fitCenter"
+                android:layout_gravity="center_horizontal"
+                android:gravity="center"
+                android:text="@string/dummy"
+                android:textSize="7pt"
+                >
+            </TextView>
+        </LinearLayout>
 
-        <TextView
-            android:id="@+id/DayLabel10"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:adjustViewBounds = "true"
-            android:scaleType="fitCenter"
-            android:layout_gravity="center_horizontal"
-            android:gravity="center"
-            android:textSize="8pt"
-            android:text="@string/dummy"
-            >
-        </TextView>
-        <TextView
-            android:id="@+id/DayLabel11"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:adjustViewBounds = "true"
-            android:scaleType="fitCenter"
-            android:layout_gravity="center_horizontal"
-            android:gravity="center"
-            android:text="@string/dummy"
-            android:textSize="8pt"
-            >
-        </TextView>
-        <TextView
-            android:id="@+id/DayLabel12"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:adjustViewBounds = "true"
-            android:scaleType="fitCenter"
-            android:layout_gravity="center_horizontal"
-            android:gravity="center"
-            android:text="@string/dummy"
-            android:textSize="8pt"
-            >
-        </TextView>
-        <TextView
-            android:id="@+id/DayLabel13"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:adjustViewBounds = "true"
-            android:scaleType="fitCenter"
-            android:layout_gravity="center_horizontal"
-            android:gravity="center"
-            android:text="@string/dummy"
-            android:textSize="8pt"
-            >
-        </TextView>
-        <TextView
-            android:id="@+id/DayLabel14"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:adjustViewBounds = "true"
-            android:scaleType="fitCenter"
-            android:layout_gravity="center_horizontal"
-            android:gravity="center"
-            android:text="@string/dummy"
-            android:textSize="8pt"
-            >
-        </TextView>
-        <TextView
-            android:id="@+id/DayLabel15"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:adjustViewBounds = "true"
-            android:scaleType="fitCenter"
-            android:layout_gravity="center_horizontal"
-            android:gravity="center"
-            android:text="@string/dummy"
-            android:textSize="8pt"
-            >
-        </TextView>
-        <TextView
-            android:id="@+id/DayLabel16"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:adjustViewBounds = "true"
-            android:scaleType="fitCenter"
-            android:layout_gravity="center_horizontal"
-            android:gravity="center"
-            android:text="@string/dummy"
-            android:textSize="8pt"
+        <LinearLayout
+            android:id="@+id/week_one_row"
+            android:orientation="horizontal"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            style="?android:attr/buttonBarStyle"
+            android:layout_weight="2"
             >
-        </TextView>
-    </LinearLayout>
+            <Button
+                android:id="@+id/Calendar00"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:adjustViewBounds = "true"
+                android:scaleType="fitCenter"
+                android:layout_weight="1"
+                android:textSize="8pt"
+                style="?android:attr/buttonBarButtonStyle"
+                >
+            </Button>
+            <Button
+                android:id="@+id/Calendar01"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:adjustViewBounds = "true"
+                android:scaleType="fitCenter"
+                android:layout_weight="1"
+                android:textSize="8pt"
+                style="?android:attr/buttonBarButtonStyle"
+                >
+            </Button>
+            <Button
+                android:id="@+id/Calendar02"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:adjustViewBounds = "true"
+                android:scaleType="fitCenter"
+                android:layout_weight="1"
+                android:textSize="8pt"
+                style="?android:attr/buttonBarButtonStyle"
+                >
+            </Button>
+            <Button
+                android:id="@+id/Calendar03"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:adjustViewBounds = "true"
+                android:scaleType="fitCenter"
+                android:layout_weight="1"
+                android:textSize="8pt"
+                style="?android:attr/buttonBarButtonStyle"
+                >
+            </Button>
+            <Button
+                android:id="@+id/Calendar04"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:adjustViewBounds = "true"
+                android:scaleType="fitCenter"
+                android:layout_weight="1"
+                android:textSize="8pt"
+                style="?android:attr/buttonBarButtonStyle"
+                >
+            </Button>
+            <Button
+                android:id="@+id/Calendar05"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:adjustViewBounds = "true"
+                android:scaleType="fitCenter"
+                android:layout_weight="1"
+                android:textSize="8pt"
+                style="?android:attr/buttonBarButtonStyle"
+                >
+            </Button>
+            <Button
+                android:id="@+id/Calendar06"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:adjustViewBounds = "true"
+                android:scaleType="fitCenter"
+                android:layout_weight="1"
+                android:textSize="8pt"
+                style="?android:attr/buttonBarButtonStyle"
+                >
+            </Button>
+        </LinearLayout>
 
-    <LinearLayout
-        android:id="@+id/week_two_row"
-        android:orientation="horizontal"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        style="?android:attr/buttonBarStyle"
-        android:layout_weight="2"
-        >
-        <Button
-            android:id="@+id/Calendar10"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:adjustViewBounds = "true"
-            android:scaleType="fitCenter"
-            android:layout_weight="1"
-            android:textSize="8pt"
-            style="?android:attr/buttonBarButtonStyle"
-            >
-        </Button>
-        <Button
-            android:id="@+id/Calendar11"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:adjustViewBounds = "true"
-            android:scaleType="fitCenter"
-            android:layout_weight="1"
-            android:textSize="8pt"
-            style="?android:attr/buttonBarButtonStyle"
-            >
-        </Button>
-        <Button
-            android:id="@+id/Calendar12"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:adjustViewBounds = "true"
-            android:scaleType="fitCenter"
-            android:layout_weight="1"
-            android:textSize="8pt"
-            style="?android:attr/buttonBarButtonStyle"
-            >
-        </Button>
-        <Button
-            android:id="@+id/Calendar13"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:adjustViewBounds = "true"
-            android:scaleType="fitCenter"
-            android:layout_weight="1"
-            android:textSize="8pt"
-            style="?android:attr/buttonBarButtonStyle"
-            >
-        </Button>
-        <Button
-            android:id="@+id/Calendar14"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:adjustViewBounds = "true"
-            android:scaleType="fitCenter"
+        <LinearLayout
+            android:id="@+id/week_two_row_label"
+            android:orientation="horizontal"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:textSize="8pt"
-            style="?android:attr/buttonBarButtonStyle"
+            android:background="@color/background_translucent_dark"
             >
-        </Button>
-        <Button
-            android:id="@+id/Calendar15"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:adjustViewBounds = "true"
-            android:scaleType="fitCenter"
-            android:layout_weight="1"
-            android:textSize="8pt"
-            style="?android:attr/buttonBarButtonStyle"
-            >
-        </Button>
-        <Button
-            android:id="@+id/Calendar16"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:adjustViewBounds = "true"
-            android:scaleType="fitCenter"
-            android:layout_weight="1"
-            android:textSize="8pt"
-            style="?android:attr/buttonBarButtonStyle"
-            >
-        </Button>
-    </LinearLayout>
 
-    <LinearLayout
-        android:id="@+id/week_three_row_label"
-        android:orientation="horizontal"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:background="@color/background_translucent_dark"
-        >
+            <TextView
+                android:id="@+id/DayLabel10"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:layout_weight="1"
+                android:adjustViewBounds = "true"
+                android:scaleType="fitCenter"
+                android:layout_gravity="center_horizontal"
+                android:gravity="center"
+                android:textSize="7pt"
+                android:text="@string/dummy"
+                >
+            </TextView>
+            <TextView
+                android:id="@+id/DayLabel11"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:layout_weight="1"
+                android:adjustViewBounds = "true"
+                android:scaleType="fitCenter"
+                android:layout_gravity="center_horizontal"
+                android:gravity="center"
+                android:text="@string/dummy"
+                android:textSize="7pt"
+                >
+            </TextView>
+            <TextView
+                android:id="@+id/DayLabel12"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:layout_weight="1"
+                android:adjustViewBounds = "true"
+                android:scaleType="fitCenter"
+                android:layout_gravity="center_horizontal"
+                android:gravity="center"
+                android:text="@string/dummy"
+                android:textSize="7pt"
+                >
+            </TextView>
+            <TextView
+                android:id="@+id/DayLabel13"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:layout_weight="1"
+                android:adjustViewBounds = "true"
+                android:scaleType="fitCenter"
+                android:layout_gravity="center_horizontal"
+                android:gravity="center"
+                android:text="@string/dummy"
+                android:textSize="7pt"
+                >
+            </TextView>
+            <TextView
+                android:id="@+id/DayLabel14"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:layout_weight="1"
+                android:adjustViewBounds = "true"
+                android:scaleType="fitCenter"
+                android:layout_gravity="center_horizontal"
+                android:gravity="center"
+                android:text="@string/dummy"
+                android:textSize="7pt"
+                >
+            </TextView>
+            <TextView
+                android:id="@+id/DayLabel15"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:layout_weight="1"
+                android:adjustViewBounds = "true"
+                android:scaleType="fitCenter"
+                android:layout_gravity="center_horizontal"
+                android:gravity="center"
+                android:text="@string/dummy"
+                android:textSize="7pt"
+                >
+            </TextView>
+            <TextView
+                android:id="@+id/DayLabel16"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:layout_weight="1"
+                android:adjustViewBounds = "true"
+                android:scaleType="fitCenter"
+                android:layout_gravity="center_horizontal"
+                android:gravity="center"
+                android:text="@string/dummy"
+                android:textSize="7pt"
+                >
+            </TextView>
+        </LinearLayout>
 
-        <TextView
-            android:id="@+id/DayLabel20"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:adjustViewBounds = "true"
-            android:scaleType="fitCenter"
-            android:layout_gravity="center_horizontal"
-            android:gravity="center"
-            android:textSize="8pt"
-            android:text="@string/dummy"
-            >
-        </TextView>
-        <TextView
-            android:id="@+id/DayLabel21"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:adjustViewBounds = "true"
-            android:scaleType="fitCenter"
-            android:layout_gravity="center_horizontal"
-            android:gravity="center"
-            android:text="@string/dummy"
-            android:textSize="8pt"
-            >
-        </TextView>
-        <TextView
-            android:id="@+id/DayLabel22"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:adjustViewBounds = "true"
-            android:scaleType="fitCenter"
-            android:layout_gravity="center_horizontal"
-            android:gravity="center"
-            android:text="@string/dummy"
-            android:textSize="8pt"
-            >
-        </TextView>
-        <TextView
-            android:id="@+id/DayLabel23"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:adjustViewBounds = "true"
-            android:scaleType="fitCenter"
-            android:layout_gravity="center_horizontal"
-            android:gravity="center"
-            android:text="@string/dummy"
-            android:textSize="8pt"
-            >
-        </TextView>
-        <TextView
-            android:id="@+id/DayLabel24"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:adjustViewBounds = "true"
-            android:scaleType="fitCenter"
-            android:layout_gravity="center_horizontal"
-            android:gravity="center"
-            android:text="@string/dummy"
-            android:textSize="8pt"
-            >
-        </TextView>
-        <TextView
-            android:id="@+id/DayLabel25"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:adjustViewBounds = "true"
-            android:scaleType="fitCenter"
-            android:layout_gravity="center_horizontal"
-            android:gravity="center"
-            android:text="@string/dummy"
-            android:textSize="8pt"
-            >
-        </TextView>
-        <TextView
-            android:id="@+id/DayLabel26"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:adjustViewBounds = "true"
-            android:scaleType="fitCenter"
-            android:layout_gravity="center_horizontal"
-            android:gravity="center"
-            android:text="@string/dummy"
-            android:textSize="8pt"
+        <LinearLayout
+            android:id="@+id/week_two_row"
+            android:orientation="horizontal"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            style="?android:attr/buttonBarStyle"
+            android:layout_weight="2"
             >
-        </TextView>
-    </LinearLayout>
+            <Button
+                android:id="@+id/Calendar10"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:adjustViewBounds = "true"
+                android:scaleType="fitCenter"
+                android:layout_weight="1"
+                android:textSize="8pt"
+                style="?android:attr/buttonBarButtonStyle"
+                >
+            </Button>
+            <Button
+                android:id="@+id/Calendar11"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:adjustViewBounds = "true"
+                android:scaleType="fitCenter"
+                android:layout_weight="1"
+                android:textSize="8pt"
+                style="?android:attr/buttonBarButtonStyle"
+                >
+            </Button>
+            <Button
+                android:id="@+id/Calendar12"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:adjustViewBounds = "true"
+                android:scaleType="fitCenter"
+                android:layout_weight="1"
+                android:textSize="8pt"
+                style="?android:attr/buttonBarButtonStyle"
+                >
+            </Button>
+            <Button
+                android:id="@+id/Calendar13"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:adjustViewBounds = "true"
+                android:scaleType="fitCenter"
+                android:layout_weight="1"
+                android:textSize="8pt"
+                style="?android:attr/buttonBarButtonStyle"
+                >
+            </Button>
+            <Button
+                android:id="@+id/Calendar14"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:adjustViewBounds = "true"
+                android:scaleType="fitCenter"
+                android:layout_weight="1"
+                android:textSize="8pt"
+                style="?android:attr/buttonBarButtonStyle"
+                >
+            </Button>
+            <Button
+                android:id="@+id/Calendar15"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:adjustViewBounds = "true"
+                android:scaleType="fitCenter"
+                android:layout_weight="1"
+                android:textSize="8pt"
+                style="?android:attr/buttonBarButtonStyle"
+                >
+            </Button>
+            <Button
+                android:id="@+id/Calendar16"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:adjustViewBounds = "true"
+                android:scaleType="fitCenter"
+                android:layout_weight="1"
+                android:textSize="8pt"
+                style="?android:attr/buttonBarButtonStyle"
+                >
+            </Button>
+        </LinearLayout>
 
-    <LinearLayout
-        android:id="@+id/week_three_row"
-        android:orientation="horizontal"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        style="?android:attr/buttonBarStyle"
-        android:layout_weight="2"
-        >
-        <Button
-            android:id="@+id/Calendar20"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:adjustViewBounds = "true"
-            android:scaleType="fitCenter"
-            android:layout_weight="1"
-            android:textSize="8pt"
-            style="?android:attr/buttonBarButtonStyle"
-            >
-        </Button>
-        <Button
-            android:id="@+id/Calendar21"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:adjustViewBounds = "true"
-            android:scaleType="fitCenter"
-            android:layout_weight="1"
-            android:textSize="8pt"
-            style="?android:attr/buttonBarButtonStyle"
-            >
-        </Button>
-        <Button
-            android:id="@+id/Calendar22"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:adjustViewBounds = "true"
-            android:scaleType="fitCenter"
+        <LinearLayout
+            android:id="@+id/week_three_row_label"
+            android:orientation="horizontal"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:textSize="8pt"
-            style="?android:attr/buttonBarButtonStyle"
+            android:background="@color/background_translucent_dark"
             >
-        </Button>
-        <Button
-            android:id="@+id/Calendar23"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:adjustViewBounds = "true"
-            android:scaleType="fitCenter"
-            android:layout_weight="1"
-            android:textSize="8pt"
-            style="?android:attr/buttonBarButtonStyle"
-            >
-        </Button>
-        <Button
-            android:id="@+id/Calendar24"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:adjustViewBounds = "true"
-            android:scaleType="fitCenter"
-            android:layout_weight="1"
-            android:textSize="8pt"
-            style="?android:attr/buttonBarButtonStyle"
-            >
-        </Button>
-        <Button
-            android:id="@+id/Calendar25"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:adjustViewBounds = "true"
-            android:scaleType="fitCenter"
-            android:layout_weight="1"
-            android:textSize="8pt"
-            style="?android:attr/buttonBarButtonStyle"
-            >
-        </Button>
-        <Button
-            android:id="@+id/Calendar26"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:adjustViewBounds = "true"
-            android:scaleType="fitCenter"
-            android:layout_weight="1"
-            android:textSize="8pt"
-            style="?android:attr/buttonBarButtonStyle"
-            >
-        </Button>
-    </LinearLayout>
 
-    <LinearLayout
-        android:id="@+id/week_four_row_label"
-        android:orientation="horizontal"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:background="@color/background_translucent_dark"
-        >
+            <TextView
+                android:id="@+id/DayLabel20"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:layout_weight="1"
+                android:adjustViewBounds = "true"
+                android:scaleType="fitCenter"
+                android:layout_gravity="center_horizontal"
+                android:gravity="center"
+                android:textSize="7pt"
+                android:text="@string/dummy"
+                >
+            </TextView>
+            <TextView
+                android:id="@+id/DayLabel21"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:layout_weight="1"
+                android:adjustViewBounds = "true"
+                android:scaleType="fitCenter"
+                android:layout_gravity="center_horizontal"
+                android:gravity="center"
+                android:text="@string/dummy"
+                android:textSize="7pt"
+                >
+            </TextView>
+            <TextView
+                android:id="@+id/DayLabel22"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:layout_weight="1"
+                android:adjustViewBounds = "true"
+                android:scaleType="fitCenter"
+                android:layout_gravity="center_horizontal"
+                android:gravity="center"
+                android:text="@string/dummy"
+                android:textSize="7pt"
+                >
+            </TextView>
+            <TextView
+                android:id="@+id/DayLabel23"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:layout_weight="1"
+                android:adjustViewBounds = "true"
+                android:scaleType="fitCenter"
+                android:layout_gravity="center_horizontal"
+                android:gravity="center"
+                android:text="@string/dummy"
+                android:textSize="7pt"
+                >
+            </TextView>
+            <TextView
+                android:id="@+id/DayLabel24"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:layout_weight="1"
+                android:adjustViewBounds = "true"
+                android:scaleType="fitCenter"
+                android:layout_gravity="center_horizontal"
+                android:gravity="center"
+                android:text="@string/dummy"
+                android:textSize="7pt"
+                >
+            </TextView>
+            <TextView
+                android:id="@+id/DayLabel25"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:layout_weight="1"
+                android:adjustViewBounds = "true"
+                android:scaleType="fitCenter"
+                android:layout_gravity="center_horizontal"
+                android:gravity="center"
+                android:text="@string/dummy"
+                android:textSize="7pt"
+                >
+            </TextView>
+            <TextView
+                android:id="@+id/DayLabel26"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:layout_weight="1"
+                android:adjustViewBounds = "true"
+                android:scaleType="fitCenter"
+                android:layout_gravity="center_horizontal"
+                android:gravity="center"
+                android:text="@string/dummy"
+                android:textSize="7pt"
+                >
+            </TextView>
+        </LinearLayout>
 
-        <TextView
-            android:id="@+id/DayLabel30"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:adjustViewBounds = "true"
-            android:scaleType="fitCenter"
-            android:layout_gravity="center_horizontal"
-            android:gravity="center"
-            android:textSize="8pt"
-            android:text="@string/dummy"
-            >
-        </TextView>
-        <TextView
-            android:id="@+id/DayLabel31"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:adjustViewBounds = "true"
-            android:scaleType="fitCenter"
-            android:layout_gravity="center_horizontal"
-            android:gravity="center"
-            android:text="@string/dummy"
-            android:textSize="8pt"
-            >
-        </TextView>
-        <TextView
-            android:id="@+id/DayLabel32"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:adjustViewBounds = "true"
-            android:scaleType="fitCenter"
-            android:layout_gravity="center_horizontal"
-            android:gravity="center"
-            android:text="@string/dummy"
-            android:textSize="8pt"
-            >
-        </TextView>
-        <TextView
-            android:id="@+id/DayLabel33"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:adjustViewBounds = "true"
-            android:scaleType="fitCenter"
-            android:layout_gravity="center_horizontal"
-            android:gravity="center"
-            android:text="@string/dummy"
-            android:textSize="8pt"
-            >
-        </TextView>
-        <TextView
-            android:id="@+id/DayLabel34"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:adjustViewBounds = "true"
-            android:scaleType="fitCenter"
-            android:layout_gravity="center_horizontal"
-            android:gravity="center"
-            android:text="@string/dummy"
-            android:textSize="8pt"
-            >
-        </TextView>
-        <TextView
-            android:id="@+id/DayLabel35"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:adjustViewBounds = "true"
-            android:scaleType="fitCenter"
-            android:layout_gravity="center_horizontal"
-            android:gravity="center"
-            android:text="@string/dummy"
-            android:textSize="8pt"
-            >
-        </TextView>
-        <TextView
-            android:id="@+id/DayLabel36"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:adjustViewBounds = "true"
-            android:scaleType="fitCenter"
-            android:layout_gravity="center_horizontal"
-            android:gravity="center"
-            android:text="@string/dummy"
-            android:textSize="8pt"
+        <LinearLayout
+            android:id="@+id/week_three_row"
+            android:orientation="horizontal"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            style="?android:attr/buttonBarStyle"
+            android:layout_weight="2"
             >
-        </TextView>
-    </LinearLayout>
+            <Button
+                android:id="@+id/Calendar20"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:adjustViewBounds = "true"
+                android:scaleType="fitCenter"
+                android:layout_weight="1"
+                android:textSize="8pt"
+                style="?android:attr/buttonBarButtonStyle"
+                >
+            </Button>
+            <Button
+                android:id="@+id/Calendar21"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:adjustViewBounds = "true"
+                android:scaleType="fitCenter"
+                android:layout_weight="1"
+                android:textSize="8pt"
+                style="?android:attr/buttonBarButtonStyle"
+                >
+            </Button>
+            <Button
+                android:id="@+id/Calendar22"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:adjustViewBounds = "true"
+                android:scaleType="fitCenter"
+                android:layout_weight="1"
+                android:textSize="8pt"
+                style="?android:attr/buttonBarButtonStyle"
+                >
+            </Button>
+            <Button
+                android:id="@+id/Calendar23"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:adjustViewBounds = "true"
+                android:scaleType="fitCenter"
+                android:layout_weight="1"
+                android:textSize="8pt"
+                style="?android:attr/buttonBarButtonStyle"
+                >
+            </Button>
+            <Button
+                android:id="@+id/Calendar24"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:adjustViewBounds = "true"
+                android:scaleType="fitCenter"
+                android:layout_weight="1"
+                android:textSize="8pt"
+                style="?android:attr/buttonBarButtonStyle"
+                >
+            </Button>
+            <Button
+                android:id="@+id/Calendar25"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:adjustViewBounds = "true"
+                android:scaleType="fitCenter"
+                android:layout_weight="1"
+                android:textSize="8pt"
+                style="?android:attr/buttonBarButtonStyle"
+                >
+            </Button>
+            <Button
+                android:id="@+id/Calendar26"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:adjustViewBounds = "true"
+                android:scaleType="fitCenter"
+                android:layout_weight="1"
+                android:textSize="8pt"
+                style="?android:attr/buttonBarButtonStyle"
+                >
+            </Button>
+        </LinearLayout>
 
-    <LinearLayout
-        android:id="@+id/week_four_row"
-        android:orientation="horizontal"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        style="?android:attr/buttonBarStyle"
-        android:layout_weight="2"
-        >
-        <Button
-            android:id="@+id/Calendar30"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:adjustViewBounds = "true"
-            android:scaleType="fitCenter"
+        <LinearLayout
+            android:id="@+id/week_four_row_label"
+            android:orientation="horizontal"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:textSize="8pt"
-            style="?android:attr/buttonBarButtonStyle"
+            android:background="@color/background_translucent_dark"
             >
-        </Button>
-        <Button
-            android:id="@+id/Calendar31"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:adjustViewBounds = "true"
-            android:scaleType="fitCenter"
-            android:layout_weight="1"
-            android:textSize="8pt"
-            style="?android:attr/buttonBarButtonStyle"
-            >
-        </Button>
-        <Button
-            android:id="@+id/Calendar32"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:adjustViewBounds = "true"
-            android:scaleType="fitCenter"
-            android:layout_weight="1"
-            android:textSize="8pt"
-            style="?android:attr/buttonBarButtonStyle"
-            >
-        </Button>
-        <Button
-            android:id="@+id/Calendar33"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:adjustViewBounds = "true"
-            android:scaleType="fitCenter"
-            android:layout_weight="1"
-            android:textSize="8pt"
-            style="?android:attr/buttonBarButtonStyle"
-            >
-        </Button>
-        <Button
-            android:id="@+id/Calendar34"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:adjustViewBounds = "true"
-            android:scaleType="fitCenter"
-            android:layout_weight="1"
-            android:textSize="8pt"
-            style="?android:attr/buttonBarButtonStyle"
-            >
-        </Button>
-        <Button
-            android:id="@+id/Calendar35"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:adjustViewBounds = "true"
-            android:scaleType="fitCenter"
-            android:layout_weight="1"
-            android:textSize="8pt"
-            style="?android:attr/buttonBarButtonStyle"
-            >
-        </Button>
-        <Button
-            android:id="@+id/Calendar36"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:adjustViewBounds = "true"
-            android:scaleType="fitCenter"
-            android:layout_weight="1"
-            android:textSize="8pt"
-            style="?android:attr/buttonBarButtonStyle"
-            >
-        </Button>
-    </LinearLayout>
 
-    <LinearLayout
-        android:id="@+id/week_five_row_label"
-        android:orientation="horizontal"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:background="@color/background_translucent_dark"
-        >
+            <TextView
+                android:id="@+id/DayLabel30"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:layout_weight="1"
+                android:adjustViewBounds = "true"
+                android:scaleType="fitCenter"
+                android:layout_gravity="center_horizontal"
+                android:gravity="center"
+                android:textSize="7pt"
+                android:text="@string/dummy"
+                >
+            </TextView>
+            <TextView
+                android:id="@+id/DayLabel31"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:layout_weight="1"
+                android:adjustViewBounds = "true"
+                android:scaleType="fitCenter"
+                android:layout_gravity="center_horizontal"
+                android:gravity="center"
+                android:text="@string/dummy"
+                android:textSize="7pt"
+                >
+            </TextView>
+            <TextView
+                android:id="@+id/DayLabel32"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:layout_weight="1"
+                android:adjustViewBounds = "true"
+                android:scaleType="fitCenter"
+                android:layout_gravity="center_horizontal"
+                android:gravity="center"
+                android:text="@string/dummy"
+                android:textSize="7pt"
+                >
+            </TextView>
+            <TextView
+                android:id="@+id/DayLabel33"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:layout_weight="1"
+                android:adjustViewBounds = "true"
+                android:scaleType="fitCenter"
+                android:layout_gravity="center_horizontal"
+                android:gravity="center"
+                android:text="@string/dummy"
+                android:textSize="7pt"
+                >
+            </TextView>
+            <TextView
+                android:id="@+id/DayLabel34"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:layout_weight="1"
+                android:adjustViewBounds = "true"
+                android:scaleType="fitCenter"
+                android:layout_gravity="center_horizontal"
+                android:gravity="center"
+                android:text="@string/dummy"
+                android:textSize="7pt"
+                >
+            </TextView>
+            <TextView
+                android:id="@+id/DayLabel35"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:layout_weight="1"
+                android:adjustViewBounds = "true"
+                android:scaleType="fitCenter"
+                android:layout_gravity="center_horizontal"
+                android:gravity="center"
+                android:text="@string/dummy"
+                android:textSize="7pt"
+                >
+            </TextView>
+            <TextView
+                android:id="@+id/DayLabel36"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:layout_weight="1"
+                android:adjustViewBounds = "true"
+                android:scaleType="fitCenter"
+                android:layout_gravity="center_horizontal"
+                android:gravity="center"
+                android:text="@string/dummy"
+                android:textSize="7pt"
+                >
+            </TextView>
+        </LinearLayout>
 
-        <TextView
-            android:id="@+id/DayLabel40"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:adjustViewBounds = "true"
-            android:scaleType="fitCenter"
-            android:layout_gravity="center_horizontal"
-            android:gravity="center"
-            android:textSize="8pt"
-            android:text="@string/dummy"
-            >
-        </TextView>
-        <TextView
-            android:id="@+id/DayLabel41"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:adjustViewBounds = "true"
-            android:scaleType="fitCenter"
-            android:layout_gravity="center_horizontal"
-            android:gravity="center"
-            android:text="@string/dummy"
-            android:textSize="8pt"
-            >
-        </TextView>
-        <TextView
-            android:id="@+id/DayLabel42"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:adjustViewBounds = "true"
-            android:scaleType="fitCenter"
-            android:layout_gravity="center_horizontal"
-            android:gravity="center"
-            android:text="@string/dummy"
-            android:textSize="8pt"
-            >
-        </TextView>
-        <TextView
-            android:id="@+id/DayLabel43"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:adjustViewBounds = "true"
-            android:scaleType="fitCenter"
-            android:layout_gravity="center_horizontal"
-            android:gravity="center"
-            android:text="@string/dummy"
-            android:textSize="8pt"
-            >
-        </TextView>
-        <TextView
-            android:id="@+id/DayLabel44"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:adjustViewBounds = "true"
-            android:scaleType="fitCenter"
-            android:layout_gravity="center_horizontal"
-            android:gravity="center"
-            android:text="@string/dummy"
-            android:textSize="8pt"
-            >
-        </TextView>
-        <TextView
-            android:id="@+id/DayLabel45"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:adjustViewBounds = "true"
-            android:scaleType="fitCenter"
-            android:layout_gravity="center_horizontal"
-            android:gravity="center"
-            android:text="@string/dummy"
-            android:textSize="8pt"
-            >
-        </TextView>
-        <TextView
-            android:id="@+id/DayLabel46"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:adjustViewBounds = "true"
-            android:scaleType="fitCenter"
-            android:layout_gravity="center_horizontal"
-            android:gravity="center"
-            android:text="@string/dummy"
-            android:textSize="8pt"
+        <LinearLayout
+            android:id="@+id/week_four_row"
+            android:orientation="horizontal"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            style="?android:attr/buttonBarStyle"
+            android:layout_weight="2"
             >
-        </TextView>
-    </LinearLayout>
+            <Button
+                android:id="@+id/Calendar30"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:adjustViewBounds = "true"
+                android:scaleType="fitCenter"
+                android:layout_weight="1"
+                android:textSize="8pt"
+                style="?android:attr/buttonBarButtonStyle"
+                >
+            </Button>
+            <Button
+                android:id="@+id/Calendar31"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:adjustViewBounds = "true"
+                android:scaleType="fitCenter"
+                android:layout_weight="1"
+                android:textSize="8pt"
+                style="?android:attr/buttonBarButtonStyle"
+                >
+            </Button>
+            <Button
+                android:id="@+id/Calendar32"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:adjustViewBounds = "true"
+                android:scaleType="fitCenter"
+                android:layout_weight="1"
+                android:textSize="8pt"
+                style="?android:attr/buttonBarButtonStyle"
+                >
+            </Button>
+            <Button
+                android:id="@+id/Calendar33"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:adjustViewBounds = "true"
+                android:scaleType="fitCenter"
+                android:layout_weight="1"
+                android:textSize="8pt"
+                style="?android:attr/buttonBarButtonStyle"
+                >
+            </Button>
+            <Button
+                android:id="@+id/Calendar34"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:adjustViewBounds = "true"
+                android:scaleType="fitCenter"
+                android:layout_weight="1"
+                android:textSize="8pt"
+                style="?android:attr/buttonBarButtonStyle"
+                >
+            </Button>
+            <Button
+                android:id="@+id/Calendar35"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:adjustViewBounds = "true"
+                android:scaleType="fitCenter"
+                android:layout_weight="1"
+                android:textSize="8pt"
+                style="?android:attr/buttonBarButtonStyle"
+                >
+            </Button>
+            <Button
+                android:id="@+id/Calendar36"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:adjustViewBounds = "true"
+                android:scaleType="fitCenter"
+                android:layout_weight="1"
+                android:textSize="8pt"
+                style="?android:attr/buttonBarButtonStyle"
+                >
+            </Button>
+        </LinearLayout>
 
-
-    <LinearLayout
-        android:id="@+id/week_five_row"
-        android:orientation="horizontal"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        style="?android:attr/buttonBarStyle"
-        android:layout_weight="2"
-        >
-        <Button
-            android:id="@+id/Calendar40"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:adjustViewBounds = "true"
-            android:scaleType="fitCenter"
-            android:layout_weight="1"
-            android:textSize="8pt"
-            style="?android:attr/buttonBarButtonStyle"
-            >
-        </Button>
-        <Button
-            android:id="@+id/Calendar41"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:adjustViewBounds = "true"
-            android:scaleType="fitCenter"
-            android:layout_weight="1"
-            android:textSize="8pt"
-            style="?android:attr/buttonBarButtonStyle"
-            >
-        </Button>
-        <Button
-            android:id="@+id/Calendar42"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:adjustViewBounds = "true"
-            android:scaleType="fitCenter"
-            android:layout_weight="1"
-            android:textSize="8pt"
-            style="?android:attr/buttonBarButtonStyle"
-            >
-        </Button>
-        <Button
-            android:id="@+id/Calendar43"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:adjustViewBounds = "true"
-            android:scaleType="fitCenter"
-            android:layout_weight="1"
-            android:textSize="8pt"
-            style="?android:attr/buttonBarButtonStyle"
-            >
-        </Button>
-        <Button
-            android:id="@+id/Calendar44"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:adjustViewBounds = "true"
-            android:scaleType="fitCenter"
+        <LinearLayout
+            android:id="@+id/week_five_row_label"
+            android:orientation="horizontal"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:textSize="8pt"
-            style="?android:attr/buttonBarButtonStyle"
+            android:background="@color/background_translucent_dark"
             >
-        </Button>
-        <Button
-            android:id="@+id/Calendar45"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:adjustViewBounds = "true"
-            android:scaleType="fitCenter"
-            android:layout_weight="1"
-            android:textSize="8pt"
-            style="?android:attr/buttonBarButtonStyle"
-            >
-        </Button>
-        <Button
-            android:id="@+id/Calendar46"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:adjustViewBounds = "true"
-            android:scaleType="fitCenter"
-            android:layout_weight="1"
-            android:textSize="8pt"
-            style="?android:attr/buttonBarButtonStyle"
-            >
-        </Button>
-    </LinearLayout>
 
-    <LinearLayout
-        android:id="@+id/week_six_row_label"
-        android:orientation="horizontal"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:background="@color/background_translucent_dark"
-        >
+            <TextView
+                android:id="@+id/DayLabel40"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:layout_weight="1"
+                android:adjustViewBounds = "true"
+                android:scaleType="fitCenter"
+                android:layout_gravity="center_horizontal"
+                android:gravity="center"
+                android:textSize="7pt"
+                android:text="@string/dummy"
+                >
+            </TextView>
+            <TextView
+                android:id="@+id/DayLabel41"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:layout_weight="1"
+                android:adjustViewBounds = "true"
+                android:scaleType="fitCenter"
+                android:layout_gravity="center_horizontal"
+                android:gravity="center"
+                android:text="@string/dummy"
+                android:textSize="7pt"
+                >
+            </TextView>
+            <TextView
+                android:id="@+id/DayLabel42"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:layout_weight="1"
+                android:adjustViewBounds = "true"
+                android:scaleType="fitCenter"
+                android:layout_gravity="center_horizontal"
+                android:gravity="center"
+                android:text="@string/dummy"
+                android:textSize="7pt"
+                >
+            </TextView>
+            <TextView
+                android:id="@+id/DayLabel43"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:layout_weight="1"
+                android:adjustViewBounds = "true"
+                android:scaleType="fitCenter"
+                android:layout_gravity="center_horizontal"
+                android:gravity="center"
+                android:text="@string/dummy"
+                android:textSize="7pt"
+                >
+            </TextView>
+            <TextView
+                android:id="@+id/DayLabel44"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:layout_weight="1"
+                android:adjustViewBounds = "true"
+                android:scaleType="fitCenter"
+                android:layout_gravity="center_horizontal"
+                android:gravity="center"
+                android:text="@string/dummy"
+                android:textSize="7pt"
+                >
+            </TextView>
+            <TextView
+                android:id="@+id/DayLabel45"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:layout_weight="1"
+                android:adjustViewBounds = "true"
+                android:scaleType="fitCenter"
+                android:layout_gravity="center_horizontal"
+                android:gravity="center"
+                android:text="@string/dummy"
+                android:textSize="7pt"
+                >
+            </TextView>
+            <TextView
+                android:id="@+id/DayLabel46"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:layout_weight="1"
+                android:adjustViewBounds = "true"
+                android:scaleType="fitCenter"
+                android:layout_gravity="center_horizontal"
+                android:gravity="center"
+                android:text="@string/dummy"
+                android:textSize="7pt"
+                >
+            </TextView>
+        </LinearLayout>
 
-        <TextView
-            android:id="@+id/DayLabel50"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:adjustViewBounds = "true"
-            android:scaleType="fitCenter"
-            android:layout_gravity="center_horizontal"
-            android:gravity="center"
-            android:textSize="8pt"
-            android:text="@string/dummy"
-            >
-        </TextView>
-        <TextView
-            android:id="@+id/DayLabel51"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:adjustViewBounds = "true"
-            android:scaleType="fitCenter"
-            android:layout_gravity="center_horizontal"
-            android:gravity="center"
-            android:text="@string/dummy"
-            android:textSize="8pt"
-            >
-        </TextView>
-        <TextView
-            android:id="@+id/DayLabel52"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:adjustViewBounds = "true"
-            android:scaleType="fitCenter"
-            android:layout_gravity="center_horizontal"
-            android:gravity="center"
-            android:text="@string/dummy"
-            android:textSize="8pt"
-            >
-        </TextView>
-        <TextView
-            android:id="@+id/DayLabel53"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:adjustViewBounds = "true"
-            android:scaleType="fitCenter"
-            android:layout_gravity="center_horizontal"
-            android:gravity="center"
-            android:text="@string/dummy"
-            android:textSize="8pt"
-            >
-        </TextView>
-        <TextView
-            android:id="@+id/DayLabel54"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:adjustViewBounds = "true"
-            android:scaleType="fitCenter"
-            android:layout_gravity="center_horizontal"
-            android:gravity="center"
-            android:text="@string/dummy"
-            android:textSize="8pt"
-            >
-        </TextView>
-        <TextView
-            android:id="@+id/DayLabel55"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:adjustViewBounds = "true"
-            android:scaleType="fitCenter"
-            android:layout_gravity="center_horizontal"
-            android:gravity="center"
-            android:text="@string/dummy"
-            android:textSize="8pt"
-            >
-        </TextView>
-        <TextView
-            android:id="@+id/DayLabel56"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:layout_weight="1"
-            android:adjustViewBounds = "true"
-            android:scaleType="fitCenter"
-            android:layout_gravity="center_horizontal"
-            android:gravity="center"
-            android:text="@string/dummy"
-            android:textSize="8pt"
-            >
-        </TextView>
-    </LinearLayout>
 
-    <LinearLayout
-        android:id="@+id/week_six_row"
-        android:orientation="horizontal"
-        android:layout_width="fill_parent"
-        android:layout_height="wrap_content"
-        style="?android:attr/buttonBarStyle"
-        android:layout_weight="2"
-        >
-        <Button
-            android:id="@+id/Calendar50"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:adjustViewBounds = "true"
-            android:scaleType="fitCenter"
-            android:layout_weight="1"
-            android:textSize="8pt"
-            style="?android:attr/buttonBarButtonStyle"
-            >
-        </Button>
-        <Button
-            android:id="@+id/Calendar51"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:adjustViewBounds = "true"
-            android:scaleType="fitCenter"
-            android:layout_weight="1"
-            android:textSize="8pt"
-            style="?android:attr/buttonBarButtonStyle"
-            >
-        </Button>
-        <Button
-            android:id="@+id/Calendar52"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:adjustViewBounds = "true"
-            android:scaleType="fitCenter"
-            android:layout_weight="1"
-            android:textSize="8pt"
-            style="?android:attr/buttonBarButtonStyle"
-            >
-        </Button>
-        <Button
-            android:id="@+id/Calendar53"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:adjustViewBounds = "true"
-            android:scaleType="fitCenter"
-            android:layout_weight="1"
-            android:textSize="8pt"
-            style="?android:attr/buttonBarButtonStyle"
-            >
-        </Button>
-        <Button
-            android:id="@+id/Calendar54"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:adjustViewBounds = "true"
-            android:scaleType="fitCenter"
-            android:layout_weight="1"
-            android:textSize="8pt"
-            style="?android:attr/buttonBarButtonStyle"
+        <LinearLayout
+            android:id="@+id/week_five_row"
+            android:orientation="horizontal"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            style="?android:attr/buttonBarStyle"
+            android:layout_weight="2"
             >
-        </Button>
-        <Button
-            android:id="@+id/Calendar55"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:adjustViewBounds = "true"
-            android:scaleType="fitCenter"
+            <Button
+                android:id="@+id/Calendar40"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:adjustViewBounds = "true"
+                android:scaleType="fitCenter"
+                android:layout_weight="1"
+                android:textSize="8pt"
+                style="?android:attr/buttonBarButtonStyle"
+                >
+            </Button>
+            <Button
+                android:id="@+id/Calendar41"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:adjustViewBounds = "true"
+                android:scaleType="fitCenter"
+                android:layout_weight="1"
+                android:textSize="8pt"
+                style="?android:attr/buttonBarButtonStyle"
+                >
+            </Button>
+            <Button
+                android:id="@+id/Calendar42"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:adjustViewBounds = "true"
+                android:scaleType="fitCenter"
+                android:layout_weight="1"
+                android:textSize="8pt"
+                style="?android:attr/buttonBarButtonStyle"
+                >
+            </Button>
+            <Button
+                android:id="@+id/Calendar43"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:adjustViewBounds = "true"
+                android:scaleType="fitCenter"
+                android:layout_weight="1"
+                android:textSize="8pt"
+                style="?android:attr/buttonBarButtonStyle"
+                >
+            </Button>
+            <Button
+                android:id="@+id/Calendar44"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:adjustViewBounds = "true"
+                android:scaleType="fitCenter"
+                android:layout_weight="1"
+                android:textSize="8pt"
+                style="?android:attr/buttonBarButtonStyle"
+                >
+            </Button>
+            <Button
+                android:id="@+id/Calendar45"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:adjustViewBounds = "true"
+                android:scaleType="fitCenter"
+                android:layout_weight="1"
+                android:textSize="8pt"
+                style="?android:attr/buttonBarButtonStyle"
+                >
+            </Button>
+            <Button
+                android:id="@+id/Calendar46"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:adjustViewBounds = "true"
+                android:scaleType="fitCenter"
+                android:layout_weight="1"
+                android:textSize="8pt"
+                style="?android:attr/buttonBarButtonStyle"
+                >
+            </Button>
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/week_six_row_label"
+            android:orientation="horizontal"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:textSize="8pt"
-            style="?android:attr/buttonBarButtonStyle"
+            android:background="@color/background_translucent_dark"
             >
-        </Button>
-        <Button
-            android:id="@+id/Calendar56"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:adjustViewBounds = "true"
-            android:scaleType="fitCenter"
-            android:layout_weight="1"
-            android:textSize="8pt"
-            style="?android:attr/buttonBarButtonStyle"
+
+            <TextView
+                android:id="@+id/DayLabel50"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:layout_weight="1"
+                android:adjustViewBounds = "true"
+                android:scaleType="fitCenter"
+                android:layout_gravity="center_horizontal"
+                android:gravity="center"
+                android:textSize="7pt"
+                android:text="@string/dummy"
+                >
+            </TextView>
+            <TextView
+                android:id="@+id/DayLabel51"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:layout_weight="1"
+                android:adjustViewBounds = "true"
+                android:scaleType="fitCenter"
+                android:layout_gravity="center_horizontal"
+                android:gravity="center"
+                android:text="@string/dummy"
+                android:textSize="7pt"
+                >
+            </TextView>
+            <TextView
+                android:id="@+id/DayLabel52"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:layout_weight="1"
+                android:adjustViewBounds = "true"
+                android:scaleType="fitCenter"
+                android:layout_gravity="center_horizontal"
+                android:gravity="center"
+                android:text="@string/dummy"
+                android:textSize="7pt"
+                >
+            </TextView>
+            <TextView
+                android:id="@+id/DayLabel53"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:layout_weight="1"
+                android:adjustViewBounds = "true"
+                android:scaleType="fitCenter"
+                android:layout_gravity="center_horizontal"
+                android:gravity="center"
+                android:text="@string/dummy"
+                android:textSize="7pt"
+                >
+            </TextView>
+            <TextView
+                android:id="@+id/DayLabel54"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:layout_weight="1"
+                android:adjustViewBounds = "true"
+                android:scaleType="fitCenter"
+                android:layout_gravity="center_horizontal"
+                android:gravity="center"
+                android:text="@string/dummy"
+                android:textSize="7pt"
+                >
+            </TextView>
+            <TextView
+                android:id="@+id/DayLabel55"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:layout_weight="1"
+                android:adjustViewBounds = "true"
+                android:scaleType="fitCenter"
+                android:layout_gravity="center_horizontal"
+                android:gravity="center"
+                android:text="@string/dummy"
+                android:textSize="7pt"
+                >
+            </TextView>
+            <TextView
+                android:id="@+id/DayLabel56"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:layout_weight="1"
+                android:adjustViewBounds = "true"
+                android:scaleType="fitCenter"
+                android:layout_gravity="center_horizontal"
+                android:gravity="center"
+                android:text="@string/dummy"
+                android:textSize="7pt"
+                >
+            </TextView>
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/week_six_row"
+            android:orientation="horizontal"
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            style="?android:attr/buttonBarStyle"
+            android:layout_weight="2"
             >
-        </Button>
+            <Button
+                android:id="@+id/Calendar50"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:adjustViewBounds = "true"
+                android:scaleType="fitCenter"
+                android:layout_weight="1"
+                android:textSize="8pt"
+                style="?android:attr/buttonBarButtonStyle"
+                >
+            </Button>
+            <Button
+                android:id="@+id/Calendar51"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:adjustViewBounds = "true"
+                android:scaleType="fitCenter"
+                android:layout_weight="1"
+                android:textSize="8pt"
+                style="?android:attr/buttonBarButtonStyle"
+                >
+            </Button>
+            <Button
+                android:id="@+id/Calendar52"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:adjustViewBounds = "true"
+                android:scaleType="fitCenter"
+                android:layout_weight="1"
+                android:textSize="8pt"
+                style="?android:attr/buttonBarButtonStyle"
+                >
+            </Button>
+            <Button
+                android:id="@+id/Calendar53"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:adjustViewBounds = "true"
+                android:scaleType="fitCenter"
+                android:layout_weight="1"
+                android:textSize="8pt"
+                style="?android:attr/buttonBarButtonStyle"
+                >
+            </Button>
+            <Button
+                android:id="@+id/Calendar54"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:adjustViewBounds = "true"
+                android:scaleType="fitCenter"
+                android:layout_weight="1"
+                android:textSize="8pt"
+                style="?android:attr/buttonBarButtonStyle"
+                >
+            </Button>
+            <Button
+                android:id="@+id/Calendar55"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:adjustViewBounds = "true"
+                android:scaleType="fitCenter"
+                android:layout_weight="1"
+                android:textSize="8pt"
+                style="?android:attr/buttonBarButtonStyle"
+                >
+            </Button>
+            <Button
+                android:id="@+id/Calendar56"
+                android:layout_width="wrap_content"
+                android:layout_height="fill_parent"
+                android:adjustViewBounds = "true"
+                android:scaleType="fitCenter"
+                android:layout_weight="1"
+                android:textSize="8pt"
+                style="?android:attr/buttonBarButtonStyle"
+                >
+            </Button>
+        </LinearLayout>
     </LinearLayout>
-</LinearLayout>
-
+</ScrollView>

diff --git a/app/src/main/res/layout/target_month_picker.xml b/app/src/main/res/layout/target_month_picker.xml
new file mode 100644 (file)
index 0000000..5ff3a91
--- /dev/null
+++ b/app/src/main/res/layout/target_month_picker.xml
@@ -0,0 +1,63 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/time_model_data_layout"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:orientation="vertical"
+    >
+    <TextView
+        android:id="@+id/information_picker"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:text="@string/information_month_picker"
+        android:textSize="12pt"
+        />
+    <LinearLayout  xmlns:android="http://schemas.android.com/apk/res/android"
+        android:id="@+id/info_laptime_layout"
+        android:layout_width="fill_parent"
+        android:layout_height="fill_parent"
+        android:orientation="horizontal"
+        android:padding="5dp"
+        >
+        <TextView
+            android:id="@+id/lap_blank"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:text="@string/blank"
+            android:textSize="12pt"
+            />
+        <NumberPicker
+            android:id="@+id/number_picker_year"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="2"
+            android:textSize="12pt"
+            />
+        <TextView
+            android:id="@+id/separator_year_month"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:text="@string/time_picker_year_month_separator"
+            android:textSize="12pt"
+            />
+        <NumberPicker
+            android:id="@+id/number_picker_month"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_weight="2"
+            android:textSize="12pt"
+            />
+        <TextView
+            android:id="@+id/separator_second"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center"
+            android:text="@string/time_picker_end_separator"
+            android:textSize="12pt"
+            />
+    </LinearLayout>
+</LinearLayout>

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 948075d..c6e3ad3 100644 (file)
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -108,7 +108,7 @@
     <string name="pref_camera_version">Camera Version</string>
     <string name="pref_camerakit_version">Camera kit Version</string>
 
-    <string name="today">Today</string>
+    <string name="now">Now</string>
     <string name="sundayLabel">Sun</string>
     <string name="mondayLabel">Mon</string>
     <string name="tuesdayLabel">Tue</string>
@@ -116,4 +116,11 @@
     <string name="thursdayLabel">Thu</string>
     <string name="fridayLabel">Fri</string>
     <string name="saturdayLabel">Sat</string>
+
+
+    <string name="time_picker_year_month_separator">/</string>
+    <string name="time_picker_minute_separator">:</string>
+    <string name="time_picker_end_separator"> </string>
+    <string name="information_month_picker">Set Year and Month</string>
+
 </resources>