From 457aeeabf39a6e4c8a80c917b8101fd5658a41a7 Mon Sep 17 00:00:00 2001
From: Siddharth Malladi <saidurm@clemson.edu>
Date: Thu, 14 Dec 2023 10:02:54 -0800
Subject: [PATCH 1/5] Revamp UI: Add bottom toolbar, update settings, modify
 main screen, rename app

---
 .../org/phenoapps/verify/MainActivity.java    | 344 ++++++------------
 .../phenoapps/verify/SettingsActivity.java    |   4 +
 .../phenoapps/verify/SettingsFragment.java    |  91 +++++
 .../java/org/phenoapps/verify/UriHandler.java |   2 +-
 app/src/main/res/drawable-anydpi/ic_home.xml  |  16 +
 app/src/main/res/drawable-hdpi/ic_home.png    | Bin 0 -> 355 bytes
 .../res/drawable-hdpi/ic_import_white.png     | Bin 0 -> 4427 bytes
 .../main/res/drawable-hdpi/ic_settings.png    | Bin 561 -> 4511 bytes
 app/src/main/res/drawable-mdpi/ic_home.png    | Bin 0 -> 253 bytes
 .../res/drawable-mdpi/ic_import_white.png     | Bin 0 -> 4427 bytes
 .../main/res/drawable-mdpi/ic_settings.png    | Bin 383 -> 4511 bytes
 app/src/main/res/drawable-xhdpi/ic_home.png   | Bin 0 -> 432 bytes
 .../res/drawable-xhdpi/ic_import_white.png    | Bin 0 -> 4427 bytes
 .../main/res/drawable-xhdpi/ic_settings.png   | Bin 677 -> 4511 bytes
 app/src/main/res/drawable-xxhdpi/ic_home.png  | Bin 0 -> 627 bytes
 .../res/drawable-xxhdpi/ic_import_white.png   | Bin 0 -> 4427 bytes
 .../main/res/drawable-xxhdpi/ic_settings.png  | Bin 1031 -> 4511 bytes
 .../main/res/layout-land/activity_main.xml    |  26 +-
 .../main/res/layout-xlarge/activity_main.xml  |  26 +-
 app/src/main/res/layout/activity_main.xml     |  62 ++--
 .../res/menu/activity_main_bottom_toolbar.xml |  23 ++
 .../main/res/menu/activity_main_toolbar.xml   |  14 +-
 app/src/main/res/xml/preferences.xml          |   9 +
 23 files changed, 345 insertions(+), 272 deletions(-)
 create mode 100644 app/src/main/res/drawable-anydpi/ic_home.xml
 create mode 100644 app/src/main/res/drawable-hdpi/ic_home.png
 create mode 100644 app/src/main/res/drawable-hdpi/ic_import_white.png
 create mode 100644 app/src/main/res/drawable-mdpi/ic_home.png
 create mode 100644 app/src/main/res/drawable-mdpi/ic_import_white.png
 create mode 100644 app/src/main/res/drawable-xhdpi/ic_home.png
 create mode 100644 app/src/main/res/drawable-xhdpi/ic_import_white.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_home.png
 create mode 100644 app/src/main/res/drawable-xxhdpi/ic_import_white.png
 create mode 100644 app/src/main/res/menu/activity_main_bottom_toolbar.xml

diff --git a/app/src/main/java/org/phenoapps/verify/MainActivity.java b/app/src/main/java/org/phenoapps/verify/MainActivity.java
index c9d424b..f98a6e9 100644
--- a/app/src/main/java/org/phenoapps/verify/MainActivity.java
+++ b/app/src/main/java/org/phenoapps/verify/MainActivity.java
@@ -19,6 +19,9 @@
 
 import androidx.annotation.NonNull;
 import com.google.android.material.navigation.NavigationView;
+
+import androidx.appcompat.widget.ActionMenuView;
+import androidx.appcompat.widget.Toolbar;
 import androidx.core.app.ActivityCompat;
 import androidx.core.view.GravityCompat;
 import androidx.drawerlayout.widget.DrawerLayout;
@@ -34,6 +37,7 @@
 import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
+import android.view.ViewGroup;
 import android.view.inputmethod.InputMethodManager;
 import android.widget.AbsListView;
 import android.widget.AdapterView;
@@ -72,9 +76,6 @@ public class MainActivity extends AppCompatActivity {
 
     private SparseArray<String> mIds;
 
-    //Verify UI variables
-    private ActionBarDrawerToggle mDrawerToggle;
-
     //global variable to track matching order
     private int mMatchingOrder;
 
@@ -86,6 +87,8 @@ public class MainActivity extends AppCompatActivity {
 
     private String mFileName = "";
 
+    private Toolbar navigationToolBar;
+
     @Override
     protected void onCreate(Bundle savedInstanceState) {
 
@@ -97,29 +100,29 @@ protected void onCreate(Bundle savedInstanceState) {
 
         SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(this);
 
-        final View auxInfo = findViewById(R.id.auxScrollView);
-        final View auxValue = findViewById(R.id.auxValueView);
+final View auxInfo = findViewById(R.id.auxScrollView);
+final View auxValue = findViewById(R.id.auxValueView);
 
         if (sharedPref.getBoolean(SettingsActivity.AUX_INFO, false)) {
-            auxInfo.setVisibility(View.VISIBLE);
-            auxValue.setVisibility(View.VISIBLE);
+auxInfo.setVisibility(View.VISIBLE);
+auxValue.setVisibility(View.VISIBLE);
 
         } else {
-            auxInfo.setVisibility(View.GONE);
-            auxValue.setVisibility(View.GONE);
-        }
+auxInfo.setVisibility(View.GONE);
+auxValue.setVisibility(View.GONE);
+}
 
         mPrefListener = new SharedPreferences.OnSharedPreferenceChangeListener() {
             @Override
             public void onSharedPreferenceChanged(SharedPreferences sharedPreferences, String s) {
 
-                if (sharedPreferences.getBoolean(SettingsActivity.AUX_INFO, false)) {
-                    auxInfo.setVisibility(View.VISIBLE);
-                    auxValue.setVisibility(View.VISIBLE);
-                } else {
-                    auxInfo.setVisibility(View.GONE);
-                    auxValue.setVisibility(View.GONE);
-                }
+if (sharedPreferences.getBoolean(SettingsActivity.AUX_INFO, false)) {
+auxInfo.setVisibility(View.VISIBLE);
+auxValue.setVisibility(View.VISIBLE);
+} else {
+auxInfo.setVisibility(View.GONE);
+auxValue.setVisibility(View.GONE);
+}
             }
         };
 
@@ -208,18 +211,11 @@ private void prepareStatements() {
     private void initializeUIVariables() {
 
         if (getSupportActionBar() != null){
-            getSupportActionBar().setTitle(null);
+            getSupportActionBar().setTitle("CheckList");
             getSupportActionBar().getThemedContext();
-            getSupportActionBar().setDisplayHomeAsUpEnabled(true);
             getSupportActionBar().setHomeButtonEnabled(true);
         }
 
-        final NavigationView nvDrawer = (NavigationView) findViewById(R.id.nvView);
-
-        // Setup drawer view
-        setupDrawerContent(nvDrawer);
-        setupDrawer();
-
         final EditText scannerTextView = ((EditText) findViewById(R.id.scannerTextView));
         scannerTextView.setSelectAllOnFocus(true);
         scannerTextView.setOnKeyListener(new View.OnKeyListener() {
@@ -237,25 +233,25 @@ public boolean onKey(View v, int keyCode, KeyEvent event) {
 
         ListView idTable = ((ListView) findViewById(R.id.idTable));
         idTable.setChoiceMode(AbsListView.CHOICE_MODE_MULTIPLE);
-        idTable.setOnItemClickListener(new AdapterView.OnItemClickListener() {
+idTable.setOnItemClickListener(new AdapterView.OnItemClickListener() {
 
             @Override
             public void onItemClick(AdapterView<?> parent, View view, int position, long id) {
-                scannerTextView.setText(((TextView) view).getText().toString());
+scannerTextView.setText(((TextView) view).getText().toString());
                 scannerTextView.setSelection(scannerTextView.getText().length());
                 scannerTextView.requestFocus();
                 scannerTextView.selectAll();
                 checkScannedItem();
-            }
+                }
         });
 
-        idTable.setOnItemLongClickListener(new AdapterView.OnItemLongClickListener() {
-            @Override
-            public boolean onItemLongClick(AdapterView<?> parent, View view, int position, long id) {
-                //get app settings
-                insertNoteIntoDb(((TextView) view).getText().toString());
-                return true;
-            }
+idTable.setOnItemLongClickListener(new AdapterView.OnItemLongClickListener() {
+@Override
+public boolean onItemLongClick(AdapterView<?> parent, View view, int position, long id) {
+//get app settings
+insertNoteIntoDb(((TextView) view).getText().toString());
+return true;
+}
         });
 
         TextView valueView = (TextView) findViewById(R.id.valueView);
@@ -273,7 +269,7 @@ private synchronized void checkScannedItem() {
 
         SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(MainActivity.this);
         int scanMode = Integer.valueOf(sharedPref.getString(SettingsActivity.SCAN_MODE_LIST, "-1"));
-        boolean displayAux = sharedPref.getBoolean(SettingsActivity.AUX_INFO, true);
+boolean displayAux = sharedPref.getBoolean(SettingsActivity.AUX_INFO, true);
 
         String scannedId = ((EditText) findViewById(org.phenoapps.verify.R.id.scannerTextView))
                 .getText().toString();
@@ -318,10 +314,10 @@ private synchronized void checkScannedItem() {
                         }
                     }
                 }
-                cursor.close();
-                ((TextView) findViewById(org.phenoapps.verify.R.id.valueView)).setText(values.toString());
-                ((TextView) findViewById(R.id.auxValueView)).setText(auxValues.toString());
-                ((EditText) findViewById(R.id.scannerTextView)).setText("");
+                                cursor.close();
+((TextView) findViewById(org.phenoapps.verify.R.id.valueView)).setText(values.toString());
+((TextView) findViewById(R.id.auxValueView)).setText(auxValues.toString());
+((EditText) findViewById(R.id.scannerTextView)).setText("");
             } else {
                 if (scanMode != 2) {
                     ringNotification(false);
@@ -808,6 +804,19 @@ final public boolean onCreateOptionsMenu(Menu m) {
 
         final MenuInflater inflater = getMenuInflater();
         inflater.inflate(org.phenoapps.verify.R.menu.activity_main_toolbar, m);
+
+        ActionMenuView bottomToolBar = (ActionMenuView) findViewById(R.id.bottom_toolbar);
+        Menu bottomMenu = bottomToolBar.getMenu();
+        inflater.inflate(R.menu.activity_main_bottom_toolbar, bottomMenu);
+
+        for (int i = 0; i < bottomMenu.size(); i++) {
+            bottomMenu.getItem(i).setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
+                @Override
+                public boolean onMenuItemClick(MenuItem item) {
+                    return onOptionsItemSelected(item);
+                }
+            });
+        }
         return true;
     }
 
@@ -815,25 +824,81 @@ final public boolean onCreateOptionsMenu(Menu m) {
     final public boolean onOptionsItemSelected(MenuItem item) {
         DrawerLayout dl = (DrawerLayout) findViewById(R.id.drawer_layout);
         int actionCamera = R.id.action_camera;
-        int actionCompare = R.id.action_compare;
-        if (mDrawerToggle.onOptionsItemSelected(item)) {
-            return true;
-        }
+        int actionImport = R.id.action_import;
+        int actionHome = R.id.Home;
+        int actionCompare = R.id.Compare;
+        int actionSettings = R.id.Settings;
+
+        if (item.getItemId() == actionImport){
+            final SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(MainActivity.this);
+            final int scanMode = Integer.valueOf(sharedPref.getString(SettingsActivity.SCAN_MODE_LIST, "-1"));
+            final Intent i;
+            File verifyDirectory = new File(getExternalFilesDir(null), "/Verify");
+
+            File[] files = verifyDirectory.listFiles();
+
+
+            AlertDialog.Builder builder = new AlertDialog.Builder(this);
+            builder.setTitle("Select files from?");
+            builder.setPositiveButton("Storage",
+                    new DialogInterface.OnClickListener()
+                    {
+                        public void onClick(DialogInterface dialog, int id)
+                        {
+                            Intent i;
+                            if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.KITKAT) {
+                                i = new Intent(Intent.ACTION_OPEN_DOCUMENT);
+                            }else{
+                                i = new Intent(Intent.ACTION_GET_CONTENT);
+                            }
+                            i.setType("*/*");
+                            startActivityForResult(Intent.createChooser(i, "Choose file to import."), VerifyConstants.DEFAULT_CONTENT_REQ);
+                        }
+                    });
+
+            builder.setNegativeButton("Verify Directory",
+                    new DialogInterface.OnClickListener()
+                    {
+                        public void onClick(DialogInterface dialog, int id)
+                        {
+
+                            AlertDialog.Builder fileBuilder = new AlertDialog.Builder(MainActivity.this);
+                            fileBuilder.setTitle("Select the sample file");
+                            final int[] checkedItem = {-1};
+                            String[] listItems = verifyDirectory.list();
+                            fileBuilder.setSingleChoiceItems(listItems, checkedItem[0],(fileDialog, which) -> {
+                                checkedItem[0] = which;
+
+                                Intent i = new Intent(MainActivity.this, LoaderDBActivity.class);
+                                i.setData(Uri.fromFile(files[which]));
+                                startActivityForResult(i, VerifyConstants.LOADER_INTENT_REQ);
+                                fileDialog.dismiss();
+                            });
+
+                            fileBuilder.show();
 
-        if (item.getItemId() == android.R.id.home){
+                        }
+                    });
+            builder.show();
+        } else if (item.getItemId() == android.R.id.home){
             dl.openDrawer(GravityCompat.START);
         }
-        else if(item.getItemId() == actionCamera){
-            final Intent cameraIntent = new Intent(this, ScanActivity.class);
-            startActivityForResult(cameraIntent, VerifyConstants.CAMERA_INTENT_REQ);
+        else if (item.getItemId() == actionHome){
+
         }
-        else if(item.getItemId() == actionCompare){
+        else if ( item.getItemId() == actionCompare) {
             final Intent compareIntent = new Intent(MainActivity.this, CompareActivity.class);
             runOnUiThread(new Runnable() {
                 @Override public void run() {
                     startActivity(compareIntent);
                 }
             });
+        } else if (item.getItemId() == actionSettings) {
+            final Intent settingsIntent = new Intent(this, SettingsActivity.class);
+            startActivityForResult(settingsIntent, VerifyConstants.SETTINGS_INTENT_REQ);
+        } else if(item.getItemId() == actionCamera){
+            final Intent cameraIntent = new Intent(this, ScanActivity.class);
+            startActivityForResult(cameraIntent, VerifyConstants.CAMERA_INTENT_REQ);
         }
         else{
             return super.onOptionsItemSelected(item);
@@ -912,131 +977,23 @@ final protected void onActivityResult(int requestCode, int resultCode, Intent in
     private void buildListView() {
 
         ListView idTable = (ListView) findViewById(org.phenoapps.verify.R.id.idTable);
-        ArrayAdapter<String> idAdapter =
-                new ArrayAdapter<>(this, org.phenoapps.verify.R.layout.row);
+ArrayAdapter<String> idAdapter =
+new ArrayAdapter<>(this, org.phenoapps.verify.R.layout.row);
         int size = mIds.size();
         for (int i = 0; i < size; i++) {
-            idAdapter.add(this.mIds.get(this.mIds.keyAt(i)));
+idAdapter.add(this.mIds.get(this.mIds.keyAt(i)));
         }
-        idTable.setAdapter(idAdapter);
+idTable.setAdapter(idAdapter);
     }
 
     private void clearListView() {
 
         ListView idTable = (ListView) findViewById(org.phenoapps.verify.R.id.idTable);
-        final ArrayAdapter<String> adapter =
-                new ArrayAdapter<>(this, org.phenoapps.verify.R.layout.row);
+final ArrayAdapter<String> adapter =
+new ArrayAdapter<>(this, org.phenoapps.verify.R.layout.row);
 
         idTable.setAdapter(adapter);
-        adapter.notifyDataSetChanged();
-    }
-
-    private void setupDrawer() {
-
-        DrawerLayout dl = (DrawerLayout) findViewById(org.phenoapps.verify.R.id.drawer_layout);
-        mDrawerToggle = new ActionBarDrawerToggle(this, dl,
-                org.phenoapps.verify.R.string.drawer_open, org.phenoapps.verify.R.string.drawer_close) {
-
-            public void onDrawerOpened(View drawerView) {
-                View view = MainActivity.this.getCurrentFocus();
-                if (view != null) {
-                    InputMethodManager imm = (InputMethodManager) getSystemService(Context.INPUT_METHOD_SERVICE);
-                    imm.hideSoftInputFromWindow(view.getWindowToken(), 0);
-                }
-            }
-
-            public void onDrawerClosed(View view) {
-            }
-
-        };
-
-        mDrawerToggle.setDrawerIndicatorEnabled(true);
-        dl.addDrawerListener(mDrawerToggle);
-    }
-
-    private void setupDrawerContent(NavigationView navigationView) {
-        navigationView.setNavigationItemSelectedListener(
-                new NavigationView.OnNavigationItemSelectedListener() {
-                    @Override
-                    public boolean onNavigationItemSelected(@NonNull MenuItem menuItem) {
-                        selectDrawerItem(menuItem);
-                        return true;
-                    }
-                });
-    }
-
-    private void selectDrawerItem(MenuItem menuItem) {
-        int itemId = menuItem.getItemId();
-        // constants like id in R class are no longer final, thus can't use switch here
-
-        if (itemId == R.id.nav_import){
-            final SharedPreferences sharedPref = PreferenceManager.getDefaultSharedPreferences(MainActivity.this);
-            final int scanMode = Integer.valueOf(sharedPref.getString(SettingsActivity.SCAN_MODE_LIST, "-1"));
-            final Intent i;
-            File verifyDirectory = new File(getExternalFilesDir(null), "/Verify");
-
-            File[] files = verifyDirectory.listFiles();
-
-
-            AlertDialog.Builder builder = new AlertDialog.Builder(this);
-            builder.setTitle("Select files from?");
-            builder.setPositiveButton("Storage",
-                    new DialogInterface.OnClickListener()
-                    {
-                        public void onClick(DialogInterface dialog, int id)
-                        {
-                            Intent i;
-                            if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.KITKAT) {
-                                i = new Intent(Intent.ACTION_OPEN_DOCUMENT);
-                            }else{
-                                i = new Intent(Intent.ACTION_GET_CONTENT);
-                            }
-                            i.setType("*/*");
-                            startActivityForResult(Intent.createChooser(i, "Choose file to import."), VerifyConstants.DEFAULT_CONTENT_REQ);
-                        }
-                    });
-
-            builder.setNegativeButton("Verify Directory",
-                    new DialogInterface.OnClickListener()
-                    {
-                        public void onClick(DialogInterface dialog, int id)
-                        {
-
-                            AlertDialog.Builder fileBuilder = new AlertDialog.Builder(MainActivity.this);
-                            fileBuilder.setTitle("Select the sample file");
-                            final int[] checkedItem = {-1};
-                            String[] listItems = verifyDirectory.list();
-                            fileBuilder.setSingleChoiceItems(listItems, checkedItem[0],(fileDialog, which) -> {
-                                checkedItem[0] = which;
-
-                                Intent i = new Intent(MainActivity.this, LoaderDBActivity.class);
-                                i.setData(Uri.fromFile(files[which]));
-                                startActivityForResult(i, VerifyConstants.LOADER_INTENT_REQ);
-                                fileDialog.dismiss();
-                            });
-
-                            fileBuilder.show();
-
-                        }
-                    });
-            builder.show();
-        } else if (itemId == R.id.nav_settings) {
-            final Intent settingsIntent = new Intent(this, SettingsActivity.class);
-            startActivityForResult(settingsIntent, VerifyConstants.SETTINGS_INTENT_REQ);
-        } else if (itemId == R.id.nav_export) {
-            askUserExportFileName();
-        } else if (itemId == R.id.nav_about) {
-            showAboutDialog();
-        } else if (itemId == R.id.nav_intro) {
-            final Intent intro_intent = new Intent(MainActivity.this, IntroActivity.class);
-            runOnUiThread(new Runnable() {
-                @Override public void run() {
-                    startActivity(intro_intent);
-                }
-            });
-        }
-        DrawerLayout dl = (DrawerLayout) findViewById(org.phenoapps.verify.R.id.drawer_layout);
-        dl.closeDrawers();
+adapter.notifyDataSetChanged();
     }
 
     private void showPairDialog() {
@@ -1065,73 +1022,14 @@ public void onClick(DialogInterface dialogInterface, int i) {
         builder.show();
     }
 
-    private void showAboutDialog()
-    {
-        android.app.AlertDialog.Builder builder = new android.app.AlertDialog.Builder(this);
-        {
-            android.view.View personView = this.getLayoutInflater().inflate(
-                    org.phenoapps.verify.R.layout.about, new android.widget.LinearLayout(this),
-                    false);
-
-            {
-                assert personView != null;
-                android.widget.TextView versionTextView = (android.widget.TextView)
-                        personView.findViewById(org.phenoapps.verify.R.id.tvVersion);
-                try
-                {
-                    android.content.pm.PackageInfo packageInfo =
-                            this.getPackageManager().getPackageInfo(this.getPackageName(), 0);
-                    assert packageInfo     != null;
-                    assert versionTextView != null;
-                    versionTextView.setText(this.getResources().getString(
-                            org.phenoapps.verify.R.string.versiontitle) +
-                            ' ' + packageInfo.versionName);
-                }
-                catch (android.content.pm.PackageManager.NameNotFoundException e)
-                { e.printStackTrace(); }
-                versionTextView.setOnClickListener(new android.view.View.OnClickListener()
-                {
-                    @java.lang.Override
-                    public void onClick(android.view.View v)
-                    { MainActivity.this.showChangeLog(); }
-                });
-            }
-
-            builder.setCancelable(true);
-            builder.setTitle     (this.getResources().getString(
-                    org.phenoapps.verify.R.string.about));
-            builder.setView(personView);
-        }
-
-        builder.setNegativeButton(
-                this.getResources().getString(org.phenoapps.verify.R.string.ok),
-                new android.content.DialogInterface.OnClickListener()
-                {
-                    @java.lang.Override
-                    public void onClick(android.content.DialogInterface dialog, int which)
-                    {
-                        assert dialog != null;
-                        dialog.dismiss();
-                    }
-                });
-
-        builder.show();
-    }
-
-    private void showChangeLog() {
-
-    }
-
     @Override
     final protected void onPostCreate(Bundle savedInstanceState) {
         super.onPostCreate(savedInstanceState);
-        mDrawerToggle.syncState();
     }
 
     @Override
     final public void onConfigurationChanged(Configuration newConfig) {
         super.onConfigurationChanged(newConfig);
-        mDrawerToggle.onConfigurationChanged(newConfig);
     }
 
     private void launchIntro() {
diff --git a/app/src/main/java/org/phenoapps/verify/SettingsActivity.java b/app/src/main/java/org/phenoapps/verify/SettingsActivity.java
index fb5a18f..f12ff6e 100644
--- a/app/src/main/java/org/phenoapps/verify/SettingsActivity.java
+++ b/app/src/main/java/org/phenoapps/verify/SettingsActivity.java
@@ -8,6 +8,10 @@
 public class SettingsActivity extends AppCompatActivity {
 
     public static String FILE_NAME = "org.phenoapps.verify.FILE_NAME";
+    public static String INTRO_BUTTON = "org.phenoapps.verify.INTRO";
+
+    public static String ABOUT_BUTTON = "org.phenoapps.verify.ABOUT";
+
     public static String SCAN_MODE_LIST = "org.phenoapps.verify.SCAN_MODE";
     public static String AUDIO_ENABLED = "org.phenoapps.verify.AUDIO_ENABLED";
     public static String TUTORIAL_MODE = "org.phenoapps.verify.TUTORIAL_MODE";
diff --git a/app/src/main/java/org/phenoapps/verify/SettingsFragment.java b/app/src/main/java/org/phenoapps/verify/SettingsFragment.java
index 577aa32..89c8970 100644
--- a/app/src/main/java/org/phenoapps/verify/SettingsFragment.java
+++ b/app/src/main/java/org/phenoapps/verify/SettingsFragment.java
@@ -1,14 +1,78 @@
 package org.phenoapps.verify;
 
+import android.content.Context;
+import android.content.Intent;
 import android.content.SharedPreferences;
+import android.os.Build;
 import android.os.Bundle;
 import android.preference.ListPreference;
 import android.preference.Preference;
 import android.preference.PreferenceFragment;
 import android.widget.Toast;
 
+import java.util.prefs.Preferences;
+
 public class SettingsFragment extends PreferenceFragment {
 
+
+    private void showChangeLog() {
+
+    }
+    private void showAboutDialog(Context ctx)
+    {
+        android.app.AlertDialog.Builder builder = new android.app.AlertDialog.Builder(ctx);
+        {
+            android.view.View personView = null;
+            if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
+                personView = getLayoutInflater().inflate(
+                        R.layout.about, new android.widget.LinearLayout(ctx),
+                        false);
+            }
+            {
+                assert personView != null;
+                android.widget.TextView versionTextView = (android.widget.TextView)
+                        personView.findViewById(org.phenoapps.verify.R.id.tvVersion);
+                try
+                {
+                    android.content.pm.PackageInfo packageInfo =
+                            ctx.getPackageManager().getPackageInfo(ctx.getPackageName(), 0);
+                    assert packageInfo     != null;
+                    assert versionTextView != null;
+                    versionTextView.setText(this.getResources().getString(
+                            org.phenoapps.verify.R.string.versiontitle) +
+                            ' ' + packageInfo.versionName);
+                }
+                catch (android.content.pm.PackageManager.NameNotFoundException e)
+                { e.printStackTrace(); }
+                versionTextView.setOnClickListener(new android.view.View.OnClickListener()
+                {
+                    @java.lang.Override
+                    public void onClick(android.view.View v)
+                    { showChangeLog(); }
+                });
+            }
+
+            builder.setCancelable(true);
+            builder.setTitle     (this.getResources().getString(
+                    org.phenoapps.verify.R.string.about));
+            builder.setView(personView);
+        }
+
+        builder.setNegativeButton(
+                this.getResources().getString(org.phenoapps.verify.R.string.ok),
+                new android.content.DialogInterface.OnClickListener()
+                {
+                    @java.lang.Override
+                    public void onClick(android.content.DialogInterface dialog, int which)
+                    {
+                        assert dialog != null;
+                        dialog.dismiss();
+                    }
+                });
+
+        builder.show();
+    }
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
@@ -17,7 +81,34 @@ public void onCreate(Bundle savedInstanceState) {
 
         final SharedPreferences sharedPrefs = super.getPreferenceManager().getSharedPreferences();
         ListPreference mode = (ListPreference) findPreference(SettingsActivity.SCAN_MODE_LIST);
+        Preference introButton = (Preference) findPreference(SettingsActivity.INTRO_BUTTON);
+        Preference aboutButton = (Preference) findPreference(SettingsActivity.ABOUT_BUTTON);
 
+        aboutButton.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
+            @Override
+            public boolean onPreferenceClick(Preference preference) {
+                if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.M) {
+                    showAboutDialog(getContext());
+                }
+                return true;
+            }
+        });
+
+        introButton.setOnPreferenceClickListener(new Preference.OnPreferenceClickListener() {
+            @Override
+            public boolean onPreferenceClick(Preference preference) {
+                if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) {
+                    final Intent intro_intent = new Intent(getContext(), IntroActivity.class);
+                    getActivity().runOnUiThread(new Runnable() {
+                        @Override
+                        public void run() {
+                            startActivity(intro_intent);
+                        }
+                    });
+                }
+                return true;
+            }
+        });
         mode.setOnPreferenceChangeListener(new Preference.OnPreferenceChangeListener() {
             //check if Pair mode is chosen, if it's disabled then show a message and switch
             //back to default mode.
diff --git a/app/src/main/java/org/phenoapps/verify/UriHandler.java b/app/src/main/java/org/phenoapps/verify/UriHandler.java
index 51c7d5f..851c11c 100644
--- a/app/src/main/java/org/phenoapps/verify/UriHandler.java
+++ b/app/src/main/java/org/phenoapps/verify/UriHandler.java
@@ -55,7 +55,7 @@ public static String getFileName(@NonNull Context context, Uri uri) {
 
         return fileName;
     }
-//test
+
     /**
      * Returns the effective file name from the provided Uri.
      * @param fileName
diff --git a/app/src/main/res/drawable-anydpi/ic_home.xml b/app/src/main/res/drawable-anydpi/ic_home.xml
new file mode 100644
index 0000000..3eb8fe0
--- /dev/null
+++ b/app/src/main/res/drawable-anydpi/ic_home.xml
@@ -0,0 +1,16 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="#FFFFFF"
+    android:alpha="0.8">
+  <group android:scaleX="1.25"
+      android:scaleY="1.25"
+      android:translateX="-3"
+      android:translateY="-3">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M10,20v-6h4v6h5v-8h3L12,3 2,12h3v8z"/>
+  </group>
+</vector>
diff --git a/app/src/main/res/drawable-hdpi/ic_home.png b/app/src/main/res/drawable-hdpi/ic_home.png
new file mode 100644
index 0000000000000000000000000000000000000000..bfbbd81b83105cbc3ef8be432f545087686b4e34
GIT binary patch
literal 355
zcmV-p0i6DcP)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ0003hNkl<ZcwX(6
zu};G<7=%+MDnMcavG5R;`T$Jrz|6?Z#>~RN!c(+cMusjGQdde8!8@6=z$jd<b<#Kq
zs(jM7*#Ccb%3vi)_EE-|3ApC-UW6hy;PZ!DzVB2h@Kh+{c;>lIgy6X-<4C~)@3ba_
zy^9h|#(TkqkO5eV@J+nh9rg(#7@vT(2=$SHQ}$~l7@mP#gjL1vUa;>@g3$<kh>*Hi
zk1_k#5)7_{aZ{$8Q%P976K0{f=e(`L!h<jg%_HYZVQ?mv+al%sKf=I^SZbSv;kOD0
zL+~bsyTZP2N5w)s&<n1NeMw7~J(2%@B_|vniov!x=KPXOEaZ`?UT9^$e=ijFj^`CY
z3tjTA6YkE%ydoCz5exZ<g?z+9K4Kvs{z6gzU0?XL_b>F?^_>6!002ovPDHLkV1g_o
Bq#6JK

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-hdpi/ic_import_white.png b/app/src/main/res/drawable-hdpi/ic_import_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..f90b07ad7594e9ac654b0fd7c63b9f4538cf07e6
GIT binary patch
literal 4427
zcmeHKdr%X19$%<Rz{fE@Ds6eJ;igl?WH-BckS!53K@u?-Aw`Pg=w=^bCCSF@h6JpD
zuj^s2)nfG&nS-mn(;Jkl*s~&4M5XrSO)Kry$B3x)yzAlP&bL$WejCDT+L;?>uK$sl
z&F+35pWpZU`F?-j*<Y0{Cu?HN^Dz(vO|+Ozx!`V=F4;Kn|H{pSS>Sf6%w8bok^$K3
z<5|wdz+$PFfteu3LQwF6+jeo{NmTa3!>I{v-g9l&QmwQ6>)%@LGQVRtRK2bj$DQph
zZ9Pj>TB_g4EN;-e@Sf$Gr;5$0`(4w*^chiE56g(?Lz8Eps4Lw4bZ^JZuHP@sSI&Df
z!Etnob>8xd4d<Tu*pz&E-rkL|=b~fQ-YUL+L2Pb(|JLJ4{_K;>9`qhv-#WdeGrv0t
zy$#cMD<45|zuMp#vn$D}eP1I^{bXO>ug}lzz4XtFCy{rrygL1u=gL1IC}IO=G}<gi
zV}Cv%i`q4B8_Xv&;@g+!wacePjo*|yW?#;;rp)-i#ANP`UAZwoVWF~T-HQ_~o8H*n
zRp`A#9r(WM>b{2c4X~`d^6-(=nMcf3PqSkbj<nQUr(0HUZV6P{5d6&daZ&0^+Ptd6
zJ3ejPwCv9^V}`6JZu?H=3rp_gW7qzb7;&t#J-Gd8b9&b1nuBq%u~p8U<b_i&oa)$h
zsI9av^~9#81+V3#v1i9tB{eq&fB3k$tLZqN%o3VK@iU$s@80);Dy8Q6e@|Uy|3>_5
zI+oZ_`(bMF^;yN8TU*iEjwRcha|BuRY)ABD(@T5b-GI4H6@6nlu;tyJ!<#F<yr2DD
z?kBHACZCR+^(EX=ekc9WrTyFLYVTB^SXF<webt=#m5s~l7Yntwsnc97)aLA3z&}p$
zulW1cdxhC=Bt{&)c)Z=8o%f*f^Mn;$pKh_9-?mP@@wLQY`fmQS$Tc5kJgoV4sgShi
z7a2827IZ>UuOBa3+w|?4&V-e>Z(hdF^p->Va^IF473z;b-vv3)Uj^2M1jW0RB+WY*
zWzg*fjR!$#=|L|^6*D62V4R%CAiv$xDu+4RAYY=fqE@ewDdNm!J|?d$$4-?MQ+isS
zJ|`wENB{sgBa(2??eYjj&>#=t65v@9BXT%oA{HCu1y&nu<b4dRR;rb#A~VR9VDdRJ
zaGH;1iCokCFa&rr$cseLOCU%f5KsniCGT@0D!pEhpcsN-3SglSN<AVORCt7B38D|f
z#0Zp+^NJkrfhA1R!TUvnTn_Ybe|&DQ)j9z05yC70K9C^kMN~=@al4VB9)g%z0zkq6
z{iKIr2ip|MWdz>uqnOMR#v>*Vg`lYcf3M%?3Z+9+2;*Yhz*GRMs)j9@WwF`@JR}O7
zoZB1n0%Q-f6ghT~tYNW9nov4J0|D*>xWlaba}OB<E31_-@swW*&tfvjrS%D#r#PAj
zJ>slZkD?f(&}cO}g<7k3DD;eqRp1P*V=y&^(>l!%D2qoBNe{(HPyk%X0US!F!L=Ch
zA!&+HsC8Oa;ZSL51*)NNoYk=y%VI+y7Wp{Pm85HER1y>opmel`!cZ-xz%U(%Mu*Z0
z(xFBH6pJ|+N~6PYT?mS%i21zFO@eZAZqmshUXL@RkO(K{+AIb+rbGuNHWw+fz`-D2
z$a(z1L4}=jGkGE@v8mFbDh;YpYqU6u>s0DNqkP6EfKHS!Rj3m0(@13@Kr(<>QtDFx
z5b^-I5Jn$EioDOx^Dcv23JI1x2h>)uooG@dO{B;GP!z)n6-J<#U4;`GHK9_apc(=n
zV$ahYTl&AOrOgAU^_ASr31I!wkf?7*<uR-J-uhl$Txcu7aA;EyB-NLKK$b9cC{BRY
zr=p5TkCOq@Biye2a_*;E0oAHm8q+CsT9j3&aR;t&XdN0*PFh9lR5XP-9K+ECo)rV6
zkD2QPJOZvjdxp4zUkVj!=5Xsk5hGOr5T;OJib2A(VZxAb!iY38`ZG>Le#A*y$Y98j
z0e*clFucGlL<WXom@{eY{EWYFEq=xo0QBf0BjR_Iu2H&1#K4G*N4sm3t`RXXBID8S
z`oGZ?GkBb0Jm4!R01iuCvYh{bgVs1lc9to0<boa>TPna)wAcKq072uYNLK_@QyT|_
zQKH3~8Fgbqq%1C0-?3&J5Z$ww=Guc7ZeGluv>u(1(e~oi-X$dn6mj3^!ua#kYW_H*
zvFm>IFD=z2D_1AYH_fj4s_^Bph0|`x{?ztdvOoSB6!E0-X2+$T=w;`H{cuJl6cIT_
z7F+*a)S>H3Z29lm(+~W{y!6n{6uG>k`?tQWfBm5PY-f8D{D)&_oEZx$Ce^%YzgnL<
zg=_Gw*yRtTXjXplDDv|&jzIEr`E}#OhjYHZGId9LV|U8I#{En6?Q7XZ4-#?~*Ux?$
z?N3eL(SGZrF4v-JF=da;_BZDiBL3v8a0KQ(2hS}|X&p<CjflK=S^rfzo>+VI>z9we
d4HB8O`k9{Yf}pRU`+&rlB{Rp=IB&(e{{r%cN#g(j

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-hdpi/ic_settings.png b/app/src/main/res/drawable-hdpi/ic_settings.png
index 4cb8e41bfb6a23af97eca06167002f9f3e2466e6..bda5e854555c9d00cfab623cc26b1e8c7d032800 100644
GIT binary patch
literal 4511
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
T(-Uh?3sXaUivDQa@^}6Vw^D2p

literal 561
zcmV-10?z%3P)<h;3K|Lk000e1NJLTq001Na001Ni1^@s6;Q*MJ0005_Nkl<Zc-rll
zyGjE=6o%sk6Yz>Yg5o74iWdZJ^ch4D3lS8O2$CkC7M7;55J5x`Z4@j71>Yi(AVI;#
z##&LLNtKKG51fE3nVoZ%xC*iOnuR(0v2!jn>xswXp1*|WU+4#g&cLUJliv_}v=Mr6
zTgVGaHbMo^=%&zsjZB%IY6}Iy5@@wNuLo-kp%|#MtZf6!z%Lb2pZlHyXTc#D1!Ex1
zkSTKmM!+~Y0y%nq3mPOsQOyfJ1Tv;ID_o&2@ao{jQl3EvM`+&#nKHX3p#UffgQ~np
zfdu87WNm>eRx7kE2=)fTz-Q@CA&?Qo*|HN-C4Rw_3EH%b08{E5v~a3y-LQ3GMw1H}
zwkjrVjB_?Q<71AOoF>MMlTJOY36>I!f}|$Kq!XbjO|XPO=votF!imtlCRmoX!zAOg
z*|J%QkQ#`ahT}zuAr!G$uL@>^Bh(JA80DIw($>igQfn~9xug?7RT^W4zLeLpO%bLH
zt1<eiM@UCUk`g#4T$=~IrX1RHak%bqlDZSTxFGXHIm;^hRZWnRgBKSi<3}f?j+b}e
z2B|tD4S`|m)LfYa4PmwJ0KC)lG@Z>wjZvLb7C>`_J{4ogL@UHplYJ5NRr?y$&k*W%
z^Iq0u$fvySR#7uoX~ij3kQLQfkN<zi)Qr#<czD+4Gnded00000NkvXXu0mjf`&{uH

diff --git a/app/src/main/res/drawable-mdpi/ic_home.png b/app/src/main/res/drawable-mdpi/ic_home.png
new file mode 100644
index 0000000000000000000000000000000000000000..5c6b248ef3d28fe0aa35fab80b2c5a8b1566ff98
GIT binary patch
literal 253
zcmeAS@N?(olHy`uVBq!ia0vp^5+KaM1|%Pp+x`GjM?75|Ln`9lPBG+ab`Wui&9P~5
z|6o$4`F3xIxJUMTQ6{mMPJ1q=*`+92^K|Z36FAt&zN!8nk4{$LpYA>1`F#9k&YN>K
zsz!87s*Q9CU|qN9z&WjN>YR+GJ32o!oXxryt*T@8K+j3?v&o+SVG$Xw7u2K9O>EjI
zd^-E3g}x9^bA(swgF7Gk`VY-H{o?TUB>o3VKG7R}(pfi4)OF8Xf2xi-$1AnVDL&PC
z;{>m;gOYPNtdrx*9QF6?{UFOa@w>(k$Afxb8T7u^?%y3%^b_bG22WQ%mvv4FO#oC~
BWc2_5

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-mdpi/ic_import_white.png b/app/src/main/res/drawable-mdpi/ic_import_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..f90b07ad7594e9ac654b0fd7c63b9f4538cf07e6
GIT binary patch
literal 4427
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-mdpi/ic_settings.png b/app/src/main/res/drawable-mdpi/ic_settings.png
index cf6c63e77bd1d3b919ab8e8b1882df7af687feb7..bda5e854555c9d00cfab623cc26b1e8c7d032800 100644
GIT binary patch
literal 4511
zcmeHKeNYo;8V`aJ5oqL8RIs-$*H+YIlifg)m8g&)1Pn&xL(2KF*?kjM$OqZQ1pGiN
z=VvP-*H#e~to67mj#aFPUvNNm^c=mj);p&37}TqCO0`gjyQ=lx4Tv!9%#AbG|H#Z{
z-}m|Wz0dP|pZA%4x0q5Af&wN7h(w|wL!v$vz7vH<JPQ7&cb!OpujZn(#e6E|Mw~8(
zh0Oy9U+4q~@URw<$kS#sH3c=x#ZQU&gkze{Ms-SgQhU|y(6G0X4piRp<-VL$)z$m#
z`r-8_cFaF9Va6MpmX`XW1Cgd#-~49pEaq1C$&^ivOW#RoNx$N`aI1%sR2N0>efN89
z$=&I@0*lX0%J-|={`UFch_HDbl5Tm8B4hfYp28B4oS758g0FaTepCIm^XCe>iyO~Q
zjnMdp1XWFud@|-iWrwlQt_`&|ZrqLCVHeE0_uAv$tOzV@eT_)uQ^M+WCWB7*A|04S
z<(e{WV)NYa)@6(0%RUHRDajY7?wz@Lt9r%wt){781k{qde*42n<K&&=LKB)!c63}c
z-)w5l%Jk2Sl{^*Y7v!h%Wg*W$9QSsM$N5#MyZ3eXLs9iYs^Vr;a885mQ2A)Zp6v0f
zmX3{+P=OIBab;Ke!EviE-qMa(eQsON%;#M3_G1;NCQ2k*th=eUmavu^dp>I_+^@cz
zbUbNwN{r>NBe(qe^ij{#&rjbw-bj38c~iR}{EZ3QrX1nrGj>n@Ze0HSoBZX_<F6mC
zJf+Tke{ybn`33p!Z)JXPI)xJ(W|~Kb=%>|GzZ;O(!rnA|y5rEZlG5VqkCX4DUP>Po
zadE^a*O4=8AI<r9du{rz%11lnMpr#)&7VDQ-M%GNS?<b*^hI``sL9%q<aly8X!$?O
zzc0$(HpQpR*3sEe8@a0SZm|3jbLr57q}YnMYSG#Ke^K3C_hWXI<Ldp|lchKO5#5rH
z?dvw^me(cz{r>ES-*!Fd`Ug?_<604}a=lj?yf6rsori_xwb(eHq#ZUH#W>7B=CL_p
z-HAjob39Ip&ILST23FRtMIWBIfFdlTMKhy}a-&lRa@fQo7g$u3l13Nh(i#SxGdm#0
zLqY%>;3>po%d>N&M~ixKNjMh77>amJ_*^Zz*l0p@4i`X_GNnu|jrXuCaddV7660bl
zWU78%KLng<(Hx$4k{IT8yJc=d=5Sdtg+`;n<T!@oQfMLN3hg}Qk=nTk0iq8>4>;Pz
zI(gP%M+8jD>?q*1C<^t+i}-9#qj3P<&h@hZ`M^As6I00Kn9YU__Tc#Vl@O#qpr7^N
z(%>n@QUT{EaM2)sC9v}mgCQ7tz~5Qm%JZhf&=|-AHfYMhRTV>)OfVQt10DheR@Ub9
zdO@;>Sn{mpC0Rpa6Exm*1_uJ&2XKd2zsTKd46TetQtzM(gzyY{Eh?-}G7g$$NbgXo
zu@Dp;t&-wEK}nTNltrqcqEu3anWhu~r=l6Nc@UJr&heC;1_BfWm$48>6Af?`p~j^O
z3ouKS(F~AMYC<lhH8ers(KH~`gCQ2USXh-*-r%SNC<a2Qaa^MWj6$l40vf5(LJ?BR
zLcpnlP$|_GLLO}<ywNZ;InUv;QE)q18)XHU({A-D1j5N!lR=B(GWko1DUaeU&_RpN
zXYB=^mx?sj1{U#@z@|baS41o1O0@#VRVqB{rBMcOaj+5vOod!VD7_kCTS%A;B$g8D
z6askVFc(ti0u=9Xr8yjVT2u%L5j+RfMtGbUil_7x4<M)<CrAZO%84|EhLkHwLNh}i
zMG}MT9SmzJ{9o3>;Xz{hwmgyL;QEDLQQwJL1oHc4ebYSFdz28wdnibX?n{BARszNw
zC&cPg(K(de3Sjr>FV`1x_Ge0g0?}$hrDmjN4TzE|qZnG)KLAHc4W(9_8HQF3MdutA
z-c7kctQGPIxq{{C<qDbR-KfZ+*6ti2>;fcAs=%cKgeevMgkk*&V?xh(k#P+66Ha2h
z27{Um^y`zs<^_8pHqZ?FITPB>FZk=<i(haB2tB;WEAcx_*DzhL#K0>V4_DVPU9ZHz
zD;W=0*Z+;KfS1=PV258pZg^SRS^n*Fc+nbVPEOE!uUw-4=*|?w(P(F47AF#o`IYea
zh$<>4LZLrzFvk0T6X+X+Mm`g7Ujc8^27^8}&C}MkCpn}U3DoHh^<Kc2fDh{?h817B
z@!6OXw4|&0q7U><i|<)_toQ5ml5Fno>dvu#afn}0a$>G8iPq#xMocvw4Q#klR=j)p
z``QWjlX|Y`tCsm?Y$48kow`25@nzTF#CmkYk?^{0s}9Qk6gwff?W#5;^yI0n#PpDa
z`M0au+lfvzTzMZ^&>OR+DKLEYZr|=7wB0qEz>d1NwswZNu3k&=i>R*;-P)G_M^$L%
zp6shTwS|>q!;awplFUl%8Cl!<xN~mx=DFgMx#F}>vz9E}z|?Fw7@mTevygV*+Km}V
zMf&GcxZA;{XD5x1+?jk&|6QABV_9xPM8?O>e=z;ovn@UUwcyK(r)9WGYeH|Ykz9B8
zoL%Tg`oC9y@8-32`^ArTd{y7uz0WUa?x?Af5qBF}4{)0={Elmph}R3en|zk7$^K&b
T(-Uh?3sXaUivDQa@^}6Vw^D2p

literal 383
zcmV-_0f7FAP)<h;3K|Lk000e1NJLTq000;O000;W1^@s6;CDUv0003-Nkl<Zc-qy~
zy-Gtt5QgDnV&_jQB3^|kcoiau76wJU0}BHI8}T5Lq!0pPA&3@w1zISA7TQ?L!Ae9F
zuRz70_%3XkVdiWI8_?qEX7}67?Aat~nkL<p{FQ(Tn!;+#fMX@#FlNB55^&Q=Kmpe{
z!wg3KNxzkVFYIFkvpB~Udh!C6#U?+>#?3&@f)y}`*ETi`c}Bk$uoYN%hbn5w0<{}j
zKnd^0f^9#aR&5atqxKDR)(pn+sGPi@+>oO3OCB&5x~6MlQ8nip)<tc(o$o*f)M5rq
z;z=yZd^==qFYZOHYwv^=u!s+1a19aSHs3L7-9?$#0yYCzFY_&_D<_xMwSWP<MEKBL
zi~Fn@EJb)KN_j(e57i}3Foj|4`G-wz{E1x*VH&5n2t9UPf37V@O29$PfU<8>i)+uy
dzxvbf*e?paUtkY>%r^i4002ovPDHLkV1nA#pzi<x

diff --git a/app/src/main/res/drawable-xhdpi/ic_home.png b/app/src/main/res/drawable-xhdpi/ic_home.png
new file mode 100644
index 0000000000000000000000000000000000000000..00ba157a427d5fdacf25c1f08748d38d829fa83e
GIT binary patch
literal 432
zcmV;h0Z;ykP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0004ZNkl<ZcwX(5
zF^U2~6huX%6-<mYG4Ko~9>Ux!2;v>Qfw8eS*wk!USa$bLz4e(D#^O)gYEO3${(=WG
z)4zTd$aJq~YL;{EP2lI95P}cE?>|F+U$hW-3chLu<oA@%6)6N=fS+3U3-WBi=Zg{o
zu9e`-n&*lTg6)*BP3(9+s}N|fguKO`eX<BaPD;2?PVARVSUv#nN~n7gj{*C)DlF`S
zPbJKwh*zKYv?44TyX$X!EW~rn`=Sa9=E~yO%z1AV!FcBM3o16UW5)ZR5)4<$qPAIa
zj)w%JjbfgP4d=N_FgPftsX1`2AYt&RnC0Tg`5NV_Z~TX1k{ik7zbjmIyPlQdQjl!=
zt&JBW7x#8;3&}X*@DrEj8y^eFI=O^jDhIm4QVQ_HPI2{DstYf-d^jUp&UaHXq!{JG
z3gpHLgz)XEn>++L%kw_c6kv}g$ysIIhZP9H3V5&rAy@$qRv-i`;K2%nU<Ew9U;&fq
aMf3;WRwP0KMgc7V0000<MNUMnLSTY^kH0qn

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/ic_import_white.png b/app/src/main/res/drawable-xhdpi/ic_import_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..f90b07ad7594e9ac654b0fd7c63b9f4538cf07e6
GIT binary patch
literal 4427
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xhdpi/ic_settings.png b/app/src/main/res/drawable-xhdpi/ic_settings.png
index 31709168d68785fdb65de7f2c439be8d1ac83e31..bda5e854555c9d00cfab623cc26b1e8c7d032800 100644
GIT binary patch
literal 4511
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
T(-Uh?3sXaUivDQa@^}6Vw^D2p

literal 677
zcmV;W0$TlvP)<h;3K|Lk000e1NJLTq001xm001xu1^@s6R|5Hm0007PNkl<Zc-rlm
zJ4*vW5P%bWf^S9C-(ZM^F9aVLEJPc{M$kfkfC#Zj)It%1XrYCbjamdl@*~7RR1oY$
z6x2pTA|gIwp^+HpVA6zmH?w=l2Cn$33$ycGc4uezY(AgQme1HM0ZTwFfpZ{jz?rH7
zO@!n#G^!}j!w~3JQDB-OFr}h^k0G$CqCkit5d2SpA>bJYb>(<o3#<bl3<2%8Yd}qo
zcrG041;>^WC;{%W2EPK_nD_+Br3HBc#(_Fu4!F*Gev3H>3(V^bo|H(O6U!?qpw;z+
ziAjo*z+Bh@`wAqVVUH`&4*V!2pykp=6|e)R3MHT6geov5InV>(0h+ObXgF{&MkQm9
zQUv;eFTnx)K$*_EDhC3Bv9+A~sB550;BEPF`WcmGyMV+!(7~-j4M3PNZORxeKm`yZ
z#y$k<MK`iSV3RP2N1%^cAjI7O3e0HcjM{}}0Rg8$%($7|Xv$!)5&?lygP7m>E|4@+
zz-S6N1O!?PV#dr6C<3+#i_I$_ut<ozg@r`88;uZ4T@*JdYVwu1NGY+ySkhSnJ&Zb?
zA;8$kLd@7v++0Zl0}_Xo0B%xxZ$2b(=pnTdBa#hQ3^yq!R+>^=u#1do^B2R^DHKt#
zoj&5MfmX#1G%5TSSygCPA%Pu{GOCrXcLkDvmFY%3I)Oh;Oj0kFTV^LN25zzfUH~&d
zH6A}7B@&P0F;Tmrn*}a&T%r}p_CkZ0r2mg=@hV`2d581{EaAS89j_NSK)Hecyxa{k
zkDqycy}q39A2=pe6zFCMbgC%O$PlPg^)u@kA^BtLL$@Vh37E$(b_9MwrgewN00000
LNkvXXu0mjfe-Ri}

diff --git a/app/src/main/res/drawable-xxhdpi/ic_home.png b/app/src/main/res/drawable-xxhdpi/ic_home.png
new file mode 100644
index 0000000000000000000000000000000000000000..35d7634bb2283707570d0b6bfd00f3e30a84e22a
GIT binary patch
literal 627
zcmeAS@N?(olHy`uVBq!ia0vp^9w5xY1|&n@Zgyv2V6yUbaSW-5dpl#V7jvLU%VIGn
zl~9l6b9;OJ7tDRadMT=7Ut^h_;{mtbCT3wPw`|@VBygoX>iG|5t2q@(n`YnHZOt4%
zdGGf*GaDzUuAQcG)y*|9NAl0kE59_-`S;XqJbqqUSEPvJUWc>Yb&rJ|3xm&@JKNpY
zSlHmbT;$oL_ohx9c4en#9GUU{dKkxUHn}-MN^j0donJjwU<32KIUg=3m0R0v7jxRs
z`{=X!9OwVyvo{|6yjhItt(D{R)al<-G+AzzADVj9?)_;m4g-x-KcjpPrSVtfi#2^L
zRu2fB^Z8#2>t^i-$2bE`w-vYkRZ*X@r}T_|SM;~ZJqdZDcdVC*_f|%v)_aTcthIKV
ze%9)DOjp7Z?s>A!r;pi`-hA)G%53er)&BA4q<dvIzB{!Xtvw#F>dVdgrH2j)A9r~*
zr=ZWP#Wnrhrx=UJHcPp<-OgRQBT=|+XK2m7$9F7G7aiR+<@36f<^zj2tCZ_pu2D^N
z_?<1lzn**A+Os>C3+d%qF~2^g_WXbFjtk8C=N9ZrimblVtSw`sajDLF9oOla1GRsI
z_+%`_XCD*%{z=hhM**MtRBpZJr!23OtlM|m^P&H`ke%C`emH+@j*s8!dFWv7z6j=R
zme0>@N<7zeC(w~mOT&Scb;SY(QIQEbj@KVlxV_OkKYMBlx7E|1mruR3`kdwpm0r-q
v6cW(D#T9_82e+U@C9CHo70;kaRqRiGg$HghU3L$cm>4`={an^LB{Ts5b3qps

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/ic_import_white.png b/app/src/main/res/drawable-xxhdpi/ic_import_white.png
new file mode 100644
index 0000000000000000000000000000000000000000..f90b07ad7594e9ac654b0fd7c63b9f4538cf07e6
GIT binary patch
literal 4427
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

literal 0
HcmV?d00001

diff --git a/app/src/main/res/drawable-xxhdpi/ic_settings.png b/app/src/main/res/drawable-xxhdpi/ic_settings.png
index 55d0279eabea549f3d2c80b017cf4f4251042874..bda5e854555c9d00cfab623cc26b1e8c7d032800 100644
GIT binary patch
literal 4511
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
T(-Uh?3sXaUivDQa@^}6Vw^D2p

delta 1010
zcmV<O0}cG2BZml(BYy+VNkl<Zc-rlpTSyi`6o7xrin5}s73r^qbQ6i_!H9y0ptm4M
zk|;u{u%LSAH7KL?*C?WU1cFcrnh@O{3$=(Yq$!d_5S7`@%1XPbWM|?0P_pj7Gjq-$
zv-9wQ=>E>x&)uDK&dwNd94BHK94o;JvVyE2E657^j|D&*(0?z;D`0LI1UV9N;_MHD
zplSs{7sDW^Q9;myFbL{W5cJt}LDLoF#F=cepydRDmY6K4kU-ETlLeI!2r3@xf`$P#
zKnHLZSQOwhqk!$eYXU)T!dQgAGtsz<fpfqIpb|*ZA!v(7&=2wZDIUk?<4N@s^AcF^
zG2U2U8}P{EGk=@81&s&Z`vm<JI1Mbs8S4gvn1NgaQt?W5ujp?+$G$;<Y=RC81pY&V
z9GS6VT!Q8RJsMA%i(kNO4nfxqkQ3)JwV>4o$%(U)N>DQJ#6UsKz;FsdyA6~RXNRhw
zDL|*ef<6KhRRo>U5ab`A0Vu~(qy)ci#Gi4Ge_U43On;z{F|aOdzoz@d5XHQun=y`F
zV5*FuRK{fQ7LX>8Vz{E}m|}6|PmsOEmICd>0afD6D4NBO0IG;%ao?`ws?K85fLg*U
zM@G)SlIn?Kx#@Rni6)B4f_2zn&zv+zy+;!zcqWww$$?~w)pZI@cZaZ%RVo>S+ih6O
z-4B`%w0}xW<>`ciG9*%f7A&~6v|Kj`2G_vQ4s8;QAx~#ddXHdm<qU!<1Y_8xQ_umy
z;7S+-#ROy6t5Z<16=ZKQtq<u&20_h3^&y=NJe8Q{ql9uYC8qgSOi@?`<tt>dF+xFQ
z3fX)fhak5GIz~`6M~SW;)h@%4pfzETfMx)<iGK>jI+QIdXC!ckD3)3*#FYfO%T?YI
zw-~A<CAo4g5y#SwEgdOAZY$s?Q<JJ*@OH~2ymAKe-LEg5=+@$Fxpre!o{>OI8S`uG
z9(*|=b&H+U)U<EH#4m<aV4kC+X@6AZ88iv_WbkXB4!?eM&{=G!!GemYUOl%MDCaS*
zmVYBj6jvE2Xa#ktam64xH5|2A7Vz5uIc{z@i>p{YB$(&uI%$zNEe>ZjKMr{3Gk7N!
zwb_`7U)3O|8n-9p04IPi2}+9;?tYNhYWcgk#CEjD@oszJIfIyIz#5P7#sCGtJ&INO
zGJ=wD-&Py`#c~3+OSTfNmwtf)g0w5#<!i{NaQW|fT?@(WRs=>02n203S<o^9LAiEA
zU5Gc-MH1|#2>q7K2rguh6?8ugf>f5#T?m7qg9?K7g+b6f%&hwa=*7%AD-43{KR2<0
gtRRaOWChXi7gbDK11BI4^#A|>07*qoM6N<$f_C`Nk^lez

diff --git a/app/src/main/res/layout-land/activity_main.xml b/app/src/main/res/layout-land/activity_main.xml
index 08a56bf..c483435 100644
--- a/app/src/main/res/layout-land/activity_main.xml
+++ b/app/src/main/res/layout-land/activity_main.xml
@@ -95,14 +95,24 @@
             </ScrollView>
         </LinearLayout>
 
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="?attr/colorPrimary"
+            android:weightSum="2"
+            app:layout_constraintBottom_toBottomOf="parent">
+
+            <androidx.appcompat.widget.ActionMenuView
+                android:id="@+id/bottom_toolbar"
+                android:layout_width="0dp"
+                android:layout_height="?attr/actionBarSize"
+                android:layout_weight="1.5"
+                android:elevation="4dp"
+                android:foregroundGravity="center"
+                android:gravity="center"
+                />
+        </LinearLayout>
+
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-    <com.google.android.material.navigation.NavigationView
-        android:id="@+id/nvView"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_gravity="start"
-        android:background="@android:color/white"
-        app:headerLayout="@layout/nav_header"
-        app:menu="@menu/nav_drawer_view" />
 </androidx.drawerlayout.widget.DrawerLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout-xlarge/activity_main.xml b/app/src/main/res/layout-xlarge/activity_main.xml
index bf2bde7..cd45fdd 100644
--- a/app/src/main/res/layout-xlarge/activity_main.xml
+++ b/app/src/main/res/layout-xlarge/activity_main.xml
@@ -94,15 +94,25 @@
 
             </ScrollView>
         </LinearLayout>
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="?attr/colorPrimary"
+            android:gravity="center"
+            android:weightSum="2"
+            app:layout_constraintBottom_toBottomOf="@+id/linearLayout">
+
+            <androidx.appcompat.widget.ActionMenuView
+                android:id="@+id/bottom_toolbar"
+                android:layout_weight="1.5"
+                android:layout_width="0dp"
+                android:layout_height="?attr/actionBarSize"
+                android:gravity="center"
+                android:elevation="4dp"
+                android:foregroundGravity="center"
+                />
+        </LinearLayout>
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-    <com.google.android.material.navigation.NavigationView
-        android:id="@+id/nvView"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_gravity="start"
-        android:background="@android:color/white"
-        app:headerLayout="@layout/nav_header"
-        app:menu="@menu/nav_drawer_view" />
 </androidx.drawerlayout.widget.DrawerLayout>
\ 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
index 6ed3db9..81e3cdf 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout/activity_main.xml
@@ -15,7 +15,7 @@
             android:id="@+id/idTable"
             android:layout_width="0dp"
             android:layout_height="200dp"
-            android:visibility="visible"
+                        android:visibility="visible"
             app:layout_constraintLeft_toLeftOf="parent"
             app:layout_constraintRight_toRightOf="parent"
             app:layout_constraintTop_toTopOf="parent" />
@@ -88,36 +88,46 @@
                 app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent" />
 
-            <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-                android:id="@+id/auxScrollView"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_weight="0.5"
-                android:fillViewport="true"
-                android:visibility="visible"
-                app:layout_constraintEnd_toEndOf="parent"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="@+id/scrollView">
+           <ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+               android:id="@+id/auxScrollView"
+               android:layout_width="match_parent"
+               android:layout_height="wrap_content"
+               android:layout_weight="0.5"
+               android:fillViewport="true"
+               android:visibility="visible"
+               app:layout_constraintEnd_toEndOf="parent"
+               app:layout_constraintStart_toStartOf="parent"
+               app:layout_constraintTop_toTopOf="@+id/scrollView">
 
-                <TextView
-                    android:id="@+id/auxValueView"
-                    style="@style/Base.TextAppearance.AppCompat.Title"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:visibility="visible" />
+               <TextView
+               android:id="@+id/auxValueView"
+               style="@style/Base.TextAppearance.AppCompat.Title"
+               android:layout_width="match_parent"
+               android:layout_height="wrap_content"
+               android:visibility="visible" />
 
-            </ScrollView>
+           </ScrollView>
         </LinearLayout>
 
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="?attr/actionBarSize"
+            android:background="?attr/colorPrimary"
+            android:gravity="center"
+            android:weightSum="2"
+            app:layout_constraintBottom_toBottomOf="@+id/linearLayout">
+
+            <androidx.appcompat.widget.ActionMenuView
+                android:id="@+id/bottom_toolbar"
+                android:layout_weight="1.5"
+                android:layout_width="0dp"
+                android:layout_height="?attr/actionBarSize"
+                android:gravity="center"
+                android:elevation="4dp"
+                android:foregroundGravity="center"
+                />
+        </LinearLayout>
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-    <com.google.android.material.navigation.NavigationView
-        android:id="@+id/nvView"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:layout_gravity="start"
-        android:background="@android:color/white"
-        app:headerLayout="@layout/nav_header"
-        app:menu="@menu/nav_drawer_view" />
 </androidx.drawerlayout.widget.DrawerLayout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/activity_main_bottom_toolbar.xml b/app/src/main/res/menu/activity_main_bottom_toolbar.xml
new file mode 100644
index 0000000..6c2fa92
--- /dev/null
+++ b/app/src/main/res/menu/activity_main_bottom_toolbar.xml
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="utf-8"?>
+<menu xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto">
+    <item
+        android:id="@+id/Home"
+        android:title="Home"
+        android:icon="@drawable/ic_home"
+        app:showAsAction="ifRoom"
+        />
+    <item
+        android:id="@+id/Compare"
+        android:title="Compare"
+        android:icon="@drawable/ic_file_compare"
+        app:showAsAction="ifRoom"
+        />
+
+    <item
+        android:id="@+id/Settings"
+        android:title="Settings"
+        android:icon="@drawable/ic_settings"
+        app:showAsAction="ifRoom"
+        />
+</menu>
\ No newline at end of file
diff --git a/app/src/main/res/menu/activity_main_toolbar.xml b/app/src/main/res/menu/activity_main_toolbar.xml
index 4d217d2..53a2b3d 100644
--- a/app/src/main/res/menu/activity_main_toolbar.xml
+++ b/app/src/main/res/menu/activity_main_toolbar.xml
@@ -1,14 +1,16 @@
 <?xml version="1.0" encoding="utf-8"?>
 <menu xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:app="http://schemas.android.com/apk/res-auto">
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    >
+    <item
+        android:id="@+id/action_import"
+        android:icon="@drawable/ic_import_white"
+        android:title="Import"
+        app:showAsAction="ifRoom" />
+
     <item
         android:id="@+id/action_camera"
         android:icon="@drawable/ic_barcode_scan"
         android:title="@string/action_camera"
         app:showAsAction="ifRoom"/>
-    <item
-        android:id="@+id/action_compare"
-        android:icon="@drawable/ic_file_compare"
-        android:title="Barcode Compare"
-        app:showAsAction="ifRoom" />
 </menu>
\ No newline at end of file
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 60d2fe0..285561f 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -36,4 +36,13 @@
         android:key="org.phenoapps.verify.TUTORIAL_MODE"
         android:summary="Always display the tutorial when Verify is opened."
         android:title="Tutorial" />
+    <Preference
+        android:icon="@drawable/ic_help"
+        android:key="org.phenoapps.verify.INTRO"
+        android:title="Intro" />
+    <Preference
+        android:icon="@drawable/ic_about"
+        android:key="org.phenoapps.verify.ABOUT"
+        android:summary=""
+        android:title="About" />
 </PreferenceScreen>
\ No newline at end of file

From 97bf7edf6d25fe39257e85cc0b1fd1f6c281f517 Mon Sep 17 00:00:00 2001
From: Siddharth Malladi <saidurm@clemson.edu>
Date: Thu, 14 Dec 2023 10:13:20 -0800
Subject: [PATCH 2/5] About was migrated. App now updated with the latest About
 info

---
 app/build.gradle                              |  5 +-
 app/src/main/AndroidManifest.xml              | 43 ++++++----
 .../org/phenoapps/verify/AboutActivity.java   | 83 +++++++++++++++++++
 .../phenoapps/verify/SettingsFragment.java    | 53 +-----------
 .../main/res/drawable/ic_person_profile.xml   | 10 +++
 app/src/main/res/values/about_styles.xml      |  3 +
 app/src/main/res/values/styles.xml            |  7 ++
 7 files changed, 135 insertions(+), 69 deletions(-)
 create mode 100644 app/src/main/java/org/phenoapps/verify/AboutActivity.java
 create mode 100644 app/src/main/res/drawable/ic_person_profile.xml
 create mode 100644 app/src/main/res/values/about_styles.xml

diff --git a/app/build.gradle b/app/build.gradle
index 4a5447f..e9899c5 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -11,7 +11,7 @@ android {
         minSdkVersion 16
         targetSdkVersion 34
         versionCode 2
-        versionName "1.1"
+        versionName "2"
         testInstrumentationRunner 'androidx.test.runner.AndroidJUnitRunner'
         multiDexEnabled = true
         vectorDrawables.useSupportLibrary = true
@@ -58,7 +58,10 @@ dependencies {
     implementation files('libs/poi-3.12-android-a.jar')
     implementation files('libs/poi-ooxml-schemas-3.12-20150511-a.jar')
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
+    implementation 'com.google.android.material:material:1.9.0'
+    implementation 'com.github.daniel-stoneuk:material-about-library:3.1.2'
 }
 repositories {
     mavenCentral()
+    maven { url 'https://jitpack.io' }
 }
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index b290ec8..444bbcc 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -12,31 +12,38 @@
         android:label="@string/app_name"
         android:supportsRtl="true"
         android:theme="@style/AppTheme">
-
         <activity
-            android:name="org.phenoapps.verify.MainActivity"
+            android:name=".AboutActivity"
+            android:theme="@style/AppTheme.MaterialAboutActivity"
+            android:exported="true" />
+        <activity
+            android:name=".MainActivity"
             android:configChanges="keyboardHidden|screenSize|keyboard"
-            android:windowSoftInputMode="adjustPan"
-            android:exported="true">
+            android:exported="true"
+            android:windowSoftInputMode="adjustPan">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
+
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
-
-        <activity android:name=".CompareActivity" android:exported="true"/>
-
         <activity
-            android:name="org.phenoapps.verify.ScanActivity"
-            android:exported="true"/>
-
-        <activity android:name="org.phenoapps.verify.LoaderDBActivity" android:exported="true"
-            android:configChanges="orientation|keyboardHidden|screenSize|keyboard"/>
-
-        <activity android:name="org.phenoapps.verify.SettingsActivity" android:exported="true"/>
-
-        <activity android:name="org.phenoapps.verify.IntroActivity" android:exported="true"
-            android:theme = "@style/AppThemeNoActionBar"/>
+            android:name=".CompareActivity"
+            android:exported="true" />
+        <activity
+            android:name=".ScanActivity"
+            android:exported="true" />
+        <activity
+            android:name=".LoaderDBActivity"
+            android:configChanges="orientation|keyboardHidden|screenSize|keyboard"
+            android:exported="true" />
+        <activity
+            android:name=".SettingsActivity"
+            android:exported="true" />
+        <activity
+            android:name=".IntroActivity"
+            android:exported="true"
+            android:theme="@style/AppThemeNoActionBar" />
     </application>
 
-</manifest>
\ No newline at end of file
+</manifest>
diff --git a/app/src/main/java/org/phenoapps/verify/AboutActivity.java b/app/src/main/java/org/phenoapps/verify/AboutActivity.java
new file mode 100644
index 0000000..6f05bba
--- /dev/null
+++ b/app/src/main/java/org/phenoapps/verify/AboutActivity.java
@@ -0,0 +1,83 @@
+package org.phenoapps.verify;
+
+import androidx.annotation.NonNull;
+import androidx.annotation.Nullable;
+import androidx.appcompat.app.AppCompatActivity;
+import androidx.swiperefreshlayout.widget.CircularProgressDrawable;
+
+import android.content.Context;
+import android.net.Uri;
+import android.os.Bundle;
+
+import com.danielstone.materialaboutlibrary.ConvenienceBuilder;
+import com.danielstone.materialaboutlibrary.MaterialAboutActivity;
+import com.danielstone.materialaboutlibrary.items.MaterialAboutActionItem;
+import com.danielstone.materialaboutlibrary.items.MaterialAboutTitleItem;
+import com.danielstone.materialaboutlibrary.model.MaterialAboutCard;
+import com.danielstone.materialaboutlibrary.model.MaterialAboutList;
+
+public class AboutActivity extends MaterialAboutActivity {
+
+
+    private CircularProgressDrawable progress;
+    private MaterialAboutActionItem updateCheckItem;
+
+
+
+
+    @NonNull
+    @Override
+    protected MaterialAboutList getMaterialAboutList(@NonNull Context context) {
+
+        MaterialAboutCard.Builder appCardBuilder = new MaterialAboutCard.Builder();
+
+        appCardBuilder.addItem(new MaterialAboutTitleItem.Builder().text("CheckList").icon(R.mipmap.ic_launcher).build());
+
+        appCardBuilder.addItem(ConvenienceBuilder.createVersionActionItem(this,
+                getResources().getDrawable(R.drawable.ic_about),
+                "Version",
+                false));
+
+        MaterialAboutCard.Builder authorCardBuilder = new MaterialAboutCard.Builder();
+        authorCardBuilder.title("Developers");
+
+        authorCardBuilder.addItem(new MaterialAboutActionItem.Builder()
+                .text(getString(R.string.dev_chaney))
+                .subText("\t\t"+getString(R.string.ksu))
+                .icon(R.drawable.ic_person_profile)
+                .build());
+        authorCardBuilder.addItem(new MaterialAboutActionItem.Builder()
+                .text(getString(R.string.dev_trevor))
+                .subText("\t\t"+getString(R.string.ksu)+"\n\t\t"+getString(R.string.dev_trevor_email))
+                .icon(R.drawable.ic_person_profile)
+                .build());
+        authorCardBuilder.addItem(new MaterialAboutActionItem.Builder()
+                .text(getString(R.string.dev_jesse))
+                .subText("\t\t"+getString(R.string.ksu)+"\n\t\t"+getString(R.string.dev_jesse_email)+
+                        "\n\t\t"+"http://wheatgenetics.org")
+                .icon(R.drawable.ic_person_profile)
+                .build());
+
+        MaterialAboutCard.Builder descriptionCard = new MaterialAboutCard.Builder();
+        descriptionCard.title("Description");
+        descriptionCard.addItem(new MaterialAboutActionItem.Builder()
+                .text("Verify is an Android application that imports a list of entries, scans barcodes, and " +
+                        "identifies whether it exists in the list of entries along with audio/visual notifications.").build());
+
+        return new MaterialAboutList(appCardBuilder.build(),authorCardBuilder.build(), descriptionCard.build());
+    }
+
+    @Nullable
+    @Override
+    protected CharSequence getActivityTitle() {
+        return "About";
+    }
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        progress = new CircularProgressDrawable(this);
+        progress.setStyle(CircularProgressDrawable.DEFAULT);
+        progress.start();
+    }
+}
\ No newline at end of file
diff --git a/app/src/main/java/org/phenoapps/verify/SettingsFragment.java b/app/src/main/java/org/phenoapps/verify/SettingsFragment.java
index 89c8970..0092384 100644
--- a/app/src/main/java/org/phenoapps/verify/SettingsFragment.java
+++ b/app/src/main/java/org/phenoapps/verify/SettingsFragment.java
@@ -20,57 +20,10 @@ private void showChangeLog() {
     }
     private void showAboutDialog(Context ctx)
     {
-        android.app.AlertDialog.Builder builder = new android.app.AlertDialog.Builder(ctx);
-        {
-            android.view.View personView = null;
-            if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.O) {
-                personView = getLayoutInflater().inflate(
-                        R.layout.about, new android.widget.LinearLayout(ctx),
-                        false);
-            }
-            {
-                assert personView != null;
-                android.widget.TextView versionTextView = (android.widget.TextView)
-                        personView.findViewById(org.phenoapps.verify.R.id.tvVersion);
-                try
-                {
-                    android.content.pm.PackageInfo packageInfo =
-                            ctx.getPackageManager().getPackageInfo(ctx.getPackageName(), 0);
-                    assert packageInfo     != null;
-                    assert versionTextView != null;
-                    versionTextView.setText(this.getResources().getString(
-                            org.phenoapps.verify.R.string.versiontitle) +
-                            ' ' + packageInfo.versionName);
-                }
-                catch (android.content.pm.PackageManager.NameNotFoundException e)
-                { e.printStackTrace(); }
-                versionTextView.setOnClickListener(new android.view.View.OnClickListener()
-                {
-                    @java.lang.Override
-                    public void onClick(android.view.View v)
-                    { showChangeLog(); }
-                });
-            }
-
-            builder.setCancelable(true);
-            builder.setTitle     (this.getResources().getString(
-                    org.phenoapps.verify.R.string.about));
-            builder.setView(personView);
+        if (android.os.Build.VERSION.SDK_INT >= android.os.Build.VERSION_CODES.M) {
+            Intent i = new Intent(getContext(), AboutActivity.class);
+            startActivity(i);
         }
-
-        builder.setNegativeButton(
-                this.getResources().getString(org.phenoapps.verify.R.string.ok),
-                new android.content.DialogInterface.OnClickListener()
-                {
-                    @java.lang.Override
-                    public void onClick(android.content.DialogInterface dialog, int which)
-                    {
-                        assert dialog != null;
-                        dialog.dismiss();
-                    }
-                });
-
-        builder.show();
     }
 
     @Override
diff --git a/app/src/main/res/drawable/ic_person_profile.xml b/app/src/main/res/drawable/ic_person_profile.xml
new file mode 100644
index 0000000..d21debf
--- /dev/null
+++ b/app/src/main/res/drawable/ic_person_profile.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="#343434"
+    android:viewportWidth="24.0"
+    android:viewportHeight="24.0">
+    <path
+        android:fillColor="#FF000000"
+        android:pathData="M12,12c2.21,0 4,-1.79 4,-4s-1.79,-4 -4,-4 -4,1.79 -4,4 1.79,4 4,4zM12,14c-2.67,0 -8,1.34 -8,4v2h16v-2c0,-2.66 -5.33,-4 -8,-4z" />
+</vector>
\ No newline at end of file
diff --git a/app/src/main/res/values/about_styles.xml b/app/src/main/res/values/about_styles.xml
new file mode 100644
index 0000000..55344e5
--- /dev/null
+++ b/app/src/main/res/values/about_styles.xml
@@ -0,0 +1,3 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+</resources>
\ No newline at end of file
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index dfd0a57..855819f 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -15,4 +15,11 @@
         <item name="colorAccent">@color/colorAccent</item>
     </style>
 
+    <style name="AppTheme.MaterialAboutActivity" parent="Theme.MaterialComponents.DayNight.DarkActionBar">
+        <item name="colorPrimary">@color/colorPrimary</item>
+        <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
+    </style>
+
+
+
 </resources>

From 156fb4f77b13a0eb9c0643bbb4fa8ec38f555ae0 Mon Sep 17 00:00:00 2001
From: SidMalladi <siddumalladi1234@gmail.com>
Date: Mon, 12 Feb 2024 15:05:07 -0500
Subject: [PATCH 3/5] bottom-nav-bar added to all screens

---
 .../org/phenoapps/verify/CompareActivity.kt   |  2 ++
 .../phenoapps/verify/LoaderDBActivity.java    | 24 ++++++++++++++++
 .../org/phenoapps/verify/MainActivity.java    |  5 ++--
 .../phenoapps/verify/SettingsActivity.java    |  4 +--
 app/src/main/res/menu/nav_drawer_view.xml     | 28 -------------------
 app/src/main/res/xml/preferences.xml          | 11 ++------
 6 files changed, 33 insertions(+), 41 deletions(-)
 delete mode 100644 app/src/main/res/menu/nav_drawer_view.xml

diff --git a/app/src/main/java/org/phenoapps/verify/CompareActivity.kt b/app/src/main/java/org/phenoapps/verify/CompareActivity.kt
index 1a066d8..30c1d8d 100644
--- a/app/src/main/java/org/phenoapps/verify/CompareActivity.kt
+++ b/app/src/main/java/org/phenoapps/verify/CompareActivity.kt
@@ -192,6 +192,8 @@ class CompareActivity : AppCompatActivity() {
         barcodeScannerView.pause()
     }
 
+
+
     override fun onKeyDown(keyCode: Int, event: KeyEvent): Boolean {
 
         return barcodeScannerView.onKeyDown(keyCode, event) || super.onKeyDown(keyCode, event)
diff --git a/app/src/main/java/org/phenoapps/verify/LoaderDBActivity.java b/app/src/main/java/org/phenoapps/verify/LoaderDBActivity.java
index 249f417..6b7b01b 100644
--- a/app/src/main/java/org/phenoapps/verify/LoaderDBActivity.java
+++ b/app/src/main/java/org/phenoapps/verify/LoaderDBActivity.java
@@ -6,9 +6,13 @@
 import android.database.sqlite.SQLiteException;
 import android.net.Uri;
 import android.os.Bundle;
+
+import androidx.appcompat.widget.ActionMenuView;
 import androidx.core.app.ActivityCompat;
 import androidx.appcompat.app.AppCompatActivity;
 import android.util.Log;
+import android.view.Menu;
+import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 import android.widget.AbsListView;
@@ -514,6 +518,26 @@ protected void onSaveInstanceState(Bundle outState) {
         if (mFileUri != null)
             outState.putString(VerifyConstants.CSV_URI, mFileUri.toString());
     }
+    @Override
+    final public boolean onCreateOptionsMenu(Menu m) {
+
+        final MenuInflater inflater = getMenuInflater();
+        inflater.inflate(org.phenoapps.verify.R.menu.activity_main_toolbar, m);
+
+        ActionMenuView bottomToolBar = (ActionMenuView) findViewById(R.id.bottom_toolbar);
+        Menu bottomMenu = bottomToolBar.getMenu();
+        inflater.inflate(R.menu.activity_main_bottom_toolbar, bottomMenu);
+
+        for (int i = 0; i < bottomMenu.size(); i++) {
+            bottomMenu.getItem(i).setOnMenuItemClickListener(new MenuItem.OnMenuItemClickListener() {
+                @Override
+                public boolean onMenuItemClick(MenuItem item) {
+                    return onOptionsItemSelected(item);
+                }
+            });
+        }
+        return true;
+    }
 
     @Override
     public boolean onOptionsItemSelected(MenuItem item) {
diff --git a/app/src/main/java/org/phenoapps/verify/MainActivity.java b/app/src/main/java/org/phenoapps/verify/MainActivity.java
index f98a6e9..35088dd 100644
--- a/app/src/main/java/org/phenoapps/verify/MainActivity.java
+++ b/app/src/main/java/org/phenoapps/verify/MainActivity.java
@@ -445,10 +445,9 @@ private synchronized void exertModeFunction(@NonNull String id) {
         final SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd hh:mm:ss", Locale.getDefault());
 
         if (sqlUpdateUserAndDate != null) { //no db yet
-            String firstName = sharedPref.getString(SettingsActivity.FIRST_NAME, "");
-            String lastName = sharedPref.getString(SettingsActivity.LAST_NAME, "");
+            String name = sharedPref.getString(SettingsActivity.NAME, "");
             sqlUpdateUserAndDate.bindAllArgsAsStrings(new String[]{
-                    firstName + " " + lastName,
+                    name,
                     sdf.format(c.getTime()),
                     id
             });
diff --git a/app/src/main/java/org/phenoapps/verify/SettingsActivity.java b/app/src/main/java/org/phenoapps/verify/SettingsActivity.java
index f12ff6e..d35764d 100644
--- a/app/src/main/java/org/phenoapps/verify/SettingsActivity.java
+++ b/app/src/main/java/org/phenoapps/verify/SettingsActivity.java
@@ -15,8 +15,8 @@ public class SettingsActivity extends AppCompatActivity {
     public static String SCAN_MODE_LIST = "org.phenoapps.verify.SCAN_MODE";
     public static String AUDIO_ENABLED = "org.phenoapps.verify.AUDIO_ENABLED";
     public static String TUTORIAL_MODE = "org.phenoapps.verify.TUTORIAL_MODE";
-    public static String FIRST_NAME = "org.phenoapps.verify.FIRST_NAME";
-    public static String LAST_NAME = "org.phenoapps.verify.LAST_NAME";
+    public static String NAME = "org.phenoapps.verify.NAME";
+
     public static String LIST_KEY_NAME = "org.phenoapps.verify.LIST_KEY_NAME";
     public static String PAIR_NAME = "org.phenoapps.verify.PAIR_NAME";
     public static String DISABLE_PAIR = "org.phenoapps.verify.DISABLE_PAIR";
diff --git a/app/src/main/res/menu/nav_drawer_view.xml b/app/src/main/res/menu/nav_drawer_view.xml
deleted file mode 100644
index 0ace8bc..0000000
--- a/app/src/main/res/menu/nav_drawer_view.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:id="@+id/nav_import"
-        android:icon="@drawable/ic_import"
-        android:title="Import" />
-
-    <item
-        android:id="@+id/nav_settings"
-        android:icon="@drawable/ic_settings"
-        android:title="@string/title_activity_preference" />
-
-    <item
-        android:id="@+id/nav_export"
-        android:icon="@drawable/ic_export"
-        android:title="Export" />
-
-    <item
-        android:id="@+id/nav_about"
-        android:icon="@drawable/ic_about"
-        android:title="About" />
-
-    <item
-        android:id="@+id/nav_intro"
-        android:icon="@drawable/ic_help"
-        android:title="Intro" />
-
-</menu>
\ No newline at end of file
diff --git a/app/src/main/res/xml/preferences.xml b/app/src/main/res/xml/preferences.xml
index 285561f..9fb29ae 100644
--- a/app/src/main/res/xml/preferences.xml
+++ b/app/src/main/res/xml/preferences.xml
@@ -10,14 +10,9 @@
         android:title="@string/prefs_mode" />
     <EditTextPreference
         android:icon="@drawable/ic_about"
-        android:key="org.phenoapps.verify.FIRST_NAME"
-        android:summary="First name of person scanning items"
-        android:title="First Name" />
-    <EditTextPreference
-        android:icon="@drawable/ic_about"
-        android:key="org.phenoapps.verify.LAST_NAME"
-        android:summary="Last name of person scanning items"
-        android:title="Last Name" />
+        android:key="org.phenoapps.verify.NAME"
+        android:summary="Name of person scanning items"
+        android:title="Name" />
     <CheckBoxPreference
         android:defaultValue="true"
         android:icon="@drawable/ic_audio"

From 020f76efc6eca920e5bcebbce67d5c5067b50aca Mon Sep 17 00:00:00 2001
From: SidMalladi <siddumalladi1234@gmail.com>
Date: Mon, 12 Feb 2024 15:59:06 -0500
Subject: [PATCH 4/5] converted hardcoded strings into Androids string
 resources

---
 .../org/phenoapps/verify/LoaderDBActivity.java   | 12 ++++++------
 .../java/org/phenoapps/verify/MainActivity.java  | 14 +++++++-------
 app/src/main/res/values/strings.xml              | 16 ++++++++++++++++
 3 files changed, 29 insertions(+), 13 deletions(-)

diff --git a/app/src/main/java/org/phenoapps/verify/LoaderDBActivity.java b/app/src/main/java/org/phenoapps/verify/LoaderDBActivity.java
index 6b7b01b..e505963 100644
--- a/app/src/main/java/org/phenoapps/verify/LoaderDBActivity.java
+++ b/app/src/main/java/org/phenoapps/verify/LoaderDBActivity.java
@@ -99,8 +99,8 @@ protected void onCreate(Bundle savedInstanceState) {
 
         mFileUri = getIntent().getData();
 
-        if (mFileUri == null ){
-            Toast.makeText(this, "There was a problem reading this file", Toast.LENGTH_LONG).show();
+        if (mFileUri == null ) {
+            Toast.makeText(this, getString(R.string.problem_reading_file), Toast.LENGTH_LONG).show();
             return;
         }
 
@@ -113,7 +113,7 @@ protected void onCreate(Bundle savedInstanceState) {
 
         //if unsupported file type, start delimiter tutorial
         if (mDelimiter == null || mHeader == null) {
-            Toast.makeText(this, "There was a problem reading this file.", Toast.LENGTH_LONG).show();
+            Toast.makeText(this, getString(R.string.problem_reading_file_general), Toast.LENGTH_LONG).show();
             finish();
            /* if (mHeader == null) {
                 tutorialText.setText("Error reading file.");
@@ -139,7 +139,7 @@ private void parseHeaders(Uri data) {
             int lastDot = mFilePath.lastIndexOf("."); // changed from mFileUri to mFilePath due to the files in download folder have URI without extension
 
             if (lastDot == -1) {
-                Toast.makeText(this, "Imported file must have an extension. (e.g: .csv, .tsv)", Toast.LENGTH_LONG).show();
+                Toast.makeText(this, getString(R.string.must_have_extension), Toast.LENGTH_LONG).show();
                 finish();
             }
 
@@ -493,7 +493,7 @@ private void displayHeaderList() {
 
         if (mHeader == null) {
             headerList.setAdapter(new ArrayAdapter<String>(this, org.phenoapps.verify.R.layout.row));
-            tutorialText.setText("Error reading file.");
+            tutorialText.setText(getString(R.string.error_reading_file));
             return;
         }
 
@@ -507,7 +507,7 @@ private void displayHeaderList() {
             headerList.setAdapter(idAdapter);
         } else {
             headerList.setAdapter(new ArrayAdapter<String>(this, org.phenoapps.verify.R.layout.row));
-            tutorialText.setText("Error reading file.");
+            tutorialText.setText(getString(R.string.error_reading_file));
         }
     }
 
diff --git a/app/src/main/java/org/phenoapps/verify/MainActivity.java b/app/src/main/java/org/phenoapps/verify/MainActivity.java
index 35088dd..c63ede2 100644
--- a/app/src/main/java/org/phenoapps/verify/MainActivity.java
+++ b/app/src/main/java/org/phenoapps/verify/MainActivity.java
@@ -345,7 +345,7 @@ private Boolean checkIdExists(String id) {
     private synchronized void insertNoteIntoDb(@NonNull final String id) {
 
         AlertDialog.Builder builder = new AlertDialog.Builder(this);
-        builder.setTitle("Enter a note for the given item.");
+        builder.setTitle(getString(R.string.enter_note));
         final EditText input = new EditText(this);
         input.setInputType(InputType.TYPE_CLASS_TEXT);
         builder.setView(input);
@@ -543,7 +543,7 @@ private void loadBarcodes() {
     private synchronized void askUserExportFileName() {
 
         AlertDialog.Builder builder = new AlertDialog.Builder(this);
-        builder.setTitle("Choose name for exported file.");
+        builder.setTitle(getString(R.string.choose_export_file_name));
         final EditText input = new EditText(this);
 
         final Calendar c = Calendar.getInstance();
@@ -838,7 +838,7 @@ final public boolean onOptionsItemSelected(MenuItem item) {
 
 
             AlertDialog.Builder builder = new AlertDialog.Builder(this);
-            builder.setTitle("Select files from?");
+            builder.setTitle(getString(R.string.select_files_from));
             builder.setPositiveButton("Storage",
                     new DialogInterface.OnClickListener()
                     {
@@ -855,7 +855,7 @@ public void onClick(DialogInterface dialog, int id)
                         }
                     });
 
-            builder.setNegativeButton("Verify Directory",
+            builder.setNegativeButton(getString(R.string.verify_directory),
                     new DialogInterface.OnClickListener()
                     {
                         public void onClick(DialogInterface dialog, int id)
@@ -998,9 +998,9 @@ private void clearListView() {
     private void showPairDialog() {
 
         AlertDialog.Builder builder = new AlertDialog.Builder(this);
-        builder.setTitle("Pair column selected, would you like to switch to Pair mode?");
+        builder.setTitle(getString(R.string.pair_mode_prompt));
 
-        builder.setPositiveButton("Yes", new DialogInterface.OnClickListener() {
+        builder.setPositiveButton(getString(R.string.yes), new DialogInterface.OnClickListener() {
             @Override
             public void onClick(DialogInterface dialog, int which) {
 
@@ -1011,7 +1011,7 @@ public void onClick(DialogInterface dialog, int which) {
             }
         });
 
-        builder.setNegativeButton("No thanks", new DialogInterface.OnClickListener() {
+        builder.setNegativeButton(getString(R.string.no_thanks), new DialogInterface.OnClickListener() {
             @Override
             public void onClick(DialogInterface dialogInterface, int i) {
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index bd1c624..9c41b90 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -6,6 +6,22 @@
     <string name="drawer_open">Open</string>
     <string name="drawer_close">Close</string>
     <string name="action_camera">Barcode Scanner</string>
+    <string name="enter_note">Enter a note for the given item.</string>
+    <string name="choose_export_file_name">Choose name for exported file.</string>
+    <string name="select_files_from">Select files from?</string>
+    <string name="storage">Storage</string>
+    <string name="verify_directory">Verify Directory</string>
+    <string name="pair_mode_prompt">Pair column selected, would you like to switch to Pair mode?</string>
+    <string name="yes">Yes</string>
+    <string name="no_thanks">No thanks</string>
+    <string name="problem_reading_file">There was a problem reading this file</string>
+    <string name="must_have_extension">Imported file must have an extension. (e.g: .csv, .tsv)</string>
+    <string name="problem_reading_file_general">There was a problem reading this file.</string>
+    <string name="error_reading_file">Error reading file.</string>
+    <string name="enter_note_title">Enter a note for the given item.</string>
+    <string name="save">Save</string>
+
+
 
     <!-- Import Strings -->
     <string name="choose_separator_tutorial">Input a separator character.\nThis character should separate the headers and columns in the uploaded file.\nThen press Done.</string>

From 158244c7e3281ac90ba2f091a136f0d872abb6f3 Mon Sep 17 00:00:00 2001
From: Siddharth Malladi <saidurm@clemson.edu>
Date: Sun, 3 Mar 2024 18:50:33 -0800
Subject: [PATCH 5/5] updated hardcoded_strings for MainActivity

---
 .../org/phenoapps/verify/CompareActivity.kt   |  4 +-
 .../org/phenoapps/verify/IntroActivity.java   | 20 ++++++--
 .../phenoapps/verify/LoaderDBActivity.java    | 47 ++++++++++-------
 .../phenoapps/verify/SettingsFragment.java    |  2 +-
 app/src/main/res/values/colors.xml            |  5 +-
 app/src/main/res/values/strings.xml           | 50 ++++++++++++++++++-
 6 files changed, 103 insertions(+), 25 deletions(-)

diff --git a/app/src/main/java/org/phenoapps/verify/CompareActivity.kt b/app/src/main/java/org/phenoapps/verify/CompareActivity.kt
index 30c1d8d..219f5e8 100644
--- a/app/src/main/java/org/phenoapps/verify/CompareActivity.kt
+++ b/app/src/main/java/org/phenoapps/verify/CompareActivity.kt
@@ -76,7 +76,7 @@ class CompareActivity : AppCompatActivity() {
 
             setView(view)
 
-            setTitle("Choose compare mode:")
+            setTitle(getString(R.string.compare_activity_title))
 
             setPositiveButton("OK") { _, _ ->
                 when (radioGroup.checkedRadioButtonId) {
@@ -145,7 +145,7 @@ class CompareActivity : AppCompatActivity() {
         barcodeScannerView.decodeContinuous(callback)
 
         if (supportActionBar != null) {
-            supportActionBar?.title = "Compare Barcodes"
+            title = getString(R.string.compare_barcodes)
             supportActionBar?.themedContext
             supportActionBar?.setDisplayHomeAsUpEnabled(true)
             supportActionBar?.setHomeButtonEnabled(true)
diff --git a/app/src/main/java/org/phenoapps/verify/IntroActivity.java b/app/src/main/java/org/phenoapps/verify/IntroActivity.java
index e2be2a5..612caab 100644
--- a/app/src/main/java/org/phenoapps/verify/IntroActivity.java
+++ b/app/src/main/java/org/phenoapps/verify/IntroActivity.java
@@ -18,9 +18,23 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         showStatusBar(false);
 
         // Add slides
-        addSlide(AppIntroFragment.newInstance(getString(org.phenoapps.verify.R.string.intro_title_1), getString(org.phenoapps.verify.R.string.intro_body_1), org.phenoapps.verify.R.drawable.intro_launcher, Color.parseColor("#A84937")));
-        addSlide(AppIntroFragment.newInstance(getString(org.phenoapps.verify.R.string.intro_title_2), getString(org.phenoapps.verify.R.string.intro_body_2), org.phenoapps.verify.R.drawable.intro_folder, Color.parseColor("#285E3D")));
-        addSlide(AppIntroFragment.newInstance(getString(org.phenoapps.verify.R.string.intro_title_3), getString(org.phenoapps.verify.R.string.intro_body_3), org.phenoapps.verify.R.drawable.intro_list, Color.parseColor("#0C6291")));
+        addSlide(AppIntroFragment.newInstance(
+                getString(R.string.intro_title_1),
+                getString(R.string.intro_body_1),
+                R.drawable.intro_launcher,
+                getResources().getColor(R.color.intro_slide_color_1)));
+
+        addSlide(AppIntroFragment.newInstance(
+                getString(R.string.intro_title_2),
+                getString(R.string.intro_body_2),
+                R.drawable.intro_folder,
+                getResources().getColor(R.color.intro_slide_color_2)));
+
+        addSlide(AppIntroFragment.newInstance(
+                getString(R.string.intro_title_3),
+                getString(R.string.intro_body_3),
+                R.drawable.intro_list,
+                getResources().getColor(R.color.intro_slide_color_3)));
 
         // Hide Skip/Done button.
         showSkipButton(false);
diff --git a/app/src/main/java/org/phenoapps/verify/LoaderDBActivity.java b/app/src/main/java/org/phenoapps/verify/LoaderDBActivity.java
index e505963..4256957 100644
--- a/app/src/main/java/org/phenoapps/verify/LoaderDBActivity.java
+++ b/app/src/main/java/org/phenoapps/verify/LoaderDBActivity.java
@@ -67,6 +67,19 @@ public class LoaderDBActivity extends AppCompatActivity {
     private HashSet<String> mDefaultCols;
 
     private IdEntryDbHelper mDbHelper;
+    final String fileExtXlsx = getString(R.string.file_extension_xlsx);
+    final String fileExtXls = getString(R.string.file_extension_xls);
+    final String fileExtCsv = getString(R.string.file_extension_csv);
+    final String fileExtTsv = getString(R.string.file_extension_tsv);
+    final String fileExtTxt = getString(R.string.file_extension_txt);
+    final String tableName = getString(R.string.db_table_verify);
+    final String createTableCommand = getString(R.string.db_create_table_verify);
+    final String colDate = getString(R.string.db_column_date);
+    final String colUser = getString(R.string.db_column_user);
+    final String colNote = getString(R.string.db_column_note);
+    final String colScanCount = getString(R.string.db_column_scan_count);
+    final String colColor = getString(R.string.db_column_color);
+    final String rowErrorLog = getString(R.string.row_error_log);
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
@@ -90,10 +103,10 @@ protected void onCreate(Bundle savedInstanceState) {
         //default column names
         mDefaultCols = new HashSet<>(5);
         mDefaultCols.add("date");
-        mDefaultCols.add("color");
-        mDefaultCols.add("scan_count");
-        mDefaultCols.add("user");
-        mDefaultCols.add("note");
+        mDefaultCols.add(getString(R.string.col_color));
+        mDefaultCols.add(getString(R.string.col_scan_count));
+        mDefaultCols.add(getString(R.string.col_user));
+        mDefaultCols.add(getString(R.string.col_note));
 
         initializeUI();
 
@@ -150,7 +163,7 @@ private void parseHeaders(Uri data) {
             //xls library support
             if (mCurrentWorkbook != null) mCurrentWorkbook.close();
 
-            if (mFileExtension.equals("xlsx") || mFileExtension.equals("xls")) {
+            if (mFileExtension.equals(fileExtXlsx) || mFileExtension.equals(fileExtXls)) {
                 mCurrentWorkbook = WorkbookFactory.create(new File(mFilePath));
 
                 final int numSheets = mCurrentWorkbook.getNumberOfSheets();
@@ -170,9 +183,9 @@ private void parseHeaders(Uri data) {
                 }
             } else {
                 //plain text file support
-                if (mFileExtension.equals("csv")) { //files ending in .csv
+                if (mFileExtension.equals(fileExtCsv)) { //files ending in .csv
                     mDelimiter = ",";
-                } else if (mFileExtension.equals("tsv") || mFileExtension.equals("txt")) { //files ending in .txt
+                } else if (mFileExtension.equals(fileExtTsv) || mFileExtension.equals(fileExtTxt)) { //files ending in .txt
                     mDelimiter = "\t";
                 } else
                     mDelimiter = null; //non-supported file type, display header for user to choose delimiter
@@ -302,11 +315,11 @@ private synchronized void insertColumns() {
 
         final SQLiteDatabase db = mDbHelper.getWritableDatabase();
 
-        db.execSQL("DROP TABLE IF EXISTS VERIFY");
+        db.execSQL("DROP TABLE IF EXISTS " + tableName);
 
         final StringBuilder dbExecCreate = new StringBuilder(32);
 
-        dbExecCreate.append("CREATE TABLE VERIFY(");
+        dbExecCreate.append(createTableCommand);
         dbExecCreate.append(mIdHeader);
         dbExecCreate.append(" TEXT PRIMARY KEY");
 
@@ -315,11 +328,11 @@ private synchronized void insertColumns() {
             dbExecCreate.append(mPairCol);
             dbExecCreate.append(" TEXT");
         }
-        dbExecCreate.append(", date DATE");
-        dbExecCreate.append(", user TEXT");
-        dbExecCreate.append(", note TEXT");
-        dbExecCreate.append(", scan_count INT DEFAULT 0");
-        dbExecCreate.append(", color INT");
+        dbExecCreate.append(", ").append(colDate);
+        dbExecCreate.append(", ").append(colUser);
+        dbExecCreate.append(", ").append(colNote);
+        dbExecCreate.append(", ").append(colScanCount);
+        dbExecCreate.append(", ").append(colColor);
 
         final String[] cols = displayCols.toArray(new String[] {});
         final int colSize = cols.length;
@@ -340,9 +353,9 @@ private synchronized void insertColumns() {
         }
         db.close();
 
-        if (mFileExtension.equals("xls")) {
+        if (mFileExtension.equals(getString(R.string.file_extension_xls))) {
             parseAndInsertXLS();
-        } else if (mFileExtension.equals("xlsx")) {
+        } else if (mFileExtension.equals(getString(R.string.file_extension_xlsx))) {
             parseAndInsertXLS();
         } else {
             parseAndInsertCSV();
@@ -379,7 +392,7 @@ private void parseAndInsertCSV() {
                             }
                             long newRowId = db.insert("VERIFY", null, entry);
                             entry.clear();
-                        } else Log.d("ROW ERROR", temp);
+                        } else Log.d(getString(R.string.log_row_error), temp);
                     }
                     db.setTransactionSuccessful();
                     db.endTransaction();
diff --git a/app/src/main/java/org/phenoapps/verify/SettingsFragment.java b/app/src/main/java/org/phenoapps/verify/SettingsFragment.java
index 0092384..7565b1e 100644
--- a/app/src/main/java/org/phenoapps/verify/SettingsFragment.java
+++ b/app/src/main/java/org/phenoapps/verify/SettingsFragment.java
@@ -71,7 +71,7 @@ public boolean onPreferenceChange(Preference preference, Object o) {
                         sharedPrefs.getBoolean(SettingsActivity.DISABLE_PAIR, false)) {
                     ((ListPreference) preference).setValue("0");
                     Toast.makeText(getActivity(),
-                            "Pair mode cannot be used without setting a pair ID.",
+                            getString(R.string.choose_pair_button_tutorial),
                             Toast.LENGTH_SHORT).show();
                     return false;
                 }
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index 767e79d..0cc85e1 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -2,5 +2,8 @@
 <resources>
     <color name="colorPrimary">#E4624C</color>
     <color name="colorPrimaryDark">#A84937</color>
-    <color name="colorAccent">#EEC657</color>
+    <color name="colorAccent">#EEC657</color>\
+    <color name="intro_slide_color_1">#A84937</color>
+    <color name="intro_slide_color_2">#285E3D</color>
+    <color name="intro_slide_color_3">#0C6291</color>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 9c41b90..a02de0a 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -21,7 +21,9 @@
     <string name="enter_note_title">Enter a note for the given item.</string>
     <string name="save">Save</string>
 
-
+    <!--Compare Strings-->
+    <string name = "compare_barcodes">Compare Barcodes</string>
+    <string name="compare_activity_title">Choose compare mode:</string>
 
     <!-- Import Strings -->
     <string name="choose_separator_tutorial">Input a separator character.\nThis character should separate the headers and columns in the uploaded file.\nThen press Done.</string>
@@ -31,6 +33,7 @@
     <string name="choose_pair_button_tutorial">Choose your pair ID column.</string>
     <string name="columns_tutorial">Choose display columns.</string>
 
+
     <!-- Settings Strings -->
     <string name="prefs_mode">Scan Mode</string>
     <string name="prefs_audio">Audio</string>
@@ -40,12 +43,57 @@
     <string name="color_mode">Color - Paint scanned items</string>
     <string name="match_mode">Order - Verify order of items</string>
     <string name="pair_mode">Pair - Track pairings of items</string>
+    <string name="pair_mode_setting_requirement">Pair mode cannot be used without setting a pair ID</string>
+
+    <!--    LoaderDBActivity-->
+    <string name="col_color">color</string>
+    <string name="col_scan_count">scan_count</string>
+    <string name="col_user">user</string>
+    <string name="col_note">note</string>
+    <string name="file_extension_xlsx">xlsx</string>
+    <string name="file_extension_xls">xls</string>
+    <string name="file_extension_csv">csv</string>
+    <string name="file_extension_tsv">tsv</string>
+    <string name="file_extension_txt">txt</string>
+    <string name="db_table_name">VERIFY</string>
+    <string name="db_create_table">CREATE TABLE VERIFY(</string>
+    <string name="db_table_verify">VERIFY</string>
+    <string name="db_create_table_verify">CREATE TABLE VERIFY(</string>
+    <string name="db_column_date">date DATE</string>
+    <string name="db_column_user">user TEXT</string>
+    <string name="db_column_note">note TEXT</string>
+    <string name="db_column_scan_count">scan_count INT DEFAULT 0</string>
+    <string name="db_column_color">color INT</string>
+    <string name="row_error_log">ROW ERROR</string>
+    <string name="table_name_verify">VERIFY</string>
+    <string name="log_row_error">ROW ERROR</string>
+    <!--URIHandler-->
+    <!-- getDocumentCacheDir -->
+    <string name="directory_documents">documents</string>
+
+    <!-- getLocalPath -->
+    <string name="authority_external_storage">com.android.externalstorage.documents</string>
+    <string name="document_type_primary">primary</string>
+    <string name="authority_media_documents">com.android.providers.media.documents</string>
+    <string name="authority_google_docs_storage">com.google.android.apps.docs.storage</string>
+    <string name="authority_microsoft_skydrive">com.microsoft.skydrive.content.StorageAccessProvider</string>
+    <string name="authority_downloads_documents">com.android.providers.downloads.documents</string>
+    <string name="raw_prefix">raw:</string>
+    <string name="content_uri_downloads_public">content://downloads/public_downloads</string>
+    <string name="content_uri_downloads_my">content://downloads/my_downloads</string>
+    <string name="content_uri_downloads_all">content://downloads/all_downloads</string>
+    <string name="uri_scheme_file">file</string>
+    <string name="authority_estrongs_files">com.estrongs.files</string>
+
+    <!-- getDataColumn -->
+    <string name="column_data">_data</string>
 
     <!-- Intro Strings -->
     <string name="intro_title_1">Welcome to Verify!</string>
     <string name="intro_title_2">Import a File</string>
     <string name="intro_title_3">Many modes</string>
 
+
     <string name="intro_body_1">Verify lets you import a list of entries to visualize details or manipulate your list.</string>
     <string name="intro_body_2">After you give Verify permission to access files, open the navigation drawer, choose import, select your file, and choose the column that matches your external barcodes.</string>
     <string name="intro_body_3">Once a list has been imported, entries can be scanned to A) show accompanying data, B) paint scanned entries, C) remove scanned entries, or D) ensure the scanned order matches the imported order.</string>