1. [DCA-37] [Android] 기존 OKR버튼, 뷰 제거

2. [DCA-47] [Android] MyHome>Profile, 유닛 정보 누르면 유닛 상세 페이지로 이동

.gitignore

@@ -35,15 +35,15 @@ proguard/
 captures/
 
 # IntelliJ
-*.iml
-.idea/workspace.xml
+/*.iml
+/.idea/workspace.xml
 .idea/tasks.xml
-.idea/gradle.xml
+/.idea/gradle.xml
 .idea/assetWizardSettings.xml
 .idea/dictionaries
-.idea/libraries
-.idea/caches
-.idea/misc.xml
+/.idea/libraries
+/.idea/caches
+/.idea/misc.xml
 
 # Keystore files
 # Uncomment the following line if you do not want to check your keystore files in.
@@ -67,3 +67,11 @@ fastlane/screenshots
 fastlane/test_output
 fastlane/readme.md
 
+.DS_Store
+.idea/codeStyles/codeStyleConfig.xml
+app/.DS_Store
+app/release/.DS_Store
+app/release/output.json
+app/src/.DS_Store
+app/src/main/.DS_Store
+app/src/main/res/.DS_Store

.idea/libraries/Gradle__com_crashlytics_sdk_android_answers_1_4_0_SNAPSHOT.xml

@@ -1,10 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.crashlytics.sdk.android:answers-1.4.0-SNAPSHOT">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/answers-1.4.0-SNAPSHOT.aar/458f6cd12f1bc04c0e905e077c2b612b/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/answers-1.4.0-SNAPSHOT.aar/458f6cd12f1bc04c0e905e077c2b612b/res" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>

.idea/libraries/Gradle__com_crashlytics_sdk_android_beta_1_2_6_SNAPSHOT.xml

@@ -1,10 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.crashlytics.sdk.android:beta-1.2.6-SNAPSHOT">
-    <CLASSES>
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/beta-1.2.6-SNAPSHOT.aar/e5654f3ddad3c9aa771009f7359e49a2/res" />
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/beta-1.2.6-SNAPSHOT.aar/e5654f3ddad3c9aa771009f7359e49a2/jars/classes.jar!/" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>

.idea/libraries/Gradle__com_crashlytics_sdk_android_crashlytics_2_7_0_SNAPSHOT.xml

@@ -1,10 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.crashlytics.sdk.android:crashlytics-2.7.0-SNAPSHOT">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/crashlytics-2.7.0-SNAPSHOT.aar/83982d820720d1e6388e0e783aedd723/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/crashlytics-2.7.0-SNAPSHOT.aar/83982d820720d1e6388e0e783aedd723/res" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>

.idea/libraries/Gradle__com_crashlytics_sdk_android_crashlytics_core_2_4_0_SNAPSHOT.xml

@@ -1,10 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: com.crashlytics.sdk.android:crashlytics-core-2.4.0-SNAPSHOT">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/crashlytics-core-2.4.0-SNAPSHOT.aar/629f4c931b87d39592957aa5f37efc5d/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/crashlytics-core-2.4.0-SNAPSHOT.aar/629f4c931b87d39592957aa5f37efc5d/res" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>

.idea/libraries/Gradle__io_fabric_sdk_android_fabric_1_4_0_SNAPSHOT.xml

@@ -1,10 +0,0 @@
-<component name="libraryTable">
-  <library name="Gradle: io.fabric.sdk.android:fabric-1.4.0-SNAPSHOT">
-    <CLASSES>
-      <root url="jar://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/fabric-1.4.0-SNAPSHOT.aar/981d7f09293fe272aed63c3e62702ebb/jars/classes.jar!/" />
-      <root url="file://$USER_HOME$/.gradle/caches/transforms-1/files-1.1/fabric-1.4.0-SNAPSHOT.aar/981d7f09293fe272aed63c3e62702ebb/res" />
-    </CLASSES>
-    <JAVADOC />
-    <SOURCES />
-  </library>
-</component>

app/.gitignore

@@ -1 +1,2 @@
 /build
+*.iml

app/src/main/java/kr/co/hanwha/hifive/screen/main/setting/myhome/MyHomeActivity.java

@@ -1,6 +1,5 @@
 package kr.co.hanwha.hifive.screen.main.setting.myhome;
 
-import android.content.Intent;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.v4.view.PagerAdapter;
@@ -19,7 +18,6 @@ import java.util.List;
 import kr.co.hanwha.hifive.R;
 import kr.co.hanwha.hifive.adapter.SettingMyHomeTodoListAdapter;
 import kr.co.hanwha.hifive.base.BaseActivity;
-import kr.co.hanwha.hifive.data.model.MemberHrData;
 import kr.co.hanwha.hifive.data.model.ProjectInfoData;
 import kr.co.hanwha.hifive.data.model.TaskData;
 import kr.co.hanwha.hifive.enums.BaseAnimationType;
@@ -179,7 +177,7 @@ public class MyHomeActivity extends BaseActivity implements MyHomeContract.View
     };
 
     /**************************************************
-     * MainHomeContract.OnMainHomeListListener
+     * MyHomeContract.OnSettingMyHomeTodoListListener
      **************************************************/
     MyHomeContract.OnSettingMyHomeTodoListListener onMyHomeTodoListListener = new MyHomeContract.OnSettingMyHomeTodoListListener() {
         @Override
@@ -218,9 +216,15 @@ public class MyHomeActivity extends BaseActivity implements MyHomeContract.View
         if (mLinearLayoutContainer.getChildCount() > 0)
             mLinearLayoutContainer.removeAllViews();
 
-        for (ProjectInfoData pid : projects) {
+        for (final ProjectInfoData pid : projects) {
             HFMyHomeProfileUnitView view = new HFMyHomeProfileUnitView(this);
             view.setProjectInfo(ProjectEvaluationType.valueOf(pid.getEvaluation()), pid.getProject_name());
+            view.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    HFActivityUtil.startDashboardProjectActivity(MyHomeActivity.this, pid.getProject_id());
+                }
+            });
             mLinearLayoutContainer.addView(view);
         }
     }

app/src/main/res/layout/fragment_main_home.xml

@@ -121,7 +121,8 @@
                     android:paddingLeft="8.5dp"
                     android:paddingRight="8.5dp"
                     android:paddingTop="2dp"
-                    android:text="@string/main_okr_title" />
+                    android:text="@string/main_okr_title"
+                    android:visibility="gone" />
             </LinearLayout>
         </RelativeLayout>
 

hf-android.iml

@@ -8,7 +8,7 @@
       </configuration>
     </facet>
   </component>
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
+  <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_7" inherit-compiler-output="true">
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />