Solution to keep working togheter

[michelesalvador]

I'm very sorry for the actual stalemate situation between Family Gem and Geni for Android.
Now we both are in difficulty: if I understand correctly, for me to merge michelesalvador#62 means loose five days of hard work, for you to merge #7 means a crazy work on all the files.
I should have waited for you to finish translate-code-to-english, or maybe you should have waited for me to finish sternbach-translation.
We were both hasty!

I'm trying to apply locally the suggestion of @hannesa2, but it seems always that I have to redo the revision from the beginning.

I'm still looking for the easiest solution to keep working togheter.

[Sternbach-Software]

@michelesalvador I merged the forks! What do you think? I must admit, it was one of the most uncomfortable and stressful experiences I have had in a long time. I really want to make this collaboration work!

[Sternbach-Software]

If you decide to continue collaboration for the future, it should not be this difficult. So long as you do not keep long changes on your computer locally, and we collaborate on large changes more closely, and process the changes in small chunks, things should be much easier.

[Sternbach-Software]

Now that the code is in English, I will be able to make real changes, hopefully getting around to all of those TODOs I saw you write, as well as modernizing the code, etc. I also expect other people to be able to help because the code is now in English. As I said - with a small group of exceptions - I don't expect future changes to be as big as this.

The only big/codebase-wide changes I see value in making are:

• Replacing tabs with 4 spaces and using the official Java code style (e.g. if(var) instead of if( var ), etc.)
• Translating to Kotlin
• Moving to the officially recommended UI-Domain-Data architecture, using the Repository pattern, etc.
• And possibly in the future moving to Jetpack Compose for the UI instead of XML.

The rest are minor details, because you did such a good job in making the app!

[whittede]

I also expect other people to be able to help because the code is now in English.

@Sternbach-Software If you have any small, basic, tasks that need done, I may be able to provide a small amount of assistance in my free time. Just let me know with some specific instructions what needs done and I will be happy to try!

[Sternbach-Software]

@whittede do you have Android experience?

[Sternbach-Software]

@whittede Here's a small and simple one that you only need Java experience for: replace all "magic numbers" with IntDefs. Here are some examples that need changing:

• https://github.com/Sternbach-Software/GeniForAndroid/blob/master/app/src/main/java/app/familygem/DetailActivity.java#L988

• GeniForAndroid/app/src/main/java/app/familygem/ConfirmationActivity.java

  Line 54 in f394c44

  case 1: add++;

• GeniForAndroid/app/src/main/java/app/familygem/ConfirmationActivity.java

  Line 77 in f394c44

  case 1: // Note

[Sternbach-Software]

@whittede see #9

[whittede]

@whittede do you have Android experience?

Not much, unfortunately! (I would say I'm willing to learn, but while that is true I can't promise I will be fast in learning just because I have a lot on my plate keeping me busy in real life :)

I do have Java experience, though 👍
I'll take a look at this in my spare time! Thanks!

[Sternbach-Software]

@whittede and #10

[Sternbach-Software]

@whittede and #11. Just know that the more simple issues you take, the sooner I can finish the complex ones in the sooner the Geni app will be released.

[michelesalvador]

I merged the forks! What do you think?

Sternbach-Software:master has no conflicts with michelesalvador:master and it could potentially be merged.
Thanks for your effort!
But I don't want this merge as is, because there are changes inadequate for Family Gem, for example the README.md.

I'd still like to collaborate with you, but I'd like also to be able to review your work and select the best of it before incorporating in Family Gem, if possible.
For example in translate-code-to-english you downgraded com.android.tools.build:gradle:7.3.1 to 7.2.0.
When I did sternbach-translation I preferred to keep the upgraded version number.

OK, I will keep no more long changes on my local computer.

At the moment I still don't know what to do to align Family Gem and Geni for Android.

[Sternbach-Software]

Ok. I don't know what to say. If that is the case, I will continue to diverge from FamilyGem. I will start by translating it to Kotlin. This will obviously affect the entire app. If you decide to continue the effort to collaborate, just let me know, and I will be happy to help!

[hannesa2]

When more developer will contribute, a lot of big changes will appear. And origin maintainer will loose code control, because new pattern will change the code drastically. When then someone hesitate to merge (like now), it's a serious issue.
Concerning hesitate: you can always improve later one.

I would go further: Combined collaborate needs more then one maintainer/owner

[Sternbach-Software]

@hannesa2 I fully agree.

[michelesalvador]

I clearly see the need to loose control on the code. But I'd like this to happen a little at a time.
You are proposing too drastic changes in a short time.

I need to:

• Feel that a contribution is needed
• Fully trust the contributor
• Maintain high quality on the final result

When then someone hesitate to merge (like now), it's a serious issue.

Two years ago I proposed to FamilySearch a pull request that was never accepted.
For me the proposal was just perfect, but perhaps it did not meet the needs of the maintainers.
I never thought it was a serious issue for them, in case mine.