몰디 지도 프래그먼트 6차

app/app.iml

@@ -117,45 +117,32 @@
     <orderEntry type="library" name="com.google.code.gson:gson:2.8.0@jar" level="project" />
     <orderEntry type="library" name="com.android.support:support-media-compat-26.1.0" level="project" />
     <orderEntry type="library" name="com.android.support:recyclerview-v7-26.1.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="junit:junit:4.12@jar" level="project" />
+    <orderEntry type="library" name="com.google.android.gms:play-services-location-license-12.0.1" level="project" />
+    <orderEntry type="library" name="com.google.android.gms:play-services-tasks-12.0.1" level="project" />
     <orderEntry type="library" name="android.arch.lifecycle:common:1.0.0@jar" level="project" />
-    <orderEntry type="library" name="com.google.android.gms:play-services-base-license-11.8.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="com.android.support.test.espresso:espresso-core-3.0.1" level="project" />
+    <orderEntry type="library" name="com.google.android.gms:play-services-basement-12.0.1" level="project" />
     <orderEntry type="library" name="com.android.support:support-fragment-26.1.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="javax.inject:javax.inject:1@jar" level="project" />
-    <orderEntry type="library" scope="TEST" name="com.squareup:javawriter:2.1.1@jar" level="project" />
     <orderEntry type="library" name="com.android.support:support-vector-drawable-26.1.0" level="project" />
     <orderEntry type="library" name="android.arch.lifecycle:runtime-1.0.0" level="project" />
     <orderEntry type="library" name="com.android.support:appcompat-v7-26.1.0" level="project" />
-    <orderEntry type="library" name="com.google.android.gms:play-services-basement-license-11.8.0" level="project" />
-    <orderEntry type="library" name="com.google.android.gms:play-services-maps-license-11.8.0" level="project" />
+    <orderEntry type="library" name="com.google.android.gms:play-services-base-license-12.0.1" level="project" />
     <orderEntry type="library" name="com.android.support:support-annotations:26.1.0@jar" level="project" />
-    <orderEntry type="library" name="com.android.support.constraint:constraint-layout-solver:1.0.2@jar" level="project" />
+    <orderEntry type="library" name="com.google.android.gms:play-services-maps-12.0.1" level="project" />
     <orderEntry type="library" name="com.android.support:support-core-utils-26.1.0" level="project" />
-    <orderEntry type="library" name="com.android.support.constraint:constraint-layout-1.0.2" level="project" />
     <orderEntry type="library" name="com.android.support:support-core-ui-26.1.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="com.android.support.test:runner-1.0.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="com.android.support.test:rules-1.0.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="com.google.code.findbugs:jsr305:2.0.1@jar" level="project" />
-    <orderEntry type="library" scope="TEST" name="com.android.support.test.espresso:espresso-idling-resource-3.0.1" level="project" />
-    <orderEntry type="library" scope="TEST" name="org.hamcrest:hamcrest-core:1.3@jar" level="project" />
+    <orderEntry type="library" name="com.google.android.gms:play-services-maps-license-12.0.1" level="project" />
+    <orderEntry type="library" name="com.google.android.gms:play-services-location-12.0.1" level="project" />
     <orderEntry type="library" name="com.jakewharton:butterknife-8.8.1" level="project" />
     <orderEntry type="library" name="com.android.support:support-compat-26.1.0" level="project" />
     <orderEntry type="library" name="com.jakewharton:butterknife-annotations:8.8.1@jar" level="project" />
-    <orderEntry type="library" name="com.google.android.gms:play-services-maps-11.8.0" level="project" />
-    <orderEntry type="library" name="com.google.android.gms:play-services-basement-11.8.0" level="project" />
     <orderEntry type="library" name="android.arch.core:common:1.0.0@jar" level="project" />
-    <orderEntry type="library" scope="TEST" name="org.hamcrest:hamcrest-library:1.3@jar" level="project" />
-    <orderEntry type="library" scope="TEST" name="org.hamcrest:hamcrest-integration:1.3@jar" level="project" />
-    <orderEntry type="library" name="com.google.android.gms:play-services-tasks-11.8.0" level="project" />
+    <orderEntry type="library" name="com.google.android.gms:play-services-base-12.0.1" level="project" />
+    <orderEntry type="library" name="com.google.android.gms:play-services-basement-license-12.0.1" level="project" />
     <orderEntry type="library" name="com.android.support:support-v4-26.1.0" level="project" />
-    <orderEntry type="library" name="com.google.android.gms:play-services-location-license-11.8.0" level="project" />
-    <orderEntry type="library" name="com.google.android.gms:play-services-location-11.8.0" level="project" />
-    <orderEntry type="library" scope="TEST" name="net.sf.kxml:kxml2:2.3.0@jar" level="project" />
     <orderEntry type="library" name="com.android.support:animated-vector-drawable-26.1.0" level="project" />
+    <orderEntry type="library" name="com.google.android.gms:play-services-tasks-license-12.0.1" level="project" />
     <orderEntry type="library" name="com.android.support:design-26.1.0" level="project" />
     <orderEntry type="library" name="com.android.support:transition-26.1.0" level="project" />
-    <orderEntry type="library" name="com.google.android.gms:play-services-base-11.8.0" level="project" />
-    <orderEntry type="library" name="com.google.android.gms:play-services-tasks-license-11.8.0" level="project" />
+    <orderEntry type="library" name="com.android.support:cardview-v7-26.1.0" level="project" />
   </component>
 </module>

app/build.gradle

@@ -8,11 +8,12 @@ android {
         targetSdkVersion 26
         versionCode 1
         versionName "1.0"
-        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+        resConfigs "en", "es", "ja", "in"
     }
     buildTypes {
         release {
-            minifyEnabled false
+            minifyEnabled true
+            shrinkResources true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
@@ -22,15 +23,12 @@ dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation 'com.android.support:appcompat-v7:26.1.0'
     implementation 'com.android.support:design:26.1.0'
-    implementation 'com.android.support.constraint:constraint-layout:1.0.2'
     implementation 'com.android.support:support-v4:26.1.0'
-    implementation 'com.google.android.gms:play-services-maps:11.8.0'
-    implementation 'com.google.android.gms:play-services-location:11.8.0'
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.1'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
+    implementation 'com.google.android.gms:play-services-maps:12.0.1'
+    implementation 'com.google.android.gms:play-services-location:12.0.1'
     compile 'com.jakewharton:butterknife:8.8.1'
     annotationProcessor 'com.jakewharton:butterknife-compiler:8.8.1'
-    compile 'com.android.support:recyclerview-v7:25.3.1'
+    compile 'com.android.support:recyclerview-v7:26.1.0'
+    compile 'com.android.support:cardview-v7:26.1.0'
     compile 'com.google.code.gson:gson:2.8.0'
 }

app/src/main/AndroidManifest.xml

@@ -1,29 +1,43 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.limefriends.molde">
-    <uses-permission android:name="android.permission.INTERNET"/>
+
+    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
-        android:supportsRtl="true"
-        android:theme="@style/AppTheme">
+        android:supportsRtl="true">
         <activity
             android:name=".MoldeMainActivity"
-            android:label="@string/app_name">
+            android:label="@string/app_name"
+            android:screenOrientation="portrait"
+            android:theme="@style/AppNoBarTheme">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
 
+        <activity
+            android:name=".menu_map.MoldeSearchMapInfoActivity"
+            android:theme="@style/AppNoBarTheme" />
+
+        <activity
+            android:name=".menu_map.MoldeReportActivity"
+            android:theme="@style/AppTheme">
+            <meta-data
+                android:name="android.support.PARENT_ACTIVITY"
+                android:value=".MoldeMainActivity"/>
+        </activity>
+
         <meta-data
             android:name="com.google.android.geo.API_KEY"
             android:value="AIzaSyAqi9cIlxH_iWsEpaXuuQ2EJ-rGFAoVT1g" />
-
-        <activity android:name=".menu_map.MoldeSearchMapInfoActivity"></activity>
     </application>
 
 </manifest>

app/src/main/java/com/limefriends/molde/MoldeMainActivity.java

@@ -1,14 +1,20 @@
 package com.limefriends.molde;
 
-import android.support.v4.app.Fragment;
+import android.content.Context;
+import android.content.Intent;
 import android.os.Bundle;
 import android.support.annotation.NonNull;
 import android.support.design.widget.BottomNavigationView;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
 import android.support.v4.app.FragmentTransaction;
 import android.support.v7.app.AppCompatActivity;
 import android.view.MenuItem;
+import android.widget.Toast;
 
 import com.limefriends.molde.menu_magazine.MoldeMagazineFragment;
+import com.limefriends.molde.menu_map.entity.MoldeSearchMapHistoryEntity;
+import com.limefriends.molde.menu_map.entity.MoldeSearchMapInfoEntity;
 import com.limefriends.molde.menu_map.MoldeMapFragment;
 import com.limefriends.molde.menu_mypage.MoldeMyPageFragment;
 import com.limefriends.molde.menu_reportlist.MoldeReportListFragment;
@@ -17,16 +23,24 @@
 import butterknife.ButterKnife;
 
 public class MoldeMainActivity extends AppCompatActivity {
-    @BindView(R.id.navigation) BottomNavigationView navigation;
-    FragmentTransaction ft;
+    public static Context allContext;
+    @BindView(R.id.navigation)
+    BottomNavigationView navigation;
 
+    private long lastTimeBackPressed;
+    private FragmentTransaction ft;
+    private FragmentManager fm;
+    private MoldeSearchMapInfoEntity entity;
+    private MoldeSearchMapHistoryEntity historyEntity;
+    private Fragment fragment;
     private BottomNavigationView.OnNavigationItemSelectedListener mOnNavigationItemSelectedListener
             = new BottomNavigationView.OnNavigationItemSelectedListener() {
         @Override
         public boolean onNavigationItemSelected(@NonNull MenuItem item) {
             switch (item.getItemId()) {
                 case R.id.main_menu_map:
-                    replaceFragment(MoldeMapFragment.newInstance());
+                    fragment = MoldeMapFragment.newInstance();
+                    replaceFragment(fragment);
                     return true;
                 case R.id.main_menu_magazine:
                     replaceFragment(MoldeMagazineFragment.newInstance());
@@ -42,21 +56,74 @@ public boolean onNavigationItemSelected(@NonNull MenuItem item) {
         }
 
     };
+    onKeyBackPressedListener mOnKeyBackPressedListener;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_molde_main);
         ButterKnife.bind(this);
+
+        fragment = MoldeMapFragment.newInstance();
         BottomNavigationViewHelper.disableShiftMode(navigation);
         navigation.setOnNavigationItemSelectedListener(mOnNavigationItemSelectedListener);
-        ft = getSupportFragmentManager().beginTransaction();
-        ft.add(R.id.menu_fragment, MoldeMapFragment.newInstance()).commit();
+        fm = getSupportFragmentManager();
+        ft = fm.beginTransaction();
+        ft.add(R.id.menu_fragment, fragment).commit();
+        allContext = this;
+    }
+    @Override
+    public void onRequestPermissionsResult(int requestCode, @NonNull String[] permissions, @NonNull int[] grantResults) {
+        if (fragment != null && fragment instanceof MoldeMapFragment) {
+            ((MoldeMapFragment) fragment).onPermissionCheck(requestCode, permissions, grantResults);
+        }
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+
+
     }
 
     private void replaceFragment(Fragment fm) {
         ft = getSupportFragmentManager().beginTransaction();
         ft.replace(R.id.menu_fragment, fm).commit();
     }
 
+    @Override
+    protected void onResume() {
+        super.onResume();
+        Intent intent = getIntent();
+        entity = (MoldeSearchMapInfoEntity) intent.getSerializableExtra("mapInfo");
+        historyEntity = (MoldeSearchMapHistoryEntity) intent.getSerializableExtra("mapHistoryInfo");
+
+    }
+
+    public MoldeSearchMapInfoEntity getMapInfoResultData() {
+        return this.entity;
+    }
+
+    public MoldeSearchMapHistoryEntity getMapHistoryResultData() {
+        return this.historyEntity;
+    }
+
+    public interface onKeyBackPressedListener {
+        void onBackKey();
+    }
+
+    public void setOnKeyBackPressedListener(onKeyBackPressedListener listener) {
+        mOnKeyBackPressedListener = listener;
+    }
+
+    @Override
+    public void onBackPressed() {
+        if (System.currentTimeMillis() > lastTimeBackPressed + 1500) {
+            lastTimeBackPressed = System.currentTimeMillis();
+            Toast.makeText(getApplicationContext(), "한번 더 누르면 종료", Toast.LENGTH_SHORT);
+            if (mOnKeyBackPressedListener != null) {
+                mOnKeyBackPressedListener.onBackKey();
+                return;
+            }
+            return;
+        } else {
+            finish();
+        }
+    }
 }

app/src/main/java/com/limefriends/molde/menu_magazine/MoldeMagazineFragment.java

@@ -1,14 +1,16 @@
 package com.limefriends.molde.menu_magazine;
 
+import android.content.Context;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 
+import com.limefriends.molde.MoldeMainActivity;
 import com.limefriends.molde.R;
 
-public class MoldeMagazineFragment extends Fragment {
+public class MoldeMagazineFragment extends Fragment implements MoldeMainActivity.onKeyBackPressedListener{
 
     public static MoldeMagazineFragment newInstance() {
         return new MoldeMagazineFragment();
@@ -17,9 +19,16 @@ public static MoldeMagazineFragment newInstance() {
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
-
-        return inflater.inflate(R.layout.fragment_molde_magazine, container, false);
+        return inflater.inflate(R.layout.magazine_fragment, container, false);
     }
 
+    @Override
+    public void onAttach(Context context) {
+        super.onAttach(context);
+        ((MoldeMainActivity)context).setOnKeyBackPressedListener(this);
+    }
 
+    @Override
+    public void onBackKey() {
+    }
 }