diff --git a/apk/MyVehicles.apk b/apk/MyVehicles.apk index a13f33a..dbd835d 100644 Binary files a/apk/MyVehicles.apk and b/apk/MyVehicles.apk differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 2ee0c18..a457ad6 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -9,10 +9,18 @@ android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" android:theme="@style/AppTheme"> + + + android:theme="@style/AppTheme.NoActionBar" /> vehicles; + Vehicle vehicle; + + TextView label; + TextView history; + Button add; + + @Override + protected void onCreate(Bundle savedInstanceState) { + super.onCreate(savedInstanceState); + setContentView(R.layout.activity_insurances_inspections_taxes_revisions); + + label = findViewById(R.id.label); + history = findViewById(R.id.history); + add = findViewById(R.id.addInsuranceInspectionTaxRevision); + + StringBuilder insurancesInspectionsTaxesRevisions = new StringBuilder(); + VehicleManager vehicleManager = new VehicleManager(); + Bundle extras = getIntent().getExtras(); + String registration = extras.getString("registration"); //vehicle registration + int vehicleType = extras.getInt("vehicleType"); + int type = extras.getInt("type"); + vehicles = vehicleManager.loadVehicles(getApplicationContext(),vehicleType); + for(int i=0;i insurances + startActivity(intent); + } + + public void onInspections(View view) { + Intent intent = new Intent(VehicleDetails.this,InsurancesInspectionsTaxesRevisions.class); + intent.putExtra("vehicleType",type); + intent.putExtra("registration",registration_value); + intent.putExtra("type",2); //2 -> inspections + startActivity(intent); + } + + public void onTaxes(View view) { + Intent intent = new Intent(VehicleDetails.this,InsurancesInspectionsTaxesRevisions.class); + intent.putExtra("vehicleType",type); + intent.putExtra("registration",registration_value); + intent.putExtra("type",3); //3 -> taxes + startActivity(intent); + } + + public void onRevisions(View view) { + Intent intent = new Intent(VehicleDetails.this,InsurancesInspectionsTaxesRevisions.class); + intent.putExtra("vehicleType",type); + intent.putExtra("registration",registration_value); + intent.putExtra("type",4); //4 -> revisions + startActivity(intent); + } } diff --git a/app/src/main/res/layout/activity_add_insurance_inspection_tax_revision.xml b/app/src/main/res/layout/activity_add_insurance_inspection_tax_revision.xml new file mode 100644 index 0000000..f4b74a4 --- /dev/null +++ b/app/src/main/res/layout/activity_add_insurance_inspection_tax_revision.xml @@ -0,0 +1,11 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/activity_insurances_inspections_taxes_revisions.xml b/app/src/main/res/layout/activity_insurances_inspections_taxes_revisions.xml new file mode 100644 index 0000000..8ddf870 --- /dev/null +++ b/app/src/main/res/layout/activity_insurances_inspections_taxes_revisions.xml @@ -0,0 +1,47 @@ + + + + + + + +