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

Lint fixes (#19)

Browse Source 
- Code inspection
 - Redundant resources removed
 - Resources moved the corresponding flavours
 - Deprecated dependencies upgraded
 - lint changes
 - circleci updated to capture screenshot
This commit is contained in:
hmalik144
2023-08-09 00:21:15 +01:00
committed by GitHub
parent baabebd40d
commit ce1d13e630
177 changed files with 1393 additions and 1265 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
.circleci/config.yml
View File

@@ -14,17 +14,11 @@ commands:
description: checkout repo and android dependencies
steps:
- checkout
- android/restore-gradle-cache
build_gradle:
description: Build the gradle
steps:
- android/restore-gradle-cache
- run:
name: Download Dependencies
name: Give gradle permissions
command: |
sudo chmod +x ./gradlew
./gradlew androidDependencies
- android/save-gradle-cache
- android/restore-gradle-cache
run_tests:
description: run tests for flavour specified
parameters:
@@ -33,11 +27,11 @@ commands:
default: "AtlasWeather"
steps:
# The next step will run the unit tests
- build_gradle
- run:
name: Run non-instrumentation unit tests
command: |
./gradlew test<< parameters.flavour >>DebugUnitTest --continue
./gradlew test<< parameters.flavour >>DebugUnitTest
- android/save-gradle-cache
- store_artifacts:
path: app/build/reports
destination: reports
@@ -49,24 +43,27 @@ commands:
flavour:
type: string
default: "AtlasWeather"
package_suffix:
type: string
default: "atlas_weather"
steps:
- build_gradle
- android/start-emulator-and-run-tests:
post-emulator-launch-assemble-command: ./gradlew assemble<< parameters.flavour >>DebugAndroidTest
test-command: ./gradlew connected<< parameters.flavour >>DebugAndroidTest
test-command: ./gradlew connected<< parameters.flavour >>DebugAndroidTest --continue
system-image: system-images;android-26;google_apis;x86
pull-data: true
pull-data-path: /storage/emulated/0/Android/data/
pull-data-target: ~/app-data
restore-gradle-cache-prefix: v1a
# store screenshots for failed ui tests
- when:
condition: on_fail
steps:
- store_artifacts:
path: ~/app-data
destination: screenshots
# store test reports
- store_artifacts:
path: app/build/reports/androidTests/connected
destination: reports
# store screenshots for failed ui tests
- store_artifacts:
path: ~/app-data
destination: screenshots
- store_test_results:
path: app/build/outputs/androidTest-results/connected
deploy_to_play_store:
@@ -83,7 +80,6 @@ commands:
name: Setup playstore key
command: |
echo "$GOOGLE_PLAY_KEY" > "google-play-key.json"
- build_gradle
- run:
name: Run fastlane command to deploy to playstore
command: |
@@ -101,6 +97,9 @@ jobs:
flavour:
type: string
default: "AtlasWeather"
package_suffix:
type: string
default: "atlas_weather"
# These next lines define the Android machine image executor.
# See: https://circleci.com/docs/2.0/executor-types/
executor:
@@ -138,6 +137,7 @@ workflows:
- build-and-test:
context: appttude
flavour: "MonoWeather"
package_suffix: "monoWeather"
filters:
branches:
ignore:
@@ -156,6 +156,7 @@ workflows:
- build-and-test:
context: appttude
flavour: "AtlasWeather"
package_suffix: "atlas_weather"
filters:
branches:
ignore:

13
.idea/androidTestResultsUserPreferences.xml generated
View File

@@ -29,6 +29,19 @@
</AndroidTestResultsTableState>
</value>
</entry>
<entry key="-1906103057">
<value>
<AndroidTestResultsTableState>
<option name="preferredColumnWidths">
<map>
<entry key="Duration" value="90" />
<entry key="Pixel_2_API_27" value="120" />
<entry key="Tests" value="360" />
</map>
</option>
</AndroidTestResultsTableState>
</value>
</entry>
<entry key="-409920851">
<value>
<AndroidTestResultsTableState>

29
app/build.gradle
View File

@@ -96,32 +96,29 @@ 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 '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'
testImplementation 'org.jetbrains.kotlinx:kotlinx-coroutines-test:1.6.1'
/ * 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"
/ * Fragment Navigation * /
implementation 'androidx.navigation:navigation-fragment-ktx:2.3.2'
implementation 'androidx.navigation:navigation-ui-ktx:2.3.2'
/ * 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 +146,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,7 +161,7 @@ dependencies {
implementation "org.kodein.di:kodein-di-framework-android-x:$kodein_version"
/ * Room database * /
def room_version = "2.3.0-alpha03"
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"
@@ -182,7 +179,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()
}

2
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

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"
}

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

@@ -6,6 +6,7 @@ import androidx.test.espresso.ViewAction
import androidx.test.espresso.matcher.ViewMatchers.isAssignableFrom
import org.hamcrest.Matcher
@Suppress("EmptyMethod")
open class BaseViewAction : ViewAction {
override fun getDescription(): String? = setDescription()
@@ -15,9 +16,7 @@ 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)

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(
".",
"-"
)
}
}

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

@@ -5,7 +5,10 @@ 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)
fun isDisplayed() = matchViewWaitFor(R.id.temp_main_4)
}

2
app/src/androidTestAtlasWeather/java/com/appttude/h_mal/atlas_weather/tests/HomePageUITest.kt
View File

@@ -16,7 +16,7 @@ class HomePageUITest : BaseTest<MainActivity>(MainActivity::class.java) {
@Test
fun loadApp_validWeatherResponse_returnsValidPage() {
homeScreen {
waitFor(2000)
isDisplayed()
verifyCurrentTemperature(2)
verifyCurrentLocation("Mock Location")
}

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

@@ -1,11 +1,14 @@
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)
fun isDisplayed() = matchViewWaitFor(R.id.temp_main_4)
}

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() }

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

@@ -1,9 +1,9 @@
package com.appttude.h_mal.monoWeather.tests
import com.appttude.h_mal.monoWeather.robot.homeScreen
import 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
class HomePageUITest : MonoBaseTest() {
@@ -15,6 +15,7 @@ class HomePageUITest : MonoBaseTest() {
@Test
fun loadApp_validWeatherResponse_returnsValidPage() {
homeScreen {
isDisplayed()
verifyCurrentTemperature(2)
verifyCurrentLocation("Mock Location")
}

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" />

17
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,11 +56,7 @@ 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")
@@ -64,10 +64,9 @@ class NotificationReceiver : BroadcastReceiver() {
// .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
val notificationManager =
context!!.getSystemService(Context.NOTIFICATION_SERVICE) as NotificationManager
notificationManager.notify(0, notification)
}
}

6
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)
}

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)
}

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

@@ -10,7 +10,8 @@ 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 {

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

@@ -26,14 +26,17 @@ class WeatherRecyclerAdapter(
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)
@@ -74,10 +77,12 @@ class WeatherRecyclerAdapter(
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)

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

@@ -38,7 +38,12 @@ class SettingsFragment : PreferenceFragmentCompat() {
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
)
}
}

11
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
/**

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

@@ -27,6 +27,7 @@ class WorldRecyclerAdapter(
val emptyViewHolder = View(parent.context)
EmptyViewHolder(emptyViewHolder)
}
is ViewType.Current -> {
val viewCurrent = parent.generateView(R.layout.db_list_item)
WorldHolderCurrent(viewCurrent)
@@ -57,6 +58,7 @@ class WorldRecyclerAdapter(
holder as EmptyViewHolder
}
is ViewType.Current -> {
val viewHolderCurrent = holder as WorldHolderCurrent
viewHolderCurrent.bindData(weather[position])
@@ -90,7 +92,6 @@ class WorldRecyclerAdapter(
}
internal class EmptyViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView)
}

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

@@ -2,9 +2,9 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<gradient
android:startColor="@color/colour_two"
android:angle="45"
android:centerColor="@color/colour_three"
android:endColor="@color/colour_four"
android:type="linear"
android:angle="45"/>
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>

62
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,9 +197,9 @@
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">
@@ -205,8 +215,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="3"
android:text="11mm"
/>
android:text="11mm" />
</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"
@@ -259,8 +271,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="3"
android:text="7"
/>
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>

7
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"
@@ -23,13 +22,13 @@
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

27
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"
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

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>

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>

28
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
@@ -29,7 +28,7 @@ class LocationProviderImpl(
) : LocationProvider, LocationHelper(applicationContext) {
private var locationManager =
applicationContext.getSystemService(Context.LOCATION_SERVICE) as LocationManager?
private val client = FusedLocationProviderClient(applicationContext)
private val client = LocationServices.getFusedLocationProviderClient(applicationContext)
private val geoCoder: Geocoder by lazy { Geocoder(applicationContext, Locale.getDefault()) }
@RequiresPermission(value = ACCESS_COARSE_LOCATION)
@@ -60,6 +59,7 @@ class LocationProviderImpl(
?: 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)
}

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

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

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

@@ -9,6 +9,7 @@ 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
) {
@@ -25,7 +26,7 @@ class PreferenceProvider(
).apply()
}
fun getLastSavedAt(locationName: String): Long? {
fun getLastSavedAt(locationName: String): Long {
return preference.getLong(locationName, 0L)
}
@@ -43,7 +44,7 @@ class PreferenceProvider(
preference.edit().putBoolean("FIRST_TIME_RUN", false).apply()
}
fun isWidgetBlackground(): Boolean {
fun isWidgetBackground(): Boolean {
return preference.getBoolean("widget_black_background", false)
}

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

@@ -41,11 +41,11 @@ class RepositoryImpl(
.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

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

@@ -10,5 +10,5 @@ class SettingsRepositoryImpl(
override fun setFirstTime() = prefs.setFirstTimeRun()
override fun isBlackBackground() = prefs.isWidgetBlackground()
override fun isBlackBackground() = prefs.isWidgetBackground()
}

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

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

@@ -41,7 +41,8 @@ class ServicesHelper(
// Get weather from api
val weather = repository
.getWeatherFromApi(latLong.first.toString(), latLong.second.toString())
val currentLocation = locationProvider.getLocationNameFromLatLong(weather.lat, weather.lon)
val currentLocation =
locationProvider.getLocationNameFromLatLong(weather.lat, weather.lon)
val fullWeather = FullWeather(weather).apply {
temperatureUnit = "°C"
locationString = currentLocation

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 {

4
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() {

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

@@ -6,7 +6,8 @@ import kotlin.coroutines.resume
import kotlin.coroutines.suspendCoroutine
inline fun <reified T> parcelableCreator(
crossinline create: (Parcel) -> T) =
crossinline create: (Parcel) -> T
) =
object : Parcelable.Creator<T> {
override fun createFromParcel(source: Parcel) = create(source)
override fun newArray(size: Int) = arrayOfNulls<T>(size)

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

@@ -4,9 +4,7 @@ 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?

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"))
}
}

1
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

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

@@ -15,8 +15,16 @@ class ApplicationViewModelFactory(
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)
isAssignableFrom(WorldViewModel::class.java) -> WorldViewModel(
locationProvider,
repository
)
isAssignableFrom(MainViewModel::class.java) -> MainViewModel(
locationProvider,
repository
)
else -> throw IllegalArgumentException("Unknown ViewModel class")
} as T
}

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

@@ -49,7 +49,8 @@ class MainViewModel(
// Get weather from api
val weather = repository
.getWeatherFromApi(latLong.first.toString(), latLong.second.toString())
val currentLocation = locationProvider.getLocationNameFromLatLong(weather.lat, weather.lon)
val currentLocation =
locationProvider.getLocationNameFromLatLong(weather.lat, weather.lon)
val fullWeather = createFullWeather(weather, currentLocation)
val entityItem = EntityItem(CURRENT_LOCATION, fullWeather)
// Save data if not null

13
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
@@ -82,7 +83,11 @@ class WorldViewModel(
val entityItem = createWeatherEntity(locationName)
// retrieved location name
val retrievedLocation = locationProvider.getLocationNameFromLatLong(entityItem.weather.lat, entityItem.weather.lon, LocationType.City)
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
@@ -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)
@@ -158,7 +164,8 @@ 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)
}

12
app/src/main/java/com/appttude/h_mal/atlas_weather/widget/BaseWidgetServiceIntentClass.kt
View File

@@ -8,7 +8,6 @@ import android.appwidget.AppWidgetManager
import android.appwidget.AppWidgetProvider
import android.content.ComponentName
import android.content.Intent
import android.os.Build
import android.widget.RemoteViews
import androidx.annotation.IdRes
import androidx.annotation.LayoutRes
@@ -43,11 +42,12 @@ abstract class BaseWidgetServiceIntentClass<T : AppWidgetProvider> : JobIntentSe
val idArray = intArrayOf(appWidgetId)
intentUpdate.putExtra(AppWidgetManager.EXTRA_APPWIDGET_IDS, idArray)
return if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.S) {
PendingIntent.getBroadcast(this, seconds, intentUpdate, PendingIntent.FLAG_UPDATE_CURRENT or PendingIntent.FLAG_IMMUTABLE)
} else {
PendingIntent.getBroadcast(this, seconds, intentUpdate, PendingIntent.FLAG_UPDATE_CURRENT)
}
return PendingIntent.getBroadcast(
this,
seconds,
intentUpdate,
PendingIntent.FLAG_UPDATE_CURRENT or FLAG_IMMUTABLE
)
}
/**

6
app/src/main/java/com/appttude/h_mal/atlas_weather/widget/NewAppWidget.kt
View File

@@ -11,7 +11,11 @@ import com.appttude.h_mal.atlas_weather.widget.WidgetJobServiceIntent.Companion.
*/
class NewAppWidget : AppWidgetProvider() {
override fun onUpdate(context: Context, appWidgetManager: AppWidgetManager, appWidgetIds: IntArray) {
override fun onUpdate(
context: Context,
appWidgetManager: AppWidgetManager,
appWidgetIds: IntArray
) {
super.onUpdate(context, appWidgetManager, appWidgetIds)
loadWidget(context)

9
app/src/main/java/com/appttude/h_mal/atlas_weather/widget/WidgetJobServiceIntent.kt
View File

@@ -10,17 +10,16 @@ import android.content.pm.PackageManager.PERMISSION_GRANTED
import android.icu.text.SimpleDateFormat
import android.os.PowerManager
import android.widget.RemoteViews
import android.os.Build
import androidx.core.app.ActivityCompat.checkSelfPermission
import com.appttude.h_mal.atlas_weather.R
import com.appttude.h_mal.atlas_weather.widget.WidgetState.*
import com.appttude.h_mal.atlas_weather.widget.WidgetState.Companion.getWidgetState
import com.appttude.h_mal.atlas_weather.helper.ServicesHelper
import com.appttude.h_mal.atlas_weather.model.widget.InnerWidgetCellData
import com.appttude.h_mal.atlas_weather.model.widget.WidgetWeatherCollection
import com.appttude.h_mal.atlas_weather.ui.MainActivity
import com.appttude.h_mal.atlas_weather.utils.isInternetAvailable
import com.appttude.h_mal.atlas_weather.utils.tryOrNullSuspended
import com.appttude.h_mal.atlas_weather.widget.WidgetState.*
import com.appttude.h_mal.atlas_weather.widget.WidgetState.Companion.getWidgetState
import kotlinx.coroutines.CoroutineScope
import kotlinx.coroutines.Dispatchers
import kotlinx.coroutines.launch
@@ -34,6 +33,7 @@ import java.util.*
* Implementation of a JobIntentService used for home screen widget
*/
const val HALF_DAY = 43200000L
class WidgetJobServiceIntent : BaseWidgetServiceIntentClass<NewAppWidget>() {
private val kodein = LateInitKodein()
@@ -167,6 +167,7 @@ class WidgetJobServiceIntent : BaseWidgetServiceIntentClass<NewAppWidget>() {
}
}
@SuppressLint("DiscouragedApi")
private fun loadCells(
appWidgetId: Int,
remoteViews: RemoteViews,
@@ -189,7 +190,7 @@ class WidgetJobServiceIntent : BaseWidgetServiceIntentClass<NewAppWidget>() {
}
private fun setLastUpdated(views: RemoteViews, timeStamp: Long?) {
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N && timeStamp != null) {
if (timeStamp != null) {
val difference = System.currentTimeMillis().minus(timeStamp)
val status = if (difference > HALF_DAY) {

34
app/src/main/res/drawable-v24/ic_launcher_foreground.xml
View File

@@ -1,34 +0,0 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:aapt="http://schemas.android.com/aapt"
android:width="108dp"
android:height="108dp"
android:viewportHeight="108"
android:viewportWidth="108">
<path
android:fillType="evenOdd"
android:pathData="M32,64C32,64 38.39,52.99 44.13,50.95C51.37,48.37 70.14,49.57 70.14,49.57L108.26,87.69L108,109.01L75.97,107.97L32,64Z"
android:strokeColor="#00000000"
android:strokeWidth="1">
<aapt:attr name="android:fillColor">
<gradient
android:endX="78.5885"
android:endY="90.9159"
android:startX="48.7653"
android:startY="61.0927"
android:type="linear">
<item
android:color="#44000000"
android:offset="0.0" />
<item
android:color="#00000000"
android:offset="1.0" />
</gradient>
</aapt:attr>
</path>
<path
android:fillColor="#FFFFFF"
android:fillType="nonZero"
android:pathData="M66.94,46.02L66.94,46.02C72.44,50.07 76,56.61 76,64L32,64C32,56.61 35.56,50.11 40.98,46.06L36.18,41.19C35.45,40.45 35.45,39.3 36.18,38.56C36.91,37.81 38.05,37.81 38.78,38.56L44.25,44.05C47.18,42.57 50.48,41.71 54,41.71C57.48,41.71 60.78,42.57 63.68,44.05L69.11,38.56C69.84,37.81 70.98,37.81 71.71,38.56C72.44,39.3 72.44,40.45 71.71,41.19L66.94,46.02ZM62.94,56.92C64.08,56.92 65,56.01 65,54.88C65,53.76 64.08,52.85 62.94,52.85C61.8,52.85 60.88,53.76 60.88,54.88C60.88,56.01 61.8,56.92 62.94,56.92ZM45.06,56.92C46.2,56.92 47.13,56.01 47.13,54.88C47.13,53.76 46.2,52.85 45.06,52.85C43.92,52.85 43,53.76 43,54.88C43,56.01 43.92,56.92 45.06,56.92Z"
android:strokeColor="#00000000"
android:strokeWidth="1" />
</vector>

13
app/src/main/res/drawable/ic_baseline_add_24.xml
View File

@@ -1,5 +1,10 @@
<vector android:height="24dp" android:tint="#000000"
android:viewportHeight="24" android:viewportWidth="24"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="@android:color/black" android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"/>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:tint="#000000"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="@android:color/black"
android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z" />
</vector>

13
app/src/main/res/drawable/ic_baseline_cloud_off_24.xml
View File

@@ -1,5 +1,10 @@
<vector android:height="128dp" android:tint="#FFFFFF"
android:viewportHeight="24" android:viewportWidth="24"
android:width="128dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="@android:color/white" android:pathData="M19.35,10.04C18.67,6.59 15.64,4 12,4c-1.48,0 -2.85,0.43 -4.01,1.17l1.46,1.46C10.21,6.23 11.08,6 12,6c3.04,0 5.5,2.46 5.5,5.5v0.5H19c1.66,0 3,1.34 3,3 0,1.13 -0.64,2.11 -1.56,2.62l1.45,1.45C23.16,18.16 24,16.68 24,15c0,-2.64 -2.05,-4.78 -4.65,-4.96zM3,5.27l2.75,2.74C2.56,8.15 0,10.77 0,14c0,3.31 2.69,6 6,6h11.73l2,2L21,20.73 4.27,4 3,5.27zM7.73,10l8,8H6c-2.21,0 -4,-1.79 -4,-4s1.79,-4 4,-4h1.73z"/>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="128dp"
android:height="128dp"
android:tint="#FFFFFF"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="@android:color/white"
android:pathData="M19.35,10.04C18.67,6.59 15.64,4 12,4c-1.48,0 -2.85,0.43 -4.01,1.17l1.46,1.46C10.21,6.23 11.08,6 12,6c3.04,0 5.5,2.46 5.5,5.5v0.5H19c1.66,0 3,1.34 3,3 0,1.13 -0.64,2.11 -1.56,2.62l1.45,1.45C23.16,18.16 24,16.68 24,15c0,-2.64 -2.05,-4.78 -4.65,-4.96zM3,5.27l2.75,2.74C2.56,8.15 0,10.77 0,14c0,3.31 2.69,6 6,6h11.73l2,2L21,20.73 4.27,4 3,5.27zM7.73,10l8,8H6c-2.21,0 -4,-1.79 -4,-4s1.79,-4 4,-4h1.73z" />
</vector>

13
app/src/main/res/drawable/ic_baseline_cloud_queue_24.xml
View File

@@ -1,5 +1,10 @@
<vector android:height="24dp" android:tint="#FFFFFF"
android:viewportHeight="24" android:viewportWidth="24"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="@android:color/white" android:pathData="M19.35,10.04C18.67,6.59 15.64,4 12,4 9.11,4 6.6,5.64 5.35,8.04 2.34,8.36 0,10.91 0,14c0,3.31 2.69,6 6,6h13c2.76,0 5,-2.24 5,-5 0,-2.64 -2.05,-4.78 -4.65,-4.96zM19,18H6c-2.21,0 -4,-1.79 -4,-4s1.79,-4 4,-4h0.71C7.37,7.69 9.48,6 12,6c3.04,0 5.5,2.46 5.5,5.5v0.5H19c1.66,0 3,1.34 3,3s-1.34,3 -3,3z"/>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:tint="#FFFFFF"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="@android:color/white"
android:pathData="M19.35,10.04C18.67,6.59 15.64,4 12,4 9.11,4 6.6,5.64 5.35,8.04 2.34,8.36 0,10.91 0,14c0,3.31 2.69,6 6,6h13c2.76,0 5,-2.24 5,-5 0,-2.64 -2.05,-4.78 -4.65,-4.96zM19,18H6c-2.21,0 -4,-1.79 -4,-4s1.79,-4 4,-4h0.71C7.37,7.69 9.48,6 12,6c3.04,0 5.5,2.46 5.5,5.5v0.5H19c1.66,0 3,1.34 3,3s-1.34,3 -3,3z" />
</vector>

13
app/src/main/res/drawable/ic_baseline_home_24.xml
View File

@@ -1,5 +1,10 @@
<vector android:height="24dp" android:tint="#FFFFFF"
android:viewportHeight="24" android:viewportWidth="24"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="@android:color/white" android:pathData="M10,20v-6h4v6h5v-8h3L12,3 2,12h3v8z"/>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:tint="#FFFFFF"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="@android:color/white"
android:pathData="M10,20v-6h4v6h5v-8h3L12,3 2,12h3v8z" />
</vector>

13
app/src/main/res/drawable/ic_baseline_public_24.xml
View File

@@ -1,5 +1,10 @@
<vector android:height="24dp" android:tint="#FFFFFF"
android:viewportHeight="24" android:viewportWidth="24"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<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"/>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:tint="#FFFFFF"
android:viewportWidth="24"
android:viewportHeight="24">
<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" />
</vector>

13
app/src/main/res/drawable/ic_round_settings_24.xml
View File

@@ -1,5 +1,10 @@
<vector android:height="24dp" android:tint="#FFFFFF"
android:viewportHeight="24" android:viewportWidth="24"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="@android:color/white" android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98s-0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.12,-0.22 -0.39,-0.3 -0.61,-0.22l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59 -1.69,0.98l-2.49,-1c-0.23,-0.09 -0.49,0 -0.61,0.22l-2,3.46c-0.13,0.22 -0.07,0.49 0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98s0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.12,0.22 0.39,0.3 0.61,0.22l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42 0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.23,0.09 0.49,0 0.61,-0.22l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM12,15.5c-1.93,0 -3.5,-1.57 -3.5,-3.5s1.57,-3.5 3.5,-3.5 3.5,1.57 3.5,3.5 -1.57,3.5 -3.5,3.5z"/>
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="24dp"
android:height="24dp"
android:tint="#FFFFFF"
android:viewportWidth="24"
android:viewportHeight="24">
<path
android:fillColor="@android:color/white"
android:pathData="M19.43,12.98c0.04,-0.32 0.07,-0.64 0.07,-0.98s-0.03,-0.66 -0.07,-0.98l2.11,-1.65c0.19,-0.15 0.24,-0.42 0.12,-0.64l-2,-3.46c-0.12,-0.22 -0.39,-0.3 -0.61,-0.22l-2.49,1c-0.52,-0.4 -1.08,-0.73 -1.69,-0.98l-0.38,-2.65C14.46,2.18 14.25,2 14,2h-4c-0.25,0 -0.46,0.18 -0.49,0.42l-0.38,2.65c-0.61,0.25 -1.17,0.59 -1.69,0.98l-2.49,-1c-0.23,-0.09 -0.49,0 -0.61,0.22l-2,3.46c-0.13,0.22 -0.07,0.49 0.12,0.64l2.11,1.65c-0.04,0.32 -0.07,0.65 -0.07,0.98s0.03,0.66 0.07,0.98l-2.11,1.65c-0.19,0.15 -0.24,0.42 -0.12,0.64l2,3.46c0.12,0.22 0.39,0.3 0.61,0.22l2.49,-1c0.52,0.4 1.08,0.73 1.69,0.98l0.38,2.65c0.03,0.24 0.24,0.42 0.49,0.42h4c0.25,0 0.46,-0.18 0.49,-0.42l0.38,-2.65c0.61,-0.25 1.17,-0.59 1.69,-0.98l2.49,1c0.23,0.09 0.49,0 0.61,-0.22l2,-3.46c0.12,-0.22 0.07,-0.49 -0.12,-0.64l-2.11,-1.65zM12,15.5c-1.93,0 -3.5,-1.57 -3.5,-3.5s1.57,-3.5 3.5,-3.5 3.5,1.57 3.5,3.5 -1.57,3.5 -3.5,3.5z" />
</vector>

BIN
app/src/main/res/drawable/location_permission_decl.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 14 KiB

BIN
app/src/main/res/drawable/refreshing.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 978 B

7
app/src/main/res/drawable/somethingnew.xml
View File

@@ -1,6 +1,6 @@
<vector xmlns:android="http://schemas.android.com/apk/res/android"
android:width="94dp"
android:height="275dp"
android:width="68dp"
android:height="200dp"
android:viewportWidth="94.0"
android:viewportHeight="275.0">
<path
@@ -14,7 +14,8 @@
android:pathData="M305.949,424.6c0-1.9,0-1.9,0-3.799v-95.602c0-11.5-7.6-19.1-19.099-19.1c-11.5,0-19.1,7.6-19.1,19.1v95.602
c0,1.898,0,1.898,0,3.799c-23,7.701-38.2,28.701-38.2,53.5c0,32.5,24.9,57.4,57.4,57.4c32.499,0,57.399-24.9,57.399-57.4
C344.25,453.301,328.949,432.301,305.949,424.6z" />
<path android:fillColor="#000000"
<path
android:fillColor="#000000"
android:pathData="M75.1515587070021,188.25562584016225 V29.53767503746845 c0,-14.982132974790945 -11.77674089383421,-26.46075177701539 -27.147989048437097,-26.46075177701539 c-15.371248154602887,0 -27.147989048437097,12.354497345366072 -27.147989048437097,26.46075177701539 v158.672312920709 c-10.878114078642042,7.929466747673202 -18.067128600179394,21.15938164747398 -18.067128600179394,35.2656360791233 c0,24.66289582004048 19.911678378731743,44.07052038123121 45.21511764861649,44.07052038123121 c25.303439269884752,0 45.21464468713481,-19.407624561190733 45.21464468713481,-44.07052038123121 C93.21821434569982,209.36936960565146 85.98237663747612,196.1850925878354 75.1515587070021,188.25562584016225 zM48.003569658565006,258.78689799840873 c-19.911678378731743,0 -36.1815533485268,-15.857089540518738 -36.1815533485268,-35.2656360791233 c0,-13.229914899800779 7.236310669705359,-24.66289582004048 18.067128600179394,-30.83922251530968 V29.53767503746845 c0,-9.680762845249534 8.134937484897527,-17.60976860421582 18.067128600179394,-17.60976860421582 s18.06665563869771,7.929005758966285 18.06665563869771,17.60976860421582 v163.09734351840189 c10.878114078642042,6.177248672683036 18.06760156166107,17.610229592922735 18.06760156166107,30.840144492723518 C84.1851230070918,242.88278760978457 67.91477507581507,258.78689799840873 48.003569658565006,258.78689799840873 z" />
<path
android:name="inner"

15
app/src/main/res/layout/activity_add_forecast.xml
View File

@@ -3,8 +3,7 @@
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
tools:context="com.appttude.h_mal.atlas_weather.ui.world.AddLocationFragment">
android:orientation="vertical">
<LinearLayout
@@ -18,20 +17,21 @@
<EditText
android:id="@+id/location_name_tv"
android:layout_width="match_parent"
android:layout_height="wrap_content"
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"/>
tools:text="Greater London"
android:autofillHints="addressLocality" />
<Button
android:id="@+id/submit"
style="?android:attr/borderlessButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right"
android:layout_gravity="end"
android:text="@string/submit"
android:textColor="#ffffff"
android:textStyle="bold" />
@@ -44,11 +44,12 @@
android:layout_height="match_parent"
android:background="@android:color/black"
android:visibility="gone">
<ProgressBar
android:layout_gravity="center"
style="?android:attr/progressBarStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
android:layout_height="wrap_content"
android:layout_gravity="center" />
</FrameLayout>

127
app/src/main/res/layout/activity_further_info.xml
View File

@@ -1,12 +1,15 @@
<?xml version="1.0" encoding="utf-8"?>
<ScrollView 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">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="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"
@@ -15,13 +18,16 @@
<FrameLayout style="@style/icon_frame_style">
<ImageView
android:src="@drawable/somethingnew"
style="@style/icon_style__further_deatils" />
style="@style/icon_style__further_details"
android:contentDescription="@string/temperature"
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"
@@ -41,16 +47,16 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:text="Max: " />
android:text="@string/max_header" />
<TextView
android:id="@+id/maxtemp"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="3"
android:text="85%"
/>
tools:text="85%" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
@@ -59,16 +65,17 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:text="Average: " />
android:text="@string/average_header" />
<TextView
android:id="@+id/averagetemp"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="3"
android:text="11mm"
/>
tools:ignore="InOrMmUsage"
tools:text="11mm" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
@@ -77,15 +84,15 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:text="Min: " />
android:text="@string/min_header" />
<TextView
android:id="@+id/minimumtemp"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="3"
android:text="11mm"
/>
tools:ignore="InOrMmUsage"
tools:text="11mm" />
</LinearLayout>
@@ -94,21 +101,23 @@
</RelativeLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<FrameLayout
style="@style/icon_frame_style">
<FrameLayout style="@style/icon_frame_style">
<ImageView
android:src="@drawable/breeze"
style="@style/icon_style__further_deatils" />
style="@style/icon_style__further_details"
android:contentDescription="@string/image_string"
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"
@@ -118,41 +127,42 @@
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:layout_weight="3">
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:text="Wind: " />
android:text="@string/wind_header" />
<TextView
android:id="@+id/windtext"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="3"
android:text="7mph"
/>
tools:text="7mph" />
</LinearLayout>
</LinearLayout>
</RelativeLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<FrameLayout
style="@style/icon_frame_style">
<FrameLayout style="@style/icon_frame_style">
<ImageView
android:src="@drawable/water_drop"
style="@style/icon_style__further_deatils" />
style="@style/icon_style__further_details"
android:contentDescription="@string/image_string"
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"
@@ -172,16 +182,16 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:text="Humidity: " />
android:text="@string/humidity_header" />
<TextView
android:id="@+id/humiditytext"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="3"
android:text="85%"
/>
tools:text="85%" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
@@ -190,15 +200,15 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:text="Precip: " />
android:text="@string/precip_header" />
<TextView
android:id="@+id/preciptext"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="3"
android:text="11mm"
/>
tools:ignore="InOrMmUsage"
tools:text="11mm" />
</LinearLayout>
@@ -207,21 +217,24 @@
</RelativeLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<FrameLayout
style="@style/icon_frame_style">
<FrameLayout style="@style/icon_frame_style">
<ImageView
android:src="@drawable/cloud_symbol"
style="@style/icon_style__further_deatils" />
style="@style/icon_style__further_details"
android:contentDescription="@string/image_string"
android:src="@drawable/cloud_symbol" />
</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"
@@ -241,14 +254,14 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:text="Cloud:" />
android:text="@string/cloud_header" />
<TextView
android:id="@+id/cloudtext"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="3"
android:text="06:12pm" />
tools:text="06:12pm" />
</LinearLayout>
</LinearLayout>
</LinearLayout>
@@ -256,21 +269,24 @@
</RelativeLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
<FrameLayout
style="@style/icon_frame_style">
<FrameLayout style="@style/icon_frame_style">
<ImageView
android:src="@drawable/sunrise"
style="@style/icon_style__further_deatils" />
style="@style/icon_style__further_details"
android:contentDescription="@string/image_string"
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"
@@ -290,15 +306,14 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:text="UV: " />
android:text="@string/uv_header" />
<TextView
android:id="@+id/uvtext"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="3"
android:text="7"
/>
tools:text="7" />
</LinearLayout>
<LinearLayout
@@ -309,15 +324,16 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:text="Sunrise:" />
android:text="@string/sunrise_header" />
<TextView
android:id="@+id/sunrisetext"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="3"
android:text="05:30am" />
tools:text="05:30am" />
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content">
@@ -326,15 +342,14 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:text="Sunset:" />
android:text="@string/sunset_header" />
<TextView
android:id="@+id/sunsettext"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="3"
android:text="06:12pm"
/>
tools:text="06:12pm" />
</LinearLayout>
</LinearLayout>
</LinearLayout>

3
app/src/main/res/layout/activity_main_navigation.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"

19
app/src/main/res/layout/db_list_item.xml
View File

@@ -1,23 +1,19 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="24dp"
android:layout_marginTop="6dp"
android:layout_marginRight="24dp"
android:layout_marginBottom="6dp"
android:layout_height="wrap_content">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<ImageView
android:id="@+id/db_icon"
android:layout_width="64dp"
android:layout_height="64dp"
android:contentDescription="@string/icon"
tools:src="@drawable/cloud_symbol"
tools:tint="@color/colour_one" />
@@ -25,7 +21,7 @@
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginLeft="15dp"
android:layout_marginStart="15dp"
android:layout_weight="1"
android:orientation="vertical">
@@ -49,7 +45,7 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginRight="4dp"
android:layout_marginEnd="4dp"
android:orientation="horizontal">
<TextView
@@ -64,9 +60,6 @@
android:id="@+id/db_temp_unit"
android:layout_width="wrap_content"
android:layout_height="match_parent"
android:text="°" />
android:text="@string/degree_sign" />
</LinearLayout>
</LinearLayout>
</RelativeLayout>

32
app/src/main/res/layout/empty_state_layout.xml
View File

@@ -5,35 +5,37 @@
android:layout_height="match_parent">
<ImageView
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintVertical_bias="0.45"
android:id="@+id/icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:contentDescription="@string/image_string"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:layout_constraintVertical_bias="0.45"
app:srcCompat="@drawable/ic_baseline_cloud_off_24" />
<TextView
android:id="@+id/header_text"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@id/icon"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
android:text="@string/retrieve_warning"
android:textSize="16sp"
android:text="Unable to retrieve weather"/>
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@id/icon" />
<TextView
android:id="@+id/body_text"
android:layout_width="0dp"
android:layout_height="wrap_content"
app:layout_constraintTop_toBottomOf="@id/header_text"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
android:gravity="center"
app:layout_constraintWidth_percent="0.65"
android:layout_marginTop="6dp"
android:gravity="center"
android:text="@string/empty_retrieve_warning"
android:textSize="12sp"
android:text="Make sure you are connected to the internet and have location permissions granted"/>
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@id/header_text"
app:layout_constraintWidth_percent="0.65" />
</androidx.constraintlayout.widget.ConstraintLayout>

19
app/src/main/res/layout/fragment__two.xml
View File

@@ -6,25 +6,25 @@
tools:context="com.appttude.h_mal.atlas_weather.ui.world.WorldFragment">
<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"
tools:listitem="@layout/db_list_item">
</androidx.recyclerview.widget.RecyclerView>
app:layout_constraintTop_toTopOf="parent"
tools:listitem="@layout/db_list_item" />
<com.google.android.material.floatingactionbutton.FloatingActionButton
android:id="@+id/floatingActionButton"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentBottom="true"
android:layout_alignParentEnd="true"
android:layout_marginBottom="20dp"
android:layout_alignParentBottom="true"
android:layout_marginEnd="20dp"
android:layout_marginBottom="20dp"
android:contentDescription="@string/image_string"
app:srcCompat="@drawable/ic_baseline_add_24" />
<FrameLayout
@@ -34,10 +34,11 @@
android:background="@android:color/black"
android:visibility="gone"
tools:visibility="visible">
<ProgressBar
android:layout_gravity="center"
style="?android:attr/progressBarStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
android:layout_height="wrap_content"
android:layout_gravity="center" />
</FrameLayout>
</RelativeLayout>

18
app/src/main/res/layout/fragment_home.xml
View File

@@ -1,22 +1,21 @@
<?xml version="1.0" encoding="utf-8"?>
<RelativeLayout 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"
android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto">
android:layout_height="match_parent">
<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
android:id="@+id/swipe_refresh"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/swipe_refresh">
android:layout_height="wrap_content">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/forecast_listview"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/forecast_listview"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager"
tools:listitem="@layout/db_list_item">
</androidx.recyclerview.widget.RecyclerView>
tools:listitem="@layout/db_list_item"></androidx.recyclerview.widget.RecyclerView>
</androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
@@ -27,11 +26,12 @@
android:background="@android:color/black"
android:visibility="gone"
tools:visibility="gone">
<ProgressBar
android:layout_gravity="center"
style="?android:attr/progressBarStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"/>
android:layout_height="wrap_content"
android:layout_gravity="center" />
</FrameLayout>
</RelativeLayout>

30
app/src/main/res/layout/weather_app_widget.xml
View File

@@ -1,5 +1,6 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/whole_widget_view"
android:layout_width="match_parent"
android:layout_height="match_parent"
@@ -10,7 +11,6 @@
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_alignParentTop="true"
android:layout_weight="1"
android:orientation="horizontal">
@@ -51,8 +51,9 @@
android:layout_above="@id/location_container"
android:layout_alignParentTop="true"
android:layout_centerInParent="true"
android:layout_marginLeft="32dp"
android:layout_marginStart="32dp"
android:adjustViewBounds="true"
android:contentDescription="@string/image_string"
tools:src="@drawable/ic_baseline_cloud_off_24" />
<LinearLayout
@@ -62,25 +63,27 @@
android:layout_alignParentBottom="true"
android:layout_centerInParent="true"
android:layout_marginBottom="1dp"
android:orientation="horizontal">
android:orientation="horizontal"
tools:ignore="UseCompoundDrawables">
<ImageView
android:id="@+id/location_icon"
android:layout_width="wrap_content"
android:layout_height="16dp"
android:layout_gravity="center"
android:layout_marginRight="2dp"
android:layout_marginEnd="2dp"
android:adjustViewBounds="true"
android:tint="@android:color/white"
android:contentDescription="@string/image_string"
app:tint="@android:color/white"
tools:src="@drawable/location_flag" />
<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>
@@ -88,15 +91,16 @@
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_alignParentEnd="true"
android:layout_centerVertical="true"
android:layout_marginRight="12dp"
android:orientation="vertical">
android:layout_marginEnd="12dp"
android:orientation="vertical"
tools:ignore="RelativeOverlap">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right"
android:layout_gravity="end"
android:orientation="horizontal">
<TextView
@@ -127,7 +131,6 @@
android:id="@+id/widget_listview"
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_alignParentBottom="true"
android:layout_weight="1"
android:columnCount="5"
android:rowCount="1">
@@ -153,6 +156,7 @@
android:layout_gravity="center"
android:layout_weight="1"
android:adjustViewBounds="true"
android:contentDescription="@string/image_string"
tools:src="@drawable/ic_baseline_cloud_off_24" />
<TextView
@@ -186,6 +190,7 @@
android:layout_gravity="center"
android:layout_weight="1"
android:adjustViewBounds="true"
android:contentDescription="@string/image_string"
tools:src="@drawable/ic_baseline_cloud_off_24" />
<TextView
@@ -219,6 +224,7 @@
android:layout_gravity="center"
android:layout_weight="1"
android:adjustViewBounds="true"
android:contentDescription="@string/image_string"
tools:src="@drawable/ic_baseline_cloud_off_24" />
<TextView
@@ -252,6 +258,7 @@
android:layout_gravity="center"
android:layout_weight="1"
android:adjustViewBounds="true"
android:contentDescription="@string/image_string"
tools:src="@drawable/ic_baseline_cloud_off_24" />
<TextView
@@ -284,6 +291,7 @@
android:layout_gravity="center"
android:layout_weight="1"
android:adjustViewBounds="true"
android:contentDescription="@string/image_string"
tools:src="@drawable/ic_baseline_cloud_off_24" />
<TextView

19
app/src/main/res/layout/widget_item.xml
View File

@@ -11,23 +11,24 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:gravity="center"
android:includeFontPadding="false"
android:textColor="#ffffff"
android:textSize="12sp"
android:autoSizeMaxTextSize="100sp"
android:autoSizeMinTextSize="8sp"
android:autoSizeStepGranularity="2sp"
android:autoSizeTextType="uniform"
android:gravity="center"
android:includeFontPadding="false"
android:textColor="#ffffff"
android:textSize="12sp"
tools:text="Wed" />
<ImageView
android:id="@+id/widget_item_image"
android:layout_width="wrap_content"
android:layout_height="0dp"
android:layout_weight="1"
android:layout_gravity="center"
android:layout_weight="1"
android:adjustViewBounds="true"
android:contentDescription="@string/image_string"
tools:src="@drawable/ic_baseline_cloud_off_24" />
<TextView
@@ -35,14 +36,14 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:includeFontPadding="false"
android:gravity="center"
android:textColor="#ffffff"
android:textSize="12sp"
android:autoSizeMaxTextSize="100sp"
android:autoSizeMinTextSize="8sp"
android:autoSizeStepGranularity="2sp"
android:autoSizeTextType="uniform"
android:gravity="center"
android:includeFontPadding="false"
android:textColor="#ffffff"
android:textSize="12sp"
tools:text="20" />

5
app/src/main/res/layout/widget_item_loading.xml
View File

@@ -12,8 +12,7 @@
android:layout_gravity="center"
android:gravity="center"
android:includeFontPadding="false"
android:textColor="#ffffff"
android:text="Loading \nforecast..." />
android:text="@string/loading_nforecast"
android:textColor="#ffffff" />
</LinearLayout>

2
app/src/main/res/menu/menu_main.xml
View File

@@ -4,8 +4,8 @@
tools:context=".legacy.ui.home.MainActivity">
<item
android:id="@+id/settings_fragment"
android:icon="@drawable/ic_round_settings_24"
android:orderInCategory="100"
android:title="@string/action_settings"
android:icon="@drawable/ic_round_settings_24"
app:showAsAction="ifRoom" />
</menu>

9
app/src/main/res/values-v14/dimens.xml
View File

@@ -1,9 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<!--
Refer to App Widget Documentation for margin information
http://developer.android.com/guide/topics/appwidgets/index.html#CreatingLayout
-->
</resources>

15
app/src/main/res/values-v26/styles.xml
View File

@@ -1,15 +0,0 @@
<?xml version="1.0" encoding="utf-8"?>
<resources>
<style name="widget_light_text">
<item name="android:layout_gravity">center</item>
<item name="android:autoSizeMaxTextSize">100sp</item>
<item name="android:autoSizeMinTextSize">8sp</item>
<item name="android:autoSizeStepGranularity">2sp</item>
<item name="android:autoSizeTextType">uniform</item>
<item name="android:gravity">center</item>
<item name="android:includeFontPadding">false</item>
<item name="android:textColor">#ffffff</item>
<item name="android:textSize">12sp</item>
</style>
</resources>

20
app/src/main/res/values/strings.xml
View File

@@ -11,9 +11,23 @@
<string name="location_name">Enter Location name</string>
<string name="degrees_c">°C</string>
<string name="degrees">°</string>
<string name="min">Min:</string>
<string name="max">Max:</string>
<string name="average">Average:</string>
<string name="cancel">Cancel</string>
<string name="ok">OK</string>
<string name="icon">icon</string>
<string name="degree_sign">°</string>
<string name="temperature">Temperature</string>
<string name="wind_header">Wind:</string>
<string name="image_string">image</string>
<string name="humidity_header">Humidity:</string>
<string name="precip_header">Precip:</string>
<string name="sunset_header">Sunset:</string>
<string name="sunrise_header">Sunrise:</string>
<string name="uv_header">UV:</string>
<string name="cloud_header">Cloud:</string>
<string name="min_header">Min:</string>
<string name="average_header">Average:</string>
<string name="max_header">Max:</string>
<string name="loading_nforecast">Loading \nforecast…</string>
<string name="retrieve_warning">Unable to retrieve weather</string>
<string name="empty_retrieve_warning">Make sure you are connected to the internet and have location permissions granted</string>
</resources>

2
app/src/main/res/values/styles.xml
View File

@@ -28,7 +28,7 @@
<item name="android:textSize">12sp</item>
</style>
<style name="icon_style__further_deatils">
<style name="icon_style__further_details">
<item name="android:layout_width">48dp</item>
<item name="android:layout_height">48dp</item>
<item name="android:adjustViewBounds">true</item>

11
app/src/monoWeather/AndroidManifest.xml
View File

@@ -13,10 +13,9 @@
tools:node="merge">
<activity
android:name="com.appttude.h_mal.atlas_weather.ui.MainActivity"
android:label="@string/app_name"
android:exported="true"
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" />
@@ -25,14 +24,16 @@
</intent-filter>
</activity>
<activity android:name="com.appttude.h_mal.monoWeather.ui.widget.WidgetLocationPermissionActivity"
<activity
android:name="com.appttude.h_mal.monoWeather.ui.widget.WidgetLocationPermissionActivity"
android:exported="true">
<intent-filter>
<action android:name="android.appwidget.action.APPWIDGET_CONFIGURE" />
</intent-filter>
</activity>
<receiver android:name="com.appttude.h_mal.atlas_weather.widget.NewAppWidget"
<receiver
android:name="com.appttude.h_mal.atlas_weather.widget.NewAppWidget"
android:exported="true">
<intent-filter>
<action android:name="android.appwidget.action.APPWIDGET_UPDATE" />

4
app/src/monoWeather/java/com/appttude/h_mal/monoWeather/dialog/DeclarationBuilder.kt
View File

@@ -1,12 +1,8 @@
package com.appttude.h_mal.monoWeather.dialog
import android.content.Context
import android.content.res.Resources
import android.os.Build
import android.text.Html
import androidx.annotation.RequiresApi
import androidx.annotation.StringRes
import androidx.core.content.ContextCompat
interface DeclarationBuilder {
val link: String

3
app/src/monoWeather/java/com/appttude/h_mal/monoWeather/dialog/PermissionsDeclarationDialog.kt
View File

@@ -10,7 +10,8 @@ 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 coding 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 {

6
app/src/monoWeather/java/com/appttude/h_mal/monoWeather/ui/WorldItemFragment.kt
View File

@@ -6,10 +6,12 @@ import android.view.View
import androidx.lifecycle.Observer
import androidx.recyclerview.widget.LinearLayoutManager
import com.appttude.h_mal.atlas_weather.R
import com.appttude.h_mal.monoWeather.ui.home.adapter.WeatherRecyclerAdapter
import com.appttude.h_mal.atlas_weather.utils.navigateTo
import com.appttude.h_mal.atlas_weather.viewmodel.WorldViewModel
import kotlinx.android.synthetic.main.fragment_home.*
import com.appttude.h_mal.monoWeather.ui.home.adapter.WeatherRecyclerAdapter
import kotlinx.android.synthetic.main.fragment_home.forecast_listview
import kotlinx.android.synthetic.main.fragment_home.progressBar
import kotlinx.android.synthetic.main.fragment_home.swipe_refresh
class WorldItemFragment : BaseFragment(R.layout.fragment_home) {

12
app/src/monoWeather/java/com/appttude/h_mal/monoWeather/ui/details/FurtherInfoFragment.kt
View File

@@ -23,7 +23,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)
}
@@ -31,8 +35,10 @@ class FurtherInfoFragment : Fragment() {
super.onViewCreated(view, savedInstanceState)
maxtemp.text = param1?.mainTemp.appendWith(requireContext().getString(R.string.degrees))
averagetemp.text = param1?.averageTemp.appendWith(requireContext().getString(R.string.degrees))
minimumtemp.text = param1?.minorTemp.appendWith(requireContext().getString(R.string.degrees))
averagetemp.text =
param1?.averageTemp.appendWith(requireContext().getString(R.string.degrees))
minimumtemp.text =
param1?.minorTemp.appendWith(requireContext().getString(R.string.degrees))
windtext.text = param1?.windText.appendWith(" km")
preciptext.text = param1?.precipitation.appendWith(" %")
cloudtext.text = param1?.cloud.appendWith(" %")

4
app/src/monoWeather/java/com/appttude/h_mal/monoWeather/ui/home/HomeFragment.kt
View File

@@ -13,11 +13,11 @@ import androidx.navigation.ui.onNavDestinationSelected
import com.appttude.h_mal.atlas_weather.R
import com.appttude.h_mal.atlas_weather.application.LOCATION_PERMISSION_REQUEST
import com.appttude.h_mal.atlas_weather.model.forecast.Forecast
import com.appttude.h_mal.atlas_weather.utils.navigateTo
import com.appttude.h_mal.atlas_weather.viewmodel.MainViewModel
import com.appttude.h_mal.monoWeather.dialog.PermissionsDeclarationDialog
import com.appttude.h_mal.monoWeather.ui.BaseFragment
import com.appttude.h_mal.monoWeather.ui.home.adapter.WeatherRecyclerAdapter
import com.appttude.h_mal.atlas_weather.utils.navigateTo
import com.appttude.h_mal.atlas_weather.viewmodel.MainViewModel
import kotlinx.android.synthetic.main.fragment_home.*

10
app/src/monoWeather/java/com/appttude/h_mal/monoWeather/ui/home/adapter/WeatherRecyclerAdapter.kt
View File

@@ -5,11 +5,11 @@ import androidx.recyclerview.widget.RecyclerView
import com.appttude.h_mal.atlas_weather.R
import com.appttude.h_mal.atlas_weather.model.forecast.Forecast
import com.appttude.h_mal.atlas_weather.model.forecast.WeatherDisplay
import com.appttude.h_mal.atlas_weather.utils.generateView
import com.appttude.h_mal.monoWeather.ui.EmptyViewHolder
import com.appttude.h_mal.monoWeather.ui.home.adapter.forecast.ViewHolderForecast
import com.appttude.h_mal.monoWeather.ui.home.adapter.forecastDaily.ViewHolderForecastDaily
import com.appttude.h_mal.monoWeather.ui.home.adapter.further.ViewHolderFurtherDetails
import com.appttude.h_mal.atlas_weather.utils.generateView
class WeatherRecyclerAdapter(
private val itemClick: (Forecast) -> Unit
@@ -27,18 +27,22 @@ class WeatherRecyclerAdapter(
val emptyViewHolder = parent.generateView(R.layout.empty_state_layout)
EmptyViewHolder(emptyViewHolder)
}
is ViewType.Current -> {
val viewCurrent = parent.generateView(R.layout.mono_item_one)
ViewHolderCurrent(viewCurrent)
}
is ViewType.ForecastHourly -> {
val viewForecast = parent.generateView(R.layout.mono_item_forecast)
ViewHolderForecast(viewForecast)
}
is ViewType.Further -> {
val viewFurther = parent.generateView(R.layout.mono_item_two)
ViewHolderFurtherDetails(viewFurther)
}
is ViewType.ForecastDaily -> {
val viewForecast = parent.generateView(R.layout.list_item_forecast)
ViewHolderForecastDaily(viewForecast)
@@ -81,18 +85,22 @@ class WeatherRecyclerAdapter(
is ViewType.Empty -> {
holder as EmptyViewHolder
}
is ViewType.Current -> {
val viewHolderCurrent = holder as ViewHolderCurrent
viewHolderCurrent.bindData(weather)
}
is ViewType.Further -> {
val viewHolderCurrent = holder as ViewHolderFurtherDetails
viewHolderCurrent.bindData(weather)
}
is ViewType.ForecastHourly -> {
val viewHolderForecast = holder as ViewHolderForecast
viewHolderForecast.bindView(weather?.hourly)
}
is ViewType.ForecastDaily -> {
val viewHolderForecast = holder as ViewHolderForecastDaily
weather?.forecast?.getOrNull(position - 3)?.let { f ->

2
app/src/monoWeather/java/com/appttude/h_mal/monoWeather/ui/home/adapter/forecast/GridForecastAdapter.kt
View File

@@ -6,7 +6,7 @@ import com.appttude.h_mal.atlas_weather.R
import com.appttude.h_mal.atlas_weather.model.weather.Hour
import com.appttude.h_mal.atlas_weather.utils.generateView
class GridForecastAdapter(): RecyclerView.Adapter<RecyclerView.ViewHolder>(){
class GridForecastAdapter : RecyclerView.Adapter<RecyclerView.ViewHolder>() {
var weather: MutableList<Hour> = mutableListOf()
fun addCurrent(current: List<Hour>?) {

3
app/src/monoWeather/java/com/appttude/h_mal/monoWeather/ui/home/adapter/further/GridAdapter.kt
View File

@@ -6,7 +6,8 @@ import android.view.ViewGroup
import android.widget.ArrayAdapter
import com.appttude.h_mal.atlas_weather.R
import com.appttude.h_mal.atlas_weather.utils.generateView
import kotlinx.android.synthetic.monoWeather.mono_item_two_cell.view.*
import kotlinx.android.synthetic.monoWeather.mono_item_two_cell.view.mono_item_cell
import kotlinx.android.synthetic.monoWeather.mono_item_two_cell.view.mono_text_cell
class GridAdapter(

6
app/src/monoWeather/java/com/appttude/h_mal/monoWeather/ui/home/adapter/further/ViewHolderFurtherDetails.kt
View File

@@ -11,11 +11,13 @@ class ViewHolderFurtherDetails(itemView: View) : RecyclerView.ViewHolder(itemVie
var grid: GridView = itemView.findViewById(R.id.grid_mono)
fun bindData(weather: WeatherDisplay?) {
grid.adapter = GridAdapter(itemView.context, listOf<Pair<Int, String>>(
grid.adapter = GridAdapter(
itemView.context, listOf<Pair<Int, String>>(
Pair(R.drawable.breeze, "${weather?.windSpeed ?: "0"} km"),
Pair(R.drawable.water_drop, "${weather?.precipitation ?: "0"} %"),
Pair(R.drawable.cloud_symbol, "${weather?.clouds ?: "0"} %")
))
)
)
}
}

7
app/src/monoWeather/java/com/appttude/h_mal/monoWeather/ui/settings/SettingsFragment.kt
View File

@@ -30,7 +30,12 @@ class SettingsFragment : PreferenceFragmentCompat() {
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)

19
app/src/monoWeather/java/com/appttude/h_mal/monoWeather/ui/widget/WidgetLocationPermissionActivity.kt
View File

@@ -2,7 +2,10 @@ package com.appttude.h_mal.monoWeather.ui.widget
import android.Manifest.permission.ACCESS_COARSE_LOCATION
import android.app.Activity
import android.appwidget.AppWidgetManager.*
import android.appwidget.AppWidgetManager.ACTION_APPWIDGET_UPDATE
import android.appwidget.AppWidgetManager.EXTRA_APPWIDGET_ID
import android.appwidget.AppWidgetManager.EXTRA_APPWIDGET_IDS
import android.appwidget.AppWidgetManager.INVALID_APPWIDGET_ID
import android.content.Intent
import android.content.pm.PackageManager.PERMISSION_GRANTED
import android.os.Bundle
@@ -11,9 +14,10 @@ import android.widget.TextView
import androidx.appcompat.app.AppCompatActivity
import androidx.core.app.ActivityCompat.checkSelfPermission
import com.appttude.h_mal.atlas_weather.R
import com.appttude.h_mal.monoWeather.dialog.DeclarationBuilder
import com.appttude.h_mal.atlas_weather.utils.displayToast
import kotlinx.android.synthetic.monoWeather.permissions_declaration_dialog.*
import com.appttude.h_mal.monoWeather.dialog.DeclarationBuilder
import kotlinx.android.synthetic.monoWeather.permissions_declaration_dialog.cancel
import kotlinx.android.synthetic.monoWeather.permissions_declaration_dialog.submit
const val PERMISSION_CODE = 401
@@ -60,7 +64,11 @@ class WidgetLocationPermissionActivity : AppCompatActivity(), DeclarationBuilder
cancel.setOnClickListener { finish() }
}
override fun onRequestPermissionsResult(requestCode: Int, permissions: Array<out String>, grantResults: IntArray) {
override fun onRequestPermissionsResult(
requestCode: Int,
permissions: Array<out String>,
grantResults: IntArray
) {
super.onRequestPermissionsResult(requestCode, permissions, grantResults)
if (requestCode == PERMISSION_CODE) {
if (grantResults.isNotEmpty() && grantResults[0] == PERMISSION_GRANTED) {
@@ -87,7 +95,8 @@ class WidgetLocationPermissionActivity : AppCompatActivity(), DeclarationBuilder
private fun sendUpdateIntent() {
// It is the responsibility of the configuration activity to update the app widget
// Send update broadcast to widget app class
Intent(this@WidgetLocationPermissionActivity,
Intent(
this@WidgetLocationPermissionActivity,
WidgetLocationPermissionActivity::class.java
).apply {
action = ACTION_APPWIDGET_UPDATE

11
app/src/monoWeather/java/com/appttude/h_mal/monoWeather/ui/world/AddLocationFragment.kt
View File

@@ -4,21 +4,23 @@ import android.os.Bundle
import android.view.View
import androidx.lifecycle.observe
import com.appttude.h_mal.atlas_weather.R
import com.appttude.h_mal.monoWeather.ui.BaseFragment
import com.appttude.h_mal.atlas_weather.utils.displayToast
import com.appttude.h_mal.atlas_weather.utils.goBack
import com.appttude.h_mal.atlas_weather.utils.hideKeyboard
import com.appttude.h_mal.atlas_weather.viewmodel.WorldViewModel
import kotlinx.android.synthetic.main.activity_add_forecast.*
import com.appttude.h_mal.monoWeather.ui.BaseFragment
import kotlinx.android.synthetic.main.activity_add_forecast.location_name_tv
import kotlinx.android.synthetic.main.activity_add_forecast.progressBar
import kotlinx.android.synthetic.main.activity_add_forecast.submit
class AddLocationFragment : BaseFragment(R.layout.activity_add_forecast) {
private val viewModel by getFragmentViewModel<WorldViewModel>()
override fun onViewCreated(view: View, savedInstanceState: Bundle?) {
super.onViewCreated(view, savedInstanceState)
val viewModel by getFragmentViewModel<WorldViewModel>()
submit.setOnClickListener {
val locationName = location_name_tv.text?.trim()?.toString()
if (locationName.isNullOrBlank()) {
@@ -37,7 +39,6 @@ class AddLocationFragment : BaseFragment(R.layout.activity_add_forecast) {
displayToast(message)
}
goBack()
}
}
}

10
app/src/monoWeather/java/com/appttude/h_mal/monoWeather/ui/world/WorldFragment.kt
View File

@@ -6,14 +6,14 @@ import androidx.fragment.app.Fragment
import androidx.lifecycle.observe
import androidx.recyclerview.widget.LinearLayoutManager
import com.appttude.h_mal.atlas_weather.R
import com.appttude.h_mal.monoWeather.ui.BaseFragment
import com.appttude.h_mal.monoWeather.ui.world.WorldFragmentDirections.actionWorldFragmentToWorldItemFragment
import com.appttude.h_mal.atlas_weather.utils.navigateTo
import com.appttude.h_mal.atlas_weather.viewmodel.WorldViewModel
import com.appttude.h_mal.monoWeather.ui.BaseFragment
import com.appttude.h_mal.monoWeather.ui.world.WorldFragmentDirections.actionWorldFragmentToWorldItemFragment
import com.google.android.material.dialog.MaterialAlertDialogBuilder
import kotlinx.android.synthetic.main.fragment__two.*
import kotlinx.android.synthetic.main.fragment_add_location.floatingActionButton
import kotlinx.android.synthetic.main.fragment_add_location.world_recycler
import kotlinx.android.synthetic.main.fragment__two.floatingActionButton
import kotlinx.android.synthetic.main.fragment__two.progressBar
import kotlinx.android.synthetic.main.fragment__two.world_recycler
/**

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