Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Filter out irrelevant categories #1029 #1134

Merged
merged 4 commits into from
Feb 15, 2018

Conversation

junkiattan
Copy link
Contributor

#1029

@nicolas-raoul @misaochan

I have submitted a pull request for this issue.

Not sure whether this was intended. When I went through the set up instructions, my Android version was telling me to insert formatted="false" to some of the string xml files, in order for me to proceed with an error free build. I added them in in order to get my app running for this project. Not sure whether I did the right thing do ;/

Would be glad if you could advice

@nicolas-raoul
Copy link
Member

Have a look here:
https://github.com/junkiattan/apps-android-commons/network

As you can see, our master has already changed a lot this since you forked.
That explains the conflicts.

The best thing for you to do is to rebase from our master.
Please let us know when you have done it.
Thanks! :-)

@junkiattan
Copy link
Contributor Author

junkiattan commented Feb 12, 2018

@nicolas-raoul

I have done the rebase, however I realized that some of the files introduced or some of the updates is causing me to fail Travis even though I did not touch the mentioned files. The main thing is that studio is telling me that values-ko-kp is an invalid resource directory name. Hope you can advice me on this

error

build.gradle Outdated
@@ -7,7 +7,7 @@ buildscript {
google()
}
dependencies {
classpath "com.android.tools.build:gradle:${project.gradleVersion}"
classpath 'com.android.tools.build:gradle:3.0.1'
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should probably not be hardcoded. :)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

that's strange. I did not touch that file. Ill reedit and rebuild my project again!

thanx @misaochan

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I believe Android Studio prompts you and asks if you would like to "update Gradle version", upon which it modifies the file. I generally set that to "Not ask again". ;)

@misaochan
Copy link
Member

Are you still unable to build locally, or is the failure only in the Travis build? If master is failing Travis, PRs that are rebased on master fail Travis as well. In that case it is not a concern, we are usually okay with merging PRs that fail Travis for that reason. :)

The current build error is caused by a translatewiki problem, we should probably create a separate issue for it.

@junkiattan
Copy link
Contributor Author

@misaochan @nicolas-raoul

after changing the class path again, I am still unable to build locally.

The error in the picture that I posted remains. I have done some online searching, and the best answer I could find was to remove the file, but since it was introduced in a previous merge I do not think that it is the best solution.

@misaochan
Copy link
Member

Yeah, that was introduced by a translation commit. Sorry about that! This is tracked at #1135 .

In the meantime, AFAIK it is okay for you to make the changes needed to build locally, just don't commit them.

@neslihanturan
Copy link
Collaborator

Hi @junkiattan , what should be result of this PR, can you describe? I have read the related issue, and expected not to see very old dates among categories. However, I am able to see them, am I missing something?

device-2018-02-15-153522

@junkiattan
Copy link
Contributor Author

Hi @neslihanturan!

What I did was just to skip all "in the XXXXs" categories except 2000s and 2010s as described in the issue. Maybe you can try typing in a specific key word like this example.

@neslihanturan
Copy link
Collaborator

Oh so we are missing .XX format years. So I will merge this and hold the issue still open. Since there is extra work needed.

@neslihanturan neslihanturan merged commit 8a26a09 into commons-app:master Feb 15, 2018
@junkiattan
Copy link
Contributor Author

@neslihanturan
I can help to add in the formatting of the years. But I would like to clarify about what is considered an old date for the year part. Referring to the picture you posted, is date with year 01 still considered old and to be filtered?

@neslihanturan
Copy link
Collaborator

Let us discuss it on the thread, since @nicolas-raoul suggested this idea, I think his user experience can guide us.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants