Technocoupdoeil completed - M1

Commit: last changes

.gitignore

@@ -2,3 +2,4 @@
 /local.properties
 /.idea/workspace.xml
 .DS_Store
+*.apk

Technothlon.iml

@@ -1,6 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module external.linked.project.path="$MODULE_DIR$" external.root.project.path="$MODULE_DIR$" external.system.id="GRADLE" type="JAVA_MODULE" version="4">
-  <component name="NewModuleRootManager" inherit-compiler-output="true">
+  <component name="NewModuleRootManager" inherit-compiler-output="false">
+    <output url="file://$MODULE_DIR$/build/classes/main" />
+    <output-test url="file://$MODULE_DIR$/build/classes/test" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
       <excludeFolder url="file://$MODULE_DIR$/.gradle" />

app/app.iml

@@ -25,37 +25,37 @@
     <output url="file://$MODULE_DIR$/build/classes/debug" />
     <exclude-output />
     <content url="file://$MODULE_DIR$">
-      <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/assets" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/build/source/r/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/source/aidl/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/source/buildConfig/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/source/rs/debug" isTestSource="false" generated="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/res/rs/debug" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/build/source/r/test/debug" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/source/aidl/test/debug" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/source/buildConfig/test/debug" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/source/rs/test/debug" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/build/res/rs/test/debug" type="java-test-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/debug/assets" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/jni" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/aidl" isTestSource="false" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/aidl" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/assets" isTestSource="false" />
       <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/aidl" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/rs" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/jni" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/assets" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/java" isTestSource="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/res/rs/debug" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/resources" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/debug/res" type="java-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+      <sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/jni" isTestSource="true" />
+      <sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/rs" isTestSource="true" />
       <sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/res" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/res/rs/test/debug" type="java-test-resource" />
       <sourceFolder url="file://$MODULE_DIR$/src/instrumentTest/resources" type="java-test-resource" />
-      <sourceFolder url="file://$MODULE_DIR$/build/source/aidl/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/source/rs/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/source/buildConfig/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/source/r/debug" isTestSource="false" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/source/rs/test/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/source/buildConfig/test/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/source/r/test/debug" isTestSource="true" generated="true" />
-      <sourceFolder url="file://$MODULE_DIR$/build/source/aidl/test/debug" isTestSource="true" generated="true" />
       <excludeFolder url="file://$MODULE_DIR$/build/apk" />
       <excludeFolder url="file://$MODULE_DIR$/build/assets" />
       <excludeFolder url="file://$MODULE_DIR$/build/bundles" />

app/src/main/AndroidManifest.xml

@@ -27,6 +27,11 @@
             android:launchMode="singleTask"
             android:taskAffinity="" >
         </activity>
+        <activity
+            android:name="org.techniche.technothlon.katana.TCDSingleViewer"
+            android:parentActivityName=".MainActivity"
+            android:label="@string/title_activity_tcdsingle_viewer" >
+        </activity>
     </application>
 
     <uses-permission android:name="android.permission.INTERNET" />

app/src/main/java/org/techniche/technothlon/katana/MainActivity.java

@@ -2,6 +2,7 @@
 
 import android.app.Activity;
 import android.content.Context;
+import android.content.Intent;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
 import android.support.v4.app.FragmentManager;
@@ -107,8 +108,12 @@ public void finished() {
     }
 
     @Override
-    public void onTCDInteraction(String id) {
-
+    public void onTCDInteraction(int id) {
+        Intent intent = new Intent(this, TCDSingleViewer.class);
+        Bundle bundle = new Bundle();
+        bundle.putInt("open", id);
+        intent.putExtras(bundle);
+        startActivity(intent);
     }
 
     @Override

app/src/main/java/org/techniche/technothlon/katana/TCDFragment.java

@@ -86,7 +86,7 @@ public void onItemClick(AdapterView<?> parent, View view, int position, long id)
         if (null != mListener) {
             // Notify the active callbacks interface (the activity, if the
             // fragment is attached to one) that an item has been selected.
-            mListener.onTCDInteraction(TCDContent.ITEMS.get(position).id);
+            mListener.onTCDInteraction(position);
         }
     }
 
@@ -129,7 +129,7 @@ public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCoun
      * >Communicating with Other Fragments</a> for more information.
      */
     public interface OnTCDInteractionListener {
-        public void onTCDInteraction(String id);
+        public void onTCDInteraction(int id);
     }
 
 }

app/src/main/java/org/techniche/technothlon/katana/TCDSingleViewer.java

@@ -0,0 +1,165 @@
+package org.techniche.technothlon.katana;
+
+import android.os.Bundle;
+import android.support.v4.app.Fragment;
+import android.support.v4.app.FragmentManager;
+import android.support.v4.app.FragmentPagerAdapter;
+import android.support.v4.view.ViewPager;
+import android.support.v7.app.ActionBarActivity;
+import android.view.*;
+import android.widget.TextView;
+import org.techniche.technothlon.katana.tcd.TCDContent;
+
+import java.util.Locale;
+
+public class TCDSingleViewer extends ActionBarActivity implements ViewPager.OnPageChangeListener {
+    private static int pages;
+    /**
+     * The {@link android.support.v4.view.PagerAdapter} that will provide
+     * fragments for each of the sections. We use a
+     * {@link FragmentPagerAdapter} derivative, which will keep every
+     * loaded fragment in memory. If this becomes too memory intensive, it
+     * may be best to switch to a
+     * {@link android.support.v4.app.FragmentStatePagerAdapter}.
+     */
+    SectionsPagerAdapter mSectionsPagerAdapter;
+
+    /**
+     * The {@link ViewPager} that will host the section contents.
+     */
+    ViewPager mViewPager;
+    private int activePage;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_tcdsingle_viewer);
+        // Create the adapter that will return a fragment for each of the three
+        // primary sections of the activity.
+        mSectionsPagerAdapter = new SectionsPagerAdapter(getSupportFragmentManager());
+
+        pages = TCDContent.ITEMS.size();
+        // Set up the ViewPager with the sections adapter.
+        mViewPager = (ViewPager) findViewById(R.id.pager);
+        mViewPager.setAdapter(mSectionsPagerAdapter);
+        activePage = getIntent().getExtras().getInt("open");
+        mViewPager.setCurrentItem(activePage);
+    }
+
+    @Override
+    public boolean onCreateOptionsMenu(Menu menu) {
+
+        // Inflate the menu; this adds items to the action bar if it is present.
+        getMenuInflater().inflate(R.menu.tcdsingle_viewer, menu);
+        return true;
+    }
+
+    @Override
+    public boolean onOptionsItemSelected(MenuItem item) {
+        // Handle action bar item clicks here. The action bar will
+        // automatically handle clicks on the Home/Up button, so long
+        // as you specify a parent activity in AndroidManifest.xml.
+        int id = item.getItemId();
+        if (id == R.id.action_settings) {
+            return true;
+        }
+        return super.onOptionsItemSelected(item);
+    }
+
+    @Override
+    public void onPageScrolled(int i, float v, int i2) {
+
+    }
+
+    @Override
+    public void onPageSelected(int i) {
+        activePage = i;
+    }
+
+    @Override
+    public void onPageScrollStateChanged(int i) {
+
+    }
+
+
+    /**
+     * A {@link FragmentPagerAdapter} that returns a fragment corresponding to
+     * one of the sections/tabs/pages.
+     */
+    public class SectionsPagerAdapter extends FragmentPagerAdapter {
+
+        public SectionsPagerAdapter(FragmentManager fm) {
+            super(fm);
+        }
+
+        @Override
+        public Fragment getItem(int position) {
+            // getItem is called to instantiate the fragment for the given page.
+            // Return a PlaceholderFragment (defined as a static inner class below).
+            return PlaceholderFragment.newInstance((position));
+        }
+
+        @Override
+        public int getCount() {
+            // Show 3 total pages.
+            return pages;
+        }
+
+        @Override
+        public CharSequence getPageTitle(int position) {
+            Locale l = Locale.getDefault();
+            TCDContent.TCDQuestion q = TCDContent.ITEM_MAP.get(TCDContent.ITEMS.get(position).id);
+            String title = "#"+q.id+" - "+q.title;
+            return title;
+        }
+    }
+
+    /**
+     * A placeholder fragment containing a simple view.
+     */
+    public static class PlaceholderFragment extends Fragment {
+        /**
+         * The fragment argument representing the section number for this
+         * fragment.
+         */
+        private static final String ARG_SECTION_NUMBER = "section_number";
+
+        /**
+         * Returns a new instance of this fragment for the given section
+         * number.
+         */
+        public static PlaceholderFragment newInstance(int sectionNumber) {
+            PlaceholderFragment fragment = new PlaceholderFragment();
+            Bundle args = new Bundle();
+            args.putInt(ARG_SECTION_NUMBER, sectionNumber);
+            fragment.setArguments(args);
+            return fragment;
+        }
+
+        public PlaceholderFragment() {
+        }
+
+        // TODO create view here
+
+        @Override
+        public View onCreateView(LayoutInflater inflater, ViewGroup container,
+                Bundle savedInstanceState) {
+            View rootView = inflater.inflate(R.layout.fragment_tcdsingle_viewer, container, false);
+            TextView id = (TextView) rootView.findViewById(R.id.tcd_id),
+                    title = (TextView) rootView.findViewById(R.id.tcd_title),
+                    question = (TextView) rootView.findViewById(R.id.tcd_question),
+                    by = (TextView) rootView.findViewById(R.id.tcd_posted_by),
+                    status = (TextView) rootView.findViewById(R.id.tcd_status);
+            int position = getArguments().getInt(ARG_SECTION_NUMBER);
+            TCDContent.TCDQuestion q = TCDContent.ITEM_MAP.get(TCDContent.ITEMS.get(position).id);
+            id.setText("#"+q.id);
+            id.setBackgroundResource(q.color);
+            title.setText(q.title);
+            question.setText(q.question);
+            by.setText(q.by);
+            status.setText(q.getStatus());
+            return rootView;
+        }
+    }
+
+}

app/src/main/java/org/techniche/technothlon/katana/tcd/TCDContent.java

@@ -165,13 +165,14 @@ public static void load(Context context) {
         TCDDatabase helper = new TCDDatabase(context);
         SQLiteDatabase db = helper.getReadableDatabase();
         assert db != null;
-        Cursor c = db.rawQuery("SELECT * FROM " + TCDDatabase.Contracts.NAME + " ORDER BY " + TCDDatabase.Contracts.FIELD_TIME + " DESC", null);
+        Cursor c = db.rawQuery("SELECT * FROM " + TCDDatabase.Contracts.NAME + " ORDER BY " + TCDDatabase.Contracts.FIELD_TIME + " DESC, "+TCDDatabase.Contracts.FIELD_ID+ " DESC", null);
         Log.d("DB", c.getCount() + " object in database");
         c.moveToFirst();
         while (!c.isAfterLast()) {
             addItem(new TCDQuestion(
                     c.getString(c.getColumnIndex(TCDDatabase.Contracts.FIELD_ID)),
                     c.getString(c.getColumnIndex(TCDDatabase.Contracts.FIELD_DISPLAY_ID)),
+                    c.getInt(c.getColumnIndex(TCDDatabase.Contracts.FIELD_COLOR)),
                     c.getString(c.getColumnIndex(TCDDatabase.Contracts.FIELD_TITLE)),
                     c.getString(c.getColumnIndex(TCDDatabase.Contracts.FIELD_QUESTION)),
                     c.getString(c.getColumnIndex(TCDDatabase.Contracts.FIELD_FACEBOOK)),
@@ -232,13 +233,13 @@ public static class TCDQuestion {
         public String title;
         public java.util.Date date = null;
         public String dateString = "";
-        public int color = 1;
+        public int color = R.drawable.tcd_background_1;
         public String uniqueId;
         private String status;
         private boolean ret = false;
 
 
-        public TCDQuestion(String uniqueId, String id, String title, String question, String facebook, String google, String tumblr,
+        public TCDQuestion(String uniqueId, String id, int color, String title, String question, String facebook, String google, String tumblr,
                            String answer_url, String by, String answer, String status) {
 
             this.uniqueId = uniqueId;
@@ -250,6 +251,7 @@ public TCDQuestion(String uniqueId, String id, String title, String question, St
             this.tumblr = tumblr;
             this.answer_url = answer_url;
             this.by = by;
+            this.color = getBackground(color);
             this.answer = answer;
             SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss");
             try {
@@ -261,6 +263,22 @@ public TCDQuestion(String uniqueId, String id, String title, String question, St
             this.dateString = sdf.format(this.date);
             this.status = getStatus();
         }
+        private int getBackground(int color) {
+            switch (color) {
+                case 10:
+                    return R.drawable.tcd_background_2;
+                case 20:
+                    return R.drawable.tcd_background_3;
+                case 30:
+                    return R.drawable.tcd_background_4;
+                case 40:
+                    return R.drawable.tcd_background_5;
+                case 50:
+                    return R.drawable.tcd_background_6;
+                default:
+                    return R.drawable.tcd_background_1;
+            }
+        }
 
         public String getStatus() {
             if (ret) return status;

app/src/main/java/org/techniche/technothlon/katana/tcd/TCDListAdapter.java

@@ -65,7 +65,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
             holder.title.setText(question.title);
             holder.question.setText(question.question);
             holder.status.setText(question.getStatus());
-            holder.id.setBackgroundResource(getBackground(question.color));
+            holder.id.setBackgroundResource(question.color);
         }
 
 
@@ -79,16 +79,4 @@ public View getView(int position, View convertView, ViewGroup parent) {
 
         return convertView;
     }
-
-    private int getBackground(int color) {
-        switch (color) {
-            case 10:
-            case 20:
-            case 30:
-            case 40:
-            case 50:
-            default:
-                return R.drawable.tcd_background_1;
-        }
-    }
 }

app/src/main/res/drawable/tcd_background_2.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
+    <solid android:color="#9933cc" />
+    <stroke android:width="1dip" android:color="#aa66cc"/>
+</shape>

app/src/main/res/drawable/tcd_background_3.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+
+<shape xmlns:android="http://schemas.android.com/apk/res/android" android:shape="rectangle" >
+    <solid android:color="#99cc00" />
+    <stroke android:width="1dip" android:color="#669900"/>
+</shape>