Skip to content

Commit c5f0559

Browse files
PeterYan-UWPeterYan-UW
committed
Merge pull request #9 from jazbel/master
Map
2 parents 0a1d3bf + d979a54 commit c5f0559

20 files changed

+533
-9
lines changed

‎.classpath

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,5 +5,11 @@
55
<classpathentry exported="true" kind="con" path="com.android.ide.eclipse.adt.DEPENDENCIES"/>
66
<classpathentry kind="src" path="src"/>
77
<classpathentry kind="src" path="gen"/>
8+
<classpathentry kind="lib" path="/Users/sylviahsu/Desktop/Jazbel/UNI/Winter2015/quickblox-android-sdk-master/jars/quickblox-android-sdk-core-2.1.jar"/>
9+
<classpathentry kind="lib" path="/Users/sylviahsu/Desktop/Jazbel/UNI/Winter2015/quickblox-android-sdk-master/jars/quickblox-android-sdk-customobjects-2.1.jar"/>
10+
<classpathentry kind="lib" path="/Users/sylviahsu/Desktop/Jazbel/UNI/Winter2015/quickblox-android-sdk-master/jars/quickblox-android-sdk-location-2.1.jar"/>
11+
<classpathentry kind="lib" path="/Users/sylviahsu/Desktop/Jazbel/UNI/Winter2015/quickblox-android-sdk-master/jars/quickblox-android-sdk-messages-2.1.jar"/>
12+
<classpathentry kind="lib" path="/Users/sylviahsu/Desktop/Jazbel/UNI/Winter2015/quickblox-android-sdk-master/jars/quickblox-android-sdk-chat-2.1.jar"/>
13+
<classpathentry kind="lib" path="/Users/sylviahsu/Desktop/Jazbel/UNI/Winter2015/android-sdk-macosx/extras/android/support/v4/android-support-v4.jar"/>
814
<classpathentry kind="output" path="bin/classes"/>
915
</classpath>

‎AndroidManifest.xml

Lines changed: 16 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -84,9 +84,24 @@
8484
android:name="com.fami.setting.UserInfo"
8585
android:label="@string/title_activity_fami_info" >
8686
</activity>
87+
<activity
88+
android:name="com.fami.whereabouts.activities.MapActivity"
89+
android:label="@string/map"
90+
android:screenOrientation="portrait"/>
91+
<meta-data
92+
android:name="com.google.android.gms.version"
93+
android:value="@integer/google_play_services_version" />
94+
<meta-data
95+
android:name="com.google.android.maps.v2.API_KEY"
96+
android:value="AIzaSyBsUdM5MBXM4XidPvA3ICRKOydJVEtVJnY" />
97+
<uses-library android:name="com.google.android.maps" />
8798
</application>
8899

89100
<uses-permission android:name="android.permission.INTERNET" />
90101
<uses-permission android:name="android.permission.READ_PHONE_STATE" />
91-
102+
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
103+
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
104+
<uses-permission android:name="com.google.android.providers.gsf.permission.READ_GSERVICES" />
105+
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
106+
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
92107
</manifest>

‎libs/android-support-v4.jar

-972 KB
Binary file not shown.

‎libs/quickblox-android-sdk-location-2.1.jar

38.6 KB
Binary file not shown.

‎project.properties

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@
1111
#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
1212

1313
# Project target.
14-
target=android-21
15-
android.library.reference.1=../appcompat_v7
16-
android.library.reference.2=../pull-to-refresh
14+
target=Google Inc.:Google APIs:21
15+
android.library.reference.1=../pull-to-refresh
16+
android.library.reference.2=../android-support-v7-appcompat
17+
android.library.reference.3=../google-play-services_lib

‎res/drawable/map_marker_my.png

5.4 KB
Loading

‎res/drawable/map_marker_other.png

5.6 KB
Loading

‎res/layout/activity_create_fami.xml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@
2626
android:gravity="center"
2727
android:text="You haven't join any Fami T_T"
2828
android:textAppearance="?android:attr/textAppearanceLarge" />
29-
30-
3129
<Button
3230
android:id="@+id/create_fami"
3331
android:layout_width="wrap_content"

‎res/layout/activity_events.xml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
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="fill_parent"
5+
android:layout_height="fill_parent"
6+
>
7+
8+
<TextView
9+
android:id="@+id/textView1"
10+
android:layout_width="match_parent"
11+
android:layout_height="wrap_content"
12+
android:text="@string/title_activity_events"
13+
android:textAppearance="?android:attr/textAppearanceLarge" />
14+
15+
<ListView
16+
android:id="@+id/events_list"
17+
android:layout_width="wrap_content"
18+
android:layout_height="match_parent"
19+
android:layout_margin="5dp" >
20+
</ListView>
21+
22+
</LinearLayout>
23+

‎res/layout/activity_map.xml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
2+
android:layout_width="match_parent"
3+
android:layout_height="match_parent">
4+
5+
<fragment
6+
android:id="@+id/map_fragment"
7+
android:name="com.google.android.gms.maps.SupportMapFragment"
8+
android:layout_width="match_parent"
9+
android:layout_height="match_parent" />
10+
11+
<Button
12+
android:id="@+id/check_in_button"
13+
android:layout_width="wrap_content"
14+
android:layout_height="wrap_content"
15+
android:layout_alignParentBottom="true"
16+
android:layout_alignParentLeft="true"
17+
android:onClick="onClickButtons"
18+
android:padding="@dimen/padding_middle"
19+
android:text="@string/btn_check_in"/>
20+
</RelativeLayout>

‎res/layout/activity_menu_page.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,13 +49,14 @@
4949
android:onClick="onClick" />
5050

5151
<ImageButton
52-
android:id="@+id/imageButton6"
52+
android:id="@+id/location"
5353
android:layout_width="80dp"
5454
android:layout_height="80dp"
5555
android:layout_alignParentTop="true"
5656
android:layout_marginTop="430dp"
5757
android:layout_marginLeft="180dp"
58-
android:background="@drawable/locationicon" />
58+
android:background="@drawable/locationicon"
59+
android:onClick="onClick" />
5960

6061

6162
<ImageButton

‎res/layout/event_view.xml

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
3+
<RelativeLayout
4+
android:layout_width="fill_parent"
5+
android:layout_height="fill_parent"
6+
xmlns:android="http://schemas.android.com/apk/res/android">
7+
8+
<TextView
9+
android:id="@+id/eventTextView"
10+
android:layout_width="wrap_content"
11+
android:layout_height="wrap_content"
12+
android:layout_alignParentLeft="true"
13+
android:layout_alignParentStart="true"
14+
android:layout_alignParentTop="true"
15+
android:gravity="center_vertical"
16+
android:text="New Text"
17+
android:textSize="20dp" />
18+
19+
<TextView
20+
android:id="@+id/countTextView"
21+
android:layout_width="wrap_content"
22+
android:layout_height="wrap_content"
23+
android:layout_alignParentRight="true"
24+
android:layout_alignParentStart="false"
25+
android:layout_alignParentLeft="false"
26+
android:layout_alignParentTop="true"
27+
android:gravity="center_vertical"
28+
android:text="New Text"
29+
android:textSize="20dp" />
30+
31+
</RelativeLayout>

‎res/menu/events.xml

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<menu xmlns:android="http://schemas.android.com/apk/res/android"
2+
xmlns:app="http://schemas.android.com/apk/res-auto"
3+
xmlns:tools="http://schemas.android.com/tools"
4+
tools:context="com.fami.Events" >
5+
6+
<item
7+
android:id="@+id/action_settings"
8+
android:orderInCategory="100"
9+
android:title="@string/action_settings"
10+
app:showAsAction="never"/>
11+
12+
</menu>

‎res/values/strings.xml

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@
2121
<string name="title_activity_search_user">SearchUserActivity</string>
2222
<string name="password_not_match">You must enter the same password twice</string>
2323
<string name="password_was_incorrect">Password was incorrect</string>
24+
<string name="title_activity_events">Events</string>
2425
<string name="qb_slogan">YOUR COMMUNICATION \nBACKEND</string>
2526
<string name="content">Content</string>
2627
<string name="add_new_image">Add new image</string>
@@ -37,5 +38,14 @@
3738
<string name="title_activity_user_info">UserInfo</string>
3839
<string name="title_activity_main_setting">MainSetting</string>
3940
<string name="title_activity_fami_info">Fami_info</string>
40-
41+
<string name="btn_check_in">Check In</string>
42+
<string name="dlg_location_error">Error(s) occurred. Look into DDMS log for details, please. Errors: </string>
43+
<string name="dlg_check_in">Check In</string>
44+
<string name="dlg_enter_message">Please enter your message</string>
45+
<string name="dlg_check_in_success">Check In was successful!</string>
46+
<string name="dlg_it_is_me">It is me</string>
47+
<string name="dlg_user_login">Name: </string>
48+
<string name="dlg_status">\nStatus: </string>
49+
<string name="map">Map</string>
50+
<string name="empty">empty</string>
4151
</resources>

‎src/com/fami/MainActivity.java

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
import com.fami.todolist.TodolistActivity;
1111
import com.fami.user.activities.UpdateActivity;
1212
import com.fami.user.helper.DataHolder;
13+
import com.fami.whereabouts.activities.MapActivity;
1314
import com.quickblox.chat.QBChatService;
1415
import com.quickblox.chat.model.QBDialog;
1516
import com.quickblox.chat.model.QBDialogType;
@@ -69,6 +70,13 @@ public void onError(List<String> errors) {
6970
startGalleryActivity();
7071
finish();
7172
break;
73+
case R.id.location:
74+
progressDialog.show();
75+
Intent locIntent = new Intent(this, MapActivity.class);
76+
startActivity(locIntent);
77+
finish();
78+
break;
79+
7280
}
7381
}
7482

0 commit comments

Comments
 (0)