Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
3d7eeb7
Initial commit
kajah Oct 4, 2016
6f70a9b
login and signup
kajah Oct 4, 2016
4afe4bc
Merge branch 'master' of https://github.com/kajah/mdbsocials
kajah Oct 4, 2016
d45bbfb
database works, auth doesn't
kajah Oct 4, 2016
7e2b10e
Auth and database works
kajah Oct 4, 2016
75a3c9b
working on feed
kajah Oct 4, 2016
c8948e0
working on feedadapter
kajah Oct 5, 2016
e8ae5f1
test
victorsun123 Oct 5, 2016
41353f0
feedadapter and logout done
kajah Oct 5, 2016
e586eca
merge conflicts
kajah Oct 5, 2016
81ceeaa
fixed some merge issues
kajah Oct 5, 2016
8177370
merge?
victorsun123 Oct 5, 2016
94d774e
Merge branch 'master' of https://github.com/kajah/mdbsocials
victorsun123 Oct 5, 2016
c996060
commit
victorsun123 Oct 8, 2016
c1de426
commit message
victorsun123 Oct 8, 2016
a1ecb3b
update
victorsun123 Oct 11, 2016
87551a5
working on create new social
kajah Oct 11, 2016
c9fb027
merging
kajah Oct 11, 2016
73821a5
issues with read/writing to firebase
victorsun123 Oct 12, 2016
c6636fe
map to add to db
kajah Oct 13, 2016
8fdf02f
merged
kajah Oct 13, 2016
5f1c06e
bugs
kajah Oct 13, 2016
c073bbe
fixed null errors, problem with read/write firebase
victorsun123 Oct 13, 2016
805638c
working on photo
victorsun123 Oct 14, 2016
7315a6a
image storage
kajah Oct 14, 2016
ce4700c
done but fugly
victorsun123 Oct 14, 2016
ae6a547
done but fugly
victorsun123 Oct 14, 2016
03c0c1f
design
kajah Oct 14, 2016
259b650
done but fugly
victorsun123 Oct 14, 2016
bc85544
readme
kajah Oct 14, 2016
b205993
readme
victorsun123 Oct 14, 2016
4f1a205
splash screen and logout menu
kajah Oct 15, 2016
aa76975
async task done
victorsun123 Oct 15, 2016
f6b58ea
merged
kajah Oct 15, 2016
7d9e90e
Merge remote-tracking branch 'origin/master'
victorsun123 Oct 15, 2016
44c9961
done
victorsun123 Oct 15, 2016
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
9 changes: 9 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
*.iml
.gradle
/local.properties
/.idea/workspace.xml
/.idea/libraries
.DS_Store
/build
/captures
.externalNativeBuild
22 changes: 22 additions & 0 deletions .idea/compiler.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

3 changes: 3 additions & 0 deletions .idea/copyright/profiles_settings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/encodings.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

19 changes: 19 additions & 0 deletions .idea/gradle.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

46 changes: 46 additions & 0 deletions .idea/misc.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

9 changes: 9 additions & 0 deletions .idea/modules.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

12 changes: 12 additions & 0 deletions .idea/runConfigurations.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 6 additions & 0 deletions .idea/vcs.xml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

6 changes: 5 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
<<<<<<< HEAD
# mdbsocials
=======
Repository for MDB Training Program Mini-Project Submissions

Finalized mini-projects should be stored in personal portfolios, but this repository will be used for providing feedback on code quality using the GitHub code review features.

When pushing code to this repo, DO NOT push to master. Create a new branch and open a pull request.
When pushing code to this repo, DO NOT push to master. Create a new branch and open a pull request.
>>>>>>> e4b4b334b11749aa357bd2044b075854227e9e86
1 change: 1 addition & 0 deletions app/.gitignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
/build
44 changes: 44 additions & 0 deletions app/build.gradle
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
apply plugin: 'com.android.application'

android {
compileSdkVersion 24
buildToolsVersion "24.0.2"
defaultConfig {
applicationId "com.mdb.training.katharine.mdbsocials"
minSdkVersion 14
targetSdkVersion 24
versionCode 1
versionName "1.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
}
buildTypes {
release {
minifyEnabled false
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}
}

dependencies {
compile fileTree(dir: 'libs', include: ['*.jar'])
androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', {
exclude group: 'com.android.support', module: 'support-annotations'
})
compile 'com.android.support:appcompat-v7:24.2.1'
compile 'com.android.support:design:24.2.1'
compile 'com.google.firebase:firebase-core:9.6.1'
compile 'com.google.firebase:firebase-auth:9.6.1'
compile 'com.google.firebase:firebase-database:9.6.1'
compile 'com.google.firebase:firebase-storage:9.6.1'
compile 'com.android.support.constraint:constraint-layout:1.0.0-alpha8'
compile 'com.google.android.gms:play-services-auth:9.6.1'
compile 'com.google.android.gms:play-services-gcm:9.6.1'
compile 'com.android.support:recyclerview-v7:24.2.1'
compile 'com.android.support:cardview-v7:24.2.1'
compile 'com.android.support:support-v4:24.2.1'
compile 'com.github.bumptech.glide:glide:3.7.0'
compile 'com.android.support:palette-v7:24.2.1'
testCompile 'junit:junit:4.12'
}

apply plugin: 'com.google.gms.google-services'
42 changes: 42 additions & 0 deletions app/google-services.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,42 @@
{
"project_info": {
"project_number": "510160351055",
"firebase_url": "https://mdbsocial-app.firebaseio.com",
"project_id": "mdbsocial-app",
"storage_bucket": "mdbsocial-app.appspot.com"
},
"client": [
{
"client_info": {
"mobilesdk_app_id": "1:510160351055:android:5ac4a500e2a0ef22",
"android_client_info": {
"package_name": "com.mdb.training.katharine.mdbsocials"
}
},
"oauth_client": [
{
"client_id": "510160351055-otm9a3teg2fb2m3csmd560d0tel17nq1.apps.googleusercontent.com",
"client_type": 3
}
],
"api_key": [
{
"current_key": "AIzaSyAl5BtrHgba8PDjaq0t_7rOKnU7gydWwa4"
}
],
"services": {
"analytics_service": {
"status": 1
},
"appinvite_service": {
"status": 1,
"other_platform_oauth_client": []
},
"ads_service": {
"status": 2
}
}
}
],
"configuration_version": "1"
}
17 changes: 17 additions & 0 deletions app/proguard-rules.pro
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
# Add project specific ProGuard rules here.
# By default, the flags in this file are appended to flags specified
# in /Users/KJ/Library/Android/sdk/tools/proguard/proguard-android.txt
# You can edit the include path and order by changing the proguardFiles
# directive in build.gradle.
#
# For more details, see
# http://developer.android.com/guide/developing/tools/proguard.html

# Add any project specific keep options here:

# 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 *;
#}
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
package com.mdb.training.katharine.mdbsocials;

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.*;

/**
* Instrumentation 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.mdb.training.katharine.mdbsocials", appContext.getPackageName());
}
}
40 changes: 40 additions & 0 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,40 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.mdb.training.katharine.mdbsocials">

<!-- To auto-complete the email text field in the login form with the user's emails -->
<uses-permission android:name="android.permission.GET_ACCOUNTS" />
<uses-permission android:name="android.permission.READ_PROFILE" />
<uses-permission android:name="android.permission.READ_CONTACTS" />
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.Read_EXTERNAL_STORAGE" />
<uses-permission android:name="android.permission.INTERNET" />

<application
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="MDB Socials"
android:supportsRtl="true"
android:theme="@style/AppTheme">
<activity android:name=".MainActivity" />
<activity android:name=".SignupActivity" />
<activity android:name=".FeedActivity" />
<activity
android:name=".DetailsActivity"
android:label="@string/title_activity_details"
android:theme="@style/AppTheme.NoActionBar" />
<activity android:name=".InterestedActivity" />
<activity android:name=".CreateNewSocial" />

<activity
android:name=".SplashActivity"
android:theme="@style/SplashTheme">
<intent-filter>
<action android:name="android.intent.action.MAIN" />

<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
</application>

</manifest>
Loading