Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Improved QRCode design #3743

Merged
merged 41 commits into from
May 13, 2020
Merged
Changes from 1 commit
Commits
Show all changes
41 commits
Select commit Hold shift + click to select a range
5444269
moved some functions to qrcode tabs
Mar 4, 2020
dba05b0
added scan button in toolbar
Mar 4, 2020
80ea5f9
Added embedded scan (WIP)
Mar 5, 2020
a7c571c
scan ulitity
Mar 5, 2020
3c9c995
added permission request
Mar 6, 2020
5116c3b
scanner works
hypercubestart Mar 6, 2020
4684371
beep sound and flashlight for embedded qr camera
hypercubestart Mar 8, 2020
8904e1d
add files from merge commit
hypercubestart Mar 14, 2020
3bcdf63
moved import qrcode item to overflow for QRCodeTabs
hypercubestart Mar 14, 2020
b04c7ca
qr_code redesign
hypercubestart Mar 24, 2020
0b22c75
minor fixes
hypercubestart Mar 24, 2020
bcd27b9
hook menu item with new QRCodeTabs and fix qrcode generation
hypercubestart Mar 24, 2020
092365a
removed unused
hypercubestart Mar 24, 2020
647138a
change test name
hypercubestart Mar 25, 2020
f43aa17
fix NPE bug
hypercubestart Mar 29, 2020
5b8ecba
add analytics and minor issues
hypercubestart Mar 29, 2020
2eec648
update to viewpager2
hypercubestart Mar 31, 2020
01f9cb2
styling
hypercubestart Mar 31, 2020
d7d548a
review
hypercubestart Apr 4, 2020
f16c57e
address review comments
hypercubestart Apr 5, 2020
817ee55
update flash button to be materialbutton
hypercubestart Apr 5, 2020
9718beb
refactor into preferences.qr
hypercubestart Apr 8, 2020
cb0adfa
QrCodeFragmentAction test
pedrop30 Apr 14, 2020
29356d7
fixed test
hypercubestart Apr 15, 2020
9f3a5d5
ShowQRFragmentAction test
pedrop30 Apr 15, 2020
f341ca3
QRCodeTabsActivityPage
hypercubestart Apr 15, 2020
9658e21
fix bug share qr code doesnt work if qr code not generated yet
hypercubestart Apr 15, 2020
8c5a962
fix tests
hypercubestart Apr 28, 2020
a544327
remove copyright
hypercubestart Apr 28, 2020
6a4b27e
fix tests
hypercubestart May 6, 2020
d2c4bf0
style
hypercubestart May 6, 2020
4959cba
update qrcodeutilstest
hypercubestart May 6, 2020
4005fe2
comments
hypercubestart May 6, 2020
644f357
rule fixing
hypercubestart May 8, 2020
ee35d8a
merge
hypercubestart May 8, 2020
9fb6b6d
fix RuleChain
hypercubestart May 8, 2020
ee53a50
fix
hypercubestart May 8, 2020
b267f65
remove @rule
hypercubestart May 9, 2020
65e9dff
dark color qr code tabs
hypercubestart May 11, 2020
1810f6c
continuous qr code + handle import qrcode
hypercubestart May 11, 2020
5318fc1
fix typo
hypercubestart May 12, 2020
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
merge
  • Loading branch information
hypercubestart committed May 8, 2020
commit ee35d8a4efe3aade182667d480fcda3ec5a71bf4
Original file line number Diff line number Diff line change
@@ -22,7 +22,6 @@
import org.odk.collect.android.formentry.ODKView;
import org.odk.collect.android.formentry.saving.SaveFormProgressDialogFragment;
import org.odk.collect.android.fragments.DataManagerList;
import org.odk.collect.android.fragments.ShowQRCodeFragment;
import org.odk.collect.android.geo.GoogleMapFragment;
import org.odk.collect.android.geo.MapboxMapFragment;
import org.odk.collect.android.geo.OsmDroidMapFragment;
Original file line number Diff line number Diff line change
@@ -274,4 +274,9 @@ public NetworkStateProvider providesConnectivityProvider() {
public QRCodeGenerator providesQRCodeGenerator() {
return new ObservableQRCodeGenerator();
}

@Provides
public VersionInformation providesVersionInformation() {
return new VersionInformation(() -> BuildConfig.VERSION_NAME);
}
}
Original file line number Diff line number Diff line change
@@ -15,6 +15,7 @@
import android.app.Activity;
import android.app.AlertDialog;
import android.content.Context;
import android.app.Fragment;
import android.content.Intent;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
@@ -30,7 +31,6 @@

import androidx.annotation.Nullable;
import androidx.appcompat.widget.AppCompatCheckedTextView;
import androidx.fragment.app.Fragment;

import com.google.zxing.ChecksumException;
import com.google.zxing.FormatException;
You are viewing a condensed version of this merge commit. You can view the full changes here.