diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..39fb081 --- /dev/null +++ b/.gitignore @@ -0,0 +1,9 @@ +*.iml +.gradle +/local.properties +/.idea/workspace.xml +/.idea/libraries +.DS_Store +/build +/captures +.externalNativeBuild diff --git a/.idea/compiler.xml b/.idea/compiler.xml new file mode 100644 index 0000000..9a8b7e5 --- /dev/null +++ b/.idea/compiler.xml @@ -0,0 +1,22 @@ + + + + + \ No newline at end of file diff --git a/.idea/copyright/profiles_settings.xml b/.idea/copyright/profiles_settings.xml new file mode 100644 index 0000000..e7bedf3 --- /dev/null +++ b/.idea/copyright/profiles_settings.xml @@ -0,0 +1,3 @@ + + + \ No newline at end of file diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..97626ba --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,6 @@ + + + + + + \ No newline at end of file diff --git a/.idea/gradle.xml b/.idea/gradle.xml new file mode 100644 index 0000000..c3a96ef --- /dev/null +++ b/.idea/gradle.xml @@ -0,0 +1,20 @@ + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..6653418 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,73 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1.8 + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/.idea/modules.xml b/.idea/modules.xml new file mode 100644 index 0000000..e92c112 --- /dev/null +++ b/.idea/modules.xml @@ -0,0 +1,10 @@ + + + + + + + + + + \ No newline at end of file diff --git a/.idea/runConfigurations.xml b/.idea/runConfigurations.xml new file mode 100644 index 0000000..7f68460 --- /dev/null +++ b/.idea/runConfigurations.xml @@ -0,0 +1,12 @@ + + + + + + \ No newline at end of file diff --git a/app/.gitignore b/app/.gitignore new file mode 100644 index 0000000..796b96d --- /dev/null +++ b/app/.gitignore @@ -0,0 +1 @@ +/build diff --git a/app/build.gradle b/app/build.gradle new file mode 100644 index 0000000..a9ec023 --- /dev/null +++ b/app/build.gradle @@ -0,0 +1,31 @@ +apply plugin: 'com.android.application' + +android { + compileSdkVersion 26 + buildToolsVersion "26.0.0" + defaultConfig { + applicationId "com.kwabenaberko.openweathermap" + minSdkVersion 15 + targetSdkVersion 26 + versionCode 1 + versionName "1.0" + testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } + } +} + +dependencies { + compile fileTree(dir: 'libs', include: ['*.jar']) + androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { + exclude group: 'com.android.support', module: 'support-annotations' + }) + compile 'com.android.support:appcompat-v7:26.+' + compile 'com.android.support.constraint:constraint-layout:1.0.2' + compile project(":openweathermaplib") + testCompile 'junit:junit:4.12' +} diff --git a/app/proguard-rules.pro b/app/proguard-rules.pro new file mode 100644 index 0000000..04a31c5 --- /dev/null +++ b/app/proguard-rules.pro @@ -0,0 +1,25 @@ +# Add project specific ProGuard rules here. +# By default, the flags in this file are appended to flags specified +# in C:\Users\PAVILION 15\AppData\Local\Android\sdk/tools/proguard/proguard-android.txt +# You can edit the include path and order by changing the proguardFiles +# directive in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# Add any project specific keep options here: + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile diff --git a/app/src/androidTest/java/com/kwabenaberko/openweathermap/ExampleInstrumentedTest.java b/app/src/androidTest/java/com/kwabenaberko/openweathermap/ExampleInstrumentedTest.java new file mode 100644 index 0000000..918af09 --- /dev/null +++ b/app/src/androidTest/java/com/kwabenaberko/openweathermap/ExampleInstrumentedTest.java @@ -0,0 +1,26 @@ +package com.kwabenaberko.openweathermap; + +import android.content.Context; +import android.support.test.InstrumentationRegistry; +import android.support.test.runner.AndroidJUnit4; + +import org.junit.Test; +import org.junit.runner.RunWith; + +import static org.junit.Assert.*; + +/** + * Instrumentation test, which will execute on an Android device. + * + * @see Testing documentation + */ +@RunWith(AndroidJUnit4.class) +public class ExampleInstrumentedTest { + @Test + public void useAppContext() throws Exception { + // Context of the app under test. + Context appContext = InstrumentationRegistry.getTargetContext(); + + assertEquals("com.kwabenaberko.openweathermap", appContext.getPackageName()); + } +} diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml new file mode 100644 index 0000000..7216b32 --- /dev/null +++ b/app/src/main/AndroidManifest.xml @@ -0,0 +1,23 @@ + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/kwabenaberko/openweathermap/MainActivity.java b/app/src/main/java/com/kwabenaberko/openweathermap/MainActivity.java new file mode 100644 index 0000000..7ecc6d7 --- /dev/null +++ b/app/src/main/java/com/kwabenaberko/openweathermap/MainActivity.java @@ -0,0 +1,32 @@ +package com.kwabenaberko.openweathermap; + +import android.support.v7.app.AppCompatActivity; +import android.os.Bundle; +import android.util.Log; +import android.widget.Toast; + +import com.kwabenaberko.openweathermaplib.implementation.OpenWeatherMapHelper; +import com.kwabenaberko.openweathermaplib.models.CurrentWeather; + +public class MainActivity extends AppCompatActivity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_main); + + OpenWeatherMapHelper helper = new OpenWeatherMapHelper(); + helper.setAppId("e1e88645e0c18f577551c16afbe063fd"); + helper.getCurrentWeatherByZipCode("97205", new OpenWeatherMapHelper.CurrentWeatherCallback() { + @Override + public void onSuccess(CurrentWeather currentWeather) { + Toast.makeText(MainActivity.this, currentWeather.getName(), Toast.LENGTH_SHORT).show(); + } + + @Override + public void onFailure(Throwable throwable) { + Log.v("RES", throwable.getMessage()); + } + }); + } +} diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml new file mode 100644 index 0000000..1637855 --- /dev/null +++ b/app/src/main/res/layout/activity_main.xml @@ -0,0 +1,19 @@ + + + + + + diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png new file mode 100644 index 0000000..cde69bc Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher_round.png b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png new file mode 100644 index 0000000..9a078e3 Binary files /dev/null and b/app/src/main/res/mipmap-hdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher.png b/app/src/main/res/mipmap-mdpi/ic_launcher.png new file mode 100644 index 0000000..c133a0c Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-mdpi/ic_launcher_round.png b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png new file mode 100644 index 0000000..efc028a Binary files /dev/null and b/app/src/main/res/mipmap-mdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher.png b/app/src/main/res/mipmap-xhdpi/ic_launcher.png new file mode 100644 index 0000000..bfa42f0 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png new file mode 100644 index 0000000..3af2608 Binary files /dev/null and b/app/src/main/res/mipmap-xhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png new file mode 100644 index 0000000..324e72c Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..9bec2e6 Binary files /dev/null and b/app/src/main/res/mipmap-xxhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png new file mode 100644 index 0000000..aee44e1 Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher.png differ diff --git a/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png new file mode 100644 index 0000000..34947cd Binary files /dev/null and b/app/src/main/res/mipmap-xxxhdpi/ic_launcher_round.png differ diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml new file mode 100644 index 0000000..3ab3e9c --- /dev/null +++ b/app/src/main/res/values/colors.xml @@ -0,0 +1,6 @@ + + + #3F51B5 + #303F9F + #FF4081 + diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml new file mode 100644 index 0000000..70b819b --- /dev/null +++ b/app/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + OpenWeatherMap + diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml new file mode 100644 index 0000000..5885930 --- /dev/null +++ b/app/src/main/res/values/styles.xml @@ -0,0 +1,11 @@ + + + + + + diff --git a/app/src/test/java/com/kwabenaberko/openweathermap/ExampleUnitTest.java b/app/src/test/java/com/kwabenaberko/openweathermap/ExampleUnitTest.java new file mode 100644 index 0000000..b3e2100 --- /dev/null +++ b/app/src/test/java/com/kwabenaberko/openweathermap/ExampleUnitTest.java @@ -0,0 +1,17 @@ +package com.kwabenaberko.openweathermap; + +import org.junit.Test; + +import static org.junit.Assert.*; + +/** + * Example local unit test, which will execute on the development machine (host). + * + * @see Testing documentation + */ +public class ExampleUnitTest { + @Test + public void addition_isCorrect() throws Exception { + assertEquals(4, 2 + 2); + } +} \ No newline at end of file diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..e8fc89b --- /dev/null +++ b/build.gradle @@ -0,0 +1,24 @@ +// Top-level build file where you can add configuration options common to all sub-projects/modules. + +buildscript { + repositories { + jcenter() + } + dependencies { + classpath 'com.android.tools.build:gradle:2.3.1' + classpath 'com.github.dcendents:android-maven-gradle-plugin:1.5' + + // NOTE: Do not place your application dependencies here; they belong + // in the individual module build.gradle files + } +} + +allprojects { + repositories { + jcenter() + } +} + +task clean(type: Delete) { + delete rootProject.buildDir +} diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..aac7c9b --- /dev/null +++ b/gradle.properties @@ -0,0 +1,17 @@ +# Project-wide Gradle settings. + +# IDE (e.g. Android Studio) users: +# Gradle settings configured through the IDE *will override* +# any settings specified in this file. + +# For more details on how to configure your build environment visit +# http://www.gradle.org/docs/current/userguide/build_environment.html + +# Specifies the JVM arguments used for the daemon process. +# The setting is particularly useful for tweaking memory settings. +org.gradle.jvmargs=-Xmx1536m + +# When configured, Gradle will run in incubating parallel mode. +# 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 +# org.gradle.parallel=true diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000..13372ae Binary files /dev/null and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..da811b8 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,6 @@ +#Tue Jul 25 09:26:51 GMT 2017 +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-3.3-all.zip diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..9d82f78 --- /dev/null +++ b/gradlew @@ -0,0 +1,160 @@ +#!/usr/bin/env bash + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS="" + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn ( ) { + echo "$*" +} + +die ( ) { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MINGW* ) + msys=true + ;; +esac + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +PRG="$0" +# Need this for relative symlinks. +while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG=`dirname "$PRG"`"/$link" + fi +done +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + +# Determine the Java command to use to start the JVM. +if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin, switch paths to Windows format before running java +if $cygwin ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=$((i+1)) + done + case $i in + (0) set -- ;; + (1) set -- "$args0" ;; + (2) set -- "$args0" "$args1" ;; + (3) set -- "$args0" "$args1" "$args2" ;; + (4) set -- "$args0" "$args1" "$args2" "$args3" ;; + (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Split up the JVM_OPTS And GRADLE_OPTS values into an array, following the shell quoting and substitution rules +function splitJvmOpts() { + JVM_OPTS=("$@") +} +eval splitJvmOpts $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS +JVM_OPTS[${#JVM_OPTS[*]}]="-Dorg.gradle.appname=$APP_BASE_NAME" + +exec "$JAVACMD" "${JVM_OPTS[@]}" -classpath "$CLASSPATH" org.gradle.wrapper.GradleWrapperMain "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..8a0b282 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,90 @@ +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS= + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto init + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto init + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:init +@rem Get command-line arguments, handling Windowz variants + +if not "%OS%" == "Windows_NT" goto win9xME_args +if "%@eval[2+2]" == "4" goto 4NT_args + +:win9xME_args +@rem Slurp the command line arguments. +set CMD_LINE_ARGS= +set _SKIP=2 + +:win9xME_args_slurp +if "x%~1" == "x" goto execute + +set CMD_LINE_ARGS=%* +goto execute + +:4NT_args +@rem Get arguments from the 4NT Shell from JP Software +set CMD_LINE_ARGS=%$ + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/openweathermaplib/.gitignore b/openweathermaplib/.gitignore new file mode 100644 index 0000000..796b96d --- /dev/null +++ b/openweathermaplib/.gitignore @@ -0,0 +1 @@ +/build diff --git a/openweathermaplib/build.gradle b/openweathermaplib/build.gradle new file mode 100644 index 0000000..a6fc92e --- /dev/null +++ b/openweathermaplib/build.gradle @@ -0,0 +1,35 @@ +apply plugin: 'com.android.library' +apply plugin: 'com.github.dcendents.android-maven' +group = 'com.github.KwabenBerkogit' + +android { + compileSdkVersion 26 + buildToolsVersion "26.0.0" + + defaultConfig { + minSdkVersion 15 + targetSdkVersion 26 + versionCode 1 + versionName "1.0" + + testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner" + + } + buildTypes { + release { + minifyEnabled false + proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' + } + } +} + +dependencies { + compile fileTree(dir: 'libs', include: ['*.jar']) + androidTestCompile('com.android.support.test.espresso:espresso-core:2.2.2', { + exclude group: 'com.android.support', module: 'support-annotations' + }) + compile 'com.android.support:appcompat-v7:26.+' + compile 'com.squareup.retrofit2:retrofit:2.3.0' + compile 'com.squareup.retrofit2:converter-gson:2.3.0' + testCompile 'junit:junit:4.12' +} diff --git a/openweathermaplib/proguard-rules.pro b/openweathermaplib/proguard-rules.pro new file mode 100644 index 0000000..04a31c5 --- /dev/null +++ b/openweathermaplib/proguard-rules.pro @@ -0,0 +1,25 @@ +# Add project specific ProGuard rules here. +# By default, the flags in this file are appended to flags specified +# in C:\Users\PAVILION 15\AppData\Local\Android\sdk/tools/proguard/proguard-android.txt +# You can edit the include path and order by changing the proguardFiles +# directive in build.gradle. +# +# For more details, see +# http://developer.android.com/guide/developing/tools/proguard.html + +# Add any project specific keep options here: + +# If your project uses WebView with JS, uncomment the following +# and specify the fully qualified class name to the JavaScript interface +# class: +#-keepclassmembers class fqcn.of.javascript.interface.for.webview { +# public *; +#} + +# Uncomment this to preserve the line number information for +# debugging stack traces. +#-keepattributes SourceFile,LineNumberTable + +# If you keep the line number information, uncomment this to +# hide the original source file name. +#-renamesourcefileattribute SourceFile diff --git a/openweathermaplib/src/androidTest/java/com/kwabenaberko/openweathermaplib/ExampleInstrumentedTest.java b/openweathermaplib/src/androidTest/java/com/kwabenaberko/openweathermaplib/ExampleInstrumentedTest.java new file mode 100644 index 0000000..a85bdf0 --- /dev/null +++ b/openweathermaplib/src/androidTest/java/com/kwabenaberko/openweathermaplib/ExampleInstrumentedTest.java @@ -0,0 +1,26 @@ +package com.kwabenaberko.openweathermaplib; + +import android.content.Context; +import android.support.test.InstrumentationRegistry; +import android.support.test.runner.AndroidJUnit4; + +import org.junit.Test; +import org.junit.runner.RunWith; + +import static org.junit.Assert.*; + +/** + * Instrumentation test, which will execute on an Android device. + * + * @see Testing documentation + */ +@RunWith(AndroidJUnit4.class) +public class ExampleInstrumentedTest { + @Test + public void useAppContext() throws Exception { + // Context of the app under test. + Context appContext = InstrumentationRegistry.getTargetContext(); + + assertEquals("com.kwabenaberko.openweathermaplib.test", appContext.getPackageName()); + } +} diff --git a/openweathermaplib/src/main/AndroidManifest.xml b/openweathermaplib/src/main/AndroidManifest.xml new file mode 100644 index 0000000..4eb723e --- /dev/null +++ b/openweathermaplib/src/main/AndroidManifest.xml @@ -0,0 +1,13 @@ + + + + + + + diff --git a/openweathermaplib/src/main/java/com/kwabenaberko/openweathermaplib/implementation/OpenWeatherMapHelper.java b/openweathermaplib/src/main/java/com/kwabenaberko/openweathermaplib/implementation/OpenWeatherMapHelper.java new file mode 100644 index 0000000..b06ecca --- /dev/null +++ b/openweathermaplib/src/main/java/com/kwabenaberko/openweathermaplib/implementation/OpenWeatherMapHelper.java @@ -0,0 +1,158 @@ +package com.kwabenaberko.openweathermaplib.implementation; + +import android.support.annotation.NonNull; + +import com.kwabenaberko.openweathermaplib.network.OpenWeatherMapClient; +import com.kwabenaberko.openweathermaplib.network.OpenWeatherMapService; +import com.kwabenaberko.openweathermaplib.models.CurrentWeather; + +import org.json.JSONException; +import org.json.JSONObject; + +import java.io.IOException; +import java.net.HttpURLConnection; +import java.util.HashMap; +import java.util.Map; + +import retrofit2.Call; +import retrofit2.Callback; +import retrofit2.Response; + +/** + * Created by Kwabena Berko on 7/25/2017. + */ + +public class OpenWeatherMapHelper { + + private OpenWeatherMapService openWeatherMapService; + private Map options; + + public interface CurrentWeatherCallback{ + void onSuccess(CurrentWeather currentWeather); + void onFailure(Throwable throwable); + } + + public OpenWeatherMapHelper(){ + openWeatherMapService = OpenWeatherMapClient.getClient().create(OpenWeatherMapService.class); + options = new HashMap<>(); + options.put("APPID", ""); + options.put("units", "fahrenheit"); + } + + //METHODS TO SETUP APPLICATION + public void setAppId(String appId){ + options.put("APPID", appId); + } + public void setUnits(String units){ + options.put("units", units); + } + + + private Throwable NoAppIdErrMessage() { + return new Throwable("UnAuthorized. Please set your OpenWeatherMap Application Id by using the setAppId method."); + } + + + private Throwable NotFoundErrMsg(String str) { + Throwable throwable = null; + try { + JSONObject obj = new JSONObject(str); + throwable = new Throwable(obj.getString("message")); + } catch (JSONException e) { + e.printStackTrace(); + } + + if (throwable == null){ + throwable = new Throwable("An error occured"); + } + + + return throwable; + } + + + //GET CURRENT WEATHER BY CITY NAME + public void getCurrentWeatherByCityName(String city, final CurrentWeatherCallback callback){ + options.put("q", city); + openWeatherMapService.getCurrentWeatherByCityName(options).enqueue(new Callback() { + @Override + public void onResponse(@NonNull Call call, @NonNull Response response) { + HandleCurrentWeatherResponse(response, callback); + } + + @Override + public void onFailure(@NonNull Call call, @NonNull Throwable throwable) { + callback.onFailure(throwable); + } + }); + } + + //GET CURRENT WEATHER BY CITY ID + public void getCurrentWeatherByCityID(String id, final CurrentWeatherCallback callback){ + options.put("id", id); + openWeatherMapService.getCurrentWeatherByCityID(options).enqueue(new Callback() { + @Override + public void onResponse(Call call, Response response) { + HandleCurrentWeatherResponse(response, callback); + } + + @Override + public void onFailure(@NonNull Call call, @NonNull Throwable throwable) { + callback.onFailure(throwable); + } + }); + + } + + //GET CURRENT WEATHER BY GEOGRAPHIC COORDINATES + public void getCurrentWeatherByGeoCoordinates(double latitude, double longitude, final CurrentWeatherCallback callback){ + options.put("lat", String.valueOf(latitude)); + options.put("lon", String.valueOf(longitude)); + openWeatherMapService.getCurrentWeatherByGeoCoordinates(options).enqueue(new Callback() { + @Override + public void onResponse(Call call, Response response) { + HandleCurrentWeatherResponse(response, callback); + } + + @Override + public void onFailure(@NonNull Call call, @NonNull Throwable throwable) { + callback.onFailure(throwable); + } + }); + } + + //GET CURRENT WEATHER BY ZIP CODE + + public void getCurrentWeatherByZipCode(String zipCode, final CurrentWeatherCallback callback){ + options.put("zip", zipCode); + openWeatherMapService.getCurrentWeatherByZipCode(options).enqueue(new Callback() { + @Override + public void onResponse(Call call, Response response) { + HandleCurrentWeatherResponse(response, callback); + } + + @Override + public void onFailure(@NonNull Call call, @NonNull Throwable throwable) { + callback.onFailure(throwable); + } + }); + } + + private void HandleCurrentWeatherResponse(Response response, CurrentWeatherCallback callback){ + if (response.code() == HttpURLConnection.HTTP_OK){ + callback.onSuccess(response.body()); + } + else if (response.code() == HttpURLConnection.HTTP_FORBIDDEN || response.code() == HttpURLConnection.HTTP_UNAUTHORIZED){ + callback.onFailure(NoAppIdErrMessage()); + } + else{ + try { + callback.onFailure(NotFoundErrMsg(response.errorBody().string())); + } catch (IOException e) { + e.printStackTrace(); + } + } + } + + +} diff --git a/openweathermaplib/src/main/java/com/kwabenaberko/openweathermaplib/models/Clouds.java b/openweathermaplib/src/main/java/com/kwabenaberko/openweathermaplib/models/Clouds.java new file mode 100644 index 0000000..2ab5c46 --- /dev/null +++ b/openweathermaplib/src/main/java/com/kwabenaberko/openweathermaplib/models/Clouds.java @@ -0,0 +1,12 @@ +package com.kwabenaberko.openweathermaplib.models; + +import com.google.gson.annotations.SerializedName; + +/** + * Created by Kwabena Berko on 7/25/2017. + */ + +public class Clouds { + @SerializedName("all") + private double all; +} diff --git a/openweathermaplib/src/main/java/com/kwabenaberko/openweathermaplib/models/Coord.java b/openweathermaplib/src/main/java/com/kwabenaberko/openweathermaplib/models/Coord.java new file mode 100644 index 0000000..23c6cae --- /dev/null +++ b/openweathermaplib/src/main/java/com/kwabenaberko/openweathermaplib/models/Coord.java @@ -0,0 +1,32 @@ +package com.kwabenaberko.openweathermaplib.models; + +import com.google.gson.annotations.SerializedName; + +/** + * Created by Kwabena Berko on 7/25/2017. + */ + +public class Coord { + + @SerializedName("lon") + private double lon; + + @SerializedName("lat") + private double lat; + + public double getLon() { + return lon; + } + + public void setLon(double lon) { + this.lon = lon; + } + + public double getLat() { + return lat; + } + + public void setLat(double lat) { + this.lat = lat; + } +} diff --git a/openweathermaplib/src/main/java/com/kwabenaberko/openweathermaplib/models/CurrentWeather.java b/openweathermaplib/src/main/java/com/kwabenaberko/openweathermaplib/models/CurrentWeather.java new file mode 100644 index 0000000..69e1f3e --- /dev/null +++ b/openweathermaplib/src/main/java/com/kwabenaberko/openweathermaplib/models/CurrentWeather.java @@ -0,0 +1,122 @@ +package com.kwabenaberko.openweathermaplib.models; + +import com.google.gson.annotations.SerializedName; + +import java.util.List; + +/** + * Created by Kwabena Berko on 7/25/2017. + */ + +public class CurrentWeather { + + @SerializedName("coord") + private Coord mCoord; + + @SerializedName("weather") + private List mWeatherArray; + + @SerializedName("base") + private String base; + + @SerializedName("main") + private Main mMain; + + @SerializedName("wind") + private Wind mWind; + + @SerializedName("clouds") + private Clouds mClouds; + + @SerializedName("dt") + private Long dt; + + @SerializedName("sys") + private Sys mSys; + + @SerializedName("id") + private Long id; + + @SerializedName("name") + private String name; + + public Coord getCoord() { + return mCoord; + } + + public void setCoord(Coord coord) { + mCoord = coord; + } + + public List getWeatherArray() { + return mWeatherArray; + } + + public void setWeatherArray(List weatherArray) { + mWeatherArray = weatherArray; + } + + public String getBase() { + return base; + } + + public void setBase(String base) { + this.base = base; + } + + public Main getMain() { + return mMain; + } + + public void setMain(Main main) { + mMain = main; + } + + public Wind getWind() { + return mWind; + } + + public void setWind(Wind wind) { + mWind = wind; + } + + public Clouds getClouds() { + return mClouds; + } + + public void setClouds(Clouds clouds) { + mClouds = clouds; + } + + public Long getDt() { + return dt; + } + + public void setDt(Long dt) { + this.dt = dt; + } + + public Sys getSys() { + return mSys; + } + + public void setSys(Sys sys) { + mSys = sys; + } + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getName() { + return name; + } + + public void setName(String name) { + this.name = name; + } +} diff --git a/openweathermaplib/src/main/java/com/kwabenaberko/openweathermaplib/models/Main.java b/openweathermaplib/src/main/java/com/kwabenaberko/openweathermaplib/models/Main.java new file mode 100644 index 0000000..596e1c4 --- /dev/null +++ b/openweathermaplib/src/main/java/com/kwabenaberko/openweathermaplib/models/Main.java @@ -0,0 +1,87 @@ +package com.kwabenaberko.openweathermaplib.models; + +import com.google.gson.annotations.SerializedName; + +/** + * Created by Kwabena Berko on 7/25/2017. + */ + +public class Main { + @SerializedName("temp") + private double temp; + + @SerializedName("pressure") + private double pressure; + + @SerializedName("humidity") + private double humidity; + + @SerializedName("temp_min") + private double tempMin; + + @SerializedName("temp_max") + private double tempMax; + + @SerializedName("sea_level") + private double seaLevel; + + @SerializedName("grnd_level") + private double grndLevel; + + + public double getTemp() { + return temp; + } + + public void setTemp(double temp) { + this.temp = temp; + } + + public double getPressure() { + return pressure; + } + + public void setPressure(double pressure) { + this.pressure = pressure; + } + + public double getHumidity() { + return humidity; + } + + public void setHumidity(double humidity) { + this.humidity = humidity; + } + + public double getTempMin() { + return tempMin; + } + + public void setTempMin(double tempMin) { + this.tempMin = tempMin; + } + + public double getTempMax() { + return tempMax; + } + + public void setTempMax(double tempMax) { + this.tempMax = tempMax; + } + + public double getSeaLevel() { + return seaLevel; + } + + public void setSeaLevel(double seaLevel) { + this.seaLevel = seaLevel; + } + + public double getGrndLevel() { + return grndLevel; + } + + public void setGrndLevel(double grndLevel) { + this.grndLevel = grndLevel; + } +} diff --git a/openweathermaplib/src/main/java/com/kwabenaberko/openweathermaplib/models/Sys.java b/openweathermaplib/src/main/java/com/kwabenaberko/openweathermaplib/models/Sys.java new file mode 100644 index 0000000..01af185 --- /dev/null +++ b/openweathermaplib/src/main/java/com/kwabenaberko/openweathermaplib/models/Sys.java @@ -0,0 +1,53 @@ +package com.kwabenaberko.openweathermaplib.models; + +import com.google.gson.annotations.SerializedName; + +/** + * Created by Kwabena Berko on 7/25/2017. + */ + +public class Sys { + @SerializedName("message") + private double message; + + @SerializedName("country") + private String country; + + @SerializedName("sunrise") + private Long sunrise; + + @SerializedName("sunset") + private Long sunset; + + public double getMessage() { + return message; + } + + public void setMessage(double message) { + this.message = message; + } + + public String getCountry() { + return country; + } + + public void setCountry(String country) { + this.country = country; + } + + public Long getSunrise() { + return sunrise; + } + + public void setSunrise(Long sunrise) { + this.sunrise = sunrise; + } + + public Long getSunset() { + return sunset; + } + + public void setSunset(Long sunset) { + this.sunset = sunset; + } +} diff --git a/openweathermaplib/src/main/java/com/kwabenaberko/openweathermaplib/models/Weather.java b/openweathermaplib/src/main/java/com/kwabenaberko/openweathermaplib/models/Weather.java new file mode 100644 index 0000000..7637c8c --- /dev/null +++ b/openweathermaplib/src/main/java/com/kwabenaberko/openweathermaplib/models/Weather.java @@ -0,0 +1,54 @@ +package com.kwabenaberko.openweathermaplib.models; + +import com.google.gson.annotations.SerializedName; + +/** + * Created by Kwabena Berko on 7/25/2017. + */ + +public class Weather { + + @SerializedName("id") + private Long id; + + @SerializedName("main") + private String main; + + @SerializedName("description") + private String description; + + @SerializedName("icon") + private String icon; + + public Long getId() { + return id; + } + + public void setId(Long id) { + this.id = id; + } + + public String getMain() { + return main; + } + + public void setMain(String main) { + this.main = main; + } + + public String getDescription() { + return description; + } + + public void setDescription(String description) { + this.description = description; + } + + public String getIcon() { + return icon; + } + + public void setIcon(String icon) { + this.icon = icon; + } +} diff --git a/openweathermaplib/src/main/java/com/kwabenaberko/openweathermaplib/models/Wind.java b/openweathermaplib/src/main/java/com/kwabenaberko/openweathermaplib/models/Wind.java new file mode 100644 index 0000000..485f98f --- /dev/null +++ b/openweathermaplib/src/main/java/com/kwabenaberko/openweathermaplib/models/Wind.java @@ -0,0 +1,31 @@ +package com.kwabenaberko.openweathermaplib.models; + +import com.google.gson.annotations.SerializedName; + +/** + * Created by Kwabena Berko on 7/25/2017. + */ + +public class Wind { + @SerializedName("speed") + private double speed; + + @SerializedName("deg") + private double deg; + + public double getSpeed() { + return speed; + } + + public void setSpeed(double speed) { + this.speed = speed; + } + + public double getDeg() { + return deg; + } + + public void setDeg(double deg) { + this.deg = deg; + } +} diff --git a/openweathermaplib/src/main/java/com/kwabenaberko/openweathermaplib/network/OpenWeatherMapClient.java b/openweathermaplib/src/main/java/com/kwabenaberko/openweathermaplib/network/OpenWeatherMapClient.java new file mode 100644 index 0000000..b4a6ae6 --- /dev/null +++ b/openweathermaplib/src/main/java/com/kwabenaberko/openweathermaplib/network/OpenWeatherMapClient.java @@ -0,0 +1,23 @@ +package com.kwabenaberko.openweathermaplib.network; + +import retrofit2.Retrofit; +import retrofit2.converter.gson.GsonConverterFactory; + +/** + * Created by Kwabena Berko on 7/25/2017. + */ + +public class OpenWeatherMapClient { + private static final String BASE_URL = "http://api.openweathermap.org"; + private static Retrofit retrofit = null; + public static Retrofit getClient(){ + if (retrofit == null){ + retrofit = new Retrofit.Builder() + .baseUrl(BASE_URL) + .addConverterFactory(GsonConverterFactory.create()) + .build(); + } + return retrofit; + } + +} diff --git a/openweathermaplib/src/main/java/com/kwabenaberko/openweathermaplib/network/OpenWeatherMapService.java b/openweathermaplib/src/main/java/com/kwabenaberko/openweathermaplib/network/OpenWeatherMapService.java new file mode 100644 index 0000000..baa0712 --- /dev/null +++ b/openweathermaplib/src/main/java/com/kwabenaberko/openweathermaplib/network/OpenWeatherMapService.java @@ -0,0 +1,27 @@ +package com.kwabenaberko.openweathermaplib.network; + +import com.kwabenaberko.openweathermaplib.models.CurrentWeather; + +import java.util.Map; + +import retrofit2.Call; +import retrofit2.http.GET; +import retrofit2.http.QueryMap; + +/** + * Created by Kwabena Berko on 7/25/2017. + */ + +public interface OpenWeatherMapService { + @GET("/data/2.5/weather") + Call getCurrentWeatherByCityName(@QueryMap Map options); + + @GET("/data/2.5/weather") + Call getCurrentWeatherByCityID(@QueryMap Map options); + + @GET("/data/2.5/weather") + Call getCurrentWeatherByGeoCoordinates(@QueryMap Map optionse); + + @GET("/data/2.5/weather") + Call getCurrentWeatherByZipCode(@QueryMap Map options); +} diff --git a/openweathermaplib/src/main/res/values/strings.xml b/openweathermaplib/src/main/res/values/strings.xml new file mode 100644 index 0000000..01a8e76 --- /dev/null +++ b/openweathermaplib/src/main/res/values/strings.xml @@ -0,0 +1,3 @@ + + OpenWeatherMapLib + diff --git a/openweathermaplib/src/test/java/com/kwabenaberko/openweathermaplib/ExampleUnitTest.java b/openweathermaplib/src/test/java/com/kwabenaberko/openweathermaplib/ExampleUnitTest.java new file mode 100644 index 0000000..3b28edd --- /dev/null +++ b/openweathermaplib/src/test/java/com/kwabenaberko/openweathermaplib/ExampleUnitTest.java @@ -0,0 +1,17 @@ +package com.kwabenaberko.openweathermaplib; + +import org.junit.Test; + +import static org.junit.Assert.*; + +/** + * Example local unit test, which will execute on the development machine (host). + * + * @see Testing documentation + */ +public class ExampleUnitTest { + @Test + public void addition_isCorrect() throws Exception { + assertEquals(4, 2 + 2); + } +} \ No newline at end of file diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..7ea4c62 --- /dev/null +++ b/settings.gradle @@ -0,0 +1 @@ +include ':app', ':openweathermaplib'