update for deploy the first version of app

Author: ShayF0x

.gitignore

@@ -83,3 +83,6 @@ charpie / généré /
 peluches / sorties /
 charpie / tmp /
 # peluches/rapports/
+/app/src/androidTest/java/fr/shayfox/k_note/
+/app/src/test/java/fr/shayfox/k_note/
+/.idea/

.idea/androidTestResultsUserPreferences.xml

@@ -1,2 +1,15 @@
-# K-Note
-Dépos open source de l'application de note de cuisine K-Note
+<div id="top"></div>
+<h2 align="center">K-Note</h2>
+<p align="center"><i>Dépos open source de l'application android de note de cuisine K-Note</i></p>
+<p align="center">
+    <img src="https://img.shields.io/badge/build-Ready%20to%20go-brightgreen"/>
+    <img src="https://img.shields.io/badge/dynamic/json?color=blue&label=Version&query=version&url=https%3A%2F%2Fraw.githubusercontent.com%2FShayF0x%2FK-Note%2Fmaster%2Fk-note.json "/>
+</p>
+###  Qu'est ce que ?
+K-Note est une application android téléchargable depuis github qui vous permet de stocker, trier et créer des notes de cuisines complètes. Ajouter le nom, les etiquettes, une image, les ingrédients, les consignes de préparations, le materiel, le temps demandé ... dans l'application elle même et consulté ou partagez les avec qui vous voulez par un simple fichier json.
+
+<br>
+
+###  Licence
+    [ GPL-3.0 ](https://choosealicense.com/licenses/gpl-3.0/)
+<p align="right">(<a href="#top">retour en haut</a>)</p>

.idea/assetWizardSettings.xml

@@ -34,6 +34,7 @@ android {
 
 dependencies {
 
+    implementation "io.noties.markwon:core:4.6.2"
     implementation 'com.google.code.gson:gson:2.8.7'
     implementation 'com.github.dhaval2404:imagepicker:2.1'
     implementation 'androidx.appcompat:appcompat:1.6.1'

LICENCE

@@ -5,6 +5,8 @@
     <uses-permission android:name="android.permission.POST_NOTIFICATIONS" />
     <uses-permission android:name="android.permission.READ_EXTERNAL_STORAGE"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.REQUEST_INSTALL_PACKAGES"/>
+    <uses-permission android:name="android.permission.INTERNET"/>
 
     <application
         android:allowBackup="true"
@@ -42,7 +44,7 @@
             android:theme="@style/Theme.KNote.NoActionBar">
         </activity>
         <provider
-            android:authorities="fr.shayfox.k_note.controller.ConsultNoteActivity.provider"
+            android:authorities="${applicationId}.provider"
             android:name="androidx.core.content.FileProvider"
             android:exported="false"
             android:grantUriPermissions="true">

README.md

@@ -121,31 +121,31 @@ public void onBindViewHolder(ViewHolder viewHolder, final int position) {
             notifyDataSetChanged();
         });
 
-        viewHolder.getImageView().setOnLongClickListener(view -> {
-            if(itemMode != 1)return false;
-
-            final int position1 = viewHolder.getAdapterPosition();
-            final Note note12 = mMainActivity.mAppManager.getNoteList().get(position1);
-            AtomicBoolean restore = new AtomicBoolean(false);
-
-            mMainActivity.mAppManager.removeNote(note12);
-            notifyItemRemoved(position1);
-            mMainActivity.updateListTagNote(mMainActivity.binding.autoCompleteTextView.getText().toString());
-
-            Snackbar snackbar = Snackbar
-                    .make(mMainActivity.binding.coordinatorLayout, "La recette "+ note12.getName()+" va être supprimée definitivement !", Snackbar.LENGTH_LONG);
-            snackbar.setAction("Annuler", v -> {
-                restore.set(true);
-                mMainActivity.mAppManager.addNote(note12);
-                notifyItemInserted(position1);
-                mMainActivity.updateListTagNote(mMainActivity.binding.autoCompleteTextView.getText().toString());
-            });
-
-            snackbar.setActionTextColor(Color.YELLOW);
-            snackbar.show();
-
-            return false;
-        });
+//        viewHolder.getImageView().setOnLongClickListener(view -> {
+//            if(itemMode != 1)return false;
+//
+//            final int position1 = viewHolder.getAdapterPosition();
+//            final Note note12 = mMainActivity.mAppManager.getNoteList().get(position1);
+//            AtomicBoolean restore = new AtomicBoolean(false);
+//
+//            mMainActivity.mAppManager.removeNote(note12);
+//            notifyItemRemoved(position1);
+//            mMainActivity.updateListTagNote(mMainActivity.binding.autoCompleteTextView.getText().toString());
+//
+//            Snackbar snackbar = Snackbar
+//                    .make(mMainActivity.binding.coordinatorLayout, "La recette "+ note12.getName()+" va être supprimée definitivement !", Snackbar.LENGTH_LONG);
+//            snackbar.setAction("Annuler", v -> {
+//                restore.set(true);
+//                mMainActivity.mAppManager.addNote(note12);
+//                notifyItemInserted(position1);
+//                mMainActivity.updateListTagNote(mMainActivity.binding.autoCompleteTextView.getText().toString());
+//            });
+//
+//            snackbar.setActionTextColor(Color.YELLOW);
+//            snackbar.show();
+//
+//            return false;
+//        });
     }
 
     // Return the size of your dataset (invoked by the layout manager)

app/build.gradle

@@ -146,7 +146,7 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
 
                         FileUtils.copy(file, tempFile);
 
-                        Uri uri = FileProvider.getUriForFile(this, BuildConfig.APPLICATION_ID + "." + getLocalClassName() + ".provider", tempFile);
+                        Uri uri = FileProvider.getUriForFile(this, BuildConfig.APPLICATION_ID + ".provider", tempFile);
                         Intent shareIntent = new Intent();
                         shareIntent.setAction(Intent.ACTION_SEND);
                         shareIntent.putExtra(Intent.EXTRA_STREAM, uri);

app/src/main/AndroidManifest.xml

@@ -1,22 +1,54 @@
 package fr.shayfox.k_note.controller;
 
+import android.content.Intent;
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
+import android.graphics.BitmapFactory;
+import android.graphics.PorterDuff;
+import android.graphics.drawable.BitmapDrawable;
+import android.net.Uri;
+import android.os.AsyncTask;
 import android.os.Bundle;
+import android.text.Spanned;
+import android.widget.EditText;
 import android.widget.TextView;
+import android.widget.Toast;
 
 import androidx.annotation.Nullable;
+import androidx.appcompat.app.AlertDialog;
 import androidx.appcompat.app.AppCompatActivity;
+import androidx.constraintlayout.widget.ConstraintLayout;
 
 import com.google.android.material.appbar.MaterialToolbar;
+import com.google.android.material.snackbar.Snackbar;
+import com.google.gson.Gson;
+import com.google.gson.GsonBuilder;
+import com.google.gson.JsonObject;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.concurrent.ExecutionException;
 
 import fr.shayfox.k_note.R;
+import fr.shayfox.k_note.manager.Response;
+import fr.shayfox.k_note.model.Ingredient;
+import fr.shayfox.k_note.model.Note;
+import fr.shayfox.k_note.model.Tag;
+import fr.shayfox.k_note.serializer.BitmapSerializer;
+import fr.shayfox.k_note.utils.FileUtils;
+import io.noties.markwon.Markwon;
 
 public class InfoActivity extends AppCompatActivity {
 
     public MaterialToolbar toolbar;
-    public TextView mTextView;
+    public TextView mVersionTextView;
+
+    public ConstraintLayout mChangeLogLayout, mAuthorLayout, mBugLayout;
 
+    private int numberOfTaps;
+    private long timeMillisOfFirstClick;
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -31,6 +63,11 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
             finish();
         });
 
+        mChangeLogLayout = findViewById(R.id.info_activity_changelog_layout);
+        mAuthorLayout = findViewById(R.id.info_activity_author_layout);
+        mBugLayout = findViewById(R.id.info_activity_bug_layout);
+        mVersionTextView = findViewById(R.id.info_activity_version_textfield);
+
         PackageManager manager = getApplicationContext().getPackageManager();
         PackageInfo info;
         try {
@@ -40,8 +77,93 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
             throw new RuntimeException(e);
         }
         String version = info.versionName;
-        mTextView = findViewById(R.id.info_activity_version_textfield);
-        mTextView.setText(version);
+        mVersionTextView.setText(version);
+
+        mChangeLogLayout.setOnClickListener(view -> {
+
+            Response response = null;
+            try {
+                response = getResponse("https://api.github.com/repos/ShayF0x/K-Note/releases/tags/"+version);
+            } catch (ExecutionException e) {
+                throw new RuntimeException(e);
+            } catch (InterruptedException e) {
+                throw new RuntimeException(e);
+            }
+
+            String message = "La mise à jour ne contient pas de note";
+            if(response != null){
+                if(response.get_code() == 404){
+                    message = "Votre version n'est pas officielle";
+                }else if (response.get_code() == 200){
+                    Gson gson = new Gson();
+                    message = gson.fromJson(response.get_content(), JsonObject.class).get("body").getAsString();
+                }
+            }
+
+            AlertDialog.Builder alertDialogBuilder = new AlertDialog.Builder(InfoActivity.this, R.style.PopupDialogTheme);
+
+            final Markwon markwon = Markwon.create(InfoActivity.this);
+            final Spanned markdown = markwon.toMarkdown(message);
+
+            alertDialogBuilder.setMessage(markdown);
+
+            // set dialog message
+            alertDialogBuilder.setCancelable(false).setPositiveButton("OK", null);
+
+            // create alert dialog
+            AlertDialog alertDialog = alertDialogBuilder.create();
+            // show it
+            alertDialog.show();
+
+            alertDialog.getButton(AlertDialog.BUTTON_POSITIVE).setTextColor(getColor(R.color.secondary_font));
+
+        });
+
+        mBugLayout.setOnClickListener(view -> {
+            Intent browserIntent = new Intent(Intent.ACTION_VIEW, Uri.parse("https://github.com/ShayF0x/K-Note/issues"));
+            startActivity(browserIntent);
+        });
+
+        mAuthorLayout.setOnClickListener(view -> {
+
+            if (timeMillisOfFirstClick > 0 && (System.currentTimeMillis() - timeMillisOfFirstClick) > 2000)
+                numberOfTaps = 1;
+            else
+                numberOfTaps++;
+            if (numberOfTaps == 1)
+                timeMillisOfFirstClick = System.currentTimeMillis();
+            if (numberOfTaps == 7 && (System.currentTimeMillis() - timeMillisOfFirstClick) <= 2000 && !MainActivity.INSTANCE.mAppManager.hasNote("Omelette au lait")) {
+                final Gson gson = new GsonBuilder()
+                        .registerTypeAdapter(Note.class, new BitmapSerializer())
+                        .create();
+                Toast.makeText(this, "Vous avez activé la recette de l'omelette au lait !", Toast.LENGTH_SHORT).show();
+                final Note note = new Note("Omelette au lait", "Qui a dit que dans une omelette on met pas de lait ?",
+                        BitmapFactory.decodeResource(getResources(), R.drawable.omelette),
+                        new ArrayList<>(), new int[]{0, 5, 0}, new int[]{0, 5, 0}, new int[]{0, 0, 0},
+                        2,
+                        new ArrayList<>(Arrays.asList(
+                                new Ingredient("Sel", 1, "pincée"),
+                                new Ingredient("oeufs", 4, null),
+                                new Ingredient("lait", 20, Ingredient.Measure.CENTILITRE),
+                                new Ingredient("gruyère", 30, Ingredient.Measure.GRAMME)
+                        )),
+                        "ÉTAPE 1\nDans un bol mélanger les œufs puis y incorporer le lait puis le gruyère et le sel.\n\nÉTAPE 2\nFaire cuire environs 5 minutes.\n\nÉTAPE 3\nEt vous obtenez une omelette très aérée et moelleuse.",
+                        new ArrayList<>(Arrays.asList(
+                                "1 pôele",
+                                "1 bol",
+                                "1 cuillère en bois"
+                        )), null);
+                FileUtils.writeFileExternalStorage("Notes"+ File.separator+note.getUUID()+".json", gson.toJson(note), true);
+                MainActivity.INSTANCE.mAppManager.addNote(note);
+            }
+
+        });
+
+
+    }
 
+    private Response getResponse(String src) throws ExecutionException, InterruptedException {
+        AsyncTask<String, Void, Response> async = new MainActivity.getResponseTask().execute(src);
+        return async.get();
     }
 }