From 8c1450b107c8ad695501eb8ac8bd3998af80b9ae Mon Sep 17 00:00:00 2001 From: Joshua Jadulco Date: Tue, 30 Oct 2018 13:11:56 -0400 Subject: [PATCH] Revert "Work In Progress of Starting Feature for #534" This reverts commit 0ae7014b13010d3fe95c5d0ee99b6ba5c91846fe. --- .../project_travel_mate/MainActivity.java | 4 +--- .../destinations/CityFragment.java | 2 +- .../utilities/OfflineMapsFragment.java | 13 ------------- Android/app/src/main/res/drawable/ic_maps.png | Bin 21037 -> 0 bytes .../main/res/layout/fragment_offlinemaps.xml | 9 --------- 5 files changed, 2 insertions(+), 26 deletions(-) delete mode 100644 Android/app/src/main/java/io/github/project_travel_mate/utilities/OfflineMapsFragment.java delete mode 100644 Android/app/src/main/res/drawable/ic_maps.png delete 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 41702c7c5c..33adb4788a 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,9 +233,7 @@ 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 904eba4217..a52397d645 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 <= 4) { + if (mSpotlightShownCount <= 3) { 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 deleted file mode 100644 index 911bd1bc5e..0000000000 --- a/Android/app/src/main/java/io/github/project_travel_mate/utilities/OfflineMapsFragment.java +++ /dev/null @@ -1,13 +0,0 @@ -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 deleted file mode 100644 index fc7988a39ef7d14fd609b3063b557f5b1e671d0b..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 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 diff --git a/Android/app/src/main/res/layout/fragment_offlinemaps.xml b/Android/app/src/main/res/layout/fragment_offlinemaps.xml deleted file mode 100644 index 4e61a950f4..0000000000 --- a/Android/app/src/main/res/layout/fragment_offlinemaps.xml +++ /dev/null @@ -1,9 +0,0 @@ - - - - - \ No newline at end of file