diff --git a/demo/AndroidManifest.xml b/demo/AndroidManifest.xml index 1eea323..0ac66d9 100644 --- a/demo/AndroidManifest.xml +++ b/demo/AndroidManifest.xml @@ -1,8 +1,8 @@ + android:versionCode="14" + android:versionName="1.3.1"> - + diff --git a/demo/pom.xml b/demo/pom.xml index 37eea27..aa383fd 100644 --- a/demo/pom.xml +++ b/demo/pom.xml @@ -27,6 +27,12 @@ ${parent.version} apklib + + com.actionbarsherlock + actionbarsherlock + 4.4.0 + apklib + diff --git a/demo/project.properties b/demo/project.properties index 3a59a4a..2bddc0b 100644 --- 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 new file mode 100644 index 0000000..9d02c80 --- /dev/null +++ b/demo/res/layout/activity_two.xml @@ -0,0 +1,20 @@ + + + + + + + \ No newline at end of file diff --git a/demo/res/layout/fragment_superactivitytoast.xml b/demo/res/layout/fragment_superactivitytoast.xml index 658303a..41631ea 100644 --- 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"/> + + + + @@ -140,9 +151,18 @@ android:layout_gravity="left|center_vertical" android:checked="false"/> + + + \ No newline at end of file diff --git a/demo/res/layout/fragment_supercardtoast.xml b/demo/res/layout/fragment_supercardtoast.xml index 4286f04..4eabff3 100644 --- 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"/> + + + + @@ -143,9 +154,28 @@ android:layout_gravity="left|center_vertical" android:spinnerMode="dropdown" android:entries="@array/dismiss_function_list"/> + + + + + + diff --git a/demo/res/values/styles.xml b/demo/res/values/styles.xml index f58baae..e6921f5 100644 --- 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. --> - diff --git a/demo/src/com/supertoastsdemo/ActivityTwo.java b/demo/src/com/supertoastsdemo/ActivityTwo.java new file mode 100644 index 0000000..68928e9 --- /dev/null +++ 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); + + } +} \ No newline at end of file diff --git a/demo/src/com/supertoastsdemo/FragmentSuperActivityToast.java b/demo/src/com/supertoastsdemo/FragmentSuperActivityToast.java index 0ca0882..89fe75e 100644 --- a/demo/src/com/supertoastsdemo/FragmentSuperActivityToast.java +++ b/demo/src/com/supertoastsdemo/FragmentSuperActivityToast.java @@ -1,6 +1,26 @@ +/** + * Copyright 2013 John Persano + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ + package com.supertoastsdemo; +import android.content.Intent; +import android.graphics.Color; import android.os.AsyncTask; +import android.os.Build; import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; @@ -12,20 +32,27 @@ import com.actionbarsherlock.app.SherlockFragment; import com.github.johnpersano.supertoasts.SuperActivityToast; import com.github.johnpersano.supertoasts.SuperToast; -import com.supertoastsdemo.R; +import com.github.johnpersano.supertoasts.util.OnToastButtonClickListenerHolder; +import com.github.johnpersano.supertoasts.util.OnToastDismissListener; +import com.github.johnpersano.supertoasts.util.OnToastDismissListenerHolder; +import java.util.ArrayList; +import java.util.List; public class FragmentSuperActivityToast extends SherlockFragment { + Spinner mAnimationSpinner; Spinner mDurationSpinner; Spinner mBackgroundSpinner; Spinner mTextsizeSpinner; - RadioGroup typeRadioGroup; - CheckBox mImageCheckBox; + CheckBox mDismissCheckBox; + DummyOperation mDummyOperation; + int mCount; + @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { @@ -33,7 +60,27 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa final View view = inflater.inflate(R.layout.fragment_superactivitytoast, container, false); - SuperActivityToast.onRestoreState(savedInstanceState, getActivity()); + if(android.os.Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB) { + + List onToastButtonClickListenerHolderList = + new ArrayList(); + onToastButtonClickListenerHolderList.add(onToastButtonClickListenerHolder); + + List onToastDismissListenerHolderList = + new ArrayList(); + onToastDismissListenerHolderList.add(onToastDismissListenerHolder); + + SuperActivityToast.onRestoreState(savedInstanceState, getActivity(), + onToastButtonClickListenerHolderList, onToastDismissListenerHolderList); + + } else { + + SuperActivityToast.onRestoreState(savedInstanceState, getActivity()); + + } + + mAnimationSpinner = (Spinner) + view.findViewById(R.id.animationSpinner); typeRadioGroup = (RadioGroup) view.findViewById(R.id.type_radiogroup); @@ -50,6 +97,12 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa mImageCheckBox = (CheckBox) view.findViewById(R.id.imageCheckBox); + mImageCheckBox = (CheckBox) + view.findViewById(R.id.imageCheckBox); + + mDismissCheckBox = (CheckBox) + view.findViewById(R.id.dismiss_checkbox); + Button showButton = (Button) view.findViewById(R.id.showButton); showButton.setOnClickListener(new View.OnClickListener() { @@ -63,6 +116,16 @@ public void onClick(View view) { }); + showButton.setOnLongClickListener(new View.OnLongClickListener() { + @Override + public boolean onLongClick(View v) { + + startActivity(new Intent(getActivity(), ActivityTwo.class)); + + return false; + } + }); + return view; } @@ -95,6 +158,7 @@ private void showSuperToast() { final SuperActivityToast superActivityToast; + switch (typeRadioGroup.getCheckedRadioButtonId()) { case R.id.toast_radiobutton: @@ -108,15 +172,22 @@ private void showSuperToast() { superActivityToast = new SuperActivityToast(getActivity(), SuperToast.Type.BUTTON); - superActivityToast.setButtonOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - SuperActivityToast.createDarkSuperActivityToast(view.getContext(), view.getContext().getResources() - .getString(R.string.onclick), SuperToast.Duration.MEDIUM).show(); + mCount++; + + if(mCount == 1) { + + superActivityToast.setOnToastButtonClickListener(onToastButtonClickListenerHolder); + + } else if (mCount == 2) { + + superActivityToast.setOnToastButtonClickListener(onToastButtonClickListenerHolderTwo); - } - }); + } else { + + superActivityToast.setOnToastButtonClickListener(onToastButtonClickListenerHolderThree); + + } break; @@ -151,6 +222,34 @@ public void onClick(View view) { } + switch (mAnimationSpinner.getSelectedItemPosition()) { + + case 0: + + superActivityToast.setAnimations(SuperToast.Animations.FADE); + + break; + + case 1: + + superActivityToast.setAnimations(SuperToast.Animations.FLYIN); + + break; + + case 2: + + superActivityToast.setAnimations(SuperToast.Animations.POPUP); + + break; + + case 3: + + superActivityToast.setAnimations(SuperToast.Animations.SCALE); + + break; + + } + switch (mDurationSpinner.getSelectedItemPosition()) { case 0: @@ -229,7 +328,7 @@ public void onClick(View view) { case 1: - superActivityToast.setTextSize(SuperToast.TextSize.SMALL); + superActivityToast.setTextSize(SuperToast.TextSize.MEDIUM); break; @@ -243,7 +342,13 @@ public void onClick(View view) { if(mImageCheckBox.isChecked()) { - superActivityToast.setIconResource(R.drawable.icon_message, SuperToast.IconPosition.LEFT); + superActivityToast.setIcon(SuperToast.Icon.Dark.INFO, SuperToast.IconPosition.LEFT); + + } + + if(mDismissCheckBox.isChecked()) { + + superActivityToast.setOnToastDismissListener(onToastDismissListenerHolder); } @@ -251,6 +356,73 @@ public void onClick(View view) { } + private OnToastButtonClickListenerHolder onToastButtonClickListenerHolder = + new OnToastButtonClickListenerHolder("toast_one", new View.OnClickListener() { + + @Override + public void onClick(View v) { + + SuperToast superToast = new SuperToast(v.getContext()); + superToast.setText("On Click with first listener!"); + superToast.setDuration(SuperToast.Duration.VERY_SHORT); + superToast.setBackgroundResource(SuperToast.Background.TRANSLUCENT_BLUE); + superToast.setTextColor(Color.WHITE); + superToast.show(); + + } + + }); + + private OnToastButtonClickListenerHolder onToastButtonClickListenerHolderTwo = + new OnToastButtonClickListenerHolder("toast_two", new View.OnClickListener() { + + @Override + public void onClick(View v) { + + SuperToast superToast = new SuperToast(v.getContext()); + superToast.setText("On Click with second listener!"); + superToast.setDuration(SuperToast.Duration.VERY_SHORT); + superToast.setBackgroundResource(SuperToast.Background.TRANSLUCENT_ORANGE); + superToast.setTextColor(Color.WHITE); + superToast.show(); + + } + + }); + + private OnToastButtonClickListenerHolder onToastButtonClickListenerHolderThree = + new OnToastButtonClickListenerHolder("toast_three", new View.OnClickListener() { + + @Override + public void onClick(View v) { + + SuperToast superToast = new SuperToast(v.getContext()); + superToast.setText("On Click with last listener!"); + superToast.setDuration(SuperToast.Duration.VERY_SHORT); + superToast.setBackgroundResource(SuperToast.Background.TRANSLUCENT_GREEN); + superToast.setTextColor(Color.WHITE); + superToast.show(); + + } + + }); + + private OnToastDismissListenerHolder onToastDismissListenerHolder = + new OnToastDismissListenerHolder("toast_one", new OnToastDismissListener() { + + @Override + public void onDismiss(View view) { + + SuperToast superToast = new SuperToast(view.getContext()); + superToast.setText("On dismiss!"); + superToast.setDuration(SuperToast.Duration.VERY_SHORT); + superToast.setBackgroundResource(SuperToast.Background.TRANSLUCENT_GREEN); + superToast.setTextColor(Color.WHITE); + superToast.show(); + + } + }); + private class DummyOperation extends AsyncTask { SuperActivityToast mSuperActivityToast; diff --git a/demo/src/com/supertoastsdemo/FragmentSuperCardToast.java b/demo/src/com/supertoastsdemo/FragmentSuperCardToast.java index c939aa0..9b22d5e 100644 --- a/demo/src/com/supertoastsdemo/FragmentSuperCardToast.java +++ b/demo/src/com/supertoastsdemo/FragmentSuperCardToast.java @@ -1,7 +1,9 @@ package com.supertoastsdemo; -import android.app.Fragment; +import android.content.Intent; +import android.graphics.Color; import android.os.AsyncTask; +import android.os.Build; import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; @@ -11,13 +13,18 @@ import android.widget.RadioGroup; import android.widget.Spinner; import com.actionbarsherlock.app.SherlockFragment; -import com.github.johnpersano.supertoasts.SuperActivityToast; import com.github.johnpersano.supertoasts.SuperCardToast; import com.github.johnpersano.supertoasts.SuperToast; -import com.supertoastsdemo.R; +import com.github.johnpersano.supertoasts.util.OnToastButtonClickListenerHolder; +import com.github.johnpersano.supertoasts.util.OnToastDismissListener; +import com.github.johnpersano.supertoasts.util.OnToastDismissListenerHolder; + +import java.util.ArrayList; +import java.util.List; public class FragmentSuperCardToast extends SherlockFragment { + Spinner mAnimationSpinner; Spinner mDurationSpinner; Spinner mBackgroundSpinner; Spinner mTextsizeSpinner; @@ -26,9 +33,12 @@ public class FragmentSuperCardToast extends SherlockFragment { RadioGroup mTypeRadioGroup; CheckBox mImageCheckBox; + CheckBox mDismissCheckBox; DummyOperation mDummyOperation; + int mCount; + @Override public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { @@ -36,7 +46,27 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa final View view = inflater.inflate(R.layout.fragment_supercardtoast, container, false); - SuperCardToast.onRestoreState(savedInstanceState, getActivity()); + if(android.os.Build.VERSION.SDK_INT < Build.VERSION_CODES.HONEYCOMB) { + + List onToastButtonClickListenerHolderList = + new ArrayList(); + onToastButtonClickListenerHolderList.add(onToastButtonClickListenerHolder); + + List onToastDismissListenerHolderList = + new ArrayList(); + onToastDismissListenerHolderList.add(onToastDismissListenerHolder); + + SuperCardToast.onRestoreState(savedInstanceState, getActivity(), + onToastButtonClickListenerHolderList, onToastDismissListenerHolderList); + + } else { + + SuperCardToast.onRestoreState(savedInstanceState, getActivity()); + + } + + mAnimationSpinner = (Spinner) + view.findViewById(R.id.animationSpinner); mTypeRadioGroup = (RadioGroup) view.findViewById(R.id.type_radiogroup); @@ -53,6 +83,12 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa mDismissFunctionSpinner = (Spinner) view.findViewById(R.id.dismissfunction_spinner); + mImageCheckBox = (CheckBox) + view.findViewById(R.id.imageCheckBox); + + mDismissCheckBox = (CheckBox) + view.findViewById(R.id.dismiss_checkbox); + Button showButton = (Button) view.findViewById(R.id.showButton); showButton.setOnClickListener(new View.OnClickListener() { @@ -66,6 +102,16 @@ public void onClick(View view) { }); + showButton.setOnLongClickListener(new View.OnLongClickListener() { + @Override + public boolean onLongClick(View v) { + + startActivity(new Intent(getActivity(), ActivityTwo.class)); + + return false; + } + }); + return view; } @@ -106,6 +152,7 @@ private void showSuperCardToast() { superCardToast = new SuperCardToast(getActivity(), SuperToast.Type.STANDARD); + superCardToast.setAnimations(SuperToast.Animations.POPUP); break; @@ -113,16 +160,23 @@ private void showSuperCardToast() { superCardToast = new SuperCardToast(getActivity(), SuperToast.Type.BUTTON); - superCardToast.setButtonOnClickListener(new View.OnClickListener() { + superCardToast.setAnimations(SuperToast.Animations.SCALE); + + mCount++; + + if(mCount == 1) { + + superCardToast.setOnToastButtonClickListener(onToastButtonClickListenerHolder); - @Override - public void onClick(View view) { + } else if (mCount == 2) { - SuperActivityToast.createDarkSuperActivityToast(view.getContext(), view.getContext().getResources() - .getString(R.string.onclick), SuperToast.Duration.MEDIUM).show(); + superCardToast.setOnToastButtonClickListener(onToastButtonClickListenerHolderTwo); - } - }); + } else { + + superCardToast.setOnToastButtonClickListener(onToastButtonClickListenerHolderThree); + + } break; @@ -130,6 +184,8 @@ public void onClick(View view) { superCardToast = new SuperCardToast(getActivity(), SuperToast.Type.PROGRESS); + superCardToast.setAnimations(SuperToast.Animations.FADE); + break; @@ -138,6 +194,8 @@ public void onClick(View view) { superCardToast = new SuperCardToast(getActivity(), SuperToast.Type.PROGRESS_HORIZONTAL); + superCardToast.setAnimations(SuperToast.Animations.FLYIN); + /** Since this SuperCardToast will show actual * progress from a background ASyncTask the duration of the * SuperCardToast must be indeterminate **/ @@ -157,6 +215,34 @@ public void onClick(View view) { } + switch (mAnimationSpinner.getSelectedItemPosition()) { + + case 0: + + superCardToast.setAnimations(SuperToast.Animations.FADE); + + break; + + case 1: + + superCardToast.setAnimations(SuperToast.Animations.FLYIN); + + break; + + case 2: + + superCardToast.setAnimations(SuperToast.Animations.POPUP); + + break; + + case 3: + + superCardToast.setAnimations(SuperToast.Animations.SCALE); + + break; + + } + switch (mDurationSpinner.getSelectedItemPosition()) { case 0: @@ -271,10 +357,92 @@ public void onClick(View view) { } + + if(mImageCheckBox.isChecked()) { + + superCardToast.setIcon(SuperToast.Icon.Dark.INFO, SuperToast.IconPosition.LEFT); + + } + + if(mDismissCheckBox.isChecked()) { + + superCardToast.setOnToastDismissListener(onToastDismissListenerHolder); + + } + + superCardToast.show(); } + private OnToastButtonClickListenerHolder onToastButtonClickListenerHolder = + new OnToastButtonClickListenerHolder("toast_one", new View.OnClickListener() { + + @Override + public void onClick(View v) { + + SuperToast superToast = new SuperToast(v.getContext()); + superToast.setText("On Click with first listener!"); + superToast.setDuration(SuperToast.Duration.VERY_SHORT); + superToast.setBackgroundResource(SuperToast.Background.TRANSLUCENT_BLUE); + superToast.setTextColor(Color.WHITE); + superToast.show(); + + } + + }); + + private OnToastButtonClickListenerHolder onToastButtonClickListenerHolderTwo = + new OnToastButtonClickListenerHolder("toast_two", new View.OnClickListener() { + + @Override + public void onClick(View v) { + + SuperToast superToast = new SuperToast(v.getContext()); + superToast.setText("On Click with second listener!"); + superToast.setDuration(SuperToast.Duration.VERY_SHORT); + superToast.setBackgroundResource(SuperToast.Background.TRANSLUCENT_ORANGE); + superToast.setTextColor(Color.WHITE); + superToast.show(); + + } + + }); + + private OnToastButtonClickListenerHolder onToastButtonClickListenerHolderThree = + new OnToastButtonClickListenerHolder("toast_three", new View.OnClickListener() { + + @Override + public void onClick(View v) { + + SuperToast superToast = new SuperToast(v.getContext()); + superToast.setText("On Click with last listener!"); + superToast.setDuration(SuperToast.Duration.VERY_SHORT); + superToast.setBackgroundResource(SuperToast.Background.TRANSLUCENT_GREEN); + superToast.setTextColor(Color.WHITE); + superToast.show(); + + } + + }); + + private OnToastDismissListenerHolder onToastDismissListenerHolder = + new OnToastDismissListenerHolder("toast_one", new OnToastDismissListener() { + + @Override + public void onDismiss(View view) { + + SuperToast superToast = new SuperToast(view.getContext()); + superToast.setText("On dismiss!"); + superToast.setDuration(SuperToast.Duration.VERY_SHORT); + superToast.setBackgroundResource(SuperToast.Background.TRANSLUCENT_GREEN); + superToast.setTextColor(Color.WHITE); + superToast.show(); + + } + }); + + private class DummyOperation extends AsyncTask { /** This setup is a little hacky due to the customization in the demo. diff --git a/demo/src/com/supertoastsdemo/FragmentSuperToast.java b/demo/src/com/supertoastsdemo/FragmentSuperToast.java index 5f38417..941d578 100644 --- a/demo/src/com/supertoastsdemo/FragmentSuperToast.java +++ b/demo/src/com/supertoastsdemo/FragmentSuperToast.java @@ -1,5 +1,6 @@ package com.supertoastsdemo; +import android.content.Intent; import android.os.Bundle; import android.view.LayoutInflater; import android.view.View; @@ -9,7 +10,6 @@ import android.widget.Spinner; import com.actionbarsherlock.app.SherlockFragment; import com.github.johnpersano.supertoasts.SuperToast; -import com.supertoastsdemo.R; public class FragmentSuperToast extends SherlockFragment { @@ -56,6 +56,16 @@ public void onClick(View view) { }); + showButton.setOnLongClickListener(new View.OnLongClickListener() { + @Override + public boolean onLongClick(View v) { + + startActivity(new Intent(getActivity(), ActivityTwo.class)); + + return false; + } + }); + return view; } @@ -70,25 +80,25 @@ private void showSuperToast() { case 0: - superToast.setAnimation(SuperToast.Animation.FADE); + superToast.setAnimations(SuperToast.Animations.FADE); break; case 1: - superToast.setAnimation(SuperToast.Animation.FLYIN); + superToast.setAnimations(SuperToast.Animations.FLYIN); break; case 2: - superToast.setAnimation(SuperToast.Animation.POPUP); + superToast.setAnimations(SuperToast.Animations.POPUP); break; case 3: - superToast.setAnimation(SuperToast.Animation.SCALE); + superToast.setAnimations(SuperToast.Animations.SCALE); break; @@ -173,7 +183,7 @@ private void showSuperToast() { case 1: - superToast.setTextSize(SuperToast.TextSize.SMALL); + superToast.setTextSize(SuperToast.TextSize.MEDIUM); break; diff --git a/demo/src/com/supertoastsdemo/MainActivity.java b/demo/src/com/supertoastsdemo/MainActivity.java index b77a427..527f9fb 100644 --- a/demo/src/com/supertoastsdemo/MainActivity.java +++ b/demo/src/com/supertoastsdemo/MainActivity.java @@ -11,7 +11,6 @@ import com.actionbarsherlock.view.Menu; import com.actionbarsherlock.view.MenuInflater; import com.actionbarsherlock.view.MenuItem; -import com.supertoastsdemo.R; public class MainActivity extends SherlockFragmentActivity { diff --git a/demo/src/com/supertoastsdemo/examples/UndoAction.java b/demo/src/com/supertoastsdemo/examples/UndoAction.java index 515b942..c529635 100644 --- a/demo/src/com/supertoastsdemo/examples/UndoAction.java +++ b/demo/src/com/supertoastsdemo/examples/UndoAction.java @@ -25,20 +25,7 @@ public void onCreate(Bundle savedInstanceState) { superActivityToast.setButtonText("UNDO"); superActivityToast.setButtonResource(SuperToast.Icon.Dark.UNDO); superActivityToast.setTextSize(SuperToast.TextSize.MEDIUM); - superActivityToast.setButtonOnClickListener(new View.OnClickListener() { - @Override - public void onClick(View view) { - - /** - * Any Context used in this method should be view.getContext() otherwise there will be - * a null pointer exception on orientation change. - */ - - dummyTextView.setVisibility(View.VISIBLE); - - } - }); Button deleteButton = (Button) findViewById(R.id.delete_button); diff --git a/supertoasts/AndroidManifest.xml b/supertoasts/AndroidManifest.xml index afdc8d2..7d988e2 100644 --- a/supertoasts/AndroidManifest.xml +++ b/supertoasts/AndroidManifest.xml @@ -1,7 +1,7 @@ + android:versionCode="14" + android:versionName="1.3.1" > - - - - - \ No newline at end of file diff --git a/supertoasts/res/layout/superactivitytoast.xml b/supertoasts/res/layout/superactivitytoast.xml index 4352af3..7709a3e 100644 --- a/supertoasts/res/layout/superactivitytoast.xml +++ b/supertoasts/res/layout/superactivitytoast.xml @@ -1,6 +1,6 @@ + android:textColor="@color/white" tools:ignore="HardcodedText"/> \ No newline at end of file diff --git a/supertoasts/res/layout/superactivitytoast_button.xml b/supertoasts/res/layout/superactivitytoast_button.xml index 5452701..040841c 100644 --- a/supertoasts/res/layout/superactivitytoast_button.xml +++ b/supertoasts/res/layout/superactivitytoast_button.xml @@ -1,6 +1,6 @@ + android:textColor="@color/white" tools:ignore="HardcodedText"/> + android:background="@color/light_gray" />