New Baka-Tsuki Android App: Development

[Nandaka]

That's a problem me and Nandaka had before (and sometimes still happens) because the end lines are different if you work on Linux and windows.

Lets say i mess with a file (windows) and then nandaka merges with his files (linux). all the files i touched will have windows coded end lines, so the merger will think that file was also touched and replace everything. Basically. In a nutshell.

This one a bit different, I suspect he haven't pull the latest merge at that point of time (Merge branch 'master' of https://github.com/Thatdot7/LNReader-Android), so in his repository the remote master still pointing to (Update prefereces for LineSpacing), which cause different point of head.

Maybe you can try to do rebase, see: http://git-scm.com/book/en/Git-Branching-Rebasing, correct me if I'm wrong

[Thatdot7]

Wow... Github is blowing my mind, but I would like to get this fixed. I know I will need to learn GitHub 1 day or another.

This is my view at the moment.
When I launch the GitHub shell, it will go to my folder.

I will usually type:
> cd LNReader-Android
[master]>git remote add upstream https://github.com/calvinaquino/LNReader-Android.git
[master]> git fetch upstream
[master]> git merge upstream/master

Now it spits "Alerady up-to-date"

During the "Great GiHub Explosion of 2013", it think I was trying to commit some piece of code to my respo at the same time when Nandaka updated something.
Then the shell shows [rebase ##### 1+ 1~] or something like that in blue/green/red text.

When that occurs, what do I need to type to
a) use Nandaka's update and completely overwrite my stuff
b) merge our 2 updates together

I am going to wait till you give me the green light to continue doing coding =D
On a side note, Bloodscythe, is it possible to post a screenshot of the before image that you referred?

[Nandaka]

Wow... Github is blowing my mind, but I would like to get this fixed. I know I will need to learn GitHub 1 day or another.

This is my view at the moment.
When I launch the GitHub shell, it will go to my folder.

I will usually type:
> cd LNReader-Android
[master]>git remote add upstream https://github.com/calvinaquino/LNReader-Android.git
[master]> git fetch upstream
[master]> git merge upstream/master

Now it spits "Alerady up-to-date"

During the "Great GiHub Explosion of 2013", it think I was trying to commit some piece of code to my respo at the same time when Nandaka updated something.
Then the shell shows [rebase ##### 1+ 1~] or something like that in blue/green/red text.

When that occurs, what do I need to type to
a) use Nandaka's update and completely overwrite my stuff
b) merge our 2 updates together

I think you need to do this:
- create new branch
- checkout the latest update from master repo
- merge back the changes to your master
- push to your repo
- create new pull request?

[Bloodscythe]

@Thatdot7
What do you mean by before screenshot?
I assume its not a screenshot of images before build 39 since you've posted those before so I'm at a bit of a loss here.

As a side note, putting scrolling size for volume rocker higher than a certain number causes the app to force close. Then again, the number is a 10 digit number above 1111111111 so nobody would really get that force close unless they were mucking about like I was.... So, yeah, don't mind me.

[Nandaka]

@Thatdot7
What do you mean by before screenshot?
I assume its not a screenshot of images before build 39 since you've posted those before so I'm at a bit of a loss here.

As a side note, putting scrolling size for volume rocker higher than a certain number causes the app to force close. Then again, the number is a 10 digit number above 1111111111 so nobody would really get that force close unless they were mucking about like I was.... So, yeah, don't mind me.

most likely it is because they failed to parse the input as integer (overflow).

[Thatdot7]

I can't recreate a pull request because it is already up to date with my repo... I think that is a good sign...
And I see that you were the last one to update my repo, which is also a good sign =D

I got a few questions.
In my computer, I have 2 copies of the project.
- GitHub/LNReader-Android
- GitHub/LNReader-Android/LNReader-Android

Is it safe to delete the 2nd copy off my computer without dropping the world in chaos?

@Bloodscythe
Ah, were you referring to the black theme version inside the actual novel text?
I believe the old version was a white border surrounding a white border. I will attempt to put it back when my GitHub meltdown is fixed

[Nandaka]

I can't recreate a pull request because it is already up to date with my repo... I think that is a good sign...
And I see that you were the last one to update my repo, which is also a good sign =D

I got a few questions.
In my computer, I have 2 copies of the project.
- GitHub/LNReader-Android
- GitHub/LNReader-Android/LNReader-Android

Is it safe to delete the 2nd copy off my computer without dropping the world in chaos?

The safest way? As long it is already uploaded to GitHub, just delete the whole folder (or back up to somewhere) and do git clone again.

[Thatdot7]

I can't recreate a pull request because it is already up to date with my repo... I think that is a good sign...
And I see that you were the last one to update my repo, which is also a good sign =D

I got a few questions.
In my computer, I have 2 copies of the project.
- GitHub/LNReader-Android
- GitHub/LNReader-Android/LNReader-Android

Is it safe to delete the 2nd copy off my computer without dropping the world in chaos?

@Bloodscythe
Ah, were you referring to the black theme version inside the actual novel text?
I believe the old version was a white border surrounding a white border. I will attempt to put it back when my GitHub meltdown is fixed

EDIT: if you are referring to the borders in the "Boku wa Tomodachi ga Sukunai" page. Here was the problem I faced:
In terms of CSS, it is close to impossible to distinguish from the navigation bar that you see at the bottom of all the novel chapters. Normally, I would want to add some cell padding for tables, but I risk changing the navigation bar.

So, this was the best way I can "sort of" can make both look half decent.
Is it possible to get the website developers to add some sort of class name or id to that navigation bar? >.<

[Nandaka]

I can't recreate a pull request because it is already up to date with my repo... I think that is a good sign...
And I see that you were the last one to update my repo, which is also a good sign =D

I got a few questions.
In my computer, I have 2 copies of the project.
- GitHub/LNReader-Android
- GitHub/LNReader-Android/LNReader-Android

Is it safe to delete the 2nd copy off my computer without dropping the world in chaos?

Double post?

EDIT: if you are referring to the borders in the "Boku wa Tomodachi ga Sukunai" page. Here was the problem I faced:
In terms of CSS, it is close to impossible to distinguish from the navigation bar that you see at the bottom of all the novel chapters. Normally, I would want to add some cell padding for tables, but I risk changing the navigation bar.

So, this was the best way I can "sort of" can make both look half decent.
Is it possible to get the website developers to add some sort of class name or id to that navigation bar? >.<

Either that, or change the layout from the wiki itself so other user using the browser can get the benefit.

[Bloodscythe]

Hmm....
Well, I'm talking about the Black theme, yes.
Here's the table in "Boku wa Tomodachi ga Sukunai"
http://db.tt/n7HGrGr2
Sorry, don't know how to display images here *shakes head*
The table has a black color with white outlines.
Now then, this one:
http://db.tt/CJo8Oh2k
You can see the backgrounds of the images is white or a shade of gray I should say.
Here's what it looks like in a chapter:
http://db.tt/NlPBiTB1
Previous it had a black background to the picture but the latest update changed it to this.
The way the images are displayed are the same between the Black and White themes as well.

[Erakk]

@Nandaka, Thatdot7:
Ok guys, let's stop adding features, i think we need to release a working version for now, then we can implement future features/fixes in patches very fast.

The thing is, we have been updating the app quite a lot, this is good, but the release version is still there with some small bugs.
I am not ordering or anything, im not the leader, and i also think we got a good new face on the team (Thatdot7).

This is my opinion, anyone is free to give theirs. But we could change our "updates plan" =D

On a side note, my setup is basically github with beyond compare and android sdk. basically, get github, compare with the one im editing, alternate changes, then submit back.

[Nandaka]

@Nandaka, Thatdot7:
Ok guys, let's stop adding features, i think we need to release a working version for now, then we can implement future features/fixes in patches very fast.

The thing is, we have been updating the app quite a lot, this is good, but the release version is still there with some small bugs.
I am not ordering or anything, im not the leader, and i also think we got a good new face on the team (Thatdot7).

This is my opinion, anyone is free to give theirs. But we could change our "updates plan" =D

On a side note, my setup is basically github with beyond compare and android sdk. basically, get github, compare with the one im editing, alternate changes, then submit back.

It is ok for me to release the apk, even it haven't fully tested (realistically, it is impossible to count for all possible test cases. I'd rather release it often than waiting until it perfect), anyway please someone buy me this: http://www.1999.co.jp/eng/10214398

[Thatdot7]

@Nandaka, Thatdot7:
Ok guys, let's stop adding features, i think we need to release a working version for now, then we can implement future features/fixes in patches very fast.

The thing is, we have been updating the app quite a lot, this is good, but the release version is still there with some small bugs.
I am not ordering or anything, im not the leader, and i also think we got a good new face on the team (Thatdot7).

This is my opinion, anyone is free to give theirs. But we could change our "updates plan" =D

On a side note, my setup is basically github with beyond compare and android sdk. basically, get github, compare with the one im editing, alternate changes, then submit back.

It is ok for me to release the apk, even it haven't fully tested (realistically, it is impossible to count for all possible test cases. I'd rather release it often than waiting until it perfect)

I also think it is ok to release. But it is missing one thing that can potentially make this whole app illegal. That is the copyright and EULA stuff.
In terms of testing, I haven't really encountered any bugs or flaws. It is more like there are some stuff that needs to be thought about (navigation/positioning of stuff).
As you guys release, there are bound to be some comments that will help constructively build the app.

[Nandaka]

I also think it is ok to release. But it is missing one thing that can potentially make this whole app illegal. That is the copyright and EULA stuff.

Never seen that on the old BakaReader app, at least in the new one have BakaTsuki:Copyright on the Settings page.

[Thatdot7]

I also think it is ok to release. But it is missing one thing that can potentially make this whole app illegal. That is the copyright and EULA stuff.

Never seen that on the old BakaReader app, at least in the new one have BakaTsuki:Copyright on the Settings page.

A popup dialog that says like "we do not own the content in this app" or something along those lines will do. You may have to ask the owner of Baka-Tsuki to pitch in.
I don't know anything about legal stuff.

EDIT: http://www.baka-tsuki.org/project/index ... disclaimer looks like a good resource, even a link to that will do.