Skip to content
This repository was archived by the owner on May 13, 2022. It is now read-only.

Commit 9475d0f

Browse files
ftlnoftlno
authored
Merge pull request #18 from digipost/innkalling
Innkalling
2 parents 373a872 + c6e6df9 commit 9475d0f

26 files changed

+726
-45
lines changed

‎Digipost/build.gradle

+2-2
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ apply plugin: 'com.android.application'
33

44
android {
55
defaultConfig {
6-
versionCode 61
7-
versionName '3.3.2'
6+
versionCode 62
7+
versionName '3.3.3'
88
applicationId = "no.digipost.android"
99
minSdkVersion 16
1010
targetSdkVersion 25

‎Digipost/src/main/AndroidManifest.xml

+2
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@
2424
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
2525
<uses-permission android:name="com.google.android.c2dm.permission.RECEIVE"/>
2626
<uses-permission android:name="android.permission.WAKE_LOCK"/>
27+
<uses-permission android:name="android.permission.READ_CALENDAR" />
28+
<uses-permission android:name="android.permission.WRITE_CALENDAR" />
2729

2830
<application
2931
android:name=".DigipostApplication"

‎Digipost/src/main/java/no/digipost/android/gui/adapters/DocumentAdapter.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@
3030
import no.digipost.android.R;
3131
import no.digipost.android.constants.ApiConstants;
3232
import no.digipost.android.model.Document;
33-
import no.digipost.android.utilities.DataFormatUtilities;
33+
import no.digipost.android.utilities.FormatUtilities;
3434

3535
import java.text.ParseException;
3636
import java.text.SimpleDateFormat;
@@ -187,7 +187,7 @@ public DocumentViewHolder(View view){
187187
public void bindDocument(Document document, int position){
188188
title.setText(document.getSubject());
189189
subTitle.setText(getSubTitleText(document));
190-
metaTop.setText(DataFormatUtilities.getFormattedDate(document.getCreated()));
190+
metaTop.setText(FormatUtilities.getFormattedDate(document.getCreated()));
191191

192192
if (!document.isRead()) {
193193
itemView.setBackgroundResource(R.drawable.content_list_item_unread);

‎Digipost/src/main/java/no/digipost/android/gui/adapters/ReceiptAdapter.java

+4-4
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@
2626
import android.widget.TextView;
2727
import no.digipost.android.R;
2828
import no.digipost.android.model.Receipt;
29-
import no.digipost.android.utilities.DataFormatUtilities;
29+
import no.digipost.android.utilities.FormatUtilities;
3030

3131
import java.util.ArrayList;
3232

@@ -145,10 +145,10 @@ public ReceiptViewHolder(View view){
145145

146146
public void bindReceipt(Receipt receipt, int position){
147147
title.setText(receipt.getStoreName());
148-
subTitle.setText(DataFormatUtilities.getFormattedAmount(receipt.getAmount()) + " "
149-
+ DataFormatUtilities.getFormattedCurrency(receipt.getCurrency()));
148+
subTitle.setText(FormatUtilities.getFormattedAmount(receipt.getAmount()) + " "
149+
+ FormatUtilities.getFormattedCurrency(receipt.getCurrency()));
150150
subTitle.setTextColor(context.getResources().getColor(R.color.green));
151-
metaTop.setText(DataFormatUtilities.getFormattedDate(receipt.getTimeOfPurchase()));
151+
metaTop.setText(FormatUtilities.getFormattedDate(receipt.getTimeOfPurchase()));
152152

153153
boolean selected = isSelected(position);
154154
checkbox.setChecked(selected);

‎Digipost/src/main/java/no/digipost/android/gui/content/DisplayContentActivity.java

+38-8
Original file line numberDiff line numberDiff line change
@@ -16,31 +16,25 @@
1616

1717
package no.digipost.android.gui.content;
1818

19-
import android.app.ActionBar;
2019
import android.app.Activity;
2120
import android.app.AlertDialog;
2221
import android.app.ProgressDialog;
2322
import android.content.ActivityNotFoundException;
2423
import android.content.Context;
2524
import android.content.DialogInterface;
2625
import android.content.Intent;
27-
import android.net.Uri;
2826
import android.os.AsyncTask;
2927
import android.os.Build;
3028
import android.os.Bundle;
3129
import android.support.v7.app.AppCompatActivity;
32-
import android.support.v7.widget.Toolbar;
3330
import android.text.Html;
3431
import android.text.Spanned;
3532
import android.util.Log;
3633
import android.view.Gravity;
3734
import android.view.LayoutInflater;
3835
import android.view.MenuItem;
3936
import android.view.View;
40-
import android.widget.AdapterView;
41-
import android.widget.Button;
42-
import android.widget.LinearLayout;
43-
import android.widget.ListView;
37+
import android.widget.*;
4438
import com.google.android.gms.analytics.GoogleAnalytics;
4539
import no.digipost.android.DigipostApplication;
4640
import no.digipost.android.R;
@@ -58,6 +52,7 @@
5852
import no.digipost.android.gui.fragments.DocumentFragment;
5953
import no.digipost.android.gui.invoice.InvoiceBankAgreements;
6054
import no.digipost.android.gui.invoice.InvoiceOptionsActivity;
55+
import no.digipost.android.gui.metadata.AppointmentView;
6156
import no.digipost.android.model.*;
6257
import no.digipost.android.utilities.*;
6358

@@ -75,6 +70,7 @@ public abstract class DisplayContentActivity extends AppCompatActivity {
7570
private FolderArrayAdapter folderAdapter;
7671
private String location;
7772
private String folderId;
73+
private GridLayout gridLayout;
7874

7975
@Override
8076
protected void onCreate(Bundle savedInstanceState) {
@@ -88,6 +84,7 @@ protected void onCreate(Bundle savedInstanceState) {
8884
finish();
8985
}
9086
}
87+
9188
}
9289

9390
@Override
@@ -102,6 +99,39 @@ protected void onStop() {
10299
GoogleAnalytics.getInstance(this).reportActivityStop(this);
103100
}
104101

102+
protected void setupMetadataView() {
103+
if(content_type != ApplicationConstants.RECEIPTS) {
104+
showMetadata();
105+
}
106+
}
107+
108+
private void showMetadata() {
109+
Attachment attachment = DocumentContentStore.getDocumentAttachment();
110+
if (DocumentContentStore.getDocumentAttachment() != null) {
111+
ArrayList<Metadata> metadataList = attachment.getMetadata();
112+
for (Metadata metadata : metadataList) {
113+
if (metadata.type.equals(Metadata.APPOINTMENT)) {
114+
addAppointmentView(metadata);
115+
}
116+
}
117+
}
118+
}
119+
120+
private void addAppointmentView(Metadata appointment) {
121+
appointment.title = "Du har fått en innkalling fra " + DocumentContentStore.getDocumentParent().getCreatorName();
122+
LinearLayout containerLayout = (LinearLayout) findViewById(R.id.container_layout);
123+
AppointmentView appointmentView = AppointmentView.newInstance();
124+
appointmentView.setAppointment(appointment);
125+
LinearLayout ll = new LinearLayout(this);
126+
ll.setOrientation(LinearLayout.VERTICAL);
127+
int randomId = (int) (Math.random()*100);
128+
ll.setId(randomId);
129+
getFragmentManager().beginTransaction().add(ll.getId(), appointmentView, "appointmentView" + randomId).commit();
130+
131+
containerLayout.addView(ll,0);
132+
133+
}
134+
105135
protected void showContentProgressDialog(final AsyncTask task, String message) {
106136
progressDialog = DialogUtitities.getProgressDialogWithMessage(this, message);
107137
progressDialog.setButton(DialogInterface.BUTTON_NEGATIVE, getString(R.string.abort), new DialogInterface.OnClickListener() {
@@ -325,7 +355,7 @@ private void openInvoiceContent(Attachment attachment, Document document, Curren
325355
}
326356

327357
private void showPaidInvoiceDialog(Invoice invoice) {
328-
String timePaid = DataFormatUtilities.getFormattedDate(invoice.getPayment().getTimePaid());
358+
String timePaid = FormatUtilities.getFormattedDate(invoice.getPayment().getTimePaid());
329359

330360
String title = getString(R.string.dialog_send_to_bank_paid_title);
331361
String message = format(getString(R.string.dialog_send_to_bank_paid_message), timePaid);

‎Digipost/src/main/java/no/digipost/android/gui/content/HtmlAndReceiptActivity.java

+3-2
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@
3232
import no.digipost.android.gui.fragments.ContentFragment;
3333
import no.digipost.android.model.Attachment;
3434
import no.digipost.android.model.Receipt;
35-
import no.digipost.android.utilities.DataFormatUtilities;
35+
import no.digipost.android.utilities.FormatUtilities;
3636

3737
public class HtmlAndReceiptActivity extends DisplayContentActivity {
3838

@@ -58,6 +58,7 @@ public void onClick(View v) {
5858
if (super.shouldShowInvoiceOptionsDialog(this)) {
5959
super.showInvoiceOptionsDialog(this);
6060
}
61+
super.setupMetadataView();
6162
}
6263

6364
@Override
@@ -155,7 +156,7 @@ private void setupActionBar() {
155156
} else {
156157
Receipt receiptMeta = DocumentContentStore.getDocumentReceipt();
157158
getSupportActionBar().setTitle(receiptMeta.getStoreName());
158-
getSupportActionBar().setSubtitle(DataFormatUtilities.getFormattedDateTime(receiptMeta.getTimeOfPurchase()));
159+
getSupportActionBar().setSubtitle(FormatUtilities.getFormattedDateTime(receiptMeta.getTimeOfPurchase()));
159160
}
160161
}
161162
} catch (NullPointerException e) {

‎Digipost/src/main/java/no/digipost/android/gui/content/MuPDFActivity.java

+5-6
Original file line numberDiff line numberDiff line change
@@ -231,13 +231,11 @@ public void onClick(View v) {
231231
intent = getIntent();
232232
String openFilepath = intent.getStringExtra(ACTION_OPEN_FILEPATH);
233233
if (openFilepath != null) {
234-
setActionBar(FilenameUtils.getName(openFilepath), null);
234+
setActionBar(FilenameUtils.getName(openFilepath));
235235
core = openFile(openFilepath);
236236
SearchTaskResult.set(null);
237237
} else if (core == null && DocumentContentStore.getDocumentContent() != null) {
238-
setActionBar(DocumentContentStore.getDocumentAttachment().getSubject(), DocumentContentStore
239-
.getDocumentParent()
240-
.getCreatorName());
238+
setActionBar(DocumentContentStore.getDocumentAttachment().getSubject());
241239

242240
byte buffer[] = DocumentContentStore.getDocumentContent();
243241

@@ -269,6 +267,7 @@ public void onClick(DialogInterface dialog, int which) {
269267
if (super.shouldShowInvoiceOptionsDialog(this)) {
270268
super.showInvoiceOptionsDialog(this);
271269
}
270+
super.setupMetadataView();
272271
}
273272

274273

@@ -317,9 +316,9 @@ protected void onTextFound(SearchTaskResult result) {
317316
};
318317

319318
mDocView.setLinksEnabled(true);
320-
RelativeLayout layout = (RelativeLayout) findViewById(R.id.pdf_relative_layout);
319+
LinearLayout layout = (LinearLayout) findViewById(R.id.pdf_relative_layout);
321320
layout.addView(mDocView);
322-
layout.setBackgroundResource(R.drawable.login_background);
321+
layout.setBackgroundResource(R.drawable.document_background);
323322
}
324323

325324
@Override

‎Digipost/src/main/java/no/digipost/android/gui/content/UnsupportedDocumentFormatActivity.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,7 @@ protected void onCreate(Bundle savedInstanceState) {
5454
finish();
5555
return;
5656
}
57-
setActionBar(DocumentContentStore.getDocumentAttachment().getSubject(), DocumentContentStore.getDocumentParent().getCreatorName());
57+
setActionBar(DocumentContentStore.getDocumentAttachment().getSubject());
5858
TextView message = (TextView) findViewById(R.id.unsupported_message);
5959
message.setText(format(getString(R.string.unsupported_message_top), DocumentContentStore.getDocumentAttachment().getFileType()));
6060

‎Digipost/src/main/java/no/digipost/android/gui/content/UploadActivity.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -413,7 +413,7 @@ public void onLoadingFailed(String imageUri, View view, FailReason failReason) {
413413
thumbnail.setImageDrawable(context.getResources().getDrawable(R.drawable.ic_grey_file));
414414
}
415415

416-
size.setText(DataFormatUtilities.getFormattedFileSize(object.length()));
416+
size.setText(FormatUtilities.getFormattedFileSize(object.length()));
417417
extension.setText("." + FilenameUtils.getExtension(object.getName()));
418418
} else {
419419
thumbnail.setImageDrawable(context.getResources().getDrawable(R.drawable.ic_grey_folder));

‎Digipost/src/main/java/no/digipost/android/gui/fragments/ContentFragment.java

+2-2
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,7 @@
4646
import no.digipost.android.model.Attachment;
4747
import no.digipost.android.model.Document;
4848
import no.digipost.android.model.Receipt;
49-
import no.digipost.android.utilities.DataFormatUtilities;
49+
import no.digipost.android.utilities.FormatUtilities;
5050
import no.digipost.android.utilities.DialogUtitities;
5151
import no.digipost.android.utilities.FileUtilities;
5252
import no.digipost.android.utilities.SettingsUtilities;
@@ -374,7 +374,7 @@ protected void onProgressUpdate(CONTENT_TYPE... values) {
374374
} else if (values[0] instanceof Receipt) {
375375
Receipt receipt = (Receipt) values[0];
376376
progressDialog.setMessage(format(getString(R.string.delete_progress_receipt), receipt.getStoreName(),
377-
DataFormatUtilities.getFormattedDateTime(receipt.getTimeOfPurchase()), progress, content.size()));
377+
FormatUtilities.getFormattedDateTime(receipt.getTimeOfPurchase()), progress, content.size()));
378378
}
379379
}
380380

0 commit comments

Comments
 (0)