Merge pull request #17 from JohnPersano/develop

Develop
jmp-12 · Dec 28, 2013 · 9608462 · 9608462
2 parents b17f346 + f7f9858
commit 9608462
Show file tree

Hide file tree

Showing 40 changed files with 3,615 additions and 2,358 deletions.
diff --git a/demo/AndroidManifest.xml b/demo/AndroidManifest.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.supertoastsdemo"
-          android:versionCode="13"
-          android:versionName="1.3">
+          android:versionCode="14"
+          android:versionName="1.3.1">
 
     <uses-sdk
             android:minSdkVersion="8"
@@ -13,13 +13,14 @@
             android:theme="@style/AppTheme"
             android:icon="@drawable/ic_launcher">
 
-        <activity android:name="MainActivity"
+        <activity android:name=".MainActivity"
                   android:label="@string/app_name">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>
                 <category android:name="android.intent.category.LAUNCHER"/>
             </intent-filter>
         </activity>
+        <activity android:name=".ActivityTwo"/>
 
     </application>
 

diff --git a/demo/pom.xml b/demo/pom.xml
@@ -27,6 +27,12 @@
             <version>${parent.version}</version>
             <type>apklib</type>
         </dependency>
+        <dependency>
+            <groupId>com.actionbarsherlock</groupId>
+            <artifactId>actionbarsherlock</artifactId>
+            <version>4.4.0</version>
+            <type>apklib</type>
+        </dependency>
 
     </dependencies>
 

diff --git a/demo/project.properties b/demo/project.properties
@@ -11,7 +11,7 @@
 #proguard.config=${sdk.dir}/tools/proguard/proguard-android.txt:proguard-project.txt
 
 # Project target.
-target=android-16
+target=android-18
 android.library.reference.1=../supertoasts
-android.library.reference.2=../../ActionBarSherlock/actionbarsherlock
+android.library.reference.2=gen-external-apklibs/com.actionbarsherlock_actionbarsherlock_4.4.0
 
diff --git a/demo/res/layout/activity_two.xml b/demo/res/layout/activity_two.xml
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+              android:orientation="vertical"
+              android:layout_width="match_parent"
+              android:layout_height="match_parent">
+
+    <TextView
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceLarge"
+            android:text="This is a dummy Activity"
+            android:id="@+id/textView" android:padding="4dp"/>
+    <TextView
+            android:layout_width="fill_parent"
+            android:layout_height="wrap_content"
+            android:textAppearance="?android:attr/textAppearanceSmall"
+            android:text="Show some different SuperToasts and see how they act when a new activity starts while they're showing"
+            android:id="@+id/textView2" android:padding="4dp"/>
+</LinearLayout>
diff --git a/demo/res/layout/fragment_superactivitytoast.xml b/demo/res/layout/fragment_superactivitytoast.xml
@@ -58,6 +58,17 @@
                         android:layout_height="wrap_content"
                         android:text="@string/horizontal_progress_type"
                         android:layout_margin="@dimen/layout_medium_padding"/>
+                <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content"
+                              android:padding="@dimen/layout_medium_padding" android:orientation="horizontal"
+                              android:id="@+id/linearLayout">
+                    <TextView android:layout_width="wrap_content" android:layout_height="wrap_content"
+                              android:textAppearance="?android:attr/textAppearanceMedium"
+                              android:layout_gravity="left|center_vertical"
+                              android:padding="@dimen/textview_medium_padding" android:text="@string/animation"/>
+                    <Spinner android:layout_width="wrap_content" android:layout_height="wrap_content"
+                             android:id="@+id/animationSpinner" android:layout_gravity="left|center_vertical"
+                             android:spinnerMode="dropdown" android:entries="@array/animation_list"/>
+                </LinearLayout>
 
             </RadioGroup>
 
@@ -140,9 +151,18 @@
                     android:layout_gravity="left|center_vertical"
                     android:checked="false"/>
 
+            <CheckBox
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="On dismiss listener"
+                    android:layout_margin="@dimen/layout_medium_padding"
+                    android:id="@+id/dismiss_checkbox"
+                    android:checked="false" />
+
         </LinearLayout>
 
     </ScrollView>
 
 
+
 </LinearLayout>
diff --git a/demo/res/layout/fragment_supercardtoast.xml b/demo/res/layout/fragment_supercardtoast.xml
@@ -50,6 +50,17 @@
                         android:layout_height="wrap_content"
                         android:text="@string/horizontal_progress_type"
                         android:layout_margin="@dimen/layout_medium_padding"/>
+                <LinearLayout android:layout_width="match_parent" android:layout_height="wrap_content"
+                              android:padding="@dimen/layout_medium_padding" android:orientation="horizontal"
+                              android:id="@+id/linearLayout">
+                    <TextView android:layout_width="wrap_content" android:layout_height="wrap_content"
+                              android:textAppearance="?android:attr/textAppearanceMedium"
+                              android:layout_gravity="left|center_vertical"
+                              android:padding="@dimen/textview_medium_padding" android:text="@string/animation"/>
+                    <Spinner android:layout_width="wrap_content" android:layout_height="wrap_content"
+                             android:id="@+id/animationSpinner" android:layout_gravity="left|center_vertical"
+                             android:spinnerMode="dropdown" android:entries="@array/animation_list"/>
+                </LinearLayout>
 
             </RadioGroup>
 
@@ -143,9 +154,28 @@
                         android:layout_gravity="left|center_vertical"
                         android:spinnerMode="dropdown"
                         android:entries="@array/dismiss_function_list"/>
+
             </LinearLayout>
 
 
+            <CheckBox
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_margin="@dimen/layout_medium_padding"
+                    android:text="@string/show_image"
+                    android:id="@+id/imageCheckBox"
+                    android:layout_gravity="left|center_vertical"
+                    android:checked="false"/>
+
+            <CheckBox
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:text="On dismiss listener"
+                    android:layout_margin="@dimen/layout_medium_padding"
+                    android:id="@+id/dismiss_checkbox"
+                    android:checked="false" />
+
+
         </LinearLayout>
 
     </ScrollView>

diff --git a/demo/res/values/styles.xml b/demo/res/values/styles.xml
@@ -4,10 +4,8 @@
         Base application theme, dependent on API level. This theme is replaced
         by AppBaseTheme from res/values-vXX/styles.xml on newer devices.
     -->
-    <style name="AppBaseTheme" parent="Theme.Sherlock.Light.DarkActionBar">
-        <item name="android:actionBarStyle">@style/ActionBar</item>
-        <item name="android:windowContentOverlay">@null</item>
-
+    <style name="AppTheme" parent="Theme.Sherlock.Light.DarkActionBar">
+        <item name="actionBarStyle">@style/ActionBar</item>
     </style>
 
     <!-- Application theme. -->

diff --git a/demo/src/com/supertoastsdemo/ActivityTwo.java b/demo/src/com/supertoastsdemo/ActivityTwo.java
@@ -0,0 +1,12 @@
+package com.supertoastsdemo;
+
+import android.app.Activity;
+import android.os.Bundle;
+
+public class ActivityTwo extends Activity {
+    public void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_two);
+
+    }
+}