.envrc

@@ -0,0 +1 @@
+use flake

.gitignore

@@ -12,3 +12,4 @@
 /captures
 .externalNativeBuild
 .cxx
+singing.properties

README.md

@@ -1 +1,5 @@
-WIP
+[![bitrise pipeline](https://app.bitrise.io/app/6234c240315de307.svg?token=QKbdCwKUbyjSHCdN-Wmluw "bitrise pipeline")](https://app.bitrise.io/app/6234c240315de307.svg?token=QKbdCwKUbyjSHCdN-Wmluw)
+
+Download apk: [Telegram channel](https://t.me/ingressmapci)
+
+WIP

app/build.gradle

@@ -1,67 +1,103 @@
 apply plugin: 'com.android.application'
 apply plugin: 'kotlin-android'
 apply plugin: 'kotlin-android-extensions'
+apply plugin: "kotlin-kapt"
 
 android {
-    signingConfigs {
-        release {
-            storeFile file('/home/puh/Documents/keychain/android.jks')
-            storePassword ANDROID_STORE_PASSWORD
-            keyAlias 'Key0'
-            keyPassword ANDROID_KEY_PASSWORD
-        }
-    }
-    compileSdkVersion 29
+    compileSdkVersion 30
     buildToolsVersion "29.0.3"
 
     defaultConfig {
         applicationId "com.puuuuh.ingressmap"
-        minSdkVersion 21
-        targetSdkVersion 29
-        versionCode 2
-        versionName "0.2.0"
+        minSdkVersion 24
+        targetSdkVersion 30
+        versionCode 3
+        versionName '0.3.0'
 
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
-        signingConfig signingConfigs.release
     }
 
     buildTypes {
         release {
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
-            signingConfig signingConfigs.release
         }
         debug {
-            signingConfig signingConfigs.release
         }
     }
     compileOptions {
         sourceCompatibility = 1.8
         targetCompatibility = 1.8
     }
-
+    kotlinOptions {
+        jvmTarget = '1.8'
+    }
 }
 
 dependencies {
     implementation fileTree(dir: 'libs', include: ['*.jar'])
     implementation "org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version"
-    implementation 'androidx.appcompat:appcompat:1.1.0'
-    implementation 'androidx.core:core-ktx:1.2.0'
-    implementation 'androidx.constraintlayout:constraintlayout:1.1.3'
-    implementation 'com.google.android.material:material:1.1.0'
+    implementation 'androidx.appcompat:appcompat:1.2.0'
+    implementation "androidx.fragment:fragment-ktx:1.3.0-rc01"
+    implementation "androidx.fragment:fragment-ktx:1.2.5"
+    implementation 'androidx.core:core-ktx:1.3.2'
+    implementation 'androidx.constraintlayout:constraintlayout:2.0.4'
+    implementation 'com.google.android.material:material:1.2.1'
     implementation 'androidx.annotation:annotation:1.1.0'
     implementation 'androidx.lifecycle:lifecycle-extensions:2.2.0'
     implementation 'com.google.android.gms:play-services-maps:17.0.0'
-    implementation 'com.google.android.libraries.places:places:2.2.0'
+    implementation 'com.google.android.libraries.places:places:2.4.0'
     implementation 'io.sgr:s2-geometry-library-java:1.0.1'
     implementation 'com.squareup.okhttp3:okhttp:3.10.0'
     implementation 'com.google.code.gson:gson:2.8.5'
+    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:1.4.2"
+
+    implementation "androidx.room:room-runtime:2.2.6"
+    implementation 'androidx.preference:preference:1.1.1'
+    kapt "androidx.room:room-compiler:2.2.6"
+    implementation "androidx.room:room-ktx:2.2.6"
+
 
     implementation 'androidx.legacy:legacy-support-v4:1.0.0'
     implementation 'androidx.lifecycle:lifecycle-viewmodel-ktx:2.2.0'
     implementation 'com.squareup.picasso:picasso:2.71828'
+    implementation 'androidx.navigation:navigation-fragment-ktx:2.3.2'
+    implementation 'androidx.navigation:navigation-ui-ktx:2.3.2'
+    implementation 'androidx.navigation:navigation-fragment-ktx:2.3.2'
+    implementation 'androidx.navigation:navigation-ui-ktx:2.3.2'
+    implementation 'androidx.preference:preference-ktx:1.1.1'
+
+    implementation 'org.osmdroid:osmdroid-android:6.1.8'
+    implementation 'com.github.MKergall:osmbonuspack:6.6.0'
+
+    implementation 'com.getbase:floatingactionbutton:1.10.1'
 
     testImplementation 'junit:junit:4.12'
-    androidTestImplementation 'androidx.test.ext:junit:1.1.1'
-    androidTestImplementation 'androidx.test.espresso:espresso-core:3.2.0'
+    androidTestImplementation 'androidx.test.ext:junit:1.1.2'
+    androidTestImplementation 'androidx.test.espresso:espresso-core:3.3.0'
+
+    implementation "com.github.skydoves:colorpickerpreference:2.0.5"
 }
+
+// https://gist.github.com/Takhion/8245967
+Properties props = new Properties()
+def propFile = file(new File('signing.properties'))
+if (propFile.canRead()) {
+    props.load(new FileInputStream(propFile))
+    if (props != null &&
+            props.containsKey('STORE_FILE') &&
+            props.containsKey('STORE_PASSWORD') &&
+            props.containsKey('KEY_ALIAS') &&
+            props.containsKey('KEY_PASSWORD')) {
+        android.signingConfigs.release.storeFile = file(props['STORE_FILE'])
+        android.signingConfigs.release.storePassword = props['STORE_PASSWORD']
+        android.signingConfigs.release.keyAlias = props['KEY_ALIAS']
+        android.signingConfigs.release.keyPassword = props['KEY_PASSWORD']
+    } else {
+        println 'signing.properties found but some entries are missing'
+        android.buildTypes.release.signingConfig = null
+    }
+} else {
+    println 'signing.properties not found'
+    android.buildTypes.release.signingConfig = null
+}

app/src/androidTest/java/com/puuuuh/ingressmap/ExampleInstrumentedTest.kt

@@ -1,13 +1,11 @@
 package com.puuuuh.ingressmap
 
-import androidx.test.platform.app.InstrumentationRegistry
 import androidx.test.ext.junit.runners.AndroidJUnit4
-
+import androidx.test.platform.app.InstrumentationRegistry
+import org.junit.Assert.assertEquals
 import org.junit.Test
 import org.junit.runner.RunWith
 
-import org.junit.Assert.*
-
 /**
  * Instrumented test, which will execute on an Android device.
  *

app/src/debug/res/values/google_maps_api.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <string name="google_maps_key" templateMergeStrategy="preserve" translatable="false">AIzaSyBiNrgpSTqeXzVIm9DoWA8XlzhPiEzX6OM</string>
+</resources>

app/src/main/AndroidManifest.xml

@@ -7,7 +7,12 @@
     <uses-permission android:name="android.permission.ACCESS_COARSE_LOCATION" />
     <uses-permission android:name="android.permission.INTERNET" />
 
+    <queries>
+        <package android:name="com.android.vending" />
+    </queries>
+
     <application
+        android:name=".MainApplication"
         android:allowBackup="false"
         android:icon="@mipmap/ic_launcher"
         android:label="@string/app_name"
@@ -17,21 +22,64 @@
         android:usesCleartextTraffic="true"
         tools:targetApi="m">
 
-        <activity android:name="com.puuuuh.ingressmap.view.MapActivity" />
-        <meta-data
-            android:name="com.google.android.geo.API_KEY"
-            android:value="@string/google_maps_key" />
 
         <activity
-            android:name=".view.LoginActivity"
-            android:label="@string/title_activity_login" />
-        <activity android:name=".view.MainActivity" >
+            android:name=".MainActivity"
+            android:label="@string/title_activity_main">
+
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
-
                 <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
+
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.BROWSABLE" />
+                <category android:name="android.intent.category.DEFAULT" />
+
+                <data
+                    android:scheme="geo" />
+            </intent-filter>
+
+            <intent-filter>
+                <action android:name="android.intent.action.VIEW" />
+
+                <category android:name="android.intent.category.BROWSABLE" />
+                <category android:name="android.intent.category.DEFAULT" />
+
+                <data
+                    android:host="intel.ingress.com"
+                    android:pathPrefix="/intel"
+                    android:scheme="http" />
+                <data
+                    android:host="intel.ingress.com"
+                    android:pathPrefix="/intel"
+                    android:scheme="https" />
+                <data
+                    android:host="intel.ingress.com"
+                    android:pathPrefix="/"
+                    android:scheme="http" />
+                <data
+                    android:host="intel.ingress.com"
+                    android:pathPrefix="/"
+                    android:scheme="https" />
+
+            </intent-filter>
+
+            <meta-data
+                android:name="android.app.default_searchable"
+                android:value=".MainActivity" />
+
         </activity>
+
+        <meta-data
+            android:name="com.google.android.geo.API_KEY"
+            android:value="@string/google_maps_key" />
+
+        <activity
+            android:name=".view.LoginActivity"
+            android:label="@string/title_activity_login" />
     </application>
 
-</manifest>
+</manifest>

app/src/main/java/com/puuuuh/ingressmap/Application.kt

@@ -0,0 +1,42 @@
+package com.puuuuh.ingressmap
+
+import android.app.Application
+import android.content.Context
+import androidx.appcompat.app.AppCompatDelegate
+import com.google.gson.Gson
+import com.google.gson.GsonBuilder
+import com.puuuuh.ingressmap.model.*
+import com.puuuuh.ingressmap.settings.Settings
+
+// Not object class. AndroidManifest.xml error happen.
+class MainApplication : Application() {
+
+    init {
+        instance = this
+    }
+
+    companion object {
+        private var instance: MainApplication? = null
+        val gson: Gson = GsonBuilder()
+            .registerTypeAdapter(GameEntity::class.java, GameEntityDeserializer())
+            .registerTypeAdapter(FieldData::class.java, FieldDeserializer())
+            .registerTypeAdapter(LinkData::class.java, LinkDeserializer())
+            .registerTypeAdapter(Mod::class.java, ModDeserializer())
+            .registerTypeAdapter(Point::class.java, PointDeserializer())
+            .registerTypeAdapter(PortalData::class.java, PortalDeserializer())
+            .registerTypeAdapter(Resonator::class.java, ResonatorDeserializer())
+            .registerTypeAdapter(PlayerInfo::class.java, PlayerInfoDeserializer())
+            .create()
+
+        fun applicationContext(): Context {
+            return instance!!.applicationContext
+        }
+    }
+
+    override fun onCreate() {
+        super.onCreate()
+        val context = applicationContext()
+        Settings.init(context)
+        AppCompatDelegate.setDefaultNightMode(Settings.theme)
+    }
+}