update dependencies, target pie, java 1.8 compat, move activities to a folder, fix some English, etc.

Signed-off-by: Taco <[email protected]>

Author: TacoTheDank

.gitignore

@@ -1,11 +1,11 @@
 *.iml
 .gradle
-/local.properties
+local.properties
 .DS_Store
-/build
-/captures
+build
+captures
 .externalNativeBuild
-/.idea
-/gradle.properties
+.idea
+gradle.properties
 app/src/main/res/values/keys.xml
 app/release/

.travis.yml

@@ -1,22 +1,29 @@
 language: android
 android:
   components:
-  - tools
-  - platform-tools
-  - tools
-  - build-tools-26.0.2
-  - android-26
-  licenses:
-  - ".+"
+    - tools
+    - platform-tools
+    - tools
+    - build-tools-28.0.3
+    - android-28
+
+  license:
+    - android-sdk-license-.+
+    - android-sdk-preview-license-.+
+    - -.+
+
 before_install:
-- yes | sdkmanager "platforms;android-27"
+- yes | sdkmanager "platforms;android-28"
+
 before_script:
 - sed -i "s/app_icon/app_icon_devel/g" app/src/main/AndroidManifest.xml
 - sed -i "s/com.danhasting.radar/com.danhasting.radar.devel/g" app/build.gradle
 - sed -i "s/versionName \"\([0-9\.]\+\)\"/versionName \"\1~git:${TRAVIS_COMMIT:0:7}\"/g" app/build.gradle
+
 before_deploy:
 - mkdir app/build/outputs/apk/debug/$TRAVIS_BRANCH/
 - mv app/build/outputs/apk/debug/app-debug.apk app/build/outputs/apk/debug/$TRAVIS_BRANCH/com.danhasting.radar.devel.apk
+
 deploy:
   provider: s3
   access_key_id:

README.md

@@ -4,17 +4,36 @@
 
 Weather Radar is an open-source application featuring doppler radar images from the United States National Weather Service and Weather Underground's API.
 
-The images are single images based on location rather than tiled images that can be panned like most other applications of this type. This allows faster loading when connection speeds are sub-optimal. Images can be customized including by resolution to help keep data usage to a minimum when needed. You can save your favorite views for easy reference.
-
-National Weather Service radar imagery is available for the United States and its territories. The Weather Underground radar imagery requires and API key from their website to work. There is a test feature available so you can try it out before acquiring your own API key. Their radar imagery is available for the United States and some parts of Canada, Mexico, Western Europe, and Australia. Their satellite imagery is available worldwide.
-
-__NOTE:__ Weather Underground discontinued free API keys at the same time I released this application. If you already have an API key from them, it will work. Otherwise, there doesn't seem to be a way to get the Weather Underground images working. The NWS images still work fine.
+The images are single images based on location rather than tiled images that can be panned like most other applications of this type.
+This allows faster loading when connection speeds are sub-optimal.
+Images can be customized including by resolution to help keep data usage to a minimum when needed.
+You can save your favorite views for easy reference.
+
+National Weather Service radar imagery is available for the United States and its territories.
+The Weather Underground radar imagery requires an API key from their website to work.
+There is a test feature available so you can try it out before acquiring your own API key.
+Their radar imagery is available for the United States and some parts of Canada, Mexico, Western Europe, and Australia.
+Their satellite imagery is available worldwide.
+
+__NOTE:__ Weather Underground discontinued free API keys at the same time I released this application.
+If you already have an API key from them, it will work.
+Otherwise, there doesn't seem to be a way to get the Weather Underground images working.
+The NWS images still work fine.
 
 I will work on integrating another source.
 
 ## Downloading
 
-<p><a href="https://f-droid.org/en/packages/com.danhasting.radar/"><img src="https://raw.githubusercontent.com/dh4/WeatherRadar/master/resources/fdroid.png" alt="Get it on F-Droid" /></a> <a href="https://play.google.com/store/apps/details?id=com.danhasting.radar"><img src="https://raw.githubusercontent.com/dh4/WeatherRadar/master/resources/googleplay.png" alt="Get it on Google Play" /></a></p>
+<a href="https://play.google.com/store/apps/details?id=com.danhasting.radar">
+    <img src="https://play.google.com/intl/en_us/badges/images/generic/en_badge_web_generic.png"
+         alt="Get it on Google Play" height="80">
+</a>
+<a href="https://f-droid.org/packages/com.danhasting.radar/">
+    <img src="https://fdroid.gitlab.io/artwork/badge/get-it-on.png"
+         alt="Get it on F-Droid" height="80">
+</a>
+
+
 
 APKs are also available on the [releases](https://github.com/dh4/WeatherRadar/releases) page.
 

app/build.gradle

@@ -1,14 +1,16 @@
 apply plugin: 'com.android.application'
 
 android {
-    compileSdkVersion 27
-    buildToolsVersion '27.0.3'
+    compileSdkVersion 28
+    buildToolsVersion '28.0.3'
+
     defaultConfig {
         applicationId "com.danhasting.radar"
         minSdkVersion 16
-        targetSdkVersion 27
-        versionCode 2
-        versionName "1.0"
+        targetSdkVersion 28
+        versionCode 3
+        versionName "1.1"
+
         testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
 
         javaCompileOptions {
@@ -17,24 +19,32 @@ android {
             }
         }
     }
+
     buildTypes {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
     }
+
+    compileOptions {
+        encoding = 'UTF-8'
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 }
 
 dependencies {
-    implementation 'com.android.support:appcompat-v7:27.1.1'
-    implementation 'com.android.support:design:27.1.1'
-    implementation 'com.android.support.constraint:constraint-layout:1.1.0'
-    implementation 'android.arch.lifecycle:extensions:1.1.1'
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'com.android.support.test:runner:1.0.2'
-    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
-    implementation 'android.arch.persistence.room:runtime:1.1.0'
-    annotationProcessor 'android.arch.persistence.room:compiler:1.1.0'
-    implementation 'com.x5dev:chunk-templates:3.3.1'
+
+    implementation 'com.android.support:design:28.0.0'
+    implementation 'com.android.support:appcompat-v7:28.0.0'
+    implementation 'com.android.support.constraint:constraint-layout:1.1.3'
+
+    implementation 'android.arch.lifecycle:extensions:1.1.1'
+    implementation 'android.arch.persistence.room:runtime:1.1.1'
+    annotationProcessor 'android.arch.persistence.room:compiler:1.1.1'
+
+    implementation 'com.x5dev:chunk-templates:3.4.0'
     implementation 'com.loopj.android:android-async-http:1.4.9'
 }

app/src/main/AndroidManifest.xml

@@ -12,21 +12,21 @@
         android:roundIcon="@mipmap/app_icon"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".MainActivity">
+        <activity android:name=".activities.MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-        <activity android:name=".SelectActivity" />
+        <activity android:name=".activities.SelectActivity" />
         <activity
-            android:name=".RadarActivity"
+            android:name=".activities.RadarActivity"
             android:windowSoftInputMode="adjustPan" />
         <activity
-            android:name=".SettingsActivity"
+            android:name=".activities.SettingsActivity"
             android:theme="@style/SettingsTheme" />
-        <activity android:name=".AboutActivity" />
+        <activity android:name=".activities.AboutActivity" />
     </application>
 
 </manifest>

app/src/main/java/com/danhasting/radar/AboutActivity.java

@@ -0,0 +1,97 @@
+/*
+ * Copyright (c) 2018, Dan Hasting
+ *
+ * This file is part of WeatherRadar
+ *
+ * WeatherRadar is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * WeatherRadar is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with WeatherRadar.  If not, see <http://www.gnu.org/licenses/>.
+ */
+package com.danhasting.radar.activities;
+
+import android.content.Context;
+import android.content.Intent;
+import android.net.Uri;
+import android.os.Bundle;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.Button;
+import android.widget.ImageView;
+import android.widget.TextView;
+
+import com.danhasting.radar.BuildConfig;
+import com.danhasting.radar.R;
+
+public class AboutActivity extends MainActivity {
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        LayoutInflater inflater = (LayoutInflater) this.getSystemService(Context.LAYOUT_INFLATER_SERVICE);
+        if (inflater != null) {
+            View contentView = inflater.inflate(R.layout.activity_about, drawerLayout, false);
+            drawerLayout.addView(contentView, 0);
+        }
+
+        setTitle(R.string.about);
+
+        TextView version = findViewById(R.id.version);
+        String versionName = String.format("%s %s", getText(R.string.version),
+                BuildConfig.VERSION_NAME);
+        version.setText(versionName);
+
+        Button donateButton = findViewById(R.id.donate_button);
+        donateButton.setOnClickListener(v -> {
+            Intent intent = new Intent();
+            intent.setAction(Intent.ACTION_VIEW);
+            intent.addCategory(Intent.CATEGORY_BROWSABLE);
+            intent.setData(Uri.parse("https://dh4.github.io/donate/"));
+            startActivity(intent);
+        });
+
+        Button githubButton = findViewById(R.id.github_button);
+        githubButton.setOnClickListener(v -> {
+            Intent intent = new Intent();
+            intent.setAction(Intent.ACTION_VIEW);
+            intent.addCategory(Intent.CATEGORY_BROWSABLE);
+            intent.setData(Uri.parse("https://github.com/dh4/WeatherRadar"));
+            startActivity(intent);
+        });
+
+        Button issueButton = findViewById(R.id.issue_button);
+        issueButton.setOnClickListener(v -> {
+            Intent intent = new Intent();
+            intent.setAction(Intent.ACTION_VIEW);
+            intent.addCategory(Intent.CATEGORY_BROWSABLE);
+            intent.setData(Uri.parse("https://github.com/dh4/WeatherRadar/issues"));
+            startActivity(intent);
+        });
+
+        Button contactButton = findViewById(R.id.contact_button);
+        contactButton.setOnClickListener(v -> {
+            Intent intent = new Intent();
+            intent.setAction(Intent.ACTION_VIEW);
+            intent.addCategory(Intent.CATEGORY_BROWSABLE);
+            intent.setData(Uri.parse("https://dh4.github.io/contact/"));
+            startActivity(intent);
+        });
+
+        ImageView wundergroundImage = findViewById(R.id.wunderground_image);
+        wundergroundImage.setOnClickListener(v -> {
+            Intent intent = new Intent();
+            intent.setAction(Intent.ACTION_VIEW);
+            intent.addCategory(Intent.CATEGORY_BROWSABLE);
+            intent.setData(Uri.parse("https://www.wunderground.com/"));
+            startActivity(intent);
+        });
+    }
+}