Fixed examples with cards with list

gabrielemariotti · Jun 10, 2014 · b8a2a6e · b8a2a6e
1 parent f36d8eb
commit b8a2a6e
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 4 deletions.
diff --git a/demo/extras/build.gradle b/demo/extras/build.gradle
@@ -75,7 +75,7 @@ dependencies {
     compile ('se.emilsjolander:stickylistheaders:2.4.0')
 
     //Weather Lib
-    compile 'com.survivingwithandroid:WeatherLib:1.3.0'
+    compile 'com.survivingwithandroid:weatherlib:1.3.2'
 
     // Fading ActionBar
     compile 'com.github.manuelpeinado.fadingactionbar:fadingactionbar:3.0.0'

diff --git a/demo/extras/src/main/java/it/gmariotti/cardslib/demo/extras/cards/GoogleKnowwithList.java b/demo/extras/src/main/java/it/gmariotti/cardslib/demo/extras/cards/GoogleKnowwithList.java
@@ -88,7 +88,7 @@ protected List<ListObject> initChildren() {
         s2.name = "Another user";
         s2.common = "3 people in common";
         s2.url = "https://lh5.googleusercontent.com/-squZd7FxR8Q/UyN5UrsfkqI/AAAAAAAAbAo/VoDHSYAhC_E/s54/new%2520profile%2520%25282%2529.jpg";
-        mObjects.add(s1);
+        mObjects.add(s2);
 
         return mObjects;
     }

diff --git a/...extras/src/main/java/it/gmariotti/cardslib/demo/extras/fragment/CardWithListFragment.java b/...extras/src/main/java/it/gmariotti/cardslib/demo/extras/fragment/CardWithListFragment.java
@@ -74,6 +74,7 @@ public void onCreate(Bundle savedInstanceState) {
 
         // Let's create the WeatherProvider
         config = new WeatherConfig();
+        config.lang = "en"; // If you want to use english
         config.unitSystem = WeatherConfig.UNIT_SYSTEM.M;
         config.numDays = 6; // Max num of days in the forecast
 
@@ -124,14 +125,15 @@ public void onConnectionError(Throwable t) {
      */
     private void initCard() {
 
-        //Create a Card
+        //Weather Card
        card= new WeatherCard(getActivity());
 
         //Set card in the cardView
         CardView cardView = (CardView) getActivity().findViewById(R.id.carddemo_weathercard);
         cardView.setCard(card);
 
 
+        //May know card
         GoogleKnowwithList card2= new GoogleKnowwithList(getActivity());
 
         //Set card in the cardView

diff --git a/demo/extras/src/main/res/values/strings.xml b/demo/extras/src/main/res/values/strings.xml
@@ -53,9 +53,12 @@
         <i>by Emil Sjölander</i><br><br>
         <b><a href="https://github.com/etsy/AndroidStaggeredGrid">AndroidStaggeredGrid</a></b><br>
         <i>by Etsy</i><br><br>
+        <b><a href="https://github.com/survivingwithandroid/WeatherLib">WeatherLib</a></b><br>
+        <i>by Francesco Azzola</i><br><br>
         <b>Thanks for some ideas and code:</b><br>
         <b><a href="https://github.com/JakeWharton/u2020">u2020</a></b><br>
         <i>by JakeWharton</i><br><br>
+        <b>Thanks to <a href="https://plus.google.com/+TaylorLing">Taylor Ling</a> for drag and drop icon.</b>
         <br>
 
     ]]></string>

diff --git a/demo/stock/src/main/res/layout/carddemo_googlenowweather_inner_header.xml b/demo/stock/src/main/res/layout/carddemo_googlenowweather_inner_header.xml
@@ -24,7 +24,7 @@
               android:gravity="center_vertical"
               style="@style/card"
               android:layout_width="match_parent"
-              android:layout_height="72dp">
+              android:layout_height="32dp">
 
 
     <TextView

diff --git a/demo/stock/src/main/res/values/strings.xml b/demo/stock/src/main/res/values/strings.xml
@@ -46,6 +46,8 @@
         <b>Thanks for some ideas and code:</b><br>
         <b><a href="https://github.com/nhaarman/ListViewAnimations">ListViewAnimations</a></b><br>
         <i>by Niek Haarman</i><br><br>
+        <b><a href="https://github.com/frankiesardo/LinearListView">LinearListView</a></b><br>
+        <i>by Frankie Sardo</i><br><br>
 
         <br><br><br>
         Google and the Google Maps logo are registered trademarks of Google Inc.