Rename package to com.hackfsu.android

Author: andrewsosa

README.md

@@ -1,17 +1,17 @@
 # HackFSU Android App
-`com.hackfsu.mobile.android`
+`com.hackfsu.android`
 
 The HackFSU Android app is an open-source, easily configurable software package
 to be shared by the hacker community.
 
 ## Package Structure
 
-> `com.hackfsu.mobile.android.app.*`
+> `com.hackfsu.android.app.*`
 
 These sub-packages are front-end, UI related packages including Activities,
 Fragments, Adapters, custom UI, etc.
 
-> `com.hackfsu.mobile.android.api.*`
+> `com.hackfsu.android.api.*`
 
 These classes are the server-facing, networking elements which connect to
 the HackFSU web API.

build.gradle

@@ -10,7 +10,7 @@ buildscript {
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
-        classpath 'com.google.gms:google-services:3.0.0'
+        classpath 'com.google.gms:google-services:3.1.0'
 
     }
 }

mobile/build.gradle

@@ -4,11 +4,11 @@ android {
     compileSdkVersion 25
     buildToolsVersion '26.0.2'
     defaultConfig {
-        applicationId 'com.hackfsu.android.hackfsu'
+        applicationId 'com.hackfsu.android'
         minSdkVersion 19
         targetSdkVersion 25
-        versionCode 10
-        versionName "4.0"
+        versionCode 11
+        versionName '5.0'
         multiDexEnabled true //enable this
 
     }
@@ -19,14 +19,14 @@ android {
             useProguard true
             proguardFiles getDefaultProguardFile('proguard-android.txt'),
                     'proguard-rules.pro'
-            buildConfigField "String", "API_HOST", "https://testapi.hackfsu.com"
+            buildConfigField "String", "API_HOST", "\"https://testapi.hackfsu.com\""
 
         }
         release {
             minifyEnabled true
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
             debuggable false
-            buildConfigField "String", "API_HOST", "https://api.hackfsu.com"
+            buildConfigField "String", "API_HOST", "\"https://api.hackfsu.com\""
         }
     }
     productFlavors {
@@ -54,9 +54,4 @@ dependencies {
 }
 
 
-
-
-
-
-
 apply plugin: 'com.google.gms.google-services'

mobile/google-services.json

@@ -8,18 +8,18 @@
   "client": [
     {
       "client_info": {
-        "mobilesdk_app_id": "1:6909141398:android:a5eea346753e4540",
+        "mobilesdk_app_id": "1:6909141398:android:dc9dd32497026b6e",
         "android_client_info": {
-          "package_name": "com.hackfsu.android.hackfsu"
+          "package_name": "com.hackfsu.android"
         }
       },
       "oauth_client": [
         {
-          "client_id": "6909141398-e898logq7t9bg4937ub35nngimgadej1.apps.googleusercontent.com",
+          "client_id": "6909141398-jgj78hkggaaeq7qjj852qbngli7edlev.apps.googleusercontent.com",
           "client_type": 1,
           "android_info": {
-            "package_name": "com.hackfsu.android.hackfsu",
-            "certificate_hash": "240a1f526c5597e8b58dc432e22a07d9aab6fcc2"
+            "package_name": "com.hackfsu.android",
+            "certificate_hash": "047574bd342a5a1f88123087618d9f227cbc52a0"
           }
         },
         {
@@ -41,8 +41,13 @@
           "status": 1
         },
         "appinvite_service": {
-          "status": 1,
-          "other_platform_oauth_client": []
+          "status": 2,
+          "other_platform_oauth_client": [
+            {
+              "client_id": "6909141398-0jn52tr8gkp9mf6rq1ot78c3uejf05e1.apps.googleusercontent.com",
+              "client_type": 3
+            }
+          ]
         },
         "ads_service": {
           "status": 2

mobile/src/main/AndroidManifest.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.hackfsu.mobile.android.app">
+    package="com.hackfsu.android.app">
 
     <uses-permission android:name="android.permission.INTERNET" />
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
@@ -10,9 +10,9 @@
     <!-- <uses-permission android:name="android.permission.GET_ACCOUNTS" /> -->
     <!-- <uses-permission android:name="com.google.android.c2dm.permission.RECEIVE" /> -->
     <!-- <permission -->
-    <!-- android:name="com.hackfsu.mobile.android.app.permission.C2D_MESSAGE" -->
+    <!-- android:nacom.hackfsu.androidroid.app.permission.C2D_MESSAGE" -->
     <!-- android:protectionLevel="signature" /> -->
-    <!-- <uses-permission android:name="com.hackfsu.mobile.android.hackfsu.permission.C2D_MESSAGE" /> -->
+    <!-- <uses-permission android:nacom.hackfsu.androidroid.hackfsu.permission.C2D_MESSAGE" /> -->
     <application
         android:name=".HackFSU"
         android:allowBackup="true"

mobile/src/main/java/com/hackfsu/mobile/android/api/API.java renamed to mobile/src/main/java/com/hackfsu/android/api/API.java

@@ -1,21 +1,20 @@
-package com.hackfsu.mobile.android.api;
+package com.hackfsu.android.api;
 
 import android.app.Activity;
 import android.util.Log;
 
-import com.hackfsu.mobile.android.api.model.CountdownModel;
-import com.hackfsu.mobile.android.api.model.UpdateModel;
-import com.hackfsu.mobile.android.api.model.BaseModel;
-import com.hackfsu.mobile.android.api.model.MapModel;
-import com.hackfsu.mobile.android.api.model.SponsorModel;
-import com.hackfsu.mobile.android.api.model.ScheduleModel;
-import com.hackfsu.mobile.android.app.BuildConfig;
+import com.hackfsu.android.api.model.CountdownModel;
+import com.hackfsu.android.api.model.UpdateModel;
+import com.hackfsu.android.api.model.BaseModel;
+import com.hackfsu.android.api.model.MapModel;
+import com.hackfsu.android.api.model.SponsorModel;
+import com.hackfsu.android.api.model.ScheduleModel;
+import com.hackfsu.android.app.BuildConfig;
 
 import org.json.JSONArray;
 import org.json.JSONException;
 import org.json.JSONObject;
 
-import java.io.UnsupportedEncodingException;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.Collections;

mobile/src/main/java/com/hackfsu/mobile/android/api/ISO8601.java renamed to mobile/src/main/java/com/hackfsu/android/api/ISO8601.java

@@ -1,4 +1,4 @@
-package com.hackfsu.mobile.android.api;
+package com.hackfsu.android.api;
 
 import java.text.ParseException;
 import java.text.SimpleDateFormat;

mobile/src/main/java/com/hackfsu/mobile/android/api/ISO8601Updates.java renamed to mobile/src/main/java/com/hackfsu/android/api/ISO8601Updates.java

@@ -1,4 +1,4 @@
-package com.hackfsu.mobile.android.api;
+package com.hackfsu.android.api;
 
 import android.util.Log;
 

mobile/src/main/java/com/hackfsu/mobile/android/api/NetworkClient.java renamed to mobile/src/main/java/com/hackfsu/android/api/NetworkClient.java

@@ -1,4 +1,4 @@
-package com.hackfsu.mobile.android.api;
+package com.hackfsu.android.api;
 
 import java.io.IOException;
 

mobile/src/main/java/com/hackfsu/mobile/android/api/model/BaseModel.java renamed to mobile/src/main/java/com/hackfsu/android/api/model/BaseModel.java

@@ -1,4 +1,4 @@
-package com.hackfsu.mobile.android.api.model;
+package com.hackfsu.android.api.model;
 
 /**
  * Created by andrew on 11/14/16.