-### Early BETA Testing
+### Early BETA Testing 🚧
If you want to try the app as it is being developed, you can get the latest Android APK in 2 different ways:
* GitHub Releases - See [current release](https://github.com/amardeshbd/android-police-brutality-incidents/releases) with APK bundled with it.
* Firebase App Distribution - Subscribe to new updates via email. Use this [open-beta testing](https://appdistribution.firebase.dev/i/5d2cb8359305f7e7) process. The invite email will be sent on next release, not immediately.
+> NOTE: App will be available in Google Play in few days after it's reviewed and approved.
+
## Objective
The objective of the app is to be front-end of the data that is collected and exposed by [police-brutality](https://github.com/2020PB/police-brutality) repository.
diff --git a/android-app/.idea/codeStyles/Project.xml b/android-app/.idea/codeStyles/Project.xml
index b93b279..1dd7d82 100644
--- a/android-app/.idea/codeStyles/Project.xml
+++ b/android-app/.idea/codeStyles/Project.xml
@@ -1,6 +1,11 @@
+ *
+ * In the implementation of this call-back method, you should consider invoking + * {@link JsonSerializationContext#serialize(Object, Type)} method to create JsonElements for any + * non-trivial field of the {@code src} object. However, you should never invoke it on the + * {@code src} object itself since that will cause an infinite loop (Gson will call your + * call-back method again). + * + * @param src the object that needs to be converted to Json. + * @param typeOfSrc the actual type (fully genericized version) of the source object. + * @return a JsonElement corresponding to the specified object. + */ + @Override + public JsonElement serialize(final OffsetDateTime src, final Type typeOfSrc, final JsonSerializationContext context) { + return new JsonPrimitive(FORMATTER.format(src)); + } + + /** + * Gson invokes this call-back method during deserialization when it encounters a field of the + * specified type.
+ *
+ * In the implementation of this call-back method, you should consider invoking
+ * {@link JsonDeserializationContext#deserialize(JsonElement, Type)} method to create objects
+ * for any non-trivial field of the returned object. However, you should never invoke it on the
+ * the same type passing {@code json} since that will cause an infinite loop (Gson will call your
+ * call-back method again).
+ *
+ * @param json The Json data being deserialized
+ * @param typeOfT The type of the Object to deserialize to
+ * @return a deserialized object of the specified type typeOfT which is a subclass of {@code T}
+ * @throws JsonParseException if json is not in the expected format of {@code typeOfT}
+ */
+ @Override
+ public OffsetDateTime deserialize(final JsonElement json, final Type typeOfT, final JsonDeserializationContext context)
+ throws JsonParseException {
+ return FORMATTER.parse(json.getAsString(), OffsetDateTime.FROM);
+ }
+}
diff --git a/android-app/app/src/main/java/com/blacklivesmatter/policebrutality/data/model/GeoCoding.kt b/android-app/app/src/main/java/com/blacklivesmatter/policebrutality/data/model/GeoCoding.kt
new file mode 100644
index 0000000..ddb6d9b
--- /dev/null
+++ b/android-app/app/src/main/java/com/blacklivesmatter/policebrutality/data/model/GeoCoding.kt
@@ -0,0 +1,24 @@
+package com.blacklivesmatter.policebrutality.data.model
+
+import androidx.annotation.Keep
+import androidx.room.ColumnInfo
+import com.google.gson.annotations.SerializedName
+
+/**
+ * Inner object of [Incident].
+ *
+ * Sample data:
+ * ```
+ * {
+ * "lat":"36.3728538",
+ * "long":"-94.2088172"
+ * }
+ * ```
+ *
+ * See [Incident]
+ */
+@Keep
+data class GeoCoding(
+ @SerializedName("lat") @ColumnInfo(name = "lat") val lat: String? = null,
+ @SerializedName("long") @ColumnInfo(name = "long") val long: String? = null
+)
diff --git a/android-app/app/src/main/java/com/blacklivesmatter/policebrutality/data/model/Incident.kt b/android-app/app/src/main/java/com/blacklivesmatter/policebrutality/data/model/Incident.kt
index e796bd8..7314ae5 100644
--- a/android-app/app/src/main/java/com/blacklivesmatter/policebrutality/data/model/Incident.kt
+++ b/android-app/app/src/main/java/com/blacklivesmatter/policebrutality/data/model/Incident.kt
@@ -1,42 +1,70 @@
package com.blacklivesmatter.policebrutality.data.model
+import androidx.annotation.Keep
import androidx.room.ColumnInfo
import androidx.room.Entity
+import androidx.room.Ignore
import androidx.room.PrimaryKey
+import com.blacklivesmatter.policebrutality.config.THE_846_DAY
import com.google.gson.annotations.SerializedName
+import org.threeten.bp.OffsetDateTime
+import org.threeten.bp.format.DateTimeFormatter
+import org.threeten.bp.format.FormatStyle
/**
* An example data exposed from JSON response.
*
* Sample data:
- *
* ```
* {
- * "links":[
- * "https://twitter.com/courtenay_roche/status/1267653137969623040",
- * "https://twitter.com/yagirlbrookie09/status/1267647898365427714",
- * "https://www.4029tv.com/article/bentonville-police-deploy-tear-gas-on-protesters/32736629#"
- * ],
+ * "id":"7b044f80-a9d6-11ea-823c-cb6b88d56860",
+ * "pb_id":"ar-bentonville-1",
* "state":"Arkansas",
- * "edit_at":"https://github.com/2020PB/police-brutality/blob/master/reports/Arkansas.md",
* "city":"Bentonville",
- * "name":"Law enforcement gas a crowd chanting \u201cwe want peace\u201d right after exiting the building.",
- * "date":"2020-06-01",
- * "date_text":"June 1st",
- * "id": "ar-bentonville-1"
+ * "date":"2020-06-01T00:00:00.000000Z",
+ * "title":"Law enforcement gas a crowd chanting \u201cwe want peace\u201d right after exiting the building.",
+ * "description":null,
+ * "links":[
+ * "https:\/\/twitter.com\/courtenay_roche\/status\/1267653137969623040",
+ * "https:\/\/twitter.com\/yagirlbrookie09\/status\/1267647898365427714",
+ * "https:\/\/www.4029tv.com\/article\/bentonville-police-deploy-tear-gas-on-protesters\/32736629#"
+ * ],
+ * "data":null,
+ * "geocoding":{
+ * "lat":"36.3728538",
+ * "long":"-94.2088172"
+ * }
* }
* ```
+ *
+ * ### See
+ * - [Sample API response](https://api.846policebrutality.com/api/incidents)
+ * - [Support date+time in Room DB](https://medium.com/androiddevelopers/room-time-2b4cf9672b98)
*/
+@Keep
@Entity(tableName = "incidents")
data class Incident(
- @PrimaryKey(autoGenerate = true)
- @ColumnInfo(name = "_id") val _id: Long,
- @SerializedName("id") @ColumnInfo(name = "incident_id") val incident_id: String? = "",
- @ColumnInfo(name = "state") val state: String? = "",
- @ColumnInfo(name = "edit_url") val edit_at: String? = "",
- @ColumnInfo(name = "city") val city: String? = "",
- @ColumnInfo(name = "name") val name: String? = "",
- @ColumnInfo(name = "date") val date: String? = "", // TODO - should use proper date to be able to use it as filter
- @ColumnInfo(name = "date_text") val date_text: String? = "",
- @ColumnInfo(name = "links") val links: List