diff --git a/.gitignore b/.gitignore index 60192dc..3a40c41 100644 --- a/.gitignore +++ b/.gitignore @@ -55,3 +55,6 @@ local.properties # PDT-specific .buildpath + +# OSX files +.DS_Store diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 04d6e7b..d4fca34 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -18,7 +18,7 @@ android:label="@string/app_name" android:theme="@style/AppTheme" > @@ -26,6 +26,37 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/libs/android-support-v4.jar b/libs/android-support-v4.jar deleted file mode 100644 index 187bdf4..0000000 Binary files a/libs/android-support-v4.jar and /dev/null differ diff --git a/project.properties b/project.properties index 4ab1256..dd11a73 100644 --- a/project.properties +++ b/project.properties @@ -12,3 +12,4 @@ # Project target. target=android-19 +android.library.reference.1=third-party-libs/ParseLoginUI diff --git a/res/drawable/logo.png b/res/drawable/logo.png new file mode 100644 index 0000000..5fc77db Binary files /dev/null and b/res/drawable/logo.png differ diff --git a/res/menu/menu_main.xml b/res/menu/menu_main.xml new file mode 100644 index 0000000..8843602 --- /dev/null +++ b/res/menu/menu_main.xml @@ -0,0 +1,9 @@ + + + + + + + \ No newline at end of file diff --git a/res/values/app_config_sample.xml b/res/values/app_config_sample.xml deleted file mode 100644 index 2331f97..0000000 --- a/res/values/app_config_sample.xml +++ /dev/null @@ -1,7 +0,0 @@ - - - - PARSE_APPLICATION_ID - PARSE_CLIENT_ID - - \ No newline at end of file diff --git a/res/values/strings.xml b/res/values/strings.xml index 48ff04a..4484c0b 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -15,4 +15,8 @@ Due On JUL 25 2 DAYS FROM NOW - + Log Out + Create Account + Log In + + \ No newline at end of file diff --git a/src/org/missionassetfund/apps/android/MAFApplication.java b/src/org/missionassetfund/apps/android/MAFApplication.java index f4a3a8b..9105036 100644 --- a/src/org/missionassetfund/apps/android/MAFApplication.java +++ b/src/org/missionassetfund/apps/android/MAFApplication.java @@ -24,6 +24,7 @@ public void onCreate() { // Initializing Parse Parse.initialize(this, getString(R.string.parseApplicationId), getString(R.string.parseClientId)); + Parse.setLogLevel(Parse.LOG_LEVEL_DEBUG); } } diff --git a/src/org/missionassetfund/apps/android/activities/MAFDispatchActivity.java b/src/org/missionassetfund/apps/android/activities/MAFDispatchActivity.java new file mode 100644 index 0000000..6b6374b --- /dev/null +++ b/src/org/missionassetfund/apps/android/activities/MAFDispatchActivity.java @@ -0,0 +1,13 @@ + +package org.missionassetfund.apps.android.activities; + +import com.parse.ui.ParseLoginDispatchActivity; + +public class MAFDispatchActivity extends ParseLoginDispatchActivity { + + @Override + protected Class getTargetClass() { + return MainActivity.class; + } + +} diff --git a/src/org/missionassetfund/apps/android/activities/MainActivity.java b/src/org/missionassetfund/apps/android/activities/MainActivity.java index 73557ad..5ededb3 100644 --- a/src/org/missionassetfund/apps/android/activities/MainActivity.java +++ b/src/org/missionassetfund/apps/android/activities/MainActivity.java @@ -4,11 +4,18 @@ import org.missionassetfund.apps.android.R; import org.missionassetfund.apps.android.fragments.DashboardFragment; +import android.content.Intent; +import android.os.Build; import android.os.Bundle; import android.support.v4.app.Fragment; import android.support.v4.app.FragmentActivity; import android.support.v4.app.FragmentManager; import android.support.v4.app.FragmentTransaction; +import android.view.Menu; +import android.view.MenuInflater; +import android.view.MenuItem; + +import com.parse.ParseUser; public class MainActivity extends FragmentActivity { @@ -16,14 +23,14 @@ public class MainActivity extends FragmentActivity { protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); - + showDashboardFragment(); } - + private void showDashboardFragment() { showFragment(DashboardFragment.class); } - + @SuppressWarnings("rawtypes") private void showFragment(Class activeFragmentClass) { Class[] fragmentClasses = new Class[] { @@ -52,4 +59,41 @@ private void showFragment(Class activeFragmentClass) { } transaction.commit(); } + + @Override + public boolean onCreateOptionsMenu(Menu menu) { + MenuInflater inflater = getMenuInflater(); + inflater.inflate(R.menu.menu_main, menu); + return true; + } + + @Override + public boolean onOptionsItemSelected(MenuItem item) { + switch (item.getItemId()) { + + case R.id.action_logout: + logoutParse(); + break; + default: + break; + } + + return true; + } + + private void logoutParse() { + ParseUser.logOut(); + + // FLAG_ACTIVITY_CLEAR_TASK only works on API 11, so if the user + // logs out on older devices, we'll just exit. + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.HONEYCOMB) { + Intent intent = new Intent(this, MAFDispatchActivity.class); + intent.addFlags(Intent.FLAG_ACTIVITY_CLEAR_TASK + | Intent.FLAG_ACTIVITY_NEW_TASK); + startActivity(intent); + } else { + finish(); + } + } + } diff --git a/src/org/missionassetfund/apps/android/models/User.java b/src/org/missionassetfund/apps/android/models/User.java index 1de4be5..5b660db 100644 --- a/src/org/missionassetfund/apps/android/models/User.java +++ b/src/org/missionassetfund/apps/android/models/User.java @@ -4,7 +4,7 @@ import com.parse.ParseClassName; import com.parse.ParseUser; -@ParseClassName("_User") +@ParseClassName("User") public class User extends ParseUser { public static final String NAME_KEY = "name"; public static final String PHONE_NUMBER_KEY = "phoneNumber"; diff --git a/third-party-libs/ParseLoginUI/AndroidManifest.xml b/third-party-libs/ParseLoginUI/AndroidManifest.xml new file mode 100644 index 0000000..6823a3b --- /dev/null +++ b/third-party-libs/ParseLoginUI/AndroidManifest.xml @@ -0,0 +1,12 @@ + + + + + + + diff --git a/third-party-libs/ParseLoginUI/build.gradle b/third-party-libs/ParseLoginUI/build.gradle new file mode 100644 index 0000000..cd32052 --- /dev/null +++ b/third-party-libs/ParseLoginUI/build.gradle @@ -0,0 +1,25 @@ +apply plugin: 'android-library' + +dependencies { + compile project(':facebook-sdk:facebook') + compile 'com.android.support:support-v4:13.0.+' + compile fileTree(dir: 'libs', include: '*.jar') +} + +android { + compileSdkVersion rootProject.ext.compileSdkVersion + buildToolsVersion rootProject.ext.buildToolsVersion + + defaultConfig { + minSdkVersion rootProject.ext.minSdkVersion + targetSdkVersion rootProject.ext.targetSdkVersion + } + + sourceSets { + main { + manifest.srcFile 'AndroidManifest.xml' + java.srcDirs = ['src'] + res.srcDirs = ['res'] + } + } +} diff --git a/third-party-libs/ParseLoginUI/libs/Parse-1.5.1.jar b/third-party-libs/ParseLoginUI/libs/Parse-1.5.1.jar new file mode 100644 index 0000000..f7c14e0 Binary files /dev/null and b/third-party-libs/ParseLoginUI/libs/Parse-1.5.1.jar differ diff --git a/third-party-libs/ParseLoginUI/project.properties b/third-party-libs/ParseLoginUI/project.properties new file mode 100644 index 0000000..1b57234 --- /dev/null +++ b/third-party-libs/ParseLoginUI/project.properties @@ -0,0 +1,17 @@ +# This file is automatically generated by Android Tools. +# Do not modify this file -- YOUR CHANGES WILL BE ERASED! +# +# This file must be checked in Version Control Systems. +# +# To customize properties used by the Ant build system edit +# "ant.properties", and override values to adapt the script to your +# project structure. +# +# To enable ProGuard to shrink and obfuscate your code, uncomment this (available properties: sdk.dir, user.home): +#proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt + +android.library=true +# Project target. +target=android-19 +android.library.reference.1=../facebook-sdk/facebook + diff --git a/third-party-libs/ParseLoginUI/res/color/com_parse_ui_parse_login_help_button_label_selector.xml b/third-party-libs/ParseLoginUI/res/color/com_parse_ui_parse_login_help_button_label_selector.xml new file mode 100644 index 0000000..cf833e8 --- /dev/null +++ b/third-party-libs/ParseLoginUI/res/color/com_parse_ui_parse_login_help_button_label_selector.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/third-party-libs/ParseLoginUI/res/drawable-xxhdpi/com_parse_ui_app_logo.png b/third-party-libs/ParseLoginUI/res/drawable-xxhdpi/com_parse_ui_app_logo.png new file mode 100644 index 0000000..51e8ddc Binary files /dev/null and b/third-party-libs/ParseLoginUI/res/drawable-xxhdpi/com_parse_ui_app_logo.png differ diff --git a/third-party-libs/ParseLoginUI/res/drawable-xxhdpi/com_parse_ui_facebook_login_logo.png b/third-party-libs/ParseLoginUI/res/drawable-xxhdpi/com_parse_ui_facebook_login_logo.png new file mode 100644 index 0000000..a1eb051 Binary files /dev/null and b/third-party-libs/ParseLoginUI/res/drawable-xxhdpi/com_parse_ui_facebook_login_logo.png differ diff --git a/third-party-libs/ParseLoginUI/res/drawable-xxhdpi/com_parse_ui_twitter_login_logo.png b/third-party-libs/ParseLoginUI/res/drawable-xxhdpi/com_parse_ui_twitter_login_logo.png new file mode 100644 index 0000000..13637c0 Binary files /dev/null and b/third-party-libs/ParseLoginUI/res/drawable-xxhdpi/com_parse_ui_twitter_login_logo.png differ diff --git a/third-party-libs/ParseLoginUI/res/drawable/com_parse_ui_facebook_login_button_background_selector.xml b/third-party-libs/ParseLoginUI/res/drawable/com_parse_ui_facebook_login_button_background_selector.xml new file mode 100644 index 0000000..5a5a3fd --- /dev/null +++ b/third-party-libs/ParseLoginUI/res/drawable/com_parse_ui_facebook_login_button_background_selector.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/third-party-libs/ParseLoginUI/res/drawable/com_parse_ui_parse_login_button_background_selector.xml b/third-party-libs/ParseLoginUI/res/drawable/com_parse_ui_parse_login_button_background_selector.xml new file mode 100644 index 0000000..f227ebe --- /dev/null +++ b/third-party-libs/ParseLoginUI/res/drawable/com_parse_ui_parse_login_button_background_selector.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/third-party-libs/ParseLoginUI/res/drawable/com_parse_ui_twitter_login_button_background_selector.xml b/third-party-libs/ParseLoginUI/res/drawable/com_parse_ui_twitter_login_button_background_selector.xml new file mode 100644 index 0000000..69affbf --- /dev/null +++ b/third-party-libs/ParseLoginUI/res/drawable/com_parse_ui_twitter_login_button_background_selector.xml @@ -0,0 +1,7 @@ + + + + + + + diff --git a/third-party-libs/ParseLoginUI/res/layout-land/com_parse_ui_parse_login_fragment.xml b/third-party-libs/ParseLoginUI/res/layout-land/com_parse_ui_parse_login_fragment.xml new file mode 100644 index 0000000..11b5d45 --- /dev/null +++ b/third-party-libs/ParseLoginUI/res/layout-land/com_parse_ui_parse_login_fragment.xml @@ -0,0 +1,27 @@ + + + + + + + + + diff --git a/third-party-libs/ParseLoginUI/res/layout-land/com_parse_ui_parse_login_help_fragment.xml b/third-party-libs/ParseLoginUI/res/layout-land/com_parse_ui_parse_login_help_fragment.xml new file mode 100644 index 0000000..9b4e297 --- /dev/null +++ b/third-party-libs/ParseLoginUI/res/layout-land/com_parse_ui_parse_login_help_fragment.xml @@ -0,0 +1,13 @@ + + + + diff --git a/third-party-libs/ParseLoginUI/res/layout-land/com_parse_ui_parse_signup_fragment.xml b/third-party-libs/ParseLoginUI/res/layout-land/com_parse_ui_parse_signup_fragment.xml new file mode 100644 index 0000000..2e7f283 --- /dev/null +++ b/third-party-libs/ParseLoginUI/res/layout-land/com_parse_ui_parse_signup_fragment.xml @@ -0,0 +1,13 @@ + + + + diff --git a/third-party-libs/ParseLoginUI/res/layout/com_parse_ui_parse_login_app_logo.xml b/third-party-libs/ParseLoginUI/res/layout/com_parse_ui_parse_login_app_logo.xml new file mode 100644 index 0000000..fb2e157 --- /dev/null +++ b/third-party-libs/ParseLoginUI/res/layout/com_parse_ui_parse_login_app_logo.xml @@ -0,0 +1,7 @@ + diff --git a/third-party-libs/ParseLoginUI/res/layout/com_parse_ui_parse_login_form.xml b/third-party-libs/ParseLoginUI/res/layout/com_parse_ui_parse_login_form.xml new file mode 100644 index 0000000..b7e7cbe --- /dev/null +++ b/third-party-libs/ParseLoginUI/res/layout/com_parse_ui_parse_login_form.xml @@ -0,0 +1,53 @@ + + + + + + + + +