diff --git a/app/build.gradle b/app/build.gradle index 182269ea..9198b207 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -1,11 +1,24 @@ apply plugin: 'com.android.application' - apply plugin: 'kotlin-android' - apply plugin: 'kotlin-android-extensions' +apply plugin: 'kotlin-android' +apply plugin: 'kotlin-kapt' +apply plugin: 'realm-android' +apply plugin: 'io.fabric' + +repositories { + maven { url 'https://maven.fabric.io/public' } +} android { + compileSdkVersion 28 + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_8 + targetCompatibility JavaVersion.VERSION_1_8 + } + defaultConfig { applicationId "net.pokeranalytics.android" minSdkVersion 23 @@ -14,24 +27,41 @@ android { versionName "1.0" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" } + buildTypes { release { minifyEnabled false proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro' } } + } dependencies { implementation fileTree(dir: 'libs', include: ['*.jar']) implementation"org.jetbrains.kotlin:kotlin-stdlib-jdk7:$kotlin_version" - implementation 'androidx.appcompat:appcompat:1.0.0-beta01' + // Android + implementation 'androidx.appcompat:appcompat:1.0.2' implementation 'androidx.core:core-ktx:1.1.0-alpha04' - implementation 'com.google.android.material:material:1.0.0-beta01' - implementation 'androidx.constraintlayout:constraintlayout:1.1.2' + implementation 'com.google.android.material:material:1.0.0' + implementation 'androidx.constraintlayout:constraintlayout:1.1.3' + implementation 'androidx.lifecycle:lifecycle-extensions:2.0.0' + + // Firebase + implementation 'com.google.firebase:firebase-core:16.0.7' + // Crashlytics + implementation 'com.crashlytics.sdk.android:crashlytics:2.9.9' + + // Kotlin + implementation 'org.jetbrains.kotlinx:kotlinx-coroutines-core:1.1.1' + + + // Test testImplementation 'junit:junit:4.12' androidTestImplementation 'androidx.test:runner:1.1.0-alpha4' androidTestImplementation 'androidx.test.espresso:espresso-core:3.1.0-alpha4' } + +apply plugin: 'com.google.gms.google-services' \ No newline at end of file diff --git a/app/google-services.json b/app/google-services.json new file mode 100644 index 00000000..f242d7b2 --- /dev/null +++ b/app/google-services.json @@ -0,0 +1,55 @@ +{ + "project_info": { + "project_number": "245968016816", + "firebase_url": "https://poker-analytics-97998.firebaseio.com", + "project_id": "poker-analytics-97998", + "storage_bucket": "poker-analytics-97998.appspot.com" + }, + "client": [ + { + "client_info": { + "mobilesdk_app_id": "1:245968016816:android:47f8b4f74b1296b4", + "android_client_info": { + "package_name": "net.pokeranalytics.android" + } + }, + "oauth_client": [ + { + "client_id": "245968016816-tr2mo4kbe1acn8u3ebbd9nk29iuk8fqr.apps.googleusercontent.com", + "client_type": 1, + "android_info": { + "package_name": "net.pokeranalytics.android", + "certificate_hash": "e26278fa6db56acde23b0ff5981692f7f60408b9" + } + }, + { + "client_id": "245968016816-756j040n0luup2nlfu9e49qm9jv0oih2.apps.googleusercontent.com", + "client_type": 3 + } + ], + "api_key": [ + { + "current_key": "AIzaSyDERILd3hSujwzqHcS4CyQjiDI7J6WvNZ4" + } + ], + "services": { + "analytics_service": { + "status": 1 + }, + "appinvite_service": { + "status": 2, + "other_platform_oauth_client": [ + { + "client_id": "245968016816-756j040n0luup2nlfu9e49qm9jv0oih2.apps.googleusercontent.com", + "client_type": 3 + } + ] + }, + "ads_service": { + "status": 2 + } + } + } + ], + "configuration_version": "1" +} \ No newline at end of file diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index afd2d9d8..1cc27c9c 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -8,9 +8,11 @@ android:label="@string/app_name" android:roundIcon="@mipmap/ic_launcher_round" android:supportsRtl="true" + android:name=".PokerAnalyticsApplication" android:theme="@style/AppTheme"> + @@ -18,6 +20,7 @@ + \ No newline at end of file diff --git a/app/src/main/java/net/pokeranalytics/android/PokerAnalyticsApplication.kt b/app/src/main/java/net/pokeranalytics/android/PokerAnalyticsApplication.kt new file mode 100644 index 00000000..7addeb66 --- /dev/null +++ b/app/src/main/java/net/pokeranalytics/android/PokerAnalyticsApplication.kt @@ -0,0 +1,13 @@ +package net.pokeranalytics.android + +import android.app.Application + +class PokerAnalyticsApplication: Application() { + + override fun onCreate() { + super.onCreate() + + + } + +} \ No newline at end of file diff --git a/app/src/main/java/net/pokeranalytics/android/MainActivity.kt b/app/src/main/java/net/pokeranalytics/android/ui/activity/MainActivity.kt similarity index 93% rename from app/src/main/java/net/pokeranalytics/android/MainActivity.kt rename to app/src/main/java/net/pokeranalytics/android/ui/activity/MainActivity.kt index 8fcb919f..6055c953 100644 --- a/app/src/main/java/net/pokeranalytics/android/MainActivity.kt +++ b/app/src/main/java/net/pokeranalytics/android/ui/activity/MainActivity.kt @@ -1,9 +1,10 @@ -package net.pokeranalytics.android +package net.pokeranalytics.android.ui.activity import android.os.Bundle import com.google.android.material.bottomnavigation.BottomNavigationView import androidx.appcompat.app.AppCompatActivity import kotlinx.android.synthetic.main.activity_main.* +import net.pokeranalytics.android.R class MainActivity : AppCompatActivity() { diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 05466031..2be04d4c 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -6,7 +6,7 @@ android:id="@+id/container" android:layout_width="match_parent" android:layout_height="match_parent" - tools:context=".MainActivity"> + tools:context=".ui.activity.MainActivity">