From 81ba80b926afa4a7bb3bc21e318dd75f45a017e3 Mon Sep 17 00:00:00 2001 From: Joshua Jadulco Date: Tue, 30 Oct 2018 13:06:41 -0400 Subject: [PATCH 01/14] Added .gitignore file --- .gitignore | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 .gitignore diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000000..be404edf4f --- /dev/null +++ b/.gitignore @@ -0,0 +1,6 @@ + +.idea/Travel-Mate.iml +.idea/codeStyles/Project.xml +.idea/modules.xml +.idea/vcs.xml +.idea/workspace.xml From 0ae7014b13010d3fe95c5d0ee99b6ba5c91846fe Mon Sep 17 00:00:00 2001 From: Joshua Jadulco Date: Tue, 30 Oct 2018 13:11:56 -0400 Subject: [PATCH 02/14] Work In Progress of Starting Feature for #534 Starting point for https://github.com/project-travel-mate/Travel-Mate/issues/534 Added the 'Offline Maps' section to the Navigation Drawer complete with the icon. 'fragment_offlinemaps.xml' and 'OfflineMapsFragment.java' also created. --- .../project_travel_mate/MainActivity.java | 4 +++- .../destinations/CityFragment.java | 2 +- .../utilities/OfflineMapsFragment.java | 13 +++++++++++++ Android/app/src/main/res/drawable/ic_maps.png | Bin 0 -> 21037 bytes .../main/res/layout/fragment_offlinemaps.xml | 9 +++++++++ 5 files changed, 26 insertions(+), 2 deletions(-) create mode 100644 Android/app/src/main/java/io/github/project_travel_mate/utilities/OfflineMapsFragment.java create mode 100644 Android/app/src/main/res/drawable/ic_maps.png create mode 100644 Android/app/src/main/res/layout/fragment_offlinemaps.xml diff --git a/Android/app/src/main/java/io/github/project_travel_mate/MainActivity.java b/Android/app/src/main/java/io/github/project_travel_mate/MainActivity.java index 33adb4788a..41702c7c5c 100644 --- a/Android/app/src/main/java/io/github/project_travel_mate/MainActivity.java +++ b/Android/app/src/main/java/io/github/project_travel_mate/MainActivity.java @@ -233,7 +233,9 @@ private Fragment getFragmentByNavMenuItemId(int id) { case R.id.nav_utility: fragment = UtilitiesFragment.newInstance(); break; - + //Work In Progress Offline Maps + case R.id.nav_offlinemaps: + break; case R.id.nav_about_us: fragment = AboutUsFragment.newInstance(); break; diff --git a/Android/app/src/main/java/io/github/project_travel_mate/destinations/CityFragment.java b/Android/app/src/main/java/io/github/project_travel_mate/destinations/CityFragment.java index a52397d645..904eba4217 100644 --- a/Android/app/src/main/java/io/github/project_travel_mate/destinations/CityFragment.java +++ b/Android/app/src/main/java/io/github/project_travel_mate/destinations/CityFragment.java @@ -182,7 +182,7 @@ public void onViewCreated(@NonNull View view, @Nullable Bundle savedInstanceStat mCityAdapter.updateData(mCities); - if (mSpotlightShownCount <= 3) { + if (mSpotlightShownCount <= 4) { showSpotlightView(mSpotView); } } diff --git a/Android/app/src/main/java/io/github/project_travel_mate/utilities/OfflineMapsFragment.java b/Android/app/src/main/java/io/github/project_travel_mate/utilities/OfflineMapsFragment.java new file mode 100644 index 0000000000..911bd1bc5e --- /dev/null +++ b/Android/app/src/main/java/io/github/project_travel_mate/utilities/OfflineMapsFragment.java @@ -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; + } +} diff --git a/Android/app/src/main/res/drawable/ic_maps.png b/Android/app/src/main/res/drawable/ic_maps.png new file mode 100644 index 0000000000000000000000000000000000000000..fc7988a39ef7d14fd609b3063b557f5b1e671d0b GIT binary patch literal 21037 zcmeHPTWDNW6g{J{X=C~!R79avN~I!7MFdfQOh`y#No_^YeE5opP(cLykst9_Na)G9tIzCe6d<66V)anHWz+;it~$Hv(^?Ci5&>zuoC z=Fa5anR#sYuDOj9=S_qVHZIK1Tn{@>UB51b#?}-2--k1H*VN)v2(KJC^W^Pkz+bn# zb8aTA^5@`@7oJ39!@cuM_W|K3wK09+vnvRW?^{@$9X~#?dDG*g!T*US82$s#lK4|%x7E_XN zr9-SPTOEUE6V?wyreJW>@lXp#(~8C7tnZMe4zHp^WUXw|zKoA4Jc%`Jdl#z$4pZ@D zt`d`GlBhdkKs#C_knjyrLW)7w{!is@eO#Brk=@F;j1SUD$R~(PU3gtN?O-IvoCuz2 z+5pX-)I%W^Cr~suVmn(1?aDewdAimHM{<&){VRV^|Gv)B57e?gUB~gOWyPbD@5h=u_nMCb%7N*TIv7wNhx~*1tpw6P5@09n|)TA097BN)fGyj#U|V)hBdG zQ<;^Ajb2VgLAWkF)UMeL#!P)U3_f@G{k(P?^YDDYS9zzlEapQkbxpBCdPvxOuVo z_e>F+L@Yqce?S^q_Da}PZ9DES@(pVR*I#}VC@}$N$PiL+ouL9HCg2PiLJF=kRG`EJ z)+j@hv*%tV?*%YNRHwT}*{YKggY66%LJF=kRG`EJoFPMqbw97l&^xxXCVwk&+y5U$ z#^0Ar{CuQ7h9wZOoW!1%B3cP*`-LvZj5i_wVFHJkA{t-D*Gf`bNz(qL6FrQtM$fNM zjVUk^<4r)k2QMvBIG!%)Df1w@h%NFJ27{hMu-!TX&cF~E;2C8O`Xy99$Ylv~QrV9H zuk)X(!V}U>P+2c6?{{=9W9WDp%G0d|ld%PqxV68bkk2>Mwqc0=Etu;^s9l@(v&-R~ zoOd%IWq>+YW&9E5x&wL+bkMRBfS*CDtV3!FYj_F~zB5V+y0sRt+x}SnNr1ixowVQ? z|6=6J-jEZU%f$LBt%wNC>a)L4pWYWHaoS+N?nY8a9Cn&=} zd3x1%P&q*dn67jyBvW@3dAtv_RPIOiW9T5}(-?MAo$F=HkGH%5ZQmH^1>^?+Tn6oD z2lBo+KTUK5+RGZG2kjjq@v4?LDEVDt6CEhZsRHyV>hDxNbq+58_;b*&p;gvq*OKdb z6Af3`rZS%&E{lPZ)%G?k0~kV%Us7=+^k=ADtDWBF??FL7JH3g&7r&`%O_m}H9>&Kg gBhz}w8Hh3P%$9xIuG#VupHRZW?5>%^)3-hR4_u3!IRF3v literal 0 HcmV?d00001 diff --git a/Android/app/src/main/res/layout/fragment_offlinemaps.xml b/Android/app/src/main/res/layout/fragment_offlinemaps.xml new file mode 100644 index 0000000000..4e61a950f4 --- /dev/null +++ b/Android/app/src/main/res/layout/fragment_offlinemaps.xml @@ -0,0 +1,9 @@ + + + + + \ No newline at end of file From 9917e6697b9cec72b77ff570f4fbf5674353661a Mon Sep 17 00:00:00 2001 From: Joshua Jadulco Date: Tue, 30 Oct 2018 20:28:53 -0400 Subject: [PATCH 03/14] Attempt to fix errors seen in previous commit --- .gitignore | 6 - .idea/Travel-Mate.iml | 24 +++ .idea/codeStyles/Project.xml | 29 +++ .idea/modules.xml | 8 + .idea/vcs.xml | 6 + .idea/workspace.xml | 178 ++++++++++++++++++ .../main/res/layout/city_history_listitem.xml | 19 +- .../main/res/menu/activity_main_drawer.xml | 8 +- Android/app/src/main/res/values/strings.xml | 1 + 9 files changed, 264 insertions(+), 15 deletions(-) delete mode 100644 .gitignore create mode 100644 .idea/Travel-Mate.iml create mode 100644 .idea/codeStyles/Project.xml create mode 100644 .idea/modules.xml create mode 100644 .idea/vcs.xml create mode 100644 .idea/workspace.xml diff --git a/.gitignore b/.gitignore deleted file mode 100644 index be404edf4f..0000000000 --- a/.gitignore +++ /dev/null @@ -1,6 +0,0 @@ - -.idea/Travel-Mate.iml -.idea/codeStyles/Project.xml -.idea/modules.xml -.idea/vcs.xml -.idea/workspace.xml diff --git a/.idea/Travel-Mate.iml b/.idea/Travel-Mate.iml new file mode 100644 index 0000000000..45ba12f1a9 --- /dev/null +++ b/.idea/Travel-Mate.iml @@ -0,0 +1,24 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml new file mode 100644 index 0000000000..30aa626c23 --- /dev/null +++ b/.idea/codeStyles/Project.xml @@ -0,0 +1,29 @@ + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000000..4358885295 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,8 @@ + + + + + + + + \ No newline at end of file diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000000..35eb1ddfbb --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 0000000000..2fc7f7394a --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,178 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 1540875936583 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file From ca1d21610ca7ff0be33fd85c0ffa778bbee42f3a Mon Sep 17 00:00:00 2001 From: Josh J Date: Sat, 3 Nov 2018 13:28:25 -0400 Subject: [PATCH 09/14] Deleted Project.xml --- .idea/codeStyles/Project.xml | 29 ----------------------------- 1 file changed, 29 deletions(-) delete mode 100644 .idea/codeStyles/Project.xml diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml deleted file mode 100644 index 30aa626c23..0000000000 --- a/.idea/codeStyles/Project.xml +++ /dev/null @@ -1,29 +0,0 @@ - - - - - - - - - - - - - - \ No newline at end of file From 3b6e3dcc82fb395c099ee618f53043bfd96a6517 Mon Sep 17 00:00:00 2001 From: Josh J Date: Sat, 3 Nov 2018 16:53:00 -0400 Subject: [PATCH 10/14] Minor edit --- .../io/github/project_travel_mate/travel/HotelsActivity.java | 1 - 1 file changed, 1 deletion(-) diff --git a/Android/app/src/main/java/io/github/project_travel_mate/travel/HotelsActivity.java b/Android/app/src/main/java/io/github/project_travel_mate/travel/HotelsActivity.java index ee1db6248e..b85c2b95c2 100644 --- a/Android/app/src/main/java/io/github/project_travel_mate/travel/HotelsActivity.java +++ b/Android/app/src/main/java/io/github/project_travel_mate/travel/HotelsActivity.java @@ -86,7 +86,6 @@ protected void onCreate(Bundle savedInstanceState) { setSupportActionBar(toolbar); ButterKnife.bind(this); - //Testing for layout recyclerView.setLayoutManager(new StaggeredGridLayoutManager(2, StaggeredGridLayoutManager.VERTICAL)); mHandler = new Handler(Looper.getMainLooper()); From eeeae58d8dad5712b1d63adce387e11e54b2443e Mon Sep 17 00:00:00 2001 From: Josh J Date: Sat, 3 Nov 2018 16:54:07 -0400 Subject: [PATCH 11/14] Deleted gitignore --- .gitignore | 2 -- 1 file changed, 2 deletions(-) delete mode 100644 .gitignore diff --git a/.gitignore b/.gitignore deleted file mode 100644 index 84cfd4461b..0000000000 --- a/.gitignore +++ /dev/null @@ -1,2 +0,0 @@ -.idea -*.li From 321f77ece1d020d431a4e189f591d2508fbe8bb3 Mon Sep 17 00:00:00 2001 From: Josh J Date: Sat, 10 Nov 2018 23:49:10 -0500 Subject: [PATCH 12/14] Updated city_history_listitem.xml Reverted previous minor change to layout orientation --- Android/app/src/main/res/layout/city_history_listitem.xml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Android/app/src/main/res/layout/city_history_listitem.xml b/Android/app/src/main/res/layout/city_history_listitem.xml index aa1df5b7bc..f35dc09a5f 100644 --- a/Android/app/src/main/res/layout/city_history_listitem.xml +++ b/Android/app/src/main/res/layout/city_history_listitem.xml @@ -3,7 +3,7 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:layout_margin="5dp" - android:orientation="vertical" + android:orientation="horizontal" android:paddingEnd="5dp" android:paddingStart="5dp"> @@ -27,4 +27,4 @@ android:layout_height="1dp" android:layout_marginTop="10dp" android:background="@color/colorAccent" /> - \ No newline at end of file + From ece9e6932593f1cbb8dbc5e0779931077798cbf9 Mon Sep 17 00:00:00 2001 From: Josh J Date: Sun, 18 Nov 2018 00:59:18 -0500 Subject: [PATCH 13/14] Updated offline maps icon Offline Maps icon now uses vector image asset --- Android/app/src/main/res/drawable/ic_map_black_24dp.xml | 9 +++++++++ Android/app/src/main/res/menu/activity_main_drawer.xml | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 Android/app/src/main/res/drawable/ic_map_black_24dp.xml diff --git a/Android/app/src/main/res/drawable/ic_map_black_24dp.xml b/Android/app/src/main/res/drawable/ic_map_black_24dp.xml new file mode 100644 index 0000000000..b9bacc8a6e --- /dev/null +++ b/Android/app/src/main/res/drawable/ic_map_black_24dp.xml @@ -0,0 +1,9 @@ + + + diff --git a/Android/app/src/main/res/menu/activity_main_drawer.xml b/Android/app/src/main/res/menu/activity_main_drawer.xml index 226fa21387..de05d4b946 100644 --- a/Android/app/src/main/res/menu/activity_main_drawer.xml +++ b/Android/app/src/main/res/menu/activity_main_drawer.xml @@ -26,7 +26,7 @@ android:title="@string/navigation_drawer_utilities" /> From 60d94ebb50b3718e57662b0c2119d1e5b5c09334 Mon Sep 17 00:00:00 2001 From: Josh J Date: Wed, 6 Mar 2019 03:43:56 -0500 Subject: [PATCH 14/14] Added UML Diagrams for Issue #557 These diagrams are added automatically using SimpleUMLCE. SimpleUMLCE is installed as a plug-in for Android Studio and enables automatic creation of UML files by selecting the appropriate target files. --- AdaptersDiagram.suml | 2 ++ Database_UML.suml | 2 ++ UML_Diagrams/AdaptersDiagram.suml | 2 ++ UML_Diagrams/DAO_Diagrams.suml | 2 ++ 4 files changed, 8 insertions(+) create mode 100644 AdaptersDiagram.suml create mode 100644 Database_UML.suml create mode 100644 UML_Diagrams/AdaptersDiagram.suml create mode 100644 UML_Diagrams/DAO_Diagrams.suml diff --git a/AdaptersDiagram.suml b/AdaptersDiagram.suml new file mode 100644 index 0000000000..45a8e3d529 --- /dev/null +++ b/AdaptersDiagram.suml @@ -0,0 +1,2 @@ + + diff --git a/Database_UML.suml b/Database_UML.suml new file mode 100644 index 0000000000..498ccd4f45 --- /dev/null +++ b/Database_UML.suml @@ -0,0 +1,2 @@ + + diff --git a/UML_Diagrams/AdaptersDiagram.suml b/UML_Diagrams/AdaptersDiagram.suml new file mode 100644 index 0000000000..45a8e3d529 --- /dev/null +++ b/UML_Diagrams/AdaptersDiagram.suml @@ -0,0 +1,2 @@ + + diff --git a/UML_Diagrams/DAO_Diagrams.suml b/UML_Diagrams/DAO_Diagrams.suml new file mode 100644 index 0000000000..fdfbf23457 --- /dev/null +++ b/UML_Diagrams/DAO_Diagrams.suml @@ -0,0 +1,2 @@ + +