summaryrefslogtreecommitdiff
path: root/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/MainActivity.java
diff options
context:
space:
mode:
Diffstat (limited to 'org.fox.ttcomics/src/main/java/org/fox/ttcomics2/MainActivity.java')
-rwxr-xr-xorg.fox.ttcomics/src/main/java/org/fox/ttcomics2/MainActivity.java34
1 files changed, 26 insertions, 8 deletions
diff --git a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/MainActivity.java b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/MainActivity.java
index ddb1fb1..a6bd9a3 100755
--- a/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/MainActivity.java
+++ b/org.fox.ttcomics/src/main/java/org/fox/ttcomics2/MainActivity.java
@@ -25,8 +25,11 @@ import android.support.v7.widget.Toolbar;
import android.util.Log;
import android.view.Menu;
import android.view.MenuItem;
+import android.view.View;
import android.view.ViewGroup;
+import com.shamanland.fab.FloatingActionButton;
+
import org.fox.ttcomics2.sync.SyncClient;
import org.fox.ttcomics2.sync.SyncFolderService;
@@ -59,7 +62,7 @@ public class MainActivity extends CommonActivity implements SharedPreferences.On
if (SyncFolderService.INTENT_ACTION_SCAN_COMPLETE.equals(intent.getAction())) {
m_progressDialog.dismiss();
- updateComicsList();
+ updateComicsList(false);
}
}
@@ -79,6 +82,19 @@ public class MainActivity extends CommonActivity implements SharedPreferences.On
m_progressDialog = new ProgressDialog(this);
+ FloatingActionButton fab = (FloatingActionButton) findViewById(R.id.fab);
+
+ if (m_prefs.getBoolean("enable_fab", true)) {
+ fab.setOnClickListener(new View.OnClickListener() {
+ @Override
+ public void onClick(View v) {
+ updateComicsList(true);
+ }
+ });
+ } else {
+ fab.setVisibility(View.GONE);
+ }
+
m_adapter = new ComicsPagerAdapter(getSupportFragmentManager());
m_pager = (ViewPager) findViewById(R.id.comics_pager);
@@ -352,7 +368,7 @@ public class MainActivity extends CommonActivity implements SharedPreferences.On
m_syncClient.setPosition(sha1(new File(fileName).getName()), m_databaseHelper.getLastPosition(fileName));
}
- updateComicsList();
+ updateComicsList(false);
}
System.gc();
@@ -360,13 +376,15 @@ public class MainActivity extends CommonActivity implements SharedPreferences.On
super.onActivityResult(requestCode, resultCode, intent);
}
- private void updateComicsList() {
+ private void updateComicsList(boolean rescan) {
ComicListFragment frag = (ComicListFragment) m_adapter.getPrimaryItem();
- Log.d(TAG, "CLF=" + frag + " " + frag.isAdded());
-
if (frag != null && frag.isAdded()) {
- frag.refresh();
+
+ if (rescan)
+ frag.rescan();
+ else
+ frag.refresh();
}
}
@@ -375,7 +393,7 @@ public class MainActivity extends CommonActivity implements SharedPreferences.On
if (m_prefs.getBoolean("use_position_sync", false) && m_syncClient.hasOwner()) {
m_databaseHelper.setLastPosition(fileName, 0);
m_databaseHelper.setLastMaxPosition(fileName, 0);
- updateComicsList();
+ updateComicsList(false);
if (m_prefs.getBoolean("use_position_sync", false) && m_syncClient.hasOwner()) {
AlertDialog.Builder builder = new AlertDialog.Builder(this);
@@ -386,7 +404,7 @@ public class MainActivity extends CommonActivity implements SharedPreferences.On
m_syncClient.clearData(sha1(new File(fileName).getName()), new SyncClient.DataClearedListener() {
@Override
public void onDataCleared(boolean result) {
- updateComicsList();
+ updateComicsList(false);
}
});
}