Merge pull request #2 from viktorholk/develop

App redesign & configurable poll timer

Author: viktorholk

Diff for: README.md

@@ -1,4 +1,3 @@
-## API Push Notifications
-Send mobile push notifications through a REST API.<br>
-
-You can already install the offical [Android](https://play.google.com/store/apps/details?id=com.viktorholk.apipushnotifications) app on Google Play, or you can work with the source code and install your own apk.
+## Push Notifications API
+PNA is a simple development tool for displaying notifications created through a custom API.  
+...

Diff for: android/.gitignore

@@ -11,3 +11,5 @@
 /build
 /captures
 .externalNativeBuild
+.cxx
+local.properties

Diff for: android/app/.gitignore

@@ -1 +1 @@
-/build
+/build

Diff for: android/app/build.gradle

@@ -1,30 +1,41 @@
-apply plugin: 'com.android.application'
+plugins {
+    id 'com.android.application'
+}
 
 android {
-    compileSdkVersion 29
-    buildToolsVersion "30.0.2"
+    compileSdk 32
+
     defaultConfig {
-        applicationId "com.viktorholk.apipushnotifications"
-        minSdkVersion 26
-        targetSdkVersion 29
+        applicationId "com.viktorholk.pushnotificationsapi"
+        minSdk 26
+        targetSdk 32
         versionCode 1
         versionName "1.0"
+
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
     }
+
     buildTypes {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
         }
     }
+    compileOptions {
+        coreLibraryDesugaringEnabled true
+        sourceCompatibility JavaVersion.VERSION_1_8
+        targetCompatibility JavaVersion.VERSION_1_8
+    }
 }
 
 dependencies {
-    implementation fileTree(dir: 'libs', include: ['*.jar'])
-    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'androidx.constraintlayout:constraintlayout:2.0.1'
-    implementation 'com.android.volley:volley:1.1.1'
-    testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test:runner:1.3.0'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
-}
+
+    implementation 'androidx.appcompat:appcompat:1.4.0'
+    implementation 'com.google.android.material:material:1.4.0'
+    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
+    implementation 'com.android.volley:volley:1.2.0'
+    testImplementation 'junit:junit:4.+'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.3'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.4.0'
+    coreLibraryDesugaring 'com.android.tools:desugar_jdk_libs:1.1.5'
+}

Diff for: android/app/proguard-rules.pro

@@ -18,4 +18,4 @@
 
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
-#-renamesourcefileattribute SourceFile
+#-renamesourcefileattribute SourceFile

Diff for: android/app/src/androidTest/java/com/viktorholk/apipushnotifications/ExampleInstrumentedTest.java renamed to android/app/src/androidTest/java/com/viktorholk/pushnotificationsapi/ExampleInstrumentedTest.java

@@ -1,9 +1,9 @@
-package com.viktorholk.apipushnotifications;
+package com.viktorholk.pushnotificationsapi;
 
 import android.content.Context;
 
-import androidx.test.InstrumentationRegistry;
-import androidx.test.runner.AndroidJUnit4;
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
 
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -20,8 +20,7 @@ public class ExampleInstrumentedTest {
     @Test
     public void useAppContext() {
         // Context of the app under test.
-        Context appContext = InstrumentationRegistry.getTargetContext();
-
-        assertEquals("com.tactoctical.apipushnotifications", appContext.getPackageName());
+        Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
+        assertEquals("com.viktorholk.pushnotificationsapi", appContext.getPackageName());
     }
-}
+}

Diff for: android/app/src/main/AndroidManifest.xml

@@ -1,28 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.viktorholk.apipushnotifications">
+    package="com.viktorholk.pushnotificationsapi">
+    <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.FOREGROUND_SERVICE"/>
-    <uses-permission android:name="android.permission.INTERNET" />
+    <uses-permission android:name="android.permission.VIBRATE" />
 
     <application
         android:allowBackup="true"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
         android:roundIcon="@mipmap/ic_launcher_round"
         android:supportsRtl="true"
-        android:theme="@style/AppTheme"
-        android:networkSecurityConfig="@xml/network_security_config">
+        android:theme="@style/Theme.PushNotificationsAPI"
+        android:usesCleartextTraffic="true">
+
         <service
-            android:name="com.viktorholk.apipushnotifications.AppService"
+            android:name="com.viktorholk.pushnotificationsapi.NotificationService"
             android:enabled="true"
             android:exported="false"/>
 
-        <activity android:name="com.viktorholk.apipushnotifications.OptionsActivity"
-            android:screenOrientation="portrait"/>
-        <activity android:name="com.viktorholk.apipushnotifications.MainActivity"
+        <activity
+            android:name=".MainActivity"
+            android:exported="true"
             android:screenOrientation="portrait">
             <intent-filter>
-                <action android:name="android.intent.action.VIEW" />
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>