Skip to content

Commit

Permalink
*Bugs Fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
PrinceSumberia committed Feb 24, 2019
1 parent 725eef0 commit 3247a5e
Show file tree
Hide file tree
Showing 58 changed files with 648 additions and 133 deletions.
19 changes: 9 additions & 10 deletions app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@ android {
targetSdkVersion 28
versionCode 1
versionName "1.0"
testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
}
buildTypes {
release {
Expand All @@ -36,8 +36,8 @@ android {
dependencies {
implementation fileTree(include: ['*.jar'], dir: 'libs')
// Support libraries
implementation 'com.android.support:appcompat-v7:28.0.0'
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
implementation 'androidx.appcompat:appcompat:1.0.0-beta01'
implementation 'androidx.constraintlayout:constraintlayout:1.1.2'
// TensorFlow
implementation 'org.tensorflow:tensorflow-android:+'
implementation 'com.google.android.gms:play-services-vision:17.0.2'
Expand All @@ -48,7 +48,7 @@ dependencies {
implementation 'ai.api:libai:1.6.12'
implementation 'com.android.volley:volley:1.1.1'
// Test Dependencies
implementation 'com.android.support:support-annotations:28.0.0'
implementation 'androidx.annotation:annotation:1.0.0-beta01'
testImplementation 'junit:junit:4.12'
implementation 'com.google.firebase:firebase-storage:16.0.5'
implementation 'com.google.firebase:firebase-auth:16.1.0'
Expand All @@ -60,16 +60,15 @@ dependencies {
implementation "com.firebaseui:firebase-ui-firestore:3.0.0"
implementation 'com.github.kenglxn.QRGen:android:2.2.0'
implementation 'com.itextpdf:itextg:5.5.10'
implementation 'com.android.support:design:28.0.0'
implementation 'com.android.support:support-v4:28.0.0'
implementation 'com.google.android.material:material:1.0.0-beta01'
implementation 'androidx.legacy:legacy-support-v4:1.0.0-beta01'
implementation 'com.jjoe64:graphview:4.2.2'
implementation 'com.android.support:recyclerview-v7:28.0.0'
implementation 'androidx.recyclerview:recyclerview:1.0.0-beta01'
implementation 'com.google.firebase:firebase-dynamic-links:16.1.7'
implementation 'com.opencsv:opencsv:4.4'
implementation 'com.google.android.material:material:1.0.0'



androidTestImplementation('com.android.support.test.espresso:espresso-core:3.0.1', {
androidTestImplementation('androidx.test.espresso:espresso-core:3.1.0-alpha4', {
exclude group: 'com.android.support', module: 'support-annotations'
})
implementation files('src/main/libs/activation.jar')
Expand Down
Original file line number Diff line number Diff line change
@@ -1,13 +1,14 @@
package com.prince.assetManagement;

import android.content.Context;
import android.support.test.InstrumentationRegistry;
import android.support.test.runner.AndroidJUnit4;

import org.junit.Test;
import org.junit.runner.RunWith;

import static org.junit.Assert.*;
import androidx.test.InstrumentationRegistry;
import androidx.test.runner.AndroidJUnit4;

import static org.junit.Assert.assertEquals;

/**
* Instrumented test, which will execute on an Android device.
Expand All @@ -17,7 +18,7 @@
@RunWith(AndroidJUnit4.class)
public class ExampleInstrumentedTest {
@Test
public void useAppContext() throws Exception {
public void useAppContext() {
// Context of the app under test.
Context appContext = InstrumentationRegistry.getTargetContext();

Expand Down
6 changes: 4 additions & 2 deletions app/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,9 @@
android:roundIcon="@mipmap/ic_launcher_custom"
android:supportsRtl="true"
android:theme="@style/AppTheme.NoActionBar">
<activity android:name=".AdminAssetRequest"></activity>
<activity android:name=".DeleteAssetInfo"></activity>
<activity android:name=".DeleteAssets" />
<activity android:name=".AdminAssetRequest" />
<activity android:name=".ApproverAssetRequest">
<intent-filter>
<action android:name="android.intent.action.VIEW" />
Expand All @@ -42,7 +44,7 @@
<activity android:name=".Approver" />

<provider
android:name="android.support.v4.content.FileProvider"
android:name="androidx.core.content.FileProvider"
android:authorities="${applicationId}.provider"
android:exported="false"
android:grantUriPermissions="true">
Expand Down
5 changes: 3 additions & 2 deletions app/src/main/java/com/prince/assetManagement/AddUsers.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,6 @@

import android.os.Bundle;
import android.os.Environment;
import android.support.annotation.NonNull;
import android.support.v7.app.AppCompatActivity;
import android.util.Log;
import android.view.View;
import android.widget.AdapterView;
Expand Down Expand Up @@ -34,6 +32,9 @@
import java.util.List;
import java.util.Map;

import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatActivity;

public class AddUsers extends AppCompatActivity implements AdapterView.OnItemSelectedListener {
Spinner spinner;
Button createUser, bulk_register;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,11 +1,6 @@
package com.prince.assetManagement;

import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.DividerItemDecoration;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.util.Log;

import com.google.android.gms.tasks.OnCompleteListener;
Expand All @@ -17,6 +12,12 @@
import java.util.ArrayList;
import java.util.Map;

import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatActivity;
import androidx.recyclerview.widget.DividerItemDecoration;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;

import static android.widget.GridLayout.VERTICAL;

public class AdminAssetRequest extends AppCompatActivity {
Expand Down
3 changes: 2 additions & 1 deletion app/src/main/java/com/prince/assetManagement/Approver.java
Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,15 @@

import android.content.Intent;
import android.os.Bundle;
import android.support.v7.app.AppCompatActivity;
import android.view.View;
import android.widget.Button;
import android.widget.TextView;
import android.widget.Toast;

import com.google.firebase.auth.FirebaseAuth;

import androidx.appcompat.app.AppCompatActivity;

public class Approver extends AppCompatActivity {

Button scanAsset, approveRequest;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,6 @@
import android.content.Intent;
import android.net.Uri;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.v7.app.AppCompatActivity;
import android.support.v7.widget.DividerItemDecoration;
import android.support.v7.widget.LinearLayoutManager;
import android.support.v7.widget.RecyclerView;
import android.util.Log;

import com.google.android.gms.tasks.OnCompleteListener;
Expand All @@ -20,6 +15,12 @@
import java.util.ArrayList;
import java.util.Map;

import androidx.annotation.NonNull;
import androidx.appcompat.app.AppCompatActivity;
import androidx.recyclerview.widget.DividerItemDecoration;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;

import static android.widget.GridLayout.VERTICAL;

public class ApproverAssetRequest extends AppCompatActivity {
Expand Down
34 changes: 34 additions & 0 deletions app/src/main/java/com/prince/assetManagement/DeleteAssetInfo.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,34 @@
package com.prince.assetManagement;

import android.os.Bundle;
import android.widget.Toast;

import androidx.fragment.app.Fragment;
import androidx.fragment.app.FragmentActivity;
import androidx.fragment.app.FragmentManager;
import androidx.fragment.app.FragmentTransaction;

public class DeleteAssetInfo extends FragmentActivity {

@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_delete_asset_info);
String selected_item = getIntent().getStringExtra("Selected Item");
Toast.makeText(this, "Selected Item is: " + selected_item, Toast.LENGTH_SHORT).show();

if (selected_item.equals("By Year")) {
FragmentManager fragmentManager = getSupportFragmentManager();
FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
Fragment fragment = new DeleteFragmentDepartment();
fragmentTransaction.replace(R.id.fragment_area, fragment);
fragmentTransaction.commit();
} else if (selected_item.equals("By Asset Type")) {
FragmentManager fragmentManager = getSupportFragmentManager();
FragmentTransaction fragmentTransaction = fragmentManager.beginTransaction();
Fragment fragment = new DeleteFragmentAssetType();
fragmentTransaction.replace(R.id.fragment_area, fragment);
fragmentTransaction.commit();
}
}
}
41 changes: 41 additions & 0 deletions app/src/main/java/com/prince/assetManagement/DeleteAssets.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,41 @@
package com.prince.assetManagement;

import android.content.Intent;
import android.os.Bundle;
import android.util.Log;
import android.view.View;
import android.widget.AdapterView;
import android.widget.ArrayAdapter;
import android.widget.ListView;
import android.widget.Toast;

import androidx.appcompat.app.AppCompatActivity;

public class DeleteAssets extends AppCompatActivity {
private static final String TAG = "DeleteAssets";
String items[] = {"By Asset Type", "By Year"};

@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
setContentView(R.layout.activity_delete_assets);

ArrayAdapter<String> itemsAdapter = new ArrayAdapter<String>(this, android.R.layout.simple_list_item_1, items);
ListView listView = findViewById(R.id.list_item);

listView.setAdapter(itemsAdapter);
listView.setOnItemClickListener(new AdapterView.OnItemClickListener() {
@Override
public void onItemClick(AdapterView<?> adapterView, View view, int position, long l) {
String selectedItem = (String) adapterView.getItemAtPosition(position);
Intent intent = new Intent(DeleteAssets.this, DeleteAssetInfo.class);
intent.putExtra("Selected Item", selectedItem);
startActivity(intent);

Toast.makeText(DeleteAssets.this, "Selected Item is: " + selectedItem, Toast.LENGTH_SHORT).show();
Log.e(TAG, "Selected Item is: " + selectedItem);
// Toast.makeText(GetAssetInfo.this, "Selected Item position is: " + position, Toast.LENGTH_SHORT).show();
}
});
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,101 @@
package com.prince.assetManagement;

import android.os.Bundle;
import android.util.Log;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;
import android.widget.Button;
import android.widget.EditText;
import android.widget.TextView;

import com.google.android.gms.tasks.OnCompleteListener;
import com.google.android.gms.tasks.Task;
import com.google.firebase.auth.FirebaseAuth;
import com.google.firebase.firestore.DocumentSnapshot;
import com.google.firebase.firestore.FirebaseFirestore;
import com.google.firebase.firestore.QuerySnapshot;

import java.util.ArrayList;

import androidx.annotation.NonNull;
import androidx.fragment.app.Fragment;


public class DeleteFragmentAssetType extends Fragment {
private static final String TAG = "DeleteFragmentAssetType";
Button get_info;
EditText editText;
TextView textView;
FirebaseFirestore db = FirebaseFirestore.getInstance();
String user_id = FirebaseAuth.getInstance().getCurrentUser().getUid();

@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
// Inflate the layout for this fragment
View view = inflater.inflate(R.layout.fragment_delete_fragment_asset_type, container, false);
get_info = view.findViewById(R.id.get_info);
editText = view.findViewById(R.id.asset_type);
textView = view.findViewById(R.id.result);

get_info.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
final String asset_type = editText.getText().toString();
final ArrayList<String> list = new ArrayList<>();
final ArrayList<String> new_list = new ArrayList<>();
db.collection("users")
.document(user_id)
.collection(asset_type)
.get()
.addOnCompleteListener(new OnCompleteListener<QuerySnapshot>() {
@Override
public void onComplete(@NonNull Task<QuerySnapshot> task) {
if (task.isSuccessful()) {
int number_assets = task.getResult().size();
String str_assets = String.valueOf(number_assets);
String result = "Number of such assets: " + str_assets;
// textView.setText(result);
Log.e(TAG, "onComplete: total assets is " + result);
for (DocumentSnapshot documentSnapshot : task.getResult()) {
documentSnapshot.getReference().delete();
// Log.e(TAG, "onComplete: querysnapshot is " + task.getResult().size() );
// Log.e(TAG, "onComplete: querysnapshot is " + task.getResult().getDocuments().toString() );
// Log.e(TAG, "onComplete: querysnapshot is " + task.getResult().getMetadata() );
// Log.e(TAG, "onComplete: Query snapshot " + querySnapshot.getData().toString() );
// Log.e(TAG, "onComplete: Query snapshot " + querySnapshot.getData().get("department") );
// list.add(querySnapshot.getData().get("department").toString());
}
// Set<String> unique = new HashSet<>(list);
// for (String key : unique) {
//// String unique_result = (key + ": " + Collections.frequency(list, key));
// String unique_result = (key + ": " + Collections.frequency(list, key));
// new_list.add(unique_result);
// }
// for (final String dep : unique) {
// Log.e(TAG, "onComplete: dep is" + dep);
// Log.e(TAG, "onComplete: Inner loop is getting executed");
// db.collection("users").document(user_id)
// .collection(asset_type)
// .whereEqualTo("department", dep).get()
// .addOnCompleteListener(new OnCompleteListener<QuerySnapshot>() {
// @Override
// public void onComplete(@NonNull Task<QuerySnapshot> task) {
// if (task.isSuccessful()){
// QuerySnapshot querySnapshot = task.getResult();
// }
// }
// });
// }
} else {
Log.e(TAG, "onComplete: Task is unsuccessful " + task.getException().toString());
}
}
});
}
});

return view;
}
}
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
package com.prince.assetManagement;

import android.os.Bundle;
import android.view.LayoutInflater;
import android.view.View;
import android.view.ViewGroup;

import androidx.fragment.app.Fragment;


public class DeleteFragmentDate extends Fragment {

@Override
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
// Inflate the layout for this fragment
View view = inflater.inflate(R.layout.fragment_delete_fragment_date, container, false);
return view;
}
}
Loading

0 comments on commit 3247a5e

Please sign in to comment.