yay, bump it

documentscanner/src/main/AndroidManifest.xml

@@ -10,12 +10,18 @@
     <uses-feature android:name="android.hardware.camera" />
 
     <application android:supportsRtl="true">
-        <activity android:name=".activity.UploadActivity"></activity>
-        <activity android:name=".activity.EditingActivity" />
-        <activity android:name=".activity.CaptureActivity" />
+        <activity
+            android:name=".activity.UploadActivity"
+            android:screenOrientation="portrait"
+            ></activity>
+        <activity android:name=".activity.EditingActivity"
+            android:screenOrientation="portrait"/>
+        <activity android:name=".activity.CaptureActivity"
+            android:screenOrientation="portrait"/>
         <activity
             android:name=".activity.ScanActivity"
-            android:theme="@style/Theme.AppCompat.Light.NoActionBar" />
+            android:theme="@style/Theme.AppCompat.Light.NoActionBar"
+            android:screenOrientation="portrait"/>
     </application>
 
 </manifest>

documentscanner/src/main/java/com/haotran/documentscanner/activity/CaptureActivity.java

@@ -20,6 +20,7 @@
 import android.view.WindowManager;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
+import android.widget.Toast;
 
 import com.haotran.documentscanner.R;
 import com.haotran.documentscanner.constants.ScanConstants;
@@ -69,6 +70,13 @@ public void onClick(View v) {
             }
         });
 
+        findViewById(R.id.grid).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Toast.makeText(CaptureActivity.this, "Coming soon.", Toast.LENGTH_SHORT).show();
+            }
+        });
+
     }
     void startScan() {
         Intent intent = new Intent(this, ScanActivity.class);

documentscanner/src/main/java/com/haotran/documentscanner/activity/EditingActivity.java

@@ -10,9 +10,12 @@
 import android.support.v7.app.AppCompatActivity;
 import android.os.Bundle;
 import android.support.v7.widget.AppCompatTextView;
+import android.util.Log;
+import android.view.DragEvent;
 import android.view.View;
 import android.widget.LinearLayout;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import com.haotran.documentscanner.R;
 import com.haotran.documentscanner.constants.ScanConstants;
@@ -58,6 +61,32 @@ public void onClick(View v) {
                 finish();
             }
         });
+
+        findViewById(R.id.viewNotice).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Toast.makeText(EditingActivity.this, "Coming soon.", Toast.LENGTH_SHORT).show();
+            }
+        });
+        findViewById(R.id.crop).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Toast.makeText(EditingActivity.this, "Coming soon.", Toast.LENGTH_SHORT).show();
+            }
+        });
+        findViewById(R.id.rotate).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Toast.makeText(EditingActivity.this, "Coming soon.", Toast.LENGTH_SHORT).show();
+            }
+        });
+        findViewById(R.id.delete).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Toast.makeText(EditingActivity.this, "Coming soon.", Toast.LENGTH_SHORT).show();
+            }
+        });
+
     }
 
     private void setupViewPager(ViewPager viewPager, String groupName) {
@@ -88,13 +117,34 @@ public boolean accept(File pathname) {
         for (int i = 0; i < filesUploaded.length; i++) {
             this.adapter.addFragment(new EditingFragment(), filesUploaded[i].getName(), length, ScanConstants.UPLOADED_IMAGE_DIR);
         }
-        ((TextView)findViewById(R.id.page)).setText(files.length + "");
+
+//        int size = getArguments().getInt("SIZE");
+        ((TextView)findViewById(R.id.page)).setText(1 + "/" + length);
 //        this.adapter.addFragment(new EditingFragment(), "1"); // add position 1
 //        this.adapter.addFragment(new EditingFragment(), "2");
 //        this.adapter.addFragment(new EditingFragment(), "3");
 //        this.adapter.addFragment(new CaptureResultFragment(), "Grid");
 //        this.adapter.addFragment(new CaptureResultFragment(), "By Day");
         viewPager.setAdapter(this.adapter);
+
+
+        viewPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
+            @Override
+            public void onPageScrolled(int i, float v, int i1) {
+//                Log.d(">>>", "" + i + " " + v + " " + i1);
+            }
+
+            @Override
+            public void onPageSelected(int i) {
+                Log.d(">>>", "onPageSelected: " + i);
+                ((TextView)findViewById(R.id.page)).setText( (i+1) + "/" + length);
+            }
+
+            @Override
+            public void onPageScrollStateChanged(int i) {
+
+            }
+        });
     }
 
     private static class Adapter extends FragmentPagerAdapter {

documentscanner/src/main/java/com/haotran/documentscanner/activity/UploadActivity.java

@@ -65,6 +65,13 @@ protected void onCreate(Bundle savedInstanceState) {
             startReviewActivity();
         });
 
+        findViewById(R.id.addNotice).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                Toast.makeText(UploadActivity.this, "Coming soon.", Toast.LENGTH_SHORT).show();
+            }
+        });
+
         findViewById(R.id.addDebtor).setOnClickListener(v -> {
             // show pop-up for choosing debtor...
 //            Toast.makeText(UploadActivity.this, "popup...", Toast.LENGTH_SHORT).show();

documentscanner/src/main/java/com/haotran/documentscanner/activity/adapters/BaseCaptureAdapter.java

@@ -49,14 +49,18 @@ static class SubheaderHolder extends RecyclerView.ViewHolder {
     static class CaptureViewHolder extends RecyclerView.ViewHolder {
 
         TextView textCaptureTitle;
-        TextView textCaptureGenre;
-        TextView textCaptureYear;
+        TextView textCaptureTime;
+        TextView location;
+        TextView timestamp;
+        TextView page;
 
         CaptureViewHolder(View itemView) {
             super(itemView);
-            this.textCaptureTitle = (TextView) itemView.findViewById(R.id.movieTitle);
-            this.textCaptureGenre = (TextView) itemView.findViewById(R.id.movieGenre);
-            this.textCaptureYear = (TextView) itemView.findViewById(R.id.movieYear);
+            this.textCaptureTitle = (TextView) itemView.findViewById(R.id.captureTitle);
+            this.textCaptureTime = (TextView) itemView.findViewById(R.id.timestamp);
+            this.location = (TextView) itemView.findViewById(R.id.localtion);
+            this.timestamp = (TextView) itemView.findViewById(R.id.timestamp);
+            this.page = (TextView) itemView.findViewById(R.id.page);
         }
     }
 

documentscanner/src/main/java/com/haotran/documentscanner/activity/adapters/CaptureAdapterByDay.java

@@ -1,15 +1,25 @@
 package com.haotran.documentscanner.activity.adapters;
 
 import android.content.Context;
+import android.support.v4.content.ContextCompat;
+import android.util.Log;
 
+import com.haotran.documentscanner.R;
+import com.haotran.documentscanner.constants.ScanConstants;
 import com.haotran.documentscanner.model.Capture;
+import com.haotran.documentscanner.util.ScanUtils;
 
+import java.io.File;
+import java.io.FileFilter;
+import java.text.DateFormat;
+import java.text.SimpleDateFormat;
 import java.util.List;
 
 public class CaptureAdapterByDay extends BaseCaptureAdapter {
-
-    public CaptureAdapterByDay(List<Capture> itemList) {
+    Context context;
+    public CaptureAdapterByDay(Context context, List<Capture> itemList) {
         super(itemList);
+        this.context = context;
     }
 
     @Override
@@ -26,13 +36,52 @@ public boolean onPlaceSubheaderBetweenItems(int position) {
 
     @Override
     public void onBindItemViewHolder(final CaptureViewHolder holder, final int position) {
-        final Capture movie = captureList.get(position);
+        final Capture capture = captureList.get(position);
+
+        holder.textCaptureTitle.setText(capture.getTitle());
+
+
+        // Convert title to correct time.
+
+        holder.timestamp.setText( convetTime(capture.getTitle()));
+        holder.location.setText(capture.isUploaded() ? "Uploaded" : "Local Storage");
+        if (capture.isUploaded()) {
+            holder.location.setTextColor(ContextCompat.getColor(context, R.color.colorPrimaryDark));
+        } else {
+
+        }
+        holder.page.setText(getPageSize(capture) + " page");
+
+        holder.itemView.setOnClickListener(v -> onItemClickListener.onItemClicked(capture));
+    }
+
+    private int getPageSize(Capture capture) {
+        String title = capture.getTitle();
+        File dir;
+        if (capture.isUploaded()) {
+            dir = ScanUtils.getBaseDirectoryFromPathString(ScanConstants.UPLOADED_IMAGE_DIR, context);
+        } else  {
+            dir = ScanUtils.getBaseDirectoryFromPathString(ScanConstants.RAW_IMAGE_DIR, context);
+        }
+
+        File[] files = dir.listFiles(new FileFilter() {
+            @Override
+            public boolean accept(File pathname) {
+                return pathname.getName().split("_")[0].equals(title);
+            }
+        });
+        return files.length;
+    }
 
-        holder.textCaptureTitle.setText(movie.getTitle());
-//        holder.textCaptureGenre.setText(movie.getGenre());
-//        holder.textCaptureYear.setText(String.valueOf(movie.getYear()));
+    private String convetTime(String title) {
+        Log.d(">>>", title);
 
-        holder.itemView.setOnClickListener(v -> onItemClickListener.onItemClicked(movie));
+//        String time = "Aug 23, 2018 | 17:30";
+        String time = "This is time...";
+        DateFormat f = new SimpleDateFormat("MMM dd, yyyy | HH:mm");
+//        System.out.println();
+        time = f.format(Long.valueOf(title));
+        return time;
     }
 
     @Override

documentscanner/src/main/java/com/haotran/documentscanner/fragments/CaptureResultFragment.java

@@ -135,7 +135,7 @@ void showFiles() {
             } catch (Exception e) {
             }
 
-            Capture movie = new Capture(name, day, false);
+            Capture movie = new Capture(name, day, true);
             if (mMovieListUploaded.contains(movie)) {
                 continue;
             }
@@ -179,21 +179,21 @@ private void setAdapterByDay() {
         this.movieComparator = (o1, o2) -> o1.getTitle().compareTo(o2.getTitle());
         Collections.sort(mMovieList, Collections.reverseOrder(movieComparator));
 //        Collections.sort(mMovieList, movieComparator);
-        mSectionedRecyclerAdapter = new CaptureAdapterByDay(mMovieList);
+        mSectionedRecyclerAdapter = new CaptureAdapterByDay(getActivity(), mMovieList);
     }
 
     private void setAdapterByDayStorage() {
         this.movieComparator = (o1, o2) -> o1.getTitle().compareTo(o2.getTitle());
         Collections.sort(mMovieListStorage, Collections.reverseOrder(movieComparator));
 //        Collections.sort(mMovieList, movieComparator);
-        mSectionedRecyclerAdapter = new CaptureAdapterByDay(mMovieListStorage);
+        mSectionedRecyclerAdapter = new CaptureAdapterByDay(getActivity(), mMovieListStorage);
     }
 
     private void setAdapterByDayUploaded() {
         this.movieComparator = (o1, o2) -> o1.getTitle().compareTo(o2.getTitle());
         Collections.sort(mMovieListUploaded, Collections.reverseOrder(movieComparator));
 //        Collections.sort(mMovieList, movieComparator);
-        mSectionedRecyclerAdapter = new CaptureAdapterByDay(mMovieListUploaded);
+        mSectionedRecyclerAdapter = new CaptureAdapterByDay(getActivity(), mMovieListUploaded);
     }
 
 //    private void setAdapterByName() {

documentscanner/src/main/res/drawable/ic_grid_unactive.xml

@@ -0,0 +1,14 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="18dp"
+    android:height="18dp"
+    android:viewportWidth="18"
+    android:viewportHeight="18">
+  <path
+      android:pathData="M1.5625,0.5625L6.3125,0.5625C6.8648,0.5625 7.3125,1.0102 7.3125,1.5625L7.3125,6.3125C7.3125,6.8648 6.8648,7.3125 6.3125,7.3125L1.5625,7.3125C1.0102,7.3125 0.5625,6.8648 0.5625,6.3125L0.5625,1.5625C0.5625,1.0102 1.0102,0.5625 1.5625,0.5625ZM11.6875,0.5625L16.4375,0.5625C16.9898,0.5625 17.4375,1.0102 17.4375,1.5625L17.4375,6.3125C17.4375,6.8648 16.9898,7.3125 16.4375,7.3125L11.6875,7.3125C11.1352,7.3125 10.6875,6.8648 10.6875,6.3125L10.6875,1.5625C10.6875,1.0102 11.1352,0.5625 11.6875,0.5625ZM1.5625,10.6875L6.3125,10.6875C6.8648,10.6875 7.3125,11.1352 7.3125,11.6875L7.3125,16.4375C7.3125,16.9898 6.8648,17.4375 6.3125,17.4375L1.5625,17.4375C1.0102,17.4375 0.5625,16.9898 0.5625,16.4375L0.5625,11.6875C0.5625,11.1352 1.0102,10.6875 1.5625,10.6875ZM11.6875,10.6875L16.4375,10.6875C16.9898,10.6875 17.4375,11.1352 17.4375,11.6875L17.4375,16.4375C17.4375,16.9898 16.9898,17.4375 16.4375,17.4375L11.6875,17.4375C11.1352,17.4375 10.6875,16.9898 10.6875,16.4375L10.6875,11.6875C10.6875,11.1352 11.1352,10.6875 11.6875,10.6875Z"
+      android:strokeLineJoin="round"
+      android:strokeWidth="1"
+      android:fillColor="#CDCDCD"
+      android:strokeColor="#CDCDCD"
+      android:fillType="evenOdd"
+      android:strokeLineCap="round"/>
+</vector>

documentscanner/src/main/res/drawable/ic_row_unactive.xml

@@ -0,0 +1,12 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="18dp"
+    android:height="18dp"
+    android:viewportWidth="18"
+    android:viewportHeight="18">
+  <path
+      android:pathData="M1,0L17,0C17.5523,-0 18,0.4477 18,1L18,3C18,3.5523 17.5523,4 17,4L1,4C0.4477,4 0,3.5523 0,3L0,1C-0,0.4477 0.4477,0 1,0ZM1,7L17,7C17.5523,7 18,7.4477 18,8L18,10C18,10.5523 17.5523,11 17,11L1,11C0.4477,11 0,10.5523 0,10L0,8C-0,7.4477 0.4477,7 1,7ZM1,14L17,14C17.5523,14 18,14.4477 18,15L18,17C18,17.5523 17.5523,18 17,18L1,18C0.4477,18 0,17.5523 0,17L0,15C-0,14.4477 0.4477,14 1,14Z"
+      android:strokeWidth="1"
+      android:fillColor="#82FF27"
+      android:fillType="evenOdd"
+      android:strokeColor="#00000000"/>
+</vector>

documentscanner/src/main/res/layout/activity_capture.xml

@@ -43,25 +43,47 @@
                 app:layout_constraintTop_toTopOf="parent" />
         </android.support.constraint.ConstraintLayout>
     </LinearLayout>
+
     <android.support.design.widget.TabLayout
         android:id="@+id/tabLayout"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
 
         app:layout_constraintTop_toBottomOf="@+id/toolbar"
         app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintBottom_toTopOf="@+id/viewPager"
+        app:layout_constraintBottom_toTopOf="@+id/grid"
         app:tabTextColor="@color/white"
         app:layout_constraintStart_toStartOf="parent" />
 
+    <!--zzzz-->
+    <ImageView
+        android:id="@+id/list"
+        android:layout_width="18dp"
+        android:layout_height="18dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="8dp"
+        android:src="@drawable/ic_row_unactive"
+        app:layout_constraintBottom_toTopOf="@+id/viewPager"
+        app:layout_constraintEnd_toStartOf="@+id/grid"
+        app:layout_constraintTop_toBottomOf="@+id/tabLayout" />
+    <ImageView
+        android:id="@+id/grid"
+        android:layout_width="18dp"
+        android:layout_height="18dp"
+        android:layout_marginTop="8dp"
+        android:layout_marginEnd="8dp"
+        android:src="@drawable/ic_grid_unactive"
+        app:layout_constraintBottom_toTopOf="@+id/viewPager"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintTop_toBottomOf="@+id/tabLayout" />
+
     <android.support.v4.view.ViewPager
         android:id="@+id/viewPager"
         android:layout_width="match_parent"
         android:layout_height="0dp"
-        android:layout_marginBottom="8dp"
         app:layout_behavior="@string/appbar_scrolling_view_behavior"
         app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintTop_toBottomOf="@+id/tabLayout" />
+        app:layout_constraintTop_toBottomOf="@+id/grid" />
 
     <ImageView
         android:id="@+id/fab"