Skip to content

Commit

Permalink
Update Room
Browse files Browse the repository at this point in the history
  • Loading branch information
Pygmalion69 committed Dec 30, 2020
1 parent e3598a7 commit b49f93d
Show file tree
Hide file tree
Showing 4 changed files with 10 additions and 10 deletions.
8 changes: 4 additions & 4 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ android {
minSdkVersion 19
targetSdkVersion 28
versionCode 25
versionName "1.11.2"
versionName "1.11.3"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
vectorDrawables.useSupportLibrary = true
}
Expand Down Expand Up @@ -41,8 +41,8 @@ dependencies {
implementation 'com.squareup.retrofit2:converter-gson:2.2.0'
implementation 'com.google.code.gson:gson:2.8.6'
implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
implementation 'androidx.room:room-runtime:2.2.5'
annotationProcessor 'androidx.room:room-compiler:2.2.5'
implementation 'androidx.room:room-runtime:2.2.6'
annotationProcessor 'androidx.room:room-compiler:2.2.6'
implementation 'net.danlew:android.joda:2.10.1'
implementation 'com.github.k3b:k3b-geoHelper:1.1.5'
api 'io.ticofab.androidgpxparser:parser:1.4.0'
Expand All @@ -55,7 +55,7 @@ dependencies {
exclude group: 'com.android.support', module: 'support-core-utils'
exclude group: 'com.android.support', module: 'exifinterface'
}
testImplementation 'junit:junit:4.12'
testImplementation 'junit:junit:4.13'
androidTestImplementation 'androidx.test:runner:1.3.0'
androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
}
6 changes: 3 additions & 3 deletions app/src/main/java/org/nitri/opentopo/MapFragment.java
Original file line number Diff line number Diff line change
Expand Up @@ -74,8 +74,8 @@ public class MapFragment extends Fragment implements LocationListener, PopupMenu
private RotationGestureOverlay mRotationGestureOverlay;
private LocationManager mLocationManager;
private OverlayHelper mOverlayHelper;
private Handler mMapHandler = new Handler();
private Runnable mCenterRunnable = new Runnable() {
private final Handler mMapHandler = new Handler();
private final Runnable mCenterRunnable = new Runnable() {

@Override
public void run() {
Expand All @@ -86,7 +86,7 @@ public void run() {
}
};

private MapListener mDragListener = new MapListener() {
private final MapListener mDragListener = new MapListener() {
@Override
public boolean onScroll(ScrollEvent event) {
if (mFollow && mMapHandler != null && mCenterRunnable != null) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -51,9 +51,9 @@ public class NearbyFragment extends Fragment implements NearbyAdapter.OnItemClic
private double mLatitude;
private double mLongitude;

private Gson gson = new GsonBuilder().setLenient().create();
private final Gson gson = new GsonBuilder().setLenient().create();

private List<NearbyItem> mNearbyItems = new ArrayList<>();
private final List<NearbyItem> mNearbyItems = new ArrayList<>();
private NearbyAdapter mNearbyAdapter;


Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ public abstract class NearbyDatabase extends RoomDatabase {
public static synchronized NearbyDatabase getDatabase(Context context) {
if (instance == null) {
instance =
Room.databaseBuilder(context.getApplicationContext(), NearbyDatabase.class, "reading-database")
Room.databaseBuilder(context.getApplicationContext(), NearbyDatabase.class, "nearby-database")
.build();
}
return instance;
Expand Down

0 comments on commit b49f93d

Please sign in to comment.