mirror of https://github.com/YTVanced/VancedMicroG
merge
This commit is contained in:
commit
1062253727
|
@ -37,6 +37,5 @@ android {
|
||||||
|
|
||||||
dependencies {
|
dependencies {
|
||||||
api project(':play-services-basement')
|
api project(':play-services-basement')
|
||||||
|
|
||||||
api project(':play-services-base-api')
|
api project(':play-services-base-api')
|
||||||
}
|
}
|
||||||
|
|
|
@ -26,13 +26,13 @@ String getMyVersionName() {
|
||||||
}
|
}
|
||||||
|
|
||||||
android {
|
android {
|
||||||
compileSdkVersion androidCompileSdk()
|
compileSdkVersion androidCompileSdk
|
||||||
buildToolsVersion "$androidBuildVersionTools"
|
buildToolsVersion "$androidBuildVersionTools"
|
||||||
|
|
||||||
defaultConfig {
|
defaultConfig {
|
||||||
versionName getMyVersionName()
|
versionName version
|
||||||
minSdkVersion androidMinSdk()
|
minSdkVersion androidMinSdk
|
||||||
targetSdkVersion androidTargetSdk()
|
targetSdkVersion androidTargetSdk
|
||||||
}
|
}
|
||||||
|
|
||||||
compileOptions {
|
compileOptions {
|
||||||
|
|
|
@ -40,7 +40,7 @@ dependencies {
|
||||||
implementation "androidx.appcompat:appcompat:$appcompatVersion"
|
implementation "androidx.appcompat:appcompat:$appcompatVersion"
|
||||||
implementation "androidx.mediarouter:mediarouter:$mediarouterVersion"
|
implementation "androidx.mediarouter:mediarouter:$mediarouterVersion"
|
||||||
implementation "androidx.preference:preference:$preferenceVersion"
|
implementation "androidx.preference:preference:$preferenceVersion"
|
||||||
implementation "androidx.navigation:navigation:$navigationVersion"
|
implementation "androidx.navigation:navigation-fragment:$navigationVersion"
|
||||||
implementation "androidx.navigation:navigation-ui:$navigationVersion"
|
implementation "androidx.navigation:navigation-ui:$navigationVersion"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -14,52 +14,52 @@
|
||||||
<action
|
<action
|
||||||
android:id="@+id/openUnifiedNlpSettings"
|
android:id="@+id/openUnifiedNlpSettings"
|
||||||
app:destination="@id/nav_unlp"
|
app:destination="@id/nav_unlp"
|
||||||
app:enterAnim="@android:anim/fragment_open_enter"
|
app:enterAnim="@anim/fragment_open_enter"
|
||||||
app:exitAnim="@android:anim/fragment_open_exit"
|
app:exitAnim="@anim/fragment_open_exit"
|
||||||
app:popEnterAnim="@android:anim/fragment_close_enter"
|
app:popEnterAnim="@anim/fragment_close_enter"
|
||||||
app:popExitAnim="@android:anim/fragment_close_exit" />
|
app:popExitAnim="@anim/fragment_close_exit" />
|
||||||
<action
|
<action
|
||||||
android:id="@+id/openSelfcheck"
|
android:id="@+id/openSelfcheck"
|
||||||
app:destination="@id/selfcheckFragment"
|
app:destination="@id/selfcheckFragment"
|
||||||
app:enterAnim="@android:anim/fragment_open_enter"
|
app:enterAnim="@anim/fragment_open_enter"
|
||||||
app:exitAnim="@android:anim/fragment_open_exit"
|
app:exitAnim="@anim/fragment_open_exit"
|
||||||
app:popEnterAnim="@android:anim/fragment_close_enter"
|
app:popEnterAnim="@anim/fragment_close_enter"
|
||||||
app:popExitAnim="@android:anim/fragment_close_exit" />
|
app:popExitAnim="@anim/fragment_close_exit" />
|
||||||
<action
|
<action
|
||||||
android:id="@+id/openCheckinSettings"
|
android:id="@+id/openCheckinSettings"
|
||||||
app:destination="@id/checkinFragment"
|
app:destination="@id/checkinFragment"
|
||||||
app:enterAnim="@android:anim/fragment_open_enter"
|
app:enterAnim="@anim/fragment_open_enter"
|
||||||
app:exitAnim="@android:anim/fragment_open_exit"
|
app:exitAnim="@anim/fragment_open_exit"
|
||||||
app:popEnterAnim="@android:anim/fragment_close_enter"
|
app:popEnterAnim="@anim/fragment_close_enter"
|
||||||
app:popExitAnim="@android:anim/fragment_close_exit" />
|
app:popExitAnim="@anim/fragment_close_exit" />
|
||||||
<action
|
<action
|
||||||
android:id="@+id/openGcmSettings"
|
android:id="@+id/openGcmSettings"
|
||||||
app:destination="@id/gcmFragment"
|
app:destination="@id/gcmFragment"
|
||||||
app:enterAnim="@android:anim/fragment_open_enter"
|
app:enterAnim="@anim/fragment_open_enter"
|
||||||
app:exitAnim="@android:anim/fragment_open_exit"
|
app:exitAnim="@anim/fragment_open_exit"
|
||||||
app:popEnterAnim="@android:anim/fragment_close_enter"
|
app:popEnterAnim="@anim/fragment_close_enter"
|
||||||
app:popExitAnim="@android:anim/fragment_close_exit" />
|
app:popExitAnim="@anim/fragment_close_exit" />
|
||||||
<action
|
<action
|
||||||
android:id="@+id/openSafetyNetSettings"
|
android:id="@+id/openSafetyNetSettings"
|
||||||
app:destination="@id/safetyNetFragment"
|
app:destination="@id/safetyNetFragment"
|
||||||
app:enterAnim="@android:anim/fragment_open_enter"
|
app:enterAnim="@anim/fragment_open_enter"
|
||||||
app:exitAnim="@android:anim/fragment_open_exit"
|
app:exitAnim="@anim/fragment_open_exit"
|
||||||
app:popEnterAnim="@android:anim/fragment_close_enter"
|
app:popEnterAnim="@anim/fragment_close_enter"
|
||||||
app:popExitAnim="@android:anim/fragment_close_exit" />
|
app:popExitAnim="@anim/fragment_close_exit" />
|
||||||
<action
|
<action
|
||||||
android:id="@+id/openMoreGoogleSettings"
|
android:id="@+id/openMoreGoogleSettings"
|
||||||
app:destination="@id/googleMoreFragment"
|
app:destination="@id/googleMoreFragment"
|
||||||
app:enterAnim="@android:anim/fragment_open_enter"
|
app:enterAnim="@anim/fragment_open_enter"
|
||||||
app:exitAnim="@android:anim/fragment_open_exit"
|
app:exitAnim="@anim/fragment_open_exit"
|
||||||
app:popEnterAnim="@android:anim/fragment_close_enter"
|
app:popEnterAnim="@anim/fragment_close_enter"
|
||||||
app:popExitAnim="@android:anim/fragment_close_exit" />
|
app:popExitAnim="@anim/fragment_close_exit" />
|
||||||
<action
|
<action
|
||||||
android:id="@+id/openAbout"
|
android:id="@+id/openAbout"
|
||||||
app:destination="@id/aboutFragment"
|
app:destination="@id/aboutFragment"
|
||||||
app:enterAnim="@android:anim/fragment_open_enter"
|
app:enterAnim="@anim/fragment_open_enter"
|
||||||
app:exitAnim="@android:anim/fragment_open_exit"
|
app:exitAnim="@anim/fragment_open_exit"
|
||||||
app:popEnterAnim="@android:anim/fragment_close_enter"
|
app:popEnterAnim="@anim/fragment_close_enter"
|
||||||
app:popExitAnim="@android:anim/fragment_close_exit" />
|
app:popExitAnim="@anim/fragment_close_exit" />
|
||||||
</fragment>
|
</fragment>
|
||||||
|
|
||||||
<fragment
|
<fragment
|
||||||
|
@ -79,24 +79,24 @@
|
||||||
<action
|
<action
|
||||||
android:id="@+id/openGcmAppDetails"
|
android:id="@+id/openGcmAppDetails"
|
||||||
app:destination="@id/gcmAppFragment"
|
app:destination="@id/gcmAppFragment"
|
||||||
app:enterAnim="@android:anim/fragment_open_enter"
|
app:enterAnim="@anim/fragment_open_enter"
|
||||||
app:exitAnim="@android:anim/fragment_open_exit"
|
app:exitAnim="@anim/fragment_open_exit"
|
||||||
app:popEnterAnim="@android:anim/fragment_close_enter"
|
app:popEnterAnim="@anim/fragment_close_enter"
|
||||||
app:popExitAnim="@android:anim/fragment_close_exit" />
|
app:popExitAnim="@anim/fragment_close_exit" />
|
||||||
<action
|
<action
|
||||||
android:id="@+id/openAllGcmApps"
|
android:id="@+id/openAllGcmApps"
|
||||||
app:destination="@id/gcmAllAppsFragment"
|
app:destination="@id/gcmAllAppsFragment"
|
||||||
app:enterAnim="@android:anim/fragment_open_enter"
|
app:enterAnim="@anim/fragment_open_enter"
|
||||||
app:exitAnim="@android:anim/fragment_open_exit"
|
app:exitAnim="@anim/fragment_open_exit"
|
||||||
app:popEnterAnim="@android:anim/fragment_close_enter"
|
app:popEnterAnim="@anim/fragment_close_enter"
|
||||||
app:popExitAnim="@android:anim/fragment_close_exit" />
|
app:popExitAnim="@anim/fragment_close_exit" />
|
||||||
<action
|
<action
|
||||||
android:id="@+id/openGcmAdvancedSettings"
|
android:id="@+id/openGcmAdvancedSettings"
|
||||||
app:destination="@id/gcmAdvancedFragment"
|
app:destination="@id/gcmAdvancedFragment"
|
||||||
app:enterAnim="@android:anim/fragment_open_enter"
|
app:enterAnim="@anim/fragment_open_enter"
|
||||||
app:exitAnim="@android:anim/fragment_open_exit"
|
app:exitAnim="@anim/fragment_open_exit"
|
||||||
app:popEnterAnim="@android:anim/fragment_close_enter"
|
app:popEnterAnim="@anim/fragment_close_enter"
|
||||||
app:popExitAnim="@android:anim/fragment_close_exit" />
|
app:popExitAnim="@anim/fragment_close_exit" />
|
||||||
</fragment>
|
</fragment>
|
||||||
<fragment
|
<fragment
|
||||||
android:id="@+id/gcmAllAppsFragment"
|
android:id="@+id/gcmAllAppsFragment"
|
||||||
|
@ -105,10 +105,10 @@
|
||||||
<action
|
<action
|
||||||
android:id="@+id/openGcmAppDetailsFromAll"
|
android:id="@+id/openGcmAppDetailsFromAll"
|
||||||
app:destination="@id/gcmAppFragment"
|
app:destination="@id/gcmAppFragment"
|
||||||
app:enterAnim="@android:anim/fragment_open_enter"
|
app:enterAnim="@anim/fragment_open_enter"
|
||||||
app:exitAnim="@android:anim/fragment_open_exit"
|
app:exitAnim="@anim/fragment_open_exit"
|
||||||
app:popEnterAnim="@android:anim/fragment_close_enter"
|
app:popEnterAnim="@anim/fragment_close_enter"
|
||||||
app:popExitAnim="@android:anim/fragment_close_exit" />
|
app:popExitAnim="@anim/fragment_close_exit" />
|
||||||
</fragment>
|
</fragment>
|
||||||
<fragment
|
<fragment
|
||||||
android:id="@+id/gcmAppFragment"
|
android:id="@+id/gcmAppFragment"
|
||||||
|
@ -130,10 +130,10 @@
|
||||||
<action
|
<action
|
||||||
android:id="@+id/openSafetyNetAdvancedSettings"
|
android:id="@+id/openSafetyNetAdvancedSettings"
|
||||||
app:destination="@id/safetyNetAdvancedFragment"
|
app:destination="@id/safetyNetAdvancedFragment"
|
||||||
app:enterAnim="@android:anim/fragment_open_enter"
|
app:enterAnim="@anim/fragment_open_enter"
|
||||||
app:exitAnim="@android:anim/fragment_open_exit"
|
app:exitAnim="@anim/fragment_open_exit"
|
||||||
app:popEnterAnim="@android:anim/fragment_close_enter"
|
app:popEnterAnim="@anim/fragment_close_enter"
|
||||||
app:popExitAnim="@android:anim/fragment_close_exit" />
|
app:popExitAnim="@anim/fragment_close_exit" />
|
||||||
</fragment>
|
</fragment>
|
||||||
<fragment
|
<fragment
|
||||||
android:id="@+id/safetyNetAdvancedFragment"
|
android:id="@+id/safetyNetAdvancedFragment"
|
||||||
|
|
Loading…
Reference in New Issue