-
Notifications
You must be signed in to change notification settings - Fork 64
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
1 parent
2deab82
commit 238282a
Showing
38 changed files
with
815 additions
and
110 deletions.
There are no files selected for viewing
This file was deleted.
Oops, something went wrong.
This file was deleted.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,18 +1,33 @@ | ||
<?xml version="1.0" encoding="utf-8"?> | ||
<RelativeLayout | ||
xmlns:android="http://schemas.android.com/apk/res/android" | ||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
xmlns:tools="http://schemas.android.com/tools" | ||
android:layout_width="match_parent" | ||
android:layout_height="match_parent" | ||
android:paddingBottom="@dimen/activity_vertical_margin" | ||
android:paddingLeft="@dimen/activity_horizontal_margin" | ||
android:paddingRight="@dimen/activity_horizontal_margin" | ||
android:paddingTop="@dimen/activity_vertical_margin" | ||
xmlns:app="http://schemas.android.com/apk/res-auto" | ||
android:orientation="vertical" | ||
tools:context="com.mzelzoghbi.sample.MainActivity"> | ||
|
||
<android.support.v7.widget.Toolbar xmlns:android="http://schemas.android.com/apk/res/android" | ||
android:id="@+id/toolbar" | ||
android:layout_width="fill_parent" | ||
android:layout_height="wrap_content" | ||
android:background="?attr/colorPrimary" | ||
android:fitsSystemWindows="true" | ||
app:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar" | ||
android:minHeight="?attr/actionBarSize" /> | ||
|
||
<Button | ||
android:layout_margin="@dimen/normal" | ||
android:layout_width="wrap_content" | ||
android:layout_height="wrap_content" | ||
android:onClick="gridActivity" | ||
android:text="Grid Activity"/> | ||
</RelativeLayout> | ||
android:text="Grid Activity" /> | ||
|
||
<Button | ||
android:layout_width="wrap_content" | ||
android:layout_height="wrap_content" | ||
android:layout_marginTop="@dimen/normal" | ||
android:layout_marginLeft="@dimen/normal" | ||
android:onClick="galleryActivity" | ||
android:text="Gallery Activity" /> | ||
</LinearLayout> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,6 +1,6 @@ | ||
#Mon Dec 28 10:00:20 PST 2015 | ||
#Tue Nov 22 16:21:50 EET 2016 | ||
distributionBase=GRADLE_USER_HOME | ||
distributionPath=wrapper/dists | ||
zipStoreBase=GRADLE_USER_HOME | ||
zipStorePath=wrapper/dists | ||
distributionUrl=https\://services.gradle.org/distributions/gradle-2.10-all.zip | ||
distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,60 @@ | ||
ECLIPSE ANDROID PROJECT IMPORT SUMMARY | ||
====================================== | ||
|
||
Ignored Files: | ||
-------------- | ||
The following files were *not* copied into the new Gradle project; you | ||
should evaluate whether these are still needed in your project and if | ||
so manually move them: | ||
|
||
* pom.xml | ||
|
||
Replaced Jars with Dependencies: | ||
-------------------------------- | ||
The importer recognized the following .jar files as third party | ||
libraries and replaced them with Gradle dependencies instead. This has | ||
the advantage that more explicit version information is known, and the | ||
libraries can be updated automatically. However, it is possible that | ||
the .jar file in your project was of an older version than the | ||
dependency we picked, which could render the project not compileable. | ||
You can disable the jar replacement in the import wizard and try again: | ||
|
||
android-support-v4.jar => com.android.support:support-v4:18.+ | ||
|
||
Moved Files: | ||
------------ | ||
Android Gradle projects use a different directory structure than ADT | ||
Eclipse projects. Here's how the projects were restructured: | ||
|
||
* AndroidManifest.xml => ViewPagerIndicator/src/main/AndroidManifest.xml | ||
* res/ => ViewPagerIndicator/src/main/res/ | ||
* src/ => ViewPagerIndicator/src/main/java/ | ||
|
||
Missing Android Support Repository: | ||
----------------------------------- | ||
Some useful libraries, such as the Android Support Library, are | ||
installed from a special Maven repository, which should be installed | ||
via the SDK manager. | ||
|
||
It looks like this library is missing from your SDK installation at: | ||
null | ||
|
||
To install it, open the SDK manager, and in the Extras category, | ||
select "Android Support Repository". You may also want to install the | ||
"Google Repository" if you want to use libraries like Google Play | ||
Services. | ||
|
||
Next Steps: | ||
----------- | ||
You can now build the project. The Gradle project needs network | ||
connectivity to download dependencies. | ||
|
||
Bugs: | ||
----- | ||
If for some reason your project does not build, and you determine that | ||
it is due to a bug or limitation of the Eclipse to Gradle importer, | ||
please file a bug at http://b.android.com with category | ||
Component-Tools. | ||
|
||
(This import summary is for your information only, and can be deleted | ||
after import once you are satisfied with the results.) |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,13 +1,13 @@ | ||
<manifest xmlns:android="http://schemas.android.com/apk/res/android" | ||
package="com.mzelzoghbi.zgallery"> | ||
package="com.mzelzoghbi.zgallery"> | ||
|
||
<uses-permission android:name="android.permission.INTERNET"/> | ||
<uses-permission android:name="android.permission.INTERNET" /> | ||
<application | ||
android:allowBackup="true" | ||
android:label="@string/app_name" | ||
android:supportsRtl="true" | ||
> | ||
<activity android:name=".ZGridActivity"/> | ||
android:supportsRtl="true"> | ||
<activity android:name=".activities.ZGridActivity" /> | ||
<activity android:name=".activities.ZGalleryActivity" /> | ||
</application> | ||
|
||
</manifest> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.