diff --git a/services_app/build.gradle b/services_app/build.gradle index 95cd52a2b..56985af6e 100644 --- a/services_app/build.gradle +++ b/services_app/build.gradle @@ -121,6 +121,7 @@ dependencies { implementation 'commons-fileupload:commons-fileupload:1.5' implementation 'org.opendatakit:odkx-rest-interface:2.2.0-SNAPSHOT' + implementation 'androidx.core:core-splashscreen:1.0.1' implementation 'androidx.annotation:annotation:1.7.1' implementation 'androidx.legacy:legacy-support-v4:1.0.0' implementation 'androidx.appcompat:appcompat:1.5.1' diff --git a/services_app/src/main/AndroidManifest.xml b/services_app/src/main/AndroidManifest.xml index fa7ae6c00..6d53a109b 100644 --- a/services_app/src/main/AndroidManifest.xml +++ b/services_app/src/main/AndroidManifest.xml @@ -110,7 +110,7 @@ + android:theme="@style/SplashTheme"> diff --git a/services_app/src/main/java/org/opendatakit/services/MainActivity.java b/services_app/src/main/java/org/opendatakit/services/MainActivity.java index 61747e823..0d53ef3e0 100644 --- a/services_app/src/main/java/org/opendatakit/services/MainActivity.java +++ b/services_app/src/main/java/org/opendatakit/services/MainActivity.java @@ -33,6 +33,7 @@ import androidx.appcompat.app.AppCompatActivity; import androidx.appcompat.widget.Toolbar; import androidx.core.app.ActivityCompat; +import androidx.core.splashscreen.SplashScreen; import androidx.core.view.GravityCompat; import androidx.drawerlayout.widget.DrawerLayout; import androidx.lifecycle.LifecycleEventObserver; @@ -203,6 +204,7 @@ public boolean onNavigationItemSelected(MenuItem item) { @Override protected void onCreate(Bundle savedInstanceState) { + SplashScreen.installSplashScreen(this); super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); diff --git a/services_app/src/main/res/drawable-night/odkx_splash.xml b/services_app/src/main/res/drawable-night/odkx_splash.xml new file mode 100644 index 000000000..a330659c9 --- /dev/null +++ b/services_app/src/main/res/drawable-night/odkx_splash.xml @@ -0,0 +1,214 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/services_app/src/main/res/drawable/odkx_splash.xml b/services_app/src/main/res/drawable/odkx_splash.xml new file mode 100644 index 000000000..afd089380 --- /dev/null +++ b/services_app/src/main/res/drawable/odkx_splash.xml @@ -0,0 +1,214 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/services_app/src/main/res/values/styles.xml b/services_app/src/main/res/values/styles.xml index cdc8027bd..1fa42a7eb 100644 --- a/services_app/src/main/res/values/styles.xml +++ b/services_app/src/main/res/values/styles.xml @@ -18,4 +18,9 @@ @menu/drawer_menu + +