Skip to content

Commit 757a254

Browse files
author
sds100
committed
Merge branch 'readme' into develop
# Conflicts: # CHANGELOG.md # app/src/main/java/com/mapcode/map/AddressUi.kt # app/src/main/java/com/mapcode/map/ClearableTextField.kt # app/src/main/java/com/mapcode/map/ShowMapcodeUseCase.kt
1 parent aef9e16 commit 757a254

62 files changed

Lines changed: 1102 additions & 141 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.gitignore

Lines changed: 117 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,89 +1,156 @@
1+
# Created by https://www.toptal.com/developers/gitignore/api/androidstudio,java
2+
# Edit at https://www.toptal.com/developers/gitignore?templates=androidstudio,java
3+
4+
### Java ###
5+
# Compiled class file
6+
*.class
7+
8+
# Log file
9+
*.log
10+
11+
# BlueJ files
12+
*.ctxt
13+
14+
# Mobile Tools for Java (J2ME)
15+
.mtj.tmp/
16+
17+
# Package Files #
18+
*.jar
19+
*.war
20+
*.nar
21+
*.ear
22+
*.zip
23+
*.tar.gz
24+
*.rar
25+
26+
# virtual machine crash logs, see http://www.java.com/en/download/help/error_hotspot.xml
27+
hs_err_pid*
28+
replay_pid*
29+
30+
### AndroidStudio ###
31+
# Covers files to be ignored for android development using Android Studio.
32+
133
# Built application files
234
*.apk
3-
*.aar
435
*.ap_
536
*.aab
637

738
# Files for the ART/Dalvik VM
839
*.dex
940

1041
# Java class files
11-
*.class
1242

1343
# Generated files
1444
bin/
1545
gen/
1646
out/
17-
# Uncomment the following line in case you need and you don't have the release build type files in your app
18-
# release/
1947

2048
# Gradle files
49+
.gradle
2150
.gradle/
2251
build/
2352

53+
# Signing files
54+
.signing/
55+
2456
# Local configuration file (sdk path, etc)
2557
local.properties
2658

2759
# Proguard folder generated by Eclipse
2860
proguard/
2961

3062
# Log Files
31-
*.log
3263

33-
# Android Studio Navigation editor temp files
64+
# Android Studio
65+
/*/build/
66+
/*/local.properties
67+
/*/out
68+
/*/*/build
69+
/*/*/production
70+
captures/
3471
.navigation/
72+
*.ipr
73+
*~
74+
*.swp
3575

36-
# Android Studio captures folder
37-
captures/
76+
# Keystore files
77+
*.jks
78+
*.keystore
79+
80+
# Google Services (e.g. APIs or Firebase)
81+
# google-services.json
82+
83+
# Android Patch
84+
gen-external-apklibs
85+
86+
# External native build folder generated in Android Studio 2.2 and later
87+
.externalNativeBuild
3888

39-
# IntelliJ
89+
# NDK
90+
obj/
91+
92+
# IntelliJ IDEA
4093
*.iml
94+
*.iws
95+
/out/
96+
97+
# User-specific configurations
98+
.idea/caches/
99+
.idea/libraries/
100+
.idea/shelf/
41101
.idea/workspace.xml
42102
.idea/tasks.xml
43-
.idea/gradle.xml
44-
.idea/assetWizardSettings.xml
45-
.idea/dictionaries
46-
.idea/libraries
47-
# Android Studio 3 in .gitignore file.
48-
.idea/caches
103+
.idea/.name
104+
.idea/compiler.xml
105+
.idea/copyright/profiles_settings.xml
106+
.idea/encodings.xml
107+
.idea/misc.xml
49108
.idea/modules.xml
50-
# Comment next line if keeping position of elements in Navigation Editor is relevant for you
109+
.idea/scopes/scope_settings.xml
110+
.idea/dictionaries
111+
.idea/vcs.xml
112+
.idea/jsLibraryMappings.xml
113+
.idea/datasources.xml
114+
.idea/dataSources.ids
115+
.idea/sqlDataSources.xml
116+
.idea/dynamic.xml
117+
.idea/uiDesigner.xml
118+
.idea/assetWizardSettings.xml
119+
.idea/gradle.xml
120+
.idea/jarRepositories.xml
51121
.idea/navEditor.xml
52-
.idea/androidTestResultsUserPreferences.xml
53-
.idea/misc.xml
54-
.idea/inspectionProfiles
55-
.idea/deploymentTargetDropDown.xml
56122

57-
# Keystore files
58-
# Uncomment the following lines if you do not want to check your keystore files in.
59-
#*.jks
60-
#*.keystore
123+
# Legacy Eclipse project files
124+
.classpath
125+
.project
126+
.cproject
127+
.settings/
61128

62-
# External native build folder generated in Android Studio 2.2 and later
63-
.externalNativeBuild
64-
.cxx/
129+
# Mobile Tools for Java (J2ME)
65130

66-
# Google Services (e.g. APIs or Firebase)
67-
# google-services.json
131+
# Package Files #
132+
133+
# virtual machine crash logs (Reference: http://www.java.com/en/download/help/error_hotspot.xml)
134+
135+
## Plugin-specific files:
136+
137+
# mpeltonen/sbt-idea plugin
138+
.idea_modules/
139+
140+
# JIRA plugin
141+
atlassian-ide-plugin.xml
142+
143+
# Mongo Explorer plugin
144+
.idea/mongoSettings.xml
145+
146+
# Crashlytics plugin (for Android Studio and IntelliJ)
147+
com_crashlytics_export_strings.xml
148+
crashlytics.properties
149+
crashlytics-build.properties
150+
fabric.properties
151+
152+
### AndroidStudio Patch ###
153+
154+
!/gradle/wrapper/gradle-wrapper.jar
68155

69-
# Freeline
70-
freeline.py
71-
freeline/
72-
freeline_project_description.json
73-
74-
# fastlane
75-
fastlane/report.xml
76-
fastlane/Preview.html
77-
fastlane/screenshots
78-
fastlane/test_output
79-
fastlane/readme.md
80-
81-
# Version control
82-
vcs.xml
83-
84-
# lint
85-
lint/intermediates/
86-
lint/generated/
87-
lint/outputs/
88-
lint/tmp/
89-
# lint/reports/
156+
# End of https://www.toptal.com/developers/gitignore/api/androidstudio,java

.idea/misc.xml

Lines changed: 2 additions & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

CHANGELOG.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
## [1.1.0](https://github.com/mapcode-foundation/mapcode-android-app/releases/tag/v1.1.0)
22

3-
#### 9 August 2022
3+
#### 2022-08-09
44

55
- [#39](https://github.com/mapcode-foundation/mapcode-android-app/issues/39) Call REST API when querying mapcodes.
66
- [#20](https://github.com/mapcode-foundation/mapcode-android-app/issues/20) Show a dropdown that suggests addresses
@@ -17,14 +17,14 @@
1717

1818
## [1.0.1](https://github.com/mapcode-foundation/mapcode-android-app/releases/tag/v1.0.1)
1919

20-
#### 5 August 2022
20+
#### 2022-08-05
2121

2222
- [#38](https://github.com/mapcode-foundation/mapcode-android-app/issues/38) Show error when inputting invalid latitude
2323
and longitude to fix the crash.
2424
- Hide buttons that link to the GitHub repo and changelog until the repo is made public.
2525

2626
## [1.0.0](https://github.com/mapcode-foundation/mapcode-android-app/releases/tag/v1.0.0)
2727

28-
#### 21 July 2022
28+
#### 2022-07-21
2929

3030
Initial release! 🎉

README.md

Lines changed: 50 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,50 @@
1-
# mapcode-android-app
2-
Mapcode Android app
1+
# Mapcode Android Application
2+
3+
[![License](http://img.shields.io/badge/license-APACHE2-blue.svg)]()
4+
5+
**Copyright (C) 2014-2022 Stichting Mapcode Foundation (http://www.mapcode.com)**
6+
7+
This is Mapcode Finder, the official Android application for mapcodes. Have fun using it!
8+
9+
Rijn Buve
10+
11+
# License
12+
13+
Licensed under the Apache License, Version 2.0 (the "License");
14+
you may not use this file except in compliance with the License.
15+
You may obtain a copy of the License at
16+
17+
http://www.apache.org/licenses/LICENSE-2.0
18+
19+
Unless required by applicable law or agreed to in writing, software
20+
distributed under the License is distributed on an "AS IS" BASIS,
21+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
22+
See the License for the specific language governing permissions and
23+
limitations under the License.
24+
25+
# Using Git and `.gitignore`
26+
27+
It's good practice to set up a personal global `.gitignore` file on your machine which filters a number of files
28+
on your file systems that you do not wish to submit to the Git repository. You can set up your own global
29+
`~/.gitignore` file by executing:
30+
`git config --global core.excludesfile ~/.gitignore`
31+
32+
The local `.gitignore` file in the Git repository itself to reflect those file only that are produced by executing
33+
regular compile, build or release commands, such as:
34+
`target/ out/`
35+
36+
Tip: Use [gitignore.io](http://gitignore.io) to generate or update the `.gitignore` file.
37+
38+
# Bug Reports and New Feature Requests
39+
40+
If you encounter any problems with this library, don't hesitate to use the `Issues` session to file your issues.
41+
Normally, one of our developers should be able to comment on them and fix.
42+
43+
# Release Notes
44+
45+
See [CHANGELOG.md](./CHANGELOG.md) for release notes.xz
46+
47+
# Credits
48+
49+
Special thanks to Seth Schroeder for developing Android version of this app.
50+

app/src/androidTest/java/com/mapcode/FakePreferenceRepository.kt

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
/*
2+
* Copyright (C) 2022, Stichting Mapcode Foundation (http://www.mapcode.com)
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
117
package com.mapcode
218

319
import androidx.datastore.preferences.core.Preferences
@@ -6,9 +22,6 @@ import kotlinx.coroutines.flow.Flow
622
import kotlinx.coroutines.flow.MutableStateFlow
723
import kotlinx.coroutines.flow.map
824

9-
/**
10-
* Created by sds100 on 26/04/2021.
11-
*/
1225
class FakePreferenceRepository : PreferenceRepository {
1326
private val preferences: MutableStateFlow<Map<Preferences.Key<*>, Any?>> = MutableStateFlow(emptyMap())
1427

app/src/androidTest/java/com/mapcode/map/FakeLocation.kt

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,23 @@
1+
/*
2+
* Copyright (C) 2022, Stichting Mapcode Foundation (http://www.mapcode.com)
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
117
package com.mapcode.map
218

319
import com.mapcode.Mapcode
420

5-
/**
6-
* Created by sds100 on 02/06/2022.
7-
*/
821
data class FakeLocation(
922
val latitude: Double,
1023
val longitude: Double,

app/src/androidTest/java/com/mapcode/map/FakeShowMapcodeUseCase.kt

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,19 @@
1+
/*
2+
* Copyright (C) 2022, Stichting Mapcode Foundation (http://www.mapcode.com)
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
117
package com.mapcode.map
218

319
import com.mapcode.Mapcode
@@ -9,9 +25,6 @@ import java.io.IOException
925
import kotlin.Result.Companion.failure
1026
import kotlin.Result.Companion.success
1127

12-
/**
13-
* Created by sds100 on 02/06/2022.
14-
*/
1528
class FakeShowMapcodeUseCase : ShowMapcodeUseCase {
1629
var clipboard: String? = null
1730
private set

0 commit comments

Comments
 (0)