Merge branch 'master' of http://timesfun.net/chudinhbka/lifelog_android

Dinh Chu
2 parents cf00f22ab4 6b038e4433
Showing 8 changed files Side-by-side Diff
.idea/modules.xml
app/src/main/AndroidManifest.xml
app/src/main/java/com/dinhcv/lifelogpedometer/activity/MapFragment.java
app/src/main/java/com/dinhcv/lifelogpedometer/activity/PedometerActivity.java
app/src/main/java/com/dinhcv/lifelogpedometer/activity/WelcomeActivity.java
app/src/main/res/drawable/test_selector.xml
app/src/main/res/layout/customtab.xml
app/src/main/res/layout/notice_list_item.xml
@@ -3,7 +3,7 @@
   <component name="ProjectModuleManager">
     <modules>
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
-      <module fileurl="file://$PROJECT_DIR$/lifelog_android.iml" filepath="$PROJECT_DIR$/lifelog_android.iml" />
+      <module fileurl="file://$PROJECT_DIR$/lifelog_new.iml" filepath="$PROJECT_DIR$/lifelog_new.iml" />
       <module fileurl="file://D:\Project\Git\lifelog_android\lifelogpedometer.iml" filepath="D:\Project\Git\lifelog_android\lifelogpedometer.iml" />
     </modules>
   </component>
@@ -12,6 +12,7 @@
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="com.google.android.providers.gsf.permission.READ_GSERVICES" />
     <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
+    <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
  
     <application
         android:name=".LifeLogApplication"
 package com.dinhcv.lifelogpedometer.activity;
  
+import android.Manifest;
 import android.app.Activity;
 import android.content.Context;
+import android.content.pm.PackageManager;
+import android.location.Location;
+import android.location.LocationListener;
+import android.location.LocationManager;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
+import android.support.v4.app.ActivityCompat;
+import android.support.v4.content.ContextCompat;
 import android.support.v4.app.Fragment;
 import android.util.Log;
 import android.view.LayoutInflater;
  
  
  
  
@@ -11,12 +18,32 @@
 import android.view.ViewGroup;
  
 import com.dinhcv.lifelogpedometer.R;
+import com.google.android.gms.maps.CameraUpdateFactory;
 import com.google.android.gms.maps.GoogleMap;
 import com.google.android.gms.maps.OnMapReadyCallback;
+import com.google.android.gms.maps.SupportMapFragment;
+import com.google.android.gms.maps.model.LatLng;
+import com.google.android.gms.maps.model.MarkerOptions;
+import com.google.android.gms.maps.model.PolylineOptions;
  
+import static android.content.Context.LOCATION_SERVICE;
+
 public class MapFragment extends Fragment implements SettingFragmentPresenter, OnMapReadyCallback {
     private View mRootView;
+    private PolylineOptions polylineOptions = new PolylineOptions();
+    private LocationManager mLocationManager;
+    // The minimum distance to change Updates in meters
+    private static final long LOCATION_REFRESH_DISTANCE = 10;
  
+    // The minimum time between updates in milliseconds
+    private static final long LOCATION_REFRESH_TIME = 10000;
+
+    private double lat = 0;
+    private double log = 0;
+
+    private SupportMapFragment mapFragment;
+    private GoogleMap googleMap;
+
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle
             savedInstanceState) {
  
  
  
  
  
@@ -36,17 +63,71 @@
      * @param rootView view
      */
     private void initView(View rootView) {
+        mapFragment = (SupportMapFragment) getChildFragmentManager()
+                .findFragmentById(R.id.map);
  
+        polylineOptions.color(ContextCompat.getColor(getActivity(),android.R.color.holo_red_dark));
+
     }
  
     /**
      * Init data
      */
     private void initData() {
+        mLocationManager = (LocationManager) getActivity().getSystemService(LOCATION_SERVICE);
  
+        if (ActivityCompat.checkSelfPermission(getActivity(), Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(getActivity(), Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
+            return;
+        }
+        mLocationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, LOCATION_REFRESH_TIME,
+                LOCATION_REFRESH_DISTANCE, mLocationListener);
     }
  
+    private final LocationListener mLocationListener = new LocationListener() {
+        @Override
+        public void onLocationChanged(final Location location) {
+            //your code here
+            lat = location.getLatitude();
+            log = location.getLongitude();
+            polylineOptions.add(new LatLng(lat, log));
+            if (googleMap!= null) {
+                googleMap.addPolyline(polylineOptions);
+            }
+            //update
+            update();
+        }
  
+        @Override
+        public void onStatusChanged(String s, int i, Bundle bundle) {
+
+        }
+
+        @Override
+        public void onProviderEnabled(String s) {
+
+        }
+
+        @Override
+        public void onProviderDisabled(String s) {
+
+        }
+    };
+
+    private void update(){
+        mapFragment.getMapAsync(this);
+    }
+
+    private void updateLine(){
+        LatLng sydney = new LatLng(-34, 151);
+        LatLng melbourne=new LatLng(37.813, 144.9631);
+        LatLng auckland=new LatLng(36.8485, 174.7633);
+
+        polylineOptions.add(new LatLng[]{sydney,melbourne,auckland});
+        if (googleMap!= null) {
+            googleMap.addPolyline(polylineOptions);
+        }
+    }
+
     @Override
     public void onAttach(Context context) {
         super.onAttach(context);
  
@@ -77,8 +158,17 @@
     }
  
     @Override
-    public void onMapReady(GoogleMap googleMap) {
+    public void onMapReady(GoogleMap gm) {
+
+        googleMap = gm;
+        LatLng pos=new LatLng(lat, log);
+        googleMap.addMarker(new MarkerOptions()
+                .position(pos));
+        googleMap.animateCamera(CameraUpdateFactory.newLatLngZoom(pos, 15.0f));
+
         Log.i("SonLT","Readdy");
+
+        //updateLine();
     }
 }
 package com.dinhcv.lifelogpedometer.activity;
  
 import android.Manifest;
+import android.content.Context;
 import android.content.Intent;
 import android.os.Build;
 import android.os.Bundle;
  
@@ -13,12 +14,14 @@
 import android.support.v7.widget.PopupMenu;
 import android.support.v7.widget.Toolbar;
 import android.view.Gravity;
+import android.view.LayoutInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.view.Window;
 import android.view.WindowManager;
 import android.widget.ImageView;
 import android.widget.PopupWindow;
+import android.widget.TabHost;
 import android.widget.TextView;
 import android.widget.Toast;
  
  
  
@@ -101,9 +104,40 @@
         if (tab != null) {
             tab.select();
         }
+        //mTabLayout.addTab();
+        View view1 = getLayoutInflater().inflate(R.layout.customtab, null);
+        view1.findViewById(R.id.icon).setBackgroundResource(R.drawable.today_ic);
+        //mTabLayout.addTab(mTabLayout.newTab().setCustomView(view1));
  
+
+        View view2 = getLayoutInflater().inflate(R.layout.customtab, null);
+        view2.findViewById(R.id.icon).setBackgroundResource(R.drawable.history_ic);
+        //mTabLayout.addTab(mTabLayout.newTab().setCustomView(view2));
+
+
+        View view3 = getLayoutInflater().inflate(R.layout.customtab, null);
+        view3.findViewById(R.id.icon).setBackgroundResource(R.drawable.rank_ic);
+        //mTabLayout.addTab(mTabLayout.newTab().setCustomView(view3));
+
+
+        View view4 = getLayoutInflater().inflate(R.layout.customtab, null);
+        view4.findViewById(R.id.icon).setBackgroundResource(R.drawable.map_ic);
+        //mTabLayout.addTab(mTabLayout.newTab().setCustomView(view4));
+
+
+        View view5 = getLayoutInflater().inflate(R.layout.customtab, null);
+        view5.findViewById(R.id.icon).setBackgroundResource(R.drawable.sns_ic);
+        //mTabLayout.addTab(mTabLayout.newTab().setCustomView(view5));
+
+
+        mTabLayout.getTabAt(0).setCustomView(view1);
+        mTabLayout.getTabAt(1).setCustomView(view2);
+        mTabLayout.getTabAt(2).setCustomView(view3);
+        mTabLayout.getTabAt(3).setCustomView(view4);
+        mTabLayout.getTabAt(4).setCustomView(view5);
+
         changeColorStatusBar();
-        setupTabIcons();
+        //setupTabIcons();
  
         //SonLT Add
         ivHome.setOnClickListener(new View.OnClickListener() {
  
@@ -161,8 +195,16 @@
         }); //closing the setOnClickListener method
     }
  
+    public TabHost.TabSpec setIndicator(Context ctx, TabHost.TabSpec spec, int viewId, int resId, String name) {
+        View v = LayoutInflater.from(ctx).inflate(R.layout.customtab, null);
+        ImageView imgTab = (ImageView) v.findViewById(viewId);
+        imgTab.setImageDrawable(getResources().getDrawable(resId));
+
+        return spec.setIndicator(v);
+    }
+
     private void setupTabIcons() {
-        mTabLayout.getTabAt(0).setIcon(tabIcons[0]);
+        mTabLayout.getTabAt(0).setCustomView(tabIcons[0]);
         mTabLayout.getTabAt(1).setIcon(tabIcons[1]);
         mTabLayout.getTabAt(2).setIcon(tabIcons[2]);
         mTabLayout.getTabAt(3).setIcon(tabIcons[3]);
 package com.dinhcv.lifelogpedometer.activity;
  
+import android.Manifest;
 import android.app.ProgressDialog;
 import android.content.DialogInterface;
 import android.content.Intent;
+import android.content.pm.PackageManager;
 import android.net.Uri;
+import android.os.Build;
 import android.os.Bundle;
 import android.os.Handler;
+import android.support.v4.app.ActivityCompat;
+import android.support.v4.content.ContextCompat;
 import android.support.v7.app.AlertDialog;
+import android.widget.Toast;
  
 import com.dinhcv.lifelogpedometer.R;
 import com.dinhcv.lifelogpedometer.interfaces.LLAPIManagerListener;
  
@@ -21,11 +27,13 @@
  
 public class WelcomeActivity extends ActivityBase implements Runnable {
     private boolean isRefresh = false;
+    private static final int PERMISSIONS_REQUEST = 999;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
         setContentView(R.layout.activity_welcome);
-        checkRefreshToken();
+        checkPermission();
     }
  
     private void checkRefreshToken(){
@@ -101,6 +109,60 @@
     @Override
     protected void onResume() {
         super.onResume();
+    }
+
+    private void checkPermission() {
+        // Check all permission in android 6.0
+        if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+            if ((ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_COARSE_LOCATION)
+                    == PackageManager.PERMISSION_GRANTED) && (ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION)
+                    == PackageManager.PERMISSION_GRANTED)) {
+                checkRefreshToken();
+
+            } else {
+                // Requset permisson of device
+                if (ActivityCompat.shouldShowRequestPermissionRationale(this, Manifest.permission
+                        .ACCESS_COARSE_LOCATION)
+                        && ActivityCompat.shouldShowRequestPermissionRationale(this, Manifest
+                        .permission.ACCESS_FINE_LOCATION)) {
+                    ActivityCompat.requestPermissions(this,
+                            new String[]{Manifest.permission.ACCESS_COARSE_LOCATION,
+                                    Manifest.permission.ACCESS_FINE_LOCATION},
+                            PERMISSIONS_REQUEST);
+
+                } else {
+                    ActivityCompat.requestPermissions(this,
+                            new String[]{Manifest.permission.ACCESS_COARSE_LOCATION,
+                                    Manifest.permission.ACCESS_FINE_LOCATION},
+                            PERMISSIONS_REQUEST);
+                }
+            }
+
+        } else {
+            checkRefreshToken();
+        }
+    }
+
+    @Override
+    public void onRequestPermissionsResult(int requestCode, String[] permissions, int[]
+            grantResults) {
+        super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+
+        if (requestCode == PERMISSIONS_REQUEST) {
+            if (grantResults.length > 0) {
+                if (grantResults[0] == PackageManager.PERMISSION_GRANTED
+                        && grantResults[1] == PackageManager.PERMISSION_GRANTED
+                        && grantResults[2] == PackageManager.PERMISSION_GRANTED) {
+                    checkRefreshToken();
+                    return;
+                }
+            } else {
+                Toast.makeText(this, "Permission was not granted ", Toast.LENGTH_SHORT).show();
+                finish();
+            }
+        } else {
+            super.onRequestPermissionsResult(requestCode, permissions, grantResults);
+        }
     }
 }
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/history_ic" android:state_selected="true"/>
+    <item android:drawable="@drawable/today_ic"/>
+</selector>
+<?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:padding="3dp">
+
+    <ImageView
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:adjustViewBounds="true"
+        android:src="@drawable/tab_ic"
+        android:id="@+id/icon"
+        android:layout_gravity="center" />
+</LinearLayout>
@@ -3,7 +3,6 @@
     android:orientation="vertical"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
-    android:background="@color/background_main"
     android:padding="4dp">
  
     <TextView
...	...	@@ -3,7 +3,7 @@
3	3	<component name="ProjectModuleManager">
4	4	<modules>
5	5	<module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
6		- <module fileurl="file://$PROJECT_DIR$/lifelog_android.iml" filepath="$PROJECT_DIR$/lifelog_android.iml" />
	6	+ <module fileurl="file://$PROJECT_DIR$/lifelog_new.iml" filepath="$PROJECT_DIR$/lifelog_new.iml" />
7	7	<module fileurl="file://D:\Project\Git\lifelog_android\lifelogpedometer.iml" filepath="D:\Project\Git\lifelog_android\lifelogpedometer.iml" />
8	8	</modules>
9	9	</component>
...	...	@@ -12,6 +12,7 @@
12	12	<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
13	13	<uses-permission android:name="com.google.android.providers.gsf.permission.READ_GSERVICES" />
14	14	<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
	15	+ <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
15	16
16	17	<application
17	18	android:name=".LifeLogApplication"
1	1	package com.dinhcv.lifelogpedometer.activity;
2	2
	3	+import android.Manifest;
3	4	import android.app.Activity;
4	5	import android.content.Context;
	6	+import android.content.pm.PackageManager;
	7	+import android.location.Location;
	8	+import android.location.LocationListener;
	9	+import android.location.LocationManager;
5	10	import android.os.Bundle;
6	11	import android.support.annotation.Nullable;
	12	+import android.support.v4.app.ActivityCompat;
	13	+import android.support.v4.content.ContextCompat;
7	14	import android.support.v4.app.Fragment;
8	15	import android.util.Log;
9	16	import android.view.LayoutInflater;
10	17
11	18
12	19
13	20
...	...	@@ -11,12 +18,32 @@
11	18	import android.view.ViewGroup;
12	19
13	20	import com.dinhcv.lifelogpedometer.R;
	21	+import com.google.android.gms.maps.CameraUpdateFactory;
14	22	import com.google.android.gms.maps.GoogleMap;
15	23	import com.google.android.gms.maps.OnMapReadyCallback;
	24	+import com.google.android.gms.maps.SupportMapFragment;
	25	+import com.google.android.gms.maps.model.LatLng;
	26	+import com.google.android.gms.maps.model.MarkerOptions;
	27	+import com.google.android.gms.maps.model.PolylineOptions;
16	28
	29	+import static android.content.Context.LOCATION_SERVICE;
	30	+
17	31	public class MapFragment extends Fragment implements SettingFragmentPresenter, OnMapReadyCallback {
18	32	private View mRootView;
	33	+ private PolylineOptions polylineOptions = new PolylineOptions();
	34	+ private LocationManager mLocationManager;
	35	+ // The minimum distance to change Updates in meters
	36	+ private static final long LOCATION_REFRESH_DISTANCE = 10;
19	37
	38	+ // The minimum time between updates in milliseconds
	39	+ private static final long LOCATION_REFRESH_TIME = 10000;
	40	+
	41	+ private double lat = 0;
	42	+ private double log = 0;
	43	+
	44	+ private SupportMapFragment mapFragment;
	45	+ private GoogleMap googleMap;
	46	+
20	47	@Override
21	48	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle
22	49	savedInstanceState) {
23	50
24	51
25	52
26	53
27	54
...	...	@@ -36,17 +63,71 @@
36	63	* @param rootView view
37	64	*/
38	65	private void initView(View rootView) {
	66	+ mapFragment = (SupportMapFragment) getChildFragmentManager()
	67	+ .findFragmentById(R.id.map);
39	68
	69	+ polylineOptions.color(ContextCompat.getColor(getActivity(),android.R.color.holo_red_dark));
	70	+
40	71	}
41	72
42	73	/**
43	74	* Init data
44	75	*/
45	76	private void initData() {
	77	+ mLocationManager = (LocationManager) getActivity().getSystemService(LOCATION_SERVICE);
46	78
	79	+ if (ActivityCompat.checkSelfPermission(getActivity(), Manifest.permission.ACCESS_FINE_LOCATION) != PackageManager.PERMISSION_GRANTED && ActivityCompat.checkSelfPermission(getActivity(), Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
	80	+ return;
	81	+ }
	82	+ mLocationManager.requestLocationUpdates(LocationManager.GPS_PROVIDER, LOCATION_REFRESH_TIME,
	83	+ LOCATION_REFRESH_DISTANCE, mLocationListener);
47	84	}
48	85
	86	+ private final LocationListener mLocationListener = new LocationListener() {
	87	+ @Override
	88	+ public void onLocationChanged(final Location location) {
	89	+ //your code here
	90	+ lat = location.getLatitude();
	91	+ log = location.getLongitude();
	92	+ polylineOptions.add(new LatLng(lat, log));
	93	+ if (googleMap!= null) {
	94	+ googleMap.addPolyline(polylineOptions);
	95	+ }
	96	+ //update
	97	+ update();
	98	+ }
49	99
	100	+ @Override
	101	+ public void onStatusChanged(String s, int i, Bundle bundle) {
	102	+
	103	+ }
	104	+
	105	+ @Override
	106	+ public void onProviderEnabled(String s) {
	107	+
	108	+ }
	109	+
	110	+ @Override
	111	+ public void onProviderDisabled(String s) {
	112	+
	113	+ }
	114	+ };
	115	+
	116	+ private void update(){
	117	+ mapFragment.getMapAsync(this);
	118	+ }
	119	+
	120	+ private void updateLine(){
	121	+ LatLng sydney = new LatLng(-34, 151);
	122	+ LatLng melbourne=new LatLng(37.813, 144.9631);
	123	+ LatLng auckland=new LatLng(36.8485, 174.7633);
	124	+
	125	+ polylineOptions.add(new LatLng[]{sydney,melbourne,auckland});
	126	+ if (googleMap!= null) {
	127	+ googleMap.addPolyline(polylineOptions);
	128	+ }
	129	+ }
	130	+
50	131	@Override
51	132	public void onAttach(Context context) {
52	133	super.onAttach(context);
53	134
...	...	@@ -77,8 +158,17 @@
77	158	}
78	159
79	160	@Override
80		- public void onMapReady(GoogleMap googleMap) {
	161	+ public void onMapReady(GoogleMap gm) {
	162	+
	163	+ googleMap = gm;
	164	+ LatLng pos=new LatLng(lat, log);
	165	+ googleMap.addMarker(new MarkerOptions()
	166	+ .position(pos));
	167	+ googleMap.animateCamera(CameraUpdateFactory.newLatLngZoom(pos, 15.0f));
	168	+
81	169	Log.i("SonLT","Readdy");
	170	+
	171	+ //updateLine();
82	172	}
83	173	}
1	1	package com.dinhcv.lifelogpedometer.activity;
2	2
3	3	import android.Manifest;
	4	+import android.content.Context;
4	5	import android.content.Intent;
5	6	import android.os.Build;
6	7	import android.os.Bundle;
7	8
...	...	@@ -13,12 +14,14 @@
13	14	import android.support.v7.widget.PopupMenu;
14	15	import android.support.v7.widget.Toolbar;
15	16	import android.view.Gravity;
	17	+import android.view.LayoutInflater;
16	18	import android.view.MenuItem;
17	19	import android.view.View;
18	20	import android.view.Window;
19	21	import android.view.WindowManager;
20	22	import android.widget.ImageView;
21	23	import android.widget.PopupWindow;
	24	+import android.widget.TabHost;
22	25	import android.widget.TextView;
23	26	import android.widget.Toast;
24	27
25	28
26	29
...	...	@@ -101,9 +104,40 @@
101	104	if (tab != null) {
102	105	tab.select();
103	106	}
	107	+ //mTabLayout.addTab();
	108	+ View view1 = getLayoutInflater().inflate(R.layout.customtab, null);
	109	+ view1.findViewById(R.id.icon).setBackgroundResource(R.drawable.today_ic);
	110	+ //mTabLayout.addTab(mTabLayout.newTab().setCustomView(view1));
104	111
	112	+
	113	+ View view2 = getLayoutInflater().inflate(R.layout.customtab, null);
	114	+ view2.findViewById(R.id.icon).setBackgroundResource(R.drawable.history_ic);
	115	+ //mTabLayout.addTab(mTabLayout.newTab().setCustomView(view2));
	116	+
	117	+
	118	+ View view3 = getLayoutInflater().inflate(R.layout.customtab, null);
	119	+ view3.findViewById(R.id.icon).setBackgroundResource(R.drawable.rank_ic);
	120	+ //mTabLayout.addTab(mTabLayout.newTab().setCustomView(view3));
	121	+
	122	+
	123	+ View view4 = getLayoutInflater().inflate(R.layout.customtab, null);
	124	+ view4.findViewById(R.id.icon).setBackgroundResource(R.drawable.map_ic);
	125	+ //mTabLayout.addTab(mTabLayout.newTab().setCustomView(view4));
	126	+
	127	+
	128	+ View view5 = getLayoutInflater().inflate(R.layout.customtab, null);
	129	+ view5.findViewById(R.id.icon).setBackgroundResource(R.drawable.sns_ic);
	130	+ //mTabLayout.addTab(mTabLayout.newTab().setCustomView(view5));
	131	+
	132	+
	133	+ mTabLayout.getTabAt(0).setCustomView(view1);
	134	+ mTabLayout.getTabAt(1).setCustomView(view2);
	135	+ mTabLayout.getTabAt(2).setCustomView(view3);
	136	+ mTabLayout.getTabAt(3).setCustomView(view4);
	137	+ mTabLayout.getTabAt(4).setCustomView(view5);
	138	+
105	139	changeColorStatusBar();
106		- setupTabIcons();
	140	+ //setupTabIcons();
107	141
108	142	//SonLT Add
109	143	ivHome.setOnClickListener(new View.OnClickListener() {
110	144
...	...	@@ -161,8 +195,16 @@
161	195	}); //closing the setOnClickListener method
162	196	}
163	197
	198	+ public TabHost.TabSpec setIndicator(Context ctx, TabHost.TabSpec spec, int viewId, int resId, String name) {
	199	+ View v = LayoutInflater.from(ctx).inflate(R.layout.customtab, null);
	200	+ ImageView imgTab = (ImageView) v.findViewById(viewId);
	201	+ imgTab.setImageDrawable(getResources().getDrawable(resId));
	202	+
	203	+ return spec.setIndicator(v);
	204	+ }
	205	+
164	206	private void setupTabIcons() {
165		- mTabLayout.getTabAt(0).setIcon(tabIcons[0]);
	207	+ mTabLayout.getTabAt(0).setCustomView(tabIcons[0]);
166	208	mTabLayout.getTabAt(1).setIcon(tabIcons[1]);
167	209	mTabLayout.getTabAt(2).setIcon(tabIcons[2]);
168	210	mTabLayout.getTabAt(3).setIcon(tabIcons[3]);
1	1	package com.dinhcv.lifelogpedometer.activity;
2	2
	3	+import android.Manifest;
3	4	import android.app.ProgressDialog;
4	5	import android.content.DialogInterface;
5	6	import android.content.Intent;
	7	+import android.content.pm.PackageManager;
6	8	import android.net.Uri;
	9	+import android.os.Build;
7	10	import android.os.Bundle;
8	11	import android.os.Handler;
	12	+import android.support.v4.app.ActivityCompat;
	13	+import android.support.v4.content.ContextCompat;
9	14	import android.support.v7.app.AlertDialog;
	15	+import android.widget.Toast;
10	16
11	17	import com.dinhcv.lifelogpedometer.R;
12	18	import com.dinhcv.lifelogpedometer.interfaces.LLAPIManagerListener;
13	19
...	...	@@ -21,11 +27,13 @@
21	27
22	28	public class WelcomeActivity extends ActivityBase implements Runnable {
23	29	private boolean isRefresh = false;
	30	+ private static final int PERMISSIONS_REQUEST = 999;
	31	+
24	32	@Override
25	33	protected void onCreate(Bundle savedInstanceState) {
26	34	super.onCreate(savedInstanceState);
27	35	setContentView(R.layout.activity_welcome);
28		- checkRefreshToken();
	36	+ checkPermission();
29	37	}
30	38
31	39	private void checkRefreshToken(){
...	...	@@ -101,6 +109,60 @@
101	109	@Override
102	110	protected void onResume() {
103	111	super.onResume();
	112	+ }
	113	+
	114	+ private void checkPermission() {
	115	+ // Check all permission in android 6.0
	116	+ if (android.os.Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
	117	+ if ((ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_COARSE_LOCATION)
	118	+ == PackageManager.PERMISSION_GRANTED) && (ContextCompat.checkSelfPermission(this, Manifest.permission.ACCESS_FINE_LOCATION)
	119	+ == PackageManager.PERMISSION_GRANTED)) {
	120	+ checkRefreshToken();
	121	+
	122	+ } else {
	123	+ // Requset permisson of device
	124	+ if (ActivityCompat.shouldShowRequestPermissionRationale(this, Manifest.permission
	125	+ .ACCESS_COARSE_LOCATION)
	126	+ && ActivityCompat.shouldShowRequestPermissionRationale(this, Manifest
	127	+ .permission.ACCESS_FINE_LOCATION)) {
	128	+ ActivityCompat.requestPermissions(this,
	129	+ new String[]{Manifest.permission.ACCESS_COARSE_LOCATION,
	130	+ Manifest.permission.ACCESS_FINE_LOCATION},
	131	+ PERMISSIONS_REQUEST);
	132	+
	133	+ } else {
	134	+ ActivityCompat.requestPermissions(this,
	135	+ new String[]{Manifest.permission.ACCESS_COARSE_LOCATION,
	136	+ Manifest.permission.ACCESS_FINE_LOCATION},
	137	+ PERMISSIONS_REQUEST);
	138	+ }
	139	+ }
	140	+
	141	+ } else {
	142	+ checkRefreshToken();
	143	+ }
	144	+ }
	145	+
	146	+ @Override
	147	+ public void onRequestPermissionsResult(int requestCode, String[] permissions, int[]
	148	+ grantResults) {
	149	+ super.onRequestPermissionsResult(requestCode, permissions, grantResults);
	150	+
	151	+ if (requestCode == PERMISSIONS_REQUEST) {
	152	+ if (grantResults.length > 0) {
	153	+ if (grantResults[0] == PackageManager.PERMISSION_GRANTED
	154	+ && grantResults[1] == PackageManager.PERMISSION_GRANTED
	155	+ && grantResults[2] == PackageManager.PERMISSION_GRANTED) {
	156	+ checkRefreshToken();
	157	+ return;
	158	+ }
	159	+ } else {
	160	+ Toast.makeText(this, "Permission was not granted ", Toast.LENGTH_SHORT).show();
	161	+ finish();
	162	+ }
	163	+ } else {
	164	+ super.onRequestPermissionsResult(requestCode, permissions, grantResults);
	165	+ }
104	166	}
105	167	}
	1	+<?xml version="1.0" encoding="utf-8"?>
	2	+<selector xmlns:android="http://schemas.android.com/apk/res/android">
	3	+ <item android:drawable="@drawable/history_ic" android:state_selected="true"/>
	4	+ <item android:drawable="@drawable/today_ic"/>
	5	+</selector>
	1	+<?xml version="1.0" encoding="utf-8"?>
	2	+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
	3	+ android:orientation="vertical"
	4	+ android:layout_width="match_parent"
	5	+ android:layout_height="match_parent"
	6	+ android:padding="3dp">
	7	+
	8	+ <ImageView
	9	+ android:layout_width="wrap_content"
	10	+ android:layout_height="wrap_content"
	11	+ android:adjustViewBounds="true"
	12	+ android:src="@drawable/tab_ic"
	13	+ android:id="@+id/icon"
	14	+ android:layout_gravity="center" />
	15	+</LinearLayout>
...	...	@@ -3,7 +3,6 @@
3	3	android:orientation="vertical"
4	4	android:layout_width="match_parent"
5	5	android:layout_height="wrap_content"
6		- android:background="@color/background_main"
7	6	android:padding="4dp">
8	7
9	8	<TextView