Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Update to new Version of android components #13

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Update to new Version of android components #13

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
d8f7833
FIX NavigationUI.navigateUp method
pishguy Apr 20, 2019
6e50320
Update AndroidManifest.xml
pishguy Apr 20, 2019
ef6eb79
Update build.gradle
pishguy Apr 21, 2019
dfdc48d
Update CurrentWeatherDao.kt
pishguy Apr 21, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,12 @@ android {
versionCode 1
versionName "1.0"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

javaCompileOptions {
annotationProcessorOptions {
arguments = ["room.schemaLocation": "$projectDir/schemas".toString()]
}
}
}
buildTypes {
release {
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/AndroidManifest.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,7 @@
android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher_round"
android:supportsRtl="true"
android:usesCleartextTraffic="true"
android:theme="@style/AppTheme"
tools:ignore="GoogleAppIndexingWarning">
<activity android:name=".ui.MainActivity">
Expand All @@ -25,4 +26,4 @@
</activity>
</application>

</manifest>
</manifest>
4 changes: 3 additions & 1 deletion app/src/main/java/com/resocoder/forecastmvvm/data/db/CurrentWeatherDao.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,11 @@ interface CurrentWeatherDao {
@Insert(onConflict = OnConflictStrategy.REPLACE)
fun upsert(weatherEntry: CurrentWeatherEntry)

@SuppressWarnings(RoomWarnings.CURSOR_MISMATCH)
@Query("select * from current_weather where id = $CURRENT_WEATHER_ID")
fun getWeatherMetric(): LiveData<MetricCurrentWeatherEntry>

@SuppressWarnings(RoomWarnings.CURSOR_MISMATCH)
@Query("select * from current_weather where id = $CURRENT_WEATHER_ID")
fun getWeatherImperial(): LiveData<ImperialCurrentWeatherEntry>
}
}
2 changes: 1 addition & 1 deletion app/src/main/java/com/resocoder/forecastmvvm/ui/MainActivity.kt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ class MainActivity : AppCompatActivity(), KodeinAware {
}

override fun onSupportNavigateUp(): Boolean {
return NavigationUI.navigateUp(null, navController)
return NavigationUI.navigateUp(navController,null)
}

private fun requestLocationPermission() {
Expand Down