Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
97 commits
Select commit Hold shift + click to select a range
68b8a4b
Initial commit
sorrellt Nov 23, 2017
3421e99
my first commit
Dec 16, 2017
c7c0cd2
Merge branch 'master' of https://github.com/sorrellt/ICS4U1a201718_Fi…
Dec 16, 2017
b716747
opening screen, and list of task screen
G30rg3Z Dec 17, 2017
fa37e77
add jdbc library
Dec 20, 2017
be1b838
fixed merge errors
Dec 20, 2017
ba3598a
connected to database
Dec 20, 2017
f07364f
updated to ignore .idea/library files
mrfabroa Dec 21, 2017
203d7d3
sign in and register screen
G30rg3Z Dec 21, 2017
8959794
Merge branch 'master' of https://github.com/sorrellt/CPT_Game
G30rg3Z Dec 21, 2017
62717ea
Updated Screens
G30rg3Z Jan 9, 2018
c1748bc
Updated Screens
G30rg3Z Jan 10, 2018
0b68e88
Updated Screens
G30rg3Z Jan 10, 2018
ac51d5e
List of days and activities
G30rg3Z Jan 15, 2018
aaa823f
clean up
mrfabroa Jan 15, 2018
44682f9
temp fix
G30rg3Z Jan 15, 2018
72732e8
added database connection
emanresu24 Jan 15, 2018
abe7675
added database connection(2nd time)
emanresu24 Jan 15, 2018
c350193
try to fix problems
emanresu24 Jan 15, 2018
bbe399b
list of everyday tasks
G30rg3Z Jan 16, 2018
2c70369
list of tasks
G30rg3Z Jan 16, 2018
301617d
Synchronize work / fixing github
emanresu24 Jan 17, 2018
f98c568
Synch and further fixing
emanresu24 Jan 17, 2018
97ae14d
Merge branch 'new'
emanresu24 Jan 17, 2018
96a1600
more clean up
G30rg3Z Jan 17, 2018
2dee102
hopefully removed .idea oppression
MarcoBozic Jan 22, 2018
57f53a7
for real this time
MarcoBozic Jan 22, 2018
19290af
i mean it this time
MarcoBozic Jan 22, 2018
c6e7bc6
database testing
MarcoBozic Jan 22, 2018
35b3e37
screen progress
CodingSkrub Jan 23, 2018
9838339
made async task for database
MarcoBozic Jan 23, 2018
486097a
added opening, sign in, and register screens
G30rg3Z Jan 24, 2018
1119ca9
enabled button activation
G30rg3Z Jan 24, 2018
da892d9
days, and links
G30rg3Z Jan 24, 2018
65b5679
added functional wednesday button
Jan 24, 2018
0fce124
added functional monday button
Jan 24, 2018
248513e
added functional tuesday button
Jan 24, 2018
e169126
added functional thursdaay button
Jan 24, 2018
7ed0054
added functional friday button
Jan 24, 2018
b24ffa6
updated format for main screen
Jan 24, 2018
e159e2c
updated sizes of buttons
Jan 24, 2018
c76505a
fixed up main screen again
Jan 24, 2018
29559a2
constrained the buttons
G30rg3Z Jan 24, 2018
b7ffa5c
changed app icon
G30rg3Z Jan 24, 2018
4db709e
updated title
MarcoBozic Jan 24, 2018
83c2c2d
worked on database
MarcoBozic Jan 24, 2018
32baf1a
added ability to write down tasks
G30rg3Z Jan 24, 2018
1346372
added working google classroom button
Jan 24, 2018
90dce4d
added back buttons for all the different days
Jan 25, 2018
1c8b324
added back buttons to all the importabt screens
Jan 25, 2018
b65bf01
Title fix
emanresu24 Jan 25, 2018
63d749f
FINALLY GOT THE DATABASE TO CONNECT :):):):)
MarcoBozic Jan 25, 2018
b69a4fc
Map init
emanresu24 Jan 25, 2018
a3437b3
Map functionality update
emanresu24 Jan 25, 2018
a5515bb
login works
emanresu24 Jan 25, 2018
7376d38
deleted some screens
emanresu24 Jan 25, 2018
91aec1c
added new monday screen
emanresu24 Jan 25, 2018
eb53543
worked on registration
emanresu24 Jan 25, 2018
e325c4c
made a relative layout screen for all the days of the week
Jan 25, 2018
ff0fbfa
added new button
Jan 25, 2018
b02ac51
fixed the format of buttons
Jan 26, 2018
6235ac8
progress on video
Jan 26, 2018
1911e1f
Adding video API
emanresu24 Jan 26, 2018
7fdcecf
naming events
G30rg3Z Jan 26, 2018
bd787f7
Video intent code
emanresu24 Jan 26, 2018
9ea1409
Spirit video continued
emanresu24 Jan 26, 2018
916eb63
Video and registeration completion
emanresu24 Jan 26, 2018
fded88d
contacts btn progress
CodingSkrub Jan 26, 2018
4f367bd
ASDF
CodingSkrub Jan 26, 2018
123bca7
Contact screen fix part 1
emanresu24 Jan 26, 2018
f33aebe
Sync events with database
emanresu24 Jan 26, 2018
ca93090
Removed contact button
G30rg3Z Jan 26, 2018
fc4e1d5
Removed contact button
G30rg3Z Jan 26, 2018
dd2973e
Event and database implementation
emanresu24 Jan 26, 2018
25ed611
adjusted UI layouts
G30rg3Z Jan 26, 2018
158abb4
removed unnecessary objects
G30rg3Z Jan 26, 2018
9f7f463
fixed merge conflicts
Jan 27, 2018
fa269a6
monday event test
Jan 27, 2018
7437c4f
Event functionality for monday
emanresu24 Jan 27, 2018
c9e87a7
Event functionality for Tuesday - Thursday
G30rg3Z Jan 27, 2018
abd0e63
Event functionality for Friday
G30rg3Z Jan 27, 2018
4215113
Cleaned up main screen
G30rg3Z Jan 27, 2018
2011926
Removed @string text pop up for monday screen
G30rg3Z Jan 27, 2018
1643827
Removed @string text on Monday button
G30rg3Z Jan 27, 2018
3af16bb
Removed all @string texts on friday
G30rg3Z Jan 27, 2018
92b847b
Removed all @string texts on thursday
G30rg3Z Jan 27, 2018
ce894b0
Removed all @string texts on tuessday
G30rg3Z Jan 27, 2018
aee9bf3
Removed all @string texts on wednessday
G30rg3Z Jan 27, 2018
4956c06
try this to save
G30rg3Z Jan 27, 2018
faaf6d6
fixed layout issues
G30rg3Z Jan 27, 2018
1d64303
Differentiating days on database
emanresu24 Jan 27, 2018
5354188
days can now save data
G30rg3Z Jan 27, 2018
433f821
Test
emanresu24 Jan 27, 2018
c2d2646
Fully functioning app completedgit add -A!
G30rg3Z Jan 27, 2018
e4ad8e6
are you done
G30rg3Z Jan 27, 2018
88bf402
WE DONE BOYZ
G30rg3Z Jan 27, 2018
6c77a80
commit before pull req.
CodingSkrub Jan 28, 2018
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
36 changes: 36 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,36 @@
#built application files
*.apk
*.ap_

# files for the dex VM
*.dex

# Java class files
*.class

# generated files
bin/
gen/

# Local configuration file (sdk path, etc)
local.properties

# Windows thumbnail db
Thumbs.db

# OSX files
.DS_Store

# Android Studio
*.iml
.idea/
#.idea/workspace.xml - remove # and delete .idea if it better suit your needs.
.gradle
build/
.navigation
captures/
output.json

#NDK
obj/
.externalNativeBuild
Binary file added ExportAPK.jks
Binary file not shown.
4 changes: 3 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1 +1,3 @@
# ICS4U1a201718_FinalProject
# CPT_Game
CPT Game. Ali, Marco, George, Thomas

68 changes: 68 additions & 0 deletions Utilities.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,68 @@
package com.strobertchs.cptassignment;

import android.util.Log;

import com.mchange.v2.c3p0.ComboPooledDataSource;

import java.sql.Connection;
import java.sql.SQLException;

/**
* Created by Ali on 2018-01-15.
*/

public class Utilities
{
static ComboPooledDataSource cpds;

public static ComboPooledDataSource connectToServer()
{
cpds = new ComboPooledDataSource();

try
{
cpds.setDriverClass("org.postgresql.Driver");
cpds.setUser("wgibtmqeiltsdf");
cpds.setPassword("b3ca2821037ac3b7354d13bf6a72291431b5d73a92e5fd03b3c9749ffb460360");
cpds.setJdbcUrl("jdbc:postgresql://ec2-54-235-244-185.compute-1.amazonaws.com:5432/");

cpds.setMinPoolSize(1);
cpds.setMaxPoolSize(1);
cpds.setAcquireIncrement(0);
}
catch(Exception sqle)
{
Log.e("sql", sqle.getMessage());
}

return cpds;
}

public static Connection getConnection() throws SQLException
{
return cpds.getConnection();
}

public static boolean login(String username, String password)
{
boolean result = false;
try
{
Connection con = getConnection();

preparedStatement statement = con.prepareStatement("select username, password from accounts where username = ? and password = ?");

//put theusername and pw into statement(in where the question marks are)
statement.setString(1, username);
statement.setString(2, password);

//execute query to server
ResultSet rs = sta.executeQuery();

if(rs.next())//if ResultSet.next() is true means match found
{
result = true;
}
}
}
}
1 change: 1 addition & 0 deletions app/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/build
49 changes: 49 additions & 0 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 27
defaultConfig {


applicationId "com.strobertchs.cptassignment"
minSdkVersion 15


targetSdkVersion 26
versionCode 1
versionName "1.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
buildToolsVersion '27.0.0'
}

dependencies {
// implementation fileTree(include: ['*.jar'], dir: 'libs')
implementation 'com.android.support:appcompat-v7:26.1.0'
implementation 'com.google.firebase:firebase-messaging:11.0.4'
compile files('postgresql-42.1.4/postgresql-42.1.4.jar')
implementation 'com.android.support:design:26.1.0'
implementation 'com.android.support.constraint:constraint-layout:1.0.2'
implementation 'com.android.support:support-v4:26.1.0'
implementation 'com.android.support:recyclerview-v7:26.1.0'
testImplementation 'junit:junit:4.12'
androidTestImplementation 'com.android.support.test:runner:1.0.1'
androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.1'
// implementation files('libs/c3p0-0.9.5.2.jar')
// implementation files('libs/c3p0-oracle-thin-extras-0.9.5.2.jar')
// implementation files('libs/mchange-commons-java-0.2.11.jar')
implementation files('libs/YouTubeAndroidPlayerApi.jar')
}






apply plugin: 'com.google.gms.google-services'
55 changes: 55 additions & 0 deletions app/google-services.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,55 @@
{
"project_info": {
"project_number": "892929488654",
"firebase_url": "https://my-time-3ca9b.firebaseio.com",
"project_id": "my-time-3ca9b",
"storage_bucket": "my-time-3ca9b.appspot.com"
},
"client": [
{
"client_info": {
"mobilesdk_app_id": "1:892929488654:android:4fedb6f36479c40b",
"android_client_info": {
"package_name": "com.strobertchs.cptassignment"
}
},
"oauth_client": [
{
"client_id": "892929488654-ie4ut7g5oitbgtt8aiuvmc7s9k1jslt4.apps.googleusercontent.com",
"client_type": 1,
"android_info": {
"package_name": "com.strobertchs.cptassignment",
"certificate_hash": "df7fc8c42c79df6a5a67b1ba5ff1eed337d0037a"
}
},
{
"client_id": "892929488654-u6f6qgs7obl3triit7n7ilo1ge2gdkbp.apps.googleusercontent.com",
"client_type": 3
}
],
"api_key": [
{
"current_key": "AIzaSyCKconJ5-KfXn9z5glGZzNe7ibY3PoVMUc"
}
],
"services": {
"analytics_service": {
"status": 1
},
"appinvite_service": {
"status": 2,
"other_platform_oauth_client": [
{
"client_id": "892929488654-u6f6qgs7obl3triit7n7ilo1ge2gdkbp.apps.googleusercontent.com",
"client_type": 3
}
]
},
"ads_service": {
"status": 2
}
}
}
],
"configuration_version": "1"
}
Binary file added app/libs/YouTubeAndroidPlayerApi.jar
Binary file not shown.
Binary file added app/libs/c3p0-0.9.5.2.jar
Binary file not shown.
Binary file added app/libs/c3p0-oracle-thin-extras-0.9.5.2.jar
Binary file not shown.
Binary file added app/libs/mchange-commons-java-0.2.11.jar
Binary file not shown.
2 changes: 2 additions & 0 deletions app/postgresql-42.1.4/desktop.ini
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[LocalizedFileNames]
postgresql-42.1.4.jar=@postgresql-42.1.4,0
Binary file added app/postgresql-42.1.4/postgresql-42.1.4.jar
Binary file not shown.
21 changes: 21 additions & 0 deletions app/proguard-rules.pro
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
# Add project specific ProGuard rules here.
# You can control the set of applied configuration files using the
# proguardFiles setting in build.gradle.
#
# For more details, see
# http://developer.android.com/guide/developing/tools/proguard.html

# If your project uses WebView with JS, uncomment the following
# and specify the fully qualified class name to the JavaScript interface
# class:
#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
# public *;
#}

# Uncomment this to preserve the line number information for
# debugging stack traces.
#-keepattributes SourceFile,LineNumberTable

# If you keep the line number information, uncomment this to
# hide the original source file name.
#-renamesourcefileattribute SourceFile
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
package com.example.robuntu.listoftasks;

import android.content.Context;
import android.support.test.InstrumentationRegistry;
import android.support.test.runner.AndroidJUnit4;

import org.junit.Test;
import org.junit.runner.RunWith;

import static org.junit.Assert.*;

/**
* Instrumented test, which will execute on an Android device.
*
* @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
*/
@RunWith(AndroidJUnit4.class)
public class ExampleInstrumentedTest {
@Test
public void useAppContext() throws Exception {
// Context of the app under test.
Context appContext = InstrumentationRegistry.getTargetContext();

assertEquals("com.example.robuntu.listoftasks", appContext.getPackageName());
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
package com.example.robuntu.mytimeapp;

import android.content.Context;
import android.support.test.InstrumentationRegistry;
import android.support.test.runner.AndroidJUnit4;

import org.junit.Test;
import org.junit.runner.RunWith;

import static org.junit.Assert.*;

/**
* Instrumented test, which will execute on an Android device.
*
* @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
*/
@RunWith(AndroidJUnit4.class)
public class ExampleInstrumentedTest {
@Test
public void useAppContext() throws Exception {
// Context of the app under test.
Context appContext = InstrumentationRegistry.getTargetContext();

assertEquals("com.example.robuntu.mytimeapp", appContext.getPackageName());
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
package com.strobertchs.cptassignment;

import android.content.Context;
import android.support.test.InstrumentationRegistry;
import android.support.test.runner.AndroidJUnit4;

import org.junit.Test;
import org.junit.runner.RunWith;

import static org.junit.Assert.*;

/**
* Instrumented test, which will execute on an Android device.
*
* @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
*/
@RunWith(AndroidJUnit4.class)
public class ExampleInstrumentedTest {
@Test
public void useAppContext() throws Exception {
// Context of the app under test.
Context appContext = InstrumentationRegistry.getTargetContext();

assertEquals("com.strobertchs.cptassignment", appContext.getPackageName());
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
package com.strobertchs.mytimecpt;

import android.content.Context;
import android.support.test.InstrumentationRegistry;
import android.support.test.runner.AndroidJUnit4;

import org.junit.Test;
import org.junit.runner.RunWith;

import static org.junit.Assert.*;

/**
* Instrumented test, which will execute on an Android device.
*
* @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
*/
@RunWith(AndroidJUnit4.class)
public class ExampleInstrumentedTest {
@Test
public void useAppContext() throws Exception {
// Context of the app under test.
Context appContext = InstrumentationRegistry.getTargetContext();

assertEquals("com.strobertchs.mytimecpt", appContext.getPackageName());
}
}
Loading