Skip to content

Commit e344693

Browse files
committed
update sample to support rxandroid and rxjava 2
1 parent df07f70 commit e344693

3 files changed

Lines changed: 15 additions & 13 deletions

File tree

app/src/main/java/com/github/lykmapipo/sqlbrite/migrations/sample/Brite.java

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,16 @@
11
package com.github.lykmapipo.sqlbrite.migrations.sample;
22

33
import android.database.Cursor;
4-
import rx.functions.Func1;
4+
import io.reactivex.functions.Function;
55

66
/**
77
* Created by lally on 3/18/17.
88
*/
99
public class Brite {
1010

11-
static final Func1<Cursor, Brite> MAPPER = new Func1<Cursor, Brite>() {
12-
@Override public Brite call(Cursor cursor) {
11+
static final Function<Cursor, Brite> MAPPER = new Function<Cursor, Brite>() {
12+
@Override
13+
public Brite apply(Cursor cursor) {
1314
return new Brite(
1415
cursor.getLong(cursor.getColumnIndexOrThrow("_id")),
1516
cursor.getString(cursor.getColumnIndexOrThrow("name"))

app/src/main/java/com/github/lykmapipo/sqlbrite/migrations/sample/BriteAdapter.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,15 +6,15 @@
66
import android.view.ViewGroup;
77
import android.widget.BaseAdapter;
88
import android.widget.TextView;
9-
import rx.functions.Action1;
9+
import io.reactivex.functions.Consumer;
1010

1111
import java.util.Collections;
1212
import java.util.List;
1313

1414
/**
1515
* Created by lally on 3/19/17.
1616
*/
17-
public class BriteAdapter extends BaseAdapter implements Action1<List<Brite>>{
17+
public class BriteAdapter extends BaseAdapter implements Consumer<List<Brite>> {
1818
private final LayoutInflater inflater;
1919

2020
private List<Brite> items = Collections.emptyList();
@@ -24,7 +24,7 @@ public BriteAdapter(Context context) {
2424
}
2525

2626
@Override
27-
public void call(List<Brite> items) {
27+
public void accept(List<Brite> items) {
2828
this.items = items;
2929
notifyDataSetChanged();
3030
}

app/src/main/java/com/github/lykmapipo/sqlbrite/migrations/sample/MainActivity.java

Lines changed: 8 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,16 +4,16 @@
44
import android.support.v7.app.AppCompatActivity;
55
import android.widget.ListView;
66
import com.github.lykmapipo.sqlbrite.migrations.SQLBriteOpenHelper;
7-
import com.squareup.sqlbrite.BriteDatabase;
8-
import rx.Subscription;
9-
import rx.android.schedulers.AndroidSchedulers;
10-
import rx.schedulers.Schedulers;
7+
import com.squareup.sqlbrite2.BriteDatabase;
8+
import io.reactivex.android.schedulers.AndroidSchedulers;
9+
import io.reactivex.disposables.Disposable;
10+
import io.reactivex.schedulers.Schedulers;
1111

1212
public class MainActivity extends AppCompatActivity {
1313

1414
private BriteDatabase database;
1515
private BriteAdapter adapter;
16-
private Subscription subscription;
16+
private Disposable disposable;
1717
private ListView listView;
1818

1919

@@ -32,16 +32,17 @@ protected void onResume() {
3232

3333
database = SQLBriteOpenHelper.get(getApplicationContext(), "brite", 1);
3434

35-
subscription = database.createQuery("brites", "SELECT * FROM brites")
35+
disposable = database.createQuery("brites", "SELECT * FROM brites")
3636
.mapToList(Brite.MAPPER)
3737
.subscribeOn(Schedulers.io())
3838
.observeOn(AndroidSchedulers.mainThread())
3939
.subscribe(adapter);
40+
4041
}
4142

4243
@Override
4344
protected void onPause() {
4445
super.onPause();
45-
subscription.unsubscribe();
46+
disposable.dispose();
4647
}
4748
}

0 commit comments

Comments
 (0)