From 2954b33f97b40cb0ec14eb99598646aade17a76c Mon Sep 17 00:00:00 2001 From: massimiliano Date: Tue, 18 Dec 2018 21:00:58 +0100 Subject: [PATCH] Added Notes app --- .idea/assetWizardSettings.xml | 4 +- .../disroot/disrootapp/ui/MainActivity.java | 63 +++++++++++++++++++ app/src/main/res/drawable/ic_notes.xml | 5 ++ app/src/main/res/layout/activity_main.xml | 34 +++++++--- app/src/main/res/values-es/strings.xml | 4 ++ app/src/main/res/values-fr/strings.xml | 4 ++ app/src/main/res/values-it/strings.xml | 4 ++ app/src/main/res/values-nl/strings.xml | 4 ++ app/src/main/res/values-pt/strings.xml | 4 ++ app/src/main/res/values-sr/strings.xml | 4 ++ app/src/main/res/values/strings.xml | 4 ++ 11 files changed, 123 insertions(+), 11 deletions(-) create mode 100644 app/src/main/res/drawable/ic_notes.xml diff --git a/.idea/assetWizardSettings.xml b/.idea/assetWizardSettings.xml index d5af6ef..aff8ae7 100644 --- a/.idea/assetWizardSettings.xml +++ b/.idea/assetWizardSettings.xml @@ -14,8 +14,8 @@ 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 c712275..6a60190 100644 --- a/app/src/main/java/org/disroot/disrootapp/ui/MainActivity.java +++ b/app/src/main/java/org/disroot/disrootapp/ui/MainActivity.java @@ -507,6 +507,32 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL }); + button = findViewById(R.id.NotesBtn);//NotesBtn + button.setOnLongClickListener(new View.OnLongClickListener() { + @Override + public boolean onLongClick(View v) { + showNotesInfo(); + return true; + } + }); + button.setOnClickListener(new View.OnClickListener() { + public void onClick(View arg0) { + //first time tap check + if (firstStart.getBoolean("firsttap", true)){ + showFirstTap(); + firstStart.edit().putBoolean("firsttap", false).apply(); + return; + } + String NotesApp = "it.niedermann.owncloud.notes"; + Intent notes = getPackageManager().getLaunchIntentForPackage(NotesApp); + if(notes == null) { + showNotesDialog(); + return; + } + else startActivity(notes); + } + }); + button = findViewById(R.id.UserBtn);//UserBtn button.setOnLongClickListener(new View.OnLongClickListener() { @Override @@ -1043,6 +1069,43 @@ public class MainActivity extends AppCompatActivity implements View.OnLongClickL builder.show(); } + //There is no extra info about Nextcoud notes yet + private void showNotesInfo() { + final ScrollView dashboard = findViewById(R.id.dashboard); + AlertDialog.Builder builder = new AlertDialog.Builder(MainActivity.this); + builder.setCancelable(false); + builder.setTitle(R.string.NotesTitle); + builder.setMessage(getString(R.string.NotesInfo)); + builder.setPositiveButton(R.string.global_ok, null); + //builder.setNegativeButton(R.string.tell_more, new DialogInterface.OnClickListener() { + // @Override + // public void onClick(DialogInterface dialog, int which) { + // webView.loadUrl(Constants.URL_DisApp_NOTESHELP); + // webView.setVisibility(View.VISIBLE); + // dashboard.setVisibility(View.GONE); + // } + //}); + builder.show(); + } + private void showNotesDialog(){ + final ScrollView dashboard = findViewById(R.id.dashboard); + AlertDialog.Builder builder = new AlertDialog.Builder(MainActivity.this); + builder.setCancelable(false); + builder.setTitle(R.string.DiaInstallTitle); + builder.setMessage(getString(R.string.NotesDialog)); + builder.setPositiveButton(R.string.global_install, new DialogInterface.OnClickListener() { + String NotesApp = "it.niedermann.owncloud.notes"; + Intent notes = getPackageManager().getLaunchIntentForPackage(NotesApp); + @Override + public void onClick(DialogInterface dialog, int which) { + notes = new Intent(Intent.ACTION_VIEW, Uri.parse("market://details?id=" + NotesApp)); + startActivity(notes); + } + }); + builder.setNegativeButton(R.string.global_cancel , null); + builder.show(); + } + private void showUserInfo() { AlertDialog.Builder builder = new AlertDialog.Builder(MainActivity.this); builder.setCancelable(false) diff --git a/app/src/main/res/drawable/ic_notes.xml b/app/src/main/res/drawable/ic_notes.xml new file mode 100644 index 0000000..67351c0 --- /dev/null +++ b/app/src/main/res/drawable/ic_notes.xml @@ -0,0 +1,5 @@ + + + diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 6ee3367..08d9d32 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -194,13 +194,22 @@ android:gravity="center_horizontal" android:id="@+id/group4" android:layout_below="@+id/group3"> +