hmalik144/Weather-apps
1
0
Fork 0
mirror of https://github.com/hmalik144/Weather-apps.git synced 2025-12-10 02:05:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

- Code inspection

Browse Source 
- Redundant resources removed
 - Resources moved the corresponding flavours
 - Deprecated dependencies upgraded
 - lint changes
This commit is contained in:
hmalik144
2023-08-08 22:20:39 +01:00
parent 9189a4412d
commit 9a0189c8ec
174 changed files with 1359 additions and 1245 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
app/build.gradle
View File

@@ -30,7 +30,7 @@ android {
}
}
android {
sourceSets{
sourceSets {
test {
resources.srcDirs += ['src/test/resources']
}
@@ -96,32 +96,30 @@ android {
dependencies {
implementation fileTree(dir: 'libs', include: ['*.jar'])
implementation 'androidx.appcompat:appcompat:1.0.0'
implementation 'androidx.appcompat:appcompat:1.6.1'
implementation 'com.google.android.material:material:1.2.1'
implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
implementation 'androidx.legacy:legacy-support-v4:1.0.0'
implementation 'com.nostra13.universalimageloader:universal-image-loader:1.9.5'
implementation 'androidx.vectordrawable:vectordrawable:1.1.0'
implementation "com.google.android.gms:play-services-location:18.0.0"
implementation "com.google.android.gms:play-services-location:21.0.1"
implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
implementation 'androidx.cardview:cardview:1.0.0'
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.2'
implementation 'androidx.preference:preference:1.2.1'
testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.1'
/ * Fragment Navigation * /
implementation 'androidx.navigation:navigation-fragment-ktx:2.3.2'
implementation 'androidx.navigation:navigation-ui-ktx:2.3.2'
implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.2'
implementation 'androidx.test.espresso:espresso-idling-resource:3.4.0'
implementation 'androidx.preference:preference:1.2.1'
testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.4.2'
androidTestImplementation 'com.android.support.test:rules:1.0.2'
/ * Unit testing * /
testImplementation 'junit:junit:4.13'
androidTestImplementation 'androidx.test:rules:1.2.0'
testImplementation 'junit:junit:4.13.2'
androidTestImplementation "org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version"
testImplementation "org.jetbrains.kotlin:kotlin-test-junit:$kotlin_version"
implementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
/ * android unit testing and espresso * /
androidTestImplementation 'androidx.test:rules:1.4.1-alpha06'
androidTestImplementation "androidx.test:core:1.4.0"
androidTestImplementation 'androidx.test:rules:1.5.0'
androidTestImplementation "androidx.test:core:1.5.0"
/ * Android Espresso * /
def testJunitVersion = "1.1.5"
@@ -149,13 +147,13 @@ dependencies {
androidTestImplementation "io.mockk:mockk-android:$mockk_ver"
/ * Retrofit * /
def retrofit_ver = "2.8.1"
def retrofit_ver = "2.9.0"
implementation "com.squareup.retrofit2:retrofit:$retrofit_ver"
implementation "com.squareup.retrofit2:converter-gson:$retrofit_ver"
implementation "com.squareup.okhttp3:logging-interceptor:4.9.0"
/ * Shared prefs * /
def prefs_ver = "1.1.1"
def prefs_ver = "1.2.0"
implementation "androidx.preference:preference-ktx:$prefs_ver"
/ *Kodein Dependency Injection * /
@@ -164,10 +162,10 @@ dependencies {
implementation "org.kodein.di:kodein-di-framework-android-x:$kodein_version"
/ * Room database * /
def room_version = "2.3.0-alpha03"
implementation "androidx.room:room-runtime:$room_version"
kapt "androidx.room:room-compiler:$room_version"
implementation "androidx.room:room-ktx:$room_version"
def room_version = "2.4.3"
implementation "androidx.room:room-runtime:$room_version"
kapt "androidx.room:room-compiler:$room_version"
implementation "androidx.room:room-ktx:$room_version"
/ * Picasso * /
implementation 'com.squareup.picasso:picasso:2.71828'
@@ -182,7 +180,7 @@ dependencies {
implementation "com.tomtom.online:sdk-maps:2.4807"
/ * coroutines support for firebase operations * /
def coroutines_google_ver = "1.1.1"
def coroutines_google_ver = "1.6.4"
implementation "org.jetbrains.kotlinx:kotlinx-coroutines-play-services:$coroutines_google_ver"
/ * Picasso * /

6
app/src/androidTest/java/com/appttude/h_mal/atlas_weather/BaseTest.kt
View File

@@ -1,3 +1,5 @@
@file:Suppress("EmptyMethod")
package com.appttude.h_mal.atlas_weather
import android.Manifest
@@ -23,6 +25,7 @@ import org.junit.Rule
import tools.fastlane.screengrab.Screengrab
import tools.fastlane.screengrab.UiAutomatorScreenshotStrategy
@Suppress("EmptyMethod")
open class BaseTest<A : Activity>(
private val activity: Class<A>,
private val intentBundle: Bundle? = null,
@@ -47,7 +50,8 @@ open class BaseTest<A : Activity>(
startIntent.replaceExtras(intentBundle)
}
testApp = InstrumentationRegistry.getInstrumentation().targetContext.applicationContext as TestAppClass
testApp =
InstrumentationRegistry.getInstrumentation().targetContext.applicationContext as TestAppClass
runBlocking {
beforeLaunch()
}

4
app/src/androidTest/java/com/appttude/h_mal/atlas_weather/BaseTestRobot.kt
View File

@@ -17,9 +17,9 @@ import androidx.test.espresso.assertion.ViewAssertions.matches
import androidx.test.espresso.contrib.PickerActions
import androidx.test.espresso.contrib.RecyclerViewActions
import androidx.test.espresso.matcher.ViewMatchers.*
import com.appttude.h_mal.atlas_weather.helpers.EspressoHelper.waitForView
import com.appttude.h_mal.atlas_weather.helpers.checkErrorMessage
import com.appttude.h_mal.atlas_weather.helpers.checkImage
import com.appttude.h_mal.atlas_weather.helpers.EspressoHelper.waitForView
import org.hamcrest.CoreMatchers.allOf
import org.hamcrest.CoreMatchers.anything
import org.hamcrest.CoreMatchers.equalTo
@@ -138,7 +138,7 @@ open class BaseTestRobot {
fun getStringFromResource(@StringRes resId: Int): String =
Resources.getSystem().getString(resId)
fun pullToRefresh(resId: Int){
fun pullToRefresh(resId: Int) {
onView(allOf(withId(resId), isDisplayed())).perform(swipeDown())
}

12
app/src/androidTest/java/com/appttude/h_mal/atlas_weather/application/TestAppClass.kt
View File

@@ -25,10 +25,10 @@ class TestAppClass : BaseAppClass() {
override fun createNetworkModule(): WeatherApi {
return NetworkModule().invoke<WeatherApi>(
mockingNetworkInterceptor,
NetworkConnectionInterceptor(this),
QueryParamsInterceptor(),
loggingInterceptor
mockingNetworkInterceptor,
NetworkConnectionInterceptor(this),
QueryParamsInterceptor(),
loggingInterceptor
) as WeatherApi
}
@@ -36,8 +36,8 @@ class TestAppClass : BaseAppClass() {
override fun createRoomDatabase(): AppDatabase {
return Room.inMemoryDatabaseBuilder(this, AppDatabase::class.java)
.addTypeConverter(Converter(this))
.build()
.addTypeConverter(Converter(this))
.build()
}
fun stubUrl(url: String, rawPath: String) {

12
app/src/androidTest/java/com/appttude/h_mal/atlas_weather/application/TestRunner.kt
View File

@@ -6,14 +6,14 @@ import androidx.test.runner.AndroidJUnitRunner
class TestRunner : AndroidJUnitRunner() {
@Throws(
InstantiationException::class,
IllegalAccessException::class,
ClassNotFoundException::class
InstantiationException::class,
IllegalAccessException::class,
ClassNotFoundException::class
)
override fun newApplication(
cl: ClassLoader?,
className: String?,
context: Context?
cl: ClassLoader?,
className: String?,
context: Context?
): Application {
return super.newApplication(cl, TestAppClass::class.java.name, context)
}

6
app/src/androidTest/java/com/appttude/h_mal/atlas_weather/data/location/MockLocationProvider.kt
View File

@@ -8,7 +8,11 @@ class MockLocationProvider : LocationProvider {
override suspend fun getCurrentLatLong() = latLong
override fun getLatLongFromLocationName(location: String) = latLong
override suspend fun getLocationNameFromLatLong(lat: Double, long: Double, type: LocationType): String {
override suspend fun getLocationNameFromLatLong(
lat: Double,
long: Double,
type: LocationType
): String {
return "Mock Location"
}

12
app/src/androidTest/java/com/appttude/h_mal/atlas_weather/data/network/interceptors/MockingNetworkInterceptor.kt
View File

@@ -8,7 +8,7 @@ import okhttp3.Response
import okhttp3.ResponseBody.Companion.toResponseBody
class MockingNetworkInterceptor(
private val idlingResource: CountingIdlingResource
private val idlingResource: CountingIdlingResource
) : Interceptor {
private var feedMap: MutableMap<String, String> = mutableMapOf()
@@ -27,11 +27,11 @@ class MockingNetworkInterceptor(
val body = jsonPath.toResponseBody("application/json".toMediaType())
val chainResponseBuilder = Response.Builder()
.code(200)
.protocol(Protocol.HTTP_1_1)
.request(original)
.message("OK")
.body(body)
.code(200)
.protocol(Protocol.HTTP_1_1)
.request(original)
.message("OK")
.body(body)
idlingResource.decrement()
return chainResponseBuilder.build()
}

2
app/src/androidTest/java/com/appttude/h_mal/atlas_weather/helpers/BaseMatcher.kt
View File

@@ -4,7 +4,7 @@ import android.view.View
import org.hamcrest.BaseMatcher
import org.hamcrest.Description
class BaseMatcher: BaseMatcher<View>() {
class BaseMatcher : BaseMatcher<View>() {
override fun describeTo(description: Description?) {
TODO("Not yet implemented")
}

9
app/src/androidTest/java/com/appttude/h_mal/atlas_weather/helpers/BaseViewAction.kt
View File

@@ -6,7 +6,8 @@ import androidx.test.espresso.ViewAction
import androidx.test.espresso.matcher.ViewMatchers.isAssignableFrom
import org.hamcrest.Matcher
open class BaseViewAction: ViewAction {
@Suppress("EmptyMethod")
open class BaseViewAction : ViewAction {
override fun getDescription(): String? = setDescription()
override fun getConstraints(): Matcher<View> = setConstraints()
@@ -15,13 +16,11 @@ open class BaseViewAction: ViewAction {
setPerform(uiController, view)
}
open fun setDescription(): String? {
return null
}
open fun setDescription(): String? = ""
open fun setConstraints(): Matcher<View> {
return isAssignableFrom(View::class.java)
}
open fun setPerform(uiController: UiController?, view: View?) { }
open fun setPerform(uiController: UiController?, view: View?) {}
}

2
app/src/androidTest/java/com/appttude/h_mal/atlas_weather/helpers/EspressoHelper.kt
View File

@@ -36,7 +36,7 @@ object EspressoHelper {
var tries = 0
val childViews: Iterable<View> = TreeIterables.breadthFirstViewTraversal(view)
// Look for the match in the tree of childviews
// Look for the match in the tree of child views
childViews.forEach {
tries++
if (viewMatcher.matches(it)) {

5
app/src/androidTest/java/com/appttude/h_mal/atlas_weather/helpers/SnapshotRule.kt
View File

@@ -14,6 +14,9 @@ class SnapshotRule : TestWatcher() {
}
fun getScreenshotName(description: Description): String {
return description.className.replace(".", "-") + "_" + description.methodName.replace(".", "-")
return description.className.replace(".", "-") + "_" + description.methodName.replace(
".",
"-"
)
}
}

2
app/src/androidTest/java/com/appttude/h_mal/atlas_weather/utils/DateUtilsKtTest.kt
View File

@@ -3,7 +3,7 @@ package com.appttude.h_mal.atlas_weather.utils
import org.junit.Assert.assertEquals
import org.junit.Test
class DateUtilsKtTest{
class DateUtilsKtTest {
@Test
fun toDayString_testStandardData_outputCorrect() {

2
app/src/androidTest/java/com/appttude/h_mal/atlas_weather/utils/Stubs.kt
View File

@@ -1,7 +1,7 @@
package com.appttude.h_mal.atlas_weather.utils
enum class Stubs(
val id: String
val id: String
) {
Valid("valid_response"),
Invalid("invalid_response")

4
app/src/androidTestAtlasWeather/java/com/appttude/h_mal/atlas_weather/robot/HomeScreenRobot.kt
View File

@@ -5,7 +5,9 @@ import com.appttude.h_mal.atlas_weather.R
fun homeScreen(func: HomeScreenRobot.() -> Unit) = HomeScreenRobot().apply { func() }
class HomeScreenRobot : BaseTestRobot() {
fun verifyCurrentTemperature(temperature: Int) = matchText(R.id.temp_main_4, temperature.toString())
fun verifyCurrentTemperature(temperature: Int) =
matchText(R.id.temp_main_4, temperature.toString())
fun verifyCurrentLocation(location: String) = matchText(R.id.location_main_4, location)
fun refresh() = pullToRefresh(R.id.swipe_refresh)
}

2
app/src/androidTestMonoWeather/java/com/appttude/h_mal/monoWeather/MonoBaseTest.kt
View File

@@ -8,7 +8,7 @@ import androidx.test.espresso.matcher.ViewMatchers
import com.appttude.h_mal.atlas_weather.BaseTest
import com.appttude.h_mal.atlas_weather.ui.MainActivity
open class MonoBaseTest: BaseTest<MainActivity>(MainActivity::class.java) {
open class MonoBaseTest : BaseTest<MainActivity>(MainActivity::class.java) {
override fun afterLaunch() {
// Dismiss dialog on start up

6
app/src/androidTestMonoWeather/java/com/appttude/h_mal/monoWeather/robot/HomeScreenRobot.kt
View File

@@ -1,11 +1,13 @@
package com.appttude.h_mal.monoWeather.robot
import com.appttude.h_mal.atlas_weather.R
import com.appttude.h_mal.atlas_weather.BaseTestRobot
import com.appttude.h_mal.atlas_weather.R
fun homeScreen(func: HomeScreenRobot.() -> Unit) = HomeScreenRobot().apply { func() }
class HomeScreenRobot : BaseTestRobot() {
fun verifyCurrentTemperature(temperature: Int) = matchText(R.id.temp_main_4, temperature.toString())
fun verifyCurrentTemperature(temperature: Int) =
matchText(R.id.temp_main_4, temperature.toString())
fun verifyCurrentLocation(location: String) = matchText(R.id.location_main_4, location)
fun refresh() = pullToRefresh(R.id.swipe_refresh)
}

2
app/src/androidTestMonoWeather/java/com/appttude/h_mal/monoWeather/robot/WidgetPermissionScreenRobot.kt
View File

@@ -1,7 +1,7 @@
package com.appttude.h_mal.monoWeather.robot
import com.appttude.h_mal.atlas_weather.R
import com.appttude.h_mal.atlas_weather.BaseTestRobot
import com.appttude.h_mal.atlas_weather.R
fun widgetPermissionScreen(func: WidgetPermissionScreenRobot.() -> Unit) =
WidgetPermissionScreenRobot().apply { func() }

6
app/src/androidTestMonoWeather/java/com/appttude/h_mal/monoWeather/tests/HomePageUITest.kt
View File

@@ -1,10 +1,11 @@
package com.appttude.h_mal.monoWeather.tests
import com.appttude.h_mal.monoWeather.robot.homeScreen
import com.appttude.h_mal.atlas_weather.utils.Stubs
00import com.appttude.h_mal.atlas_weather.utils.Stubs
import com.appttude.h_mal.monoWeather.MonoBaseTest
import com.appttude.h_mal.monoWeather.robot.homeScreen
import org.junit.Test
import java.io.IOException
class HomePageUITest : MonoBaseTest() {
@@ -18,5 +19,6 @@ class HomePageUITest : MonoBaseTest() {
verifyCurrentTemperature(2)
verifyCurrentLocation("Mock Location")
}
throw IOException("sdfsdfasdfasdfasdf")
}
}

2
app/src/androidTestMonoWeather/java/com/appttude/h_mal/monoWeather/tests/WidgetLocationPermissionActivityTest.kt
View File

@@ -1,9 +1,7 @@
package com.appttude.h_mal.monoWeather.tests
import android.appwidget.AppWidgetManager
import android.content.Intent
import android.os.Bundle
import androidx.test.rule.ActivityTestRule
import com.appttude.h_mal.atlas_weather.BaseTest
import com.appttude.h_mal.monoWeather.robot.widgetPermissionScreen
import com.appttude.h_mal.monoWeather.ui.widget.WidgetLocationPermissionActivity

15
app/src/atlasWeather/AndroidManifest.xml
View File

@@ -12,11 +12,12 @@
android:theme="@style/AppTheme"
tools:node="merge">
<activity android:name=".ui.MainActivity"
<activity
android:name=".ui.MainActivity"
android:exported="true"
android:label="@string/app_name"
android:launchMode="singleTop"
android:theme="@style/AppTheme.NoActionBar"
android:exported="true">
android:theme="@style/AppTheme.NoActionBar">
<intent-filter>
<action android:name="android.intent.action.MAIN" />
<action android:name="android.intent.action.VIEW" />
@@ -24,12 +25,14 @@
<category android:name="android.intent.category.LAUNCHER" />
</intent-filter>
</activity>
<receiver
android:name=".notification.NotificationReceiver"
android:parentActivityName=".MainActivity"
android:exported="true"/>
android:exported="true"
android:parentActivityName=".MainActivity" />
<receiver android:name=".widget.NewAppWidget"
<receiver
android:name=".widget.NewAppWidget"
android:exported="true">
<intent-filter>
<action android:name="android.appwidget.action.APPWIDGET_UPDATE" />

4
app/src/atlasWeather/java/com/appttude/h_mal/atlas_weather/notification/NotificationData.kt
View File

@@ -3,6 +3,6 @@ package com.appttude.h_mal.atlas_weather.notification
import android.graphics.Bitmap
data class NotificationData(
val temp: String,
val icon: Bitmap
val temp: String,
val icon: Bitmap
)

27
app/src/atlasWeather/java/com/appttude/h_mal/atlas_weather/notification/NotificationReceiver.kt
View File

@@ -34,7 +34,11 @@ class NotificationReceiver : BroadcastReceiver() {
override fun onReceive(context: Context, intent: Intent) {
kodein.baseKodein = (context.applicationContext as KodeinAware).kodein
if (ActivityCompat.checkSelfPermission(context, Manifest.permission.ACCESS_COARSE_LOCATION) != PackageManager.PERMISSION_GRANTED) {
if (ActivityCompat.checkSelfPermission(
context,
Manifest.permission.ACCESS_COARSE_LOCATION
) != PackageManager.PERMISSION_GRANTED
) {
context.displayToast("Please enable location permissions")
return
}
@@ -52,22 +56,17 @@ class NotificationReceiver : BroadcastReceiver() {
val pendingIntent = stackBuilder.getPendingIntent(0, PendingIntent.FLAG_UPDATE_CURRENT)
val builder = if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
Notification.Builder(context, NOTIFICATION_CHANNEL_ID)
} else {
Notification.Builder(context)
}
val builder = Notification.Builder(context, NOTIFICATION_CHANNEL_ID)
val notification = builder.setContentTitle("Weather App")
.setContentText(weather.current?.main + "°C")
.setSmallIcon(R.mipmap.ic_notif) //change icon
.setContentText(weather.current?.main + "°C")
.setSmallIcon(R.mipmap.ic_notif) //change icon
// .setLargeIcon(Icon.createWithResource(context, getImageResource(forecastItem.getCurrentForecast().getIconURL(), context)))
.setAutoCancel(true)
.setContentIntent(pendingIntent).build()
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
builder.setChannelId(NOTIFICATION_CHANNEL_ID)
}
val notificationManager = context!!.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
.setAutoCancel(true)
.setContentIntent(pendingIntent).build()
builder.setChannelId(NOTIFICATION_CHANNEL_ID)
val notificationManager =
context!!.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
notificationManager.notify(0, notification)
}
}

2
app/src/atlasWeather/java/com/appttude/h_mal/atlas_weather/ui/BaseActivity.kt
View File

@@ -2,7 +2,7 @@ package com.appttude.h_mal.atlas_weather.ui
import androidx.appcompat.app.AppCompatActivity
abstract class BaseActivity : AppCompatActivity(){
abstract class BaseActivity : AppCompatActivity() {
}

8
app/src/atlasWeather/java/com/appttude/h_mal/atlas_weather/ui/WorldItemFragment.kt
View File

@@ -21,8 +21,10 @@ class WorldItemFragment : Fragment() {
param1 = WorldItemFragmentArgs.fromBundle(requireArguments()).weatherDisplay
}
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?,
savedInstanceState: Bundle?): View? {
override fun onCreateView(
inflater: LayoutInflater, container: ViewGroup?,
savedInstanceState: Bundle?
): View? {
// Inflate the layout for this fragment
return inflater.inflate(R.layout.fragment_home, container, false)
}
@@ -32,7 +34,7 @@ class WorldItemFragment : Fragment() {
val recyclerAdapter = WeatherRecyclerAdapter {
val directions =
WorldItemFragmentDirections.actionWorldItemFragmentToFurtherDetailsFragment(it)
WorldItemFragmentDirections.actionWorldItemFragmentToFurtherDetailsFragment(it)
navigateTo(directions)
}

7
app/src/atlasWeather/java/com/appttude/h_mal/atlas_weather/ui/details/FurtherInfoFragment.kt
View File

@@ -11,6 +11,7 @@ import kotlinx.android.synthetic.main.activity_further_info.*
private const val WEATHER = "param1"
/**
* A simple [Fragment] subclass.
* Use the [FurtherInfoFragment.newInstance] factory method to
@@ -24,7 +25,11 @@ class FurtherInfoFragment : Fragment() {
}
override fun onCreateView(inflater: LayoutInflater, container: ViewGroup?, savedInstanceState: Bundle?): View? {
override fun onCreateView(
inflater: LayoutInflater,
container: ViewGroup?,
savedInstanceState: Bundle?
): View? {
return inflater.inflate(R.layout.activity_further_info, container, false)
}

2
app/src/atlasWeather/java/com/appttude/h_mal/atlas_weather/ui/dialog/DeclarationBuilder.kt
View File

@@ -8,7 +8,7 @@ import androidx.annotation.RequiresApi
import androidx.annotation.StringRes
import androidx.core.content.ContextCompat
interface DeclarationBuilder{
interface DeclarationBuilder {
val link: String
val message: String

21
app/src/atlasWeather/java/com/appttude/h_mal/atlas_weather/ui/dialog/PermissionsDeclarationDialog.kt
View File

@@ -10,10 +10,11 @@ import androidx.appcompat.app.AlertDialog
class PermissionsDeclarationDialog(context: Context) : BaseDeclarationDialog(context) {
override val link: String = "https://sites.google.com/view/hmaldev/home/monochrome"
override val message: String = "Hi, thank you for downloading my app. Google play isn't letting me upload my app to the Playstore until I have a privacy declaration :(. My app is basically used to demonstrate my code=ing to potential employers and others. I do NOT store or process any information. The location permission in the app is there just to provide the end user with weather data."
override val message: String =
"Hi, thank you for downloading my app. Google play isn't letting me upload my app to the Playstore until I have a privacy declaration :(. My app is basically used to demonstrate my code=ing to potential employers and others. I do NOT store or process any information. The location permission in the app is there just to provide the end user with weather data."
}
abstract class BaseDeclarationDialog(val context: Context): DeclarationBuilder {
abstract class BaseDeclarationDialog(val context: Context) : DeclarationBuilder {
abstract override val link: String
abstract override val message: String
@@ -23,14 +24,14 @@ abstract class BaseDeclarationDialog(val context: Context): DeclarationBuilder {
val myMessage = buildMessage()
val builder = AlertDialog.Builder(context)
.setPositiveButton("agree") { _, _ ->
agreeCallback()
}
.setNegativeButton("disagree") { _, _ ->
disagreeCallback()
}
.setMessage(myMessage)
.setCancelable(false)
.setPositiveButton("agree") { _, _ ->
agreeCallback()
}
.setNegativeButton("disagree") { _, _ ->
disagreeCallback()
}
.setMessage(myMessage)
.setCancelable(false)
dialog = builder.create()
dialog.show()

2
app/src/atlasWeather/java/com/appttude/h_mal/atlas_weather/ui/home/adapter/EmptyViewHolder.kt
View File

@@ -3,4 +3,4 @@ package com.appttude.h_mal.atlas_weather.ui.home.adapter
import android.view.View
import androidx.recyclerview.widget.RecyclerView
class EmptyViewHolder(itemView: View): RecyclerView.ViewHolder(itemView)
class EmptyViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView)

2
app/src/atlasWeather/java/com/appttude/h_mal/atlas_weather/ui/home/adapter/ViewHolderCurrent.kt
View File

@@ -16,7 +16,7 @@ class ViewHolderCurrent(listItemView: View) : RecyclerView.ViewHolder(listItemVi
var avgTempTV: TextView = listItemView.findViewById(R.id.temp_main_4)
var tempUnit: TextView = listItemView.findViewById(R.id.temp_unit_4)
fun bindData(weather: WeatherDisplay?){
fun bindData(weather: WeatherDisplay?) {
locationTV.text = weather?.displayName
conditionTV.text = weather?.description
weatherIV.loadImage(weather?.iconURL)

2
app/src/atlasWeather/java/com/appttude/h_mal/atlas_weather/ui/home/adapter/ViewHolderFurtherDetails.kt
View File

@@ -14,7 +14,7 @@ internal class ViewHolderFurtherDetails(itemView: View) : RecyclerView.ViewHolde
var humidity: TextView = itemView.findViewById(R.id.humidity_)
var clouds: TextView = itemView.findViewById(R.id.clouds_)
fun bindData(weather: WeatherDisplay?){
fun bindData(weather: WeatherDisplay?) {
windSpeed.text = weather?.windSpeed
windDirection.text = weather?.windDirection
precipitation.text = weather?.precipitation

24
app/src/atlasWeather/java/com/appttude/h_mal/atlas_weather/ui/home/adapter/WeatherRecyclerAdapter.kt
View File

@@ -10,30 +10,33 @@ import com.appttude.h_mal.atlas_weather.model.forecast.WeatherDisplay
import com.appttude.h_mal.atlas_weather.utils.generateView
class WeatherRecyclerAdapter(
val itemClick: (Forecast) -> Unit
val itemClick: (Forecast) -> Unit
) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
var weather: WeatherDisplay? = null
@SuppressLint("NotifyDataSetChanged")
fun addCurrent(current: WeatherDisplay){
fun addCurrent(current: WeatherDisplay) {
weather = current
notifyDataSetChanged()
}
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
return when (getDataType(viewType)){
return when (getDataType(viewType)) {
is ViewType.Empty -> {
val emptyViewHolder = View(parent.context)
EmptyViewHolder(emptyViewHolder)
}
is ViewType.Current -> {
val viewCurrent = parent.generateView(R.layout.list_item_current)
ViewHolderCurrent(viewCurrent)
}
is ViewType.Forecast -> {
val viewForecast = parent.generateView(R.layout.list_item_forecast)
ViewHolderForecast(viewForecast)
}
is ViewType.Further -> {
val viewFurther = parent.generateView(R.layout.list_item_further)
ViewHolderFurtherDetails(viewFurther)
@@ -41,7 +44,7 @@ class WeatherRecyclerAdapter(
}
}
sealed class ViewType{
sealed class ViewType {
object Empty : ViewType()
object Current : ViewType()
object Forecast : ViewType()
@@ -49,7 +52,7 @@ class WeatherRecyclerAdapter(
}
private fun getDataType(type: Int): ViewType {
return when (type){
return when (type) {
0 -> ViewType.Empty
1 -> ViewType.Current
2 -> ViewType.Forecast
@@ -61,23 +64,25 @@ class WeatherRecyclerAdapter(
override fun getItemViewType(position: Int): Int {
if (weather == null) return 0
return when(position){
return when (position) {
0 -> 1
in 1 until itemCount -2 -> 2
in 1 until itemCount - 2 -> 2
itemCount - 1 -> 3
else -> 0
}
}
override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
when (getDataType(getItemViewType(position))){
when (getDataType(getItemViewType(position))) {
is ViewType.Empty -> {
holder as EmptyViewHolder
}
is ViewType.Current -> {
val viewHolderCurrent = holder as ViewHolderCurrent
viewHolderCurrent.bindData(weather)
}
is ViewType.Forecast -> {
val viewHolderForecast = holder as ViewHolderForecast
@@ -88,6 +93,7 @@ class WeatherRecyclerAdapter(
}
}
}
is ViewType.Further -> {
val viewHolderCurrent = holder as ViewHolderFurtherDetails
viewHolderCurrent.bindData(weather)
@@ -98,7 +104,7 @@ class WeatherRecyclerAdapter(
override fun getItemCount(): Int {
if (weather == null) return 0
return 2 + (weather?.forecast?.size?: 0)
return 2 + (weather?.forecast?.size ?: 0)
}
}

22
app/src/atlasWeather/java/com/appttude/h_mal/atlas_weather/ui/settings/SettingsFragment.kt
View File

@@ -34,11 +34,16 @@ class SettingsFragment : PreferenceFragmentCompat() {
setupNotificationBroadcaster(requireContext())
}
if (key == "widget_black_background"){
if (key == "widget_black_background") {
val intent = Intent(AppWidgetManager.ACTION_APPWIDGET_UPDATE)
val widgetManager = AppWidgetManager.getInstance(requireContext())
val ids =
widgetManager.getAppWidgetIds(ComponentName(requireContext(), NewAppWidget::class.java))
widgetManager.getAppWidgetIds(
ComponentName(
requireContext(),
NewAppWidget::class.java
)
)
AppWidgetManager.getInstance(requireContext())
.notifyAppWidgetViewDataChanged(ids, R.id.whole_widget_view)
intent.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, ids)
@@ -50,12 +55,19 @@ class SettingsFragment : PreferenceFragmentCompat() {
fun setupNotificationBroadcaster(context: Context) {
val alarmManager = context.getSystemService(Context.ALARM_SERVICE) as AlarmManager
val notificationIntent = Intent(context, NotificationReceiver::class.java)
val broadcast = PendingIntent.getBroadcast(context, 100, notificationIntent,
PendingIntent.FLAG_UPDATE_CURRENT)
val broadcast = PendingIntent.getBroadcast(
context, 100, notificationIntent,
PendingIntent.FLAG_UPDATE_CURRENT
)
val cal: Calendar = Calendar.getInstance()
cal.set(Calendar.HOUR_OF_DAY, 6)
cal.set(Calendar.MINUTE, 8)
cal.set(Calendar.SECOND, 5)
alarmManager.setRepeating(AlarmManager.RTC_WAKEUP, cal.timeInMillis, AlarmManager.INTERVAL_DAY, broadcast)
alarmManager.setRepeating(
AlarmManager.RTC_WAKEUP,
cal.timeInMillis,
AlarmManager.INTERVAL_DAY,
broadcast
)
}
}

4
app/src/atlasWeather/java/com/appttude/h_mal/atlas_weather/ui/world/AddLocationFragment.kt
View File

@@ -27,7 +27,7 @@ class AddLocationFragment : BaseFragment(R.layout.activity_add_forecast) {
submit.setOnClickListener {
val locationName = location_name_tv.text?.trim()?.toString()
if (locationName.isNullOrBlank()){
if (locationName.isNullOrBlank()) {
submit.error = "Location cannot be blank"
return@setOnClickListener
}
@@ -38,7 +38,7 @@ class AddLocationFragment : BaseFragment(R.layout.activity_add_forecast) {
viewModel.operationError.observe(viewLifecycleOwner, errorObserver())
viewModel.operationComplete.observe(viewLifecycleOwner) {
it?.getContentIfNotHandled()?.let {message ->
it?.getContentIfNotHandled()?.let { message ->
displayToast(message)
}
goBack()

17
app/src/atlasWeather/java/com/appttude/h_mal/atlas_weather/ui/world/WorldFragment.kt
View File

@@ -1,22 +1,17 @@
package com.appttude.h_mal.atlas_weather.ui.world
import android.os.Bundle
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
import androidx.fragment.app.Fragment
import androidx.fragment.app.viewModels
import androidx.lifecycle.observe
import androidx.recyclerview.widget.LinearLayoutManager
import com.appttude.h_mal.atlas_weather.R
import com.appttude.h_mal.atlas_weather.utils.navigateTo
import com.appttude.h_mal.atlas_weather.viewmodel.ApplicationViewModelFactory
import com.appttude.h_mal.atlas_weather.viewmodel.WorldViewModel
import com.appttude.h_mal.monoWeather.ui.BaseFragment
import kotlinx.android.synthetic.main.fragment_add_location.*
import org.kodein.di.KodeinAware
import org.kodein.di.android.x.kodein
import org.kodein.di.generic.instance
import kotlinx.android.synthetic.atlasWeather.fragment_add_location.floatingActionButton
import kotlinx.android.synthetic.atlasWeather.fragment_add_location.progressBar2
import kotlinx.android.synthetic.atlasWeather.fragment_add_location.world_recycler
/**
@@ -29,9 +24,9 @@ class WorldFragment : BaseFragment(R.layout.fragment_add_location) {
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
val recyclerAdapter = WorldRecyclerAdapter{
val recyclerAdapter = WorldRecyclerAdapter {
val direction =
WorldFragmentDirections.actionWorldFragmentToWorldItemFragment(it)
WorldFragmentDirections.actionWorldFragmentToWorldItemFragment(it)
navigateTo(direction)
}
@@ -44,7 +39,7 @@ class WorldFragment : BaseFragment(R.layout.fragment_add_location) {
recyclerAdapter.addCurrent(it)
}
floatingActionButton.setOnClickListener{
floatingActionButton.setOnClickListener {
navigateTo(R.id.action_worldFragment_to_addLocationFragment)
}

21
app/src/atlasWeather/java/com/appttude/h_mal/atlas_weather/ui/world/WorldRecyclerAdapter.kt
View File

@@ -11,22 +11,23 @@ import com.appttude.h_mal.atlas_weather.utils.generateView
import com.appttude.h_mal.atlas_weather.utils.loadImage
class WorldRecyclerAdapter(
val itemClick: (WeatherDisplay) -> Unit
val itemClick: (WeatherDisplay) -> Unit
) : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
var weather: MutableList<WeatherDisplay> = mutableListOf()
fun addCurrent(current: List<WeatherDisplay>){
fun addCurrent(current: List<WeatherDisplay>) {
weather.clear()
weather.addAll(current)
notifyDataSetChanged()
}
override fun onCreateViewHolder(parent: ViewGroup, viewType: Int): RecyclerView.ViewHolder {
return when (getDataType(viewType)){
return when (getDataType(viewType)) {
is ViewType.Empty -> {
val emptyViewHolder = View(parent.context)
EmptyViewHolder(emptyViewHolder)
}
is ViewType.Current -> {
val viewCurrent = parent.generateView(R.layout.db_list_item)
WorldHolderCurrent(viewCurrent)
@@ -34,13 +35,13 @@ class WorldRecyclerAdapter(
}
}
sealed class ViewType{
sealed class ViewType {
object Empty : ViewType()
object Current : ViewType()
}
private fun getDataType(type: Int): ViewType{
return when (type){
private fun getDataType(type: Int): ViewType {
return when (type) {
0 -> ViewType.Empty
1 -> ViewType.Current
else -> ViewType.Empty
@@ -52,11 +53,12 @@ class WorldRecyclerAdapter(
}
override fun onBindViewHolder(holder: RecyclerView.ViewHolder, position: Int) {
when (getDataType(getItemViewType(position))){
when (getDataType(getItemViewType(position))) {
is ViewType.Empty -> {
holder as EmptyViewHolder
}
is ViewType.Current -> {
val viewHolderCurrent = holder as WorldHolderCurrent
viewHolderCurrent.bindData(weather[position])
@@ -79,7 +81,7 @@ class WorldRecyclerAdapter(
var avgTempTV: TextView = listItemView.findViewById(R.id.db_main_temp)
// var tempUnit: TextView = listItemView.findViewById(R.id.db_minor_temp)
fun bindData(weather: WeatherDisplay?){
fun bindData(weather: WeatherDisplay?) {
locationTV.text = weather?.location
conditionTV.text = weather?.description
weatherIV.loadImage(weather?.iconURL)
@@ -90,7 +92,6 @@ class WorldRecyclerAdapter(
}
internal class EmptyViewHolder(itemView: View): RecyclerView.ViewHolder(itemView)
internal class EmptyViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView)
}

12
app/src/atlasWeather/res/drawable/gradient.xml
View File

@@ -1,10 +1,10 @@
<?xml version="1.0" encoding="utf-8"?>
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<gradient
android:startColor="@color/colour_two"
android:centerColor="@color/colour_three"
android:endColor="@color/colour_four"
android:type="linear"
android:angle="45"/>
<gradient
android:angle="45"
android:centerColor="@color/colour_three"
android:endColor="@color/colour_four"
android:startColor="@color/colour_two"
android:type="linear" />
</shape>

16
app/src/atlasWeather/res/drawable/ic_launcher_foreground.xml Normal file
View File

@@ -0,0 +1,16 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="108dp"
android:height="108dp"
android:tint="#FFFFFF"
android:viewportWidth="108"
android:viewportHeight="108">
<group
android:scaleX="2.61"
android:scaleY="2.61"
android:translateX="22.68"
android:translateY="22.68">
<path
android:fillColor="@android:color/white"
android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM11,19.93c-3.95,-0.49 -7,-3.85 -7,-7.93 0,-0.62 0.08,-1.21 0.21,-1.79L9,15v1c0,1.1 0.9,2 2,2v1.93zM17.9,17.39c-0.26,-0.81 -1,-1.39 -1.9,-1.39h-1v-3c0,-0.55 -0.45,-1 -1,-1L8,12v-2h2c0.55,0 1,-0.45 1,-1L11,7h2c1.1,0 2,-0.9 2,-2v-0.41c2.93,1.19 5,4.06 5,7.41 0,2.08 -0.8,3.97 -2.1,5.39z" />
</group>
</vector>

55
app/src/atlasWeather/res/layout/activity_add_forecast.xml Normal file
View File

@@ -0,0 +1,55 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:layout_margin="24dp"
android:orientation="vertical">
<EditText
android:id="@+id/location_name_tv"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="2"
android:ems="10"
android:hint="@string/location_name"
android:inputType="textPersonName"
android:maxLines="2"
tools:text="Greater London" />
<Button
android:id="@+id/submit"
style="?android:attr/borderlessButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="end"
android:text="@string/submit"
android:textColor="#ffffff"
android:textStyle="bold" />
</LinearLayout>
<FrameLayout
android:id="@+id/progressBar"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@android:color/black"
android:visibility="gone">
<ProgressBar
style="?android:attr/progressBarStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center" />
</FrameLayout>
</RelativeLayout>

110
app/src/atlasWeather/res/layout/activity_further_info.xml
View File

@@ -3,11 +3,13 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -20,13 +22,15 @@
android:layout_weight="2">
<ImageView
android:src="@drawable/somethingnew"
style="@style/icon_style__further_deatils" />
style="@style/icon_style__further_details"
android:src="@drawable/somethingnew" />
</FrameLayout>
<RelativeLayout
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="2">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -55,6 +59,7 @@
android:layout_weight="3"
tools:text="11" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
@@ -72,6 +77,7 @@
android:layout_weight="3"
tools:text="11" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
@@ -96,6 +102,7 @@
</RelativeLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
@@ -107,13 +114,14 @@
android:layout_weight="2">
<ImageView
android:src="@drawable/breeze"
style="@style/icon_style__further_deatils" />
style="@style/icon_style__further_details"
android:src="@drawable/breeze" />
</FrameLayout>
<RelativeLayout
android:layout_weight="2"
android:layout_width="0dp"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:layout_weight="2">
<LinearLayout
android:layout_width="match_parent"
@@ -137,12 +145,12 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="3"
android:text="7mph"
/>
android:text="7mph" />
</LinearLayout>
</LinearLayout>
</RelativeLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
@@ -154,13 +162,15 @@
android:layout_weight="2">
<ImageView
android:src="@drawable/water_drop"
style="@style/icon_style__further_deatils" />
style="@style/icon_style__further_details"
android:src="@drawable/water_drop" />
</FrameLayout>
<RelativeLayout
android:layout_weight="2"
android:layout_width="0dp"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:layout_weight="2">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -187,27 +197,26 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="3"
android:text="85%"
/>
android:text="85%" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:text="Precip: " />
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:id="@+id/preciptext"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="3"
android:text="11mm"
/>
</LinearLayout>
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:text="Precip: " />
<TextView
android:id="@+id/preciptext"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="3"
android:text="11mm" />
</LinearLayout>
</LinearLayout>
@@ -215,6 +224,7 @@
</RelativeLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
@@ -226,13 +236,15 @@
android:layout_weight="2">
<ImageView
android:src="@drawable/sunrise"
style="@style/icon_style__further_deatils" />
style="@style/icon_style__further_details"
android:src="@drawable/sunrise" />
</FrameLayout>
<RelativeLayout
android:layout_weight="2"
android:layout_width="0dp"
android:layout_height="match_parent">
android:layout_height="match_parent"
android:layout_weight="2">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
@@ -245,22 +257,21 @@
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
android:layout_width="match_parent"
android:layout_height="wrap_content">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:text="UV: " />
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:text="UV: " />
<TextView
android:id="@+id/uvtext"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="3"
android:text="7"
/>
android:id="@+id/uvtext"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="3"
android:text="7" />
</LinearLayout>
<LinearLayout
@@ -278,9 +289,9 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="3"
android:text="05:30am"
/>
android:text="05:30am" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
@@ -296,8 +307,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="3"
android:text="06:12pm"
/>
android:text="06:12pm" />
</LinearLayout>
</LinearLayout>
</LinearLayout>

11
app/src/atlasWeather/res/layout/activity_main.xml
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/main_content"
@@ -17,19 +16,19 @@
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:popupTheme="@style/AppTheme.PopupOverlay"
tools:title="Atlas Weather"/>
tools:title="Atlas Weather" />
<com.google.android.material.bottomnavigation.BottomNavigationView
android:id="@+id/nav_view"
android:layout_width="0dp"
android:layout_height="60dp"
app:backgroundTint="@android:color/transparent"
app:elevation="0dp"
app:itemIconTint="@android:color/background_light"
app:itemTextColor="@android:color/background_light"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:backgroundTint="@android:color/transparent"
app:elevation="0dp"
app:menu="@menu/tabs_menu" />
<fragment
@@ -42,7 +41,7 @@
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@id/toolbar"
tools:layout="@layout/fragment_home"/>
tools:layout="@layout/fragment_home" />
<ProgressBar
android:id="@+id/progress_circular"

29
app/src/main/res/layout/fragment_add_location.xml → app/src/atlasWeather/res/layout/fragment_add_location.xml
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.constraintlayout.widget.ConstraintLayout
xmlns:android="http://schemas.android.com/apk/res/android"
<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
@@ -8,39 +7,39 @@
tools:context="com.appttude.h_mal.atlas_weather.ui.world.AddLocationFragment">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/world_recycler"
android:layout_width="match_parent"
android:layout_height="match_parent"
app:layout_constraintTop_toTopOf="parent"
android:divider="@null"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
android:id="@+id/world_recycler"
android:divider="@null">
</androidx.recyclerview.widget.RecyclerView>
app:layout_constraintTop_toTopOf="parent" />
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/floatingActionButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toRightOf="parent"
android:layout_marginBottom="36dp"
android:layout_marginEnd="24dp"
android:layout_marginBottom="36dp"
android:clickable="true"
app:srcCompat="@android:drawable/ic_input_add"
android:contentDescription="@string/image_string"
android:focusable="true"
android:tint="@android:color/white"
app:elevation="0dp"
android:focusable="true" />
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:srcCompat="@android:drawable/ic_input_add" />
<ProgressBar
android:id="@+id/progressBar2"
style="?android:attr/progressBarStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintTop_toTopOf="parent"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
android:visibility="gone"
tools:visibility="visible"/>
app:layout_constraintTop_toTopOf="parent"
tools:visibility="visible" />
</androidx.constraintlayout.widget.ConstraintLayout>

9
app/src/atlasWeather/res/layout/list_item_current.xml
View File

@@ -20,8 +20,8 @@
android:layout_height="match_parent"
android:layout_gravity="center"
android:layout_marginRight="6dp"
android:tint="@color/colorAccent"
android:src="@drawable/location_flag" />
android:src="@drawable/location_flag"
android:tint="@color/colorAccent" />
<TextView
android:id="@+id/location_main_4"
@@ -58,9 +58,9 @@
android:textSize="30sp" />
<LinearLayout
android:layout_below="@id/location_holder"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_below="@id/location_holder"
android:orientation="horizontal">
<View
@@ -84,8 +84,7 @@
android:layout_gravity="center"
android:layout_marginRight="15dp"
android:layout_weight="6"
android:orientation="vertical"
>
android:orientation="vertical">
<TextView
android:id="@+id/condition_main_4"

6
app/src/atlasWeather/res/layout/list_item_forecast.xml
View File

@@ -7,12 +7,12 @@
android:layout_height="wrap_content">
<androidx.cardview.widget.CardView
android:layout_marginTop="2dp"
android:layout_marginBottom="2dp"
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:cardElevation="0dp"
android:layout_marginTop="2dp"
android:layout_marginBottom="2dp"
android:backgroundTint="@android:color/transparent"
app:cardElevation="0dp"
card_view:cardPreventCornerOverlap="false"
card_view:cardUseCompatPadding="true">

23
app/src/atlasWeather/res/layout/list_item_further.xml
View File

@@ -15,8 +15,8 @@
android:layout_weight="2">
<ImageView
android:src="@drawable/breeze"
style="@style/icon_style__further_deatils" />
style="@style/icon_style__further_details"
android:src="@drawable/breeze" />
</FrameLayout>
<RelativeLayout
@@ -50,8 +50,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="3"
android:text="11kmp"
/>
android:text="11kmp" />
</LinearLayout>
<LinearLayout
@@ -70,8 +69,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="3"
android:text="SW"
/>
android:text="SW" />
</LinearLayout>
@@ -92,7 +90,7 @@
android:layout_weight="2">
<ImageView
style="@style/icon_style__further_deatils"
style="@style/icon_style__further_details"
android:src="@drawable/water_drop" />
</FrameLayout>
@@ -126,8 +124,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="3"
android:text="85%"
/>
android:text="85%" />
</LinearLayout>
<LinearLayout
@@ -145,8 +142,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="3"
android:text="11mm"
/>
android:text="11mm" />
</LinearLayout>
@@ -167,7 +163,7 @@
android:layout_weight="2">
<ImageView
style="@style/icon_style__further_deatils"
style="@style/icon_style__further_details"
android:src="@drawable/cloud_symbol" />
</FrameLayout>
@@ -202,8 +198,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="3"
android:text="85%"
/>
android:text="85%" />
</LinearLayout>

2
app/src/atlasWeather/res/layout/new_app_widget.xml
View File

@@ -76,11 +76,11 @@
<TextView
android:id="@+id/widget_current_location"
style="@style/widget_light_home_text"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:maxWidth="180dp"
android:maxLines="1"
style="@style/widget_light_home_text"
tools:text="Hammersmith Bridge" />
</LinearLayout>

0
app/src/main/res/mipmap-hdpi/ic_notif.png → app/src/atlasWeather/res/mipmap-hdpi/ic_notif.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 671 B

After

Width:  |  Height:  |  Size: 671 B

0
app/src/main/res/mipmap-mdpi/ic_notif.png → app/src/atlasWeather/res/mipmap-mdpi/ic_notif.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 881 B

After

Width:  |  Height:  |  Size: 881 B

0
app/src/main/res/mipmap-xhdpi/ic_notif.png → app/src/atlasWeather/res/mipmap-xhdpi/ic_notif.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 1.7 KiB

After

Width:  |  Height:  |  Size: 1.7 KiB

0
app/src/main/res/mipmap-xxhdpi/ic_notif.png → app/src/atlasWeather/res/mipmap-xxhdpi/ic_notif.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.6 KiB

After

Width:  |  Height:  |  Size: 2.6 KiB

0
app/src/main/res/mipmap-xxxhdpi/ic_notif.png → app/src/atlasWeather/res/mipmap-xxxhdpi/ic_notif.png
View File

Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 2.9 KiB

After

Width:  |  Height:  |  Size: 2.9 KiB

2
app/src/atlasWeather/res/navigation/main_navigation.xml
View File

@@ -32,7 +32,7 @@
tools:layout="@layout/fragment__two">
<action
android:id="@+id/action_worldFragment_to_addLocationFragment"
app:destination="@id/addLocationFragment"/>
app:destination="@id/addLocationFragment" />
<action
android:id="@+id/action_worldFragment_to_worldItemFragment"
app:destination="@id/worldItemFragment" />

7
app/src/atlasWeather/res/values/strings.xml
View File

@@ -1,4 +1,7 @@
<resources>
<!-- TODO: Remove or change this placeholder text -->
<string name="hello_blank_fragment">Hello blank fragment</string>
<string name="min">Min:</string>
<string name="max">Max:</string>
<string name="average">Average:</string>
<string name="floating_action_button">Floating Action Button</string>
<string name="_11mm">11mm</string>
</resources>

4
app/src/atlasWeather/res/xml/new_app_widget_info.xml
View File

@@ -3,13 +3,13 @@
android:configure="com.appttude.h_mal.atlas_weather.ui.widget.WidgetLocationPermissionActivity"
android:initialKeyguardLayout="@layout/weather_app_widget"
android:initialLayout="@layout/weather_app_widget"
android:minHeight="110.0dp"
android:minWidth="320.0dp"
android:minHeight="110.0dp"
android:minResizeWidth="320.0dp"
android:minResizeHeight="110.0dp"
android:previewImage="@drawable/widget_screenshot"
android:updatePeriodMillis="1800000"
android:resizeMode="vertical"
android:updatePeriodMillis="1800000"
android:widgetCategory="home_screen">
</appwidget-provider>

52
app/src/atlasWeather/res/xml/prefs.xml
View File

@@ -1,32 +1,32 @@
<?xml version="1.0" encoding="utf-8"?>
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<!-- <PreferenceCategory android:title="Units">-->
<!-- <ListPreference-->
<!-- android:defaultValue="°C"-->
<!-- android:entries="@array/list_preference_temp"-->
<!-- android:entryValues="@array/list_preference_temp"-->
<!-- android:key="temp_units"-->
<!-- android:title="Temperature Units" />-->
<!-- <ListPreference-->
<!-- android:defaultValue="kph"-->
<!-- android:entries="@array/list_preference_wind"-->
<!-- android:entryValues="@array/list_preference_wind_values"-->
<!-- android:key="wind_units"-->
<!-- android:title="Wind Units" />-->
<!-- <ListPreference-->
<!-- android:defaultValue="mm"-->
<!-- android:entries="@array/list_preference_precip"-->
<!-- android:entryValues="@array/list_preference_precip_values"-->
<!-- android:key="precip_units"-->
<!-- android:title="Precipitation Units" />-->
<!-- <ListPreference-->
<!-- android:defaultValue="km"-->
<!-- android:entries="@array/list_preference_vis"-->
<!-- android:entryValues="@array/list_preference_vis_values"-->
<!-- android:key="vis_units"-->
<!-- android:title="Visibility Units" />-->
<!-- </PreferenceCategory>-->
<!-- <PreferenceCategory android:title="Units">-->
<!-- <ListPreference-->
<!-- android:defaultValue="°C"-->
<!-- android:entries="@array/list_preference_temp"-->
<!-- android:entryValues="@array/list_preference_temp"-->
<!-- android:key="temp_units"-->
<!-- android:title="Temperature Units" />-->
<!-- <ListPreference-->
<!-- android:defaultValue="kph"-->
<!-- android:entries="@array/list_preference_wind"-->
<!-- android:entryValues="@array/list_preference_wind_values"-->
<!-- android:key="wind_units"-->
<!-- android:title="Wind Units" />-->
<!-- <ListPreference-->
<!-- android:defaultValue="mm"-->
<!-- android:entries="@array/list_preference_precip"-->
<!-- android:entryValues="@array/list_preference_precip_values"-->
<!-- android:key="precip_units"-->
<!-- android:title="Precipitation Units" />-->
<!-- <ListPreference-->
<!-- android:defaultValue="km"-->
<!-- android:entries="@array/list_preference_vis"-->
<!-- android:entryValues="@array/list_preference_vis_values"-->
<!-- android:key="vis_units"-->
<!-- android:title="Visibility Units" />-->
<!-- </PreferenceCategory>-->
<PreferenceCategory android:title="Notification Settings">
<SwitchPreference
android:defaultValue="true"

6
app/src/main/AndroidManifest.xml
View File

@@ -10,8 +10,6 @@
<uses-permission android:name="android.permission.WAKE_LOCK" />
<uses-permission android:name="android.permission.ACCESS_BACKGROUND_LOCATION" />
<application android:networkSecurityConfig="@xml/network_security_config" />
<uses-feature
android:name="android.hardware.location"
android:required="true" />
@@ -19,4 +17,8 @@
android:name="android.hardware.location.gps"
android:required="true" />
<application
android:networkSecurityConfig="@xml/network_security_config"
tools:ignore="MissingApplicationIcon" />
</manifest>

6
app/src/main/java/com/appttude/h_mal/atlas_weather/application/AppClass.kt
View File

@@ -14,9 +14,9 @@ class AppClass : BaseAppClass() {
override fun createNetworkModule(): WeatherApi {
return NetworkModule().invoke<WeatherApi>(
NetworkConnectionInterceptor(this),
QueryParamsInterceptor(),
loggingInterceptor
NetworkConnectionInterceptor(this),
QueryParamsInterceptor(),
loggingInterceptor
) as WeatherApi
}

8
app/src/main/java/com/appttude/h_mal/atlas_weather/data/location/LocationHelper.kt
View File

@@ -9,21 +9,21 @@ import com.tomtom.online.sdk.search.data.common.Address
import com.tomtom.online.sdk.search.data.reversegeocoder.ReverseGeocoderSearchQueryBuilder
abstract class LocationHelper(
context: Context
context: Context
) {
private val key = BuildConfig.ParamTwo
private val searchApi = OnlineSearchApi.create(context, key)
suspend fun getAddressFromLatLong(
lat: Double, long: Double
lat: Double, long: Double
): Address? {
return createSuspend {
val revGeoQuery =
ReverseGeocoderSearchQueryBuilder(lat, long).build()
ReverseGeocoderSearchQueryBuilder(lat, long).build()
val resultSingle =
searchApi.reverseGeocoding(revGeoQuery)
searchApi.reverseGeocoding(revGeoQuery)
resultSingle.blockingGet()?.addresses?.get(0)?.address
}

6
app/src/main/java/com/appttude/h_mal/atlas_weather/data/location/LocationProvider.kt
View File

@@ -6,8 +6,8 @@ interface LocationProvider {
suspend fun getCurrentLatLong(): Pair<Double, Double>
fun getLatLongFromLocationName(location: String): Pair<Double, Double>
suspend fun getLocationNameFromLatLong(
lat: Double,
long: Double,
type: LocationType = LocationType.Town
lat: Double,
long: Double,
type: LocationType = LocationType.Town
): String
}

44
app/src/main/java/com/appttude/h_mal/atlas_weather/data/location/LocationProviderImpl.kt
View File

@@ -9,12 +9,11 @@ import android.location.LocationManager
import android.os.HandlerThread
import androidx.annotation.RequiresPermission
import com.appttude.h_mal.atlas_weather.model.types.LocationType
import com.google.android.gms.location.FusedLocationProviderClient
import com.google.android.gms.location.LocationCallback
import com.google.android.gms.location.LocationRequest
import com.google.android.gms.location.LocationRequest.PRIORITY_HIGH_ACCURACY
import com.google.android.gms.location.LocationRequest.PRIORITY_LOW_POWER
import com.google.android.gms.location.LocationResult
import com.google.android.gms.location.LocationServices
import com.google.android.gms.location.Priority
import com.google.android.gms.tasks.CancellationToken
import com.google.android.gms.tasks.OnTokenCanceledListener
import kotlinx.coroutines.tasks.await
@@ -28,8 +27,8 @@ class LocationProviderImpl(
private val applicationContext: Context
) : LocationProvider, LocationHelper(applicationContext) {
private var locationManager =
applicationContext.getSystemService(Context.LOCATION_SERVICE) as LocationManager?
private val client = FusedLocationProviderClient(applicationContext)
applicationContext.getSystemService(Context.LOCATION_SERVICE) as LocationManager?
private val client = LocationServices.getFusedLocationProviderClient(applicationContext)
private val geoCoder: Geocoder by lazy { Geocoder(applicationContext, Locale.getDefault()) }
@RequiresPermission(value = ACCESS_COARSE_LOCATION)
@@ -48,18 +47,19 @@ class LocationProviderImpl(
}
override suspend fun getLocationNameFromLatLong(
lat: Double, long: Double, type: LocationType
lat: Double, long: Double, type: LocationType
): String {
val address = getAddressFromLatLong(lat, long) ?: return "$lat $long"
return when (type) {
LocationType.Town -> {
val location = address
.municipalitySubdivision
?.takeIf { it.isNotBlank() }
?: address.municipality
.municipalitySubdivision
?.takeIf { it.isNotBlank() }
?: address.municipality
location ?: throw IOException("No location municipalitySubdivision or municipality")
}
LocationType.City -> {
address.municipality ?: throw IOException("No location municipality")
}
@@ -68,7 +68,7 @@ class LocationProviderImpl(
@SuppressLint("MissingPermission")
private suspend fun getAFreshLocation(): Location? {
return client.getCurrentLocation(PRIORITY_LOW_POWER, object : CancellationToken() {
return client.getCurrentLocation(Priority.PRIORITY_LOW_POWER, object : CancellationToken() {
override fun isCancellationRequested(): Boolean = false
override fun onCanceledRequested(p0: OnTokenCanceledListener): CancellationToken = this
}).await()
@@ -84,20 +84,30 @@ class LocationProviderImpl(
return suspendCoroutine { cont ->
val callback = object : LocationCallback() {
override fun onLocationResult(p0: LocationResult?) {
override fun onLocationResult(p0: LocationResult) {
client.removeLocationUpdates(this)
cont.resume(p0?.lastLocation)
cont.resume(p0.lastLocation)
}
}
with(locationManager!!) {
when {
isProviderEnabled(LocationManager.GPS_PROVIDER) -> {
client.requestLocationUpdates(createLocationRequest(PRIORITY_HIGH_ACCURACY), callback, looper)
client.requestLocationUpdates(
createLocationRequest(Priority.PRIORITY_HIGH_ACCURACY),
callback,
looper
)
}
isProviderEnabled(LocationManager.NETWORK_PROVIDER) -> {
client.requestLocationUpdates(createLocationRequest(PRIORITY_LOW_POWER), callback, looper)
client.requestLocationUpdates(
createLocationRequest(Priority.PRIORITY_LOW_POWER),
callback,
looper
)
}
else -> {
cont.resume(null)
}
@@ -108,7 +118,7 @@ class LocationProviderImpl(
}
private fun createLocationRequest(priority: Int) = LocationRequest.create()
.setPriority(priority)
.setNumUpdates(1)
.setExpirationDuration(1000)
.setPriority(priority)
.setNumUpdates(1)
.setExpirationDuration(1000)
}

10
app/src/main/java/com/appttude/h_mal/atlas_weather/data/network/BaseNetworkModule.kt
View File

@@ -8,16 +8,16 @@ open class BaseNetworkModule {
// Declare the method we want/can change (no annotations)
open fun baseUrl() = "/"
inline fun <reified T: Api> invoke(
vararg interceptors: Interceptor
inline fun <reified T : Api> invoke(
vararg interceptors: Interceptor
): Api {
val okHttpClient = buildOkHttpClient(*interceptors)
return createRetrofit(
baseUrl(),
okHttpClient,
T::class.java
baseUrl(),
okHttpClient,
T::class.java
)
}
}

3
app/src/main/java/com/appttude/h_mal/atlas_weather/data/network/ResponseUnwrap.kt
View File

@@ -7,9 +7,8 @@ import java.io.IOException
abstract class ResponseUnwrap {
@Suppress("BlockingMethodInNonBlockingContext")
suspend fun <T : Any> responseUnwrap(
call: suspend () -> Response<T>
call: suspend () -> Response<T>
): T {
val response = call.invoke()

10
app/src/main/java/com/appttude/h_mal/atlas_weather/data/network/WeatherApi.kt
View File

@@ -6,14 +6,14 @@ import retrofit2.http.GET
import retrofit2.http.Query
interface WeatherApi: Api {
interface WeatherApi : Api {
@GET("onecall?")
suspend fun getFromApi(
@Query("lat") query: String,
@Query("lon") lon: String,
@Query("exclude") exclude: String = "minutely",
@Query("units") units: String = "metric"
@Query("lat") query: String,
@Query("lon") lon: String,
@Query("exclude") exclude: String = "minutely",
@Query("units") units: String = "metric"
): Response<WeatherResponse>
}

2
app/src/main/java/com/appttude/h_mal/atlas_weather/data/network/interceptors/NetworkConnectionInterceptor.kt
View File

@@ -12,7 +12,7 @@ class NetworkConnectionInterceptor(
private val applicationContext = context.applicationContext
override fun intercept(chain: Interceptor.Chain): okhttp3.Response {
if (!isInternetAvailable(applicationContext)){
if (!isInternetAvailable(applicationContext)) {
throw IOException("Make sure you have an active data connection")
}
return chain.proceed(chain.request())

6
app/src/main/java/com/appttude/h_mal/atlas_weather/data/network/interceptors/QueryParamsInterceptor.kt
View File

@@ -8,7 +8,7 @@ import okhttp3.Response
/**
* Interceptor used to add default query parameters to api calls
*/
class QueryParamsInterceptor : Interceptor{
class QueryParamsInterceptor : Interceptor {
val id = BuildConfig.ParamOne
@@ -16,8 +16,8 @@ class QueryParamsInterceptor : Interceptor{
val original = chain.request()
val url = original.url.newBuilder()
.addQueryParameter("appid", id)
.build()
.addQueryParameter("appid", id)
.build()
// Request customization: add request headers
val requestBuilder = original.newBuilder().url(url)

28
app/src/main/java/com/appttude/h_mal/atlas_weather/data/network/networkUtils/RetrofitComponents.kt
View File

@@ -9,12 +9,12 @@ import retrofit2.converter.gson.GsonConverterFactory
import java.util.concurrent.TimeUnit
val loggingInterceptor = HttpLoggingInterceptor().apply {
level = HttpLoggingInterceptor.Level.BODY
}
level = HttpLoggingInterceptor.Level.BODY
}
fun buildOkHttpClient(
vararg interceptor: Interceptor,
timeoutSeconds: Long = 30L
vararg interceptor: Interceptor,
timeoutSeconds: Long = 30L
): OkHttpClient {
val builder = OkHttpClient.Builder()
@@ -28,21 +28,21 @@ fun buildOkHttpClient(
}
builder.connectTimeout(timeoutSeconds, TimeUnit.SECONDS)
.writeTimeout(timeoutSeconds, TimeUnit.SECONDS)
.readTimeout(timeoutSeconds, TimeUnit.SECONDS)
.writeTimeout(timeoutSeconds, TimeUnit.SECONDS)
.readTimeout(timeoutSeconds, TimeUnit.SECONDS)
return builder.build()
}
fun <T> createRetrofit(
baseUrl: String,
okHttpClient: OkHttpClient,
service: Class<T>
baseUrl: String,
okHttpClient: OkHttpClient,
service: Class<T>
): T {
return Retrofit.Builder()
.client(okHttpClient)
.baseUrl(baseUrl)
.addConverterFactory(GsonConverterFactory.create())
.build()
.create(service)
.client(okHttpClient)
.baseUrl(baseUrl)
.addConverterFactory(GsonConverterFactory.create())
.build()
.create(service)
}

56
app/src/main/java/com/appttude/h_mal/atlas_weather/data/network/response/forecast/Current.kt
View File

@@ -4,45 +4,45 @@ import com.google.gson.annotations.SerializedName
data class Current(
@field:SerializedName("sunrise")
val sunrise: Int? = null,
@field:SerializedName("sunrise")
val sunrise: Int? = null,
@field:SerializedName("temp")
val temp: Double? = null,
@field:SerializedName("temp")
val temp: Double? = null,
@field:SerializedName("visibility")
val visibility: Int? = null,
@field:SerializedName("visibility")
val visibility: Int? = null,
@field:SerializedName("uvi")
val uvi: Double? = null,
@field:SerializedName("uvi")
val uvi: Double? = null,
@field:SerializedName("pressure")
val pressure: Int? = null,
@field:SerializedName("pressure")
val pressure: Int? = null,
@field:SerializedName("clouds")
val clouds: Int? = null,
@field:SerializedName("clouds")
val clouds: Int? = null,
@field:SerializedName("feels_like")
val feelsLike: Double? = null,
@field:SerializedName("feels_like")
val feelsLike: Double? = null,
@field:SerializedName("dt")
val dt: Int? = null,
@field:SerializedName("dt")
val dt: Int? = null,
@field:SerializedName("wind_deg")
val windDeg: Int? = null,
@field:SerializedName("wind_deg")
val windDeg: Int? = null,
@field:SerializedName("dew_point")
val dewPoint: Double? = null,
@field:SerializedName("dew_point")
val dewPoint: Double? = null,
@field:SerializedName("sunset")
val sunset: Int? = null,
@field:SerializedName("sunset")
val sunset: Int? = null,
@field:SerializedName("weather")
val weather: List<WeatherItem?>? = null,
@field:SerializedName("weather")
val weather: List<WeatherItem?>? = null,
@field:SerializedName("humidity")
val humidity: Int? = null,
@field:SerializedName("humidity")
val humidity: Int? = null,
@field:SerializedName("wind_speed")
val windSpeed: Double? = null
@field:SerializedName("wind_speed")
val windSpeed: Double? = null
)

60
app/src/main/java/com/appttude/h_mal/atlas_weather/data/network/response/forecast/DailyItem.kt
View File

@@ -4,48 +4,48 @@ import com.google.gson.annotations.SerializedName
data class DailyItem(
@field:SerializedName("sunrise")
val sunrise: Int? = null,
@field:SerializedName("sunrise")
val sunrise: Int? = null,
@field:SerializedName("temp")
val temp: Temp? = null,
@field:SerializedName("temp")
val temp: Temp? = null,
@field:SerializedName("uvi")
val uvi: Double? = null,
@field:SerializedName("uvi")
val uvi: Double? = null,
@field:SerializedName("pressure")
val pressure: Int? = null,
@field:SerializedName("pressure")
val pressure: Int? = null,
@field:SerializedName("clouds")
val clouds: Int? = null,
@field:SerializedName("clouds")
val clouds: Int? = null,
@field:SerializedName("feels_like")
val feelsLike: FeelsLike? = null,
@field:SerializedName("feels_like")
val feelsLike: FeelsLike? = null,
@field:SerializedName("dt")
val dt: Int? = null,
@field:SerializedName("dt")
val dt: Int? = null,
@field:SerializedName("pop")
val pop: Double? = null,
@field:SerializedName("pop")
val pop: Double? = null,
@field:SerializedName("wind_deg")
val windDeg: Int? = null,
@field:SerializedName("wind_deg")
val windDeg: Int? = null,
@field:SerializedName("dew_point")
val dewPoint: Double? = null,
@field:SerializedName("dew_point")
val dewPoint: Double? = null,
@field:SerializedName("sunset")
val sunset: Int? = null,
@field:SerializedName("sunset")
val sunset: Int? = null,
@field:SerializedName("weather")
val weather: List<WeatherItem?>? = null,
@field:SerializedName("weather")
val weather: List<WeatherItem?>? = null,
@field:SerializedName("humidity")
val humidity: Int? = null,
@field:SerializedName("humidity")
val humidity: Int? = null,
@field:SerializedName("wind_speed")
val windSpeed: Double? = null,
@field:SerializedName("wind_speed")
val windSpeed: Double? = null,
@field:SerializedName("rain")
val rain: Double? = null
@field:SerializedName("rain")
val rain: Double? = null
)

16
app/src/main/java/com/appttude/h_mal/atlas_weather/data/network/response/forecast/FeelsLike.kt
View File

@@ -4,15 +4,15 @@ import com.google.gson.annotations.SerializedName
data class FeelsLike(
@field:SerializedName("eve")
val eve: Double? = null,
@field:SerializedName("eve")
val eve: Double? = null,
@field:SerializedName("night")
val night: Double? = null,
@field:SerializedName("night")
val night: Double? = null,
@field:SerializedName("day")
val day: Double? = null,
@field:SerializedName("day")
val day: Double? = null,
@field:SerializedName("morn")
val morn: Double? = null
@field:SerializedName("morn")
val morn: Double? = null
)

56
app/src/main/java/com/appttude/h_mal/atlas_weather/data/network/response/forecast/Hour.kt
View File

@@ -4,45 +4,45 @@ import com.google.gson.annotations.SerializedName
data class Hour(
@field:SerializedName("sunrise")
val sunrise: Int? = null,
@field:SerializedName("sunrise")
val sunrise: Int? = null,
@field:SerializedName("temp")
val temp: Double? = null,
@field:SerializedName("temp")
val temp: Double? = null,
@field:SerializedName("visibility")
val visibility: Int? = null,
@field:SerializedName("visibility")
val visibility: Int? = null,
@field:SerializedName("uvi")
val uvi: Double? = null,
@field:SerializedName("uvi")
val uvi: Double? = null,
@field:SerializedName("pressure")
val pressure: Int? = null,
@field:SerializedName("pressure")
val pressure: Int? = null,
@field:SerializedName("clouds")
val clouds: Int? = null,
@field:SerializedName("clouds")
val clouds: Int? = null,
@field:SerializedName("feels_like")
val feelsLike: Double? = null,
@field:SerializedName("feels_like")
val feelsLike: Double? = null,
@field:SerializedName("dt")
val dt: Int? = null,
@field:SerializedName("dt")
val dt: Int? = null,
@field:SerializedName("wind_deg")
val windDeg: Int? = null,
@field:SerializedName("wind_deg")
val windDeg: Int? = null,
@field:SerializedName("dew_point")
val dewPoint: Double? = null,
@field:SerializedName("dew_point")
val dewPoint: Double? = null,
@field:SerializedName("sunset")
val sunset: Int? = null,
@field:SerializedName("sunset")
val sunset: Int? = null,
@field:SerializedName("weather")
val weather: List<WeatherItem?>? = null,
@field:SerializedName("weather")
val weather: List<WeatherItem?>? = null,
@field:SerializedName("humidity")
val humidity: Int? = null,
@field:SerializedName("humidity")
val humidity: Int? = null,
@field:SerializedName("wind_speed")
val windSpeed: Double? = null
@field:SerializedName("wind_speed")
val windSpeed: Double? = null
)

24
app/src/main/java/com/appttude/h_mal/atlas_weather/data/network/response/forecast/Response.kt
View File

@@ -4,21 +4,21 @@ import com.google.gson.annotations.SerializedName
data class Response(
@field:SerializedName("current")
val current: Current? = null,
@field:SerializedName("current")
val current: Current? = null,
@field:SerializedName("timezone")
val timezone: String? = null,
@field:SerializedName("timezone")
val timezone: String? = null,
@field:SerializedName("timezone_offset")
val timezoneOffset: Int? = null,
@field:SerializedName("timezone_offset")
val timezoneOffset: Int? = null,
@field:SerializedName("daily")
val daily: List<DailyItem?>? = null,
@field:SerializedName("daily")
val daily: List<DailyItem?>? = null,
@field:SerializedName("lon")
val lon: Double? = null,
@field:SerializedName("lon")
val lon: Double? = null,
@field:SerializedName("lat")
val lat: Double? = null
@field:SerializedName("lat")
val lat: Double? = null
)

24
app/src/main/java/com/appttude/h_mal/atlas_weather/data/network/response/forecast/Temp.kt
View File

@@ -4,21 +4,21 @@ import com.google.gson.annotations.SerializedName
data class Temp(
@field:SerializedName("min")
val min: Double? = null,
@field:SerializedName("min")
val min: Double? = null,
@field:SerializedName("max")
val max: Double? = null,
@field:SerializedName("max")
val max: Double? = null,
@field:SerializedName("eve")
val eve: Double? = null,
@field:SerializedName("eve")
val eve: Double? = null,
@field:SerializedName("night")
val night: Double? = null,
@field:SerializedName("night")
val night: Double? = null,
@field:SerializedName("day")
val day: Double? = null,
@field:SerializedName("day")
val day: Double? = null,
@field:SerializedName("morn")
val morn: Double? = null
@field:SerializedName("morn")
val morn: Double? = null
)

16
app/src/main/java/com/appttude/h_mal/atlas_weather/data/network/response/forecast/WeatherItem.kt
View File

@@ -4,15 +4,15 @@ import com.google.gson.annotations.SerializedName
data class WeatherItem(
@field:SerializedName("icon")
val icon: String? = null,
@field:SerializedName("icon")
val icon: String? = null,
@field:SerializedName("description")
val description: String? = null,
@field:SerializedName("description")
val description: String? = null,
@field:SerializedName("main")
val main: String? = null,
@field:SerializedName("main")
val main: String? = null,
@field:SerializedName("id")
val id: Int? = null
@field:SerializedName("id")
val id: Int? = null
)

28
app/src/main/java/com/appttude/h_mal/atlas_weather/data/network/response/forecast/WeatherResponse.kt
View File

@@ -4,25 +4,25 @@ import com.google.gson.annotations.SerializedName
data class WeatherResponse(
@field:SerializedName("current")
val current: Current? = null,
@field:SerializedName("current")
val current: Current? = null,
@field:SerializedName("timezone")
val timezone: String? = null,
@field:SerializedName("timezone")
val timezone: String? = null,
@field:SerializedName("timezone_offset")
val timezoneOffset: Int? = null,
@field:SerializedName("timezone_offset")
val timezoneOffset: Int? = null,
@field:SerializedName("hourly")
val hourly: List<Hour>? = null,
@field:SerializedName("hourly")
val hourly: List<Hour>? = null,
@field:SerializedName("daily")
val daily: List<DailyItem>? = null,
@field:SerializedName("daily")
val daily: List<DailyItem>? = null,
@field:SerializedName("lon")
val lon: Double = 0.00,
@field:SerializedName("lon")
val lon: Double = 0.00,
@field:SerializedName("lat")
val lat: Double = 0.00
@field:SerializedName("lat")
val lat: Double = 0.00
)

17
app/src/main/java/com/appttude/h_mal/atlas_weather/data/prefs/PreferencesProvider.kt
View File

@@ -9,9 +9,10 @@ import com.appttude.h_mal.atlas_weather.data.room.entity.CURRENT_LOCATION
* Shared preferences to save & load last timestamp
*/
const val LOCATION_CONST = "location_"
class PreferenceProvider(
context: Context
){
) {
private val appContext = context.applicationContext
@@ -20,30 +21,30 @@ class PreferenceProvider(
fun saveLastSavedAt(locationName: String) {
preference.edit().putLong(
locationName,
System.currentTimeMillis()
locationName,
System.currentTimeMillis()
).apply()
}
fun getLastSavedAt(locationName: String): Long? {
return preference.getLong(locationName, 0L)
fun getLastSavedAt(locationName: String): Long {
return preference.getLong(locationName, 0L)
}
fun getAllKeys() = preference.all.keys.apply {
remove(CURRENT_LOCATION)
}
fun deleteLocation(locationName: String){
fun deleteLocation(locationName: String) {
preference.edit().remove(locationName).apply()
}
fun isNotificationsEnabled(): Boolean = preference.getBoolean("notif_boolean", true)
fun setFirstTimeRun(){
fun setFirstTimeRun() {
preference.edit().putBoolean("FIRST_TIME_RUN", false).apply()
}
fun isWidgetBlackground(): Boolean {
fun isWidgetBackground(): Boolean {
return preference.getBoolean("widget_black_background", false)
}

2
app/src/main/java/com/appttude/h_mal/atlas_weather/data/repository/Repository.kt
View File

@@ -10,7 +10,7 @@ interface Repository {
suspend fun saveCurrentWeatherToRoom(entityItem: EntityItem)
suspend fun saveWeatherListToRoom(list: List<EntityItem>)
fun loadRoomWeatherLiveData(): LiveData<List<EntityItem>>
suspend fun loadWeatherList() : List<String>
suspend fun loadWeatherList(): List<String>
fun loadCurrentWeatherFromRoom(id: String): LiveData<EntityItem>
suspend fun loadSingleCurrentWeatherFromRoom(id: String): EntityItem
fun isSearchValid(locationName: String): Boolean

24
app/src/main/java/com/appttude/h_mal/atlas_weather/data/repository/RepositoryImpl.kt
View File

@@ -23,34 +23,34 @@ class RepositoryImpl(
return responseUnwrap { api.getFromApi(lat, long) }
}
override suspend fun saveCurrentWeatherToRoom(entityItem: EntityItem){
override suspend fun saveCurrentWeatherToRoom(entityItem: EntityItem) {
db.getSimpleDao().upsertFullWeather(entityItem)
}
override suspend fun saveWeatherListToRoom(
list: List<EntityItem>
){
list: List<EntityItem>
) {
db.getSimpleDao().upsertListOfFullWeather(list)
}
override fun loadRoomWeatherLiveData() = db.getSimpleDao().getAllFullWeatherWithoutCurrent()
override suspend fun loadWeatherList() : List<String>{
override suspend fun loadWeatherList(): List<String> {
return db.getSimpleDao()
.getWeatherListWithoutCurrent()
.map { it.id }
.getWeatherListWithoutCurrent()
.map { it.id }
}
override fun loadCurrentWeatherFromRoom(id: String)
= db.getSimpleDao().getCurrentFullWeather(id)
override fun loadCurrentWeatherFromRoom(id: String) =
db.getSimpleDao().getCurrentFullWeather(id)
override suspend fun loadSingleCurrentWeatherFromRoom(id: String)
= db.getSimpleDao().getCurrentFullWeatherSingle(id)
override suspend fun loadSingleCurrentWeatherFromRoom(id: String) =
db.getSimpleDao().getCurrentFullWeatherSingle(id)
override fun isSearchValid(locationName: String): Boolean {
val lastSaved = prefs
.getLastSavedAt("$LOCATION_CONST$locationName")
?: return true
.getLastSavedAt("$LOCATION_CONST$locationName")
?: return true
val difference = System.currentTimeMillis() - lastSaved
return difference > FALLBACK_TIME

6
app/src/main/java/com/appttude/h_mal/atlas_weather/data/repository/SettingsRepositoryImpl.kt
View File

@@ -3,12 +3,12 @@ package com.appttude.h_mal.atlas_weather.data.repository
import com.appttude.h_mal.atlas_weather.data.prefs.PreferenceProvider
class SettingsRepositoryImpl(
private val prefs: PreferenceProvider
) : SettingsRepository{
private val prefs: PreferenceProvider
) : SettingsRepository {
override fun isNotificationsEnabled(): Boolean = prefs.isNotificationsEnabled()
override fun setFirstTime() = prefs.setFirstTimeRun()
override fun isBlackBackground() = prefs.isWidgetBlackground()
override fun isBlackBackground() = prefs.isWidgetBackground()
}

18
app/src/main/java/com/appttude/h_mal/atlas_weather/data/room/AppDatabase.kt
View File

@@ -8,9 +8,9 @@ import androidx.room.TypeConverters
import com.appttude.h_mal.atlas_weather.data.room.entity.EntityItem
@Database(
entities = [EntityItem::class],
version = 1,
exportSchema = false
entities = [EntityItem::class],
version = 1,
exportSchema = false
)
@TypeConverters(Converter::class)
abstract class AppDatabase : RoomDatabase() {
@@ -31,12 +31,12 @@ abstract class AppDatabase : RoomDatabase() {
}
private fun buildDatabase(context: Context) =
Room.databaseBuilder(
context.applicationContext,
AppDatabase::class.java,
"MyDatabase.db"
).addTypeConverter(Converter(context))
.build()
Room.databaseBuilder(
context.applicationContext,
AppDatabase::class.java,
"MyDatabase.db"
).addTypeConverter(Converter(context))
.build()
}
}

8
app/src/main/java/com/appttude/h_mal/atlas_weather/data/room/WeatherDao.kt
View File

@@ -18,16 +18,16 @@ interface WeatherDao {
fun upsertListOfFullWeather(items: List<EntityItem>)
@Query("SELECT * FROM EntityItem WHERE id = :userId LIMIT 1")
fun getCurrentFullWeather(userId: String) : LiveData<EntityItem>
fun getCurrentFullWeather(userId: String): LiveData<EntityItem>
@Query("SELECT * FROM EntityItem WHERE id = :userId LIMIT 1")
fun getCurrentFullWeatherSingle(userId: String) : EntityItem
fun getCurrentFullWeatherSingle(userId: String): EntityItem
@Query("SELECT * FROM EntityItem WHERE id != :id")
fun getAllFullWeatherWithoutCurrent(id: String = CURRENT_LOCATION) : LiveData<List<EntityItem>>
fun getAllFullWeatherWithoutCurrent(id: String = CURRENT_LOCATION): LiveData<List<EntityItem>>
@Query("SELECT * FROM EntityItem WHERE id != :id")
fun getWeatherListWithoutCurrent(id: String = CURRENT_LOCATION) : List<EntityItem>
fun getWeatherListWithoutCurrent(id: String = CURRENT_LOCATION): List<EntityItem>
@Query("DELETE FROM EntityItem WHERE id = :userId")
fun deleteEntry(userId: String): Int

1
app/src/main/java/com/appttude/h_mal/atlas_weather/data/room/entity/EntityItem.kt
View File

@@ -6,6 +6,7 @@ import com.appttude.h_mal.atlas_weather.model.weather.FullWeather
const val CURRENT_LOCATION = "CurrentLocation"
@Entity
data class EntityItem(
@PrimaryKey(autoGenerate = false)

2
app/src/main/java/com/appttude/h_mal/atlas_weather/helper/GenericsHelper.kt
View File

@@ -1,7 +1,5 @@
package com.appttude.h_mal.atlas_weather.helper
import android.view.LayoutInflater
import android.view.ViewGroup
import java.lang.reflect.ParameterizedType
import kotlin.reflect.KClass

13
app/src/main/java/com/appttude/h_mal/atlas_weather/helper/ServicesHelper.kt
View File

@@ -26,9 +26,9 @@ import kotlin.coroutines.suspendCoroutine
class ServicesHelper(
private val repository: Repository,
private val settingsRepository: SettingsRepository,
private val locationProvider: LocationProvider
private val repository: Repository,
private val settingsRepository: SettingsRepository,
private val locationProvider: LocationProvider
) {
@RequiresPermission(Manifest.permission.ACCESS_COARSE_LOCATION)
@@ -40,8 +40,9 @@ class ServicesHelper(
val latLong = locationProvider.getCurrentLatLong()
// Get weather from api
val weather = repository
.getWeatherFromApi(latLong.first.toString(), latLong.second.toString())
val currentLocation = locationProvider.getLocationNameFromLatLong(weather.lat, weather.lon)
.getWeatherFromApi(latLong.first.toString(), latLong.second.toString())
val currentLocation =
locationProvider.getLocationNameFromLatLong(weather.lat, weather.lon)
val fullWeather = FullWeather(weather).apply {
temperatureUnit = "°C"
locationString = currentLocation
@@ -61,7 +62,7 @@ class ServicesHelper(
return try {
val result = repository.loadSingleCurrentWeatherFromRoom(CURRENT_LOCATION)
val epoc = System.currentTimeMillis()
result.weather.let {
val bitmap = it.current?.icon
val location = locationProvider.getLocationNameFromLatLong(it.lat, it.lon)

2
app/src/main/java/com/appttude/h_mal/atlas_weather/model/forecast/Forecast.kt
View File

@@ -23,7 +23,7 @@ data class Forecast(
val sunrise: String?,
val sunset: String?,
val cloud: String?
): Parcelable{
) : Parcelable {
constructor(parcel: Parcel) : this(
parcel.readString(),

2
app/src/main/java/com/appttude/h_mal/atlas_weather/model/forecast/WeatherDisplay.kt
View File

@@ -22,7 +22,7 @@ data class WeatherDisplay(
val lat: Double = 0.00,
val lon: Double = 0.00,
var displayName: String?
): Parcelable {
) : Parcelable {
constructor(parcel: Parcel) : this(
parcel.readValue(Double::class.java.classLoader) as? Double,

2
app/src/main/java/com/appttude/h_mal/atlas_weather/model/types/LocationType.kt
View File

@@ -1,6 +1,6 @@
package com.appttude.h_mal.atlas_weather.model.types
enum class LocationType{
enum class LocationType {
City,
Town
}

84
app/src/main/java/com/appttude/h_mal/atlas_weather/model/weather/DailyWeather.kt
View File

@@ -5,49 +5,49 @@ import com.appttude.h_mal.atlas_weather.utils.generateIconUrlString
data class DailyWeather(
val dt: Int?,
val sunrise: Int?,
val sunset: Int?,
val min: Double? = null,
val max: Double? = null,
val average: Double? = null,
var feelsLike: Double?,
val pressure: Int?,
val humidity: Int?,
val dewPoint: Double?,
val windSpeed: Double?,
val windDeg: Int?,
val icon: String? = null,
val description: String? = null,
val main: String? = null,
val id: Int? = null,
val clouds: Int?,
val pop: Double?,
val uvi: Double?,
val rain: Double?
){
val dt: Int?,
val sunrise: Int?,
val sunset: Int?,
val min: Double? = null,
val max: Double? = null,
val average: Double? = null,
var feelsLike: Double?,
val pressure: Int?,
val humidity: Int?,
val dewPoint: Double?,
val windSpeed: Double?,
val windDeg: Int?,
val icon: String? = null,
val description: String? = null,
val main: String? = null,
val id: Int? = null,
val clouds: Int?,
val pop: Double?,
val uvi: Double?,
val rain: Double?
) {
constructor(dailyItem: DailyItem): this(
dailyItem.dt,
dailyItem.sunrise,
dailyItem.sunset,
dailyItem.temp?.min,
dailyItem.temp?.max,
dailyItem.temp?.day,
dailyItem.feelsLike?.day,
dailyItem.pressure,
dailyItem.humidity,
dailyItem.dewPoint,
dailyItem.windSpeed,
dailyItem.windDeg,
generateIconUrlString(dailyItem.weather?.getOrNull(0)?.icon),
dailyItem.weather?.get(0)?.description,
dailyItem.weather?.get(0)?.main,
dailyItem.weather?.get(0)?.id,
dailyItem.clouds,
dailyItem.pop,
dailyItem.uvi,
dailyItem.rain
constructor(dailyItem: DailyItem) : this(
dailyItem.dt,
dailyItem.sunrise,
dailyItem.sunset,
dailyItem.temp?.min,
dailyItem.temp?.max,
dailyItem.temp?.day,
dailyItem.feelsLike?.day,
dailyItem.pressure,
dailyItem.humidity,
dailyItem.dewPoint,
dailyItem.windSpeed,
dailyItem.windDeg,
generateIconUrlString(dailyItem.weather?.getOrNull(0)?.icon),
dailyItem.weather?.get(0)?.description,
dailyItem.weather?.get(0)?.main,
dailyItem.weather?.get(0)?.id,
dailyItem.clouds,
dailyItem.pop,
dailyItem.uvi,
dailyItem.rain
)

36
app/src/main/java/com/appttude/h_mal/atlas_weather/model/weather/FullWeather.kt
View File

@@ -3,26 +3,26 @@ package com.appttude.h_mal.atlas_weather.model.weather
import com.appttude.h_mal.atlas_weather.data.network.response.forecast.WeatherResponse
data class FullWeather(
val current: Current? = null,
val timezone: String? = null,
val timezoneOffset: Int? = null,
val hourly: List<Hour>? = null,
val daily: List<DailyWeather>? = null,
val lon: Double = 0.00,
val lat: Double = 0.00,
var locationString: String? = null,
var temperatureUnit: String? = null
val current: Current? = null,
val timezone: String? = null,
val timezoneOffset: Int? = null,
val hourly: List<Hour>? = null,
val daily: List<DailyWeather>? = null,
val lon: Double = 0.00,
val lat: Double = 0.00,
var locationString: String? = null,
var temperatureUnit: String? = null
) {
constructor(weatherResponse: WeatherResponse): this(
weatherResponse.current?.let { Current(it) },
weatherResponse.timezone,
weatherResponse.timezoneOffset,
weatherResponse.hourly?.subList(0,23)?.map { Hour(it) },
weatherResponse.daily?.map { DailyWeather(it) },
weatherResponse.lon,
weatherResponse.lat
)
constructor(weatherResponse: WeatherResponse) : this(
weatherResponse.current?.let { Current(it) },
weatherResponse.timezone,
weatherResponse.timezoneOffset,
weatherResponse.hourly?.subList(0, 23)?.map { Hour(it) },
weatherResponse.daily?.map { DailyWeather(it) },
weatherResponse.lon,
weatherResponse.lat
)
}

2
app/src/main/java/com/appttude/h_mal/atlas_weather/model/weather/Hour.kt
View File

@@ -10,7 +10,7 @@ data class Hour(
val dt: Int? = null,
val temp: Double? = null,
val icon: String? = null
): Parcelable {
) : Parcelable {
constructor(parcel: Parcel) : this(
parcel.readValue(Int::class.java.classLoader) as? Int,

24
app/src/main/java/com/appttude/h_mal/atlas_weather/model/widget/WidgetData.kt
View File

@@ -3,26 +3,26 @@ package com.appttude.h_mal.atlas_weather.model.widget
import android.graphics.Bitmap
data class WidgetData(
val location: String?,
val icon: String?,
val currentTemp: String?,
val timeStamp: Long
val location: String?,
val icon: String?,
val currentTemp: String?,
val timeStamp: Long
)
data class InnerWidgetData(
val date: String?,
val icon: Bitmap?,
val highTemp: String?
val date: String?,
val icon: Bitmap?,
val highTemp: String?
)
data class InnerWidgetCellData(
val date: String?,
val icon: String?,
val highTemp: String?
val date: String?,
val icon: String?,
val highTemp: String?
)
data class WidgetWeatherCollection(
val widgetData: WidgetData,
val forecast: List<InnerWidgetCellData>
val widgetData: WidgetData,
val forecast: List<InnerWidgetCellData>
)

3
app/src/main/java/com/appttude/h_mal/atlas_weather/ui/BaseFragment.kt
View File

@@ -14,11 +14,11 @@ import androidx.lifecycle.Observer
import androidx.lifecycle.ViewModel
import androidx.swiperefreshlayout.widget.SwipeRefreshLayout
import com.appttude.h_mal.atlas_weather.application.LOCATION_PERMISSION_REQUEST
import com.appttude.h_mal.atlas_weather.viewmodel.ApplicationViewModelFactory
import com.appttude.h_mal.atlas_weather.utils.Event
import com.appttude.h_mal.atlas_weather.utils.displayToast
import com.appttude.h_mal.atlas_weather.utils.hide
import com.appttude.h_mal.atlas_weather.utils.show
import com.appttude.h_mal.atlas_weather.viewmodel.ApplicationViewModelFactory
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
@@ -27,6 +27,7 @@ import org.kodein.di.android.x.kodein
import org.kodein.di.generic.instance
import kotlin.properties.Delegates
@Suppress("EmptyMethod", "EmptyMethod")
abstract class BaseFragment(@LayoutRes contentLayoutId: Int) : Fragment(contentLayoutId),
KodeinAware {

6
app/src/main/java/com/appttude/h_mal/atlas_weather/ui/MainActivity.kt
View File

@@ -1,8 +1,6 @@
package com.appttude.h_mal.atlas_weather.ui
import android.content.Intent
import android.os.Bundle
import android.view.Menu
import android.view.MenuItem
import androidx.appcompat.app.AppCompatActivity
import androidx.navigation.NavController
@@ -12,7 +10,7 @@ import androidx.navigation.ui.setupActionBarWithNavController
import androidx.navigation.ui.setupWithNavController
import com.appttude.h_mal.atlas_weather.R
import com.google.android.material.bottomnavigation.BottomNavigationView
import kotlinx.android.synthetic.main.activity_main_navigation.*
import kotlinx.android.synthetic.main.activity_main_navigation.toolbar
class MainActivity : AppCompatActivity() {
@@ -26,7 +24,7 @@ class MainActivity : AppCompatActivity() {
setSupportActionBar(toolbar)
navHost = supportFragmentManager
.findFragmentById(R.id.container) as NavHostFragment
.findFragmentById(R.id.container) as NavHostFragment
val navController = navHost.navController
navController.setGraph(R.navigation.main_navigation)

25
app/src/main/java/com/appttude/h_mal/atlas_weather/utils/GenericTypeUtils.kt
View File

@@ -6,31 +6,32 @@ import kotlin.coroutines.resume
import kotlin.coroutines.suspendCoroutine
inline fun <reified T> parcelableCreator(
crossinline create: (Parcel) -> T) =
object : Parcelable.Creator<T> {
override fun createFromParcel(source: Parcel) = create(source)
override fun newArray(size: Int) = arrayOfNulls<T>(size)
}
crossinline create: (Parcel) -> T
) =
object : Parcelable.Creator<T> {
override fun createFromParcel(source: Parcel) = create(source)
override fun newArray(size: Int) = arrayOfNulls<T>(size)
}
suspend fun <T : Any?> tryOrNullSuspended(
call: suspend () -> T?
call: suspend () -> T?
): T? {
return try {
call.invoke()
}catch (e: Exception){
} catch (e: Exception) {
e.printStackTrace()
null
}
}
fun <T : Any?> tryOrNull(
call: () -> T?
call: () -> T?
): T? {
return try {
call.invoke()
}catch (e: Exception){
} catch (e: Exception) {
e.printStackTrace()
null
}
@@ -46,9 +47,9 @@ fun <T : Any?> tryOrNull(
*
* Both equal 2.
*/
suspend fun <T: Any> createSuspend(
call: () -> T?
): T?{
suspend fun <T : Any> createSuspend(
call: () -> T?
): T? {
return suspendCoroutine { cont ->
cont.resume(call())

6
app/src/main/java/com/appttude/h_mal/atlas_weather/utils/NavigationUtils.kt
View File

@@ -6,10 +6,10 @@ import androidx.navigation.NavDirections
import androidx.navigation.Navigation
import com.appttude.h_mal.atlas_weather.R
fun Fragment.navigateToFragment(newFragment: Fragment){
fun Fragment.navigateToFragment(newFragment: Fragment) {
childFragmentManager.beginTransaction()
.add(R.id.container, newFragment)
.commit()
.add(R.id.container, newFragment)
.commit()
}

6
app/src/main/java/com/appttude/h_mal/atlas_weather/utils/NetworkUtils.kt
View File

@@ -4,12 +4,10 @@ import android.content.Context
import android.net.ConnectivityManager
import android.net.NetworkCapabilities
fun isInternetAvailable(
context: Context
): Boolean {
fun isInternetAvailable(context: Context): Boolean {
var result = false
val connectivityManager =
context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager?
context.getSystemService(Context.CONNECTIVITY_SERVICE) as ConnectivityManager?
connectivityManager?.let {
it.getNetworkCapabilities(connectivityManager.activeNetwork)?.apply {
result = when {

13
app/src/main/java/com/appttude/h_mal/atlas_weather/utils/SecondsToDateUtils.kt
View File

@@ -1,13 +1,13 @@
package com.appttude.h_mal.atlas_weather.utils
import android.os.Build
import java.text.SimpleDateFormat
import java.time.Instant
import java.time.OffsetTime
import java.time.ZoneOffset
import java.time.format.DateTimeFormatter
import java.util.*
import java.util.Date
import java.util.Locale
fun Int.toDayString(): String {
return try {
@@ -46,13 +46,8 @@ fun Int.toSmallDayName(): String {
fun Int?.toTime(): String? {
return this?.makeMilliseconds()?.let {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.O) {
OffsetTime.ofInstant(Instant.ofEpochMilli(it), ZoneOffset.UTC).format(DateTimeFormatter.ofPattern("HH:mm"))
} else {
val date = Date(it)
val format = SimpleDateFormat("HH:mm", Locale.getDefault())
format.format(date)
}
OffsetTime.ofInstant(Instant.ofEpochMilli(it), ZoneOffset.UTC)
.format(DateTimeFormatter.ofPattern("HH:mm"))
}
}

10
app/src/main/java/com/appttude/h_mal/atlas_weather/utils/StringUtils.kt
View File

@@ -1,12 +1,12 @@
package com.appttude.h_mal.atlas_weather.utils
fun generateIconUrlString(icon: String?): String?{
fun generateIconUrlString(icon: String?): String? {
return icon?.let {
StringBuilder()
.append("http://openweathermap.org/img/wn/")
.append(it)
.append("@2x.png")
.toString()
.append("http://openweathermap.org/img/wn/")
.append(it)
.append("@2x.png")
.toString()
}
}

7
app/src/main/java/com/appttude/h_mal/atlas_weather/utils/ViewUtils.kt
View File

@@ -2,7 +2,6 @@ package com.appttude.h_mal.atlas_weather.utils
import android.app.Activity
import android.content.Context
import android.graphics.drawable.Drawable
import android.view.LayoutInflater
import android.view.View
import android.view.ViewGroup
@@ -30,10 +29,10 @@ fun Fragment.displayToast(message: String) {
}
fun ViewGroup.generateView(layoutId: Int): View = LayoutInflater
.from(context)
.inflate(layoutId, this, false)
.from(context)
.inflate(layoutId, this, false)
fun ImageView.loadImage(url: String?){
fun ImageView.loadImage(url: String?) {
Picasso.get().load(url)
.placeholder(R.drawable.ic_baseline_cloud_queue_24)
.error(R.drawable.ic_baseline_cloud_off_24)

16
app/src/main/java/com/appttude/h_mal/atlas_weather/viewmodel/ApplicationViewModelFactory.kt
View File

@@ -13,10 +13,18 @@ class ApplicationViewModelFactory(
@Suppress("UNCHECKED_CAST")
override fun <T : ViewModel> create(modelClass: Class<T>): T {
with(modelClass){
return when{
isAssignableFrom(WorldViewModel::class.java) -> WorldViewModel(locationProvider, repository)
isAssignableFrom(MainViewModel::class.java) -> MainViewModel(locationProvider, repository)
with(modelClass) {
return when {
isAssignableFrom(WorldViewModel::class.java) -> WorldViewModel(
locationProvider,
repository
)
isAssignableFrom(MainViewModel::class.java) -> MainViewModel(
locationProvider,
repository
)
else -> throw IllegalArgumentException("Unknown ViewModel class")
} as T
}

15
app/src/main/java/com/appttude/h_mal/atlas_weather/viewmodel/MainViewModel.kt
View File

@@ -17,7 +17,7 @@ import kotlinx.coroutines.launch
class MainViewModel(
private val locationProvider: LocationProvider,
private val repository: Repository
): WeatherViewModel(){
) : WeatherViewModel() {
val weatherLiveData = MutableLiveData<WeatherDisplay>()
@@ -35,8 +35,8 @@ class MainViewModel(
}
@RequiresPermission(value = Manifest.permission.ACCESS_COARSE_LOCATION)
fun fetchData(){
if (!repository.isSearchValid(CURRENT_LOCATION)){
fun fetchData() {
if (!repository.isSearchValid(CURRENT_LOCATION)) {
operationRefresh.postValue(Event(false))
return
}
@@ -48,16 +48,17 @@ class MainViewModel(
val latLong = locationProvider.getCurrentLatLong()
// Get weather from api
val weather = repository
.getWeatherFromApi(latLong.first.toString(), latLong.second.toString())
val currentLocation = locationProvider.getLocationNameFromLatLong(weather.lat, weather.lon)
.getWeatherFromApi(latLong.first.toString(), latLong.second.toString())
val currentLocation =
locationProvider.getLocationNameFromLatLong(weather.lat, weather.lon)
val fullWeather = createFullWeather(weather, currentLocation)
val entityItem = EntityItem(CURRENT_LOCATION, fullWeather)
// Save data if not null
repository.saveLastSavedAt(CURRENT_LOCATION)
repository.saveCurrentWeatherToRoom(entityItem)
}catch (e: Exception){
} catch (e: Exception) {
operationError.postValue(Event(e.message!!))
}finally {
} finally {
operationState.postValue(Event(false))
operationRefresh.postValue(Event(false))
}

31
app/src/main/java/com/appttude/h_mal/atlas_weather/viewmodel/WorldViewModel.kt
View File

@@ -15,6 +15,7 @@ import kotlinx.coroutines.launch
import java.io.IOException
const val ALL_LOADED = "all_loaded"
class WorldViewModel(
private val locationProvider: LocationProvider,
private val repository: Repository
@@ -40,7 +41,7 @@ class WorldViewModel(
}
}
fun getSingleLocation(locationName: String){
fun getSingleLocation(locationName: String) {
CoroutineScope(Dispatchers.IO).launch {
val entity = repository.getSingleWeather(locationName)
val item = WeatherDisplay(entity)
@@ -49,7 +50,7 @@ class WorldViewModel(
}
fun fetchDataForSingleLocation(locationName: String) {
if (!repository.isSearchValid(locationName)){
if (!repository.isSearchValid(locationName)) {
operationRefresh.postValue(Event(false))
return
}
@@ -72,7 +73,7 @@ class WorldViewModel(
CoroutineScope(Dispatchers.IO).launch {
operationState.postValue(Event(true))
// Check if location exists
if (repository.getSavedLocations().contains(locationName)){
if (repository.getSavedLocations().contains(locationName)) {
operationError.postValue(Event("$locationName already exists"))
return@launch
}
@@ -82,8 +83,12 @@ class WorldViewModel(
val entityItem = createWeatherEntity(locationName)
// retrieved location name
val retrievedLocation = locationProvider.getLocationNameFromLatLong(entityItem.weather.lat, entityItem.weather.lon, LocationType.City)
if (repository.getSavedLocations().contains(retrievedLocation)){
val retrievedLocation = locationProvider.getLocationNameFromLatLong(
entityItem.weather.lat,
entityItem.weather.lon,
LocationType.City
)
if (repository.getSavedLocations().contains(retrievedLocation)) {
operationError.postValue(Event("$retrievedLocation already exists"))
return@launch
}
@@ -101,7 +106,7 @@ class WorldViewModel(
}
fun fetchAllLocations() {
if (!repository.isSearchValid(ALL_LOADED)){
if (!repository.isSearchValid(ALL_LOADED)) {
operationRefresh.postValue(Event(false))
return
}
@@ -117,7 +122,8 @@ class WorldViewModel(
val entity = createWeatherEntity(locationName)
list.add(entity)
repository.saveLastSavedAt(locationName)
} catch (e: IOException) { }
} catch (e: IOException) {
}
}
repository.saveWeatherListToRoom(list)
repository.saveLastSavedAt(ALL_LOADED)
@@ -129,12 +135,12 @@ class WorldViewModel(
}
}
fun deleteLocation(locationName: String){
fun deleteLocation(locationName: String) {
CoroutineScope(Dispatchers.IO).launch {
operationState.postValue(Event(true))
try {
val success = repository.deleteSavedWeatherEntry(locationName)
if (!success){
if (!success) {
operationError.postValue(Event("Failed to delete"))
}
} catch (e: IOException) {
@@ -148,7 +154,7 @@ class WorldViewModel(
private suspend fun getWeather(locationName: String): WeatherResponse {
// Get location
val latLong =
locationProvider.getLatLongFromLocationName(locationName)
locationProvider.getLatLongFromLocationName(locationName)
val lat = latLong.first
val lon = latLong.second
@@ -158,8 +164,9 @@ class WorldViewModel(
private suspend fun createWeatherEntity(locationName: String): EntityItem {
val weather = getWeather(locationName)
val location = locationProvider.getLocationNameFromLatLong(weather.lat, weather.lon, LocationType.City)
val location =
locationProvider.getLocationNameFromLatLong(weather.lat, weather.lon, LocationType.City)
val fullWeather = createFullWeather(weather, location)
return createWeatherEntity(location,fullWeather)
return createWeatherEntity(location, fullWeather)
}
}

Some files were not shown because too many files have changed in this diff Show More