diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 1c5b1aa..50352d0 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -22,7 +22,6 @@ - + - + \ No newline at end of file diff --git a/app/src/main/java/com/udacity/exploreindia/adapter/SelectedStatePlaceAdapter.java b/app/src/main/java/com/udacity/exploreindia/adapter/SelectedStatePlaceAdapter.java new file mode 100644 index 0000000..9c42756 --- /dev/null +++ b/app/src/main/java/com/udacity/exploreindia/adapter/SelectedStatePlaceAdapter.java @@ -0,0 +1,60 @@ +package com.udacity.exploreindia.adapter; + + +import android.content.Context; +import android.support.v7.widget.RecyclerView; +import android.view.LayoutInflater; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ImageView; +import android.widget.TextView; + +import com.udacity.exploreindia.R; + +/** + * Created by kamalshree on 5/9/2018. + */ + +public class SelectedStatePlaceAdapter extends RecyclerView.Adapter { + + private final Context mContext; + + //sample data this can be changed later + private int[] likedImages = {R.drawable.gujarat1, R.drawable.gujarat2, R.drawable.gujarat3, R.drawable.gujarat4, R.drawable.gujarat5, R.drawable.gujarat6, R.drawable.gujarat7, R.drawable.gujarat8, R.drawable.gujarat5}; + private String[] mplace = {"Bharuch", "Vadodara", "Akshardham", "Sarkhej Roza", "Nagina Masjid", "Akshardham", "Gandhinagar", "Rajkot", "Nagina Masjid"}; + + public SelectedStatePlaceAdapter(Context context) { + mContext = context; + + } + + @Override + public SelectedStatePlaceAdapter.ImageViewHolder onCreateViewHolder(ViewGroup parent, int viewType) { + View view = LayoutInflater.from(mContext).inflate(R.layout.image_item_list, parent, false); + return new SelectedStatePlaceAdapter.ImageViewHolder(view); + } + + @Override + public void onBindViewHolder(SelectedStatePlaceAdapter.ImageViewHolder holder, int position) { + holder.itemImage.setImageResource(likedImages[position]); + holder.placeName.setText(mplace[position]); + } + + @Override + public int getItemCount() { + return likedImages.length; + } + + + protected class ImageViewHolder extends RecyclerView.ViewHolder { + ImageView itemImage; + TextView placeName; + + public ImageViewHolder(View itemView) { + super(itemView); + itemImage = (ImageView) itemView.findViewById(R.id.selected_places_list_images); + placeName = (TextView) itemView.findViewById(R.id.selected_places_tv_name); + } + } + +} \ No newline at end of file diff --git a/app/src/main/java/com/udacity/exploreindia/base/PresenterFactory.java b/app/src/main/java/com/udacity/exploreindia/base/PresenterFactory.java index 311833b..df7bb14 100644 --- a/app/src/main/java/com/udacity/exploreindia/base/PresenterFactory.java +++ b/app/src/main/java/com/udacity/exploreindia/base/PresenterFactory.java @@ -1,6 +1,8 @@ package com.udacity.exploreindia.base; import com.udacity.exploreindia.injection.InjectionUtils; +import com.udacity.exploreindia.ui.StatesWithPlaces.StatesWithPlacesActivity; +import com.udacity.exploreindia.ui.StatesWithPlaces.StatesWithPlacesPresenter; import com.udacity.exploreindia.ui.City.CityActivity; import com.udacity.exploreindia.ui.City.CityPresenter; import com.udacity.exploreindia.ui.home.HomeActivity; @@ -57,6 +59,8 @@ public static S getPresente presenter = (S) new LoginPresenter(InjectionUtils.getSharedPreference(), InjectionUtils.providesDataRepo(), claxx); } else if (claxx instanceof HomeActivity) { presenter = (S) new HomePresenter(InjectionUtils.getSharedPreference(), InjectionUtils.providesDataRepo(), claxx); + } else if (claxx instanceof StatesWithPlacesActivity) { + presenter = (S) new StatesWithPlacesPresenter(InjectionUtils.getSharedPreference(), InjectionUtils.providesDataRepo(), claxx); } else if (claxx instanceof CityActivity) { presenter = (S) new CityPresenter(InjectionUtils.getSharedPreference(), InjectionUtils.providesDataRepo(), claxx); } else { diff --git a/app/src/main/java/com/udacity/exploreindia/ui/StatesWithPlaces/SpacesItemDecoration.java b/app/src/main/java/com/udacity/exploreindia/ui/StatesWithPlaces/SpacesItemDecoration.java new file mode 100644 index 0000000..6fad99e --- /dev/null +++ b/app/src/main/java/com/udacity/exploreindia/ui/StatesWithPlaces/SpacesItemDecoration.java @@ -0,0 +1,28 @@ +package com.udacity.exploreindia.ui.StatesWithPlaces; + +import android.graphics.Rect; +import android.support.v7.widget.RecyclerView; +import android.view.View; + +/** + * Created by kamalshree on 5/9/2018. + */ + +public class SpacesItemDecoration extends RecyclerView.ItemDecoration { + private final int mSpace; + + public SpacesItemDecoration(int space) { + this.mSpace = space; + } + + @Override + public void getItemOffsets(Rect outRect, View view, RecyclerView parent, RecyclerView.State state) { + outRect.left = mSpace; + outRect.right = mSpace; + outRect.bottom = mSpace; + + // Add top margin only for the first item to avoid double space between items + if (parent.getChildAdapterPosition(view) == 0) + outRect.top = mSpace; + } +} \ No newline at end of file diff --git a/app/src/main/java/com/udacity/exploreindia/ui/StatesWithPlaces/StatesWithPlacesActivity.java b/app/src/main/java/com/udacity/exploreindia/ui/StatesWithPlaces/StatesWithPlacesActivity.java index b1c792b..e55c8ce 100644 --- a/app/src/main/java/com/udacity/exploreindia/ui/StatesWithPlaces/StatesWithPlacesActivity.java +++ b/app/src/main/java/com/udacity/exploreindia/ui/StatesWithPlaces/StatesWithPlacesActivity.java @@ -1,33 +1,41 @@ package com.udacity.exploreindia.ui.StatesWithPlaces; -import android.support.annotation.Nullable; -import android.support.v7.app.AppCompatActivity; + import android.os.Bundle; +import android.support.annotation.Nullable; +import android.support.v7.widget.RecyclerView; +import android.support.v7.widget.StaggeredGridLayoutManager; import com.udacity.exploreindia.R; +import com.udacity.exploreindia.adapter.SelectedStatePlaceAdapter; import com.udacity.exploreindia.base.BaseActivity; import com.udacity.exploreindia.databinding.ActivityStatesWithPlacesBinding; + public class StatesWithPlacesActivity extends BaseActivity implements StatesWithPlacesContract.View { - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_states_with_places); - } + RecyclerView mRecyclerView; @Override protected int getContentResource() { - return 0; + return R.layout.activity_states_with_places; } @Override protected void init(@Nullable Bundle savedInstanceState) { + mRecyclerView = (RecyclerView) findViewById(R.id.selected_places_rv_images); + mRecyclerView.setLayoutManager(new StaggeredGridLayoutManager(2, StaggeredGridLayoutManager.VERTICAL)); + + SelectedStatePlaceAdapter adapter = new SelectedStatePlaceAdapter(this); + mRecyclerView.setAdapter(adapter); + SpacesItemDecoration decoration = new SpacesItemDecoration(16); + mRecyclerView.addItemDecoration(decoration); } @Override protected void beforeView(@Nullable Bundle savedInstanceState) { } -} + +} \ No newline at end of file diff --git a/app/src/main/res/drawable/gujarat1.jpg b/app/src/main/res/drawable/gujarat1.jpg new file mode 100644 index 0000000..cf755a4 Binary files /dev/null and b/app/src/main/res/drawable/gujarat1.jpg differ diff --git a/app/src/main/res/drawable/gujarat2.jpg b/app/src/main/res/drawable/gujarat2.jpg new file mode 100644 index 0000000..65a8299 Binary files /dev/null and b/app/src/main/res/drawable/gujarat2.jpg differ diff --git a/app/src/main/res/drawable/gujarat3.jpg b/app/src/main/res/drawable/gujarat3.jpg new file mode 100644 index 0000000..c70caef Binary files /dev/null and b/app/src/main/res/drawable/gujarat3.jpg differ diff --git a/app/src/main/res/drawable/gujarat4.jpg b/app/src/main/res/drawable/gujarat4.jpg new file mode 100644 index 0000000..ef2c617 Binary files /dev/null and b/app/src/main/res/drawable/gujarat4.jpg differ diff --git a/app/src/main/res/drawable/gujarat5.jpg b/app/src/main/res/drawable/gujarat5.jpg new file mode 100644 index 0000000..43b5ffc Binary files /dev/null and b/app/src/main/res/drawable/gujarat5.jpg differ diff --git a/app/src/main/res/drawable/gujarat6.jpg b/app/src/main/res/drawable/gujarat6.jpg new file mode 100644 index 0000000..5258e67 Binary files /dev/null and b/app/src/main/res/drawable/gujarat6.jpg differ diff --git a/app/src/main/res/drawable/gujarat7.jpg b/app/src/main/res/drawable/gujarat7.jpg new file mode 100644 index 0000000..dabff35 Binary files /dev/null and b/app/src/main/res/drawable/gujarat7.jpg differ diff --git a/app/src/main/res/drawable/gujarat8.jpg b/app/src/main/res/drawable/gujarat8.jpg new file mode 100644 index 0000000..6361ae1 Binary files /dev/null and b/app/src/main/res/drawable/gujarat8.jpg differ diff --git a/app/src/main/res/drawable/ic_heart.xml b/app/src/main/res/drawable/ic_heart.xml new file mode 100644 index 0000000..5fa7f1a --- /dev/null +++ b/app/src/main/res/drawable/ic_heart.xml @@ -0,0 +1,4 @@ + + + diff --git a/app/src/main/res/drawable/left_arrow.png b/app/src/main/res/drawable/left_arrow.png new file mode 100644 index 0000000..67d1cd2 Binary files /dev/null and b/app/src/main/res/drawable/left_arrow.png differ diff --git a/app/src/main/res/drawable/search.png b/app/src/main/res/drawable/search.png new file mode 100644 index 0000000..bc42cd4 Binary files /dev/null and b/app/src/main/res/drawable/search.png differ diff --git a/app/src/main/res/drawable/white_grey_border_bottom.xml b/app/src/main/res/drawable/white_grey_border_bottom.xml new file mode 100644 index 0000000..c110235 --- /dev/null +++ b/app/src/main/res/drawable/white_grey_border_bottom.xml @@ -0,0 +1,20 @@ + + + + + + + + + + diff --git a/app/src/main/res/layout/activity_states_with_places.xml b/app/src/main/res/layout/activity_states_with_places.xml index 726d57d..3141e79 100644 --- a/app/src/main/res/layout/activity_states_with_places.xml +++ b/app/src/main/res/layout/activity_states_with_places.xml @@ -1,15 +1,31 @@ - + + - + android:layout_height="match_parent"> + + + + + + + + + + - \ No newline at end of file diff --git a/app/src/main/res/layout/image_item_list.xml b/app/src/main/res/layout/image_item_list.xml new file mode 100644 index 0000000..9143a76 --- /dev/null +++ b/app/src/main/res/layout/image_item_list.xml @@ -0,0 +1,60 @@ + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/snippet_top_bar.xml b/app/src/main/res/layout/snippet_top_bar.xml new file mode 100644 index 0000000..5ea96b8 --- /dev/null +++ b/app/src/main/res/layout/snippet_top_bar.xml @@ -0,0 +1,52 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/ids.xml b/app/src/main/res/values/ids.xml index 3dabdd7..a35665d 100644 --- a/app/src/main/res/values/ids.xml +++ b/app/src/main/res/values/ids.xml @@ -272,4 +272,17 @@ + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 813f7b5..7d30718 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -33,6 +33,11 @@ Popular Places > Search Places + + Gujarat + back + search + Like diff --git a/local.properties b/local.properties index a73573e..b130680 100644 --- a/local.properties +++ b/local.properties @@ -6,3 +6,4 @@ # header note. #Sun May 13 02:21:10 IST 2018 sdk.dir=C\:\\Users\\Navoki\\AppData\\Local\\Android\\Sdk +