Fix padding of abbpar for ZimManageActivity. Stop creating unused tables, drop unused table

This commit is contained in:
Sean Mac Gillicuddy 2019-05-20 13:19:25 +01:00
parent 75c47055c1
commit aa01598e27
4 changed files with 13 additions and 30 deletions

View File

@ -29,7 +29,6 @@ import java.io.FileNotFoundException;
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
import java.util.ArrayList;
import javax.inject.Inject;
import javax.inject.Singleton;
import org.kiwix.kiwixmobile.ZimContentProvider;
@ -40,9 +39,7 @@ import org.kiwix.kiwixmobile.database.entity.NetworkLanguageDatabaseEntity;
import org.kiwix.kiwixmobile.database.entity.RecentSearch;
import org.kiwix.kiwixmobile.database.newdb.dao.NewBookDao;
import org.kiwix.kiwixmobile.database.newdb.dao.NewLanguagesDao;
import org.kiwix.kiwixmobile.library.entity.LibraryNetworkEntity;
import org.kiwix.kiwixmobile.utils.UpdateUtils;
import org.kiwix.kiwixmobile.zim_manager.library_view.adapter.Language;
import static org.kiwix.kiwixmobile.utils.Constants.TAG_KIWIX;
@ -70,11 +67,8 @@ public class KiwixDatabase extends SquidDatabase {
@Override
protected Table[] getTables() {
return new Table[] {
BookDatabaseEntity.TABLE,
LibraryDatabaseEntity.TABLE,
RecentSearch.TABLE,
Bookmarks.TABLE,
NetworkLanguageDatabaseEntity.TABLE
};
}
@ -83,12 +77,12 @@ public class KiwixDatabase extends SquidDatabase {
if (newVersion >= 16) { //2.5 attempt reading values from old db before they get dropped
try {
bookDao.migrationInsert(new BookDao(this).getBooks());
} catch (Exception e){
} catch (Exception e) {
e.printStackTrace();
}
try {
languagesDao.insert(new NetworkLanguageDao(this).getFilteredLanguages());
} catch (Exception e){
} catch (Exception e) {
e.printStackTrace();
}
}
@ -153,6 +147,7 @@ public class KiwixDatabase extends SquidDatabase {
if (newVersion >= 16) { //2.5 drop tables
tryDropTable(BookDatabaseEntity.TABLE);
tryDropTable(NetworkLanguageDatabaseEntity.TABLE);
tryDropTable(LibraryDatabaseEntity.TABLE);
}
return true;
}

View File

@ -36,10 +36,6 @@ import kotlinx.android.synthetic.main.zim_manager.tabs
import kotlinx.android.synthetic.main.zim_manager.toolbar
import org.kiwix.kiwixmobile.KiwixMobileActivity
import org.kiwix.kiwixmobile.R
import org.kiwix.kiwixmobile.R.id
import org.kiwix.kiwixmobile.R.layout
import org.kiwix.kiwixmobile.R.string
import org.kiwix.kiwixmobile.R.style
import org.kiwix.kiwixmobile.base.BaseActivity
import org.kiwix.kiwixmobile.database.newdb.dao.NewLanguagesDao
import org.kiwix.kiwixmobile.extensions.toast
@ -75,9 +71,9 @@ class ZimManageActivity : BaseActivity() {
LanguageUtils.handleLocaleChange(this, sharedPreferenceUtil)
if (KiwixSettingsActivity.nightMode(sharedPreferenceUtil)) {
setTheme(style.AppTheme_Night)
setTheme(R.style.AppTheme_Night)
}
setContentView(layout.zim_manager)
setContentView(R.layout.zim_manager)
setUpToolbar()
manageViewPager.run {
@ -105,7 +101,7 @@ class ZimManageActivity : BaseActivity() {
private fun onLanguageItemsForDialogUpdated(languages: List<Language>) {
if (languages.isEmpty()) {
toast(string.wait_for_load)
toast(R.string.wait_for_load)
} else {
LanguageSelectDialog.Builder(this, dialogStyle())
.apply {
@ -131,7 +127,7 @@ class ZimManageActivity : BaseActivity() {
setSupportActionBar(toolbar)
supportActionBar!!.setHomeButtonEnabled(true)
supportActionBar!!.setDisplayHomeAsUpEnabled(true)
supportActionBar!!.setTitle(string.zim_manager)
supportActionBar!!.setTitle(R.string.zim_manager)
toolbar.setNavigationOnClickListener { _ -> onBackPressed() }
toolbar.setOnClickListener { _ ->
if (manageViewPager.currentItem == 1)
@ -151,8 +147,8 @@ class ZimManageActivity : BaseActivity() {
override fun onCreateOptionsMenu(menu: Menu): Boolean {
// Inflate the menu; this adds items to the action bar if it is present.
menuInflater.inflate(R.menu.menu_zim_manager, menu)
searchItem = menu.findItem(id.action_search)
languageItem = menu.findItem(id.select_language)
searchItem = menu.findItem(R.id.action_search)
languageItem = menu.findItem(R.id.select_language)
val searchView = searchItem!!.actionView as SearchView
updateMenu(manageViewPager.currentItem)
searchView.setOnQueryTextListener(SimpleTextListener {
@ -163,7 +159,7 @@ class ZimManageActivity : BaseActivity() {
override fun onOptionsItemSelected(item: MenuItem): Boolean {
when (item.itemId) {
id.select_language -> {
R.id.select_language -> {
zimManageViewModel.requestLanguagesDialog.onNext(Unit)
}
}

View File

@ -12,16 +12,10 @@
android:id="@+id/appbar"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:paddingTop="@dimen/dimen_medium_padding"
android:paddingTop="@dimen/zim_manage_toolbar_top_padding"
android:theme="@style/AppTheme.AppBarOverlay"
>
<RelativeLayout
android:id="@+id/toolbar_layout"
android:layout_width="match_parent"
android:layout_height="?actionBarSize"
>
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
@ -29,10 +23,7 @@
android:background="?attr/colorPrimary"
app:layout_scrollFlags="scroll|snap|enterAlways"
app:popupTheme="@style/AppTheme.PopupOverlay"
>
</android.support.v7.widget.Toolbar>
</RelativeLayout>
/>
<android.support.design.widget.TabLayout
android:id="@+id/tabs"

View File

@ -69,6 +69,7 @@
<dimen name="language_name_localized_margin_left">10dp</dimen>
<dimen name="help_textview_padding">10dp</dimen>
<dimen name="progressbar_textview_vertical_padding">10dp</dimen>
<dimen name="zim_manage_toolbar_top_padding">15dp</dimen>
<!-- Workaround to store floats in dimen -->
<item format="float" name="material_light_hint_alpha" type="dimen">0.38</item>
<item format="float" name="material_dark_hint_pressed_alpha" type="dimen">0.70</item>