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

- Build errors cleared with lint

Browse Source
This commit is contained in:
hmalik144
2020-12-01 20:43:50 +00:00
parent ac3f7b13d8
commit 84896ab47f
31 changed files with 512 additions and 853 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
.idea/caches/build_file_checksums.ser generated
View File

Binary file not shown.

152
.idea/codeStyles/Project.xml generated
View File

@@ -1,29 +1,131 @@
<component name="ProjectCodeStyleConfiguration"> <component name="ProjectCodeStyleConfiguration">
<code_scheme name="Project" version="173"> <code_scheme name="Project" version="173">
<Objective-C-extensions> <JetCodeStyleSettings>
<file> <option name="PACKAGES_TO_USE_STAR_IMPORTS">
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Import" /> <value>
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Macro" /> <package name="java.util" alias="false" withSubpackages="false" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Typedef" /> <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Enum" /> <package name="io.ktor" alias="false" withSubpackages="true" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Constant" /> </value>
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Global" /> </option>
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Struct" /> <option name="PACKAGES_IMPORT_LAYOUT">
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="FunctionPredecl" /> <value>
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Function" /> <package name="" alias="false" withSubpackages="true" />
</file> <package name="java" alias="false" withSubpackages="true" />
<class> <package name="javax" alias="false" withSubpackages="true" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Property" /> <package name="kotlin" alias="false" withSubpackages="true" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="Synthesize" /> <package name="" alias="true" withSubpackages="true" />
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InitMethod" /> </value>
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="StaticMethod" /> </option>
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="InstanceMethod" /> </JetCodeStyleSettings>
<option name="com.jetbrains.cidr.lang.util.OCDeclarationKind" value="DeallocMethod" /> <codeStyleSettings language="XML">
</class> <arrangement>
<extensions> <rules>
<pair source="cpp" header="h" fileNamingConvention="NONE" /> <section>
<pair source="c" header="h" fileNamingConvention="NONE" /> <rule>
</extensions> <match>
</Objective-C-extensions> <AND>
<NAME>xmlns:android</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>^$</XML_NAMESPACE>
</AND>
</match>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>xmlns:.*</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>^$</XML_NAMESPACE>
</AND>
</match>
<order>BY_NAME</order>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>.*:id</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
</AND>
</match>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>.*:name</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
</AND>
</match>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>name</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>^$</XML_NAMESPACE>
</AND>
</match>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>style</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>^$</XML_NAMESPACE>
</AND>
</match>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>.*</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>^$</XML_NAMESPACE>
</AND>
</match>
<order>BY_NAME</order>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>.*</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>http://schemas.android.com/apk/res/android</XML_NAMESPACE>
</AND>
</match>
<order>ANDROID_ATTRIBUTE_ORDER</order>
</rule>
</section>
<section>
<rule>
<match>
<AND>
<NAME>.*</NAME>
<XML_ATTRIBUTE />
<XML_NAMESPACE>.*</XML_NAMESPACE>
</AND>
</match>
<order>BY_NAME</order>
</rule>
</section>
</rules>
</arrangement>
</codeStyleSettings>
</code_scheme> </code_scheme>
</component> </component>

2
.idea/gradle.xml generated
View File

@@ -1,8 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="GradleMigrationSettings" migrationVersion="1" />
<component name="GradleSettings"> <component name="GradleSettings">
<option name="linkedExternalProjectsSettings"> <option name="linkedExternalProjectsSettings">
<GradleProjectSettings> <GradleProjectSettings>
<option name="testRunner" value="PLATFORM" />
<option name="distributionType" value="DEFAULT_WRAPPED" /> <option name="distributionType" value="DEFAULT_WRAPPED" />
<option name="externalProjectPath" value="$PROJECT_DIR$" /> <option name="externalProjectPath" value="$PROJECT_DIR$" />
<option name="modules"> <option name="modules">

25
.idea/jarRepositories.xml generated Normal file
View File

@@ -0,0 +1,25 @@
<?xml version="1.0" encoding="UTF-8"?>
<project version="4">
<component name="RemoteRepositoriesConfiguration">
<remote-repository>
<option name="id" value="central" />
<option name="name" value="Maven Central repository" />
<option name="url" value="https://repo1.maven.org/maven2" />
</remote-repository>
<remote-repository>
<option name="id" value="jboss.community" />
<option name="name" value="JBoss Community repository" />
<option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
</remote-repository>
<remote-repository>
<option name="id" value="BintrayJCenter" />
<option name="name" value="BintrayJCenter" />
<option name="url" value="https://jcenter.bintray.com/" />
</remote-repository>
<remote-repository>
<option name="id" value="Google" />
<option name="name" value="Google" />
<option name="url" value="https://dl.google.com/dl/android/maven2/" />
</remote-repository>
</component>
</project>

2
.idea/modules.xml generated
View File

@@ -2,6 +2,8 @@
<project version="4"> <project version="4">
<component name="ProjectModuleManager"> <component name="ProjectModuleManager">
<modules> <modules>
<module fileurl="file://$PROJECT_DIR$/.idea/modules/Altas_-_Weather.iml" filepath="$PROJECT_DIR$/.idea/modules/Altas_-_Weather.iml" group="Altas_-_Weather" />
<module fileurl="file://$PROJECT_DIR$/.idea/modules/app/Altas_-_Weather-app.iml" filepath="$PROJECT_DIR$/.idea/modules/app/Altas_-_Weather-app.iml" group="Altas_-_Weather/app" />
<module fileurl="file://$PROJECT_DIR$/Weather_app.iml" filepath="$PROJECT_DIR$/Weather_app.iml" /> <module fileurl="file://$PROJECT_DIR$/Weather_app.iml" filepath="$PROJECT_DIR$/Weather_app.iml" />
<module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" /> <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
</modules> </modules>

2
.idea/vcs.xml generated
View File

@@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="VcsDirectoryMappings"> <component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" /> <mapping directory="" vcs="Git" />
</component> </component>
</project> </project>

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

@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
package="com.appttude.h_mal.atlas_weather"> package="com.appttude.h_mal.atlas_weather">
<uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" /> <uses-permission android:name="android.permission.ACCESS_FINE_LOCATION" />
<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" /> <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
<uses-permission android:name="android.permission.INTERNET" /> <uses-permission android:name="android.permission.INTERNET" />
@@ -16,14 +16,16 @@
android:required="true" /> android:required="true" />
<application <application
android:name="com.appttude.h_mal.atlas_weather.application.AppClass"
android:allowBackup="true" android:allowBackup="true"
android:icon="@mipmap/ic_launcher" android:icon="@mipmap/ic_launcher"
android:label="@string/app_name" android:label="@string/app_name"
android:roundIcon="@mipmap/ic_launcher" android:roundIcon="@mipmap/ic_launcher"
android:supportsRtl="true" android:supportsRtl="true"
android:theme="@style/AppTheme"> android:theme="@style/AppTheme"
<activity tools:node="merge">
android:name="com.appttude.h_mal.atlas_weather.MainActivity"
<activity android:name=".ui.MainActivity"
android:label="@string/app_name" android:label="@string/app_name"
android:launchMode="singleTop" android:launchMode="singleTop"
android:theme="@style/AppTheme.NoActionBar"> android:theme="@style/AppTheme.NoActionBar">
@@ -35,23 +37,15 @@
</intent-filter> </intent-filter>
</activity> </activity>
<receiver android:name="com.appttude.h_mal.atlas_weather.NotificationReceiver"
android:parentActivityName="com.appttude.h_mal.atlas_weather.MainActivity"/>
<activity android:name="com.appttude.h_mal.atlas_weather.FurtherInfoActivity"
android:parentActivityName="com.appttude.h_mal.atlas_weather.MainActivity"/>
<activity <activity
android:name="com.appttude.h_mal.atlas_weather.AddForecast" android:name=".ui.settings.UnitSettingsActivity"
android:parentActivityName="com.appttude.h_mal.atlas_weather.MainActivity" /> android:label="Settings" />
<activity android:name="com.appttude.h_mal.atlas_weather.UnitSettings"
android:parentActivityName="com.appttude.h_mal.atlas_weather.MainActivity"/>
<provider <receiver
android:name="com.appttude.h_mal.atlas_weather.dbfiles.ForecastProvider" android:name=".notification.NotificationReceiver"
android:authorities="com.appttude.h_mal.atlas_weather" android:parentActivityName=".MainActivity" />
android:exported="false" />
<receiver android:name="com.appttude.h_mal.atlas_weather.AppWidget.NewAppWidget"> <receiver android:name=".widget.NewAppWidget">
<intent-filter> <intent-filter>
<action android:name="android.appwidget.action.APPWIDGET_UPDATE" /> <action android:name="android.appwidget.action.APPWIDGET_UPDATE" />
<action android:name="android.appwidget.action.APPWIDGET_ENABLED" /> <action android:name="android.appwidget.action.APPWIDGET_ENABLED" />
@@ -63,19 +57,10 @@
android:resource="@xml/new_app_widget_info" /> android:resource="@xml/new_app_widget_info" />
</receiver> </receiver>
<activity android:name="com.appttude.h_mal.atlas_weather.WorldItemActivity"
android:parentActivityName="com.appttude.h_mal.atlas_weather.MainActivity">
</activity>
<service <service
android:name="com.appttude.h_mal.atlas_weather.AppWidget.WidgetRemoteViewsService" android:name=".widget.WidgetRemoteViewsService"
android:permission="android.permission.BIND_REMOTEVIEWS"></service> android:permission="android.permission.BIND_REMOTEVIEWS" />
<activity android:name="com.appttude.h_mal.atlas_weather.InfoActivity"
android:parentActivityName="com.appttude.h_mal.atlas_weather.MainActivity">
</activity>
</application> </application>
</manifest> </manifest>

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

@@ -3,17 +3,17 @@
android:height="275dp" android:height="275dp"
android:viewportWidth="94.0" android:viewportWidth="94.0"
android:viewportHeight="275.0"> android:viewportHeight="275.0">
<!--<path--> <path
<!--android:fillColor="#FF000000"--> android:fillColor="#FF000000"
<!--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--> 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--> 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"/>--> 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--> <path
<!--android:name="inner"--> android:name="inner"
<!--android:fillColor="#ff0000"--> android:fillColor="#ff0000"
<!--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--> 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--> 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"/>--> 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"/> 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 <path

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

@@ -1,68 +1,48 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <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" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical" android:orientation="vertical">
tools:context=".AddForecast">
<ProgressBar <LinearLayout
android:id="@+id/pb_add"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:visibility="gone" />
<RelativeLayout
android:id="@+id/whole_view"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="wrap_content"
android:layout_centerHorizontal="true"
android:layout_centerVertical="true"
android:layout_margin="24dp"
android:orientation="vertical">
<LinearLayout <EditText
android:id="@+id/location_name_tv"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerHorizontal="true" android:layout_weight="2"
android:layout_centerVertical="true" android:ems="10"
android:layout_marginLeft="12dp" android:hint="@string/location_name"
android:layout_marginRight="12dp" android:inputType="textPersonName"
android:orientation="horizontal" android:maxLines="2"
android:paddingBottom="@dimen/activity_horizontal_margin"> tools:text="Greater London"/>
<TextView
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="1"
android:text="Location:"
android:textAppearance="@style/TextAppearance.AppCompat"
android:textColor="@color/colour_five" />
<EditText
android:id="@+id/location_name_tv"
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_weight="2"
android:ems="10"
android:hint="Location name"
android:inputType="textPersonName" />
</LinearLayout>
<Button <Button
android:id="@+id/submit" android:id="@+id/submit"
style="?android:attr/borderlessButtonStyle"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentEnd="true" android:layout_gravity="right"
android:layout_alignParentRight="true"
android:layout_alignParentBottom="true"
android:layout_margin="12dp"
android:background="@drawable/button_layout"
android:text="@string/submit" android:text="@string/submit"
android:textColor="#ffffff" android:textColor="#ffffff"
android:textStyle="bold" android:textStyle="bold" />
style="?android:attr/borderlessButtonStyle"/> </LinearLayout>
</RelativeLayout> <ProgressBar
android:id="@+id/progressBar"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:visibility="gone"
tools:visibility="visible" />
</RelativeLayout> </RelativeLayout>

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

@@ -1,27 +1,29 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<ScrollView xmlns:android="http://schemas.android.com/apk/res/android" <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent">
tools:context=".FurtherInfoActivity">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="wrap_content"
android:layout_gravity="center"
android:orientation="vertical"> android:orientation="vertical">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:orientation="horizontal"> android:orientation="horizontal">
<ImageView <FrameLayout
android:id="@+id/thermom"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:layout_margin="12dp" android:layout_margin="12dp"
android:layout_weight="1" android:layout_weight="2">
android:tint="@color/colour_five"
app:srcCompat="@drawable/somethingnew" /> <ImageView
android:src="@drawable/somethingnew"
style="@style/icon_style__further_deatils" />
</FrameLayout>
<RelativeLayout <RelativeLayout
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
@@ -30,10 +32,6 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerInParent="true"> android:layout_centerInParent="true">
<View
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1" />
<LinearLayout <LinearLayout
android:layout_width="0dp" android:layout_width="0dp"
@@ -48,16 +46,15 @@
<TextView <TextView
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="2"
android:text="Maximum: " /> android:text="@string/max" />
<TextView <TextView
android:id="@+id/maxtemp" android:id="@+id/maxtemp"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="3"
android:text="85%" tools:text="11" />
android:textColor="#000000" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -66,16 +63,15 @@
<TextView <TextView
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="2"
android:text="Average: " /> android:text="@string/average" />
<TextView <TextView
android:id="@+id/averagetemp" android:id="@+id/averagetemp"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="3"
android:text="11mm" tools:text="11" />
android:textColor="#000000" />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -84,16 +80,15 @@
<TextView <TextView
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="2"
android:text="Minimum: " /> android:text="@string/min" />
<TextView <TextView
android:id="@+id/minimumtemp" android:id="@+id/minimumtemp"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="3"
android:text="11mm" tools:text="11" />
android:textColor="#000000" />
</LinearLayout> </LinearLayout>
@@ -106,14 +101,16 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<ImageView <FrameLayout
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:layout_margin="12dp" android:layout_margin="12dp"
android:layout_weight="1" android:layout_weight="2">
android:adjustViewBounds="true"
android:src="@drawable/breeze" <ImageView
android:tint="@color/colour_five" /> android:src="@drawable/breeze"
style="@style/icon_style__further_deatils" />
</FrameLayout>
<RelativeLayout <RelativeLayout
android:layout_weight="2" android:layout_weight="2"
android:layout_width="0dp" android:layout_width="0dp"
@@ -123,10 +120,6 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerInParent="true"> android:layout_centerInParent="true">
<View
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1" />
<LinearLayout <LinearLayout
android:layout_width="0dp" android:layout_width="0dp"
@@ -137,16 +130,16 @@
<TextView <TextView
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="2"
android:text="Wind: " /> android:text="Wind: " />
<TextView <TextView
android:id="@+id/windtext" android:id="@+id/windtext"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="3"
android:text="7mph" android:text="7mph"
android:textColor="#000000" /> />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</RelativeLayout> </RelativeLayout>
@@ -155,14 +148,16 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<ImageView <FrameLayout
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:layout_margin="12dp" android:layout_margin="12dp"
android:layout_weight="1" android:layout_weight="2">
android:adjustViewBounds="true"
android:src="@drawable/water_drop" <ImageView
android:tint="@color/colour_five" /> android:src="@drawable/water_drop"
style="@style/icon_style__further_deatils" />
</FrameLayout>
<RelativeLayout <RelativeLayout
android:layout_weight="2" android:layout_weight="2"
android:layout_width="0dp" android:layout_width="0dp"
@@ -171,10 +166,6 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerInParent="true"> android:layout_centerInParent="true">
<View
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1" />
<LinearLayout <LinearLayout
android:layout_width="0dp" android:layout_width="0dp"
@@ -189,16 +180,16 @@
<TextView <TextView
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="2"
android:text="Humidity: " /> android:text="Humidity: " />
<TextView <TextView
android:id="@+id/humiditytext" android:id="@+id/humiditytext"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="3"
android:text="85%" android:text="85%"
android:textColor="#000000" /> />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -207,16 +198,16 @@
<TextView <TextView
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="2"
android:text="Precipitation: " /> android:text="Precip: " />
<TextView <TextView
android:id="@+id/preciptext" android:id="@+id/preciptext"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="3"
android:text="11mm" android:text="11mm"
android:textColor="#000000" /> />
</LinearLayout> </LinearLayout>
@@ -229,14 +220,16 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">
<ImageView <FrameLayout
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="match_parent"
android:layout_margin="12dp" android:layout_margin="12dp"
android:layout_weight="1" android:layout_weight="2">
android:adjustViewBounds="true"
android:src="@drawable/sunrise" <ImageView
android:tint="@color/colour_five" /> android:src="@drawable/sunrise"
style="@style/icon_style__further_deatils" />
</FrameLayout>
<RelativeLayout <RelativeLayout
android:layout_weight="2" android:layout_weight="2"
android:layout_width="0dp" android:layout_width="0dp"
@@ -245,10 +238,6 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerInParent="true"> android:layout_centerInParent="true">
<View
android:layout_width="0dp"
android:layout_height="match_parent"
android:layout_weight="1" />
<LinearLayout <LinearLayout
android:layout_width="0dp" android:layout_width="0dp"
@@ -263,16 +252,16 @@
<TextView <TextView
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="2"
android:text="UV: " /> android:text="UV: " />
<TextView <TextView
android:id="@+id/uvtext" android:id="@+id/uvtext"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="3"
android:text="7" android:text="7"
android:textColor="#000000" /> />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
@@ -282,16 +271,16 @@
<TextView <TextView
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="2"
android:text="Sunrise:" /> android:text="Sunrise:" />
<TextView <TextView
android:id="@+id/sunrisetext" android:id="@+id/sunrisetext"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="3"
android:text="05:30am" android:text="05:30am"
android:textColor="#000000" /> />
</LinearLayout> </LinearLayout>
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
@@ -300,16 +289,16 @@
<TextView <TextView
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="2"
android:text="Sunset:" /> android:text="Sunset:" />
<TextView <TextView
android:id="@+id/sunsettext" android:id="@+id/sunsettext"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_weight="1" android:layout_weight="3"
android:text="06:12pm" android:text="06:12pm"
android:textColor="#000000" /> />
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
@@ -319,4 +308,4 @@
</LinearLayout> </LinearLayout>
</LinearLayout> </LinearLayout>
</ScrollView> </FrameLayout>

76
app/src/main/res/layout/activity_main.xml
View File

@@ -1,46 +1,60 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<android.support.design.widget.CoordinatorLayout 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:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/main_content" android:id="@+id/main_content"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:fitsSystemWindows="true" android:fitsSystemWindows="true">
tools:context="com.appttude.h_mal.atlas_weather.MainActivity">
<android.support.design.widget.AppBarLayout <androidx.appcompat.widget.Toolbar
android:id="@+id/appbar" android:id="@+id/toolbar"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="?attr/actionBarSize"
android:theme="@style/AppTheme.AppBarOverlay"> android:theme="@style/ThemeOverlay.AppCompat.Dark.ActionBar"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"
app:popupTheme="@style/AppTheme.PopupOverlay"
tools:title="Atlas Weather"/>
<android.support.v7.widget.Toolbar <com.google.android.material.bottomnavigation.BottomNavigationView
android:id="@+id/toolbar" android:id="@+id/nav_view"
android:layout_width="match_parent" android:layout_width="0dp"
android:layout_height="?attr/actionBarSize" android:layout_height="60dp"
android:background="?attr/colorPrimary" app:itemIconTint="@android:color/background_light"
app:popupTheme="@style/AppTheme.PopupOverlay" app:itemTextColor="@android:color/background_light"
app:titleTextAppearance="@style/titlebar" app:layout_constraintBottom_toBottomOf="parent"
tools:fontfamily="@font/archeologicaps" app:layout_constraintLeft_toLeftOf="parent"
tools:title="Atlas Weather"> app:layout_constraintRight_toRightOf="parent"
app:backgroundTint="@android:color/transparent"
app:elevation="0dp"
app:menu="@menu/tabs_menu" />
</android.support.v7.widget.Toolbar> <fragment
<android.support.design.widget.TabLayout
android:id="@+id/tabs"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:tab="hello"/>
</android.support.design.widget.AppBarLayout>
<android.support.v4.view.ViewPager
android:id="@+id/container" android:id="@+id/container"
android:name="androidx.navigation.fragment.NavHostFragment"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="0dp"
app:layout_behavior="@string/appbar_scrolling_view_behavior" > app:defaultNavHost="true"
app:layout_constraintBottom_toTopOf="@id/nav_view"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toBottomOf="@id/toolbar"
tools:layout="@layout/fragment_home"/>
</android.support.v4.view.ViewPager> <ProgressBar
android:id="@+id/progress_circular"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:elevation="0.2dp"
android:visibility="gone"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent"
tools:visibility="visible" />
</android.support.design.widget.CoordinatorLayout> </androidx.constraintlayout.widget.ConstraintLayout>

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

@@ -1,95 +1,93 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:card_view="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:padding="1dp"> xmlns:app="http://schemas.android.com/apk/res-auto">
<android.support.v7.widget.CardView <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
app:cardBackgroundColor="@android:color/transparent" android:layout_marginLeft="12dp"
app:cardCornerRadius="22dp" android:layout_marginRight="12dp"
card_view:cardElevation="1dp" android:orientation="horizontal">
card_view:cardMaxElevation="1dp"
card_view:cardPreventCornerOverlap="false"
card_view:cardUseCompatPadding="true">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_weight="1"
android:orientation="horizontal"> android:orientation="horizontal">
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginLeft="15dp"
android:layout_weight="1"
android:orientation="vertical">
<TextView
android:id="@+id/db_location"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:textColor="@color/colour_five"
android:textSize="22sp"
tools:text="Bakkafjörður"
android:includeFontPadding="false"/>
</LinearLayout>
<ImageView <ImageView
android:id="@+id/db_icon" android:id="@+id/location_icon"
android:layout_width="32dp"
android:layout_height="32dp"
android:layout_marginRight="12dp"
android:tint="@color/colorAccent"
app:srcCompat="@drawable/maps_and_flags" />
<TextView
android:id="@+id/db_location"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="match_parent"
tools:src="@drawable/day_305" /> android:textSize="22sp"
android:maxLines="2"
<LinearLayout tools:text="Greater London" />
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginRight="15dp"
android:layout_weight="1"
android:orientation="vertical">
<LinearLayout
android:id="@+id/list_temp_holder"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right"
android:orientation="horizontal">
<TextView
android:id="@+id/db_main_temp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:includeFontPadding="false"
android:textColor="@color/colour_five"
android:textSize="28sp"
tools:text="28" />
<TextView
android:id="@+id/db_minor_temp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:includeFontPadding="false"
tools:text="°C" />
</LinearLayout>
<TextView
android:id="@+id/db_condition"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="right"
android:includeFontPadding="false"
android:gravity="right"
tools:text="Patchy rain possible" />
</LinearLayout>
</LinearLayout> </LinearLayout>
</android.support.v7.widget.CardView>
<ImageView
android:id="@+id/db_icon"
android:layout_width="64dp"
android:layout_height="64dp"
tools:padding="10dp"
tools:tint="@color/colorAccent"
tools:src="@drawable/cloud_symbol" />
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_weight="1"
android:orientation="vertical">
<LinearLayout
android:id="@+id/list_temp_holder"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right"
android:orientation="horizontal">
<TextView
android:id="@+id/db_main_temp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:includeFontPadding="false"
android:textSize="22sp"
tools:text="28" />
<TextView
android:id="@+id/db_minor_temp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:includeFontPadding="false"
tools:text="°C" />
</LinearLayout>
<TextView
android:id="@+id/db_condition"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="right"
android:gravity="right"
android:textSize="12sp"
android:includeFontPadding="false"
tools:text="Patchy rain possible" />
</LinearLayout>
</LinearLayout>
</RelativeLayout> </RelativeLayout>

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

@@ -3,66 +3,29 @@
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
tools:context="com.appttude.h_mal.atlas_weather.Fragment_Two"> tools:context=".ui.world.WorldFragment">
<ListView <androidx.recyclerview.widget.RecyclerView
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:id="@+id/listview" app:layout_constraintTop_toTopOf="parent"
android:divider="@null"> app:layout_constraintBottom_toBottomOf="parent"
</ListView> 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>
<LinearLayout <com.google.android.material.floatingactionbutton.FloatingActionButton
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:orientation="vertical"
android:id="@+id/emptyView">
<ImageView
android:layout_width="64dp"
android:layout_height="wrap_content"
android:scaleType="fitCenter"
android:adjustViewBounds="true"
android:layout_gravity="center"
android:alpha="0.8"
android:src="@drawable/triple"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="List Empty"
android:textSize="30sp"
android:textStyle="bold" />
<TextView
android:id="@+id/emptyViewText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="Add locations" />
<View
android:layout_width="match_parent"
android:layout_height="64dp"/>
</LinearLayout>
<android.support.design.widget.FloatingActionButton
android:id="@+id/floatingActionButton" android:id="@+id/floatingActionButton"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_alignParentBottom="true" android:layout_alignParentBottom="true"
android:layout_alignParentEnd="true" android:layout_alignParentEnd="true"
android:layout_alignParentRight="true"
android:layout_marginBottom="20dp" android:layout_marginBottom="20dp"
android:layout_marginEnd="20dp" android:layout_marginEnd="20dp"
android:layout_marginRight="20dp" app:srcCompat="@drawable/ic_baseline_add_24"/>
android:clickable="true"
app:srcCompat="@android:drawable/ic_input_add"
android:tint="@android:color/white"
app:elevation="0dp"
android:focusable="true" />
<ProgressBar <ProgressBar
android:id="@+id/progressBar2" android:id="@+id/progressBar2"
@@ -70,5 +33,6 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_centerInParent="true" android:layout_centerInParent="true"
android:visibility="gone"/> android:visibility="gone"
tools:visibility="visible"/>
</RelativeLayout> </RelativeLayout>

73
app/src/main/res/layout/fragment_main.xml
View File

@@ -1,73 +0,0 @@
<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:id="@+id/constraintLayout"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context="com.appttude.h_mal.atlas_weather.MainActivity">
<android.support.v4.widget.SwipeRefreshLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:id="@+id/swipe_refresh">
<android.support.v7.widget.RecyclerView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:id="@+id/forecast_listview">
</android.support.v7.widget.RecyclerView>
</android.support.v4.widget.SwipeRefreshLayout>
<ProgressBar
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:id="@+id/mainPB"/>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:orientation="vertical"
android:id="@+id/emptyView">
<ImageView
android:layout_width="64dp"
android:layout_height="wrap_content"
android:scaleType="fitCenter"
android:adjustViewBounds="true"
android:layout_gravity="center"
android:alpha="0.8"
android:src="@drawable/error_icon"/>
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:text="List Empty"
android:textSize="30sp"
android:textStyle="bold" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:id="@id/emptyViewText"
android:text="check connection or location settings" />
<Button
android:id="@+id/emptyViewButton"
style="?android:attr/borderlessButtonStyle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginTop="6dp"
android:background="@drawable/button_layout"
android:padding="12dp"
android:text="Grant Permission"
android:textColor="#ffffff"
android:textStyle="bold" />
<View
android:layout_width="match_parent"
android:layout_height="64dp"/>
</LinearLayout>
</RelativeLayout>

1
app/src/main/res/layout/info_dialog_item.xml
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout 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" xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content">

1
app/src/main/res/layout/info_dialog_layout.xml
View File

@@ -1,6 +1,5 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout 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_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"> android:orientation="vertical">

104
app/src/main/res/layout/list_item_layout2.xml
View File

@@ -1,104 +0,0 @@
<?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:card_view="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:padding="1dp">
<android.support.v7.widget.CardView
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:cardBackgroundColor="@android:color/transparent"
app:cardCornerRadius="22dp"
card_view:cardElevation="1dp"
card_view:cardMaxElevation="1dp"
card_view:cardPreventCornerOverlap="false"
card_view:cardUseCompatPadding="true">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="horizontal">
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginLeft="15dp"
android:layout_weight="3"
android:orientation="vertical">
<TextView
android:id="@+id/list_date"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/colour_five"
android:textSize="22sp"
tools:text="Nov 28" />
<TextView
android:id="@+id/list_day"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:textColor="@color/colour_five"
tools:text="Wednesday" />
</LinearLayout>
<ImageView
android:id="@+id/list_icon"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:src="@drawable/day_305" />
<LinearLayout
android:layout_width="0dp"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:layout_marginRight="15dp"
android:layout_weight="6"
android:orientation="vertical">
<LinearLayout
android:id="@+id/list_temp_holder"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right"
android:orientation="horizontal">
<TextView
android:id="@+id/list_main_temp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:includeFontPadding="false"
android:textColor="@color/colour_five"
android:textSize="28sp"
tools:text="28" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:includeFontPadding="false"
android:text="/" />
<TextView
android:id="@+id/list_minor_temp"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:includeFontPadding="false"
tools:text="26" />
</LinearLayout>
<TextView
android:id="@+id/list_condition"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right"
tools:text="Patchy rain possible" />
</LinearLayout>
</LinearLayout>
</android.support.v7.widget.CardView>
</RelativeLayout>

80
app/src/main/res/layout/new_app_widget.xml
View File

@@ -23,21 +23,20 @@
android:layout_marginLeft="12dp" android:layout_marginLeft="12dp"
android:orientation="vertical"> android:orientation="vertical">
<TextClock <!-- <TextClock-->
android:id="@+id/textclock_time" <!-- android:id="@+id/textclock_time"-->
android:layout_width="match_parent" <!-- android:layout_width="match_parent"-->
android:layout_height="wrap_content" <!-- android:layout_height="wrap_content"-->
android:autoSizeMaxTextSize="100sp" <!-- android:autoSizeMaxTextSize="100sp"-->
android:autoSizeMinTextSize="12sp" <!-- android:autoSizeMinTextSize="12sp"-->
android:autoSizeStepGranularity="2sp" <!-- android:autoSizeStepGranularity="2sp"-->
android:autoSizeTextType="uniform" <!-- android:autoSizeTextType="uniform"-->
android:format12Hour="h:mm a" <!-- android:format12Hour="h:mm a"-->
android:includeFontPadding="false" <!-- android:includeFontPadding="false"-->
android:maxLines="1" <!-- android:maxLines="1"-->
android:textColor="#ffffff" <!-- android:textColor="#ffffff"-->
android:textSize="32sp" <!-- android:textSize="32sp"-->
tools:text="4:22 AM" /> <!-- tools:text="4:22 AM" />-->
<TextClock <TextClock
android:id="@+id/clock_date" android:id="@+id/clock_date"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@@ -87,6 +86,16 @@
android:layout_centerInParent="true" android:layout_centerInParent="true"
android:orientation="horizontal"> android:orientation="horizontal">
<ImageView
android:id="@+id/location_icon"
android:layout_width="wrap_content"
android:layout_height="16dp"
android:layout_gravity="center"
android:layout_marginRight="2dp"
android:adjustViewBounds="true"
android:src="@drawable/location_flag"
android:tint="@android:color/white" />
<TextView <TextView
android:id="@+id/widget_current_location" android:id="@+id/widget_current_location"
android:layout_width="wrap_content" android:layout_width="wrap_content"
@@ -101,16 +110,6 @@
android:textColor="#ffffff" android:textColor="#ffffff"
android:textSize="12sp" android:textSize="12sp"
tools:text="South Brisbane" /> tools:text="South Brisbane" />
<ImageView
android:id="@+id/location_icon"
android:layout_width="match_parent"
android:layout_height="16dp"
android:layout_gravity="center"
android:layout_marginLeft="2dp"
android:adjustViewBounds="true"
android:src="@drawable/location_flag"
android:tint="@android:color/white" />
</LinearLayout> </LinearLayout>
@@ -158,38 +157,7 @@
tools:text="°C" /> tools:text="°C" />
</LinearLayout> </LinearLayout>
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="right">
<TextView
android:id="@+id/widget_item_temp_high"
style="@style/textView_minor"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="top"
android:autoSizeMaxTextSize="100sp"
android:autoSizeMinTextSize="12sp"
android:autoSizeStepGranularity="2sp"
android:autoSizeTextType="uniform"
tools:text="20°" />
<TextView
android:id="@+id/dash"
style="@style/textView_minor"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
tools:text=" / " />
<TextView
android:id="@+id/widget_item_temp_low"
style="@style/textView_minor"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="top"
tools:text="19°" />
</LinearLayout>
</LinearLayout> </LinearLayout>

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

@@ -25,41 +25,16 @@
android:adjustViewBounds="true" android:adjustViewBounds="true"
tools:src="@drawable/demo_icon" /> tools:src="@drawable/demo_icon" />
<LinearLayout <TextView
android:id="@+id/widget_item_temp_high"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:gravity="center"> android:includeFontPadding="false"
android:gravity="center"
<TextView android:textColor="#ffffff"
android:id="@+id/widget_item_temp_high" android:textSize="12sp"
android:layout_width="wrap_content" tools:text="20" />
android:layout_height="wrap_content"
android:layout_gravity="center"
android:includeFontPadding="false"
android:textColor="#ffffff"
android:textSize="12sp"
tools:text="20°" />
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center"
android:includeFontPadding="false"
android:text=" / "
android:textColor="#ffffff"
android:textSize="12sp" />
<TextView
android:id="@+id/widget_item_temp_low"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="top"
android:includeFontPadding="false"
android:textColor="#ffffff"
android:textSize="12sp"
tools:text="19°" />
</LinearLayout>
</LinearLayout> </LinearLayout>

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

@@ -1,15 +1,11 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android" <menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
tools:context="com.appttude.h_mal.atlas_weather.MainActivity"> tools:context=".legacy.ui.home.MainActivity">
<item <item
android:id="@+id/action_settings" android:id="@+id/action_settings"
android:orderInCategory="100" android:orderInCategory="100"
android:title="@string/action_settings" android:title="@string/action_settings"
app:showAsAction="never" /> android:icon="@android:drawable/ic_menu_preferences"
<item app:showAsAction="ifRoom" />
android:id="@+id/action_into"
android:orderInCategory="100"
android:title="@string/action_info"
app:showAsAction="never" />
</menu> </menu>

6
app/src/main/res/values/colors.xml
View File

@@ -1,8 +1,8 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<color name="colorPrimary">#3F51B5</color> <color name="colorPrimary">@android:color/black</color>
<color name="colorPrimaryDark">#303F9F</color> <color name="colorPrimaryDark">@android:color/black</color>
<color name="colorAccent">#FF4081</color> <color name="colorAccent">@android:color/white</color>
<color name="colour_one">#E8D0DD</color> <color name="colour_one">#E8D0DD</color>
<color name="colour_two">#5F8E7B</color> <color name="colour_two">#5F8E7B</color>

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

@@ -1,72 +1,18 @@
<resources> <resources>
<string name="app_name">Atlas Weather</string> <string name="app_name">Atlas Weather</string>
<string name="action_settings">Settings</string> <string name="action_settings">Settings</string>
<string name="action_info">Info</string>
<string name="section_format">Hello World from section: %1$d</string>
<!-- TODO: Remove or change this placeholder text -->
<string name="hello_blank_fragment">Hello blank fragment</string>
<string name="title_activity_settings">Settings</string>
<!-- Strings related to Settings -->
<!-- Example General settings -->
<string name="pref_header_general">General</string>
<string name="pref_title_social_recommendations">Enable social recommendations</string>
<string name="pref_description_social_recommendations">Recommendations for people to contact
based on your message history
</string>
<string name="pref_title_display_name">Display name</string>
<string name="pref_default_display_name">John Smith</string>
<string name="pref_title_add_friends_to_messages">Add friends to messages</string>
<string-array name="pref_example_list_titles">
<item>Always</item>
<item>When possible</item>
<item>Never</item>
</string-array>
<string-array name="pref_example_list_values">
<item>1</item>
<item>0</item>
<item>-1</item>
</string-array>
<!-- Example settings for Data & Sync --> <!-- Example settings for Data & Sync -->
<string name="pref_header_data_sync">Data &amp; sync</string> <string name="pref_header_data_sync">Data &amp; sync</string>
<string name="pref_title_sync_frequency">Sync frequency</string>
<string-array name="pref_sync_frequency_titles">
<item>15 minutes</item>
<item>30 minutes</item>
<item>1 hour</item>
<item>3 hours</item>
<item>6 hours</item>
<item>Never</item>
</string-array>
<string-array name="pref_sync_frequency_values">
<item>15</item>
<item>30</item>
<item>60</item>
<item>180</item>
<item>360</item>
<item>-1</item>
</string-array>
<string-array name="list_preference_temp"> <string-array name="list_preference_temp">
<item>°C</item> <item>°C</item>
<item>°F</item> <item>°F</item>
</string-array> </string-array>
<string-array name="list_preference_refactor_values">
<item>c</item>
<item>f</item>
</string-array>
<string-array name="list_preference_wind"> <string-array name="list_preference_wind">
<item>MPH</item> <item>MpH</item>
<item>KPH</item> <item>kpH</item>
</string-array> </string-array>
<string-array name="list_preference_wind_values"> <string-array name="list_preference_wind_values">
@@ -74,16 +20,6 @@
<item>kph</item> <item>kph</item>
</string-array> </string-array>
<string-array name="list_preference_pressure">
<item>mBar</item>
<item>In</item>
</string-array>
<string-array name="list_preference_pressure_values">
<item>mb</item>
<item>in</item>
</string-array>
<string-array name="list_preference_precip"> <string-array name="list_preference_precip">
<item>mm</item> <item>mm</item>
<item>In</item> <item>In</item>
@@ -94,11 +30,6 @@
<item>in</item> <item>in</item>
</string-array> </string-array>
<string-array name="list_preference_days">
<item>7</item>
<item>5</item>
</string-array>
<string-array name="list_preference_vis"> <string-array name="list_preference_vis">
<item>KM</item> <item>KM</item>
<item>Miles</item> <item>Miles</item>
@@ -109,34 +40,18 @@
<item>miles</item> <item>miles</item>
</string-array> </string-array>
<string-array name="multi_select_list_preference_default_value" />
<string name="pref_title_system_sync_settings">System sync settings</string>
<!-- Example settings for Notifications -->
<string name="pref_header_notifications">Notifications</string>
<string name="pref_title_new_message_notifications">New message notifications</string> <string name="pref_title_new_message_notifications">New message notifications</string>
<string name="pref_title_ringtone">Ringtone</string>
<string name="pref_ringtone_silent">Silent</string>
<string name="pref_title_vibrate">Vibrate</string> <string name="pref_title_vibrate">Vibrate</string>
<string name="submit">submit</string> <string name="submit">submit</string>
<string name="insert_entry_failed">Insertion failed</string>
<string name="insert_entry_successful">Insertion successful</string>
<string-array name="list_preference_entries">
<item>Entry 1</item>
<item>Entry 2</item>
<item>Entry 3</item>
</string-array>
<string-array name="list_preference_entry_values">
<item>1</item>
<item>2</item>
<item>3</item>
</string-array>
<string name="appwidget_text">EXAMPLE</string> <string name="appwidget_text">EXAMPLE</string>
<string name="add_widget">Add widget</string> <string name="add_widget">Add widget</string>
</resources> <string name="title_home">Home</string>
<string name="title_world">World</string>
<string name="location_name">Enter Location name</string>
<string name="degrees_c">°C</string>
<string name="min">Min:</string>
<string name="max">Max:</string>
<string name="average">Average:</string>
</resources>

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

@@ -3,11 +3,12 @@
<!-- Base application theme. --> <!-- Base application theme. -->
<style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar"> <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar">
<!-- Customize your theme here. --> <!-- Customize your theme here. -->
<item name="colorPrimary">@android:color/transparent</item> <item name="colorPrimary">@android:color/black</item>
<item name="colorPrimaryDark">@color/colour_four</item> <item name="colorPrimaryDark">@color/colour_four</item>
<item name="colorAccent">@color/colour_one</item> <item name="colorAccent">@color/colour_one</item>
<item name="android:windowBackground">@drawable/gradient</item> <item name="android:windowBackground">@drawable/gradient</item>
<item name="fontFamily">sans-serif-light</item> <item name="fontFamily">sans-serif-light</item>
<item name="android:textColor">@color/colorAccent</item>
</style> </style>
<style name="AppTheme.NoActionBar"> <style name="AppTheme.NoActionBar">
@@ -45,4 +46,12 @@
<item name="android:textSize">32sp</item> <item name="android:textSize">32sp</item>
</style> </style>
<style name="icon_style__further_deatils">
<item name="android:layout_width">64dp</item>
<item name="android:layout_height">64dp</item>
<item name="android:adjustViewBounds">true</item>
<item name="android:layout_gravity">center</item>
<item name="android:tint">@color/colorAccent</item>
</style>
</resources> </resources>

21
app/src/main/res/xml/pref_data_sync.xml
View File

@@ -1,21 +0,0 @@
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<!-- NOTE: Hide buttons to simplify the UI. Users can touch outside the dialog to
dismiss it. -->
<!-- NOTE: ListPreference's summary should be set to its value by the activity code. -->
<ListPreference
android:defaultValue="180"
android:entries="@array/pref_sync_frequency_titles"
android:entryValues="@array/pref_sync_frequency_values"
android:key="sync_frequency"
android:negativeButtonText="@null"
android:positiveButtonText="@null"
android:title="@string/pref_title_sync_frequency" />
<!-- This preference simply launches an intent when selected. Use this UI sparingly, per
design guidelines. -->
<Preference android:title="@string/pref_title_system_sync_settings">
<intent android:action="android.settings.SYNC_SETTINGS" />
</Preference>
</PreferenceScreen>

33
app/src/main/res/xml/pref_general.xml
View File

@@ -1,33 +0,0 @@
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<SwitchPreference
android:defaultValue="true"
android:key="example_switch"
android:summary="@string/pref_description_social_recommendations"
android:title="@string/pref_title_social_recommendations" />
<!-- NOTE: EditTextPreference accepts EditText attributes. -->
<!-- NOTE: EditTextPreference's summary should be set to its value by the activity code. -->
<EditTextPreference
android:capitalize="words"
android:defaultValue="@string/pref_default_display_name"
android:inputType="textCapWords"
android:key="example_text"
android:maxLines="1"
android:selectAllOnFocus="true"
android:singleLine="true"
android:title="@string/pref_title_display_name" />
<!-- NOTE: Hide buttons to simplify the UI. Users can touch outside the dialog to
dismiss it. -->
<!-- NOTE: ListPreference's summary should be set to its value by the activity code. -->
<ListPreference
android:defaultValue="-1"
android:entries="@array/pref_example_list_titles"
android:entryValues="@array/pref_example_list_values"
android:key="example_list"
android:negativeButtonText="@null"
android:positiveButtonText="@null"
android:title="@string/pref_title_add_friends_to_messages" />
</PreferenceScreen>

20
app/src/main/res/xml/pref_headers.xml
View File

@@ -1,20 +0,0 @@
<preference-headers xmlns:android="http://schemas.android.com/apk/res/android">
<!-- These settings headers are only used on tablets. -->
<header
android:fragment="com.appttude.h_mal.atlas_weather.SettingsActivity$GeneralPreferenceFragment"
android:icon="@drawable/ic_info_black_24dp"
android:title="@string/pref_header_general" />
<header
android:fragment="com.appttude.h_mal.atlas_weather.SettingsActivity$NotificationPreferenceFragment"
android:icon="@drawable/ic_notifications_black_24dp"
android:title="@string/pref_header_notifications" />
<header
android:fragment="com.appttude.h_mal.atlas_weather.SettingsActivity$DataSyncPreferenceFragment"
android:icon="@drawable/ic_sync_black_24dp"
android:title="@string/pref_header_data_sync" />
</preference-headers>

27
app/src/main/res/xml/pref_notification.xml
View File

@@ -1,27 +0,0 @@
<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android">
<!-- A 'parent' preference, which enables/disables child prefs (below)
when checked/unchecked. -->
<SwitchPreference
android:defaultValue="true"
android:key="notifications_new_message"
android:title="@string/pref_title_new_message_notifications" />
<!-- Allows the user to choose a ringtone in the 'notification' category. -->
<!-- NOTE: This preference will be enabled only when the checkbox above is checked. -->
<!-- NOTE: RingtonePreference's summary should be set to its value by the activity code. -->
<RingtonePreference
android:defaultValue="content://settings/system/notification_sound"
android:dependency="notifications_new_message"
android:key="notifications_new_message_ringtone"
android:ringtoneType="notification"
android:title="@string/pref_title_ringtone" />
<!-- NOTE: This preference will be enabled only when the checkbox above is checked. -->
<SwitchPreference
android:defaultValue="true"
android:dependency="notifications_new_message"
android:key="notifications_new_message_vibrate"
android:title="@string/pref_title_vibrate" />
</PreferenceScreen>

58
app/src/main/res/xml/prefs.xml
View File

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

10
build.gradle
View File

@@ -2,13 +2,19 @@
buildscript { buildscript {
ext {
kotlin_version = '1.3.72'
}
repositories { repositories {
google() google()
jcenter() jcenter()
} }
dependencies { dependencies {
classpath 'com.android.tools.build:gradle:3.2.1' classpath 'com.android.tools.build:gradle:4.0.1'
classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
def nav_version = "2.3.0"
classpath "androidx.navigation:navigation-safe-args-gradle-plugin:$nav_version"
// NOTE: Do not place your application dependencies here; they belong // NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files // in the individual module build.gradle files

3
gradle.properties
View File

@@ -9,9 +9,12 @@
# Specifies the JVM arguments used for the daemon process. # Specifies the JVM arguments used for the daemon process.
# The setting is particularly useful for tweaking memory settings. # The setting is particularly useful for tweaking memory settings.
android.enableJetifier=true
android.useAndroidX=true
org.gradle.jvmargs=-Xmx1536m org.gradle.jvmargs=-Xmx1536m
# When configured, Gradle will run in incubating parallel mode. # When configured, Gradle will run in incubating parallel mode.
# This option should only be used with decoupled projects. More details, visit # This option should only be used with decoupled projects. More details, visit
# http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
# org.gradle.parallel=true # org.gradle.parallel=true
paramOneEndPoint="109561f18fea4fa03d124a2127457a89"

2
gradle/wrapper/gradle-wrapper.properties vendored
View File

@@ -3,4 +3,4 @@ distributionBase=GRADLE_USER_HOME
distributionPath=wrapper/dists distributionPath=wrapper/dists
zipStoreBase=GRADLE_USER_HOME zipStoreBase=GRADLE_USER_HOME
zipStorePath=wrapper/dists zipStorePath=wrapper/dists
distributionUrl=https\://services.gradle.org/distributions/gradle-4.6-all.zip distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip