Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
7 changes: 7 additions & 0 deletions .idea/dictionaries/andrewsosa.xml

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

6 changes: 3 additions & 3 deletions mobile/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ android {
compileSdkVersion 23
buildToolsVersion "23.0.2"
defaultConfig {
applicationId 'com.hackfsu.hackfsu_android'
applicationId 'com.hackfsu.android.hackfsu'
minSdkVersion 16
targetSdkVersion 23
versionCode 1
Expand All @@ -29,9 +29,9 @@ dependencies {
compile 'com.android.support:recyclerview-v7:23.1.1'
compile 'com.android.support:cardview-v7:23.1.1'
compile 'com.android.support:multidex:1.0.1'
compile 'com.yqritc:recyclerview-flexibledivider:1.2.6' // Optional, remove if needed.
compile 'com.yqritc:recyclerview-flexibledivider:1.2.6'
// Optional, remove if needed.
//compile 'com.parse.bolts:bolts-android:1.+'
compile 'com.parse:parse-android:1.+'
compile 'com.parse:parseui-widget-android:0.0.1'

}
2 changes: 1 addition & 1 deletion mobile/mobile.iml
Original file line number Diff line number Diff line change
Expand Up @@ -101,9 +101,9 @@
<orderEntry type="library" exported="" name="appcompat-v7-23.1.1" level="project" />
<orderEntry type="library" exported="" name="parseui-widget-android-0.0.1" level="project" />
<orderEntry type="library" exported="" name="recyclerview-flexibledivider-1.2.6" level="project" />
<orderEntry type="library" exported="" name="parse-android-1.12.0" level="project" />
<orderEntry type="library" exported="" name="bolts-tasks-1.3.0" level="project" />
<orderEntry type="library" exported="" name="multidex-1.0.1" level="project" />
<orderEntry type="library" exported="" name="parse-android-1.11.0" level="project" />
<orderEntry type="library" exported="" name="cardview-v7-23.1.1" level="project" />
<orderEntry type="library" exported="" scope="TEST" name="multidex-instrumentation-1.0.1" level="project" />
</component>
Expand Down

This file was deleted.

20 changes: 10 additions & 10 deletions mobile/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.hackfsu.hackfsu_android">
package="com.hackfsu.android.hackfsu">

<uses-permission android:name="android.permission.INTERNET" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
Expand All @@ -10,19 +10,19 @@
<uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" />

<permission
android:name="com.hackfsu.hackfsu_android.permission.C2D_MESSAGE"
android:name="com.hackfsu.android.hackfsu.permission.C2D_MESSAGE"
android:protectionLevel="signature" />

<uses-permission android:name="com.hackfsu.hackfsu_android.permission.C2D_MESSAGE" />
<uses-permission android:name="com.hackfsu.android.hackfsu.permission.C2D_MESSAGE" />

<application
android:name=".HackFSU"
android:name="com.hackfsu.android.hackfsu.HackFSU"
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:theme="@style/AppTheme">
<activity
android:name=".MainActivity"
android:name="com.hackfsu.android.hackfsu.MainActivity"
android:label="@string/app_name"
android:theme="@style/AppTheme.NoActionBar">
<intent-filter>
Expand All @@ -32,19 +32,19 @@
</intent-filter>
</activity>
<activity
android:name=".HelpActivity"
android:name="com.hackfsu.android.hackfsu.HelpActivity"
android:label="@string/title_activity_help"
android:parentActivityName=".MainActivity"
android:parentActivityName="com.hackfsu.android.hackfsu.MainActivity"
android:theme="@style/AppTheme.HelpRequest">
<meta-data
android:name="android.support.PARENT_ACTIVITY"
android:value="com.hackfsu.hackfsu_android.MainActivity" />
android:value="com.hackfsu.android.hackfsu.MainActivity" />
</activity>

<service android:name="com.parse.PushService" />

<receiver
android:name=".CustomPushReceiver"
android:name="com.hackfsu.android.hackfsu.CustomPushReceiver"
android:exported="false">
<intent-filter>
<action android:name="com.parse.push.intent.RECEIVE" />
Expand All @@ -59,7 +59,7 @@
<action android:name="com.google.android.c2dm.intent.RECEIVE" />
<action android:name="com.google.android.c2dm.intent.REGISTRATION" />

<category android:name="com.hackfsu.hackfsu_android" />
<category android:name="com.hackfsu.android.hackfsu" />
</intent-filter>
</receiver>

Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.hackfsu.hackfsu_android;
package com.hackfsu.android.hackfsu;

import android.support.v4.app.Fragment;
import android.support.v7.widget.Toolbar;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.hackfsu.hackfsu_android;
package com.hackfsu.android.hackfsu;

import android.content.Context;
import android.content.Intent;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.hackfsu.hackfsu_android;
package com.hackfsu.android.hackfsu;

import android.content.Context;
import android.content.SharedPreferences;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.hackfsu.hackfsu_android;
package com.hackfsu.android.hackfsu;

import android.app.Application;

Expand Down Expand Up @@ -28,6 +28,6 @@ public void onCreate() {
Parse.initialize(this, "7MgItVIkvSmADkIdIVPmEbIOOZQ84ilW224wXsgS", "hHoLbbe3SWIzt6JiXaNY5gdPQ47QBGH6AlbHHTih");
ParseInstallation.getCurrentInstallation().saveInBackground();

ParsePush.subscribeInBackground("announcements");
ParsePush.subscribeInBackground("updates");
}
}
Original file line number Diff line number Diff line change
@@ -1,8 +1,7 @@
package com.hackfsu.hackfsu_android;
package com.hackfsu.android.hackfsu;

import android.app.ProgressDialog;
import android.os.Bundle;
import android.support.design.widget.FloatingActionButton;
import android.support.design.widget.Snackbar;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.Toolbar;
Expand All @@ -11,6 +10,7 @@
import android.widget.EditText;
import android.widget.Toast;

import com.hackfsu.android.hackfsu.R;
import com.parse.ParseException;
import com.parse.ParseObject;
import com.parse.SaveCallback;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.hackfsu.hackfsu_android;
package com.hackfsu.android.hackfsu;

import android.content.Intent;
import android.content.SharedPreferences;
Expand All @@ -18,6 +18,8 @@
import android.view.View;
import android.widget.TextView;

import com.hackfsu.android.hackfsu.R;

public class MainActivity extends AppCompatActivity
implements NavigationView.OnNavigationItemSelectedListener, Toolbar.OnMenuItemClickListener,
BaseFragment.OnFragmentInteractionListener {
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.hackfsu.hackfsu_android;
package com.hackfsu.android.hackfsu;

import android.content.Context;
import android.os.Bundle;
Expand All @@ -10,8 +10,8 @@
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;

import com.hackfsu.android.hackfsu.R;
import com.parse.FindCallback;
import com.parse.GetDataCallback;
import com.parse.ParseClassName;
Expand Down Expand Up @@ -66,7 +66,7 @@ public void onActivityCreated(Bundle savedInstanceState) {

// use this setting to improve performance if you know that changes
// in content do not change the layout size of the RecyclerView
mRecyclerView.setHasFixedSize(true);
mRecyclerView.setHasFixedSize(false);

// use a linear layout manager
mLayoutManager = new LinearLayoutManager(getActivity());
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.hackfsu.hackfsu_android;
package com.hackfsu.android.hackfsu;

import android.support.v4.app.Fragment;
import android.support.v4.app.FragmentManager;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.hackfsu.hackfsu_android;
package com.hackfsu.android.hackfsu;

public class ParseName {

Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,13 @@
package com.hackfsu.hackfsu_android;
package com.hackfsu.android.hackfsu;

import android.support.v7.widget.RecyclerView;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;

import com.hackfsu.android.hackfsu.R;

/**
* Created by andrewsosa on 9/25/15.
*/
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.hackfsu.hackfsu_android;
package com.hackfsu.android.hackfsu;

import android.os.Bundle;
import android.support.v7.widget.LinearLayoutManager;
Expand All @@ -9,6 +9,7 @@
import android.view.ViewGroup;
import android.widget.TextView;

import com.hackfsu.android.hackfsu.R;
import com.parse.FindCallback;
import com.parse.ParseClassName;
import com.parse.ParseException;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,23 +1,20 @@
package com.hackfsu.hackfsu_android;
package com.hackfsu.android.hackfsu;

import android.content.Context;
import android.content.res.ColorStateList;
import android.content.res.Resources;
import android.graphics.Typeface;
import android.os.Build;
import android.os.Bundle;
import android.support.design.widget.AppBarLayout;
import android.support.design.widget.CollapsingToolbarLayout;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.support.v7.widget.Toolbar;
import android.util.Log;
import android.util.TypedValue;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.TextView;

import com.hackfsu.android.hackfsu.R;
import com.parse.FindCallback;
import com.parse.GetDataCallback;
import com.parse.ParseClassName;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.hackfsu.hackfsu_android;
package com.hackfsu.android.hackfsu;

import android.os.Bundle;
import android.support.design.widget.Snackbar;
Expand All @@ -12,6 +12,7 @@
import android.widget.ImageView;
import android.widget.TextView;

import com.hackfsu.android.hackfsu.R;
import com.parse.FindCallback;
import com.parse.ParseClassName;
import com.parse.ParseException;
Expand Down
2 changes: 1 addition & 1 deletion mobile/src/main/res/layout/activity_help.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
android:layout_height="match_parent" android:fitsSystemWindows="false"
tools:context="com.hackfsu.hackfsu_android.HelpActivity">
tools:context="com.hackfsu.android.hackfsu.HelpActivity">

<android.support.design.widget.AppBarLayout android:layout_height="wrap_content"
android:layout_width="match_parent"
Expand Down
4 changes: 2 additions & 2 deletions mobile/src/main/res/layout/activity_settings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
tools:context="com.hackfsu.hackfsu_android.SettingsActivity"
tools:context="com.hackfsu.android.hackfsu.SettingsActivity"
android:background="@color/grey_200">

<!-- Layout height used to be wrap_content-->
Expand All @@ -27,7 +27,7 @@
</android.support.design.widget.AppBarLayout>

<LinearLayout
tools:context="com.hackfsu.hackfsu_android.SettingsActivity"
tools:context="com.hackfsu.android.hackfsu.SettingsActivity"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
Expand Down
2 changes: 1 addition & 1 deletion mobile/src/main/res/layout/content_feed.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
tools:context=".MainActivity"
tools:context="com.hackfsu.android.hackfsu.MainActivity"
android:id="@+id/viewpager"
android:layout_width="match_parent"
android:layout_height="match_parent"
Expand Down
2 changes: 1 addition & 1 deletion mobile/src/main/res/layout/content_help.xml
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
xmlns:app="http://schemas.android.com/apk/res-auto" android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
tools:showIn="@layout/activity_help" tools:context="com.hackfsu.hackfsu_android.HelpActivity">
tools:showIn="@layout/activity_help" tools:context="com.hackfsu.android.hackfsu.HelpActivity">

<LinearLayout
android:orientation="vertical"
Expand Down
2 changes: 1 addition & 1 deletion mobile/src/main/res/layout/fragment_list.xml
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent"
android:layout_height="match_parent" tools:context="com.hackfsu.hackfsu_android.UpdateFragment">
android:layout_height="match_parent" tools:context="com.hackfsu.android.hackfsu.UpdateFragment">

<ImageView
android:layout_width="match_parent"
Expand Down
2 changes: 1 addition & 1 deletion mobile/src/main/res/layout/fragment_list_refresh.xml
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="com.hackfsu.hackfsu_android.UpdateFragment">
tools:context="com.hackfsu.android.hackfsu.UpdateFragment">

<ImageView
android:layout_width="match_parent"
Expand Down
2 changes: 1 addition & 1 deletion mobile/src/main/res/layout/fragment_maps.xml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
android:layout_width="match_parent"
android:animateLayoutChanges="true"
android:fitsSystemWindows="false"
tools:context=".MainActivity">
tools:context="com.hackfsu.android.hackfsu.MainActivity">

<android.support.design.widget.CoordinatorLayout
android:id="@+id/main_content"
Expand Down
2 changes: 1 addition & 1 deletion mobile/src/main/res/layout/fragment_sponsors.xml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:animateLayoutChanges="true"
android:fitsSystemWindows="false"
tools:context=".MainActivity"
tools:context="com.hackfsu.android.hackfsu.MainActivity"
android:background="@color/background"
android:id="@+id/main_content"
android:layout_width="match_parent"
Expand Down
Loading