Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
I
InstiApp
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Analytics
Analytics
Repository
Value Stream
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Commits
Open sidebar
RAHUL SHARMA
InstiApp
Commits
c6381041
Commit
c6381041
authored
Jul 20, 2019
by
Varun Patil
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
Add QR code button to navbar
parent
28256995
Changes
3
Show whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
56 additions
and
7 deletions
+56
-7
app/src/main/java/app/insti/fragment/WebViewFragment.java
app/src/main/java/app/insti/fragment/WebViewFragment.java
+33
-7
app/src/main/res/drawable/ic_qr_code.xml
app/src/main/res/drawable/ic_qr_code.xml
+12
-0
app/src/main/res/menu/qr_scan_menu.xml
app/src/main/res/menu/qr_scan_menu.xml
+11
-0
No files found.
app/src/main/java/app/insti/fragment/WebViewFragment.java
View file @
c6381041
...
...
@@ -6,7 +6,11 @@ import android.content.Intent;
import
android.net.Uri
;
import
android.os.Build
;
import
android.os.Bundle
;
import
android.text.TextUtils
;
import
android.view.LayoutInflater
;
import
android.view.Menu
;
import
android.view.MenuInflater
;
import
android.view.MenuItem
;
import
android.view.MotionEvent
;
import
android.view.View
;
import
android.view.ViewGroup
;
...
...
@@ -19,6 +23,7 @@ import android.webkit.WebView;
import
android.webkit.WebViewClient
;
import
android.widget.Toast
;
import
androidx.appcompat.widget.SearchView
;
import
androidx.appcompat.widget.Toolbar
;
import
androidx.fragment.app.FragmentManager
;
import
androidx.fragment.app.FragmentTransaction
;
...
...
@@ -28,6 +33,7 @@ import com.google.gson.Gson;
import
app.insti.Constants
;
import
app.insti.R
;
import
app.insti.Utils
;
import
app.insti.activity.MainActivity
;
import
app.insti.api.EmptyCallback
;
import
app.insti.api.RetrofitInterface
;
import
app.insti.api.model.Body
;
...
...
@@ -53,13 +59,6 @@ public class WebViewFragment extends BaseFragment {
return
this
;
}
private
void
setTitle
(
String
title
)
{
Toolbar
toolbar
=
getActivity
().
findViewById
(
R
.
id
.
toolbar
);
if
(
toolbar
!=
null
)
{
toolbar
.
setTitle
(
title
);
}
}
private
String
chooseUrl
(
Bundle
args
)
{
setTitle
(
"InstiApp"
);
...
...
@@ -93,11 +92,13 @@ public class WebViewFragment extends BaseFragment {
break
;
case
Constants
.
WV_TYPE_ACHIEVEMENTS
:
initQRButton
();
url
+=
"/achievements"
;
setTitle
(
"Achievements"
);
break
;
case
Constants
.
WV_TYPE_NEW_OFFERED_ACHIEVEMENT
:
initQRButton
();
url
+=
"/achievement-new/"
+
ID
;
setTitle
(
"Achievements"
);
break
;
...
...
@@ -182,6 +183,31 @@ public class WebViewFragment extends BaseFragment {
return
view
;
}
private
void
setTitle
(
String
title
)
{
Toolbar
toolbar
=
getActivity
().
findViewById
(
R
.
id
.
toolbar
);
if
(
toolbar
!=
null
)
{
toolbar
.
setTitle
(
title
);
}
}
private
void
initQRButton
()
{
setHasOptionsMenu
(
true
);
}
@Override
public
void
onCreateOptionsMenu
(
Menu
menu
,
MenuInflater
inflater
)
{
inflater
.
inflate
(
R
.
menu
.
qr_scan_menu
,
menu
);
MenuItem
item
=
menu
.
findItem
(
R
.
id
.
action_qr_scan
);
item
.
setOnMenuItemClickListener
(
new
MenuItem
.
OnMenuItemClickListener
()
{
@Override
public
boolean
onMenuItemClick
(
MenuItem
menuItem
)
{
Toast
.
makeText
(
getContext
(),
"Scan QRs to get achievements!"
,
Toast
.
LENGTH_LONG
).
show
();
return
false
;
}
});
}
private
void
openEvent
(
Event
event
)
{
Utils
.
eventCache
.
updateCache
(
event
);
String
eventJson
=
new
Gson
().
toJson
(
event
);
...
...
app/src/main/res/drawable/ic_qr_code.xml
0 → 100644
View file @
c6381041
<vector
android:height=
"24dp"
android:viewportHeight=
"401.994"
android:viewportWidth=
"401.994"
android:width=
"24dp"
xmlns:android=
"http://schemas.android.com/apk/res/android"
>
<path
android:fillColor=
"#FFFFFFFF"
android:pathData=
"M0,401.991h182.724V219.265H0V401.991zM36.542,255.813h109.636v109.352H36.542V255.813z"
/>
<path
android:fillColor=
"#FFFFFFFF"
android:pathData=
"M73.089,292.355h36.544v36.549h-36.544z"
/>
<path
android:fillColor=
"#FFFFFFFF"
android:pathData=
"M292.352,365.449h36.553v36.545h-36.553z"
/>
<path
android:fillColor=
"#FFFFFFFF"
android:pathData=
"M365.442,365.449h36.552v36.545h-36.552z"
/>
<path
android:fillColor=
"#FFFFFFFF"
android:pathData=
"M365.446,255.813l-36.542,0l0,-36.548l-109.639,0l0,182.726l36.548,0l0,-109.636l36.539,0l0,36.549l109.639,0l0,-109.639l0,0l-36.545,0z"
/>
<path
android:fillColor=
"#FFFFFFFF"
android:pathData=
"M0,182.728h182.724V0H0V182.728zM36.542,36.542h109.636v109.636H36.542V36.542z"
/>
<path
android:fillColor=
"#FFFFFFFF"
android:pathData=
"M73.089,73.089h36.544v36.547h-36.544z"
/>
<path
android:fillColor=
"#FFFFFFFF"
android:pathData=
"M219.265,0v182.728h182.729V0H219.265zM365.446,146.178H255.813V36.542h109.633V146.178z"
/>
<path
android:fillColor=
"#FFFFFFFF"
android:pathData=
"M292.352,73.089h36.553v36.547h-36.553z"
/>
</vector>
app/src/main/res/menu/qr_scan_menu.xml
0 → 100644
View file @
c6381041
<?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/action_qr_scan"
android:icon=
"@drawable/ic_qr_code"
android:iconTint=
"@color/colorWhite"
android:title=
"Scan QR"
app:showAsAction=
"always"
/>
</menu>
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment