From f5a299430474fc9f8be432f7b8e3464e3a76b74c Mon Sep 17 00:00:00 2001 From: Andrew Sosa Date: Wed, 13 Jan 2016 20:52:16 -0500 Subject: [PATCH] Fixed name Some sponsor image stuff too --- .idea/dictionaries/andrewsosa.xml | 7 +++++++ mobile/build.gradle | 6 +++--- mobile/mobile.iml | 2 +- .../hackfsu_android/ApplicationTest.java | 13 ------------ mobile/src/main/AndroidManifest.xml | 20 +++++++++---------- .../hackfsu}/BaseFragment.java | 2 +- .../hackfsu}/CustomPushReceiver.java | 2 +- .../hackfsu}/FeedFragment.java | 2 +- .../hackfsu}/HackFSU.java | 4 ++-- .../hackfsu}/HelpActivity.java | 4 ++-- .../hackfsu}/MainActivity.java | 4 +++- .../hackfsu}/MapsFragment.java | 6 +++--- .../hackfsu}/PagerAdapter.java | 2 +- .../hackfsu}/ParseName.java | 2 +- .../hackfsu}/RecyclerAdapter.java | 4 +++- .../hackfsu}/ScheduleFragment.java | 3 ++- .../hackfsu}/SponsorsFragment.java | 7 ++----- .../hackfsu}/UpdateFragment.java | 3 ++- mobile/src/main/res/layout/activity_help.xml | 2 +- .../src/main/res/layout/activity_settings.xml | 4 ++-- mobile/src/main/res/layout/content_feed.xml | 2 +- mobile/src/main/res/layout/content_help.xml | 2 +- mobile/src/main/res/layout/fragment_list.xml | 2 +- .../main/res/layout/fragment_list_refresh.xml | 2 +- mobile/src/main/res/layout/fragment_maps.xml | 2 +- .../src/main/res/layout/fragment_sponsors.xml | 2 +- mobile/src/main/res/layout/tile_sponsor.xml | 18 ++++++----------- mobile/src/main/res/menu/menu_help.xml | 2 +- mobile/src/main/res/menu/menu_main.xml | 2 +- 29 files changed, 62 insertions(+), 71 deletions(-) create mode 100644 .idea/dictionaries/andrewsosa.xml delete mode 100644 mobile/src/androidTest/java/com/hackfsu/hackfsu_android/ApplicationTest.java rename mobile/src/main/java/com/hackfsu/{hackfsu_android => android/hackfsu}/BaseFragment.java (95%) rename mobile/src/main/java/com/hackfsu/{hackfsu_android => android/hackfsu}/CustomPushReceiver.java (94%) rename mobile/src/main/java/com/hackfsu/{hackfsu_android => android/hackfsu}/FeedFragment.java (99%) rename mobile/src/main/java/com/hackfsu/{hackfsu_android => android/hackfsu}/HackFSU.java (91%) rename mobile/src/main/java/com/hackfsu/{hackfsu_android => android/hackfsu}/HelpActivity.java (97%) rename mobile/src/main/java/com/hackfsu/{hackfsu_android => android/hackfsu}/MainActivity.java (99%) rename mobile/src/main/java/com/hackfsu/{hackfsu_android => android/hackfsu}/MapsFragment.java (98%) rename mobile/src/main/java/com/hackfsu/{hackfsu_android => android/hackfsu}/PagerAdapter.java (97%) rename mobile/src/main/java/com/hackfsu/{hackfsu_android => android/hackfsu}/ParseName.java (96%) rename mobile/src/main/java/com/hackfsu/{hackfsu_android => android/hackfsu}/RecyclerAdapter.java (96%) rename mobile/src/main/java/com/hackfsu/{hackfsu_android => android/hackfsu}/ScheduleFragment.java (98%) rename mobile/src/main/java/com/hackfsu/{hackfsu_android => android/hackfsu}/SponsorsFragment.java (97%) rename mobile/src/main/java/com/hackfsu/{hackfsu_android => android/hackfsu}/UpdateFragment.java (99%) diff --git a/.idea/dictionaries/andrewsosa.xml b/.idea/dictionaries/andrewsosa.xml new file mode 100644 index 0000000..1d0f0ef --- /dev/null +++ b/.idea/dictionaries/andrewsosa.xml @@ -0,0 +1,7 @@ + + + + hackfsu + + + \ No newline at end of file diff --git a/mobile/build.gradle b/mobile/build.gradle index 237ff7d..88623f6 100644 --- a/mobile/build.gradle +++ b/mobile/build.gradle @@ -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 @@ -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' - } diff --git a/mobile/mobile.iml b/mobile/mobile.iml index 08c65f7..83f7a45 100644 --- a/mobile/mobile.iml +++ b/mobile/mobile.iml @@ -101,9 +101,9 @@ + - diff --git a/mobile/src/androidTest/java/com/hackfsu/hackfsu_android/ApplicationTest.java b/mobile/src/androidTest/java/com/hackfsu/hackfsu_android/ApplicationTest.java deleted file mode 100644 index dbd077b..0000000 --- a/mobile/src/androidTest/java/com/hackfsu/hackfsu_android/ApplicationTest.java +++ /dev/null @@ -1,13 +0,0 @@ -package com.hackfsu.hackfsu_android; - -import android.app.Application; -import android.test.ApplicationTestCase; - -/** - * Testing Fundamentals - */ -public class ApplicationTest extends ApplicationTestCase { - public ApplicationTest() { - super(Application.class); - } -} \ No newline at end of file diff --git a/mobile/src/main/AndroidManifest.xml b/mobile/src/main/AndroidManifest.xml index b7800b8..abdede1 100644 --- a/mobile/src/main/AndroidManifest.xml +++ b/mobile/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ + package="com.hackfsu.android.hackfsu"> @@ -10,19 +10,19 @@ - + @@ -32,19 +32,19 @@ + android:value="com.hackfsu.android.hackfsu.MainActivity" /> @@ -59,7 +59,7 @@ - + diff --git a/mobile/src/main/java/com/hackfsu/hackfsu_android/BaseFragment.java b/mobile/src/main/java/com/hackfsu/android/hackfsu/BaseFragment.java similarity index 95% rename from mobile/src/main/java/com/hackfsu/hackfsu_android/BaseFragment.java rename to mobile/src/main/java/com/hackfsu/android/hackfsu/BaseFragment.java index aecb451..4f2c25c 100644 --- a/mobile/src/main/java/com/hackfsu/hackfsu_android/BaseFragment.java +++ b/mobile/src/main/java/com/hackfsu/android/hackfsu/BaseFragment.java @@ -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; diff --git a/mobile/src/main/java/com/hackfsu/hackfsu_android/CustomPushReceiver.java b/mobile/src/main/java/com/hackfsu/android/hackfsu/CustomPushReceiver.java similarity index 94% rename from mobile/src/main/java/com/hackfsu/hackfsu_android/CustomPushReceiver.java rename to mobile/src/main/java/com/hackfsu/android/hackfsu/CustomPushReceiver.java index 8ef5ae9..2d52fce 100644 --- a/mobile/src/main/java/com/hackfsu/hackfsu_android/CustomPushReceiver.java +++ b/mobile/src/main/java/com/hackfsu/android/hackfsu/CustomPushReceiver.java @@ -1,4 +1,4 @@ -package com.hackfsu.hackfsu_android; +package com.hackfsu.android.hackfsu; import android.content.Context; import android.content.Intent; diff --git a/mobile/src/main/java/com/hackfsu/hackfsu_android/FeedFragment.java b/mobile/src/main/java/com/hackfsu/android/hackfsu/FeedFragment.java similarity index 99% rename from mobile/src/main/java/com/hackfsu/hackfsu_android/FeedFragment.java rename to mobile/src/main/java/com/hackfsu/android/hackfsu/FeedFragment.java index 91beb5a..f25d8b6 100644 --- a/mobile/src/main/java/com/hackfsu/hackfsu_android/FeedFragment.java +++ b/mobile/src/main/java/com/hackfsu/android/hackfsu/FeedFragment.java @@ -1,4 +1,4 @@ -package com.hackfsu.hackfsu_android; +package com.hackfsu.android.hackfsu; import android.content.Context; import android.content.SharedPreferences; diff --git a/mobile/src/main/java/com/hackfsu/hackfsu_android/HackFSU.java b/mobile/src/main/java/com/hackfsu/android/hackfsu/HackFSU.java similarity index 91% rename from mobile/src/main/java/com/hackfsu/hackfsu_android/HackFSU.java rename to mobile/src/main/java/com/hackfsu/android/hackfsu/HackFSU.java index 175d50d..4aaefb6 100644 --- a/mobile/src/main/java/com/hackfsu/hackfsu_android/HackFSU.java +++ b/mobile/src/main/java/com/hackfsu/android/hackfsu/HackFSU.java @@ -1,4 +1,4 @@ -package com.hackfsu.hackfsu_android; +package com.hackfsu.android.hackfsu; import android.app.Application; @@ -28,6 +28,6 @@ public void onCreate() { Parse.initialize(this, "7MgItVIkvSmADkIdIVPmEbIOOZQ84ilW224wXsgS", "hHoLbbe3SWIzt6JiXaNY5gdPQ47QBGH6AlbHHTih"); ParseInstallation.getCurrentInstallation().saveInBackground(); - ParsePush.subscribeInBackground("announcements"); + ParsePush.subscribeInBackground("updates"); } } diff --git a/mobile/src/main/java/com/hackfsu/hackfsu_android/HelpActivity.java b/mobile/src/main/java/com/hackfsu/android/hackfsu/HelpActivity.java similarity index 97% rename from mobile/src/main/java/com/hackfsu/hackfsu_android/HelpActivity.java rename to mobile/src/main/java/com/hackfsu/android/hackfsu/HelpActivity.java index 28afc36..820ce35 100644 --- a/mobile/src/main/java/com/hackfsu/hackfsu_android/HelpActivity.java +++ b/mobile/src/main/java/com/hackfsu/android/hackfsu/HelpActivity.java @@ -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; @@ -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; diff --git a/mobile/src/main/java/com/hackfsu/hackfsu_android/MainActivity.java b/mobile/src/main/java/com/hackfsu/android/hackfsu/MainActivity.java similarity index 99% rename from mobile/src/main/java/com/hackfsu/hackfsu_android/MainActivity.java rename to mobile/src/main/java/com/hackfsu/android/hackfsu/MainActivity.java index 3b904ef..810963c 100644 --- a/mobile/src/main/java/com/hackfsu/hackfsu_android/MainActivity.java +++ b/mobile/src/main/java/com/hackfsu/android/hackfsu/MainActivity.java @@ -1,4 +1,4 @@ -package com.hackfsu.hackfsu_android; +package com.hackfsu.android.hackfsu; import android.content.Intent; import android.content.SharedPreferences; @@ -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 { diff --git a/mobile/src/main/java/com/hackfsu/hackfsu_android/MapsFragment.java b/mobile/src/main/java/com/hackfsu/android/hackfsu/MapsFragment.java similarity index 98% rename from mobile/src/main/java/com/hackfsu/hackfsu_android/MapsFragment.java rename to mobile/src/main/java/com/hackfsu/android/hackfsu/MapsFragment.java index 66587e5..2017a07 100644 --- a/mobile/src/main/java/com/hackfsu/hackfsu_android/MapsFragment.java +++ b/mobile/src/main/java/com/hackfsu/android/hackfsu/MapsFragment.java @@ -1,4 +1,4 @@ -package com.hackfsu.hackfsu_android; +package com.hackfsu.android.hackfsu; import android.content.Context; import android.os.Bundle; @@ -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; @@ -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()); diff --git a/mobile/src/main/java/com/hackfsu/hackfsu_android/PagerAdapter.java b/mobile/src/main/java/com/hackfsu/android/hackfsu/PagerAdapter.java similarity index 97% rename from mobile/src/main/java/com/hackfsu/hackfsu_android/PagerAdapter.java rename to mobile/src/main/java/com/hackfsu/android/hackfsu/PagerAdapter.java index 5155dbe..49cf0df 100644 --- a/mobile/src/main/java/com/hackfsu/hackfsu_android/PagerAdapter.java +++ b/mobile/src/main/java/com/hackfsu/android/hackfsu/PagerAdapter.java @@ -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; diff --git a/mobile/src/main/java/com/hackfsu/hackfsu_android/ParseName.java b/mobile/src/main/java/com/hackfsu/android/hackfsu/ParseName.java similarity index 96% rename from mobile/src/main/java/com/hackfsu/hackfsu_android/ParseName.java rename to mobile/src/main/java/com/hackfsu/android/hackfsu/ParseName.java index 5f9622f..d82a77d 100644 --- a/mobile/src/main/java/com/hackfsu/hackfsu_android/ParseName.java +++ b/mobile/src/main/java/com/hackfsu/android/hackfsu/ParseName.java @@ -1,4 +1,4 @@ -package com.hackfsu.hackfsu_android; +package com.hackfsu.android.hackfsu; public class ParseName { diff --git a/mobile/src/main/java/com/hackfsu/hackfsu_android/RecyclerAdapter.java b/mobile/src/main/java/com/hackfsu/android/hackfsu/RecyclerAdapter.java similarity index 96% rename from mobile/src/main/java/com/hackfsu/hackfsu_android/RecyclerAdapter.java rename to mobile/src/main/java/com/hackfsu/android/hackfsu/RecyclerAdapter.java index d2c2c53..8ec93e9 100644 --- a/mobile/src/main/java/com/hackfsu/hackfsu_android/RecyclerAdapter.java +++ b/mobile/src/main/java/com/hackfsu/android/hackfsu/RecyclerAdapter.java @@ -1,4 +1,4 @@ -package com.hackfsu.hackfsu_android; +package com.hackfsu.android.hackfsu; import android.support.v7.widget.RecyclerView; import android.view.LayoutInflater; @@ -6,6 +6,8 @@ import android.view.ViewGroup; import android.widget.TextView; +import com.hackfsu.android.hackfsu.R; + /** * Created by andrewsosa on 9/25/15. */ diff --git a/mobile/src/main/java/com/hackfsu/hackfsu_android/ScheduleFragment.java b/mobile/src/main/java/com/hackfsu/android/hackfsu/ScheduleFragment.java similarity index 98% rename from mobile/src/main/java/com/hackfsu/hackfsu_android/ScheduleFragment.java rename to mobile/src/main/java/com/hackfsu/android/hackfsu/ScheduleFragment.java index 2112013..8219534 100644 --- a/mobile/src/main/java/com/hackfsu/hackfsu_android/ScheduleFragment.java +++ b/mobile/src/main/java/com/hackfsu/android/hackfsu/ScheduleFragment.java @@ -1,4 +1,4 @@ -package com.hackfsu.hackfsu_android; +package com.hackfsu.android.hackfsu; import android.os.Bundle; import android.support.v7.widget.LinearLayoutManager; @@ -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; diff --git a/mobile/src/main/java/com/hackfsu/hackfsu_android/SponsorsFragment.java b/mobile/src/main/java/com/hackfsu/android/hackfsu/SponsorsFragment.java similarity index 97% rename from mobile/src/main/java/com/hackfsu/hackfsu_android/SponsorsFragment.java rename to mobile/src/main/java/com/hackfsu/android/hackfsu/SponsorsFragment.java index 93c24b1..9cb6bc6 100644 --- a/mobile/src/main/java/com/hackfsu/hackfsu_android/SponsorsFragment.java +++ b/mobile/src/main/java/com/hackfsu/android/hackfsu/SponsorsFragment.java @@ -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; diff --git a/mobile/src/main/java/com/hackfsu/hackfsu_android/UpdateFragment.java b/mobile/src/main/java/com/hackfsu/android/hackfsu/UpdateFragment.java similarity index 99% rename from mobile/src/main/java/com/hackfsu/hackfsu_android/UpdateFragment.java rename to mobile/src/main/java/com/hackfsu/android/hackfsu/UpdateFragment.java index 3ee4518..63fa30b 100644 --- a/mobile/src/main/java/com/hackfsu/hackfsu_android/UpdateFragment.java +++ b/mobile/src/main/java/com/hackfsu/android/hackfsu/UpdateFragment.java @@ -1,4 +1,4 @@ -package com.hackfsu.hackfsu_android; +package com.hackfsu.android.hackfsu; import android.os.Bundle; import android.support.design.widget.Snackbar; @@ -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; diff --git a/mobile/src/main/res/layout/activity_help.xml b/mobile/src/main/res/layout/activity_help.xml index 8e27e06..67e5bdc 100644 --- a/mobile/src/main/res/layout/activity_help.xml +++ b/mobile/src/main/res/layout/activity_help.xml @@ -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"> @@ -27,7 +27,7 @@ + tools:showIn="@layout/activity_help" tools:context="com.hackfsu.android.hackfsu.HelpActivity"> + android:layout_height="match_parent" tools:context="com.hackfsu.android.hackfsu.UpdateFragment"> + tools:context="com.hackfsu.android.hackfsu.UpdateFragment"> + tools:context="com.hackfsu.android.hackfsu.MainActivity"> - - + android:scaleType="centerInside" + android:adjustViewBounds="true" /> @@ -39,7 +34,6 @@ - \ No newline at end of file + \ No newline at end of file diff --git a/mobile/src/main/res/menu/menu_help.xml b/mobile/src/main/res/menu/menu_help.xml index dda945a..097c6b8 100644 --- a/mobile/src/main/res/menu/menu_help.xml +++ b/mobile/src/main/res/menu/menu_help.xml @@ -1,6 +1,6 @@ + xmlns:tools="http://schemas.android.com/tools" tools:context="com.hackfsu.android.hackfsu.MainActivity"> diff --git a/mobile/src/main/res/menu/menu_main.xml b/mobile/src/main/res/menu/menu_main.xml index 58f53c2..6873b3f 100644 --- a/mobile/src/main/res/menu/menu_main.xml +++ b/mobile/src/main/res/menu/menu_main.xml @@ -1,6 +1,6 @@ + xmlns:tools="http://schemas.android.com/tools" tools:context="com.hackfsu.android.hackfsu.MainActivity">