Fixed bugs in demo 2.0.0

gabrielemariotti · Nov 8, 2014 · 7e2a6b2 · 7e2a6b2
1 parent 61ffadb
commit 7e2a6b2
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 7 deletions.
diff --git a/demo/stock/src/main/AndroidManifest.xml b/demo/stock/src/main/AndroidManifest.xml
@@ -41,7 +41,6 @@
         </activity>
         <activity
             android:name=".ui.NativeMenuActivity"
-            android:label="@string/navdrawer_item_native_cardslib"
             android:theme="@style/Theme.Carddemo.Main">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN"/>

diff --git a/.../src/main/java/it/gmariotti/cardslib/demo/fragment/nativeview/NativeMiscCardFragment.java b/.../src/main/java/it/gmariotti/cardslib/demo/fragment/nativeview/NativeMiscCardFragment.java
@@ -79,11 +79,16 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle sa
         return inflater.inflate(R.layout.demo_fragment_native_misc_card, container, false);
     }
 
+    float mElevationCircle;
+    int mSizeCircle;
+
     @Override
     public void onActivityCreated(Bundle savedInstanceState) {
         super.onActivityCreated(savedInstanceState);
 
         mScrollView = (ScrollView) getActivity().findViewById(R.id.card_scrollview);
+        mElevationCircle = getResources().getDimension(R.dimen.circle_elevation);
+        mSizeCircle = getResources().getDimensionPixelSize(R.dimen.circle_size);
 
         initCard();
     }
@@ -165,15 +170,14 @@ public boolean applyBitmap(final View imageView, Bitmap bitmap) {
                 imageView.setBackgroundDrawable(circle);
 
 
-            ViewCompat.setElevation(imageView, getResources().getDimension(R.dimen.circle_elevation));
+            ViewCompat.setElevation(imageView, mElevationCircle);
             if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.LOLLIPOP){
-                final int size = getResources().getDimensionPixelSize(R.dimen.circle_size);
                 imageView.setOutlineProvider(
                         new ViewOutlineProvider(){
                             @TargetApi(Build.VERSION_CODES.LOLLIPOP)
                             @Override
                             public void getOutline(View view, Outline outline) {
-                                outline.setOval(0, 0, size, size);
+                                outline.setOval(0, 0, mSizeCircle, mSizeCircle);
                             }
                         });
                 imageView.setClipToOutline(true);

diff --git a/.../main/java/it/gmariotti/cardslib/demo/fragment/nativeview/NativeRecyclerViewFragment.java b/.../main/java/it/gmariotti/cardslib/demo/fragment/nativeview/NativeRecyclerViewFragment.java
@@ -111,8 +111,11 @@ class LoaderAsyncTask extends AsyncTask<Void, Void, ArrayList<Card>> {
         protected ArrayList<Card> doInBackground(Void... params) {
             //elaborate images
             SystemClock.sleep(1000); //delay to simulate download, don't use it in a real app
-            ArrayList<Card> cards = initCard();
-            return cards;
+            if (isAdded()) {
+                ArrayList<Card> cards = initCard();
+                return cards;
+            }else
+                return null;
         }
 
         @Override

diff --git a/demo/stock/src/main/java/it/gmariotti/cardslib/demo/ui/NativeMenuActivity.java b/demo/stock/src/main/java/it/gmariotti/cardslib/demo/ui/NativeMenuActivity.java
@@ -45,6 +45,9 @@ protected void onCreate(Bundle savedInstanceState) {
 
         setContentView(R.layout.carddemo_activity_native);
 
+        if (getSupportActionBar() != null)
+            getSupportActionBar().setTitle(R.string.navdrawer_item_native_cardslib);
+
         if (null == savedInstanceState) {
             getFragmentManager().beginTransaction()
                     .replace(R.id.container, NativeDashFragment.newInstance())

diff --git a/demo/stock/src/main/res/values/strings.xml b/demo/stock/src/main/res/values/strings.xml
@@ -20,7 +20,7 @@
 <resources>
 
     <!--App name -->
-    <string name="app_name">CardsLibDemo</string>
+    <string name="app_name">CardsLib Demo</string>
 
     <!--Authority -->
     <string name="config_authority">it.gmariotti.cardslib.demo.provider</string>