[Question] I've got some contributions, buuut, I'm not exactly sure how to submit them

[ShadowKyogre]

I've got some contributions, buuut, I'm not exactly sure how to submit them. The reason why is that I had to convert the project from the current Eclipse format to Android Studio format before I could get to working on it.

A few of the contributions include:

• Massively better support for nested folders
• Better UI for bookmark folder creation
• Renaming folders/moving them
• Moving bookmarks without having to edit them
• Getting javascript bookmarklets to work

Which of the following should I do to submit the contributions?:

• Manually do diffs for the necessary contributions and apply those to a copy on github
• Put up a completely separate repo on github for Tint Browser, then the manual diff attached to some ticket ala a pastebin
• Wait for this to be converted to gradle format, then apply my changes to a copy on github

[ElementW]

I don't know if the project would have gotten Android Studio project files officially without someone else proposing the change. Is this conversion destroying Eclipse project files?

Personally I don't use Android Studio, and heavily hate the gradle build system, but its integration to the project is fine by me.

As for your changes, the easiest way to get your work merged is to use a fork, push your changes there (including the project files changes), then do a simple pull request from your repo to this one. Things that should be corrected will be notified to you on the said PR's comment page and you'll be able to amend your commits/squash them if necessary before Anasthase (if he's still alive somehow) decides to merge your changes.

[ShadowKyogre]

@gravgun: When I did the conversion to Android Studio format before I started working on the code, I think it did pop the original Eclipse project format files. I still have a local copy of the original repo though.

Trying to figure out how to get Android Studio to convert it along with the addon framework needed to build Tint was a huge pain. Mostly because of Android Studio being an idiot regarding how I should've named the cloned copies of the repos. At least I hadn't touched the addon framework for that to be a problem.

Hence why I was asking the question of what should I do considering the pull request, because Android studio was insisting, "Hey, make this a subproject too" for the framework while I was importing Tint Browser.

I'll go ahead and make a fork, then apply what I need to apply to the fork before submitting the pull request (after I eat breakfast).

[ShadowKyogre]

@gravgun
For instance, here's what happens when I did the conversion with the local copy of the upstream repo again:

ECLIPSE ANDROID PROJECT IMPORT SUMMARY
======================================

Manifest Merging:
-----------------
Your project uses libraries that provide manifests, and your Eclipse
project did not explicitly turn on manifest merging. In Android Gradle
projects, manifests are always merged (meaning that contents from your
libraries' manifests will be merged into the app manifest. If you had
manually copied contents from library manifests into your app manifest
you may need to remove these for the app to build correctly.

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:

From TintBrowser:
* .gitignore
* README.textile
* changelog
* proguard.cfg
From TintBrowserAddonFrameworkLibrary:
* .gitignore
* README.textile
* proguard.cfg

Moved Files:
------------
Android Gradle projects use a different directory structure than ADT
Eclipse projects. Here's how the projects were restructured:

In TintBrowserAddonFrameworkLibrary:
* AndroidManifest.xml => tintBrowserAddonFrameworkLibrary/src/main/AndroidManifest.xml
* res/ => tintBrowserAddonFrameworkLibrary/src/main/res/
* src/ => tintBrowserAddonFrameworkLibrary/src/main/java/
* src/org/tint/addons/framework/Action.aidl => tintBrowserAddonFrameworkLibrary/src/main/aidl/org/tint/addons/framework/Action.aidl
* src/org/tint/addons/framework/IAddon.aidl => tintBrowserAddonFrameworkLibrary/src/main/aidl/org/tint/addons/framework/IAddon.aidl
In TintBrowser:
* AndroidManifest.xml => tintBrowser/src/main/AndroidManifest.xml
* assets/ => tintBrowser/src/main/assets/
* lint.xml => tintBrowser/lint.xml
* res/ => tintBrowser/src/main/res/
* src/ => tintBrowser/src/main/java/

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.)

I'm still trying to figure out how to get the project to //not// import the addon framework library to keep the addon framework code not intertangled with the main code for the browser. It'd be awkward to have a duplicate copy inside my personal fork until I figure that part out before copying my changes over.