- Clear history

 - Move back to first fragment after upload chosen

app/src/androidTest/java/com/thecoolguy/rumaan/fileio/FileEntityDaoTest.java

@@ -3,7 +3,6 @@
 import static junit.framework.Assert.assertEquals;
 import static junit.framework.Assert.assertNotNull;
 
-import android.arch.lifecycle.LiveData;
 import android.arch.persistence.room.Room;
 import android.support.test.InstrumentationRegistry;
 import android.support.test.filters.LargeTest;
@@ -108,7 +107,7 @@ public void accept(FileEntity fileEntity) {
 
     assertEquals(items, database.uploadItemDao().numberOfItems());
 
-    List<FileEntity> list = database.uploadItemDao().allUploads();
+    List<FileEntity> list = database.uploadItemDao().getAllUploads().getValue();
     assertNotNull(list);
     assertEquals(fileEntities, list);
   }

app/src/main/java/com/thecoolguy/rumaan/fileio/data/db/UploadItemDao.java

@@ -23,14 +23,12 @@ public interface UploadItemDao {
   void delete(FileEntity... fileEntity);
 
   @Query("DELETE FROM " + TABLE_NAME)
-  void deleteAll();
+  void clearAll();
 
   @Query("SELECT DISTINCT count(*) FROM " + TABLE_NAME)
   int numberOfItems();
 
   @Query("SELECT * FROM " + TABLE_NAME)
   LiveData<List<FileEntity>> getAllUploads();
 
-  @Query("SELECT * FROM " + TABLE_NAME)
-  List<FileEntity> allUploads();
 }

app/src/main/java/com/thecoolguy/rumaan/fileio/repository/ClearHistoryWorker.kt

@@ -0,0 +1,15 @@
+package com.thecoolguy.rumaan.fileio.repository
+
+import androidx.work.Worker
+import com.thecoolguy.rumaan.fileio.data.db.UploadHistoryRoomDatabase
+
+class ClearHistoryWorker : Worker() {
+
+    override fun doWork(): WorkerResult {
+        UploadHistoryRoomDatabase.getInstance(applicationContext)
+                .uploadItemDao()
+                .clearAll()
+
+        return WorkerResult.SUCCESS
+    }
+}

app/src/main/java/com/thecoolguy/rumaan/fileio/ui/activities/MainActivity.java

@@ -113,14 +113,18 @@ protected void onCreate(Bundle savedInstanceState) {
     setSupportActionBar(toolbar);
 
     // set up initial fragment
+    setUpInitialFragment();
+
+    viewModel = ViewModelProviders.of(this).get(MainActivityViewModel.class);
+  }
+
+  private void setUpInitialFragment() {
     getSupportFragmentManager()
         .beginTransaction()
         .add(R.id.parent_fragment_container, ChooseFileFragment.newInstance(),
             ChooseFileFragment.TAG)
         .addToBackStack(ChooseFileFragment.TAG)
         .commit();
-
-    viewModel = ViewModelProviders.of(this).get(MainActivityViewModel.class);
   }
 
   @OnPermissionDenied({Manifest.permission.READ_EXTERNAL_STORAGE,
@@ -179,6 +183,8 @@ public void onChanged(WorkStatus workStatus) {
                     UploadResultFragment.TAG)
                 .addToBackStack(UploadResultFragment.TAG)
                 .commit();
+          } else {
+            getSupportFragmentManager().popBackStack(ChooseFileFragment.TAG, 0);
           }
         }
       });
@@ -203,18 +209,14 @@ public void onClick(View view) {
     });
     snackbar
         .setActionTextColor(ContextCompat.getColor(MainActivity.this, R.color.dark_yellow));
-
     View snackBarView = snackbar.getView();
-    View view = new View(this);
-
     TextView snackTextView = snackBarView
         .findViewById(android.support.design.R.id.snackbar_text);
     snackTextView.setMaxLines(3);
 
     snackbar.show();
   }
 
-
   @Override
   public void onFileLoad(@NotNull LocalFile localFile) {
     // change the current fragment to upload
@@ -227,6 +229,5 @@ public void onFileLoad(@NotNull LocalFile localFile) {
         UploadFileFragment.TAG);
     transaction.addToBackStack(UploadFileFragment.TAG);
     transaction.commit();
-
   }
 }

app/src/main/java/com/thecoolguy/rumaan/fileio/ui/activities/UploadHistoryActivity.kt

@@ -3,13 +3,17 @@ package com.thecoolguy.rumaan.fileio.ui.activities
 import android.arch.lifecycle.Observer
 import android.arch.lifecycle.ViewModelProviders
 import android.os.Bundle
+import android.support.transition.TransitionManager
 import android.support.v7.app.AppCompatActivity
 import android.support.v7.widget.DividerItemDecoration
 import android.view.Menu
 import android.view.MenuItem
 import android.view.View
 import android.view.animation.AnimationUtils
+import androidx.work.OneTimeWorkRequestBuilder
+import androidx.work.WorkManager
 import com.thecoolguy.rumaan.fileio.R
+import com.thecoolguy.rumaan.fileio.repository.ClearHistoryWorker
 import com.thecoolguy.rumaan.fileio.ui.UploadHistoryListAdapter
 import com.thecoolguy.rumaan.fileio.viewmodel.UploadHistoryViewModel
 import kotlinx.android.synthetic.main.activity_upload_history.*
@@ -27,10 +31,18 @@ class UploadHistoryActivity : AppCompatActivity() {
     override fun onOptionsItemSelected(item: MenuItem): Boolean {
         when (item.itemId) {
             android.R.id.home -> onBackPressed()
+            R.id.menu_clear_history -> clearHistory()
         }
         return super.onOptionsItemSelected(item)
     }
 
+    private fun clearHistory() {
+        val work = OneTimeWorkRequestBuilder<ClearHistoryWorker>()
+                .build()
+        WorkManager.getInstance()
+                .enqueue(work)
+    }
+
     override fun onCreate(savedInstanceState: Bundle?) {
         super.onCreate(savedInstanceState)
         setContentView(R.layout.activity_upload_history)
@@ -52,16 +64,18 @@ class UploadHistoryActivity : AppCompatActivity() {
             layoutAnimation = AnimationUtils.loadLayoutAnimation(context, R.anim.layout_anim_fall_down)
         }
 
-
         viewModel.uploadList.observe(this, Observer { list ->
+            TransitionManager.beginDelayedTransition(parent_history)
             list?.let {
                 progress.visibility = View.GONE
-                if (it.isEmpty())
+                if (it.isEmpty()) {
                     no_uploads_view.visibility = View.VISIBLE
-                else {
+                    upload_history_list.visibility = View.INVISIBLE
+                } else {
                     // set up recycler view and adapter
                     adapter.swapList(list)
                     upload_history_list.visibility = View.VISIBLE
+                    no_uploads_view.visibility = View.INVISIBLE
                 }
             }
         })

app/src/main/java/com/thecoolguy/rumaan/fileio/ui/fragments/ChooseFileFragment.kt

@@ -3,14 +3,12 @@ package com.thecoolguy.rumaan.fileio.ui.fragments
 import android.content.Context
 import android.os.Bundle
 import android.support.v4.app.Fragment
-import android.view.Gravity
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
-import android.widget.Button
 import com.thecoolguy.rumaan.fileio.R
 import com.thecoolguy.rumaan.fileio.listeners.OnFragmentInteractionListener
-import com.thecoolguy.rumaan.fileio.utils.MaterialIn
+import kotlinx.android.synthetic.main.fragment_choose_file.*
 
 class ChooseFileFragment : Fragment() {
     /**
@@ -23,19 +21,15 @@ class ChooseFileFragment : Fragment() {
     private var listener: OnFragmentInteractionListener? = null
 
     override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
-                              savedInstanceState: Bundle?): View? =
-            inflater.inflate(R.layout.fragment_choose_file, container, false)
-
+                              savedInstanceState: Bundle?): View? {
+        return inflater.inflate(R.layout.fragment_choose_file, container, false)
+    }
 
     override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
         super.onViewCreated(view, savedInstanceState)
-
-        MaterialIn.animate(view)
-
-        view.findViewById<Button>(R.id.btn_choose_file)
-                .setOnClickListener {
-                    buttonChooseFileClick()
-                }
+        btn_choose_file.setOnClickListener {
+            buttonChooseFileClick()
+        }
     }
 
     override fun onAttach(context: Context) {

app/src/main/res/anim/item_anim_slide_up_fade.xml

@@ -1,8 +1,10 @@
 <?xml version="1.0" encoding="utf-8"?>
 <set xmlns:android="http://schemas.android.com/apk/res/android"
-  android:duration="500">
+  android:duration="500"
+  >
   <translate
-    android:fromYDelta="45%"
+    android:fromYDelta="50%"
+    android:interpolator="@android:interpolator/decelerate_cubic"
     android:toYDelta="0"/>
   <alpha
     android:fromAlpha="0"

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

@@ -2,6 +2,7 @@
 <android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
   xmlns:app="http://schemas.android.com/apk/res-auto"
   xmlns:tools="http://schemas.android.com/tools"
+  android:id="@+id/parent_history"
   android:layout_width="match_parent"
   android:layout_height="match_parent"
   tools:context="com.thecoolguy.rumaan.fileio.ui.activities.UploadHistoryActivity">