Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added 'Offline Maps' to Navigation Drawer #545

Closed
wants to merge 16 commits into from
Closed

Added 'Offline Maps' to Navigation Drawer #545

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
81ba80b
Added .gitignore file
jtj9817 Oct 30, 2018
0ae7014
Work In Progress of Starting Feature for #534
jtj9817 Oct 30, 2018
9917e66
Attempt to fix errors seen in previous commit
jtj9817 Oct 31, 2018
2a437cc
Made sugggested changes
jtj9817 Nov 1, 2018
aab08fb
Deleted travel-mate.iml
jtj9817 Nov 3, 2018
a6338aa
Delted modules.xml
jtj9817 Nov 3, 2018
953bacd
Deleted vcs.xml
jtj9817 Nov 3, 2018
f40178a
Deleted workspace.xml
jtj9817 Nov 3, 2018
ca1d216
Deleted Project.xml
jtj9817 Nov 3, 2018
3b6e3dc
Minor edit
jtj9817 Nov 3, 2018
eeeae58
Deleted gitignore
jtj9817 Nov 3, 2018
321f77e
Updated city_history_listitem.xml
jtj9817 Nov 11, 2018
5950314
Merge remote-tracking branch 'origin/master'
jtj9817 Nov 18, 2018
ece9e69
Updated offline maps icon
jtj9817 Nov 18, 2018
60d94eb
Added UML Diagrams for Issue #557
jtj9817 Mar 6, 2019
3cb4ce9
Merge branch 'master' of https://github.com/project-travel-mate/Trave…
jtj9817 Mar 6, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 24 additions & 0 deletions .idea/Travel-Mate.iml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

29 changes: 29 additions & 0 deletions .idea/codeStyles/Project.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions .idea/modules.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

178 changes: 178 additions & 0 deletions .idea/workspace.xml
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 3 additions & 1 deletion Android/app/src/main/java/io/github/project_travel_mate/MainActivity.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -233,7 +233,9 @@ private Fragment getFragmentByNavMenuItemId(int id) {
case R.id.nav_utility:
fragment = UtilitiesFragment.newInstance();
break;

//Work In Progress Offline Maps
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is it work in progress or done?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Still a work in progress for the MainActivity.java file as I'm still trying to figure out how the feature should be implemented.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Swati4star Hey, just cleaned up this branch for the merging process. Please review it again, thanks!

case R.id.nav_offlinemaps:
break;
case R.id.nav_about_us:
fragment = AboutUsFragment.newInstance();
break;
Expand Down
2 changes: 1 addition & 1 deletion Android/app/src/main/java/io/github/project_travel_mate/destinations/CityFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat

mCityAdapter.updateData(mCities);

if (mSpotlightShownCount <= 3) {
if (mSpotlightShownCount <= 4) {
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

why?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

My bad, this was an experimentation I was doing on trying to solve the #539 issue.

showSpotlightView(mSpotView);
}
}
Expand Down
13 changes: 13 additions & 0 deletions Android/app/src/main/java/io/github/project_travel_mate/utilities/OfflineMapsFragment.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
package io.github.project_travel_mate.utilities;

import android.content.Intent;
import android.support.v4.app.Fragment;

import adapters.CardViewOptionsAdapter;

public class OfflineMapsFragment extends Fragment implements CardViewOptionsAdapter.OnItemClickListener {
@Override
public void onItemClick(int position) {
Intent intent;
}
}
Binary file added Android/app/src/main/res/drawable/ic_maps.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
19 changes: 11 additions & 8 deletions Android/app/src/main/res/layout/city_history_listitem.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,26 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:layout_margin="5dp"
android:paddingStart="5dp"
android:paddingEnd="5dp">
android:orientation="vertical"
jtj9817 marked this conversation as resolved.
Show resolved Hide resolved
android:paddingEnd="5dp"
android:paddingStart="5dp">

<TextView
android:id="@+id/heading"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textStyle="bold"
android:textSize="18sp"
android:textColor="@color/black"
android:id="@+id/heading"/>
android:textSize="18sp"
android:textStyle="bold" />

<utils.ExpandableTextView
android:id="@+id/text"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:id="@+id/text"
android:textColor="@color/black"
android:textSize="14sp"/>
android:textSize="14sp" />

<View
android:layout_width="fill_parent"
android:layout_height="1dp"
Expand Down
9 changes: 9 additions & 0 deletions Android/app/src/main/res/layout/fragment_offlinemaps.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<android.widget.ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_height="match_parent">

<android.support.v7.widget.RecyclerView
android:id="@+id/offlinemaps_list_recyclerView"
android:layout_width="match_parent"
android:layout_height="wrap_content" />
</android.widget.ScrollView>
8 changes: 7 additions & 1 deletion Android/app/src/main/res/menu/activity_main_drawer.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<menu xmlns:android="http://schemas.android.com/apk/res/android">

<group android:checkableBehavior="single" android:id="@+id/nav_grp1">
<group
android:id="@+id/nav_grp1"
android:checkableBehavior="single">
<item
android:id="@+id/nav_city"
android:icon="@drawable/ic_location_city_black"
Expand All @@ -22,6 +24,10 @@
android:id="@+id/nav_utility"
android:icon="@drawable/ic_utilities"
android:title="@string/navigation_drawer_utilities" />
<item
android:id="@+id/nav_offlinemaps"
android:icon="@drawable/ic_maps"
android:title="@string/navigation_drawer_offlinemaps" />

</group>

Expand Down
1 change: 1 addition & 0 deletions Android/app/src/main/res/values/strings.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
<string name="navigation_drawer_destination">Destinations</string>
<string name="navigation_drawer_travel">Travel</string>
<string name="navigation_drawer_utilities">Utilities</string>
<string name="navigation_drawer_offlinemaps">Offline Maps</string>
<string name="navigation_drawer_about_us">About Us</string>
<string name="navigation_drawer_signout">Sign Out</string>
<string name="navigation_drawer_my_friends">My Friends</string>
Expand Down