-
Notifications
You must be signed in to change notification settings - Fork 56
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge pull request #231 from DP-3T/hotfix/version-1.1.2
Hotfix/version 1.1.2
- Loading branch information
Showing
22 changed files
with
553 additions
and
128 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
42 changes: 42 additions & 0 deletions
42
app/src/main/java/ch/admin/bag/dp3t/networking/models/FaqEntryModel.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,42 @@ | ||
/* | ||
* Copyright (c) 2020 Ubique Innovation AG <https://www.ubique.ch> | ||
* | ||
* This Source Code Form is subject to the terms of the Mozilla Public | ||
* License, v. 2.0. If a copy of the MPL was not distributed with this | ||
* file, You can obtain one at https://mozilla.org/MPL/2.0/. | ||
* | ||
* SPDX-License-Identifier: MPL-2.0 | ||
*/ | ||
package ch.admin.bag.dp3t.networking.models; | ||
|
||
public class FaqEntryModel { | ||
|
||
private String title; | ||
private String text; | ||
private String iconAndroid; | ||
|
||
/* optional */ | ||
private String linkTitle; | ||
private String linkUrl; | ||
|
||
public String getTitle() { | ||
return title; | ||
} | ||
|
||
public String getText() { | ||
return text; | ||
} | ||
|
||
public String getIconAndroid() { | ||
return iconAndroid; | ||
} | ||
|
||
public String getLinkTitle() { | ||
return linkTitle; | ||
} | ||
|
||
public String getLinkUrl() { | ||
return linkUrl; | ||
} | ||
|
||
} |
15 changes: 15 additions & 0 deletions
15
...rc/main/java/ch/admin/bag/dp3t/networking/models/WhatToDoPositiveTestTextsCollection.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
/* | ||
* Copyright (c) 2020 Ubique Innovation AG <https://www.ubique.ch> | ||
* | ||
* This Source Code Form is subject to the terms of the Mozilla Public | ||
* License, v. 2.0. If a copy of the MPL was not distributed with this | ||
* file, You can obtain one at https://mozilla.org/MPL/2.0/. | ||
* | ||
* SPDX-License-Identifier: MPL-2.0 | ||
*/ | ||
package ch.admin.bag.dp3t.networking.models; | ||
|
||
import java.util.HashMap; | ||
|
||
public class WhatToDoPositiveTestTextsCollection extends HashMap<String, WhatToDoPositiveTestTextsModel> { | ||
} |
50 changes: 50 additions & 0 deletions
50
app/src/main/java/ch/admin/bag/dp3t/networking/models/WhatToDoPositiveTestTextsModel.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,50 @@ | ||
/* | ||
* Copyright (c) 2020 Ubique Innovation AG <https://www.ubique.ch> | ||
* | ||
* This Source Code Form is subject to the terms of the Mozilla Public | ||
* License, v. 2.0. If a copy of the MPL was not distributed with this | ||
* file, You can obtain one at https://mozilla.org/MPL/2.0/. | ||
* | ||
* SPDX-License-Identifier: MPL-2.0 | ||
*/ | ||
package ch.admin.bag.dp3t.networking.models; | ||
|
||
import java.util.List; | ||
|
||
public class WhatToDoPositiveTestTextsModel { | ||
|
||
private String enterCovidcodeBoxSupertitle; | ||
private String enterCovidcodeBoxTitle; | ||
private String enterCovidcodeBoxText; | ||
private String enterCovidcodeBoxButtonTitle; | ||
|
||
//dismissible will be ignored by clients | ||
private InfoBoxModel infoBox; | ||
|
||
private List<FaqEntryModel> faqEntries; | ||
|
||
public String getEnterCovidcodeBoxSupertitle() { | ||
return enterCovidcodeBoxSupertitle; | ||
} | ||
|
||
public String getEnterCovidcodeBoxTitle() { | ||
return enterCovidcodeBoxTitle; | ||
} | ||
|
||
public String getEnterCovidcodeBoxText() { | ||
return enterCovidcodeBoxText; | ||
} | ||
|
||
public String getEnterCovidcodeBoxButtonTitle() { | ||
return enterCovidcodeBoxButtonTitle; | ||
} | ||
|
||
public InfoBoxModel getInfoBox() { | ||
return infoBox; | ||
} | ||
|
||
public List<FaqEntryModel> getFaqEntries() { | ||
return faqEntries; | ||
} | ||
|
||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.