Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Room Park Android
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Vladislav Bogdashkin
Room Park Android
Commits
1fa0544c
Commit
1fa0544c
authored
Mar 24, 2020
by
Vladislav Bogdashkin
🎣
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
added firebase services;
move to firebase-crashlytics
parent
3c537a2e
Changes
8
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
58 additions
and
16 deletions
+58
-16
Project.xml
.idea/codeStyles/Project.xml
+0
-3
build.gradle
app/build.gradle
+10
-5
google-services.json
app/google-services.json
+40
-0
AndroidManifest.xml
app/src/main/AndroidManifest.xml
+1
-1
RoomParkApplication.kt
...a/com/biganto/visual/roompark/base/RoomParkApplication.kt
+2
-3
RoomParkMainActivity.kt
.../com/biganto/visual/roompark/base/RoomParkMainActivity.kt
+1
-4
build.gradle
build.gradle
+3
-0
dependencies.gradle
dependencies.gradle
+1
-0
No files found.
.idea/codeStyles/Project.xml
View file @
1fa0544c
<component
name=
"ProjectCodeStyleConfiguration"
>
<component
name=
"ProjectCodeStyleConfiguration"
>
<code_scheme
name=
"Project"
version=
"173"
>
<code_scheme
name=
"Project"
version=
"173"
>
<AndroidXmlCodeStyleSettings>
<option
name=
"ARRANGEMENT_SETTINGS_MIGRATED_TO_191"
value=
"true"
/>
</AndroidXmlCodeStyleSettings>
<JetCodeStyleSettings>
<JetCodeStyleSettings>
<option
name=
"CODE_STYLE_DEFAULTS"
value=
"KOTLIN_OFFICIAL"
/>
<option
name=
"CODE_STYLE_DEFAULTS"
value=
"KOTLIN_OFFICIAL"
/>
</JetCodeStyleSettings>
</JetCodeStyleSettings>
...
...
app/build.gradle
View file @
1fa0544c
...
@@ -10,6 +10,10 @@ apply from: '../dependencies.gradle'
...
@@ -10,6 +10,10 @@ apply from: '../dependencies.gradle'
apply
plugin:
'kotlinx-serialization'
apply
plugin:
'kotlinx-serialization'
apply
plugin:
'com.google.gms.google-services'
apply
plugin:
'com.google.firebase.crashlytics'
//apply plugin: 'io.fabric'
//apply plugin: 'io.fabric'
android
{
android
{
...
@@ -80,11 +84,6 @@ dependencies {
...
@@ -80,11 +84,6 @@ dependencies {
//Logger: Timber
//Logger: Timber
implementation
"com.jakewharton.timber:timber:$timberVersion"
implementation
"com.jakewharton.timber:timber:$timberVersion"
//Crashlytics
implementation
(
'com.crashlytics.sdk.android:crashlytics:2.10.0@aar'
)
{
transitive
=
true
;
}
//RxJava
//RxJava
implementation
"io.reactivex.rxjava3:rxjava:$rxJavaVersion"
implementation
"io.reactivex.rxjava3:rxjava:$rxJavaVersion"
...
@@ -162,6 +161,12 @@ dependencies {
...
@@ -162,6 +161,12 @@ dependencies {
implementation
'jp.wasabeef:glide-transformations:4.0.0'
implementation
'jp.wasabeef:glide-transformations:4.0.0'
kapt
"com.github.bumptech.glide:compiler:$glideVersion"
kapt
"com.github.bumptech.glide:compiler:$glideVersion"
//Firebase
implementation
"com.google.firebase:firebase-analytics:$fireBaseVersion"
//CrshLytics
implementation
'com.google.firebase:firebase-crashlytics:17.0.0-beta02'
//Tests
//Tests
testImplementation
'junit:junit:4.12'
testImplementation
'junit:junit:4.12'
androidTestImplementation
'androidx.test:runner:1.2.0'
androidTestImplementation
'androidx.test:runner:1.2.0'
...
...
app/google-services.json
0 → 100644
View file @
1fa0544c
{
"project_info"
:
{
"project_number"
:
"740988198336"
,
"firebase_url"
:
"https://room-park-9cc38.firebaseio.com"
,
"project_id"
:
"room-park-9cc38"
,
"storage_bucket"
:
"room-park-9cc38.appspot.com"
},
"client"
:
[
{
"client_info"
:
{
"mobilesdk_app_id"
:
"1:740988198336:android:0fd03bfcfa85b78dae3c25"
,
"android_client_info"
:
{
"package_name"
:
"com.biganto.visual.roompark"
}
},
"oauth_client"
:
[
{
"client_id"
:
"740988198336-8c08r8mikgulg2s08p0fgi5j028rhn4u.apps.googleusercontent.com"
,
"client_type"
:
3
}
],
"api_key"
:
[
{
"current_key"
:
"AIzaSyBvrvu2Iz2FGEf7S_DVaSwQmhuijIuW2SU"
}
],
"services"
:
{
"appinvite_service"
:
{
"other_platform_oauth_client"
:
[
{
"client_id"
:
"740988198336-8c08r8mikgulg2s08p0fgi5j028rhn4u.apps.googleusercontent.com"
,
"client_type"
:
3
}
]
}
}
}
],
"configuration_version"
:
"1"
}
\ No newline at end of file
app/src/main/AndroidManifest.xml
View file @
1fa0544c
...
@@ -11,10 +11,10 @@
...
@@ -11,10 +11,10 @@
android:label=
"@string/app_name"
android:label=
"@string/app_name"
android:roundIcon=
"@mipmap/ic_launcher_round"
android:roundIcon=
"@mipmap/ic_launcher_round"
android:supportsRtl=
"true"
android:supportsRtl=
"true"
android:screenOrientation=
"userPortrait"
android:theme=
"@style/AppTheme.Launch"
>
android:theme=
"@style/AppTheme.Launch"
>
<activity
android:name=
".base.RoomParkMainActivity"
<activity
android:name=
".base.RoomParkMainActivity"
android:configChanges=
"fontScale|keyboard|keyboardHidden|locale|mnc|mcc|navigation|orientation|screenLayout|screenSize|smallestScreenSize|uiMode|touchscreen"
android:configChanges=
"fontScale|keyboard|keyboardHidden|locale|mnc|mcc|navigation|orientation|screenLayout|screenSize|smallestScreenSize|uiMode|touchscreen"
android:screenOrientation=
"portrait"
android:windowSoftInputMode=
"stateHidden|adjustPan"
>
android:windowSoftInputMode=
"stateHidden|adjustPan"
>
<intent-filter>
<intent-filter>
<action
android:name=
"android.intent.action.MAIN"
/>
<action
android:name=
"android.intent.action.MAIN"
/>
...
...
app/src/main/java/com/biganto/visual/roompark/base/RoomParkApplication.kt
View file @
1fa0544c
...
@@ -4,7 +4,6 @@ import android.util.Log
...
@@ -4,7 +4,6 @@ import android.util.Log
import
com.biganto.visual.roompark.BuildConfig
import
com.biganto.visual.roompark.BuildConfig
import
com.biganto.visual.roompark.di.dagger.AppComponent
import
com.biganto.visual.roompark.di.dagger.AppComponent
import
com.biganto.visual.roompark.di.dagger.DaggerAppComponent
import
com.biganto.visual.roompark.di.dagger.DaggerAppComponent
import
com.crashlytics.android.Crashlytics
import
dagger.android.AndroidInjector
import
dagger.android.AndroidInjector
import
dagger.android.DaggerApplication
import
dagger.android.DaggerApplication
import
timber.log.Timber
import
timber.log.Timber
...
@@ -42,7 +41,7 @@ class RoomParkApplication : DaggerApplication() {
...
@@ -42,7 +41,7 @@ class RoomParkApplication : DaggerApplication() {
override
fun
log
(
priority
:
Int
,
tag
:
String
?,
message
:
String
,
throwable
:
Throwable
?)
{
override
fun
log
(
priority
:
Int
,
tag
:
String
?,
message
:
String
,
throwable
:
Throwable
?)
{
if
(
priority
==
Log
.
VERBOSE
||
priority
==
Log
.
DEBUG
)
return
if
(
priority
==
Log
.
VERBOSE
||
priority
==
Log
.
DEBUG
)
return
Crashlytics
.
log
(
priority
,
tag
,
message
)
//
Crashlytics.log(priority, tag, message)
throwable
?.
let
{
Crashlytics
.
logException
(
it
)
}
//
throwable?.let { Crashlytics.logException(it) }
}
}
}
}
\ No newline at end of file
app/src/main/java/com/biganto/visual/roompark/base/RoomParkMainActivity.kt
View file @
1fa0544c
...
@@ -9,7 +9,6 @@ import androidx.coordinatorlayout.widget.CoordinatorLayout
...
@@ -9,7 +9,6 @@ import androidx.coordinatorlayout.widget.CoordinatorLayout
import
androidx.core.view.isGone
import
androidx.core.view.isGone
import
butterknife.BindView
import
butterknife.BindView
import
butterknife.ButterKnife
import
butterknife.ButterKnife
import
com.biganto.visual.roompark.BuildConfig
import
com.biganto.visual.roompark.R
import
com.biganto.visual.roompark.R
import
com.biganto.visual.roompark.presentation.screen.splash.SplashScreenController
import
com.biganto.visual.roompark.presentation.screen.splash.SplashScreenController
import
com.biganto.visual.roompark.util.extensions.setGone
import
com.biganto.visual.roompark.util.extensions.setGone
...
@@ -17,11 +16,9 @@ import com.biganto.visual.roompark.util.view_utils.app_bar.DragControlAppBarLayo
...
@@ -17,11 +16,9 @@ import com.biganto.visual.roompark.util.view_utils.app_bar.DragControlAppBarLayo
import
com.bluelinelabs.conductor.Conductor
import
com.bluelinelabs.conductor.Conductor
import
com.bluelinelabs.conductor.Router
import
com.bluelinelabs.conductor.Router
import
com.bluelinelabs.conductor.RouterTransaction
import
com.bluelinelabs.conductor.RouterTransaction
import
com.crashlytics.android.Crashlytics
import
com.google.android.material.appbar.AppBarLayout
import
com.google.android.material.appbar.AppBarLayout
import
com.google.android.material.bottomnavigation.BottomNavigationView
import
com.google.android.material.bottomnavigation.BottomNavigationView
import
com.google.android.material.textview.MaterialTextView
import
com.google.android.material.textview.MaterialTextView
import
io.fabric.sdk.android.Fabric
import
kotlinx.android.synthetic.main.activity_main.*
import
kotlinx.android.synthetic.main.activity_main.*
import
kotlinx.android.synthetic.main.status_layout_toolbar.view.*
import
kotlinx.android.synthetic.main.status_layout_toolbar.view.*
import
kotlinx.android.synthetic.main.switch_toolbar.view.*
import
kotlinx.android.synthetic.main.switch_toolbar.view.*
...
@@ -53,7 +50,7 @@ class RoomParkMainActivity(
...
@@ -53,7 +50,7 @@ class RoomParkMainActivity(
setTheme
(
R
.
style
.
AppTheme
)
setTheme
(
R
.
style
.
AppTheme
)
super
.
onCreate
(
savedInstanceState
)
super
.
onCreate
(
savedInstanceState
)
if
(!
BuildConfig
.
DEBUG
)
Fabric
.
with
(
this
,
Crashlytics
())
//
if (!BuildConfig.DEBUG) Fabric.with(this, Crashlytics())
setContentView
(
R
.
layout
.
activity_main
)
setContentView
(
R
.
layout
.
activity_main
)
...
...
build.gradle
View file @
1fa0544c
...
@@ -14,6 +14,9 @@ buildscript {
...
@@ -14,6 +14,9 @@ buildscript {
classpath
"com.android.tools.build:gradle:3.6.1"
classpath
"com.android.tools.build:gradle:3.6.1"
classpath
"org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath
"org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
classpath
"org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
classpath
"org.jetbrains.kotlin:kotlin-serialization:$kotlin_version"
classpath
'com.google.gms:google-services:4.3.3'
classpath
'com.google.firebase:firebase-crashlytics-gradle:2.0.0-beta03'
// NOTE: Do not place your application dependencies here; they belong
// NOTE: Do not place your application dependencies here; they belong
// in the individual module build.gradle files
// in the individual module build.gradle files
}
}
...
...
dependencies.gradle
View file @
1fa0544c
...
@@ -27,4 +27,5 @@ ext {
...
@@ -27,4 +27,5 @@ ext {
photoViewVersion
=
"2.0.0"
photoViewVersion
=
"2.0.0"
viewPager2Version
=
"1.0.0"
viewPager2Version
=
"1.0.0"
glideVersion
=
"4.11.0"
glideVersion
=
"4.11.0"
fireBaseVersion
=
"17.2.3"
}
}
\ No newline at end of file
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment