From af805d81120edb6e2b7e9e00802d1c37644de647 Mon Sep 17 00:00:00 2001
From: VladimirJevtic <vjkblmb@gmail.com>
Date: Mon, 9 Nov 2020 20:42:32 +0100
Subject: [PATCH 1/2] made changes for creating a contact barcode

---
 .idea/caches/build_file_checksums.ser         | Bin 0 -> 594 bytes
 .idea/codeStyles/Project.xml                  |  18 +++
 .idea/gradle.xml                              |   6 +-
 .idea/jarRepositories.xml                     |  25 ++++
 .idea/misc.xml                                |  21 +++-
 .idea/modules.xml                             |   3 +
 QRGenearator/build.gradle                     |   6 +-
 .../library/qrgenearator/QRGContents.java     |  10 +-
 .../library/qrgenearator/QRGEncoder.java      |  34 +++--
 app/build.gradle                              |   5 +-
 app/src/main/AndroidManifest.xml              |   7 +-
 .../androidmads/example/GenDataActivity.java  |  52 ++++++++
 .../androidmads/example/GenQRActivity.java    |  50 ++++++++
 .../androidmads/example/MainActivity.java     |  96 --------------
 app/src/main/res/layout/activity_gen_data.xml | 118 ++++++++++++++++++
 app/src/main/res/layout/activity_gen_q_r.xml  |  23 ++++
 app/src/main/res/layout/activity_main.xml     |  46 -------
 app/src/main/res/values/strings.xml           |   2 +-
 vCardQRGenerator/.gitignore                   |   1 +
 vCardQRGenerator/build.gradle                 |  31 +++++
 vCardQRGenerator/consumer-rules.pro           |   0
 vCardQRGenerator/proguard-rules.pro           |  21 ++++
 .../ExampleInstrumentedTest.java              |  26 ++++
 vCardQRGenerator/src/main/AndroidManifest.xml |   5 +
 .../vcardqrgenerator/ExampleUnitTest.java     |  17 +++
 25 files changed, 451 insertions(+), 172 deletions(-)
 create mode 100644 .idea/caches/build_file_checksums.ser
 create mode 100644 .idea/jarRepositories.xml
 create mode 100644 app/src/main/java/androidmads/example/GenDataActivity.java
 create mode 100644 app/src/main/java/androidmads/example/GenQRActivity.java
 delete mode 100644 app/src/main/java/androidmads/example/MainActivity.java
 create mode 100644 app/src/main/res/layout/activity_gen_data.xml
 create mode 100644 app/src/main/res/layout/activity_gen_q_r.xml
 delete mode 100644 app/src/main/res/layout/activity_main.xml
 create mode 100644 vCardQRGenerator/.gitignore
 create mode 100644 vCardQRGenerator/build.gradle
 create mode 100644 vCardQRGenerator/consumer-rules.pro
 create mode 100644 vCardQRGenerator/proguard-rules.pro
 create mode 100644 vCardQRGenerator/src/androidTest/java/com/kodobit/vcardqrgenerator/ExampleInstrumentedTest.java
 create mode 100644 vCardQRGenerator/src/main/AndroidManifest.xml
 create mode 100644 vCardQRGenerator/src/test/java/com/kodobit/vcardqrgenerator/ExampleUnitTest.java

diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
new file mode 100644
index 0000000000000000000000000000000000000000..aac06d3a169da09aedfb82edfe0e1756f88759c1
GIT binary patch
literal 594
zcmZ4UmVvdnh`~NNKUXg?FQq6yGexf?KR>5fFEb@IQ7^qHF(oHeub?PDD>b=9F91S2
zm1gFoxMk*~I%lLNXBU^|7Q2L-Ts|(GuF1r}<i#MFTj`TnT;dMa8(f)}9Fm!vT3nKt
zTj0aMpIeEdv4nx&Co8cmQNOe#Ge_SyvB0{bfPsOrbY0QCK%lz>L2`N^IX#cW;tZfX
zEBmd3hs6>uGBYr_F>vMNC#JY1CYR(Fc`|U8WE7<qXXNLkR20}dFn|D0IR}sw0AltM
z27$zaf|w+b)1lrfEn;Abc3SgU{0AFH$O9$@29VVZ0`I<;&EIIjT5;9MeCkQbD@TD&
zEKV&c$;?YHhG{HhsAFIQsV#D8S<ZD-de!x1|5x>M%qlNo;6bqguF&;Zl+gkH-<Pe_
z84M>pWpo2NCnrBSF$Wa11*t_PnW@F4aK$!<+Pgms#N}-Nsc^&E=*_7T25o1nn9$<X
zqT-maoWzvO+{~gFs9RzXQG{X671^Gf{S2E}UN&&fc=N-lu7p7{FvvYMFEz0!5g25s
wfdRL@E-(3PEc?vmz4vxb$anT$Si&HP#}0#Y0YQ5&l<b<gnz!qx|E}B$0Dythpa1{>

literal 0
HcmV?d00001

diff --git a/.idea/codeStyles/Project.xml b/.idea/codeStyles/Project.xml
index 681f41a..0d15693 100644
--- a/.idea/codeStyles/Project.xml
+++ b/.idea/codeStyles/Project.xml
@@ -1,5 +1,23 @@
 <component name="ProjectCodeStyleConfiguration">
   <code_scheme name="Project" version="173">
+    <JetCodeStyleSettings>
+      <option name="PACKAGES_TO_USE_STAR_IMPORTS">
+        <value>
+          <package name="java.util" alias="false" withSubpackages="false" />
+          <package name="kotlinx.android.synthetic" alias="false" withSubpackages="true" />
+          <package name="io.ktor" alias="false" withSubpackages="true" />
+        </value>
+      </option>
+      <option name="PACKAGES_IMPORT_LAYOUT">
+        <value>
+          <package name="" alias="false" withSubpackages="true" />
+          <package name="java" alias="false" withSubpackages="true" />
+          <package name="javax" alias="false" withSubpackages="true" />
+          <package name="kotlin" alias="false" withSubpackages="true" />
+          <package name="" alias="true" withSubpackages="true" />
+        </value>
+      </option>
+    </JetCodeStyleSettings>
     <codeStyleSettings language="XML">
       <indentOptions>
         <option name="CONTINUATION_INDENT_SIZE" value="4" />
diff --git a/.idea/gradle.xml b/.idea/gradle.xml
index 30fb186..189d6e2 100644
--- a/.idea/gradle.xml
+++ b/.idea/gradle.xml
@@ -1,11 +1,10 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <project version="4">
+  <component name="GradleMigrationSettings" migrationVersion="1" />
   <component name="GradleSettings">
     <option name="linkedExternalProjectsSettings">
       <GradleProjectSettings>
-        <compositeConfiguration>
-          <compositeBuild compositeDefinitionSource="SCRIPT" />
-        </compositeConfiguration>
+        <option name="testRunner" value="PLATFORM" />
         <option name="distributionType" value="DEFAULT_WRAPPED" />
         <option name="externalProjectPath" value="$PROJECT_DIR$" />
         <option name="modules">
@@ -16,7 +15,6 @@
           </set>
         </option>
         <option name="resolveModulePerSourceSet" value="false" />
-        <option name="testRunner" value="PLATFORM" />
       </GradleProjectSettings>
     </option>
   </component>
diff --git a/.idea/jarRepositories.xml b/.idea/jarRepositories.xml
new file mode 100644
index 0000000..19364dc
--- /dev/null
+++ b/.idea/jarRepositories.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RemoteRepositoriesConfiguration">
+    <remote-repository>
+      <option name="id" value="central" />
+      <option name="name" value="Maven Central repository" />
+      <option name="url" value="https://repo1.maven.org/maven2" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="jboss.community" />
+      <option name="name" value="JBoss Community repository" />
+      <option name="url" value="https://repository.jboss.org/nexus/content/repositories/public/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="Google" />
+      <option name="name" value="Google" />
+      <option name="url" value="https://maven.google.com/" />
+    </remote-repository>
+    <remote-repository>
+      <option name="id" value="BintrayJCenter" />
+      <option name="name" value="BintrayJCenter" />
+      <option name="url" value="https://jcenter.bintray.com/" />
+    </remote-repository>
+  </component>
+</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
index 63678ef..9a4a7b8 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -8,26 +8,41 @@
     <option name="myDefaultNotNull" value="android.support.annotation.NonNull" />
     <option name="myNullables">
       <value>
-        <list size="4">
+        <list size="12">
           <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.Nullable" />
           <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nullable" />
           <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.Nullable" />
           <item index="3" class="java.lang.String" itemvalue="android.support.annotation.Nullable" />
+          <item index="4" class="java.lang.String" itemvalue="javax.annotation.CheckForNull" />
+          <item index="5" class="java.lang.String" itemvalue="androidx.annotation.Nullable" />
+          <item index="6" class="java.lang.String" itemvalue="android.annotation.Nullable" />
+          <item index="7" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNullable" />
+          <item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.Nullable" />
+          <item index="9" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableDecl" />
+          <item index="10" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NullableType" />
+          <item index="11" class="java.lang.String" itemvalue="com.android.annotations.Nullable" />
         </list>
       </value>
     </option>
     <option name="myNotNulls">
       <value>
-        <list size="4">
+        <list size="11">
           <item index="0" class="java.lang.String" itemvalue="org.jetbrains.annotations.NotNull" />
           <item index="1" class="java.lang.String" itemvalue="javax.annotation.Nonnull" />
           <item index="2" class="java.lang.String" itemvalue="edu.umd.cs.findbugs.annotations.NonNull" />
           <item index="3" class="java.lang.String" itemvalue="android.support.annotation.NonNull" />
+          <item index="4" class="java.lang.String" itemvalue="androidx.annotation.NonNull" />
+          <item index="5" class="java.lang.String" itemvalue="android.annotation.NonNull" />
+          <item index="6" class="java.lang.String" itemvalue="androidx.annotation.RecentlyNonNull" />
+          <item index="7" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.qual.NonNull" />
+          <item index="8" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullDecl" />
+          <item index="9" class="java.lang.String" itemvalue="org.checkerframework.checker.nullness.compatqual.NonNullType" />
+          <item index="10" class="java.lang.String" itemvalue="com.android.annotations.NonNull" />
         </list>
       </value>
     </option>
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" project-jdk-name="JDK" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_7" default="true" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
   <component name="ProjectType">
diff --git a/.idea/modules.xml b/.idea/modules.xml
index 9f7eaed..7044e29 100644
--- a/.idea/modules.xml
+++ b/.idea/modules.xml
@@ -4,6 +4,9 @@
     <modules>
       <module fileurl="file://$PROJECT_DIR$/QRGenearator/QRGenearator.iml" filepath="$PROJECT_DIR$/QRGenearator/QRGenearator.iml" />
       <module fileurl="file://$PROJECT_DIR$/QRGenerator.iml" filepath="$PROJECT_DIR$/QRGenerator.iml" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/QRGeneratorGIT_Fork_Vladimir.iml" filepath="$PROJECT_DIR$/.idea/modules/QRGeneratorGIT_Fork_Vladimir.iml" group="QRGeneratorGIT_Fork_Vladimir" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/app/QRGeneratorGIT_Fork_Vladimir-app.iml" filepath="$PROJECT_DIR$/.idea/modules/app/QRGeneratorGIT_Fork_Vladimir-app.iml" group="QRGeneratorGIT_Fork_Vladimir/app" />
+      <module fileurl="file://$PROJECT_DIR$/.idea/modules/QRGenearator/androidmads.library.qrgenearator-QRGenearator.iml" filepath="$PROJECT_DIR$/.idea/modules/QRGenearator/androidmads.library.qrgenearator-QRGenearator.iml" group="QRGeneratorGIT_Fork_Vladimir/QRGenearator" />
       <module fileurl="file://$PROJECT_DIR$/app/app.iml" filepath="$PROJECT_DIR$/app/app.iml" />
     </modules>
   </component>
diff --git a/QRGenearator/build.gradle b/QRGenearator/build.gradle
index e6b9132..d2244e7 100644
--- a/QRGenearator/build.gradle
+++ b/QRGenearator/build.gradle
@@ -6,12 +6,12 @@ group = 'androidmads.library.qrgenearator' // Change this to match your package
 version = '1.0.4' // Change this to match your version number
 
 android {
-    compileSdkVersion 28
+    compileSdkVersion 30
     buildToolsVersion "28.0.3"
 
     defaultConfig {
         minSdkVersion 14
-        targetSdkVersion 28
+        targetSdkVersion 30
         versionCode 1
         versionName "1.0"
     }
@@ -24,7 +24,7 @@ android {
 }
 
 dependencies {
-    implementation 'com.google.zxing:core:3.2.0'
+    implementation 'com.google.zxing:core:3.3.2'
 }
 
 Properties properties = new Properties()
diff --git a/QRGenearator/src/main/java/androidmads/library/qrgenearator/QRGContents.java b/QRGenearator/src/main/java/androidmads/library/qrgenearator/QRGContents.java
index f517c53..2ed14f8 100644
--- a/QRGenearator/src/main/java/androidmads/library/qrgenearator/QRGContents.java
+++ b/QRGenearator/src/main/java/androidmads/library/qrgenearator/QRGContents.java
@@ -30,14 +30,11 @@ public static final class Type {
         public static final String LOCATION = "LOCATION_TYPE";
     }
 
-    public static final String URL_KEY = "URL_KEY";
-
-    public static final String NOTE_KEY = "NOTE_KEY";
-
     // When using Type.CONTACT, these arrays provide the keys for adding or retrieving multiple
     // phone numbers and addresses.
     public static final String[] PHONE_KEYS = {
-            ContactsContract.Intents.Insert.PHONE, ContactsContract.Intents.Insert.SECONDARY_PHONE,
+            ContactsContract.Intents.Insert.PHONE,
+            ContactsContract.Intents.Insert.SECONDARY_PHONE,
             ContactsContract.Intents.Insert.TERTIARY_PHONE
     };
 
@@ -48,7 +45,8 @@ public static final class Type {
     };
 
     public static final String[] EMAIL_KEYS = {
-            ContactsContract.Intents.Insert.EMAIL, ContactsContract.Intents.Insert.SECONDARY_EMAIL,
+            ContactsContract.Intents.Insert.EMAIL,
+            ContactsContract.Intents.Insert.SECONDARY_EMAIL,
             ContactsContract.Intents.Insert.TERTIARY_EMAIL
     };
 
diff --git a/QRGenearator/src/main/java/androidmads/library/qrgenearator/QRGEncoder.java b/QRGenearator/src/main/java/androidmads/library/qrgenearator/QRGEncoder.java
index d55450e..dd1fb99 100644
--- a/QRGenearator/src/main/java/androidmads/library/qrgenearator/QRGEncoder.java
+++ b/QRGenearator/src/main/java/androidmads/library/qrgenearator/QRGEncoder.java
@@ -113,17 +113,20 @@ private void encodeQRCodeContents(String data, Bundle bundle, String type) {
                     StringBuilder newContents = new StringBuilder(100);
                     StringBuilder newDisplayContents = new StringBuilder(100);
 
-                    newContents.append("VCARD:");
+                    newContents.append("BEGIN:VCARD\n");
 
                     String name = trim(bundle.getString(ContactsContract.Intents.Insert.NAME));
                     if (name != null) {
                         newContents.append("N:").append(escapeVCard(name)).append(';');
                         newDisplayContents.append(name);
+                        newContents.append("\n");
                     }
 
                     String address = trim(bundle.getString(ContactsContract.Intents.Insert.POSTAL));
                     if (address != null) {
-                        newContents.append("ADR:").append(escapeVCard(address)).append(';');
+                        //the append ; is removed because it is unnecessary because we are breaking into new row
+                        newContents.append("ADR:").append(escapeVCard(address));//.append(';')
+                        newContents.append("\n");
                         newDisplayContents.append('\n').append(address);
                     }
 
@@ -135,7 +138,8 @@ private void encodeQRCodeContents(String data, Bundle bundle, String type) {
                         }
                     }
                     for (String phone : uniquePhones) {
-                        newContents.append("TEL:").append(escapeVCard(phone)).append(';');
+                        newContents.append("TEL:").append(escapeVCard(phone));//.append(';')
+                        newContents.append("\n");
                         //noinspection deprecation
                         newDisplayContents.append('\n').append(PhoneNumberUtils.formatNumber(phone));
                     }
@@ -148,25 +152,37 @@ private void encodeQRCodeContents(String data, Bundle bundle, String type) {
                         }
                     }
                     for (String email : uniqueEmails) {
-                        newContents.append("EMAIL:").append(escapeVCard(email)).append(';');
+                        newContents.append("EMAIL:").append(escapeVCard(email));//.append(';')
+                        newContents.append("\n");
                         newDisplayContents.append('\n').append(email);
                     }
 
-                    String url = trim(bundle.getString(QRGContents.URL_KEY));
+                    String organization = trim(bundle.getString(ContactsContract.Intents.Insert.COMPANY));
+                    if (organization != null) {
+                        newContents.append("ORG:").append(organization);//.append(';')
+                        newContents.append("\n");
+                        newDisplayContents.append('\n').append(organization);
+                    }
+
+                    String url = trim(bundle.getString(ContactsContract.Intents.Insert.DATA));
                     if (url != null) {
-                        // escapeVCard(url) -> wrong escape e.g. http\://zxing.google.com
-                        newContents.append("URL:").append(url).append(';');
+                        // in this field only the website name and the domain are necessary (example : somewebsite.com)
+                        newContents.append("URL:").append(escapeVCard(url));//.append(';');
+                        newContents.append("\n");
                         newDisplayContents.append('\n').append(url);
                     }
 
-                    String note = trim(bundle.getString(QRGContents.NOTE_KEY));
+                    String note = trim(bundle.getString(ContactsContract.Intents.Insert.NOTES));
                     if (note != null) {
-                        newContents.append("NOTE:").append(escapeVCard(note)).append(';');
+                        newContents.append("NOTE:").append(escapeVCard(note));//.append(';')
+                        newContents.append("\n");
                         newDisplayContents.append('\n').append(note);
                     }
 
                     // Make sure we've encoded at least one field.
                     if (newDisplayContents.length() > 0) {
+                        //this end vcard needs to be at the end in order for the default phone reader to recognize it as a contact
+                        newContents.append("END:VCARD");
                         newContents.append(';');
                         contents = newContents.toString();
                         displayContents = newDisplayContents.toString();
diff --git a/app/build.gradle b/app/build.gradle
index b8ca172..0bae344 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -21,8 +21,9 @@ android {
 
 dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
-    testImplementation 'junit:junit:4.12'
-    implementation 'androidx.appcompat:appcompat:1.1.0'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    testImplementation 'junit:junit:4.13.1'
     implementation project(':QRGenearator')
     //implementation 'androidmads.library.qrgenearator:QRGenearator:1.0.3'
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7c95d27..81627c3 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -2,7 +2,7 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="androidmads.example">
 
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
 
     <application
         android:allowBackup="true"
@@ -10,13 +10,16 @@
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-        <activity android:name=".MainActivity">
+
+        <activity android:name=".GenDataActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
+
+        <activity android:name=".GenQRActivity" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/androidmads/example/GenDataActivity.java b/app/src/main/java/androidmads/example/GenDataActivity.java
new file mode 100644
index 0000000..e355332
--- /dev/null
+++ b/app/src/main/java/androidmads/example/GenDataActivity.java
@@ -0,0 +1,52 @@
+package androidmads.example;
+
+import android.content.Intent;
+import android.os.Bundle;
+import android.view.View;
+import android.widget.Button;
+import android.widget.EditText;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+public class GenDataActivity extends AppCompatActivity {
+
+    EditText editTextName, editTextAddress, editTextPhone, editTextAddressMail, editTextNotes, editTextOrganization, editTextURL;
+    Button btnGenerate;
+
+    private static final String TAG = "MainActivity";
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_gen_data);
+
+        editTextName = findViewById(R.id.editTextName);
+        editTextAddress = findViewById(R.id.editTextAddress);
+        editTextPhone = findViewById(R.id.editTextPhone);
+        editTextAddressMail = findViewById(R.id.editTextAddressMail);
+        btnGenerate = findViewById(R.id.btnGenerate);
+        editTextNotes = findViewById(R.id.editTextNotes);
+        editTextOrganization = findViewById(R.id.editTextOrganization);
+        editTextURL = findViewById(R.id.editTextURL);
+
+        btnGenerate.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+
+                //keys in bundle correspond to the fields in the ContactsContract.class
+                Intent intent = new Intent(getApplicationContext(), GenQRActivity.class);
+                Bundle bundle = new Bundle();
+                bundle.putString("name", editTextName.getText().toString());
+                bundle.putString("postal", editTextAddress.getText().toString());
+                bundle.putString("phone", editTextPhone.getText().toString());
+                bundle.putString("email", editTextAddressMail.getText().toString());
+                bundle.putString("notes", editTextNotes.getText().toString());
+                bundle.putString("company", editTextOrganization.getText().toString());
+                bundle.putString("data", editTextURL.getText().toString());
+                intent.putExtras(bundle);
+                startActivity(intent);
+            }
+        });
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/androidmads/example/GenQRActivity.java b/app/src/main/java/androidmads/example/GenQRActivity.java
new file mode 100644
index 0000000..0eaa69c
--- /dev/null
+++ b/app/src/main/java/androidmads/example/GenQRActivity.java
@@ -0,0 +1,50 @@
+package androidmads.example;
+
+import android.graphics.Bitmap;
+import android.os.Bundle;
+import android.util.Log;
+import android.widget.ImageView;
+import android.widget.Toast;
+
+import androidx.appcompat.app.AppCompatActivity;
+
+import androidmads.library.qrgenearator.QRGContents;
+import androidmads.library.qrgenearator.QRGEncoder;
+
+public class GenQRActivity extends AppCompatActivity {
+
+    ImageView imageQR;
+    Bitmap bitmap;
+    private static final String TAG = "QRActivity";
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_gen_q_r);
+
+        imageQR = findViewById(R.id.imageQR);
+
+        final Bundle bundle = getIntent().getExtras();
+//        String name = bundle.getString("name");
+//        String address = bundle.getString("postal");
+//        String phone = bundle.getString("phone");
+//        String email = bundle.getString("email");
+//        String notes = bundle.getString("notes");
+//        String organization = bundle.getString("company");
+//        String url = bundle.getString("data");
+//        Toast.makeText(this, name + address + phone, Toast.LENGTH_SHORT).show();
+
+
+        //setting the data as null and bundle of data from the previous activity because of the type of the QR
+        QRGEncoder qrgEncoder = new QRGEncoder(null, bundle, QRGContents.Type.CONTACT, 500);
+        try {
+            // Getting QR-Code as Bitmap
+            bitmap = qrgEncoder.getBitmap();
+            // Setting Bitmap to ImageView
+            imageQR.setImageBitmap(bitmap);
+        } catch (Exception e) {
+            Log.v(TAG, e.toString());
+        }
+
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/androidmads/example/MainActivity.java b/app/src/main/java/androidmads/example/MainActivity.java
deleted file mode 100644
index c6a867b..0000000
--- a/app/src/main/java/androidmads/example/MainActivity.java
+++ /dev/null
@@ -1,96 +0,0 @@
-package androidmads.example;
-
-import android.Manifest;
-import android.content.pm.PackageManager;
-import android.graphics.Bitmap;
-import android.graphics.Color;
-import android.graphics.Point;
-import android.os.Bundle;
-import android.os.Environment;
-import android.view.Display;
-import android.view.View;
-import android.view.WindowManager;
-import android.widget.EditText;
-import android.widget.ImageView;
-import android.widget.Toast;
-
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.core.app.ActivityCompat;
-import androidx.core.content.ContextCompat;
-
-import androidmads.library.qrgenearator.QRGContents;
-import androidmads.library.qrgenearator.QRGEncoder;
-import androidmads.library.qrgenearator.QRGSaver;
-
-public class MainActivity extends AppCompatActivity {
-
-    private EditText edtValue;
-    private ImageView qrImage;
-    private String inputValue;
-    private String savePath = Environment.getExternalStorageDirectory().getPath() + "/QRCode/";
-    private Bitmap bitmap;
-    private QRGEncoder qrgEncoder;
-    private AppCompatActivity activity;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main);
-
-        qrImage = findViewById(R.id.qr_image);
-        edtValue = findViewById(R.id.edt_value);
-        activity = this;
-
-        findViewById(R.id.generate_barcode).setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                inputValue = edtValue.getText().toString().trim();
-                if (inputValue.length() > 0) {
-                    WindowManager manager = (WindowManager) getSystemService(WINDOW_SERVICE);
-                    Display display = manager.getDefaultDisplay();
-                    Point point = new Point();
-                    display.getSize(point);
-                    int width = point.x;
-                    int height = point.y;
-                    int smallerDimension = width < height ? width : height;
-                    smallerDimension = smallerDimension * 3 / 4;
-
-                    qrgEncoder = new QRGEncoder(
-                            inputValue, null,
-                            QRGContents.Type.TEXT,
-                            smallerDimension);
-                    qrgEncoder.setColorBlack(Color.RED);
-                    qrgEncoder.setColorWhite(Color.BLUE);
-                    try {
-                        bitmap = qrgEncoder.getBitmap();
-                        qrImage.setImageBitmap(bitmap);
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    }
-                } else {
-                    edtValue.setError(getResources().getString(R.string.value_required));
-                }
-            }
-        });
-
-        findViewById(R.id.save_barcode).setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                if (ContextCompat.checkSelfPermission(getApplicationContext(), Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED) {
-                    try {
-                        boolean save = new QRGSaver().save(savePath, edtValue.getText().toString().trim(), bitmap, QRGContents.ImageType.IMAGE_JPEG);
-                        String result = save ? "Image Saved" : "Image Not Saved";
-                        Toast.makeText(activity, result, Toast.LENGTH_LONG).show();
-                        edtValue.setText(null);
-                    } catch (Exception e) {
-                        e.printStackTrace();
-                    }
-                } else {
-                    ActivityCompat.requestPermissions(activity, new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, 0);
-                }
-            }
-        });
-
-    }
-
-}
diff --git a/app/src/main/res/layout/activity_gen_data.xml b/app/src/main/res/layout/activity_gen_data.xml
new file mode 100644
index 0000000..4363cfe
--- /dev/null
+++ b/app/src/main/res/layout/activity_gen_data.xml
@@ -0,0 +1,118 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    tools:context=".GenDataActivity">
+
+    <LinearLayout
+        android:id="@+id/layout"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="20dp"
+        android:orientation="horizontal"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toTopOf="parent">
+
+        <EditText
+            android:id="@+id/editTextName"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:hint="name"
+            android:inputType="textPersonName" />
+
+        <EditText
+            android:id="@+id/editTextAddress"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:hint="address"
+            android:inputType="text" />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/layout2"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="20dp"
+        android:orientation="horizontal"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/layout">
+
+        <EditText
+            android:id="@+id/editTextPhone"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:hint="phone"
+            android:inputType="phone" />
+
+        <EditText
+            android:id="@+id/editTextAddressMail"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:hint="mail"
+            android:inputType="textEmailAddress" />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/layout3"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="20dp"
+        android:orientation="horizontal"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/layout2">
+
+        <EditText
+            android:id="@+id/editTextNotes"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:hint="notes"
+            android:inputType="textMultiLine"
+            android:maxLines="3" />
+
+        <EditText
+            android:id="@+id/editTextOrganization"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:hint="organisation"
+            android:inputType="text" />
+
+    </LinearLayout>
+
+    <LinearLayout
+        android:id="@+id/layout4"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_margin="20dp"
+        android:orientation="horizontal"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/layout3">
+
+        <EditText
+            android:id="@+id/editTextURL"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:hint="website"
+            android:inputType="textUri" />
+
+    </LinearLayout>
+
+    <Button
+        android:id="@+id/btnGenerate"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="Generate"
+        app:layout_constraintStart_toStartOf="@id/layout4"
+        app:layout_constraintTop_toBottomOf="@id/layout4" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_gen_q_r.xml b/app/src/main/res/layout/activity_gen_q_r.xml
new file mode 100644
index 0000000..b9e28fd
--- /dev/null
+++ b/app/src/main/res/layout/activity_gen_q_r.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent"
+    android:padding="20dp"
+    tools:context=".GenQRActivity">
+
+    <ImageView
+        android:id="@+id/imageQR"
+        android:layout_width="0dp"
+        android:layout_height="0dp"
+        android:layout_marginStart="16dp"
+        android:layout_marginTop="16dp"
+        android:layout_marginEnd="16dp"
+        android:layout_marginBottom="16dp"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
deleted file mode 100644
index 9135081..0000000
--- a/app/src/main/res/layout/activity_main.xml
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:gravity="center_horizontal"
-    android:orientation="vertical"
-    android:padding="@dimen/activity_vertical_margin"
-    tools:context=".MainActivity">
-
-    <EditText
-        android:id="@+id/edt_value"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:hint="@string/enter_text"
-        android:importantForAutofill="no"
-        android:inputType="text" />
-
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:gravity="center_horizontal"
-        android:orientation="horizontal">
-
-        <Button
-            android:layout_weight="1"
-            android:id="@+id/generate_barcode"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:text="@string/generate"/>
-
-        <Button
-            android:layout_weight="1"
-            android:id="@+id/save_barcode"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            android:text="@string/save"/>
-    </LinearLayout>
-
-    <ImageView
-        android:id="@+id/qr_image"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:contentDescription="@string/app_name" />
-
-</LinearLayout>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 2090b6c..f4548e2 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@
 <resources>
-    <string name="app_name">QRGenerator</string>
+    <string name="app_name">FORK_QRGenerator</string>
     <string name="save">Save</string>
     <string name="generate">Generate</string>
     <string name="enter_text">Enter Text</string>
diff --git a/vCardQRGenerator/.gitignore b/vCardQRGenerator/.gitignore
new file mode 100644
index 0000000..42afabf
--- /dev/null
+++ b/vCardQRGenerator/.gitignore
@@ -0,0 +1 @@
+/build
\ No newline at end of file
diff --git a/vCardQRGenerator/build.gradle b/vCardQRGenerator/build.gradle
new file mode 100644
index 0000000..702b0f9
--- /dev/null
+++ b/vCardQRGenerator/build.gradle
@@ -0,0 +1,31 @@
+apply plugin: 'com.android.library'
+
+android {
+    compileSdkVersion 30
+    buildToolsVersion "30.0.2"
+
+    defaultConfig {
+        minSdkVersion 24
+        targetSdkVersion 30
+        versionCode 1
+        versionName "1.0"
+
+        testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
+        consumerProguardFiles "consumer-rules.pro"
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+        }
+    }
+}
+
+dependencies {
+    implementation fileTree(dir: "libs", include: ["*.jar"])
+    testImplementation 'junit:junit:4.12'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+
+}
\ No newline at end of file
diff --git a/vCardQRGenerator/consumer-rules.pro b/vCardQRGenerator/consumer-rules.pro
new file mode 100644
index 0000000..e69de29
diff --git a/vCardQRGenerator/proguard-rules.pro b/vCardQRGenerator/proguard-rules.pro
new file mode 100644
index 0000000..481bb43
--- /dev/null
+++ b/vCardQRGenerator/proguard-rules.pro
@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile
\ No newline at end of file
diff --git a/vCardQRGenerator/src/androidTest/java/com/kodobit/vcardqrgenerator/ExampleInstrumentedTest.java b/vCardQRGenerator/src/androidTest/java/com/kodobit/vcardqrgenerator/ExampleInstrumentedTest.java
new file mode 100644
index 0000000..31f4626
--- /dev/null
+++ b/vCardQRGenerator/src/androidTest/java/com/kodobit/vcardqrgenerator/ExampleInstrumentedTest.java
@@ -0,0 +1,26 @@
+package com.kodobit.vcardqrgenerator;
+
+import android.content.Context;
+
+import androidx.test.platform.app.InstrumentationRegistry;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.*;
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+@RunWith(AndroidJUnit4.class)
+public class ExampleInstrumentedTest {
+    @Test
+    public void useAppContext() {
+        // Context of the app under test.
+        Context appContext = InstrumentationRegistry.getInstrumentation().getTargetContext();
+        assertEquals("com.kodobit.vcardqrgenerator.test", appContext.getPackageName());
+    }
+}
\ No newline at end of file
diff --git a/vCardQRGenerator/src/main/AndroidManifest.xml b/vCardQRGenerator/src/main/AndroidManifest.xml
new file mode 100644
index 0000000..38166e9
--- /dev/null
+++ b/vCardQRGenerator/src/main/AndroidManifest.xml
@@ -0,0 +1,5 @@
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.kodobit.vcardqrgenerator">
+
+    /
+</manifest>
\ No newline at end of file
diff --git a/vCardQRGenerator/src/test/java/com/kodobit/vcardqrgenerator/ExampleUnitTest.java b/vCardQRGenerator/src/test/java/com/kodobit/vcardqrgenerator/ExampleUnitTest.java
new file mode 100644
index 0000000..22ccc20
--- /dev/null
+++ b/vCardQRGenerator/src/test/java/com/kodobit/vcardqrgenerator/ExampleUnitTest.java
@@ -0,0 +1,17 @@
+package com.kodobit.vcardqrgenerator;
+
+import org.junit.Test;
+
+import static org.junit.Assert.*;
+
+/**
+ * Example local unit test, which will execute on the development machine (host).
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+public class ExampleUnitTest {
+    @Test
+    public void addition_isCorrect() {
+        assertEquals(4, 2 + 2);
+    }
+}
\ No newline at end of file

From 74f41621e14d9ec454d281d636bde679e0b598b1 Mon Sep 17 00:00:00 2001
From: VladimirJevtic <vjkblmb@gmail.com>
Date: Mon, 9 Nov 2020 21:38:39 +0100
Subject: [PATCH 2/2] 2nd commit. Recreated main activity and added path to qr
 generator for contacts

---
 .idea/caches/build_file_checksums.ser         | Bin 594 -> 594 bytes
 app/src/main/AndroidManifest.xml              |  11 +-
 .../androidmads/example/MainActivity.java     | 100 ++++++++++++++++++
 app/src/main/res/layout/activity_gen_data.xml |   6 +-
 app/src/main/res/layout/activity_main.xml     |  54 ++++++++++
 app/src/main/res/values/strings.xml           |   2 +-
 6 files changed, 165 insertions(+), 8 deletions(-)
 create mode 100644 app/src/main/java/androidmads/example/MainActivity.java
 create mode 100644 app/src/main/res/layout/activity_main.xml

diff --git a/.idea/caches/build_file_checksums.ser b/.idea/caches/build_file_checksums.ser
index aac06d3a169da09aedfb82edfe0e1756f88759c1..b3bed0b0b070d35962bdc71d8b01bfd071cacd3d 100644
GIT binary patch
delta 14
Wcmcb_a*1WaOy;e}{Ws3p#s~m12nMJC

delta 14
Wcmcb_a*1WaOy;6{fg9&+V*~&&#|C}?

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 81627c3..efec506 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -10,16 +10,19 @@
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-
-        <activity android:name=".GenDataActivity">
+        <activity android:name=".MainActivity">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
 
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-
-        <activity android:name=".GenQRActivity" />
+        <activity
+            android:name=".GenDataActivity"
+            android:screenOrientation="portrait" />
+        <activity
+            android:name=".GenQRActivity"
+            android:screenOrientation="portrait" />
     </application>
 
 </manifest>
\ No newline at end of file
diff --git a/app/src/main/java/androidmads/example/MainActivity.java b/app/src/main/java/androidmads/example/MainActivity.java
new file mode 100644
index 0000000..a0ab399
--- /dev/null
+++ b/app/src/main/java/androidmads/example/MainActivity.java
@@ -0,0 +1,100 @@
+package androidmads.example;
+
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.core.app.ActivityCompat;
+import androidx.core.content.ContextCompat;
+
+import android.Manifest;
+import android.content.Intent;
+import android.content.pm.PackageManager;
+import android.graphics.Bitmap;
+import android.graphics.Color;
+import android.graphics.Point;
+import android.os.Bundle;
+import android.os.Environment;
+import android.view.Display;
+import android.view.View;
+import android.view.WindowManager;
+import android.widget.EditText;
+import android.widget.ImageView;
+import android.widget.Toast;
+
+import androidmads.library.qrgenearator.QRGContents;
+import androidmads.library.qrgenearator.QRGEncoder;
+import androidmads.library.qrgenearator.QRGSaver;
+
+public class MainActivity extends AppCompatActivity {
+
+    private EditText edtValue;
+    private ImageView qrImage;
+    private String inputValue;
+    private String savePath = Environment.getExternalStorageDirectory().getPath() + "/QRCode/";
+    private Bitmap bitmap;
+    private QRGEncoder qrgEncoder;
+    private AppCompatActivity activity;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main);
+
+        qrImage = findViewById(R.id.qr_image);
+        edtValue = findViewById(R.id.edt_value);
+        activity = this;
+
+        findViewById(R.id.generate_barcode).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                inputValue = edtValue.getText().toString().trim();
+                if (inputValue.length() > 0) {
+                    WindowManager manager = (WindowManager) getSystemService(WINDOW_SERVICE);
+                    Display display = manager.getDefaultDisplay();
+                    Point point = new Point();
+                    display.getSize(point);
+                    int width = point.x;
+                    int height = point.y;
+                    int smallerDimension = width < height ? width : height;
+                    smallerDimension = smallerDimension * 3 / 4;
+
+                    qrgEncoder = new QRGEncoder(
+                            inputValue, null,
+                            QRGContents.Type.TEXT,
+                            smallerDimension);
+                    qrgEncoder.setColorBlack(Color.RED);
+                    qrgEncoder.setColorWhite(Color.BLUE);
+                    try {
+                        bitmap = qrgEncoder.getBitmap();
+                        qrImage.setImageBitmap(bitmap);
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                } else {
+                    edtValue.setError(getResources().getString(R.string.value_required));
+                }
+            }
+        });
+
+        findViewById(R.id.save_barcode).setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (ContextCompat.checkSelfPermission(getApplicationContext(), Manifest.permission.WRITE_EXTERNAL_STORAGE) == PackageManager.PERMISSION_GRANTED) {
+                    try {
+                        boolean save = new QRGSaver().save(savePath, edtValue.getText().toString().trim(), bitmap, QRGContents.ImageType.IMAGE_JPEG);
+                        String result = save ? "Image Saved" : "Image Not Saved";
+                        Toast.makeText(activity, result, Toast.LENGTH_LONG).show();
+                        edtValue.setText(null);
+                    } catch (Exception e) {
+                        e.printStackTrace();
+                    }
+                } else {
+                    ActivityCompat.requestPermissions(activity, new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE}, 0);
+                }
+            }
+        });
+
+    }
+
+    public void goto_CQBarcode(View view) {
+        startActivity(new Intent(getApplicationContext(), GenDataActivity.class));
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_gen_data.xml b/app/src/main/res/layout/activity_gen_data.xml
index 4363cfe..07fdd1d 100644
--- a/app/src/main/res/layout/activity_gen_data.xml
+++ b/app/src/main/res/layout/activity_gen_data.xml
@@ -20,7 +20,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:hint="name"
+            android:hint="name surname"
             android:inputType="textPersonName" />
 
         <EditText
@@ -55,7 +55,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:hint="mail"
+            android:hint="mail@gmail.com"
             android:inputType="textEmailAddress" />
 
     </LinearLayout>
@@ -102,7 +102,7 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
-            android:hint="website"
+            android:hint="somewebsite.com"
             android:inputType="textUri" />
 
     </LinearLayout>
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml
new file mode 100644
index 0000000..c9e57b8
--- /dev/null
+++ b/app/src/main/res/layout/activity_main.xml
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:gravity="center_horizontal"
+    android:orientation="vertical"
+    android:padding="@dimen/activity_vertical_margin"
+    tools:context=".MainActivity">
+
+    <EditText
+        android:id="@+id/edt_value"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:hint="@string/enter_text"
+        android:importantForAutofill="no"
+        android:inputType="text" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:gravity="center_horizontal"
+        android:orientation="horizontal">
+
+        <Button
+            android:id="@+id/generate_barcode"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/generate" />
+
+        <Button
+            android:id="@+id/save_barcode"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="@string/save" />
+
+        <Button
+            android:onClick="goto_CQBarcode"
+            android:id="@+id/qr_barcode"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:text="QR contact" />
+    </LinearLayout>
+
+    <ImageView
+        android:id="@+id/qr_image"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:contentDescription="@string/app_name" />
+
+</LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index f4548e2..2090b6c 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -1,5 +1,5 @@
 <resources>
-    <string name="app_name">FORK_QRGenerator</string>
+    <string name="app_name">QRGenerator</string>
     <string name="save">Save</string>
     <string name="generate">Generate</string>
     <string name="enter_text">Enter Text</string>