diff --git a/.idea/misc.xml b/.idea/misc.xml index fbb6828..5d19981 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -37,7 +37,7 @@ - + diff --git a/.idea/vcs.xml b/.idea/vcs.xml new file mode 100644 index 0000000..94a25f7 --- /dev/null +++ b/.idea/vcs.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/app/build.gradle b/app/build.gradle index 1a437c7..b7c3923 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -32,5 +32,7 @@ dependencies { compile 'com.android.support:support-v4:23.4.0' compile 'com.squareup.picasso:picasso:2.3.2' compile 'com.nineoldandroids:library:2.4.0' + compile 'com.daimajia.slider:library:1.1.5@aar' + compile 'com.cleveroad:splittransformation:0.9.0' } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 3ba069e..9b35ee9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,9 +1,11 @@ - + + - + + + - + + + + \ No newline at end of file diff --git a/app/src/main/java/com/example/manis/myapp/AndroidImageAdapter.java b/app/src/main/java/com/example/manis/myapp/AndroidImageAdapter.java new file mode 100644 index 0000000..5f2c8fd --- /dev/null +++ b/app/src/main/java/com/example/manis/myapp/AndroidImageAdapter.java @@ -0,0 +1,55 @@ +package com.example.manis.myapp; + +import android.content.Context; +import android.support.v4.view.PagerAdapter; +import android.support.v4.view.ViewPager; +import android.view.View; +import android.view.ViewGroup; +import android.widget.ImageView; + +import com.squareup.picasso.Picasso; + +/** + * Created by manis on 24-Jun-17. + */ +public class AndroidImageAdapter extends PagerAdapter { + Context mContext; + + AndroidImageAdapter(Context context) { + this.mContext = context; + } + + @Override + public int getCount() { + return sliderImagesId.length; + } + + private String[] sliderImagesId = new String[]{ + "http://images.all-free-download.com/images/graphiclarge/mississippi_landscape_scenic_214567.jpg", + "https://s-media-cache-ak0.pinimg.com/originals/57/80/0e/57800e6fd63b49c51c106bc26bbc3933.jpg", + "https://s-media-cache-ak0.pinimg.com/736x/9e/9a/84/9e9a847b036b582a20fb4ae76c444fb3--green-scenery-black-garden.jpg" + + }; + + @Override + public boolean isViewFromObject(View v, Object obj) { + return v == ((ImageView) obj); + } + + @Override + public Object instantiateItem(ViewGroup container, int i) { + ImageView mImageView = new ImageView(mContext); + mImageView.setScaleType(ImageView.ScaleType.CENTER_CROP); + // mImageView.setImageResource(sliderImagesId[i]); + + + Picasso.with(mContext).load(sliderImagesId[i]).into(mImageView); + ((ViewPager) container).addView(mImageView, 0); + return mImageView; + } + + @Override + public void destroyItem(ViewGroup container, int i, Object obj) { + ((ViewPager) container).removeView((ImageView) obj); + } +} \ No newline at end of file diff --git a/app/src/main/java/com/example/manis/myapp/Gallery.java b/app/src/main/java/com/example/manis/myapp/Gallery.java new file mode 100644 index 0000000..f662e27 --- /dev/null +++ b/app/src/main/java/com/example/manis/myapp/Gallery.java @@ -0,0 +1,18 @@ +package com.example.manis.myapp; + +import android.support.v4.view.ViewPager; +import android.support.v7.app.AppCompatActivity; +import android.os.Bundle; + +public class Gallery extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_gallery2); + getSupportActionBar().setTitle("Gallery"); + ViewPager mViewPager = (ViewPager) findViewById(R.id.viewPageAndroid); + AndroidImageAdapter adapterView = new AndroidImageAdapter(this); + mViewPager.setAdapter(adapterView); + } +} diff --git a/app/src/main/java/com/example/manis/myapp/MainActivity.java b/app/src/main/java/com/example/manis/myapp/MainActivity.java index b9d64e7..8dc2932 100644 --- a/app/src/main/java/com/example/manis/myapp/MainActivity.java +++ b/app/src/main/java/com/example/manis/myapp/MainActivity.java @@ -101,6 +101,8 @@ private void displaySelectedScreen(int id) { } else if (id == R.id.nav_web) { } else if (id == R.id.nav_photo) { + Intent i = new Intent(MainActivity.this, Gallery.class); + startActivity(i); } else if (id == R.id.nav_results) { diff --git a/app/src/main/res/drawable-v21/bigbang.jpg b/app/src/main/res/drawable-v21/bigbang.jpg deleted file mode 100644 index e69de29..0000000 diff --git a/app/src/main/res/drawable-v21/cat.jpg b/app/src/main/res/drawable-v21/cat.jpg new file mode 100644 index 0000000..eb4997a Binary files /dev/null and b/app/src/main/res/drawable-v21/cat.jpg differ diff --git a/app/src/main/res/drawable-v21/game_of_thrones.jpg b/app/src/main/res/drawable-v21/game_of_thrones.jpg deleted file mode 100644 index e69de29..0000000 diff --git a/app/src/main/res/drawable-v21/hannibal.jpg b/app/src/main/res/drawable-v21/hannibal.jpg deleted file mode 100644 index e69de29..0000000 diff --git a/app/src/main/res/drawable-v21/house.jpg b/app/src/main/res/drawable-v21/house.jpg deleted file mode 100644 index e69de29..0000000 diff --git a/app/src/main/res/drawable-v21/image1.jpg b/app/src/main/res/drawable-v21/image1.jpg new file mode 100644 index 0000000..73a37d3 Binary files /dev/null and b/app/src/main/res/drawable-v21/image1.jpg differ diff --git a/app/src/main/res/drawable-v21/image2.jpg b/app/src/main/res/drawable-v21/image2.jpg new file mode 100644 index 0000000..37cced1 Binary files /dev/null and b/app/src/main/res/drawable-v21/image2.jpg differ diff --git a/app/src/main/res/layout/activity_gallery2.xml b/app/src/main/res/layout/activity_gallery2.xml new file mode 100644 index 0000000..a5d67a7 --- /dev/null +++ b/app/src/main/res/layout/activity_gallery2.xml @@ -0,0 +1,16 @@ + + + + +