すこし更新。設定画面を起動するようにしてみた。

diff --git a/app/src/main/java/net/osdn/gokigen/pkremote/MainActivity.java b/app/src/main/java/net/osdn/gokigen/pkremote/MainActivity.java
index b040a69..398fc0e 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/pkremote/MainActivity.java
+++ b/app/src/main/java/net/osdn/gokigen/pkremote/MainActivity.java
@@ -1,18 +1,38 @@
 package net.osdn.gokigen.pkremote;
 
+import android.Manifest;
+import android.content.SharedPreferences;
+import android.content.pm.PackageManager;
 import android.os.Bundle;
 
 import androidx.annotation.NonNull;
 
 import com.google.android.material.bottomnavigation.BottomNavigationView;
 
+import androidx.appcompat.app.ActionBar;
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+import androidx.fragment.app.FragmentTransaction;
+import androidx.preference.PreferenceManager;
 
+import android.util.Log;
 import android.view.MenuItem;
+import android.view.WindowManager;
 import android.widget.TextView;
 
+import net.osdn.gokigen.pkremote.camera.CameraInterfaceProvider;
+import net.osdn.gokigen.pkremote.camera.interfaces.IInterfaceProvider;
+import net.osdn.gokigen.pkremote.preference.IPreferencePropertyAccessor;
+import net.osdn.gokigen.pkremote.scene.CameraSceneUpdater;
+
 public class MainActivity extends AppCompatActivity
 {
+    private final String TAG = toString();
+    private IInterfaceProvider interfaceProvider = null;
+    private CameraSceneUpdater scenceUpdater = null;
+
+
     private TextView mTextMessage;
     private BottomNavigationView.OnNavigationItemSelectedListener mOnNavigationItemSelectedListener
             = new BottomNavigationView.OnNavigationItemSelectedListener() {
@@ -41,13 +61,102 @@ public class MainActivity extends AppCompatActivity
     };
 
     @Override
-    protected void onCreate(Bundle savedInstanceState) {
+    protected void onCreate(Bundle savedInstanceState)
+    {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_main);
+        try
+        {
+            ActionBar bar = getSupportActionBar();
+            if (bar != null)
+            {
+                // タイトルバーは表示しない
+                bar.hide();
+            }
+        }
+        catch (Exception e)
+        {
+            e.printStackTrace();
+        }
+        getWindow().addFlags(WindowManager.LayoutParams.FLAG_KEEP_SCREEN_ON);
 
         mTextMessage = findViewById(R.id.message);
         BottomNavigationView navigation = findViewById(R.id.navigation);
         navigation.setOnNavigationItemSelectedListener(mOnNavigationItemSelectedListener);
+
+        // パーミッション群のオプトイン
+        final int REQUEST_NEED_PERMISSIONS = 1010;
+        if ((ContextCompat.checkSelfPermission(this, Manifest.permission.WRITE_EXTERNAL_STORAGE) != PackageManager.PERMISSION_GRANTED) ||
+                (ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_NETWORK_STATE) != PackageManager.PERMISSION_GRANTED) ||
+                (ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_WIFI_STATE) != PackageManager.PERMISSION_GRANTED) ||
+                (ContextCompat.checkSelfPermission(this, Manifest.permission.VIBRATE) != PackageManager.PERMISSION_GRANTED) ||
+                (ContextCompat.checkSelfPermission(this, Manifest.permission.INTERNET) != PackageManager.PERMISSION_GRANTED)) {
+            ActivityCompat.requestPermissions(this,
+                    new String[]{
+                            Manifest.permission.WRITE_EXTERNAL_STORAGE,
+                            Manifest.permission.ACCESS_NETWORK_STATE,
+                            Manifest.permission.ACCESS_WIFI_STATE,
+                            Manifest.permission.VIBRATE,
+                            Manifest.permission.INTERNET,
+                    },
+                    REQUEST_NEED_PERMISSIONS);
+        }
+        initializeClass();
+        onReadyClass();
+    }
+
+    /**
+     *   パーミッション設定が終わった後...
+     *
+     */
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String  permissions[], @NonNull int[] grantResults)
+    {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+        onReadyClass();
     }
 
+    /**
+     * クラスの初期化 (instantiate)
+     *
+     */
+    private void initializeClass()
+    {
+        try
+        {
+            scenceUpdater = CameraSceneUpdater.newInstance(this);
+            interfaceProvider = CameraInterfaceProvider.newInstance(this, scenceUpdater);
+            scenceUpdater.changeFirstFragment(interfaceProvider);
+        }
+        catch (Exception e)
+        {
+            e.printStackTrace();
+        }
+    }
+
+
+    /**
+     *    初期化終了時の処理 (カメラへの自動接続)
+     */
+    private void onReadyClass()
+    {
+        try
+        {
+            // カメラに自動接続するかどうか確認
+            SharedPreferences preferences = PreferenceManager.getDefaultSharedPreferences(this);
+            boolean isAutoConnectCamera = preferences.getBoolean(IPreferencePropertyAccessor.AUTO_CONNECT_TO_CAMERA, true);
+            Log.v(TAG, "isAutoConnectCamera() : " + isAutoConnectCamera);
+
+            // カメラに接続する
+            if (isAutoConnectCamera)
+            {
+                // 自動接続の指示があったとき
+                scenceUpdater.changeCameraConnection();
+            }
+        }
+        catch (Exception e)
+        {
+            e.printStackTrace();
+        }
+    }
 }

diff --git a/app/src/main/java/net/osdn/gokigen/pkremote/preference/olympus/PreferenceFragment.java b/app/src/main/java/net/osdn/gokigen/pkremote/preference/olympus/OpcPreferenceFragment.java
similarity index 96%
rename from app/src/main/java/net/osdn/gokigen/pkremote/preference/olympus/PreferenceFragment.java
rename to app/src/main/java/net/osdn/gokigen/pkremote/preference/olympus/OpcPreferenceFragment.java
index 1949f31..019cef7 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/pkremote/preference/olympus/PreferenceFragment.java
+++ b/app/src/main/java/net/osdn/gokigen/pkremote/preference/olympus/OpcPreferenceFragment.java
@@ -36,7 +36,7 @@ import jp.co.olympus.camerakit.OLYCamera;
  *   SettingFragment
  *
  */
-public class PreferenceFragment extends PreferenceFragmentCompat implements SharedPreferences.OnSharedPreferenceChangeListener, PreferenceSynchronizer.IPropertySynchronizeCallback
+public class OpcPreferenceFragment extends PreferenceFragmentCompat implements SharedPreferences.OnSharedPreferenceChangeListener, OpcPreferenceSynchronizer.IPropertySynchronizeCallback
 {
     private final String TAG = toString();
     private IOlyCameraPropertyProvider propertyInterface = null;
@@ -46,12 +46,12 @@ public class PreferenceFragment extends PreferenceFragmentCompat implements Shar
     private LogCatViewer logCatViewer = null;
     private SharedPreferences preferences = null;
     private ProgressDialog busyDialog = null;
-    private PreferenceSynchronizer preferenceSynchronizer = null;
+    private OpcPreferenceSynchronizer opcPreferenceSynchronizer = null;
 
 
-    public static PreferenceFragment newInstance(@NonNull AppCompatActivity context, @NonNull IInterfaceProvider factory, @NonNull IChangeScene changeScene)
+    public static OpcPreferenceFragment newInstance(@NonNull AppCompatActivity context, @NonNull IInterfaceProvider factory, @NonNull IChangeScene changeScene)
     {
-        PreferenceFragment instance = new PreferenceFragment();
+        OpcPreferenceFragment instance = new OpcPreferenceFragment();
         instance.setInterface(context, factory, changeScene);
 
         // パラメータはBundleにまとめておく
@@ -91,9 +91,9 @@ public class PreferenceFragment extends PreferenceFragmentCompat implements Shar
 
         // Preference をつかまえる
         preferences = PreferenceManager.getDefaultSharedPreferences(activity);
-        if (preferenceSynchronizer == null)
+        if (opcPreferenceSynchronizer == null)
         {
-            preferenceSynchronizer = new PreferenceSynchronizer(this.propertyInterface, preferences, this);
+            opcPreferenceSynchronizer = new OpcPreferenceSynchronizer(this.propertyInterface, preferences, this);
         }
 
         // Preference を初期設定する
@@ -319,7 +319,7 @@ public class PreferenceFragment extends PreferenceFragmentCompat implements Shar
         // データ読み込み処理（別スレッドで実行）
         if (isPropertyLoad)
         {
-            new Thread(preferenceSynchronizer).start();
+            new Thread(opcPreferenceSynchronizer).start();
         }
     }
 

diff --git a/app/src/main/java/net/osdn/gokigen/pkremote/preference/olympus/PreferenceSynchronizer.java b/app/src/main/java/net/osdn/gokigen/pkremote/preference/olympus/OpcPreferenceSynchronizer.java
similarity index 90%
rename from app/src/main/java/net/osdn/gokigen/pkremote/preference/olympus/PreferenceSynchronizer.java
rename to app/src/main/java/net/osdn/gokigen/pkremote/preference/olympus/OpcPreferenceSynchronizer.java
index 62b67d3..7fcbb18 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/pkremote/preference/olympus/PreferenceSynchronizer.java
+++ b/app/src/main/java/net/osdn/gokigen/pkremote/preference/olympus/OpcPreferenceSynchronizer.java
@@ -9,14 +9,14 @@ import net.osdn.gokigen.pkremote.camera.vendor.olympus.wrapper.property.IOlyCame
 import net.osdn.gokigen.pkremote.camera.vendor.olympus.wrapper.property.IOlyCameraPropertyProvider;
 import net.osdn.gokigen.pkremote.preference.IPreferencePropertyAccessor;
 
-class PreferenceSynchronizer implements Runnable
+class OpcPreferenceSynchronizer implements Runnable
 {
     private final String TAG = toString();
     private final IOlyCameraPropertyProvider propertyInterface;
     private final SharedPreferences preference;
     private final IPropertySynchronizeCallback callback;
 
-    PreferenceSynchronizer(IOlyCameraPropertyProvider propertyInterface, SharedPreferences preference, IPropertySynchronizeCallback callback)
+    OpcPreferenceSynchronizer(IOlyCameraPropertyProvider propertyInterface, SharedPreferences preference, IPropertySynchronizeCallback callback)
     {
         this.propertyInterface = propertyInterface;
         this.preference = preference;

diff --git a/app/src/main/java/net/osdn/gokigen/pkremote/scene/CameraSceneUpdater.java b/app/src/main/java/net/osdn/gokigen/pkremote/scene/CameraSceneUpdater.java
index 6f65fbf..dd11c41 100644 (file)
--- a/app/src/main/java/net/osdn/gokigen/pkremote/scene/CameraSceneUpdater.java
+++ b/app/src/main/java/net/osdn/gokigen/pkremote/scene/CameraSceneUpdater.java
@@ -8,6 +8,7 @@ import net.osdn.gokigen.pkremote.camera.interfaces.liveview.IStatusViewDrawer;
 import net.osdn.gokigen.pkremote.camera.interfaces.status.ICameraStatusReceiver;
 import net.osdn.gokigen.pkremote.camera.interfaces.IInterfaceProvider;
 import net.osdn.gokigen.pkremote.logcat.LogCatFragment;
+import net.osdn.gokigen.pkremote.preference.olympus.OpcPreferenceFragment;
 import net.osdn.gokigen.pkremote.preference.ricohgr2.RicohGr2PreferenceFragment;
 
 import androidx.annotation.NonNull;
@@ -43,6 +44,28 @@ public class CameraSceneUpdater implements ICameraStatusReceiver, IChangeScene
         this.activity = activity;
     }
 
+    /**
+     *   一番最初のフラグメントを表示する
+     *
+     */
+    public void changeFirstFragment(@NonNull IInterfaceProvider interfaceProvider)
+    {
+        this.interfaceProvider = interfaceProvider;
+
+        // 初期画面へ遷移
+        changeSceneToConfiguration();
+/*
+            LiveViewFragment fragment = LiveViewFragment.newInstance(scenceUpdater, interfaceProvider);
+            scenceUpdater.registerInterface(fragment, interfaceProvider);
+
+            fragment.setRetainInstance(true);
+            FragmentTransaction transaction = getSupportFragmentManager().beginTransaction();
+            transaction.replace(R.id.fragment1, fragment);
+            transaction.commitAllowingStateLoss();
+*/
+
+    }
+
     //  CameraSceneUpdater
     public void registerInterface(@NonNull IStatusViewDrawer statusViewDrawer, @NonNull IInterfaceProvider interfaceProvider)
     {
@@ -199,7 +222,6 @@ public class CameraSceneUpdater implements ICameraStatusReceiver, IChangeScene
                 try
                 {
                     preferenceFragment = RicohGr2PreferenceFragment.newInstance(activity, this);
-/*
                     ICameraConnection.CameraConnectionMethod connectionMethod = interfaceProvider.getCammeraConnectionMethod();
                     if (connectionMethod == ICameraConnection.CameraConnectionMethod.RICOH) {
                         preferenceFragment = RicohGr2PreferenceFragment.newInstance(activity, this);
@@ -207,9 +229,8 @@ public class CameraSceneUpdater implements ICameraStatusReceiver, IChangeScene
                     //    preferenceFragment = SonyPreferenceFragment.newInstance(this, this);
                     } else //  if (connectionMethod == ICameraConnection.CameraConnectionMethod.OPC)
                     {
-                        preferenceFragment = PreferenceFragment.newInstance(activity, interfaceProvider, this);
+                        preferenceFragment = OpcPreferenceFragment.newInstance(activity, interfaceProvider, this);
                     }
-*/
                 }
                 catch (Exception e)
                 {

diff --git a/app/src/main/res/drawable/ic_navigate_before_black_24dp.xml b/app/src/main/res/drawable/ic_navigate_before_black_24dp.xml
new file mode 100644 (file)
index 0000000..e6bb3ca
--- /dev/null
+++ b/app/src/main/res/drawable/ic_navigate_before_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M15.41,7.41L14,6l-6,6 6,6 1.41,-1.41L10.83,12z"/>
+</vector>

diff --git a/app/src/main/res/drawable/ic_navigate_before_light_grey_24dp.xml b/app/src/main/res/drawable/ic_navigate_before_light_grey_24dp.xml
new file mode 100644 (file)
index 0000000..b548f99
--- /dev/null
+++ b/app/src/main/res/drawable/ic_navigate_before_light_grey_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FAFAFA"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M15.41,7.41L14,6l-6,6 6,6 1.41,-1.41L10.83,12z"/>
+</vector>

diff --git a/app/src/main/res/drawable/ic_navigate_next_black_24dp.xml b/app/src/main/res/drawable/ic_navigate_next_black_24dp.xml
new file mode 100644 (file)
index 0000000..2483512
--- /dev/null
+++ b/app/src/main/res/drawable/ic_navigate_next_black_24dp.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+        android:width="24dp"
+        android:height="24dp"
+        android:viewportWidth="24.0"
+        android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M10,6L8.59,7.41 13.17,12l-4.58,4.59L10,18l6,-6z"/>
+</vector>

diff --git a/app/src/main/res/drawable/ic_navigate_next_light_grey_24dp.xml b/app/src/main/res/drawable/ic_navigate_next_light_grey_24dp.xml
new file mode 100644 (file)
index 0000000..6c28ff4
--- /dev/null
+++ b/app/src/main/res/drawable/ic_navigate_next_light_grey_24dp.xml
@@ -0,0 +1,5 @@
+<vector android:height="24dp" android:tint="#FAFAFA"
+    android:viewportHeight="24.0" android:viewportWidth="24.0"
+    android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
+    <path android:fillColor="#FF000000" android:pathData="M10,6L8.59,7.41 13.17,12l-4.58,4.59L10,18l6,-6z"/>
+</vector>

diff --git a/app/src/main/res/layout/fragment_calendar.xml b/app/src/main/res/layout/fragment_calendar.xml
new file mode 100644 (file)
index 0000000..e4f3238
--- /dev/null
+++ b/app/src/main/res/layout/fragment_calendar.xml
@@ -0,0 +1,1293 @@
+<?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"
+    android:layout_height="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>
+
+    <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/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_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>
+
+    <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"
+            android:layout_weight="1"
+            android:textSize="8pt"
+            style="?android:attr/buttonBarButtonStyle"
+            >
+        </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/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"
+            >
+        </TextView>
+    </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"
+            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_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="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"
+            >
+        </TextView>
+    </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"
+            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_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="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"
+            >
+        </TextView>
+    </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"
+            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_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="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"
+            >
+        </TextView>
+    </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"
+            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:background="@color/background_translucent_dark"
+        >
+
+        <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"
+            >
+        </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>
+

diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 1f30e43..632f532 100644 (file)
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,6 +1,8 @@
 <resources>
     <string name="app_name">PKRemote</string>
     <string name="blank"> </string>
+    <string name="dummy">##</string>
+    <string name="button">Button</string>
 
     <string name="configuration">Settings</string>
     <string name="restore">Restore</string>
@@ -42,8 +44,9 @@
 
     <string name="pref_gr2_display_mode">Display Mode</string>
     <string name="pref_gr2_display_camera_view">Mirror Camera Screen</string>
-    <string name="pref_gr2_display_camera_view_summary">Use same camera screen.</string>
+    <string name="pref_gr2_display_camera_view_summary">Use same camera screen.(GR2 Only)</string>
     <string name="pref_gr2_lcd_sleep">Screen off during connected</string>
+    <string name="pref_gr2_lcd_sleep_summary">This switch effects only GR2.</string>
 
     <string name="pref_cat_others">Others</string>
     <string name="pref_call_share_after_save">Share after Save</string>
@@ -53,7 +56,7 @@
     <string name="summary_use_gr2_special_command">Use some GR2 special command.</string>
 
     <string name="pref_pentax_capture_after_auto_focus">Capture after AF(PENTAX)</string>
-    <string name="summary_pentax_capture_after_auto_focus">Capture after AF.(for PENTAX DSLR, need restart)</string>
+    <string name="summary_pentax_capture_after_auto_focus">Capture after AF.(for PENTAX DSLR, needs restart)</string>
 
     <string name="pref_cat_gokigen">GOKIGEN</string>
     <string name="pref_instruction_manual">Instructions</string>
@@ -104,4 +107,13 @@
     <string name="pref_media_status">SD Card Status</string>
     <string name="pref_camera_version">Camera Version</string>
     <string name="pref_camerakit_version">Camera kit Version</string>
+
+    <string name="today">Today</string>
+    <string name="sundayLabel">Sun</string>
+    <string name="mondayLabel">Mon</string>
+    <string name="tuesdayLabel">Tue</string>
+    <string name="wednesdayLabel">Wed</string>
+    <string name="thursdayLabel">Thu</string>
+    <string name="fridayLabel">Fri</string>
+    <string name="saturdayLabel">Sat</string>
 </resources>

diff --git a/app/src/main/res/xml/larrowbuttonstyle.xml b/app/src/main/res/xml/larrowbuttonstyle.xml
new file mode 100644 (file)
index 0000000..577e080
--- /dev/null
+++ b/app/src/main/res/xml/larrowbuttonstyle.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item
+        android:state_pressed="true"
+        android:drawable="@drawable/ic_navigate_before_light_grey_24dp"
+    />
+    <item
+        android:state_focused="true"
+        android:drawable="@drawable/ic_navigate_before_light_grey_24dp"
+    />
+    <item
+        android:drawable="@drawable/ic_navigate_before_black_24dp"
+    />
+</selector>

diff --git a/app/src/main/res/xml/preferences_ricoh_gr2.xml b/app/src/main/res/xml/preferences_ricoh_gr2.xml
index 10a13fc..1ebd267 100644 (file)
--- a/app/src/main/res/xml/preferences_ricoh_gr2.xml
+++ b/app/src/main/res/xml/preferences_ricoh_gr2.xml
@@ -36,7 +36,8 @@
 
         <CheckBoxPreference
             android:key="gr2_lcd_sleep"
-            android:title="@string/pref_gr2_lcd_sleep" />
+            android:title="@string/pref_gr2_lcd_sleep"
+            android:summary="@string/pref_gr2_lcd_sleep_summary" />
 
         <CheckBoxPreference
             android:key="auto_connect_to_camera"

diff --git a/app/src/main/res/xml/rarrowbuttonstyle.xml b/app/src/main/res/xml/rarrowbuttonstyle.xml
new file mode 100644 (file)
index 0000000..1c307c7
--- /dev/null
+++ b/app/src/main/res/xml/rarrowbuttonstyle.xml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android" >
+    <item
+        android:state_pressed="true"
+        android:drawable="@drawable/ic_navigate_next_light_grey_24dp"
+    />
+    <item
+        android:state_focused="true"
+        android:drawable="@drawable/ic_navigate_next_light_grey_24dp"
+    />
+    <item
+        android:drawable="@drawable/ic_navigate_next_black_24dp"
+    />
+</selector>