Merge pull request #33 from happyfoxinc/development

Development - v1.2.0 - UI Improvements

Author: anirudh24seven

HelpStackExample/AndroidManifest.xml

@@ -1,12 +1,11 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
     package="com.example.helpstackexample"
     android:versionCode="1"
     android:versionName="1.0" >
 
     <uses-sdk
-        android:minSdkVersion="8"
+        android:minSdkVersion="9"
         android:targetSdkVersion="22" />
 
     <uses-permission android:name="android.permission.INTERNET"/>
@@ -22,7 +21,6 @@
             android:label="@string/app_name" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>

HelpStackExample/build.gradle

@@ -4,12 +4,12 @@ dependencies {
     compile fileTree(dir: 'libs', include: '*.jar')
     compile project(':helpstack')
 
-    compile 'com.android.support:appcompat-v7:22.2.0'
+    compile 'com.android.support:appcompat-v7:23.0.0'
 }
 
 android {
-    compileSdkVersion 22
-    buildToolsVersion "22.0.1"
+    compileSdkVersion 23
+    buildToolsVersion "23.0.0"
 
     sourceSets {
         main {

HelpStackExample/res/values-v14/styles.xml

@@ -5,13 +5,12 @@
         AppBaseTheme from BOTH res/values/styles.xml and
         res/values-v11/styles.xml on API 14+ devices.
     -->
-    <style name="HSAppBaseTheme" parent="Theme.AppCompat.Light">
+    <style name="HSAppBaseTheme" parent="Theme.AppCompat.Light.DarkActionBar">
         <!-- API 14 theme customizations can go here. -->
       <!-- <item name="android:actionBarStyle">@style/MyActionBar</item> -->
     </style>
 
-    <style name="MyActionBar"
-           parent="@style/Widget.AppCompat.Light.ActionBar.Solid.Inverse">
+    <style name="MyActionBar" parent="@style/Widget.AppCompat.Light.ActionBar.Solid.Inverse">
 
     </style>
 

HelpStackExample/src/com/example/helpstackexample/HSApplication.java

@@ -4,11 +4,9 @@
 
 import com.tenmiles.helpstack.HSHelpStack;
 import com.tenmiles.helpstack.gears.HSEmailGear;
-import com.tenmiles.helpstack.gears.HSZendeskGear;
+import com.tenmiles.helpstack.gears.HSHappyfoxGear;
 
-
-
-public class HSApplication extends Application{
+public class HSApplication extends Application {
 
 	HSHelpStack helpStack;
 
@@ -18,16 +16,17 @@ public void onCreate() {
 
 		helpStack = HSHelpStack.getInstance(this);
 
-		HSEmailGear emailGear = new HSEmailGear( "example@happyfox.com",R.xml.articles);
-		helpStack.setGear(emailGear);
-
+//		HSEmailGear emailGear = new HSEmailGear("foo@bar.com", R.xml.articles);
+//		helpStack.setGear(emailGear);
 
-		/* Uncomment the following to use the Happyfox gear with appropriate support email address */
-		//		HSHappyfoxGear happyfoxGear = new HSHappyfoxGear("https://example.happyfox.com", 
-		//				"<Your API Key>",
-		//				"<Your Auth Code>", 
-		//				"<Category ID>", "<Priority ID>");
-		//		helpStack.setGear(happyfoxGear);
+		/* Uncomment the following to use the HappyFox gear with appropriate support email address */
 
+				HSHappyfoxGear happyfoxGear = new HSHappyfoxGear(
+		              "http://acmewidgetsco.happyfox.com",
+						"b3416a6ebf4245bf9bbeb55b296ecf92",
+						"6b562e17b1ab4c37bc8c955af8f5cc5c",
+						"107",
+		                "1");
+				helpStack.setGear(happyfoxGear);
 	}
 }

HelpStackExample/src/com/example/helpstackexample/MainActivity.java

@@ -22,8 +22,7 @@ protected void onCreate(Bundle savedInstanceState) {
 		setContentView(R.layout.activity_main);
 
 		if (savedInstanceState == null) {
-			getSupportFragmentManager().beginTransaction()
-					.add(R.id.container, new PlaceholderFragment()).commit();
+			getSupportFragmentManager().beginTransaction().add(R.id.container, new PlaceholderFragment()).commit();
 		}
 
 		getSupportActionBar().setDisplayHomeAsUpEnabled(false);
@@ -33,25 +32,18 @@ protected void onCreate(Bundle savedInstanceState) {
 
 	@Override
 	public boolean onCreateOptionsMenu(Menu menu) {
-
-		// Inflate the menu; this adds items to the action bar if it is present.
 		getMenuInflater().inflate(R.menu.main, menu);
 		return true;
 	}
 
 	@Override
 	public boolean onOptionsItemSelected(MenuItem item) {
-		// Handle action bar item clicks here. The action bar will
-		// automatically handle clicks on the Home/Up button, so long
-		// as you specify a parent activity in AndroidManifest.xml.
 		int id = item.getItemId();
 		if (id == R.id.action_settings) {
 			return true;
 		}
 		return super.onOptionsItemSelected(item);
 	}
-	
-	
 
 	/**
 	 * A placeholder fragment containing a simple view.
@@ -62,10 +54,8 @@ public PlaceholderFragment() {
 		}
 
 		@Override
-		public View onCreateView(LayoutInflater inflater, ViewGroup container,
-				Bundle savedInstanceState) {
-			View rootView = inflater.inflate(R.layout.fragment_main, container,
-					false);
+		public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
+			View rootView = inflater.inflate(R.layout.fragment_main, container, false);
 			rootView.findViewById(R.id.button1).setOnClickListener(new OnClickListener() {
 
 				@Override

helpstack/AndroidManifest.xml

@@ -5,7 +5,7 @@
     android:versionName="1.0" >
 
     <uses-sdk
-        android:minSdkVersion="8"
+        android:minSdkVersion="9"
         android:targetSdkVersion="22" />
 
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />

helpstack/build.gradle

@@ -4,7 +4,7 @@ apply plugin: 'maven'
 dependencies {
     compile fileTree(dir: 'libs', include: '*.jar')
 
-    compile 'com.android.support:appcompat-v7:22.2.0'
+    compile 'com.android.support:appcompat-v7:23.0.0'
 
     compile 'com.google.code.gson:gson:2.3'
 
@@ -13,8 +13,8 @@ dependencies {
 }
 
 android {
-    compileSdkVersion 22
-    buildToolsVersion "22.0.1"
+    compileSdkVersion 23
+    buildToolsVersion "23.0.0"
 
     sourceSets {
         main {
@@ -45,7 +45,7 @@ uploadArchives {
     repositories.mavenDeployer {
         pom.groupId = 'com.tenmiles'
         pom.artifactId = 'helpstack'
-        pom.version = '1.1.3'
+        pom.version = '1.2.0'
         // Add other pom properties here if you want (developer details / licenses)
         repository(url: "file:///Users/anirudh/Desktop/gradleRelease/")
     }