diff --git a/app/build.gradle b/app/build.gradle index 45dc106..ff5f9e0 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,13 +1,13 @@ apply plugin: 'com.android.application' android { - compileSdkVersion 29 - buildToolsVersion "29.0.2" + compileSdkVersion 31 + buildToolsVersion "30.0.3" defaultConfig { applicationId "ch.fixme.status" minSdkVersion 21 - targetSdkVersion 29 + targetSdkVersion 31 versionCode 20 versionName "1.8.1" } diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 343f498..afde500 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -20,13 +20,16 @@ + android:launchMode="singleTask" + android:exported="true"> - + + android:label="@string/app_name" + android:exported="false"> - + - + diff --git a/app/src/main/java/ch/fixme/status/Main.java b/app/src/main/java/ch/fixme/status/Main.java index 4581ac0..d75a416 100644 --- a/app/src/main/java/ch/fixme/status/Main.java +++ b/app/src/main/java/ch/fixme/status/Main.java @@ -23,6 +23,7 @@ import android.net.http.HttpResponseCache; import android.os.AsyncTask; import android.os.Bundle; +import android.os.Handler; import android.preference.PreferenceManager; import android.text.util.Linkify; import android.util.Log; @@ -110,6 +111,12 @@ public void onCreate(Bundle savedInstanceState) { showError(getString(R.string.error_title) + getString(R.string.error_network_title), getString(R.string.error_network_msg)); } + + // Show info about new app after 1s + new Handler().postDelayed(() -> { + final Intent intent = new Intent(this, NewVersionActivity.class); + startActivity(intent); + }, 1000); } @Override diff --git a/app/src/main/java/ch/fixme/status/NewVersionActivity.java b/app/src/main/java/ch/fixme/status/NewVersionActivity.java new file mode 100644 index 0000000..625c427 --- /dev/null +++ b/app/src/main/java/ch/fixme/status/NewVersionActivity.java @@ -0,0 +1,27 @@ +package ch.fixme.status; + +import android.app.Activity; +import android.os.Bundle; +import android.widget.ImageView; + +public class NewVersionActivity extends Activity { + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_new_version); + + // Close button + final ImageView closeButton = findViewById(R.id.closeButton); + closeButton.setImageResource(R.drawable.ic_baseline_close_24); + closeButton.setOnClickListener(buttonView -> finish()); + + // Logos + final ImageView oldLogo = findViewById(R.id.oldLogo); + oldLogo.setImageResource(R.drawable.myhs); + final ImageView arrow = findViewById(R.id.arrow); + arrow.setImageResource(R.drawable.ic_baseline_arrow_forward_24); + final ImageView newLogo = findViewById(R.id.newLogo); + newLogo.setImageResource(R.drawable.newlogo); + } +} \ No newline at end of file diff --git a/app/src/main/res/drawable/ic_baseline_arrow_forward_24.xml b/app/src/main/res/drawable/ic_baseline_arrow_forward_24.xml new file mode 100644 index 0000000..d231cd6 --- /dev/null +++ b/app/src/main/res/drawable/ic_baseline_arrow_forward_24.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/ic_baseline_close_24.xml b/app/src/main/res/drawable/ic_baseline_close_24.xml new file mode 100644 index 0000000..f1cca19 --- /dev/null +++ b/app/src/main/res/drawable/ic_baseline_close_24.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/drawable/newlogo.png b/app/src/main/res/drawable/newlogo.png new file mode 100644 index 0000000..d2435ba Binary files /dev/null and b/app/src/main/res/drawable/newlogo.png differ diff --git a/app/src/main/res/layout/activity_new_version.xml b/app/src/main/res/layout/activity_new_version.xml new file mode 100644 index 0000000..78ccd87 --- /dev/null +++ b/app/src/main/res/layout/activity_new_version.xml @@ -0,0 +1,101 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/base.xml b/app/src/main/res/layout/base.xml index a17703b..cde705f 100644 --- a/app/src/main/res/layout/base.xml +++ b/app/src/main/res/layout/base.xml @@ -3,12 +3,13 @@ Copyright (C) 2012 Aubort Jean-Baptiste (Rorist) Licensed under GNU's GPL 3, see README --> - + android:orientation="vertical"> diff --git a/app/src/main/res/values-da/strings.xml b/app/src/main/res/values-da/strings.xml index 2b32228..5e48f38 100644 --- a/app/src/main/res/values-da/strings.xml +++ b/app/src/main/res/values-da/strings.xml @@ -6,7 +6,7 @@ --> - MyHackerspace + MyHackerspace (Old) OK diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml index e863ae4..1c1480c 100644 --- a/app/src/main/res/values-de/strings.xml +++ b/app/src/main/res/values-de/strings.xml @@ -9,7 +9,7 @@ Licensed under GNU's GPL 3, see README --> - MyHackerspace + MyHackerspace (Old) OK diff --git a/app/src/main/res/values-fr/strings.xml b/app/src/main/res/values-fr/strings.xml index 0d055bb..4250e9e 100644 --- a/app/src/main/res/values-fr/strings.xml +++ b/app/src/main/res/values-fr/strings.xml @@ -5,7 +5,7 @@ --> - MyHackerspace + MyHackerspace (Old) OK diff --git a/app/src/main/res/values-nl/strings.xml b/app/src/main/res/values-nl/strings.xml index 6e49e4c..9b861b8 100644 --- a/app/src/main/res/values-nl/strings.xml +++ b/app/src/main/res/values-nl/strings.xml @@ -5,7 +5,7 @@ --> - MyHackerspace + MyHackerspace (Old) OK diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index b98b486..0565283 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -6,7 +6,7 @@ Licensed under GNU's GPL 3, see README --> - MyHackerspace + MyHackerspace (Old) OK