From 1f9b6b408ac52a1fb0f5941f65854a5b905c7c5a Mon Sep 17 00:00:00 2001 From: Swati4star Date: Mon, 4 Jun 2018 20:51:52 +0530 Subject: [PATCH] Added strings to constants; removed deprecated method from checkstyle.gradle; Removed code cleanup warnings --- Android/app/build.gradle | 1 - Android/app/src/main/AndroidManifest.xml | 2 +- .../adapter/BaseFlipAdapter.java | 2 +- .../project_travel_mate/LocationService.java | 7 ++-- .../project_travel_mate/MainActivity.java | 5 +-- .../project_travel_mate/SelectCity.java | 29 ++++++++++------ .../destinations/CityAdapter.java | 20 ++++++----- .../destinations/CityFragment.java | 24 ++++++++------ .../description/FinalCityInfo.java | 33 +++++++++++-------- .../description/FinalCityInfoPresenter.java | 5 +-- .../destinations/description/PlacesOnMap.java | 22 ++++++++----- .../destinations/description/Tweets.java | 16 +++++---- .../description/TweetsAdapter.java | 2 +- .../destinations/funfacts/FunFacts.java | 11 ++++--- .../funfacts/FunFactsPresenter.java | 5 +-- .../funfacts/FunfactFragment.java | 7 ++-- .../login/LoginActivity.java | 13 +++++--- .../login/LoginPresenter.java | 7 ++-- .../project_travel_mate/travel/Hotels.java | 27 ++++++++------- .../travel/MapRealTimeActivity.java | 29 +++++++++++----- .../travel/ShoppingAdapter.java | 2 +- .../travel/ShoppingCurrentCity.java | 10 ++---- .../travel/mytrips/AddNewTrip.java | 10 +++--- .../mytrips/MyTripFriendnameAdapter.java | 2 +- .../travel/mytrips/MyTripInfo.java | 12 ++++--- .../mytrips/MyTripInfoImagesAdapter.java | 2 +- .../travel/mytrips/MyTrips.java | 10 +++--- .../travel/mytrips/MyTripsAdapter.java | 9 +++-- .../travel/mytrips/TripImage.java | 11 ++++--- .../travel/transport/BusAdapter.java | 2 +- .../travel/transport/BusList.java | 15 +++++---- .../travel/transport/CarDirections.java | 27 ++++++++++----- .../travel/transport/TrainAdapter.java | 2 +- .../travel/transport/TrainList.java | 13 +++++--- .../utilities}/ChecklistEntry.java | 2 +- .../utilities/ChecklistFragment.java | 17 +++++----- .../utilities/EmergencyFragment.java | 7 ---- .../utilities/ShareContact.java | 8 +++-- Android/app/src/main/java/objects/Tweet.java | 6 ++-- .../app/src/main/java/utils/Constants.java | 18 +++++++--- Android/app/src/main/java/utils/DBhelp.java | 2 ++ .../src/main/java/utils/TouchImageView.java | 2 +- .../layout/activity_shopping_currentcity.xml | 1 + Android/config/checkstyle.gradle | 2 +- 44 files changed, 277 insertions(+), 182 deletions(-) rename Android/app/src/main/java/{utils => io/github/project_travel_mate/utilities}/ChecklistEntry.java (86%) diff --git a/Android/app/build.gradle b/Android/app/build.gradle index 573c13fff..e5a92c350 100644 --- a/Android/app/build.gradle +++ b/Android/app/build.gradle @@ -44,7 +44,6 @@ dependencies { implementation 'de.hdodenhof:circleimageview:2.0.0' implementation 'com.github.ParkSangGwon:TedPicker:v1.0.10' - implementation 'com.estimote:sdk:0.9.4@aar' implementation 'com.eftimoff:android-pathview:1.0.8@aar' implementation 'com.squareup.picasso:picasso:2.5.2' diff --git a/Android/app/src/main/AndroidManifest.xml b/Android/app/src/main/AndroidManifest.xml index 41a896ea7..5bd4c4128 100644 --- a/Android/app/src/main/AndroidManifest.xml +++ b/Android/app/src/main/AndroidManifest.xml @@ -49,7 +49,7 @@ android:theme="@style/AppTheme_picker" /> - + { - private Activity context; - private final int pages = 3; - private Typeface tex; + private final Activity context; + private final Typeface tex; private final int[] idsInterest = {R.id.interest_1, R.id.interest_2, R.id.interest_3, R.id.interest_4}; @@ -93,6 +96,7 @@ public View getPage(int position, View convertView, ViewGroup parent, final City @Override public int getPagesCount() { + int pages = 3; return pages; } @@ -116,9 +120,9 @@ public void onClick(View v) { @Override public void onClick(View v) { Intent i = new Intent(context, FinalCityInfo.class); - i.putExtra("id_", friend.getId()); - i.putExtra("name_", friend.getNickname()); - i.putExtra("image_", friend.getAvatar()); + i.putExtra(EXTRA_MESSAGE_ID, friend.getId()); + i.putExtra(EXTRA_MESSAGE_NAME, friend.getNickname()); + i.putExtra(EXTRA_MESSAGE_IMAGE, friend.getAvatar()); context.startActivity(i); } }); @@ -127,8 +131,8 @@ public void onClick(View v) { @Override public void onClick(View v) { Intent i = new Intent(context, FunFacts.class); - i.putExtra("id_", friend.getId()); - i.putExtra("name_", friend.getNickname()); + i.putExtra(EXTRA_MESSAGE_ID, friend.getId()); + i.putExtra(EXTRA_MESSAGE_NAME, friend.getNickname()); context.startActivity(i); } }); 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 c03be85fa..bbbfa9ee4 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 @@ -41,7 +41,11 @@ import okhttp3.OkHttpClient; import okhttp3.Request; import okhttp3.Response; -import utils.Constants; + +import static utils.Constants.API_LINK; +import static utils.Constants.EXTRA_MESSAGE_ID; +import static utils.Constants.EXTRA_MESSAGE_IMAGE; +import static utils.Constants.EXTRA_MESSAGE_NAME; public class CityFragment extends Fragment { @@ -52,7 +56,7 @@ public class CityFragment extends Fragment { @BindView(R.id.music_list) ListView lv; - private List image = new ArrayList<>(); + private final List image = new ArrayList<>(); private String nameyet; private String cityid; @@ -91,7 +95,7 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, private void tripAutoComplete() { // to fetch city names - String uri = Constants.apilink + + String uri = API_LINK + "city/autocomplete.php?search=" + nameyet.trim(); Log.v("executing", uri); @@ -146,9 +150,9 @@ public void onItemClick(AdapterView arg0, View arg1, int arg2, long arg3) { Log.e("jkjb", "uihgiug" + arg2); cityid = id.get(arg2).toString(); Intent i = new Intent(activity, FinalCityInfo.class); - i.putExtra("id_", cityid); - i.putExtra("name_", name.get(arg2).toString()); - i.putExtra("image_", image.get(arg2)); + i.putExtra(EXTRA_MESSAGE_ID, cityid); + i.putExtra(EXTRA_MESSAGE_NAME, name.get(arg2).toString()); + i.putExtra(EXTRA_MESSAGE_IMAGE, image.get(arg2)); startActivity(i); } }); @@ -168,7 +172,7 @@ public void onItemClick(AdapterView arg0, View arg1, int arg2, long arg3) { private void getCity() { // to fetch city names - String uri = Constants.apilink + + String uri = API_LINK + "all-cities.php"; Log.e("executing", uri + " "); @@ -232,9 +236,9 @@ public void onItemClick(AdapterView parent, View view, int position, long id1 City f = (City) lv.getAdapter().getItem(position); Toast.makeText(activity, f.getNickname(), Toast.LENGTH_SHORT).show(); Intent i = new Intent(activity, FinalCityInfo.class); - i.putExtra("id_", f.getId()); - i.putExtra("name_", f.getNickname()); - i.putExtra("image_", f.getAvatar()); + i.putExtra(EXTRA_MESSAGE_ID, f.getId()); + i.putExtra(EXTRA_MESSAGE_NAME, f.getNickname()); + i.putExtra(EXTRA_MESSAGE_IMAGE, f.getAvatar()); startActivity(i); } }); diff --git a/Android/app/src/main/java/io/github/project_travel_mate/destinations/description/FinalCityInfo.java b/Android/app/src/main/java/io/github/project_travel_mate/destinations/description/FinalCityInfo.java index 66dfba7d5..2e6d05339 100644 --- a/Android/app/src/main/java/io/github/project_travel_mate/destinations/description/FinalCityInfo.java +++ b/Android/app/src/main/java/io/github/project_travel_mate/destinations/description/FinalCityInfo.java @@ -23,6 +23,13 @@ import io.github.project_travel_mate.R; import io.github.project_travel_mate.destinations.funfacts.FunFacts; +import static utils.Constants.EXTRA_MESSAGE_ID; +import static utils.Constants.EXTRA_MESSAGE_IMAGE; +import static utils.Constants.EXTRA_MESSAGE_LATITUDE; +import static utils.Constants.EXTRA_MESSAGE_LONGITUDE; +import static utils.Constants.EXTRA_MESSAGE_NAME; +import static utils.Constants.EXTRA_MESSAGE_TYPE; + /** * Fetch city information for given city id */ @@ -82,9 +89,9 @@ protected void onCreate(Bundle savedInstanceState) { mHandler = new Handler(Looper.getMainLooper()); Intent intent = getIntent(); - mTitle = intent.getStringExtra("name_"); - id = intent.getStringExtra("id_"); - image = intent.getStringExtra("image_"); + mTitle = intent.getStringExtra(EXTRA_MESSAGE_NAME); + id = intent.getStringExtra(EXTRA_MESSAGE_ID); + image = intent.getStringExtra(EXTRA_MESSAGE_IMAGE); initUi(); initPresenter(); @@ -149,8 +156,8 @@ public void onClick(View v) { switch (v.getId()) { case R.id.funfact: i = new Intent(FinalCityInfo.this, FunFacts.class); - i.putExtra("id_", id); - i.putExtra("name_", mTitle); + i.putExtra(EXTRA_MESSAGE_ID, id); + i.putExtra(EXTRA_MESSAGE_NAME, mTitle); startActivity(i); break; case R.id.restau: @@ -167,8 +174,8 @@ public void onClick(View v) { break; case R.id.trends: i = new Intent(FinalCityInfo.this, Tweets.class); - i.putExtra("id_", id); - i.putExtra("name_", mTitle); + i.putExtra(EXTRA_MESSAGE_ID, id); + i.putExtra(EXTRA_MESSAGE_NAME, mTitle); startActivity(i); break; } @@ -197,7 +204,7 @@ public void onStop() { @Override public void showProgress() { dialog = new MaterialDialog.Builder(FinalCityInfo.this) - .title(R.string.app_name) + .title(getString(R.string.app_name)) .content("Please wait...") .progress(true, 0) .show(); @@ -245,11 +252,11 @@ public void run() { } private void fireIntent(Intent intent, String type) { - intent.putExtra("id_", id); - intent.putExtra("lat_", lat); - intent.putExtra("lng_", lon); - intent.putExtra("name_", mTitle); - intent.putExtra("type_", type); + intent.putExtra(EXTRA_MESSAGE_ID, id); + intent.putExtra(EXTRA_MESSAGE_LATITUDE, lat); + intent.putExtra(EXTRA_MESSAGE_LONGITUDE, lon); + intent.putExtra(EXTRA_MESSAGE_NAME, mTitle); + intent.putExtra(EXTRA_MESSAGE_TYPE, type); startActivity(intent); } } diff --git a/Android/app/src/main/java/io/github/project_travel_mate/destinations/description/FinalCityInfoPresenter.java b/Android/app/src/main/java/io/github/project_travel_mate/destinations/description/FinalCityInfoPresenter.java index 8324a491c..f0ae2ac94 100644 --- a/Android/app/src/main/java/io/github/project_travel_mate/destinations/description/FinalCityInfoPresenter.java +++ b/Android/app/src/main/java/io/github/project_travel_mate/destinations/description/FinalCityInfoPresenter.java @@ -11,7 +11,8 @@ import okhttp3.OkHttpClient; import okhttp3.Request; import okhttp3.Response; -import utils.Constants; + +import static utils.Constants.API_LINK; /** * Created by niranjanb on 15/05/17. @@ -32,7 +33,7 @@ public void attachView(FinalCityInfoView finalCityInfoView) { public void fetchCityInfo(String id) { mFinalCityInfoView.showProgress(); - String uri = Constants.apilink + "city/info.php?id=" + id; + String uri = API_LINK + "city/info.php?id=" + id; Request request = new Request.Builder() .url(uri) .build(); diff --git a/Android/app/src/main/java/io/github/project_travel_mate/destinations/description/PlacesOnMap.java b/Android/app/src/main/java/io/github/project_travel_mate/destinations/description/PlacesOnMap.java index 6bab73be9..e05346c92 100644 --- a/Android/app/src/main/java/io/github/project_travel_mate/destinations/description/PlacesOnMap.java +++ b/Android/app/src/main/java/io/github/project_travel_mate/destinations/description/PlacesOnMap.java @@ -46,9 +46,15 @@ import okhttp3.OkHttpClient; import okhttp3.Request; import okhttp3.Response; -import utils.Constants; import utils.GPSTracker; +import static utils.Constants.API_LINK; +import static utils.Constants.EXTRA_MESSAGE_ID; +import static utils.Constants.EXTRA_MESSAGE_LATITUDE; +import static utils.Constants.EXTRA_MESSAGE_LONGITUDE; +import static utils.Constants.EXTRA_MESSAGE_NAME; +import static utils.Constants.EXTRA_MESSAGE_TYPE; + public class PlacesOnMap extends AppCompatActivity implements OnMapReadyCallback { @BindView(R.id.lv) @@ -71,9 +77,9 @@ protected void onCreate(Bundle savedInstanceState) { ButterKnife.bind(this); Intent intent = getIntent(); - String name = intent.getStringExtra("name_"); - String id = intent.getStringExtra("id_"); - String type = intent.getStringExtra("type_"); + String name = intent.getStringExtra(EXTRA_MESSAGE_NAME); + String id = intent.getStringExtra(EXTRA_MESSAGE_ID); + String type = intent.getStringExtra(EXTRA_MESSAGE_TYPE); mHandler = new Handler(Looper.getMainLooper()); setTitle(name); @@ -97,8 +103,8 @@ protected void onCreate(Bundle savedInstanceState) { break; } - deslat = intent.getStringExtra("lat_"); - deslon = intent.getStringExtra("lng_"); + deslat = intent.getStringExtra(EXTRA_MESSAGE_LATITUDE); + deslon = intent.getStringExtra(EXTRA_MESSAGE_LONGITUDE); getPlaces(); @@ -145,7 +151,7 @@ private void getPlaces() { progressDialog.show(); // to fetch city names - String uri = Constants.apilink + "places-api.php?lat=" + deslat + "&lng=" + deslon + "&mode=" + mode; + String uri = API_LINK + "places-api.php?lat=" + deslat + "&lng=" + deslon + "&mode=" + mode; Log.v("executing", "URI : " + uri ); //Set up client @@ -254,7 +260,7 @@ public long getItemId(int position) { public View getView(final int position, View convertView, ViewGroup parent) { View vi = convertView; if (vi == null) - vi = inflater.inflate(R.layout.city_infoitem, (ViewGroup) null); + vi = inflater.inflate(R.layout.city_infoitem, parent, false); TextView title = vi.findViewById(R.id.item_name); TextView description = vi.findViewById(R.id.item_address); diff --git a/Android/app/src/main/java/io/github/project_travel_mate/destinations/description/Tweets.java b/Android/app/src/main/java/io/github/project_travel_mate/destinations/description/Tweets.java index d69dec437..bf16d43ab 100644 --- a/Android/app/src/main/java/io/github/project_travel_mate/destinations/description/Tweets.java +++ b/Android/app/src/main/java/io/github/project_travel_mate/destinations/description/Tweets.java @@ -28,7 +28,11 @@ import okhttp3.OkHttpClient; import okhttp3.Request; import okhttp3.Response; -import utils.Constants; + +import static utils.Constants.API_LINK; +import static utils.Constants.EXTRA_MESSAGE_ID; +import static utils.Constants.EXTRA_MESSAGE_IMAGE; +import static utils.Constants.EXTRA_MESSAGE_NAME; public class Tweets extends AppCompatActivity { @@ -37,7 +41,7 @@ public class Tweets extends AppCompatActivity { private String id; private MaterialDialog dialog; - private List tweets = new ArrayList<>(); + private final List tweets = new ArrayList<>(); private TweetsAdapter adapter; private Handler mHandler; @@ -51,9 +55,9 @@ protected void onCreate(Bundle savedInstanceState) { mHandler = new Handler(Looper.getMainLooper()); Intent intent = getIntent(); - String title = intent.getStringExtra("name_"); - id = intent.getStringExtra("id_"); - String image = intent.getStringExtra("image_"); + String title = intent.getStringExtra(EXTRA_MESSAGE_NAME); + id = intent.getStringExtra(EXTRA_MESSAGE_ID); + String image = intent.getStringExtra(EXTRA_MESSAGE_IMAGE); setTitle(title); getTweets(); @@ -72,7 +76,7 @@ private void getTweets() { .show(); // to fetch city names - String uri = Constants.apilink + "city/trends/twitter.php?city=" + id; + String uri = API_LINK + "city/trends/twitter.php?city=" + id; Log.v("executing", uri); diff --git a/Android/app/src/main/java/io/github/project_travel_mate/destinations/description/TweetsAdapter.java b/Android/app/src/main/java/io/github/project_travel_mate/destinations/description/TweetsAdapter.java index 148bf952c..170e33d4d 100644 --- a/Android/app/src/main/java/io/github/project_travel_mate/destinations/description/TweetsAdapter.java +++ b/Android/app/src/main/java/io/github/project_travel_mate/destinations/description/TweetsAdapter.java @@ -32,7 +32,7 @@ public View getView(final int position, View view, @NonNull ViewGroup parent) { ViewHolder holder; LayoutInflater mInflater = (LayoutInflater) context.getSystemService(Activity.LAYOUT_INFLATER_SERVICE); if (view == null) { - view = Objects.requireNonNull(mInflater).inflate(R.layout.tweet_listitem, (ViewGroup) null); + view = Objects.requireNonNull(mInflater).inflate(R.layout.tweet_listitem, parent, false); holder = new ViewHolder(); holder.name = view.findViewById(R.id.tagmain); view.setTag(holder); diff --git a/Android/app/src/main/java/io/github/project_travel_mate/destinations/funfacts/FunFacts.java b/Android/app/src/main/java/io/github/project_travel_mate/destinations/funfacts/FunFacts.java index ebba1513d..54ee25a7b 100644 --- a/Android/app/src/main/java/io/github/project_travel_mate/destinations/funfacts/FunFacts.java +++ b/Android/app/src/main/java/io/github/project_travel_mate/destinations/funfacts/FunFacts.java @@ -25,6 +25,9 @@ import butterknife.ButterKnife; import io.github.project_travel_mate.R; +import static utils.Constants.EXTRA_MESSAGE_ID; +import static utils.Constants.EXTRA_MESSAGE_NAME; + /** * Funfacts activity */ @@ -48,10 +51,10 @@ protected void onCreate(Bundle savedInstanceState) { ButterKnife.bind(this); - Intent i = getIntent(); - id = i.getStringExtra("id_"); - name = i.getStringExtra("name_"); - mHandler = new Handler(Looper.getMainLooper()); + Intent intent = getIntent(); + id = intent.getStringExtra(EXTRA_MESSAGE_ID); + name = intent.getStringExtra(EXTRA_MESSAGE_NAME); + mHandler = new Handler(Looper.getMainLooper()); initPresenter(); Objects.requireNonNull(getSupportActionBar()).hide(); diff --git a/Android/app/src/main/java/io/github/project_travel_mate/destinations/funfacts/FunFactsPresenter.java b/Android/app/src/main/java/io/github/project_travel_mate/destinations/funfacts/FunFactsPresenter.java index 6973dbff4..b72f042f8 100644 --- a/Android/app/src/main/java/io/github/project_travel_mate/destinations/funfacts/FunFactsPresenter.java +++ b/Android/app/src/main/java/io/github/project_travel_mate/destinations/funfacts/FunFactsPresenter.java @@ -14,7 +14,8 @@ import okhttp3.OkHttpClient; import okhttp3.Request; import okhttp3.Response; -import utils.Constants; + +import static utils.Constants.API_LINK; /** * Created by niranjanb on 14/06/17. @@ -36,7 +37,7 @@ private void getCityFacts(String id) { mFunFactsView.showProgressDialog(); // to fetch city names - String uri = Constants.apilink + "city_facts.php?id=" + id; + String uri = API_LINK + "city_facts.php?id=" + id; //Set up client OkHttpClient client = new OkHttpClient(); diff --git a/Android/app/src/main/java/io/github/project_travel_mate/destinations/funfacts/FunfactFragment.java b/Android/app/src/main/java/io/github/project_travel_mate/destinations/funfacts/FunfactFragment.java index 9f95b84cc..101c9bc97 100644 --- a/Android/app/src/main/java/io/github/project_travel_mate/destinations/funfacts/FunfactFragment.java +++ b/Android/app/src/main/java/io/github/project_travel_mate/destinations/funfacts/FunfactFragment.java @@ -23,6 +23,10 @@ import butterknife.OnClick; import io.github.project_travel_mate.R; +import static utils.Constants.EXTRA_MESSAGE_IMAGE; +import static utils.Constants.EXTRA_MESSAGE_TEXT; +import static utils.Constants.EXTRA_MESSAGE_TITLE; + /** * Created by swati on 25/1/16. *

@@ -30,9 +34,6 @@ */ public class FunfactFragment extends Fragment { - private static final String EXTRA_MESSAGE_IMAGE = "_image"; - private static final String EXTRA_MESSAGE_TEXT = "_text"; - private static final String EXTRA_MESSAGE_TITLE = "_title"; private File file; /** diff --git a/Android/app/src/main/java/io/github/project_travel_mate/login/LoginActivity.java b/Android/app/src/main/java/io/github/project_travel_mate/login/LoginActivity.java index 4ed1533f7..3c145fe05 100644 --- a/Android/app/src/main/java/io/github/project_travel_mate/login/LoginActivity.java +++ b/Android/app/src/main/java/io/github/project_travel_mate/login/LoginActivity.java @@ -25,7 +25,10 @@ import butterknife.ButterKnife; import io.github.project_travel_mate.MainActivity; import io.github.project_travel_mate.R; -import utils.Constants; + +import static utils.Constants.USER_ID; +import static utils.Constants.USER_NAME; +import static utils.Constants.USER_NUMBER; /** * Initiates login @@ -124,9 +127,9 @@ public void onClick(View view) { @Override public void rememberUserInfo(String id, String name, String num) { SharedPreferences.Editor editor = sharedPreferences.edit(); - editor.putString(Constants.USER_ID, id); - editor.putString(Constants.USER_NAME, name); - editor.putString(Constants.USER_NUMBER, num); + editor.putString(USER_ID, id); + editor.putString(USER_NAME, name); + editor.putString(USER_NUMBER, num); editor.apply(); } @@ -185,7 +188,7 @@ public void getRunTimePermissions() { @Override public void checkUserSession() { - if (sharedPreferences.getString(Constants.USER_ID, null) != null) { + if (sharedPreferences.getString(USER_ID, null) != null) { Intent i = new Intent(LoginActivity.this, MainActivity.class); startActivity(i); finish(); diff --git a/Android/app/src/main/java/io/github/project_travel_mate/login/LoginPresenter.java b/Android/app/src/main/java/io/github/project_travel_mate/login/LoginPresenter.java index 780406da1..5539b7b13 100644 --- a/Android/app/src/main/java/io/github/project_travel_mate/login/LoginPresenter.java +++ b/Android/app/src/main/java/io/github/project_travel_mate/login/LoginPresenter.java @@ -13,7 +13,8 @@ import okhttp3.OkHttpClient; import okhttp3.Request; import okhttp3.Response; -import utils.Constants; + +import static utils.Constants.API_LINK; /** * Created by el on 5/4/17. @@ -47,7 +48,7 @@ public void ok_signUp(final String name, final String num, String pass, final Ha view.showLoadingDialog(); - String uri = Constants.apilink + "users/signup.php?name=" + name + "&contact=" + num + "&password=" + pass; + String uri = API_LINK + "users/signup.php?name=" + name + "&contact=" + num + "&password=" + pass; //Set up client OkHttpClient client = new OkHttpClient(); @@ -100,7 +101,7 @@ public void ok_login(final String num, String pass, final Handler mhandler) { view.showLoadingDialog(); - String uri = Constants.apilink + "users/login.php?contact=" + num + "&password=" + pass; + String uri = API_LINK + "users/login.php?contact=" + num + "&password=" + pass; //Set up client OkHttpClient client = new OkHttpClient(); //Execute request diff --git a/Android/app/src/main/java/io/github/project_travel_mate/travel/Hotels.java b/Android/app/src/main/java/io/github/project_travel_mate/travel/Hotels.java index 80e5a8500..06457c048 100644 --- a/Android/app/src/main/java/io/github/project_travel_mate/travel/Hotels.java +++ b/Android/app/src/main/java/io/github/project_travel_mate/travel/Hotels.java @@ -42,7 +42,12 @@ import okhttp3.OkHttpClient; import okhttp3.Request; import okhttp3.Response; -import utils.Constants; + +import static utils.Constants.API_LINK; +import static utils.Constants.DESTINATION_CITY; +import static utils.Constants.DESTINATION_CITY_ID; +import static utils.Constants.SOURCE_CITY; +import static utils.Constants.SOURCE_CITY_ID; /** * Display list of hotels in destination city @@ -84,10 +89,10 @@ protected void onCreate(Bundle savedInstanceState) { mHandler = new Handler(Looper.getMainLooper()); sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this); - source = sharedPreferences.getString(Constants.SOURCE_CITY_ID, "1"); - dest = sharedPreferences.getString(Constants.DESTINATION_CITY_ID, "1"); - sourcet = sharedPreferences.getString(Constants.SOURCE_CITY, "Delhi"); - destt = sharedPreferences.getString(Constants.DESTINATION_CITY, "Mumbai"); + source = sharedPreferences.getString(SOURCE_CITY_ID, "1"); + dest = sharedPreferences.getString(DESTINATION_CITY_ID, "1"); + sourcet = sharedPreferences.getString(SOURCE_CITY, "Delhi"); + destt = sharedPreferences.getString(DESTINATION_CITY, "Mumbai"); String cityText = "Showing " + destt + " hotels"; String selectDateText = "Check In : " + dates; @@ -159,7 +164,7 @@ public void onTimeSet(RadialPickerLayout view, int hourOfDay, int minute) { } private void getHotellist() { pb.setVisibility(View.VISIBLE); - String uri = Constants.apilink + + String uri = API_LINK + "get-city-hotels.php?id=" + dest + "&date=" + @@ -207,10 +212,10 @@ public void run() { @Override protected void onResume() { super.onResume(); - source = sharedPreferences.getString(Constants.SOURCE_CITY_ID, "1"); - dest = sharedPreferences.getString(Constants.DESTINATION_CITY_ID, "1"); - sourcet = sharedPreferences.getString(Constants.SOURCE_CITY, "Delhi"); - destt = sharedPreferences.getString(Constants.DESTINATION_CITY, "Mumbai"); + source = sharedPreferences.getString(SOURCE_CITY_ID, "1"); + dest = sharedPreferences.getString(DESTINATION_CITY_ID, "1"); + sourcet = sharedPreferences.getString(SOURCE_CITY, "Delhi"); + destt = sharedPreferences.getString(DESTINATION_CITY, "Mumbai"); String cityText = "Showing " + destt + " hotels"; city.setText(cityText); getHotellist(); @@ -265,7 +270,7 @@ public long getItemId(int position) { public View getView(final int position, View convertView, ViewGroup parent) { View vi = convertView; if (vi == null) - vi = inflater.inflate(R.layout.hotel_listitem, (ViewGroup) null); + vi = inflater.inflate(R.layout.hotel_listitem, parent, false); LinearLayout call, map, book; diff --git a/Android/app/src/main/java/io/github/project_travel_mate/travel/MapRealTimeActivity.java b/Android/app/src/main/java/io/github/project_travel_mate/travel/MapRealTimeActivity.java index a624037f0..6e0072990 100644 --- a/Android/app/src/main/java/io/github/project_travel_mate/travel/MapRealTimeActivity.java +++ b/Android/app/src/main/java/io/github/project_travel_mate/travel/MapRealTimeActivity.java @@ -49,9 +49,20 @@ import okhttp3.OkHttpClient; import okhttp3.Request; import okhttp3.Response; -import utils.Constants; import utils.GPSTracker; +import static utils.Constants.API_LINK; +import static utils.Constants.DELHI_LAT; +import static utils.Constants.DELHI_LON; +import static utils.Constants.DESTINATION_CITY; +import static utils.Constants.DESTINATION_CITY_LAT; +import static utils.Constants.DESTINATION_CITY_LON; +import static utils.Constants.MUMBAI_LAT; +import static utils.Constants.MUMBAI_LON; +import static utils.Constants.SOURCE_CITY; +import static utils.Constants.SOURCE_CITY_LAT; +import static utils.Constants.SOURCE_CITY_LON; + /** * Show markers on map around user's current location */ @@ -68,7 +79,7 @@ public class MapRealTimeActivity extends AppCompatActivity implements OnMapReady private GoogleMap googleMap; - private List mapItems = new ArrayList<>(); + private final List mapItems = new ArrayList<>(); @Override protected void onCreate(Bundle savedInstanceState) { @@ -87,12 +98,12 @@ protected void onCreate(Bundle savedInstanceState) { SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this); - String sorcelat = sharedPreferences.getString(Constants.SOURCE_CITY_LAT, Constants.DELHI_LAT); - String sorcelon = sharedPreferences.getString(Constants.SOURCE_CITY_LON, Constants.DELHI_LON); - String deslat = sharedPreferences.getString(Constants.DESTINATION_CITY_LAT, Constants.MUMBAI_LAT); - String deslon = sharedPreferences.getString(Constants.DESTINATION_CITY_LON, Constants.MUMBAI_LON); - String surce = sharedPreferences.getString(Constants.SOURCE_CITY, "Delhi"); - String dest = sharedPreferences.getString(Constants.DESTINATION_CITY, "Mumbai"); + String sorcelat = sharedPreferences.getString(SOURCE_CITY_LAT, DELHI_LAT); + String sorcelon = sharedPreferences.getString(SOURCE_CITY_LON, DELHI_LON); + String deslat = sharedPreferences.getString(DESTINATION_CITY_LAT, MUMBAI_LAT); + String deslon = sharedPreferences.getString(DESTINATION_CITY_LON, MUMBAI_LON); + String surce = sharedPreferences.getString(SOURCE_CITY, "Delhi"); + String dest = sharedPreferences.getString(DESTINATION_CITY, "Mumbai"); sc.setVisibility(View.GONE); @@ -129,7 +140,7 @@ protected void onCreate(Bundle savedInstanceState) { */ private void getMarkers(int mo, final int ic) { - String uri = Constants.apilink + "places-api.php?mode=" + mo + "&lat=" + curlat + "&lng=" + curlon; + String uri = API_LINK + "places-api.php?mode=" + mo + "&lat=" + curlat + "&lng=" + curlon; Log.e("executing", uri + " "); //Set up client diff --git a/Android/app/src/main/java/io/github/project_travel_mate/travel/ShoppingAdapter.java b/Android/app/src/main/java/io/github/project_travel_mate/travel/ShoppingAdapter.java index 7157e9276..dec981722 100644 --- a/Android/app/src/main/java/io/github/project_travel_mate/travel/ShoppingAdapter.java +++ b/Android/app/src/main/java/io/github/project_travel_mate/travel/ShoppingAdapter.java @@ -55,7 +55,7 @@ public long getItemId(int position) { public View getView(final int position, View convertView, ViewGroup parent) { View vi = convertView; if (vi == null) - vi = inflater.inflate(R.layout.shop_listitem, (ViewGroup) null); + vi = inflater.inflate(R.layout.shop_listitem, parent, false); TextView title = vi.findViewById(R.id.VideoTitle); TextView description = vi.findViewById(R.id.VideoDescription); diff --git a/Android/app/src/main/java/io/github/project_travel_mate/travel/ShoppingCurrentCity.java b/Android/app/src/main/java/io/github/project_travel_mate/travel/ShoppingCurrentCity.java index a6f9df88f..fe87d5361 100644 --- a/Android/app/src/main/java/io/github/project_travel_mate/travel/ShoppingCurrentCity.java +++ b/Android/app/src/main/java/io/github/project_travel_mate/travel/ShoppingCurrentCity.java @@ -31,9 +31,10 @@ import butterknife.ButterKnife; import butterknife.OnClick; import io.github.project_travel_mate.R; -import utils.Constants; import utils.Utils; +import static utils.Constants.API_LINK; + public class ShoppingCurrentCity extends AppCompatActivity { @BindView(R.id.pb) ProgressBar pb; @@ -160,14 +161,9 @@ public boolean onOptionsItemSelected(MenuItem item) { private class GetShoppingItems extends AsyncTask { - @Override - protected void onPreExecute() { - super.onPreExecute(); - } - protected String doInBackground(String... urls) { try { - String uri = Constants.apilink + + String uri = API_LINK + "online-shopping.php?string=" + item; uri = uri.replace(" ", "+"); URL url = new URL(uri); diff --git a/Android/app/src/main/java/io/github/project_travel_mate/travel/mytrips/AddNewTrip.java b/Android/app/src/main/java/io/github/project_travel_mate/travel/mytrips/AddNewTrip.java index c5b151944..ef0b66ba8 100644 --- a/Android/app/src/main/java/io/github/project_travel_mate/travel/mytrips/AddNewTrip.java +++ b/Android/app/src/main/java/io/github/project_travel_mate/travel/mytrips/AddNewTrip.java @@ -39,7 +39,9 @@ import okhttp3.OkHttpClient; import okhttp3.Request; import okhttp3.Response; -import utils.Constants; + +import static utils.Constants.API_LINK; +import static utils.Constants.USER_ID; /** * Activity to add new trip @@ -80,7 +82,7 @@ protected void onCreate(Bundle savedInstanceState) { ButterKnife.bind(this); SharedPreferences sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this); - userid = sharedPreferences.getString(Constants.USER_ID, "1"); + userid = sharedPreferences.getString(USER_ID, "1"); mHandler = new Handler(Looper.getMainLooper()); cityname.setThreshold(1); @@ -131,7 +133,7 @@ public void onTimeSet(RadialPickerLayout view, int hourOfDay, int minute) { } private void tripAutoComplete() { // to fetch city names - String uri = Constants.apilink + "city/autocomplete.php?search=" + nameyet.trim(); + String uri = API_LINK + "city/autocomplete.php?search=" + nameyet.trim(); Log.e("executing", uri + " "); //Set up client @@ -205,7 +207,7 @@ private void addTrip() { .progress(true, 0) .show(); - String uri = Constants.apilink + "trip/add-trip.php?user=" + userid + + String uri = API_LINK + "trip/add-trip.php?user=" + userid + "&title=" + tripname + "&start_time=" + startdate + "&city=" + cityid; diff --git a/Android/app/src/main/java/io/github/project_travel_mate/travel/mytrips/MyTripFriendnameAdapter.java b/Android/app/src/main/java/io/github/project_travel_mate/travel/mytrips/MyTripFriendnameAdapter.java index a78ad50af..50acae622 100644 --- a/Android/app/src/main/java/io/github/project_travel_mate/travel/mytrips/MyTripFriendnameAdapter.java +++ b/Android/app/src/main/java/io/github/project_travel_mate/travel/mytrips/MyTripFriendnameAdapter.java @@ -29,7 +29,7 @@ public View getView(final int position, View view, @NonNull ViewGroup parent) { ViewHolder holder; LayoutInflater mInflater = (LayoutInflater) context.getSystemService(Activity.LAYOUT_INFLATER_SERVICE); if (view == null) { - view = Objects.requireNonNull(mInflater).inflate(R.layout.home_city_listitem, (ViewGroup) null); + view = Objects.requireNonNull(mInflater).inflate(R.layout.home_city_listitem, parent, false); holder = new ViewHolder(); holder.iv = view.findViewById(R.id.name); view.setTag(holder); diff --git a/Android/app/src/main/java/io/github/project_travel_mate/travel/mytrips/MyTripInfo.java b/Android/app/src/main/java/io/github/project_travel_mate/travel/mytrips/MyTripInfo.java index 4b95fb8f2..0070a074e 100644 --- a/Android/app/src/main/java/io/github/project_travel_mate/travel/mytrips/MyTripInfo.java +++ b/Android/app/src/main/java/io/github/project_travel_mate/travel/mytrips/MyTripInfo.java @@ -49,6 +49,8 @@ import okhttp3.Response; import utils.Constants; +import static utils.Constants.API_LINK; + public class MyTripInfo extends AppCompatActivity { @BindView(R.id.image) @@ -88,8 +90,8 @@ protected void onCreate(Bundle savedInstanceState) { ButterKnife.bind(this); Intent intent = getIntent(); - id = intent.getStringExtra("_id"); - String img = intent.getStringExtra("_image"); + id = intent.getStringExtra(Constants.EXTRA_MESSAGE_ID); + String img = intent.getStringExtra(Constants.EXTRA_MESSAGE_IMAGE); List mediaimages = new ArrayList<>(); List imagesuri = new ArrayList<>(); @@ -140,7 +142,7 @@ private void mytrip() { .show(); // to fetch city names - String uri = Constants.apilink + "trip/get-one.php?trip=" + id; + String uri = API_LINK + "trip/get-one.php?trip=" + id; Log.e("executing", uri + " "); @@ -229,7 +231,7 @@ public boolean onOptionsItemSelected(MenuItem item) { private void friendautocomplete() { - String uri = Constants.apilink + "users/find.php?search=" + nameyet.trim(); + String uri = API_LINK + "users/find.php?search=" + nameyet.trim(); Log.e("executing", uri + " "); //Set up client @@ -303,7 +305,7 @@ private void addfriend() { .progress(true, 0) .show(); - String uri = Constants.apilink + "trip/add-user.php?user=" + friendid + "&trip=" + id; + String uri = API_LINK + "trip/add-user.php?user=" + friendid + "&trip=" + id; Log.e("executing", uri + " "); //Set up client diff --git a/Android/app/src/main/java/io/github/project_travel_mate/travel/mytrips/MyTripInfoImagesAdapter.java b/Android/app/src/main/java/io/github/project_travel_mate/travel/mytrips/MyTripInfoImagesAdapter.java index ce49eb9a0..48d6c6d58 100644 --- a/Android/app/src/main/java/io/github/project_travel_mate/travel/mytrips/MyTripInfoImagesAdapter.java +++ b/Android/app/src/main/java/io/github/project_travel_mate/travel/mytrips/MyTripInfoImagesAdapter.java @@ -36,7 +36,7 @@ public View getView(final int position, View view, @NonNull ViewGroup parent) { ViewHolder holder; LayoutInflater mInflater = (LayoutInflater) context.getSystemService(Activity.LAYOUT_INFLATER_SERVICE); if (view == null) { - view = Objects.requireNonNull(mInflater).inflate(R.layout.image_listitem, (ViewGroup) null); + view = Objects.requireNonNull(mInflater).inflate(R.layout.image_listitem, parent, false); holder = new ViewHolder(); holder.iv = view.findViewById(R.id.iv); diff --git a/Android/app/src/main/java/io/github/project_travel_mate/travel/mytrips/MyTrips.java b/Android/app/src/main/java/io/github/project_travel_mate/travel/mytrips/MyTrips.java index 4234603f1..ab8c69aea 100644 --- a/Android/app/src/main/java/io/github/project_travel_mate/travel/mytrips/MyTrips.java +++ b/Android/app/src/main/java/io/github/project_travel_mate/travel/mytrips/MyTrips.java @@ -29,7 +29,9 @@ import okhttp3.OkHttpClient; import okhttp3.Request; import okhttp3.Response; -import utils.Constants; + +import static utils.Constants.API_LINK; +import static utils.Constants.USER_ID; public class MyTrips extends AppCompatActivity { @@ -37,7 +39,7 @@ public class MyTrips extends AppCompatActivity { GridView g; private MaterialDialog dialog; - private List trips = new ArrayList<>(); + private final List trips = new ArrayList<>(); private String userid; private Handler mHandler; @@ -49,7 +51,7 @@ protected void onCreate(Bundle savedInstanceState) { ButterKnife.bind(this); SharedPreferences s = PreferenceManager.getDefaultSharedPreferences(this); - userid = s.getString(Constants.USER_ID, "1"); + userid = s.getString(USER_ID, "1"); mHandler = new Handler(Looper.getMainLooper()); trips.add(new Trip()); @@ -71,7 +73,7 @@ private void mytrip() { .progress(true, 0) .show(); - String uri = Constants.apilink + "trip/get-all.php?user=" + userid; + String uri = API_LINK + "trip/get-all.php?user=" + userid; Log.e("executing", uri + " "); diff --git a/Android/app/src/main/java/io/github/project_travel_mate/travel/mytrips/MyTripsAdapter.java b/Android/app/src/main/java/io/github/project_travel_mate/travel/mytrips/MyTripsAdapter.java index 33186d14d..fbc541408 100644 --- a/Android/app/src/main/java/io/github/project_travel_mate/travel/mytrips/MyTripsAdapter.java +++ b/Android/app/src/main/java/io/github/project_travel_mate/travel/mytrips/MyTripsAdapter.java @@ -23,6 +23,9 @@ import io.github.project_travel_mate.R; import objects.Trip; +import static utils.Constants.EXTRA_MESSAGE_ID; +import static utils.Constants.EXTRA_MESSAGE_IMAGE; + class MyTripsAdapter extends ArrayAdapter { private final Activity context; private final List trips; @@ -38,7 +41,7 @@ class MyTripsAdapter extends ArrayAdapter { @Override public View getView(final int position, View view2, @NonNull ViewGroup parent) { LayoutInflater mInflater = (LayoutInflater) context.getSystemService(Activity.LAYOUT_INFLATER_SERVICE); - View view = Objects.requireNonNull(mInflater).inflate(R.layout.trip_listitem, (ViewGroup) null); + View view = Objects.requireNonNull(mInflater).inflate(R.layout.trip_listitem, parent, false); ImageView city = view.findViewById(R.id.profile_image); TextView cityname = view.findViewById(R.id.tv); TextView date = view.findViewById(R.id.date); @@ -71,8 +74,8 @@ public void onClick(View v) { @Override public void onClick(View v) { Intent i = new Intent(context, MyTripInfo.class); - i.putExtra("_id", trips.get(position).getId()); - i.putExtra("_image", trips.get(position).getImage()); + i.putExtra(EXTRA_MESSAGE_ID, trips.get(position).getId()); + i.putExtra(EXTRA_MESSAGE_IMAGE, trips.get(position).getImage()); context.startActivity(i); } }); diff --git a/Android/app/src/main/java/io/github/project_travel_mate/travel/mytrips/TripImage.java b/Android/app/src/main/java/io/github/project_travel_mate/travel/mytrips/TripImage.java index 74150bb07..afe97e009 100644 --- a/Android/app/src/main/java/io/github/project_travel_mate/travel/mytrips/TripImage.java +++ b/Android/app/src/main/java/io/github/project_travel_mate/travel/mytrips/TripImage.java @@ -10,7 +10,10 @@ import adapters.ImageAdapter; import io.github.project_travel_mate.R; -import utils.Constants; + +import static utils.Constants.EVENT_IMG; +import static utils.Constants.EVENT_NAME; +import static utils.Constants.IMAGE_NO; public class TripImage extends AppCompatActivity { @@ -22,10 +25,10 @@ protected void onCreate(Bundle savedInstanceState) { setContentView(R.layout.activity_trip_image); Intent intent = getIntent(); - String name = intent.getStringExtra(Constants.EVENT_NAME); - int pos = intent.getIntExtra(Constants.IMAGE_NO, -1); + String name = intent.getStringExtra(EVENT_NAME); + int pos = intent.getIntExtra(IMAGE_NO, -1); - ArrayList images = intent.getStringArrayListExtra(Constants.EVENT_IMG); + ArrayList images = intent.getStringArrayListExtra(EVENT_IMG); ViewPager viewPager = findViewById(R.id.view_pager); ImageAdapter adapter = new ImageAdapter(this, images); diff --git a/Android/app/src/main/java/io/github/project_travel_mate/travel/transport/BusAdapter.java b/Android/app/src/main/java/io/github/project_travel_mate/travel/transport/BusAdapter.java index 25ed4d063..4928255e7 100644 --- a/Android/app/src/main/java/io/github/project_travel_mate/travel/transport/BusAdapter.java +++ b/Android/app/src/main/java/io/github/project_travel_mate/travel/transport/BusAdapter.java @@ -56,7 +56,7 @@ public long getItemId(int position) { public View getView(final int position, View convertView, ViewGroup parent) { View vi = convertView; if (vi == null) - vi = inflater.inflate(R.layout.bus_listitem, (ViewGroup) null); + vi = inflater.inflate(R.layout.bus_listitem, parent, false); TextView title = vi.findViewById(R.id.bus_name); TextView description = vi.findViewById(R.id.bustype); diff --git a/Android/app/src/main/java/io/github/project_travel_mate/travel/transport/BusList.java b/Android/app/src/main/java/io/github/project_travel_mate/travel/transport/BusList.java index e94a51f10..98e86bcea 100644 --- a/Android/app/src/main/java/io/github/project_travel_mate/travel/transport/BusList.java +++ b/Android/app/src/main/java/io/github/project_travel_mate/travel/transport/BusList.java @@ -37,7 +37,10 @@ import okhttp3.OkHttpClient; import okhttp3.Request; import okhttp3.Response; -import utils.Constants; + +import static utils.Constants.API_LINK; +import static utils.Constants.DESTINATION_CITY; +import static utils.Constants.SOURCE_CITY; /** * Displays a list of available buses @@ -76,8 +79,8 @@ protected void onCreate(Bundle savedInstanceState) { ButterKnife.bind(this); sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this); - source = sharedPreferences.getString(Constants.SOURCE_CITY, "delhi"); - dest = sharedPreferences.getString(Constants.DESTINATION_CITY, "mumbai"); + source = sharedPreferences.getString(SOURCE_CITY, "delhi"); + dest = sharedPreferences.getString(DESTINATION_CITY, "mumbai"); selectdate.setText(dates); String cityText = source + " to " + dest; @@ -155,7 +158,7 @@ public void onTimeSet(RadialPickerLayout view, int hourOfDay, int minute) { private void getBuslist() { pb.setVisibility(View.VISIBLE); - String uri = Constants.apilink + "bus-booking.php?src=" + + String uri = API_LINK + "bus-booking.php?src=" + source + "&dest=" + dest + @@ -204,8 +207,8 @@ public void run() { @Override protected void onResume() { super.onResume(); - source = sharedPreferences.getString(Constants.SOURCE_CITY, "delhi"); - dest = sharedPreferences.getString(Constants.DESTINATION_CITY, "mumbai"); + source = sharedPreferences.getString(SOURCE_CITY, "delhi"); + dest = sharedPreferences.getString(DESTINATION_CITY, "mumbai"); String cityText = source + " to " + dest; city.setText(cityText); getBuslist(); // Update Bus list diff --git a/Android/app/src/main/java/io/github/project_travel_mate/travel/transport/CarDirections.java b/Android/app/src/main/java/io/github/project_travel_mate/travel/transport/CarDirections.java index f386e725f..5b8c3fcbd 100644 --- a/Android/app/src/main/java/io/github/project_travel_mate/travel/transport/CarDirections.java +++ b/Android/app/src/main/java/io/github/project_travel_mate/travel/transport/CarDirections.java @@ -46,7 +46,18 @@ import okhttp3.OkHttpClient; import okhttp3.Request; import okhttp3.Response; -import utils.Constants; + +import static utils.Constants.DELHI_LAT; +import static utils.Constants.DELHI_LON; +import static utils.Constants.DESTINATION_CITY; +import static utils.Constants.DESTINATION_CITY_LAT; +import static utils.Constants.DESTINATION_CITY_LON; +import static utils.Constants.MUMBAI_LAT; +import static utils.Constants.MUMBAI_LON; +import static utils.Constants.SOURCE_CITY; +import static utils.Constants.SOURCE_CITY_LAT; +import static utils.Constants.SOURCE_CITY_LON; +import static utils.Constants.maps_key; /** * Show car directions between 2 cities @@ -94,12 +105,12 @@ protected void onCreate(Bundle savedInstanceState) { mHandler = new Handler(Looper.getMainLooper()); - sorcelat = s.getString(Constants.SOURCE_CITY_LAT, Constants.DELHI_LAT); - sorcelon = s.getString(Constants.SOURCE_CITY_LON, Constants.DELHI_LON); - deslat = s.getString(Constants.DESTINATION_CITY_LAT, Constants.MUMBAI_LAT); - deslon = s.getString(Constants.DESTINATION_CITY_LON, Constants.MUMBAI_LON); - surce = s.getString(Constants.SOURCE_CITY, "Delhi"); - dest = s.getString(Constants.DESTINATION_CITY, "MUmbai"); + sorcelat = s.getString(SOURCE_CITY_LAT, DELHI_LAT); + sorcelon = s.getString(SOURCE_CITY_LON, DELHI_LON); + deslat = s.getString(DESTINATION_CITY_LAT, MUMBAI_LAT); + deslon = s.getString(DESTINATION_CITY_LON, MUMBAI_LON); + surce = s.getString(SOURCE_CITY, "Delhi"); + dest = s.getString(DESTINATION_CITY, "MUmbai"); MapFragment mapFragment = (MapFragment) getFragmentManager() .findFragmentById(R.id.map); @@ -168,7 +179,7 @@ private void getDirections() { String uri = "https://maps.googleapis.com/maps/api/directions/json?origin=" + sorcelat + "," + sorcelon + "&destination=" + deslat + "," + deslon + "&key=" + - Constants.maps_key + + maps_key + "&mode=driving\n"; Log.e("CALLING : ", uri); diff --git a/Android/app/src/main/java/io/github/project_travel_mate/travel/transport/TrainAdapter.java b/Android/app/src/main/java/io/github/project_travel_mate/travel/transport/TrainAdapter.java index 397b8b1d1..41874be1d 100644 --- a/Android/app/src/main/java/io/github/project_travel_mate/travel/transport/TrainAdapter.java +++ b/Android/app/src/main/java/io/github/project_travel_mate/travel/transport/TrainAdapter.java @@ -56,7 +56,7 @@ public long getItemId(int position) { public View getView(final int position, View convertView, ViewGroup parent) { View vi = convertView; if (vi == null) - vi = inflater.inflate(R.layout.train_listitem, (ViewGroup) null); + vi = inflater.inflate(R.layout.train_listitem, parent, false); TextView title = vi.findViewById(R.id.bus_name); TextView description = vi.findViewById(R.id.bustype); diff --git a/Android/app/src/main/java/io/github/project_travel_mate/travel/transport/TrainList.java b/Android/app/src/main/java/io/github/project_travel_mate/travel/transport/TrainList.java index ba96a5449..365581968 100644 --- a/Android/app/src/main/java/io/github/project_travel_mate/travel/transport/TrainList.java +++ b/Android/app/src/main/java/io/github/project_travel_mate/travel/transport/TrainList.java @@ -38,6 +38,9 @@ import okhttp3.Response; import utils.Constants; +import static utils.Constants.DESTINATION_CITY; +import static utils.Constants.SOURCE_CITY; + public class TrainList extends AppCompatActivity implements com.fourmob.datetimepicker.date.DatePickerDialog.OnDateSetListener, TimePickerDialog.OnTimeSetListener, @@ -74,8 +77,8 @@ protected void onCreate(Bundle savedInstanceState) { mHandler = new Handler(Looper.getMainLooper()); sharedPreferences = PreferenceManager.getDefaultSharedPreferences(this); - source = sharedPreferences.getString(Constants.SOURCE_CITY, "delhi"); - dest = sharedPreferences.getString(Constants.DESTINATION_CITY, "mumbai"); + source = sharedPreferences.getString(SOURCE_CITY, "delhi"); + dest = sharedPreferences.getString(DESTINATION_CITY, "mumbai"); String cityText = source + " to " + dest; city.setText(cityText); selectdate.setText(dates); @@ -134,7 +137,7 @@ public void onTimeSet(RadialPickerLayout view, int hourOfDay, int minute) { } private void getTrainlist() { pb.setVisibility(View.VISIBLE); - String uri = Constants.apilink + + String uri = Constants.API_LINK + "get-trains.php?src_city=" + source + "&dest_city=" + dest + "&date=" + dates; @@ -181,8 +184,8 @@ public void run() { @Override protected void onResume() { super.onResume(); - source = sharedPreferences.getString(Constants.SOURCE_CITY, "delhi"); - dest = sharedPreferences.getString(Constants.DESTINATION_CITY, "mumbai"); + source = sharedPreferences.getString(SOURCE_CITY, "delhi"); + dest = sharedPreferences.getString(DESTINATION_CITY, "mumbai"); String cityText = source + " to " + dest; city.setText(cityText); diff --git a/Android/app/src/main/java/utils/ChecklistEntry.java b/Android/app/src/main/java/io/github/project_travel_mate/utilities/ChecklistEntry.java similarity index 86% rename from Android/app/src/main/java/utils/ChecklistEntry.java rename to Android/app/src/main/java/io/github/project_travel_mate/utilities/ChecklistEntry.java index c442650a5..39ce4ea3e 100644 --- a/Android/app/src/main/java/utils/ChecklistEntry.java +++ b/Android/app/src/main/java/io/github/project_travel_mate/utilities/ChecklistEntry.java @@ -1,4 +1,4 @@ -package utils; +package io.github.project_travel_mate.utilities; import android.provider.BaseColumns; diff --git a/Android/app/src/main/java/io/github/project_travel_mate/utilities/ChecklistFragment.java b/Android/app/src/main/java/io/github/project_travel_mate/utilities/ChecklistFragment.java index fbcdf124a..cfb101cb1 100644 --- a/Android/app/src/main/java/io/github/project_travel_mate/utilities/ChecklistFragment.java +++ b/Android/app/src/main/java/io/github/project_travel_mate/utilities/ChecklistFragment.java @@ -31,10 +31,11 @@ import butterknife.OnClick; import io.github.project_travel_mate.R; import objects.ChecklistItem; -import utils.ChecklistEntry; -import utils.Constants; import utils.DBhelp; +import static utils.Constants.BASE_TASKS; +import static utils.Constants.ID_ADDED_INDB; + public class ChecklistFragment extends Fragment { @@ -42,7 +43,7 @@ public class ChecklistFragment extends Fragment { private SQLiteDatabase db; private Activity activity; - private ArrayList items = new ArrayList<>(); + private final ArrayList items = new ArrayList<>(); @BindView(R.id.lv) ListView lv; @@ -64,17 +65,17 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, SharedPreferences.Editor editor = sharedPreferences.edit(); //First time uers - String isAlreadyAdded = sharedPreferences.getString(Constants.ID_ADDED_INDB, "null"); + String isAlreadyAdded = sharedPreferences.getString(ID_ADDED_INDB, "null"); if (isAlreadyAdded.equals("null")) { - for (int i = 0; i < Constants.baseTask.size(); i++) { + for (int i = 0; i < BASE_TASKS.size(); i++) { ContentValues insertValues = new ContentValues(); - insertValues.put(ChecklistEntry.COLUMN_NAME, Constants.baseTask.get(i)); + insertValues.put(ChecklistEntry.COLUMN_NAME, BASE_TASKS.get(i)); insertValues.put(ChecklistEntry.COLUMN_NAME_ISDONE, "0"); db.insert(ChecklistEntry.TABLE_NAME, null, insertValues); } - editor.putString(Constants.ID_ADDED_INDB, "yes"); + editor.putString(ID_ADDED_INDB, "yes"); editor.apply(); } @@ -91,7 +92,7 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, LayoutInflater inflater = (activity).getLayoutInflater(); builder.setTitle("Add new item"); builder.setCancelable(false); - final View dialogv = inflater.inflate(R.layout.dialog, (ViewGroup) null); + final View dialogv = inflater.inflate(R.layout.dialog, null); builder.setView(dialogv) .setPositiveButton("OK", new DialogInterface.OnClickListener() { @Override diff --git a/Android/app/src/main/java/io/github/project_travel_mate/utilities/EmergencyFragment.java b/Android/app/src/main/java/io/github/project_travel_mate/utilities/EmergencyFragment.java index 5a5486b65..cc5c24211 100644 --- a/Android/app/src/main/java/io/github/project_travel_mate/utilities/EmergencyFragment.java +++ b/Android/app/src/main/java/io/github/project_travel_mate/utilities/EmergencyFragment.java @@ -1,6 +1,5 @@ package io.github.project_travel_mate.utilities; -import android.content.Context; import android.content.Intent; import android.net.Uri; import android.os.Bundle; @@ -52,12 +51,6 @@ public View onCreateView(@NonNull LayoutInflater inflater, ViewGroup container, return view; } - - @Override - public void onAttach(Context activity) { - super.onAttach(activity); - } - @Override public void onClick(View v) { Intent intent = new Intent(Intent.ACTION_DIAL); diff --git a/Android/app/src/main/java/io/github/project_travel_mate/utilities/ShareContact.java b/Android/app/src/main/java/io/github/project_travel_mate/utilities/ShareContact.java index fa4bfb390..1046638c6 100644 --- a/Android/app/src/main/java/io/github/project_travel_mate/utilities/ShareContact.java +++ b/Android/app/src/main/java/io/github/project_travel_mate/utilities/ShareContact.java @@ -22,9 +22,11 @@ import butterknife.BindView; import butterknife.ButterKnife; import io.github.project_travel_mate.R; -import utils.Constants; import utils.Services; +import static utils.Constants.USER_NAME; +import static utils.Constants.USER_NUMBER; + public class ShareContact extends AppCompatActivity implements View.OnClickListener { @BindView(R.id.create) @@ -142,8 +144,8 @@ public void onClick(View view) { //Create a new Intent to send to QR Droid qrDroid = new Intent(Services.ENCODE); //Set action "la.droid.qr.encode" - String mPhoneNumber = sharedPreferences.getString(Constants.USER_NUMBER, "997112322"); - String name = sharedPreferences.getString(Constants.USER_NAME, "Swati Garg"); + String mPhoneNumber = sharedPreferences.getString(USER_NUMBER, "997112322"); + String name = sharedPreferences.getString(USER_NAME, "Swati Garg"); qrDroid.putExtra(Services.CODE, mPhoneNumber + "---" + name); diff --git a/Android/app/src/main/java/objects/Tweet.java b/Android/app/src/main/java/objects/Tweet.java index 59b237dfa..f781cd374 100644 --- a/Android/app/src/main/java/objects/Tweet.java +++ b/Android/app/src/main/java/objects/Tweet.java @@ -2,9 +2,9 @@ public class Tweet { - private String name; - private String url; - private String volume; + private final String name; + private final String url; + private final String volume; public Tweet(String name, String url, String volume) { this.name = name; diff --git a/Android/app/src/main/java/utils/Constants.java b/Android/app/src/main/java/utils/Constants.java index bcb61c7c7..a982ea180 100644 --- a/Android/app/src/main/java/utils/Constants.java +++ b/Android/app/src/main/java/utils/Constants.java @@ -8,9 +8,7 @@ */ public class Constants { public static final String ID_ADDED_INDB = "is_added_in_db"; - public static String FIRST_TIME = "is_first"; public static final String USER_NAME = "user_name"; - public static String USER_EMAIL = "user_email"; public static final String USER_NUMBER = "user_number"; public static final String USER_ID = "user_id"; @@ -33,10 +31,10 @@ public class Constants { public static final String MUMBAI_LAT = "19.076"; public static final String MUMBAI_LON = "772.8777"; - public static final String apilink = "http://prabhakargupta.com/travel-mate/"; + public static final String API_LINK = "http://prabhakargupta.com/travel-mate/"; public static final String maps_key = "AIzaSyBgktirlOODUO9zWD-808D7zycmP7smp-Y"; - public static final List baseTask = new ArrayList() { + public static final List BASE_TASKS = new ArrayList() { { add("Bags"); add("Keys"); @@ -48,4 +46,16 @@ public class Constants { } }; + // For passing within intents / fragments + public static final String EXTRA_MESSAGE_NAME = "name_"; + public static final String EXTRA_MESSAGE_ID = "id_"; + public static final String EXTRA_MESSAGE_IMAGE = "image_"; + public static final String EXTRA_MESSAGE_LATITUDE = "lat_"; + public static final String EXTRA_MESSAGE_LONGITUDE = "lon_"; + public static final String EXTRA_MESSAGE_TYPE = "type_"; + public static final String EXTRA_MESSAGE_TEXT = "text_"; + public static final String EXTRA_MESSAGE_TITLE = "title_"; + + + } \ No newline at end of file diff --git a/Android/app/src/main/java/utils/DBhelp.java b/Android/app/src/main/java/utils/DBhelp.java index ca1449480..6a8418c8d 100644 --- a/Android/app/src/main/java/utils/DBhelp.java +++ b/Android/app/src/main/java/utils/DBhelp.java @@ -4,6 +4,8 @@ import android.database.sqlite.SQLiteDatabase; import android.database.sqlite.SQLiteOpenHelper; +import io.github.project_travel_mate.utilities.ChecklistEntry; + /** * Created by Swati garg on 30-06-2015. *

diff --git a/Android/app/src/main/java/utils/TouchImageView.java b/Android/app/src/main/java/utils/TouchImageView.java index 61131ac1f..d0e8a11a7 100644 --- a/Android/app/src/main/java/utils/TouchImageView.java +++ b/Android/app/src/main/java/utils/TouchImageView.java @@ -1178,7 +1178,7 @@ public void run() { @TargetApi(VERSION_CODES.GINGERBREAD) private class CompatScroller { Scroller scroller; - OverScroller overScroller; + final OverScroller overScroller; final boolean isPreGingerbread; CompatScroller(Context context) { diff --git a/Android/app/src/main/res/layout/activity_shopping_currentcity.xml b/Android/app/src/main/res/layout/activity_shopping_currentcity.xml index 0b97c22ea..d797ed226 100644 --- a/Android/app/src/main/res/layout/activity_shopping_currentcity.xml +++ b/Android/app/src/main/res/layout/activity_shopping_currentcity.xml @@ -30,6 +30,7 @@ android:layout_height="fill_parent" android:layout_gravity="center_vertical" android:inputType="text" + android:hint="@string/empty_description" android:layout_weight="100" />