Skip to content

Updates for december elections #239

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 38 commits into from
Dec 12, 2020
Merged

Updates for december elections #239

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
38 commits
Select commit Hold shift + click to select a range
7d3053f
fix send note on question
aniri Oct 1, 2020
0262a3d
Merge pull request #214 from aniri/bugfix/notes_on_questions
aniri Oct 1, 2020
72c6e22
Add simple usage for values from remote config at "About page"
DeKaN Oct 1, 2020
e732c6d
Use values from remote config for menu
DeKaN Oct 4, 2020
904c80d
Merge pull request #216 from DeKaN/about-fragment-simple-remote-config
aniri Oct 7, 2020
2785e66
Merge code from #216. Remove WebClient
DeKaN Oct 7, 2020
157e131
Copy files to cache instead of using directly. Fixes #178
DeKaN Oct 14, 2020
84ac8e1
Remove file from cache after sending in any sync case
DeKaN Oct 16, 2020
de01769
Merge pull request #219 from DeKaN/note-files
aniri Oct 16, 2020
6a12713
Fix null string property
DeKaN Oct 16, 2020
8fe9486
Merge pull request #217 from DeKaN/menu-links
aniri Oct 17, 2020
8be99f6
Made font for selected item in the menu bold (#195)
caldareanda Oct 17, 2020
b881b50
added collapse keyboard function (#215)
mrwhoknows55 Oct 17, 2020
7c64adf
Use the orderNumber field for sorting (#222)
lukstbit Oct 27, 2020
675fcef
Fix sorting for forms (#227)
lukstbit Oct 28, 2020
d85cc08
Sending firebase token on the login call (#225)
pedrofsn Nov 3, 2020
affc4ba
Use filesDir instead of cacheDir (#230)
lukstbit Nov 14, 2020
3cdc0b2
Enable upload of multiple files with note (#231)
lukstbit Nov 16, 2020
c657040
replace: `this` with appropriate lifecycle owner (#224)
mrwhoknows55 Nov 17, 2020
6a43cf8
check db reset remote config flag on startup
aniri Nov 17, 2020
0ab85fb
cleanups and add default value for remote config param
aniri Nov 18, 2020
299e99a
Add sync related UI changes (#233)
lukstbit Nov 18, 2020
e4f691a
removed extra activate
aniri Nov 19, 2020
0071c9f
Merge pull request #238 from aniri/feature/clear_db_remote_config
AlexandraDaraban Nov 19, 2020
96054bb
Allow user to delete note files (#237)
lukstbit Nov 19, 2020
9483563
Send count of unsynced items to analytics (#244)
lukstbit Nov 24, 2020
7e68c25
fixed remote config init error and add min interval setting (#245)
aniri Nov 25, 2020
6c2f42c
Fix RxJava null values usage (#240)
lukstbit Nov 25, 2020
499cbf6
Fix incorrect selection of counties (#247)
lukstbit Nov 26, 2020
cb2aefd
Enable screen for visited polling stations (#241)
lukstbit Nov 28, 2020
4d54abb
Enable details screen for user's notes (#242)
lukstbit Nov 28, 2020
86afd50
Add info for visited stations screen (#256)
lukstbit Nov 30, 2020
d4102e5
Fix UI for notes after changing stations (#254)
lukstbit Nov 30, 2020
82566aa
Bugfix/cleanups on app update (#257)
aniri Nov 30, 2020
f6bd35c
Add checks for empty answers list to sync (#252)
lukstbit Nov 30, 2020
d761891
added new link in menu and new guide (#259)
aniri Dec 2, 2020
8b514e5
changed logout display in menu and default safety link (#260)
aniri Dec 3, 2020
baba09d
Merge branch 'master' into develop
aniri Dec 12, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions app/build.gradle
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ apply plugin: 'org.sonarqube'
static def getKey(String env, String key) {
Properties props = new Properties()
props.load(new FileInputStream(new File(env.concat('.properties'))))
return props[key]
return props[key] ?: ""
}

androidExtensions {
Expand All @@ -24,8 +24,8 @@ android {
applicationId "ro.code4.monitorizarevot"
minSdkVersion 21
targetSdkVersion 29
versionCode 35
versionName "2.0.7"
versionCode 42
versionName "2.1.1"
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"

javaCompileOptions {
Expand Down Expand Up @@ -57,6 +57,7 @@ android {
variant.buildConfigField "String", "API_URL", "\"" + getKey(variant.buildType.name, "apiUrl") + "\""
variant.buildConfigField "String", "GUIDE_URL", "\"" + getKey(variant.buildType.name, "guideUrl") + "\""
variant.buildConfigField "String", "SAFETY_URL", "\"" + getKey(variant.buildType.name, "safetyUrl") + "\""
variant.buildConfigField "String", "OBSERVER_FEEDBACK_URL", "\"" + getKey(variant.buildType.name, "observerFeedbackUrl") + "\""
variant.buildConfigField "String", "ORGANISATION_WEB_URL", "\"" + getKey(variant.buildType.name, "organisationWebUrl") + "\""
variant.buildConfigField "String", "SERVICE_CENTER_PHONE_NUMBER", "\"" + getKey(variant.buildType.name, "serviceCenterPhoneNumber") + "\""
variant.buildConfigField "String", "PREFERRED_LOCALE", "\"" + getKey(variant.buildType.name, "preferredLocale") + "\""
Expand Down Expand Up @@ -154,6 +155,7 @@ dependencies {
kapt "androidx.room:room-compiler:$roomVersion"
implementation "androidx.room:room-ktx:$roomVersion"
implementation "androidx.room:room-rxjava2:$roomVersion"
implementation 'com.squareup.picasso:picasso:2.71828'

// Unit tests
testImplementation 'junit:junit:4.13'
Expand Down
Loading