diff --git a/app/build.gradle b/app/build.gradle index e41ecfd..cac0a7b 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -16,7 +16,7 @@ android { } defaultConfig { - applicationId 'io.elixirdesktop.example' + applicationId 'net.nytsoi.geotherminator' minSdkVersion 23 targetSdkVersion 30 versionCode 1 diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index e1ab665..a4330d9 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,6 +1,6 @@ @@ -17,7 +17,7 @@ + android:name="net.nytsoi.geotherminator.MainActivity"> diff --git a/app/src/main/cpp/native-lib.cpp b/app/src/main/cpp/native-lib.cpp index 6c0b7b6..cd006f7 100644 --- a/app/src/main/cpp/native-lib.cpp +++ b/app/src/main/cpp/native-lib.cpp @@ -160,7 +160,7 @@ const char* startErlang(std::string root_dir, std::string log_dir) } extern "C" JNIEXPORT jstring JNICALL -Java_io_elixirdesktop_example_Bridge_startErlang( +Java_net_nytsoi_geotherminator_Bridge_startErlang( JNIEnv* env, jobject /* this */, jstring release_dir, jstring log_dir) { diff --git a/app/src/main/ic_launcher-playstore.png b/app/src/main/ic_launcher-playstore.png index 18a1e07..81a562e 100644 Binary files a/app/src/main/ic_launcher-playstore.png and b/app/src/main/ic_launcher-playstore.png differ diff --git a/app/src/main/java/io/elixirdesktop/example/Bridge.kt b/app/src/main/java/net/nytsoi/geotherminator/Bridge.kt similarity index 98% rename from app/src/main/java/io/elixirdesktop/example/Bridge.kt rename to app/src/main/java/net/nytsoi/geotherminator/Bridge.kt index aa69575..70fd162 100644 --- a/app/src/main/java/io/elixirdesktop/example/Bridge.kt +++ b/app/src/main/java/net/nytsoi/geotherminator/Bridge.kt @@ -1,6 +1,5 @@ -package io.elixirdesktop.example +package net.nytsoi.geotherminator -import android.app.PendingIntent import android.content.ActivityNotFoundException import android.content.Context import android.content.Intent @@ -13,9 +12,6 @@ import android.webkit.WebChromeClient import android.webkit.WebSettings import android.webkit.WebView import android.webkit.WebViewClient -import androidx.core.app.NotificationCompat -import androidx.core.app.NotificationManagerCompat -import androidx.core.content.ContextCompat import androidx.core.content.FileProvider import org.json.JSONArray import org.json.JSONObject diff --git a/app/src/main/java/io/elixirdesktop/example/MainActivity.kt b/app/src/main/java/net/nytsoi/geotherminator/MainActivity.kt similarity index 93% rename from app/src/main/java/io/elixirdesktop/example/MainActivity.kt rename to app/src/main/java/net/nytsoi/geotherminator/MainActivity.kt index eca1447..5b6c87a 100644 --- a/app/src/main/java/io/elixirdesktop/example/MainActivity.kt +++ b/app/src/main/java/net/nytsoi/geotherminator/MainActivity.kt @@ -1,11 +1,10 @@ -package io.elixirdesktop.example +package net.nytsoi.geotherminator import android.app.Activity import android.os.Bundle -import android.system.Os import android.view.KeyEvent import android.view.View -import io.elixirdesktop.example.databinding.ActivityMainBinding +import net.nytsoi.geotherminator.databinding.ActivityMainBinding import java.io.* import java.util.* import android.webkit.WebView diff --git a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml b/app/src/main/res/drawable-v24/ic_launcher_foreground.xml deleted file mode 100644 index e7139f2..0000000 --- a/app/src/main/res/drawable-v24/ic_launcher_foreground.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - diff --git a/app/src/main/res/drawable/ic_launcher_foreground.xml b/app/src/main/res/drawable/ic_launcher_foreground.xml new file mode 100644 index 0000000..54996d1 --- /dev/null +++ b/app/src/main/res/drawable/ic_launcher_foreground.xml @@ -0,0 +1,86 @@ + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/ic_launcher_playstore.png b/app/src/main/res/drawable/ic_launcher_playstore.png new file mode 100644 index 0000000..4a10fad Binary files /dev/null and b/app/src/main/res/drawable/ic_launcher_playstore.png differ diff --git a/app/src/main/res/drawable/radiator.xml b/app/src/main/res/drawable/radiator.xml new file mode 100644 index 0000000..b0ed55b --- /dev/null +++ b/app/src/main/res/drawable/radiator.xml @@ -0,0 +1,81 @@ + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 1031e64..f47cd0e 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -10,12 +10,14 @@ android:id="@+id/splash" android:layout_width="0dp" android:layout_height="0dp" + android:background="#FFF" android:contentDescription="@string/app_name" android:src="@drawable/ic_launcher_foreground" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintStart_toStartOf="parent" - app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toTopOf="parent" + app:srcCompat="@drawable/radiator" /> - - - - \ No newline at end of file diff --git a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml b/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml deleted file mode 100644 index 7353dbd..0000000 --- a/app/src/main/res/mipmap-anydpi-v26/ic_launcher_round.xml +++ /dev/null @@ -1,5 +0,0 @@ - - - - - \ No newline at end of file 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..2446c9f 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..21bd3ee 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..8f5b9f0 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..eacfeb5 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..f9edbdd 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..24d0963 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..9bfdf88 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..aa0701f 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..8301312 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..c04343f 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/ic_launcher_background.xml b/app/src/main/res/values/ic_launcher_background.xml index c5d5899..d94d5d7 100644 --- a/app/src/main/res/values/ic_launcher_background.xml +++ b/app/src/main/res/values/ic_launcher_background.xml @@ -1,4 +1,4 @@ - #FFFFFF + #CFCFCF \ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 5286f8c..7618f5d 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -1,3 +1,3 @@ - TodoApp + GeoTherminator \ No newline at end of file diff --git a/build.gradle b/build.gradle index e5d021f..06d513d 100644 --- a/build.gradle +++ b/build.gradle @@ -6,7 +6,7 @@ buildscript { mavenCentral() } dependencies { - classpath 'com.android.tools.build:gradle:7.0.3' + classpath 'com.android.tools.build:gradle:7.2.2' classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:1.5.30" // NOTE: Do not place your application dependencies here; they belong diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index bcef597..e1034bd 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,6 @@ #Tue Jun 22 14:56:47 CEST 2021 distributionBase=GRADLE_USER_HOME -distributionUrl=https\://services.gradle.org/distributions/gradle-7.0.2-bin.zip +distributionUrl=https\://services.gradle.org/distributions/gradle-7.3.3-bin.zip distributionPath=wrapper/dists zipStorePath=wrapper/dists zipStoreBase=GRADLE_USER_HOME diff --git a/settings.gradle b/settings.gradle index 11a6f8b..4be9e6e 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,2 +1,2 @@ -rootProject.name = "TodoApp" +rootProject.name = "GeoTherminator" include ':app'