Merge branch 'master' of github.com:DevConMyanmar/devcon-android-2014

Author: yemyatthu1990

app/build.gradle

@@ -17,7 +17,7 @@ repositories {
 
 def versionMajor = 1
 def versionMinor = 3
-def versionPatch = 0
+def versionPatch = 1
 def versionBuild = 0
 
 def gitSha = 'git rev-parse --short HEAD'.execute([], project.rootDir).text.trim()

app/src/main/assets/bootstrapdata.json

@@ -219,36 +219,6 @@
         "7"
       ]
     },
-    {
-      "id": "17",
-      "title": "The Art of killing bugs",
-      "description": "The Art of killing bugs",
-      "photo": "",
-      "date": "2014-11-15",
-      "favourite": "false",
-      "talk_type": "2",
-      "room": "205",
-      "from_time": "15:00",
-      "to_time": "16:00",
-      "speakers": [
-        "29"
-      ]
-    },
-    {
-      "id": "14",
-      "title": "Cocos2DX Game Development Engine",
-      "description": "Cocos2DX Game Development Engine",
-      "photo": "",
-      "date": "2014-11-15",
-      "favourite": "false",
-      "talk_type": "2",
-      "room": "205",
-      "from_time": "11:00",
-      "to_time": "12:00",
-      "speakers": [
-        "25"
-      ]
-    },
     {
       "id": "16",
       "title": "Lightening Talks",
@@ -271,6 +241,21 @@
         "8"
       ]
     },
+    {
+      "id": "17",
+      "title": "The Art of killing bugs",
+      "description": "The Art of killing bugs",
+      "photo": "",
+      "date": "2014-11-15",
+      "favourite": "false",
+      "talk_type": "2",
+      "room": "205",
+      "from_time": "15:00",
+      "to_time": "16:00",
+      "speakers": [
+        "29"
+      ]
+    },
     {
       "id": "18",
       "title": "What's new in Android 5.0 ?",
@@ -771,6 +756,13 @@
       "description": "",
       "photo": ""
     },
+    {
+      "id": "16",
+      "name": "David Madden",
+      "title": "Founder of Code for Change Myanmar",
+      "description": "David Madden is an entrepreneur specializing in technology, new media & innovation. He is the Founder of Code for Change Myanmar, an initiative to harness the transformative potential of Myanmar's connectivity revolution. He is also the Co-Founder of Parami Road, a marketing strategy agency in Yangon.\nPrior to moving to Myanmar, David was the Co-Founder of Purpose, a digital strategy agency with offices in New York, London and Rio. David is also the Co-Founder of two major advocacy groups, Avaaz.org and GetUp.org.\nDavid holds a Masters in Public Policy from Harvard University and has degrees in Law and Arts from the University of New South Wales. \ne. david@codeforchangemyanmar.org  \n t. @davidmadden",
+      "photo": "https://lh4.googleusercontent.com/aFT-gRzImP1y94EosvD9MIac3movlcCVR0CCprs9DzMNE7NcUBsAC_EtIg5Pct6N7imzF8RB1lc=w1416-h646"
+    },
     {
       "id": "17",
       "name": "Poe Poe Myint Swe",

app/src/main/java/org/devconmyanmar/apps/devcon/db/TalkDao.java

@@ -1,4 +1,3 @@
-
 /*
  * The MIT License (MIT)
  *

app/src/main/java/org/devconmyanmar/apps/devcon/ui/BaseFragment.java

@@ -1,4 +1,3 @@
-
 /*
  * The MIT License (MIT)
  *
@@ -153,6 +152,7 @@ protected void syncSchedules(final CustomSwipeRefreshLayout exploreSwipeRefreshV
           e.printStackTrace();
         }
 
+        List<Talk> talks = new ArrayList<Talk>();
         for (JsonElement j : scheduleArray) {
           Talk talk = new Talk();
           talk.setId(j.getAsJsonObject().get("id").getAsInt());
@@ -167,14 +167,10 @@ protected void syncSchedules(final CustomSwipeRefreshLayout exploreSwipeRefreshV
           talk.setTo_time(j.getAsJsonObject().get("to_time").getAsString());
           JsonArray speakers = j.getAsJsonObject().getAsJsonArray("speakers");
           talk.setSpeakers(speakers.toString());
+          talks.add(talk);
           talkDao.create(talk);
         }
-        List<Talk> talks = new ArrayList<Talk>();
-        try {
-          talks = talkDao.getAll();
-        } catch (SQLException e) {
-          e.printStackTrace();
-        }
+
         ArrayList<Talk> favTalk = flattenFav(SharePref.getInstance(mContext).geFavIds());
         ArrayList<Integer> talkIds = new ArrayList<Integer>();
         for (Talk talk : favTalk) {

app/src/main/java/org/devconmyanmar/apps/devcon/ui/SpeakerDetailFragment.java

@@ -1,4 +1,3 @@
-
 /*
  * The MIT License (MIT)
  *
@@ -41,6 +40,7 @@
 import org.devconmyanmar.apps.devcon.transformer.CircleTransformer;
 import org.devconmyanmar.apps.devcon.utils.AnalyticsManager;
 
+import static org.devconmyanmar.apps.devcon.utils.LogUtils.LOGD;
 import static org.devconmyanmar.apps.devcon.utils.LogUtils.makeLogTag;
 
 public class SpeakerDetailFragment extends BaseFragment {
@@ -73,6 +73,7 @@ public void onCreate(Bundle savedInstanceState) {
     super.onCreate(savedInstanceState);
     if (getArguments() != null) {
       mSpeakerId = getArguments().getString(ARG_TALK_ID);
+      LOGD(TAG, "speaker id in detail : " + mSpeakerId);
     }
   }
 
@@ -90,6 +91,7 @@ public View onCreateView(LayoutInflater inflater, ViewGroup container,
       tintManager.setNavigationBarTintEnabled(false);
       tintManager.setTintColor(getResources().getColor(R.color.translucent_actionbar_background));
     }
+
     Speaker speaker = speakerDao.getSpeakerById(mSpeakerId);
 
     if (speaker != null) {

app/src/main/java/org/devconmyanmar/apps/devcon/ui/SpeakerFragment.java

@@ -1,4 +1,3 @@
-
 /*
  * The MIT License (MIT)
  *
@@ -57,6 +56,7 @@
 import org.devconmyanmar.apps.devcon.utils.HelpUtils;
 
 import static org.devconmyanmar.apps.devcon.Config.POSITION;
+import static org.devconmyanmar.apps.devcon.utils.LogUtils.LOGD;
 
 /**
  * Created by Ye Lin Aung on 14/10/05.
@@ -144,6 +144,7 @@ public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCoun
 
   @SuppressWarnings("unused") @OnItemClick(R.id.my_list) void speakerListItemClick(int position) {
     int id = mSpeakers.get(position).getId();
+    LOGD("speakers ", "id " + id);
     Intent i = new Intent(getActivity(), SpeakerDetailActivity.class);
 
     AnalyticsManager.sendEvent("Speaker List", "selectspeaker", mSpeakers.get(position).getTitle());

app/src/main/res/layout/fragment_speaker_detail.xml

@@ -5,6 +5,7 @@
     androidsucks:stuckShadowDrawable="@drawable/sticky_shawdow"
     androidsucks:stuckShadowHeight="10dip"
     android:id="@+id/talk_detail_scroll_view"
+    android:background="@android:color/white"
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
@@ -81,7 +82,6 @@
 
     <TextView
         android:id="@+id/speaker_detail_description"
-        tools:text="@string/placeholder_talk_description"
         android:padding="@dimen/spacing_major"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"/>
@@ -97,21 +97,21 @@
           android:layout_height="1dp"
           layout="@layout/divider"/>
 
-      <TextView
-          android:text="@string/related_talks"
-          style="@style/SessionDetailSectionHeader"
-          android:layout_width="match_parent"
-          android:layout_height="wrap_content"/>
+      <!--<TextView-->
+          <!--android:text="@string/related_talks"-->
+          <!--style="@style/SessionDetailSectionHeader"-->
+          <!--android:layout_width="match_parent"-->
+          <!--android:layout_height="wrap_content"/>-->
 
       <!--<include-->
       <!--android:id="@+id/include_speaker_list"-->
       <!--layout="@layout/speaker_list"/>-->
 
-      <include
-          android:layout_margin="@dimen/spacing_major"
-          android:layout_width="wrap_content"
-          android:layout_height="1dp"
-          layout="@layout/divider"/>
+      <!--<include-->
+          <!--android:layout_margin="@dimen/spacing_major"-->
+          <!--android:layout_width="wrap_content"-->
+          <!--android:layout_height="1dp"-->
+          <!--layout="@layout/divider"/>-->
     </LinearLayout>
 
   </LinearLayout>