search

cpollett / Cinequest-Android

Cinequest Android Application for CS175 Class, Fall 2013 @ SJSU
0 stars 16 forks source link

Fixed text size issue and app not building issue #65

Closed katharinebrinker closed 9 years ago

katharinebrinker commented 9 years ago

"My Cinequest" tab no longer srolls; all of the text fits on the tab. Also fixed the problem where the app wasn't building due to missing resources. I don't actually have those resources, but I made the necessary changes for the app to build now. Not sure if that can count as two issues, though I guess that's technically two different issues with the app that've been fixed, but at least the text issue is resolved now. Group: Katharine Brinker, Sreenidhi Pundi Muralidharan, Duy Truong

cpollett commented 9 years ago

It looks like a git pull of the main repository should have been done before making this pull request. Can you check?

katharinebrinker commented 9 years ago

I pulled the main repository beforehand (I had been about eighteen commits behind, yikes) and fixed merge conflicts before submitting the pull request. At the time I sent the pull request, my repository was listed as being two commits ahead of yours; this seems to still be the case. I can try another pull and see if anything changes, if you'd like.

On Wed, Dec 10, 2014 at 9:43 AM, cpollett notifications@github.com wrote:

It looks like a git pull of the main repository should have been done before making this pull request. Can you check?

— Reply to this email directly or view it on GitHub https://github.com/cpollett/Cinequest-Android/pull/65#issuecomment-66491717 .

cpollett commented 9 years ago

Hey Katherine,

I am just worried that someone added back the missing images in an earlier commit and you were changing the resource identifiers. What was reasoning is changing R.drawable.ic_tab_news to R.drawable.news ?

Best, Chris

On Dec 10, 2014, at 10:31 AM, Katharine Brinker notifications@github.com wrote:

I pulled the main repository beforehand (I had been about eighteen commits behind, yikes) and fixed merge conflicts before submitting the pull request. At the time I sent the pull request, my repository was listed as being two commits ahead of yours; this seems to still be the case. I can try another pull and see if anything changes, if you'd like.

On Wed, Dec 10, 2014 at 9:43 AM, cpollett notifications@github.com wrote:

It looks like a git pull of the main repository should have been done before making this pull request. Can you check?

— Reply to this email directly or view it on GitHub https://github.com/cpollett/Cinequest-Android/pull/65#issuecomment-66491717 .

— Reply to this email directly or view it on GitHub https://github.com/cpollett/Cinequest-Android/pull/65#issuecomment-66499147.

katharinebrinker commented 9 years ago

​Interesting. Those still weren't available ​when I pulled. I'll check it out.

On Wed, Dec 10, 2014 at 10:36 AM, cpollett notifications@github.com wrote:

Hey Katherine,

I am just worried that someone added back the missing images in an earlier commit and you were changing the resource identifiers. What was reasoning is changing R.drawable.ic_tab_news to R.drawable.news ?

Best, Chris

On Dec 10, 2014, at 10:31 AM, Katharine Brinker < notifications@github.com> wrote:

I pulled the main repository beforehand (I had been about eighteen commits behind, yikes) and fixed merge conflicts before submitting the pull request. At the time I sent the pull request, my repository was listed as being two commits ahead of yours; this seems to still be the case. I can try another pull and see if anything changes, if you'd like.

On Wed, Dec 10, 2014 at 9:43 AM, cpollett notifications@github.com wrote:

It looks like a git pull of the main repository should have been done before making this pull request. Can you check?

— Reply to this email directly or view it on GitHub < https://github.com/cpollett/Cinequest-Android/pull/65#issuecomment-66491717>

.

— Reply to this email directly or view it on GitHub < https://github.com/cpollett/Cinequest-Android/pull/65#issuecomment-66499147>.

— Reply to this email directly or view it on GitHub https://github.com/cpollett/Cinequest-Android/pull/65#issuecomment-66499950 .