yetangitu/FBReaderJ
1
0
Fork 0
mirror of https://github.com/geometer/FBReaderJ.git synced 2025-10-03 17:59:33 +02:00
Code Issues Releases Wiki Activity

formatting

Browse source
This commit is contained in:
Nikolay Pultsin 2013-09-15 13:44:45 +01:00
parent 0cb1180467
commit e8695cf6f2
4 changed files with 67 additions and 73 deletions
Download patch file Download diff file Expand all files Collapse all files

35
res/layout/checkbox_section.xml
View file

@ -1,23 +1,20 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout
xmlns:tools="http://schemas.android.com/tools" xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingTop="6dp" android:paddingTop="6dp"
android:paddingBottom="6dp"> android:paddingBottom="6dp"
>
<TextView <TextView
android:id="@+id/title" android:id="@+id/title"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="10dp" android:paddingLeft="10dp"
android:singleLine="true" android:singleLine="true"
android:textAppearance="?android:attr/textAppearanceMedium" android:textAppearance="?android:attr/textAppearanceMedium"
android:ellipsize="marquee" android:ellipsize="marquee"
android:marqueeRepeatLimit="marquee_forever"/> android:marqueeRepeatLimit="marquee_forever"
/>
</LinearLayout> </LinearLayout>

21
res/layout/network_library_filter.xml
View file

@ -1,12 +1,13 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout
android:layout_width="fill_parent" xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_height="match_parent" android:layout_width="fill_parent"
android:orientation="vertical" > android:layout_height="match_parent"
android:orientation="vertical"
>
<ListView android:id="@+id/selectedList" <ListView
android:layout_width="fill_parent" android:id="@+id/selectedList"
android:layout_height="wrap_content" /> android:layout_width="fill_parent"
android:layout_height="wrap_content"
/>
</LinearLayout> </LinearLayout>

2
src/org/geometerplus/android/fbreader/network/AllCatalogsActivity.java
View file

@ -33,8 +33,6 @@ import org.geometerplus.fbreader.network.*;
import org.geometerplus.fbreader.network.tree.NetworkCatalogRootTree; import org.geometerplus.fbreader.network.tree.NetworkCatalogRootTree;
import org.geometerplus.android.fbreader.covers.CoverManager; import org.geometerplus.android.fbreader.covers.CoverManager;
public class AllCatalogsActivity extends Activity { public class AllCatalogsActivity extends Activity {
final NetworkLibrary library = NetworkLibrary.Instance(); final NetworkLibrary library = NetworkLibrary.Instance();
CheckListAdapter myAdapter; CheckListAdapter myAdapter;

2
src/org/geometerplus/fbreader/network/NetworkLibrary.java
View file

@ -475,12 +475,10 @@ public class NetworkLibrary {
if (l != null && link.compareTo(l) <= 0) { if (l != null && link.compareTo(l) <= 0) {
break; break;
} }
++index; ++index;
} }
new NetworkCatalogRootTree(myRootTree, link, index); new NetworkCatalogRootTree(myRootTree, link, index);
} }
// we do add non-catalog items // we do add non-catalog items
new SearchCatalogTree(myRootTree, mySearchItem, 0); new SearchCatalogTree(myRootTree, mySearchItem, 0);
new AddCustomCatalogItemTree(myRootTree); new AddCustomCatalogItemTree(myRootTree);