Fix: renaming resources to avoid conflicts with users resources.

Update: Updating gradle version

build.gradle

@@ -5,7 +5,7 @@ buildscript {
         jcenter()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.3'
+        classpath 'com.android.tools.build:gradle:2.3.3'
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
         classpath 'com.github.dcendents:android-maven-gradle-plugin:1.4.1'

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Tue Nov 22 16:21:50 EET 2016
+#Sat Mar 11 14:07:55 EET 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip

zgallery/src/main/java/com/mzelzoghbi/zgallery/ZGallery.java

@@ -40,7 +40,7 @@ private ZGallery(Activity activity, ArrayList<String> imagesURLs) {
     }
 
     /**
-     * Set toolbar title
+     * Set z_toolbar title
      *
      * @param title
      * @return
@@ -51,7 +51,7 @@ public ZGallery setTitle(String title) {
     }
 
     /**
-     * Setting toolbar Color ResourceId
+     * Setting z_toolbar Color ResourceId
      *
      * @param colorResId
      * @return
@@ -62,7 +62,7 @@ public ZGallery setToolbarColorResId(int colorResId) {
     }
 
     /**
-     * Setting toolbar color
+     * Setting z_toolbar color
      *
      * @param color enum color may be black or white
      * @return

zgallery/src/main/java/com/mzelzoghbi/zgallery/activities/ZGalleryActivity.java

@@ -32,7 +32,7 @@ public class ZGalleryActivity extends BaseActivity {
 
     @Override
     protected int getResourceLayoutId() {
-        return R.layout.activity_gallery;
+        return R.layout.z_activity_gallery;
     }
 
     @Override

zgallery/src/main/java/com/mzelzoghbi/zgallery/activities/ZGridActivity.java

@@ -23,7 +23,7 @@ public final class ZGridActivity extends BaseActivity implements GridClickListen
 
     @Override
     protected int getResourceLayoutId() {
-        return R.layout.activity_grid;
+        return R.layout.z_activity_grid;
     }
 
     @Override

zgallery/src/main/java/com/mzelzoghbi/zgallery/adapters/GridImagesAdapter.java

@@ -31,7 +31,7 @@ public GridImagesAdapter(Activity activity, ArrayList<String> imageURLs, int img
 
     @Override
     public ImageViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-        return new ImageViewHolder(LayoutInflater.from(parent.getContext()).inflate(R.layout.item_image, null));
+        return new ImageViewHolder(LayoutInflater.from(parent.getContext()).inflate(R.layout.z_item_image, null));
     }
 
     @Override

zgallery/src/main/java/com/mzelzoghbi/zgallery/adapters/HorizontalListAdapters.java

@@ -32,7 +32,7 @@ public HorizontalListAdapters(Activity activity, ArrayList<String> images, OnImg
 
     @Override
     public HorizontalImageViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
-        return new HorizontalImageViewHolder(LayoutInflater.from(parent.getContext()).inflate(R.layout.item_image_horizontal, null));
+        return new HorizontalImageViewHolder(LayoutInflater.from(parent.getContext()).inflate(R.layout.z_item_image_horizontal, null));
     }
 
     @Override

zgallery/src/main/java/com/mzelzoghbi/zgallery/adapters/ViewPagerAdapter.java

@@ -56,7 +56,7 @@ public boolean isViewFromObject(View view, Object object) {
 
     @Override
     public Object instantiateItem(ViewGroup container, int position) {
-        View itemView = mLayoutInflater.inflate(R.layout.pager_item, container, false);
+        View itemView = mLayoutInflater.inflate(R.layout.z_pager_item, container, false);
 
         final ImageView imageView = (ImageView) itemView.findViewById(R.id.iv);
         Glide.with(activity).load(images.get(position)).listener(new RequestListener<String, GlideDrawable>() {

zgallery/src/main/res/layout/activity_gallery.xml → zgallery/src/main/res/layout/z_activity_gallery.xml

@@ -6,7 +6,7 @@
     android:id="@+id/mainLayout"
     android:orientation="vertical">
 
-    <include layout="@layout/toolbar" />
+    <include layout="@layout/z_toolbar" />
 
     <com.mzelzoghbi.zgallery.CustomViewPager
         android:id="@+id/pager"

zgallery/src/main/res/layout/activity_grid.xml → zgallery/src/main/res/layout/z_activity_grid.xml

@@ -4,7 +4,7 @@
               android:layout_height="match_parent"
               android:orientation="vertical">
 
-    <include layout="@layout/toolbar"/>
+    <include layout="@layout/z_toolbar"/>
 
     <android.support.v7.widget.RecyclerView
         android:id="@+id/recyclerView"