From 50a1437a752501cbe34cb64e33a085915d1c3485 Mon Sep 17 00:00:00 2001 From: Massimiliano Lentini Date: Sun, 9 Sep 2018 18:52:57 +0200 Subject: [PATCH] added welcome activity --- CHANGELOG.md | 1 + app/src/main/AndroidManifest.xml | 26 ++++++----- .../disroot/disrootapp/ui/MainActivity.java | 20 +++++---- .../disrootapp/ui/WelcomeActivity.java | 27 +++++++++++ .../disroot/disrootapp/utils/Constants.java | 1 + app/src/main/res/layout/activity_welcome.xml | 45 +++++++++++++++++++ app/src/main/res/values/strings.xml | 6 ++- 7 files changed, 105 insertions(+), 21 deletions(-) create mode 100644 app/src/main/java/org/disroot/disrootapp/ui/WelcomeActivity.java create mode 100644 app/src/main/res/layout/activity_welcome.xml diff --git a/CHANGELOG.md b/CHANGELOG.md index 8cd0b18..05a2d84 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -20,3 +20,4 @@ * Added exit button * Tapping on a disroot domain from external app (such as browser or chat app) opens Disroot app * Added reload button +* Welcome activity added diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 5e5b6bc..c67fb04 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -15,6 +15,7 @@ android:label="@string/app_name"> + @@ -22,20 +23,23 @@ android:name="org.disroot.disrootapp.ui.MainActivity" android:configChanges="orientation|screenSize" android:hardwareAccelerated="true" - android:label="@string/app_name" > - - - - - - - + android:label="@string/app_name"> + + + + + + + + + + android:theme="@style/DisTheme" /> + \ No newline at end of file diff --git a/app/src/main/java/org/disroot/disrootapp/ui/MainActivity.java b/app/src/main/java/org/disroot/disrootapp/ui/MainActivity.java index 02b8fee..14f4ba3 100644 --- a/app/src/main/java/org/disroot/disrootapp/ui/MainActivity.java +++ b/app/src/main/java/org/disroot/disrootapp/ui/MainActivity.java @@ -2,6 +2,7 @@ package org.disroot.disrootapp.ui; import android.annotation.SuppressLint; import android.app.AlertDialog; +import android.content.DialogInterface; import android.content.Intent; import android.content.SharedPreferences; import android.net.Uri; @@ -296,7 +297,8 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL //first start if (firstStart.getBoolean("firstrun", true)) { // Do first run stuff here then set 'firstrun' as false - showWelcome(); + Intent welcome = new Intent(MainActivity.this, WelcomeActivity.class); + MainActivity.this.startActivity(welcome); // using the following line to edit/commit prefs firstStart.edit().putBoolean("firstrun", false).apply(); } @@ -538,19 +540,21 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL } private void showMailInfo() { + final ScrollView dashboard = (ScrollView)findViewById(R.id.dashboard); AlertDialog.Builder builder = new AlertDialog.Builder(MainActivity.this); builder.setTitle(R.string.MailInfoTitle); //builder.setMessage(getString(R.string.activity_main_manteiners, DeviceProvider.getAppVersion(this))); builder.setMessage(getString(R.string.MailInfo)); builder.setPositiveButton(R.string.global_ok, null); - builder.show(); - } + builder.setNegativeButton(R.string.more_help, new DialogInterface.OnClickListener() { + @Override + public void onClick(DialogInterface dialog, int which) { + webView.loadUrl(Constants.URL_DisApp_K9HELP); + webView.setVisibility(View.VISIBLE); + dashboard.setVisibility(View.GONE); - private void showWelcome() { - AlertDialog.Builder builder = new AlertDialog.Builder(MainActivity.this); - builder.setTitle(R.string.WelcomeTitle); - builder.setMessage(getString(R.string.WelcomeInfo)); - builder.setPositiveButton(R.string.global_ok, null); + } + }); builder.show(); } diff --git a/app/src/main/java/org/disroot/disrootapp/ui/WelcomeActivity.java b/app/src/main/java/org/disroot/disrootapp/ui/WelcomeActivity.java new file mode 100644 index 0000000..3a2f11e --- /dev/null +++ b/app/src/main/java/org/disroot/disrootapp/ui/WelcomeActivity.java @@ -0,0 +1,27 @@ +package org.disroot.disrootapp.ui; + +import android.content.Intent; +import android.support.v7.app.AppCompatActivity; +import android.os.Bundle; +import android.view.View; +import android.widget.Button; + +import com.example.webview.R; + +public class WelcomeActivity extends AppCompatActivity { + Button button; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_welcome); + button = (Button) findViewById(R.id.homeBtn);//Home + button.setOnClickListener(new View.OnClickListener() { + public void onClick(View arg0) { + Intent goHome = new Intent(WelcomeActivity.this, MainActivity.class); + WelcomeActivity.this.startActivity(goHome); + } + + }); + } +} diff --git a/app/src/main/java/org/disroot/disrootapp/utils/Constants.java b/app/src/main/java/org/disroot/disrootapp/utils/Constants.java index 75f4e81..4eaad02 100644 --- a/app/src/main/java/org/disroot/disrootapp/utils/Constants.java +++ b/app/src/main/java/org/disroot/disrootapp/utils/Constants.java @@ -23,4 +23,5 @@ public class Constants { public static final String URL_DisApp_USER = "https://user.disroot.org"; public static final String URL_DisApp_STATE = "https://state.disroot.org"; public static final String URL_DisApp_HOWTO = "https://howto.disroot.org"; + public static final String URL_DisApp_K9HELP = "https://howto.disroot.org/en/email/email-clients/mobile/androidk9"; } diff --git a/app/src/main/res/layout/activity_welcome.xml b/app/src/main/res/layout/activity_welcome.xml new file mode 100644 index 0000000..dd0c700 --- /dev/null +++ b/app/src/main/res/layout/activity_welcome.xml @@ -0,0 +1,45 @@ + + + + + + + + +