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

Update README.md #2

Open
wants to merge 134 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
134 commits
Select commit Hold shift + click to select a range
47e0554
Update README.md
cpollett Sep 24, 2014
2a58116
Added our names
8Mobius8 Sep 30, 2014
7b16a0d
new file
Sep 30, 2014
9796e79
Document SeparatedListAdapter.java
hongde88 Oct 9, 2014
70e6be9
Merge pull request #1 from hongde88/master
cpollett Oct 9, 2014
df8c26a
Added some documentaion to the FileCache.java file
8Mobius8 Oct 10, 2014
92e648e
Add class & method documentation
johnsmiller Oct 10, 2014
3476e74
LazyAdapter comments/documentation
Oct 10, 2014
541d2e5
Changed comments to JavaDoc type comments.
8Mobius8 Oct 11, 2014
b5d7ba7
Merge pull request #6 from 8Mobius8/master
cpollett Oct 11, 2014
80ff8b2
Cleaned up some code and added some javadoc
katharinebrinker Oct 11, 2014
8d6acc1
Merge pull request #7 from katharinebrinker/master
cpollett Oct 11, 2014
5ed020d
Commented on some classes.
bruno1308 Oct 11, 2014
6b396f0
Merge https://github.com/cpollett/Cinequest-Android
bruno1308 Oct 11, 2014
8039141
Added comments to some undocumented classes and clarifid some classes
Oct 18, 2014
a69577e
Updated with necessary changes
Oct 21, 2014
282fc40
Applied Requested Changes
Oct 21, 2014
dbc2ca9
Changed 'Schedule' to 'My Cinequest'
johnsmiller Oct 22, 2014
14b08d8
Merging in commits made by other students in CS 175 course.
8Mobius8 Oct 22, 2014
2ffd446
Merge pull request #19 from Ofek86/master
cpollett Oct 23, 2014
8444e4a
Commit for First part of Paint the App Red, Issue #11
sreenidhipm Oct 23, 2014
fd8e602
Merge pull request #22 from sreenidhipm/Sreenidhi-Cinequest-Android
cpollett Oct 27, 2014
c46fb83
Add some missing imports, delete whitespace, a=chris
cpollett Oct 27, 2014
b7ae702
We should really git fetch upstream more often.
8Mobius8 Oct 29, 2014
f17eca9
issue #13 fixed
shwu2012 Nov 2, 2014
6ace69f
issue 13 films and events buttons updated
shwu2012 Nov 2, 2014
ebb8dc1
Merge pull request #23 from 8Mobius8/master
cpollett Nov 2, 2014
2ac4e24
Merge pull request #25 from shwu2012/master
cpollett Nov 2, 2014
cbb0077
Removed forums tab from MainTab. Removed "else if" clause which handeled
kenano Nov 3, 2014
e4250a9
Merge pull request #26 from kenano/master
cpollett Nov 4, 2014
f2937bf
fixed button border and list_header color
farjahan Nov 8, 2014
611093d
Merge pull request #28 from farjahan/master
cpollett Nov 8, 2014
49e8e56
Added border for Films and Events button
farjahan Nov 11, 2014
0ef10fa
Fixed Comments according to directions:
swathi-k Nov 11, 2014
540aba6
Merge pull request #29 from swathi-k/master
cpollett Nov 12, 2014
67494fd
Merge pull request #31 from farjahan/master
cpollett Nov 15, 2014
dc1b9bd
Display a server down message if app hangs at the loading sreen
hongde88 Nov 17, 2014
1983e32
Merge branch 'master' of https://github.com/cpollett/Cinequest-Android
bruno1308 Nov 18, 2014
d371ede
change server message to what Matt wanted it to be
hongde88 Nov 19, 2014
432d2d8
search edit text added
hongde88 Nov 21, 2014
a2aa6a3
Special character bug fix
michaelsingh99 Nov 22, 2014
803230b
searchable edit text added
hongde88 Nov 24, 2014
3753c92
Merge branch 'master' of https://github.com/hongde88/Cinequest-Android
hongde88 Nov 24, 2014
6fc9533
Merge pull request #36 from michaelsingh99/master
cpollett Nov 24, 2014
c530401
Merge pull request #33 from hongde88/master
cpollett Nov 24, 2014
6755052
Updated Share Options banner color. Everything that's supposed to be …
katharinebrinker Nov 25, 2014
33365d2
Merge pull request #43 from katharinebrinker/master
cpollett Nov 25, 2014
4c1fa68
Just fixed image loading issue by encoding image url
hongde88 Nov 27, 2014
f11e0e9
Merge pull request #44 from hongde88/master
cpollett Nov 29, 2014
b320501
"Make Events Tab into Schedule Tab"
BrianGuilardi Dec 2, 2014
1935636
Update AndroidManifest.xml
michaelsingh99 Dec 2, 2014
085845c
Update AndroidManifest.xml
michaelsingh99 Dec 2, 2014
4190973
Update AndroidManifest.xml
michaelsingh99 Dec 2, 2014
6b3b55a
Merge pull request #48 from BrianGuilardi/master
cpollett Dec 3, 2014
99bff09
Merge pull request #50 from michaelsingh99/master
cpollett Dec 3, 2014
7b652c0
refixed interaction color to red
farjahan Dec 3, 2014
5290ccd
Test
michaelsingh99 Dec 3, 2014
92cfd72
Update/change current images to same size grey icons,Update Icons for…
farjahan Dec 4, 2014
e6e4e63
fixed and limited the Android application only in Portrait orientatio…
zhen511 Dec 4, 2014
9f07a6e
Merge pull request #58 from zhen511/master
cpollett Dec 4, 2014
f43cd88
Merge pull request #57 from farjahan/master
cpollett Dec 4, 2014
164714a
Merge pull request #51 from farjahan/master
cpollett Dec 4, 2014
d499347
uploaded missing images
farjahan Dec 8, 2014
9d167ce
Merge pull request #61 from farjahan/master
cpollett Dec 9, 2014
fd99d66
Changed My Cinequest tab text size so it fits on the tab
katharinebrinker Dec 10, 2014
8dd0576
Merging with upstream. App actually builds now
katharinebrinker Dec 10, 2014
ffba2cd
Updated images, now that Eclipse decided they exist
katharinebrinker Dec 10, 2014
6a8cbab
Merge pull request #65 from katharinebrinker/master
cpollett Dec 10, 2014
c9bbafe
fixed secondary App Navigation Options #64
farjahan Dec 10, 2014
16bcd0b
finish issue #63, replace youtube with Twiiter
luznlun Dec 11, 2014
50865f5
Merge pull request #66 from farjahan/master
cpollett Dec 11, 2014
b62e1fa
finish issue #63, replace youtube with twitter
luznlun Dec 11, 2014
8fd6169
Merge branch 'master' of https://github.com/cpollett/Cinequest-Android
bruno1308 Dec 13, 2014
b058963
Merge pull request #68 from luznlun/master
cpollett Dec 16, 2014
d971d2d
Revert "finish issue #63, replace youtube with Twiiter"
cpollett Dec 16, 2014
00a394a
Merge pull request #69 from cpollett/revert-68-master
cpollett Dec 16, 2014
141b4bd
Update README.md
cpollett Dec 16, 2014
93a1e84
Deprecated method being replaced by the new one.
bruno1308 Dec 16, 2014
6cffbab
Merge branch 'master' of https://github.com/cpollett/Cinequest-Android
bruno1308 Dec 16, 2014
f3d39cb
fix the build error, now youtube button is replaced with Twitter. It …
luznlun Dec 17, 2014
4768bee
Merge pull request #70 from bruno1308/master
cpollett Dec 17, 2014
76aaf25
Merge pull request #71 from luznlun/master
cpollett Dec 17, 2014
33f064d
Updated ScheduleActivity
Dec 23, 2014
480148b
Updated Cinequest Activity to enable clicking on event and adding it …
Dec 24, 2014
4d204ac
Put back original Schedule Activity with working delete button
Dec 24, 2014
7920487
Updated FilmsActivity1.java to anchor date when user scrolls through …
Dec 28, 2014
aca520d
Updated FilmsActivity1.java to anchor date when user scrolls through …
Jan 2, 2015
7e47928
Optimized Code For Faster Performance, and added anchoring of date to…
Jan 4, 2015
e7a5796
latest changes to email application, it uses a chooser so user can ch…
Jan 6, 2015
e514942
Updateed button names in FilmsDetails, and put code that should allow…
Jan 6, 2015
5699fe6
Email functionality checked and verified, latest code is submitted
Jan 7, 2015
216ee8f
Facebook login and post functions merged into one function. Its easy …
Jan 7, 2015
e43a76b
Twitter works again now.
Jan 7, 2015
728b5ea
Twitter works again now. Repolished facebook code
Jan 8, 2015
c99c5dc
Facebook now works, there is not need for a facebook application
Jan 14, 2015
d27fdd7
Extra Two necessary files
Jan 14, 2015
fef7102
Commit with latest changes
Jan 15, 2015
cd028c5
Gave credit to facebook Webview code
Jan 17, 2015
40a1287
Attempt to fix a bug of having schedule events actually be removed wh…
Jan 19, 2015
65deb77
Contacts refresh as they are added and deleted
Jan 20, 2015
f71bdbb
Changing banner
Jan 20, 2015
3013bd0
changed backgroundimage name
Jan 20, 2015
6e2049f
commit removing old filmreel
Jan 20, 2015
61614e2
Adding filmreel2.jpg
Jan 20, 2015
5660a00
Adding filmreel3.jpg
Jan 20, 2015
2e5f367
removing filmreel2.jpg
Jan 20, 2015
5fb1ae0
adding two new images one for splash and one for news banner
Jan 21, 2015
edc3746
adding two new images one for splash and one for news banner
Jan 21, 2015
e0dac90
adding androidsplash due to naming conventions
Jan 21, 2015
a484449
adding more stuff to ignore list
cpollett Jan 27, 2015
4bb4d65
Changes cinequest guid, a=chris
cpollett Jan 29, 2015
248c793
Fixed Schedule not showing
Jan 30, 2015
378ea43
Fixed Schedule to display in a chronological order
Jan 30, 2015
a562bcd
...
cayhorstmann Dec 17, 2015
b608a5c
removed .idea
cayhorstmann Dec 17, 2015
7f6a8a4
Videos playing
cayhorstmann Jan 15, 2016
af329d4
Schedule fix
cayhorstmann Jan 20, 2016
c73586c
New splash screen
cayhorstmann Jan 20, 2016
8ab332a
added - android:versionCode="1601251907" android:versionName="16.0125…
cayhorstmann Jan 26, 2016
3c2734f
...
cayhorstmann Jan 31, 2016
28808ec
added - android:versionCode="1602041503" android:versionName="16.0204…
cayhorstmann Feb 4, 2016
4087b2f
...
cayhorstmann Feb 6, 2016
9d2f8c8
Merge branch 'master' of github.com:cpollett/Cinequest-Android
cayhorstmann Feb 6, 2016
87be56e
added - android:versionCode="1602060938" android:versionName="16.0206…
cayhorstmann Feb 6, 2016
82cc7e3
...
cayhorstmann Feb 7, 2016
3891821
Merge branch 'master' of github.com:cpollett/Cinequest-Android
cayhorstmann Feb 7, 2016
568207b
...
cayhorstmann Feb 8, 2016
e6295b6
added - android:versionCode="1602081518" android:versionName="16.0208…
mopsal Feb 8, 2016
3cbdcdb
Merge pull request #1 from cpollett/master
Apr 24, 2016
5c11fe2
Updated Gradle, updated splash screen image
mopsal Dec 21, 2016
23fc69b
Updated Gradle, updated URLs for trending and venues
mopsal Mar 30, 2017
8f0369f
Merge pull request #75 from Ofek86/master
Jun 28, 2017
aa95c5c
Updated newsFeedURL to point to main feed from Agile Ticketing - mopsal
mopsal Dec 6, 2017
39da57d
Merge remote-tracking branch 'origin/master'
mopsal Dec 6, 2017
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
.DS_Store
# built application files
*.apk
*.ap_
Expand All @@ -19,3 +20,12 @@ local.properties
.classpath
.project
*.~
ant.properties
cinequest.keystore
abc.txt

build/
.gradle
.idea
gradle/
gradlew*
106 changes: 106 additions & 0 deletions Android/Android.iml
Original file line number Diff line number Diff line change
@@ -0,0 +1,106 @@
<?xml version="1.0" encoding="UTF-8"?>
<module external.linked.project.id=":Android" external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$/.." external.system.id="GRADLE" external.system.module.group="Cinequest-Android" external.system.module.version="unspecified" type="JAVA_MODULE" version="4">
<component name="FacetManager">
<facet type="android-gradle" name="Android-Gradle">
<configuration>
<option name="GRADLE_PROJECT_PATH" value=":Android" />
</configuration>
</facet>
<facet type="android" name="Android">
<configuration>
<option name="SELECTED_BUILD_VARIANT" value="debug" />
<option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
<option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
<afterSyncTasks>
<task>generateDebugSources</task>
</afterSyncTasks>
<option name="ALLOW_USER_CONFIGURATION" value="false" />
<option name="RES_FOLDERS_RELATIVE_PATH" value="file://$MODULE_DIR$/res" />
</configuration>
</facet>
</component>
<component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_1_6" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/build/intermediates/classes/debug" />
<output-test url="file://$MODULE_DIR$/build/intermediates/classes/test/debug" />
<exclude-output />
<content url="file://$MODULE_DIR$">
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/debug" isTestSource="false" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/debug" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/r/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/aidl/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/buildConfig/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/rs/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/source/apt/androidTest/debug" isTestSource="true" generated="true" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/rs/androidTest/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/build/generated/res/resValues/androidTest/debug" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/build-types/debug/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/build-types/debug/resources" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/build-types/debug/assets" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/build-types/debug/aidl" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/build-types/debug/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/build-types/debug/rs" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/build-types/debug/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/testDebug/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/res" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/assets" type="java-resource" />
<sourceFolder url="file://$MODULE_DIR$/src" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/builds" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-runtime-classes" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-safeguard" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/incremental-verifier" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-resources" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/instant-run-support" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/jniLibs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/manifests" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/reload-dex" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/res" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/restart-dex" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/rs" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/shaders" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/split-apk" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/symbols" />
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/transforms" />
<excludeFolder url="file://$MODULE_DIR$/build/outputs" />
<excludeFolder url="file://$MODULE_DIR$/build/tmp" />
</content>
<orderEntry type="jdk" jdkName="Android API 15 Platform" jdkType="Android SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" exported="" name="CWAC-SackOfViewsAdapter" level="project" />
<orderEntry type="library" exported="" name="android-support-v4" level="project" />
<orderEntry type="library" exported="" name="CWAC-MergeAdapter" level="project" />
<orderEntry type="module" module-name="JavaCommon" exported="" />
</component>
</module>
50 changes: 29 additions & 21 deletions Android/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,61 +1,69 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="edu.sjsu.cinequest" >

package="edu.sjsu.cinequest" android:versionCode="1602081517"
android:versionName="16.0208.1517">
<uses-permission android:name="android.permission.READ_CALENDAR" />
<uses-permission android:name="android.permission.WRITE_CALENDAR" />
<uses-permission android:name="android.permission.INTERNET" >
</uses-permission>
<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.CALL_PHONE" >
</uses-permission>
<uses-permission android:name="android.permission.CALL_PHONE" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />

<uses-sdk android:minSdkVersion="7" /> <!-- Android 2.1 -->

<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
<uses-sdk android:minSdkVersion="15" />
<application
android:allowBackup="true"
android:icon="@drawable/icon"
android:label="@string/app_name" >
<activity
android:name=".MainTab"
android:label="@string/app_name" >
android:label="@string/app_name"
android:screenOrientation="portrait" >
</activity>
<activity
android:name=".HomeActivity"
android:configChanges="orientation" />

<activity
android:name=".FilmsActivity"
android:name=".HotPicksActivity"
android:configChanges="orientation" />
<activity
android:name=".FilmsActivity1"
android:screenOrientation="portrait"
android:configChanges="orientation" />
<activity
android:name=".FilmDetail"
android:screenOrientation="portrait"
android:configChanges="orientation" />

<activity
android:name=".ScheduleActivity"
android:screenOrientation="portrait"
android:configChanges="orientation" />

<activity
android:name=".PostOnFacebook"
android:screenOrientation="portrait"
android:configChanges="orientation"/>
<!--
<meta-data
android:name="com.facebook.sdk.ApplicationId"
android:value="@string/app_id" />

<activity
android:name="com.facebook.LoginActivity"
android:label="@string/app_name" >
android:label="@string/app_name"
android:screenOrientation="portrait" >
</activity>
-->
<activity
android:name=".SplashScreenActivity"
android:label="@string/app_name" >
android:label="@string/app_name"
android:screenOrientation="portrait" >
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
<action android:name="android.net.wifi.WIFI_STATE_CHANGED"/>
<action android:name="android.net.wifi.STATE_CHANGE"/>
</intent-filter>
</activity>
<activity
android:name=".IndexActivity"
android:configChanges="orientation"
android:screenOrientation="portrait" />
</application>

</manifest>
</manifest>
2 changes: 0 additions & 2 deletions Android/ant.properties

This file was deleted.

37 changes: 37 additions & 0 deletions Android/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
apply plugin: 'com.android.application'

dependencies {
compile fileTree(dir: 'libs', include: '*.jar')
compile project(':JavaCommon')
}

android {
compileSdkVersion 15
buildToolsVersion '25.0.0'

sourceSets {
main {
manifest.srcFile 'AndroidManifest.xml'
java.srcDirs = ['src']
resources.srcDirs = ['src']
aidl.srcDirs = ['src']
renderscript.srcDirs = ['src']
res.srcDirs = ['res']
assets.srcDirs = ['assets']
}

// Move the tests to tests/java, tests/res, etc...
instrumentTest.setRoot('tests')

// Move the build types to build-types/<type>
// For instance, build-types/debug/java, build-types/debug/AndroidManifest.xml, ...
// This moves them out of them default location under src/<type>/... which would
// conflict with src/ being used by the main source set.
// Adding new build types or product flavors should be accompanied
// by a similar customization.
debug.setRoot('build-types/debug')
release.setRoot('build-types/release')
}

android.enforceUniquePackageName = false
}
2 changes: 1 addition & 1 deletion Android/project.properties
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,6 @@

android.library=false
# Project target.
target=android-18
target=android-15
android.library.reference.1=../JavaCommon
android.library.reference.2=../facebook
Binary file added Android/res/drawable-hdpi/events_icon_grey.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Android/res/drawable-hdpi/film_icon2_grey.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Android/res/drawable-hdpi/ic_action_remove.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Android/res/drawable-hdpi/news_2x_grey.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Android/res/drawable-hdpi/news_2x_white.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Android/res/drawable-hdpi/schedule_grey.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Android/res/drawable-hdpi/twitter.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file removed Android/res/drawable-hdpi/youtube.png
Binary file not shown.
Binary file removed Android/res/drawable-mdpi/forums_icon.png
Binary file not shown.
Binary file added Android/res/drawable/androidsplash.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
11 changes: 11 additions & 0 deletions Android/res/drawable/disabledeventsbutton.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#000000"/>
<corners android:topLeftRadius="0dp"
android:bottomLeftRadius="0dp"
android:topRightRadius="8dp"
android:bottomRightRadius="8dp"
/>
<stroke android:width="2px" android:color="#ff0000" />
</shape>
11 changes: 11 additions & 0 deletions Android/res/drawable/disabledfilmsbutton.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#000000"/>
<corners android:topLeftRadius="8dp"
android:bottomLeftRadius="8dp"
android:topRightRadius="0dp"
android:bottomRightRadius="0dp"
/>
<stroke android:width="2px" android:color="#ff0000" />
</shape>
11 changes: 11 additions & 0 deletions Android/res/drawable/enabledeventsbutton.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#ff0000"/>
<corners android:topLeftRadius="0dp"
android:bottomLeftRadius="0dp"
android:topRightRadius="8dp"
android:bottomRightRadius="8dp"
/>
<stroke android:width="5px" android:color="#990000" />
</shape>
11 changes: 11 additions & 0 deletions Android/res/drawable/enabledfilmsbutton.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<solid android:color="#ff0000"/>
<corners android:topLeftRadius="8dp"
android:bottomLeftRadius="8dp"
android:topRightRadius="0dp"
android:bottomRightRadius="0dp"
/>
<stroke android:width="5px" android:color="#990000" />
</shape>
Binary file modified Android/res/drawable/filmreel.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
8 changes: 8 additions & 0 deletions Android/res/drawable/ic_tab_event.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<!-- When selected -->
<item android:drawable="@drawable/events_icon_white_retina"
android:state_selected="true" />
<!-- When not selected-->
<item android:drawable="@drawable/events_icon_grey" />
</selector>
11 changes: 11 additions & 0 deletions Android/res/drawable/ic_tab_film.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<!-- When selected -->
<item android:drawable="@drawable/film_icon2_white_retina"
android:state_selected="true" />
<!-- When not selected-->
<item android:drawable="@drawable/film_icon2_grey" />
</selector>



9 changes: 9 additions & 0 deletions Android/res/drawable/ic_tab_news.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<!-- When selected -->
<item android:drawable="@drawable/news_2x_white"
android:state_selected="true" />
<!-- When not selected-->
<item android:drawable="@drawable/news_2x_grey" />
</selector>

8 changes: 8 additions & 0 deletions Android/res/drawable/ic_tab_schedule.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,8 @@
<?xml version="1.0" encoding="utf-8"?>
<selector xmlns:android="http://schemas.android.com/apk/res/android">
<!-- When selected -->
<item android:drawable="@drawable/schedule_white_retina"
android:state_selected="true" />
<!-- When not selected-->
<item android:drawable="@drawable/schedule_grey" />
</selector>
Binary file removed Android/res/drawable/splash.png
Binary file not shown.
2 changes: 1 addition & 1 deletion Android/res/layout/activity_splash_screen.xml
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
android:id="@+id/login_status"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:background="@drawable/splash" >
android:background="@drawable/androidsplash" >
<TextView
android:id="@+id/login_status_message"
android:layout_width="wrap_content"
Expand Down
13 changes: 12 additions & 1 deletion Android/res/layout/cinequest_tab_activity_layout.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,19 +4,30 @@
android:layout_width="fill_parent"
android:layout_height="fill_parent"
>

<TextView
android:id="@+id/textView1"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:text="@string/heading"
android:paddingTop="2dip"
android:paddingBottom="2dip"
android:paddingLeft="5dip"
android:background="#ff0000"
style="?android:attr/listSeparatorTextViewStyle"/>

<LinearLayout
android:layout_width="fill_parent"
android:layout_height="fill_parent"
android:layout_weight="1"
>

<ListView
android:id="@+id/cinequest_tabactivity_listview"
android:layout_width="fill_parent"
android:layout_height="wrap_content"
android:background="@android:color/transparent"
android:layout_weight="1"
android:listSelector="#FF0000"
/>

<TextView
Expand Down
Loading