mirror of
				https://github.com/mihonapp/mihon.git
				synced 2025-11-03 23:58:55 +01:00 
			
		
		
		
	Fixed wrong download filter from commit #33386e2
Fixed another tab not in TabLayout error. Drawable to Vector Removed Filter... Toast
This commit is contained in:
		@@ -239,7 +239,6 @@ class LibraryFragment : BaseRxFragment<LibraryPresenter>(), ActionMode.Callback
 | 
			
		||||
        adapter.notifyDataSetChanged()
 | 
			
		||||
        adapter.refreshRegisteredAdapters()
 | 
			
		||||
        activity.supportInvalidateOptionsMenu();
 | 
			
		||||
        ToastUtil.showShort(context, getString(R.string.library_filter_change))
 | 
			
		||||
    }
 | 
			
		||||
 | 
			
		||||
    /**
 | 
			
		||||
 
 | 
			
		||||
@@ -166,9 +166,12 @@ class LibraryPresenter : BasePresenter<LibraryFragment>() {
 | 
			
		||||
 | 
			
		||||
            // Does it have downloaded chapters.
 | 
			
		||||
            var hasDownloaded = false
 | 
			
		||||
            var hasUnread = false
 | 
			
		||||
 | 
			
		||||
            // Does it have unread chapters.
 | 
			
		||||
            val hasUnread = manga.unread > 0
 | 
			
		||||
            if (prefFilterUnread) {
 | 
			
		||||
                // Does it have unread chapters.
 | 
			
		||||
                hasUnread = manga.unread > 0
 | 
			
		||||
            }
 | 
			
		||||
 | 
			
		||||
            if (prefFilterDownloaded) {
 | 
			
		||||
                val mangaDir = downloadManager.getAbsoluteMangaDirectory(sourceManager.get(manga.source), manga)
 | 
			
		||||
 
 | 
			
		||||
@@ -77,6 +77,13 @@ public class MangaActivity extends BaseRxActivity<MangaPresenter> {
 | 
			
		||||
        adapter = new MangaDetailAdapter(getSupportFragmentManager(), this);
 | 
			
		||||
 | 
			
		||||
        viewPager.setAdapter(adapter);
 | 
			
		||||
 | 
			
		||||
        // Workaround to prevent: Tab belongs to a different TabLayout.
 | 
			
		||||
        // Internal bug in Support library v23.2.0.
 | 
			
		||||
        // See https://code.google.com/p/android/issues/detail?id=201827
 | 
			
		||||
        for (int j = 0; j < 17; j++)
 | 
			
		||||
            tabs.newTab();
 | 
			
		||||
 | 
			
		||||
        tabs.setupWithViewPager(viewPager);
 | 
			
		||||
 | 
			
		||||
        if (!isOnline)
 | 
			
		||||
 
 | 
			
		||||
										
											Binary file not shown.
										
									
								
							| 
		 Before Width: | Height: | Size: 111 B  | 
										
											Binary file not shown.
										
									
								
							| 
		 Before Width: | Height: | Size: 90 B  | 
										
											Binary file not shown.
										
									
								
							| 
		 Before Width: | Height: | Size: 103 B  | 
										
											Binary file not shown.
										
									
								
							| 
		 Before Width: | Height: | Size: 107 B  | 
										
											Binary file not shown.
										
									
								
							| 
		 Before Width: | Height: | Size: 106 B  | 
							
								
								
									
										9
									
								
								app/src/main/res/drawable/ic_filter_list.xml
									
									
									
									
									
										Normal file
									
								
							
							
						
						
									
										9
									
								
								app/src/main/res/drawable/ic_filter_list.xml
									
									
									
									
									
										Normal file
									
								
							@@ -0,0 +1,9 @@
 | 
			
		||||
<vector xmlns:android="http://schemas.android.com/apk/res/android"
 | 
			
		||||
        android:width="24dp"
 | 
			
		||||
        android:height="24dp"
 | 
			
		||||
        android:viewportWidth="24.0"
 | 
			
		||||
        android:viewportHeight="24.0">
 | 
			
		||||
    <path
 | 
			
		||||
        android:fillColor="#FFFFFFFF"
 | 
			
		||||
        android:pathData="M10,18h4v-2h-4v2zM3,6v2h18L21,6L3,6zM6,13h12v-2L6,11v2z"/>
 | 
			
		||||
</vector>
 | 
			
		||||
@@ -5,7 +5,7 @@
 | 
			
		||||
    <item
 | 
			
		||||
        android:id="@+id/action_filter"
 | 
			
		||||
        android:title="@string/action_filter"
 | 
			
		||||
        android:icon="@drawable/ic_filter_list_white_24dp"
 | 
			
		||||
        android:icon="@drawable/ic_filter_list"
 | 
			
		||||
        app:showAsAction="ifRoom">
 | 
			
		||||
        <menu>
 | 
			
		||||
            <item
 | 
			
		||||
 
 | 
			
		||||
@@ -162,7 +162,6 @@
 | 
			
		||||
    <!-- Library fragment -->
 | 
			
		||||
    <string name="library_search_hint">Title or author…</string>
 | 
			
		||||
    <string name="library_selection_title">Selected</string>
 | 
			
		||||
    <string name="library_filter_change">Filtering…</string>
 | 
			
		||||
 | 
			
		||||
    <!-- Catalogue fragment -->
 | 
			
		||||
    <string name="source_requires_login">This source requires you to log in</string>
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user