Skip to content

Commit 061b341

Browse files
JaspreetRFSinghJaspreetRFSingh
committed
29th October: 1. Modify Purchase Order Activity added.
2. Permission check and Internet connection check added inside Main activity
1 parent cc503ed commit 061b341

File tree

6 files changed

+1038
-0
lines changed

6 files changed

+1038
-0
lines changed

‎app/src/main/java/com/jstech/fluenterp/MainActivity.java

+73
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,21 @@
11
package com.jstech.fluenterp;
22

3+
import android.Manifest;
4+
import android.content.Context;
35
import android.content.DialogInterface;
46
import android.content.Intent;
7+
import android.content.pm.PackageManager;
8+
import android.net.ConnectivityManager;
9+
import android.net.NetworkInfo;
510
import android.net.Uri;
611
import android.os.Build;
712
import android.os.Bundle;
813
import android.os.Handler;
914
import android.support.annotation.NonNull;
1015
import android.support.annotation.RequiresApi;
1116
import android.support.design.widget.Snackbar;
17+
import android.support.v4.app.ActivityCompat;
18+
import android.support.v4.content.ContextCompat;
1219
import android.support.v7.app.AlertDialog;
1320
import android.support.v7.widget.GridLayoutManager;
1421
import android.support.v7.widget.RecyclerView;
@@ -117,6 +124,19 @@ public void onWindowFocusChanged(boolean hasFocus) {
117124
expandableList.setIndicatorBoundsRelative(expandableList.getRight()- 80, expandableList.getWidth());
118125
}
119126

127+
boolean isConnection(){
128+
boolean connected;
129+
ConnectivityManager connectivityManager = (ConnectivityManager)getSystemService(Context.CONNECTIVITY_SERVICE);
130+
if(connectivityManager.getNetworkInfo(ConnectivityManager.TYPE_MOBILE).getState() == NetworkInfo.State.CONNECTED ||
131+
connectivityManager.getNetworkInfo(ConnectivityManager.TYPE_WIFI).getState() == NetworkInfo.State.CONNECTED) {
132+
connected = true;
133+
}
134+
else {
135+
connected = false;
136+
}
137+
return connected;
138+
}
139+
120140
@Override
121141
protected void onCreate(Bundle savedInstanceState) {
122142
super.onCreate(savedInstanceState);
@@ -131,6 +151,53 @@ protected void onCreate(Bundle savedInstanceState) {
131151
mDrawer = findViewById(R.id.drawer_layout);
132152
mDrawer.setTouchMode(ElasticDrawer.TOUCH_MODE_BEZEL);
133153
setupToolbar();
154+
155+
if (ContextCompat.checkSelfPermission(MainActivity.this,
156+
android.Manifest.permission.ACCESS_NETWORK_STATE)
157+
!= PackageManager.PERMISSION_GRANTED) {
158+
159+
// Permission is not granted
160+
if (!ActivityCompat.shouldShowRequestPermissionRationale(MainActivity.this,
161+
Manifest.permission.ACCESS_NETWORK_STATE)) {
162+
163+
// No explanation needed; request the permission
164+
ActivityCompat.requestPermissions(MainActivity.this,
165+
new String[]{Manifest.permission.ACCESS_NETWORK_STATE},
166+
101);
167+
}
168+
}
169+
170+
171+
if (ContextCompat.checkSelfPermission(MainActivity.this,
172+
android.Manifest.permission.READ_EXTERNAL_STORAGE)
173+
!= PackageManager.PERMISSION_GRANTED) {
174+
175+
// Permission is not granted
176+
if (!ActivityCompat.shouldShowRequestPermissionRationale(MainActivity.this,
177+
Manifest.permission.READ_EXTERNAL_STORAGE)) {
178+
179+
// No explanation needed; request the permission
180+
ActivityCompat.requestPermissions(MainActivity.this,
181+
new String[]{Manifest.permission.READ_EXTERNAL_STORAGE},
182+
101);
183+
}
184+
}
185+
186+
if (ContextCompat.checkSelfPermission(MainActivity.this,
187+
android.Manifest.permission.WRITE_EXTERNAL_STORAGE)
188+
!= PackageManager.PERMISSION_GRANTED) {
189+
190+
// Permission is not granted
191+
if (!ActivityCompat.shouldShowRequestPermissionRationale(MainActivity.this,
192+
Manifest.permission.WRITE_EXTERNAL_STORAGE)) {
193+
194+
// No explanation needed; request the permission
195+
ActivityCompat.requestPermissions(MainActivity.this,
196+
new String[]{Manifest.permission.WRITE_EXTERNAL_STORAGE},
197+
101);
198+
}
199+
}
200+
134201
//Activity
135202
initMainContent();
136203
strTCode = "";
@@ -171,6 +238,10 @@ public void onClick(View v) {
171238
mMenuAdapter = new ExpandableListAdapter(this, listDataHeader, listDataChild);
172239
// setting list adapter
173240
expandableList.setAdapter(mMenuAdapter);
241+
if(!isConnection()){
242+
Snackbar.make( findViewById(R.id.content), "It seems you are not connected to the network!", Snackbar.LENGTH_LONG).show();
243+
244+
}
174245
expandableList.setOnChildClickListener(new ExpandableListView.OnChildClickListener() {
175246
@Override
176247
public boolean onChildClick(ExpandableListView expandableListView,
@@ -682,8 +753,10 @@ public void onClick(DialogInterface dialog, int which) {
682753
Objects.requireNonNull(dialog.getWindow()).getAttributes().windowAnimations = R.style.DialogThemeModified;
683754
dialog.show();
684755
Button bNeg = dialog.getButton(DialogInterface.BUTTON_NEGATIVE);
756+
//noinspection deprecation
685757
bNeg.setTextColor(getResources().getColor(R.color.splashback));
686758
Button bPos = dialog.getButton(DialogInterface.BUTTON_POSITIVE);
759+
//noinspection deprecation
687760
bPos.setTextColor(getResources().getColor(R.color.splashback));
688761
break;
689762
}

‎app/src/main/java/com/jstech/fluenterp/SplashActivity.java

+9
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,8 @@
44
import android.provider.SyncStateContract;
55
import android.support.v7.app.AppCompatActivity;
66
import android.os.Bundle;
7+
import android.view.Window;
8+
import android.view.WindowManager;
79

810
import com.daimajia.androidanimations.library.Techniques;
911
import com.viksaa.sssplash.lib.activity.AwesomeSplash;
@@ -14,6 +16,13 @@ public class SplashActivity extends AwesomeSplash {
1416

1517
@Override
1618
public void initSplash(ConfigSplash configSplash) {
19+
20+
Window window = this.getWindow();
21+
window.addFlags(WindowManager.LayoutParams.FLAG_DRAWS_SYSTEM_BAR_BACKGROUNDS);
22+
window.clearFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS);
23+
//noinspection deprecation
24+
window.setStatusBarColor(this.getResources().getColor(R.color.status_bar_colour));
25+
1726
//Customize Circular Reveal
1827
configSplash.setBackgroundColor(R.color.splashback); //any color you want form colors.xml
1928
configSplash.setAnimCircularRevealDuration(1500); //int ms

‎app/src/main/java/com/jstech/fluenterp/purchasing/ActivityPurchaseOrderCreate.java

+4
Original file line numberDiff line numberDiff line change
@@ -371,6 +371,10 @@ public void onDismiss(DialogInterface dialog) {
371371
AlertDialog dialog = builder.create();
372372
Objects.requireNonNull(dialog.getWindow()).getAttributes().windowAnimations = R.style.DialogThemeModified;
373373
dialog.show();
374+
Button bNeg = dialog.getButton(DialogInterface.BUTTON_NEGATIVE);
375+
bNeg.setTextColor(getResources().getColor(R.color.splashback));
376+
Button bPos = dialog.getButton(DialogInterface.BUTTON_POSITIVE);
377+
bPos.setTextColor(getResources().getColor(R.color.splashback));
374378

375379
}
376380

0 commit comments

Comments
 (0)