Skip to content

Commit

Permalink
makeup folder names, fix minor issues
Browse files Browse the repository at this point in the history
  • Loading branch information
nuhkoca committed Jun 17, 2018
1 parent 4a8f2a8 commit 5f67c61
Show file tree
Hide file tree
Showing 41 changed files with 75 additions and 84 deletions.
2 changes: 1 addition & 1 deletion .idea/misc.xml

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

4 changes: 3 additions & 1 deletion README.md
Expand Up @@ -4,6 +4,8 @@

:boom: One travel guide for the whole world. It's free.

[![Build Status](https://travis-ci.org/nuhkoca/Trippo-The_Travel_Guide.svg?branch=master)](https://travis-ci.org/nuhkoca/Trippo-The_Travel_Guide)

Trippo is your smart travel guide - it’s free and works offline, too! Our awesome algorithms crunch through millions of websites and reviews to deliver unique recommendations across 50,000 destinations worldwide! Personalize your trip by picking your favorite hotels, sights, activities and restaurants and book them seamlessly in our app! You can skim through tours, locations, POIs, city walks, articles and so on. This guide will save you from a serious headache!

This project is powered by **Triposo.com.** To get your own Account Id and Token, please visit [Triposo](https://www.triposo.com/)
Expand Down Expand Up @@ -31,7 +33,7 @@ You also need browser and API keys in order to use Google Maps with Nearby Place
- [x] 225 countries are available in total.
- [x] Users can add any country to their favorite lists.
- [x] A comprehensive detail page for each of the countries helps you out to find everything.
- [x] Users can book any activity by activating bookable option.
- [x] Users can seamlessly book any event by activating bookable option.
- [x] Users can show any landmark/country in the map.
- [x] The app reads too long articles to users.
- [x] Users receive remindful notifications. They can also switch off notifications if wish.
Expand Down
12 changes: 6 additions & 6 deletions app/src/main/AndroidManifest.xml
Expand Up @@ -59,29 +59,29 @@
android:name=".ui.AboutActivity"
android:parentActivityName=".ui.MainActivity" />
<activity
android:name=".ui.content.first.FirstContentActivity"
android:name=".ui.content.feature.FirstContentActivity"
android:launchMode="singleTop"
android:parentActivityName=".ui.CountryDetailActivity" />
<activity
android:name=".ui.content.second.OutsideContentActivity"
android:name=".ui.content.outside.OutsideContentActivity"
android:launchMode="singleTop"
android:parentActivityName=".ui.CountryDetailActivity" />
<activity
android:name=".ui.content.third.ExperienceContentActivity"
android:name=".ui.content.experience.ExperienceContentActivity"
android:launchMode="singleTop"
android:parentActivityName=".ui.CountryDetailActivity" />
<activity android:name=".ui.WebViewActivity" />
<activity
android:name=".ui.favorite.FavoritesActivity"
android:parentActivityName=".ui.searchable.SearchableActivity" />
<activity
android:name=".ui.content.fifth.ArticleActivity"
android:name=".ui.content.article.ArticleActivity"
android:launchMode="singleTop"
android:parentActivityName=".ui.CountryDetailActivity" />
<activity
android:name=".ui.content.fifth.ArticleDetailActivity"
android:name=".ui.content.article.ArticleDetailActivity"
android:keepScreenOn="true"
android:parentActivityName=".ui.content.fifth.ArticleActivity"
android:parentActivityName=".ui.content.article.ArticleActivity"
android:theme="@style/AppTheme.Details" />
<activity android:name=".ui.AuthActivity"
android:parentActivityName=".ui.MainActivity" />
Expand Down
Expand Up @@ -23,7 +23,7 @@ public FavoriteCountriesRepository(Application application) {
mFavoriteCountriesDao = trippoDatabase.favoriteCountriesDao();
}

public List<FavoriteCountries> getAllForWidget(){
public List<FavoriteCountries> getAllForWidget() {
return mFavoriteCountriesDao.getAllForWidget();
}

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/nuhkoca/trippo/ui/AboutActivity.java
Expand Up @@ -91,7 +91,7 @@ public boolean onOptionsItemSelected(MenuItem item) {

int reqCode = getIntent().getIntExtra(Constants.PARENT_ACTIVITY_REQ_KEY, 0);

if (reqCode > 0) {
if (reqCode == Constants.PARENT_ACTIVITY_REQ_CODE) {
NavUtils.navigateUpFromSameTask(this);
} else {
super.onBackPressed();
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/java/com/nuhkoca/trippo/ui/AuthActivity.java
Expand Up @@ -98,7 +98,7 @@ public void onClick(View v) {

switch (itemThatWasClicked) {
case R.id.tvSkipNow:
if (mReqCode > 0) {
if (mReqCode == Constants.PARENT_ACTIVITY_REQ_CODE) {
finish();
} else {

Expand Down
Expand Up @@ -32,17 +32,15 @@
import com.nuhkoca.trippo.ui.content.ContentType;
import com.nuhkoca.trippo.ui.content.ExperienceContentType;
import com.nuhkoca.trippo.ui.content.OutsideContentType;
import com.nuhkoca.trippo.ui.content.fifth.ArticleActivity;
import com.nuhkoca.trippo.ui.content.first.FirstContentActivity;
import com.nuhkoca.trippo.ui.content.second.OutsideContentActivity;
import com.nuhkoca.trippo.ui.content.third.ExperienceContentActivity;
import com.nuhkoca.trippo.ui.content.article.ArticleActivity;
import com.nuhkoca.trippo.ui.content.feature.FirstContentActivity;
import com.nuhkoca.trippo.ui.content.outside.OutsideContentActivity;
import com.nuhkoca.trippo.ui.content.experience.ExperienceContentActivity;
import com.nuhkoca.trippo.util.AlertDialogUtils;
import com.nuhkoca.trippo.util.AppWidgetUtils;
import com.nuhkoca.trippo.util.ScreenSizer;
import com.nuhkoca.trippo.util.SnackbarUtils;

import timber.log.Timber;

public class CountryDetailActivity extends AppCompatActivity implements View.OnClickListener {

private ActivityCountryDetailBinding mActivityCountryDetailBinding;
Expand Down Expand Up @@ -265,7 +263,7 @@ public boolean onOptionsItemSelected(MenuItem item) {
case android.R.id.home:
supportFinishAfterTransition();

if (mReqCode > 0) {
if (mReqCode == Constants.PARENT_ACTIVITY_REQ_CODE) {
NavUtils.navigateUpFromSameTask(this);
} else {
super.onBackPressed();
Expand Down
13 changes: 9 additions & 4 deletions app/src/main/java/com/nuhkoca/trippo/ui/MainActivity.java
Expand Up @@ -55,9 +55,14 @@ private void setupInterstitialAd() {
mInterstitialAd.setAdListener(new AdListener() {
@Override
public void onAdClosed() {
if (mInterstitialAd != null && mInterstitialAd.isLoaded()) {
mInterstitialAd = null;
MainActivity.super.onBackPressed();
} else {
MainActivity.super.onBackPressed();
}

super.onAdClosed();
mInterstitialAd = null;
MainActivity.super.onBackPressed();
}
});
}
Expand Down Expand Up @@ -131,9 +136,8 @@ public void onBackPressed() {

if (mBackPressed + timeDelay > System.currentTimeMillis()) {
supportFinishAfterTransition();
AppWidgetUtils.update(MainActivity.this);

if (mInterstitialAd.isLoaded()) {
if (mInterstitialAd != null && mInterstitialAd.isLoaded()) {
mInterstitialAd.show();
} else {
super.onBackPressed();
Expand All @@ -144,6 +148,7 @@ public void onBackPressed() {
Toast.LENGTH_SHORT).show();
}

AppWidgetUtils.update(MainActivity.this);
mBackPressed = System.currentTimeMillis();
}

Expand Down
@@ -1,4 +1,4 @@
package com.nuhkoca.trippo.ui.content.fifth;
package com.nuhkoca.trippo.ui.content.article;

import android.arch.lifecycle.Observer;
import android.arch.lifecycle.ViewModelProviders;
Expand All @@ -7,9 +7,7 @@
import android.databinding.DataBindingUtil;
import android.os.Bundle;
import android.support.annotation.Nullable;
import android.support.v4.app.ActivityOptionsCompat;
import android.support.v4.app.NavUtils;
import android.support.v4.view.ViewCompat;
import android.support.v7.app.ActionBar;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.LinearLayoutManager;
Expand All @@ -27,7 +25,7 @@
import com.nuhkoca.trippo.helper.Constants;
import com.nuhkoca.trippo.model.remote.content.fifth.ArticleResult;
import com.nuhkoca.trippo.ui.content.ArticleContentType;
import com.nuhkoca.trippo.ui.content.fifth.paging.ArticleResultDataSourceFactory;
import com.nuhkoca.trippo.ui.content.article.paging.ArticleResultDataSourceFactory;
import com.nuhkoca.trippo.ui.settings.ActivityType;
import com.nuhkoca.trippo.ui.settings.SettingsActivity;
import com.nuhkoca.trippo.util.ConnectionUtil;
Expand Down
@@ -1,10 +1,9 @@
package com.nuhkoca.trippo.ui.content.fifth;
package com.nuhkoca.trippo.ui.content.article;

import android.arch.paging.PagedListAdapter;
import android.content.Context;
import android.databinding.DataBindingUtil;
import android.support.annotation.NonNull;
import android.support.v4.view.ViewCompat;
import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
Expand All @@ -18,7 +17,6 @@
import com.nuhkoca.trippo.callback.IRetryClickListener;
import com.nuhkoca.trippo.databinding.ArticleListBinding;
import com.nuhkoca.trippo.databinding.NetworkStateItemBinding;
import com.nuhkoca.trippo.helper.Constants;
import com.nuhkoca.trippo.model.remote.content.fifth.ArticleResult;

public class ArticleAdapter extends PagedListAdapter<ArticleResult, RecyclerView.ViewHolder> {
Expand Down
@@ -1,4 +1,4 @@
package com.nuhkoca.trippo.ui.content.fifth;
package com.nuhkoca.trippo.ui.content.article;

import android.app.ActivityOptions;
import android.content.Intent;
Expand Down
@@ -1,4 +1,4 @@
package com.nuhkoca.trippo.ui.content.fifth;
package com.nuhkoca.trippo.ui.content.article;

import android.arch.core.util.Function;
import android.arch.lifecycle.LiveData;
Expand All @@ -11,8 +11,8 @@
import com.nuhkoca.trippo.helper.AppsExecutor;
import com.nuhkoca.trippo.helper.Constants;
import com.nuhkoca.trippo.model.remote.content.fifth.ArticleResult;
import com.nuhkoca.trippo.ui.content.fifth.paging.ArticleResultDataSourceFactory;
import com.nuhkoca.trippo.ui.content.fifth.paging.ItemKeyedArticleDataSource;
import com.nuhkoca.trippo.ui.content.article.paging.ArticleResultDataSourceFactory;
import com.nuhkoca.trippo.ui.content.article.paging.ItemKeyedArticleDataSource;

public class ArticleViewModel extends ViewModel {

Expand Down
@@ -1,10 +1,10 @@
package com.nuhkoca.trippo.ui.content.fifth;
package com.nuhkoca.trippo.ui.content.article;

import android.arch.lifecycle.ViewModel;
import android.arch.lifecycle.ViewModelProvider;
import android.support.annotation.NonNull;

import com.nuhkoca.trippo.ui.content.fifth.paging.ArticleResultDataSourceFactory;
import com.nuhkoca.trippo.ui.content.article.paging.ArticleResultDataSourceFactory;

public class ArticleViewModelFactory implements ViewModelProvider.Factory {

Expand Down
@@ -1,4 +1,4 @@
package com.nuhkoca.trippo.ui.content.fifth.paging;
package com.nuhkoca.trippo.ui.content.article.paging;

import android.arch.lifecycle.MutableLiveData;
import android.arch.paging.DataSource;
Expand Down
@@ -1,4 +1,4 @@
package com.nuhkoca.trippo.ui.content.fifth.paging;
package com.nuhkoca.trippo.ui.content.article.paging;

import android.arch.lifecycle.MutableLiveData;
import android.arch.paging.ItemKeyedDataSource;
Expand Down
@@ -1,4 +1,4 @@
package com.nuhkoca.trippo.ui.content.third;
package com.nuhkoca.trippo.ui.content.experience;

import android.app.ActivityOptions;
import android.arch.lifecycle.Observer;
Expand Down Expand Up @@ -30,7 +30,7 @@
import com.nuhkoca.trippo.model.remote.content.third.ExperienceResult;
import com.nuhkoca.trippo.ui.WebViewActivity;
import com.nuhkoca.trippo.ui.content.ExperienceContentType;
import com.nuhkoca.trippo.ui.content.third.paging.ExperienceContentResultDataSourceFactory;
import com.nuhkoca.trippo.ui.content.experience.paging.ExperienceContentResultDataSourceFactory;
import com.nuhkoca.trippo.ui.settings.ActivityType;
import com.nuhkoca.trippo.ui.settings.SettingsActivity;
import com.nuhkoca.trippo.util.ConnectionUtil;
Expand Down
@@ -1,4 +1,4 @@
package com.nuhkoca.trippo.ui.content.third;
package com.nuhkoca.trippo.ui.content.experience;

import android.arch.paging.PagedListAdapter;
import android.content.Context;
Expand Down
@@ -1,4 +1,4 @@
package com.nuhkoca.trippo.ui.content.third;
package com.nuhkoca.trippo.ui.content.experience;

import android.arch.core.util.Function;
import android.arch.lifecycle.LiveData;
Expand All @@ -11,8 +11,8 @@
import com.nuhkoca.trippo.helper.Constants;
import com.nuhkoca.trippo.model.remote.content.third.ExperienceResult;
import com.nuhkoca.trippo.api.NetworkState;
import com.nuhkoca.trippo.ui.content.third.paging.ExperienceContentResultDataSourceFactory;
import com.nuhkoca.trippo.ui.content.third.paging.ItemKeyedExperienceContentDataSource;
import com.nuhkoca.trippo.ui.content.experience.paging.ExperienceContentResultDataSourceFactory;
import com.nuhkoca.trippo.ui.content.experience.paging.ItemKeyedExperienceContentDataSource;

public class ExperienceContentViewModel extends ViewModel {

Expand Down
@@ -1,10 +1,10 @@
package com.nuhkoca.trippo.ui.content.third;
package com.nuhkoca.trippo.ui.content.experience;

import android.arch.lifecycle.ViewModel;
import android.arch.lifecycle.ViewModelProvider;
import android.support.annotation.NonNull;

import com.nuhkoca.trippo.ui.content.third.paging.ExperienceContentResultDataSourceFactory;
import com.nuhkoca.trippo.ui.content.experience.paging.ExperienceContentResultDataSourceFactory;

public class ExperienceContentViewModelFactory implements ViewModelProvider.Factory {

Expand Down
@@ -1,4 +1,4 @@
package com.nuhkoca.trippo.ui.content.third.paging;
package com.nuhkoca.trippo.ui.content.experience.paging;

import android.arch.lifecycle.MutableLiveData;
import android.arch.paging.DataSource;
Expand Down
@@ -1,4 +1,4 @@
package com.nuhkoca.trippo.ui.content.third.paging;
package com.nuhkoca.trippo.ui.content.experience.paging;

import android.arch.lifecycle.MutableLiveData;
import android.arch.paging.ItemKeyedDataSource;
Expand Down
@@ -1,4 +1,4 @@
package com.nuhkoca.trippo.ui.content.first;
package com.nuhkoca.trippo.ui.content.feature;

import android.arch.paging.PagedListAdapter;
import android.content.Context;
Expand Down
@@ -1,4 +1,4 @@
package com.nuhkoca.trippo.ui.content.first;
package com.nuhkoca.trippo.ui.content.feature;

import android.arch.core.util.Function;
import android.arch.lifecycle.LiveData;
Expand All @@ -11,8 +11,8 @@
import com.nuhkoca.trippo.helper.Constants;
import com.nuhkoca.trippo.model.remote.content.first.ContentResult;
import com.nuhkoca.trippo.api.NetworkState;
import com.nuhkoca.trippo.ui.content.first.paging.ContentResultDataSourceFactory;
import com.nuhkoca.trippo.ui.content.first.paging.ItemKeyedContentDataSource;
import com.nuhkoca.trippo.ui.content.feature.paging.ContentResultDataSourceFactory;
import com.nuhkoca.trippo.ui.content.feature.paging.ItemKeyedContentDataSource;

public class ContentViewModel extends ViewModel {

Expand Down
@@ -1,10 +1,10 @@
package com.nuhkoca.trippo.ui.content.first;
package com.nuhkoca.trippo.ui.content.feature;

import android.arch.lifecycle.ViewModel;
import android.arch.lifecycle.ViewModelProvider;
import android.support.annotation.NonNull;

import com.nuhkoca.trippo.ui.content.first.paging.ContentResultDataSourceFactory;
import com.nuhkoca.trippo.ui.content.feature.paging.ContentResultDataSourceFactory;

public class ContentViewModelFactory implements ViewModelProvider.Factory {

Expand Down
@@ -1,4 +1,4 @@
package com.nuhkoca.trippo.ui.content.first;
package com.nuhkoca.trippo.ui.content.feature;

import android.app.ActivityOptions;
import android.arch.lifecycle.Observer;
Expand Down Expand Up @@ -27,7 +27,7 @@
import com.nuhkoca.trippo.model.remote.content.first.ContentResult;
import com.nuhkoca.trippo.api.NetworkState;
import com.nuhkoca.trippo.ui.content.ContentType;
import com.nuhkoca.trippo.ui.content.first.paging.ContentResultDataSourceFactory;
import com.nuhkoca.trippo.ui.content.feature.paging.ContentResultDataSourceFactory;
import com.nuhkoca.trippo.ui.nearby.NearbyActivity;
import com.nuhkoca.trippo.util.ConnectionUtil;
import com.nuhkoca.trippo.util.IntentUtils;
Expand Down
@@ -1,4 +1,4 @@
package com.nuhkoca.trippo.ui.content.first.paging;
package com.nuhkoca.trippo.ui.content.feature.paging;

import android.arch.lifecycle.MutableLiveData;
import android.arch.paging.DataSource;
Expand Down
@@ -1,4 +1,4 @@
package com.nuhkoca.trippo.ui.content.first.paging;
package com.nuhkoca.trippo.ui.content.feature.paging;

import android.arch.lifecycle.MutableLiveData;
import android.arch.paging.ItemKeyedDataSource;
Expand Down
@@ -1,4 +1,4 @@
package com.nuhkoca.trippo.ui.content.second;
package com.nuhkoca.trippo.ui.content.outside;

import android.app.ActivityOptions;
import android.arch.lifecycle.Observer;
Expand Down Expand Up @@ -32,7 +32,7 @@
import com.nuhkoca.trippo.ui.settings.SettingsActivity;
import com.nuhkoca.trippo.ui.WebViewActivity;
import com.nuhkoca.trippo.ui.content.OutsideContentType;
import com.nuhkoca.trippo.ui.content.second.paging.OutsideContentResultDataSourceFactory;
import com.nuhkoca.trippo.ui.content.outside.paging.OutsideContentResultDataSourceFactory;
import com.nuhkoca.trippo.ui.nearby.NearbyActivity;
import com.nuhkoca.trippo.util.ConnectionUtil;
import com.nuhkoca.trippo.util.IntentUtils;
Expand Down
@@ -1,4 +1,4 @@
package com.nuhkoca.trippo.ui.content.second;
package com.nuhkoca.trippo.ui.content.outside;

import android.arch.paging.PagedListAdapter;
import android.content.Context;
Expand Down

0 comments on commit 5f67c61

Please sign in to comment.