mirror of
https://github.com/TeamVanced/VancedMicroG
synced 2024-12-24 03:35:50 +01:00
added androidx navigation library
This commit is contained in:
X1nto
parent
2e84a5665d
commit
569a337c07
@ -40,6 +40,8 @@ dependencies {
|
||||
implementation "androidx.appcompat:appcompat:$appcompatVersion"
|
||||
implementation "androidx.mediarouter:mediarouter:$mediarouterVersion"
|
||||
implementation "androidx.preference:preference:$preferenceVersion"
|
||||
implementation "androidx.navigation:navigation:$navigationVersion"
|
||||
implementation "androidx.navigation:navigation-ui:$navigationVersion"
|
||||
}
|
||||
|
||||
android {
|
||||
|
||||
@ -1,107 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
~ Copyright (C) 2013-2017 microG Project Team
|
||||
~
|
||||
~ Licensed under the Apache License, Version 2.0 (the "License");
|
||||
~ you may not use this file except in compliance with the License.
|
||||
~ You may obtain a copy of the License at
|
||||
~
|
||||
~ http://www.apache.org/licenses/LICENSE-2.0
|
||||
~
|
||||
~ Unless required by applicable law or agreed to in writing, software
|
||||
~ distributed under the License is distributed on an "AS IS" BASIS,
|
||||
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
~ See the License for the specific language governing permissions and
|
||||
~ limitations under the License.
|
||||
-->
|
||||
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical">
|
||||
|
||||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="center_horizontal"
|
||||
android:paddingTop="10dp"
|
||||
android:text="@string/games_title"
|
||||
android:textColor="?attr/colorPrimary"/>
|
||||
|
||||
<View
|
||||
android:id="@+id/no_progress_bar"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="1dp"
|
||||
android:layout_marginBottom="10dp"
|
||||
android:layout_marginTop="10dp"
|
||||
android:background="@color/dialog_border_color"/>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center_horizontal"
|
||||
android:paddingTop="15dp">
|
||||
|
||||
<FrameLayout
|
||||
android:layout_width="64dp"
|
||||
android:layout_height="64dp"
|
||||
android:layout_marginEnd="-3dp"
|
||||
android:layout_marginRight="-3dp"
|
||||
android:background="@drawable/circle_shape_background"
|
||||
android:padding="10dp">
|
||||
|
||||
<ImageView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:src="@drawable/ic_gamepad"/>
|
||||
</FrameLayout>
|
||||
|
||||
<FrameLayout
|
||||
android:layout_width="64dp"
|
||||
android:layout_height="64dp"
|
||||
android:layout_marginLeft="-3dp"
|
||||
android:layout_marginStart="-3dp"
|
||||
android:background="@drawable/circle_shape_background"
|
||||
android:padding="10dp">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/app_icon"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:src="@mipmap/ic_core_service_app"/>
|
||||
</FrameLayout>
|
||||
</LinearLayout>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/title"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:gravity="center_horizontal"
|
||||
android:padding="15dp"
|
||||
android:text="@string/games_info_title"
|
||||
android:textColor="?attr/colorAccent"
|
||||
android:textSize="18sp"/>
|
||||
|
||||
<TextView
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:padding="10dp"
|
||||
android:text="@string/games_info_content"/>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="end"
|
||||
android:orientation="horizontal"
|
||||
android:paddingBottom="5dp"
|
||||
android:paddingLeft="10dp"
|
||||
android:paddingRight="10dp">
|
||||
|
||||
<Button
|
||||
android:id="@android:id/button1"
|
||||
style="?attr/buttonBarButtonStyle"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:text="@android:string/ok"/>
|
||||
</LinearLayout>
|
||||
</LinearLayout>
|
||||
@ -1,133 +0,0 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<!--
|
||||
~ Copyright (C) 2013-2017 microG Project Team
|
||||
~
|
||||
~ Licensed under the Apache License, Version 2.0 (the "License");
|
||||
~ you may not use this file except in compliance with the License.
|
||||
~ You may obtain a copy of the License at
|
||||
~
|
||||
~ http://www.apache.org/licenses/LICENSE-2.0
|
||||
~
|
||||
~ Unless required by applicable law or agreed to in writing, software
|
||||
~ distributed under the License is distributed on an "AS IS" BASIS,
|
||||
~ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
~ See the License for the specific language governing permissions and
|
||||
~ limitations under the License.
|
||||
-->
|
||||
|
||||
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"
|
||||
android:orientation="vertical">
|
||||
|
||||
<include layout="@layout/toolbar"/>
|
||||
|
||||
<RelativeLayout
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="0dip"
|
||||
android:layout_weight="1">
|
||||
|
||||
<!-- <org.microg.gms.maps.vtm.BackendMapView
|
||||
android:id="@+id/map"
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="match_parent"/>
|
||||
|
||||
<ImageView
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_centerInParent="true"
|
||||
android:paddingBottom="41dip"
|
||||
android:src="@drawable/maps_default_marker"/>-->
|
||||
</RelativeLayout>
|
||||
|
||||
<LinearLayout
|
||||
android:id="@+id/place_picker_select"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="72dp"
|
||||
android:background="?attr/selectableItemBackground"
|
||||
android:clickable="true"
|
||||
android:orientation="horizontal">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/place_picker_icon"
|
||||
android:layout_width="32.0dip"
|
||||
android:layout_height="72dp"
|
||||
android:layout_gravity="top"
|
||||
android:layout_marginEnd="16.0dip"
|
||||
android:layout_marginLeft="16.0dip"
|
||||
android:layout_marginRight="16.0dip"
|
||||
android:layout_marginStart="16.0dip"
|
||||
android:src="@drawable/ic_map_marker"/>
|
||||
|
||||
<FrameLayout
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="fill_parent">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/place_picker_title"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="top"
|
||||
android:layout_marginTop="12.0dip"
|
||||
android:ellipsize="end"
|
||||
android:maxLines="1"
|
||||
android:text="@string/place_picker_select_title"
|
||||
android:textAppearance="?android:textAppearanceMedium"
|
||||
android:textColor="?attr/colorAccent"/>
|
||||
|
||||
<TextView
|
||||
android:id="@+id/place_picker_info"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="top"
|
||||
android:layout_marginTop="36.0dip"
|
||||
android:ellipsize="end"
|
||||
android:lines="1"
|
||||
android:text="(0.0000000, 0.0000000)"
|
||||
android:textAppearance="?android:textAppearanceSmall"/>
|
||||
</FrameLayout>
|
||||
</LinearLayout>
|
||||
|
||||
<View
|
||||
android:layout_width="match_parent"
|
||||
android:layout_height="2dp"
|
||||
android:background="#7f7f7f7f"/>
|
||||
|
||||
<LinearLayout
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="wrap_content"
|
||||
android:background="#fff1f1f1"
|
||||
android:focusable="false"
|
||||
android:orientation="vertical"
|
||||
android:paddingLeft="8.0dip"
|
||||
android:paddingRight="8.0dip">
|
||||
|
||||
<TextView
|
||||
android:id="@id/title"
|
||||
android:layout_width="fill_parent"
|
||||
android:layout_height="40.0dip"
|
||||
android:gravity="center_vertical"
|
||||
android:paddingLeft="8.0dip"
|
||||
android:text="@string/place_picker_nearby_places"
|
||||
android:textAllCaps="true"
|
||||
android:textAppearance="?android:textAppearanceSmall"
|
||||
android:textColor="#ff7f7f7f"
|
||||
android:textStyle="bold"/>
|
||||
|
||||
<RelativeLayout
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:layout_gravity="center_horizontal">
|
||||
|
||||
<TextView
|
||||
android:id="@+id/hint"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:padding="16.0dip"
|
||||
android:text="Can't load nearby places."
|
||||
android:textAppearance="?android:textAppearanceLarge"
|
||||
android:textColor="#ff7f7f7f"/>
|
||||
</RelativeLayout>
|
||||
</LinearLayout>
|
||||
|
||||
</LinearLayout>
|
||||
@ -1,5 +1,6 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<navigation xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
<navigation
|
||||
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||
xmlns:app="http://schemas.android.com/apk/res-auto"
|
||||
xmlns:tools="http://schemas.android.com/tools"
|
||||
android:id="@+id/nav_settings"
|
||||
@ -9,55 +10,56 @@
|
||||
android:id="@+id/settingsFragment"
|
||||
android:name="org.microg.gms.ui.SettingsFragment"
|
||||
android:label="@string/gms_settings_name">
|
||||
|
||||
<action
|
||||
android:id="@+id/openUnifiedNlpSettings"
|
||||
app:destination="@id/nav_unlp"
|
||||
app:enterAnim="@anim/fragment_open_enter"
|
||||
app:exitAnim="@anim/fragment_open_exit"
|
||||
app:popEnterAnim="@anim/fragment_close_enter"
|
||||
app:popExitAnim="@anim/fragment_close_exit" />
|
||||
app:enterAnim="@android:anim/fragment_open_enter"
|
||||
app:exitAnim="@android:anim/fragment_open_exit"
|
||||
app:popEnterAnim="@android:anim/fragment_close_enter"
|
||||
app:popExitAnim="@android:anim/fragment_close_exit" />
|
||||
<action
|
||||
android:id="@+id/openSelfcheck"
|
||||
app:destination="@id/selfcheckFragment"
|
||||
app:enterAnim="@anim/fragment_open_enter"
|
||||
app:exitAnim="@anim/fragment_open_exit"
|
||||
app:popEnterAnim="@anim/fragment_close_enter"
|
||||
app:popExitAnim="@anim/fragment_close_exit" />
|
||||
app:enterAnim="@android:anim/fragment_open_enter"
|
||||
app:exitAnim="@android:anim/fragment_open_exit"
|
||||
app:popEnterAnim="@android:anim/fragment_close_enter"
|
||||
app:popExitAnim="@android:anim/fragment_close_exit" />
|
||||
<action
|
||||
android:id="@+id/openCheckinSettings"
|
||||
app:destination="@id/checkinFragment"
|
||||
app:enterAnim="@anim/fragment_open_enter"
|
||||
app:exitAnim="@anim/fragment_open_exit"
|
||||
app:popEnterAnim="@anim/fragment_close_enter"
|
||||
app:popExitAnim="@anim/fragment_close_exit" />
|
||||
app:enterAnim="@android:anim/fragment_open_enter"
|
||||
app:exitAnim="@android:anim/fragment_open_exit"
|
||||
app:popEnterAnim="@android:anim/fragment_close_enter"
|
||||
app:popExitAnim="@android:anim/fragment_close_exit" />
|
||||
<action
|
||||
android:id="@+id/openGcmSettings"
|
||||
app:destination="@id/gcmFragment"
|
||||
app:enterAnim="@anim/fragment_open_enter"
|
||||
app:exitAnim="@anim/fragment_open_exit"
|
||||
app:popEnterAnim="@anim/fragment_close_enter"
|
||||
app:popExitAnim="@anim/fragment_close_exit" />
|
||||
app:enterAnim="@android:anim/fragment_open_enter"
|
||||
app:exitAnim="@android:anim/fragment_open_exit"
|
||||
app:popEnterAnim="@android:anim/fragment_close_enter"
|
||||
app:popExitAnim="@android:anim/fragment_close_exit" />
|
||||
<action
|
||||
android:id="@+id/openSafetyNetSettings"
|
||||
app:destination="@id/safetyNetFragment"
|
||||
app:enterAnim="@anim/fragment_open_enter"
|
||||
app:exitAnim="@anim/fragment_open_exit"
|
||||
app:popEnterAnim="@anim/fragment_close_enter"
|
||||
app:popExitAnim="@anim/fragment_close_exit" />
|
||||
app:enterAnim="@android:anim/fragment_open_enter"
|
||||
app:exitAnim="@android:anim/fragment_open_exit"
|
||||
app:popEnterAnim="@android:anim/fragment_close_enter"
|
||||
app:popExitAnim="@android:anim/fragment_close_exit" />
|
||||
<action
|
||||
android:id="@+id/openMoreGoogleSettings"
|
||||
app:destination="@id/googleMoreFragment"
|
||||
app:enterAnim="@anim/fragment_open_enter"
|
||||
app:exitAnim="@anim/fragment_open_exit"
|
||||
app:popEnterAnim="@anim/fragment_close_enter"
|
||||
app:popExitAnim="@anim/fragment_close_exit" />
|
||||
app:enterAnim="@android:anim/fragment_open_enter"
|
||||
app:exitAnim="@android:anim/fragment_open_exit"
|
||||
app:popEnterAnim="@android:anim/fragment_close_enter"
|
||||
app:popExitAnim="@android:anim/fragment_close_exit" />
|
||||
<action
|
||||
android:id="@+id/openAbout"
|
||||
app:destination="@id/aboutFragment"
|
||||
app:enterAnim="@anim/fragment_open_enter"
|
||||
app:exitAnim="@anim/fragment_open_exit"
|
||||
app:popEnterAnim="@anim/fragment_close_enter"
|
||||
app:popExitAnim="@anim/fragment_close_exit" />
|
||||
app:enterAnim="@android:anim/fragment_open_enter"
|
||||
app:exitAnim="@android:anim/fragment_open_exit"
|
||||
app:popEnterAnim="@android:anim/fragment_close_enter"
|
||||
app:popExitAnim="@android:anim/fragment_close_exit" />
|
||||
</fragment>
|
||||
|
||||
<fragment
|
||||
@ -77,24 +79,24 @@
|
||||
<action
|
||||
android:id="@+id/openGcmAppDetails"
|
||||
app:destination="@id/gcmAppFragment"
|
||||
app:enterAnim="@anim/fragment_open_enter"
|
||||
app:exitAnim="@anim/fragment_open_exit"
|
||||
app:popEnterAnim="@anim/fragment_close_enter"
|
||||
app:popExitAnim="@anim/fragment_close_exit" />
|
||||
app:enterAnim="@android:anim/fragment_open_enter"
|
||||
app:exitAnim="@android:anim/fragment_open_exit"
|
||||
app:popEnterAnim="@android:anim/fragment_close_enter"
|
||||
app:popExitAnim="@android:anim/fragment_close_exit" />
|
||||
<action
|
||||
android:id="@+id/openAllGcmApps"
|
||||
app:destination="@id/gcmAllAppsFragment"
|
||||
app:enterAnim="@anim/fragment_open_enter"
|
||||
app:exitAnim="@anim/fragment_open_exit"
|
||||
app:popEnterAnim="@anim/fragment_close_enter"
|
||||
app:popExitAnim="@anim/fragment_close_exit" />
|
||||
app:enterAnim="@android:anim/fragment_open_enter"
|
||||
app:exitAnim="@android:anim/fragment_open_exit"
|
||||
app:popEnterAnim="@android:anim/fragment_close_enter"
|
||||
app:popExitAnim="@android:anim/fragment_close_exit" />
|
||||
<action
|
||||
android:id="@+id/openGcmAdvancedSettings"
|
||||
app:destination="@id/gcmAdvancedFragment"
|
||||
app:enterAnim="@anim/fragment_open_enter"
|
||||
app:exitAnim="@anim/fragment_open_exit"
|
||||
app:popEnterAnim="@anim/fragment_close_enter"
|
||||
app:popExitAnim="@anim/fragment_close_exit" />
|
||||
app:enterAnim="@android:anim/fragment_open_enter"
|
||||
app:exitAnim="@android:anim/fragment_open_exit"
|
||||
app:popEnterAnim="@android:anim/fragment_close_enter"
|
||||
app:popExitAnim="@android:anim/fragment_close_exit" />
|
||||
</fragment>
|
||||
<fragment
|
||||
android:id="@+id/gcmAllAppsFragment"
|
||||
@ -103,10 +105,10 @@
|
||||
<action
|
||||
android:id="@+id/openGcmAppDetailsFromAll"
|
||||
app:destination="@id/gcmAppFragment"
|
||||
app:enterAnim="@anim/fragment_open_enter"
|
||||
app:exitAnim="@anim/fragment_open_exit"
|
||||
app:popEnterAnim="@anim/fragment_close_enter"
|
||||
app:popExitAnim="@anim/fragment_close_exit" />
|
||||
app:enterAnim="@android:anim/fragment_open_enter"
|
||||
app:exitAnim="@android:anim/fragment_open_exit"
|
||||
app:popEnterAnim="@android:anim/fragment_close_enter"
|
||||
app:popExitAnim="@android:anim/fragment_close_exit" />
|
||||
</fragment>
|
||||
<fragment
|
||||
android:id="@+id/gcmAppFragment"
|
||||
@ -128,10 +130,10 @@
|
||||
<action
|
||||
android:id="@+id/openSafetyNetAdvancedSettings"
|
||||
app:destination="@id/safetyNetAdvancedFragment"
|
||||
app:enterAnim="@anim/fragment_open_enter"
|
||||
app:exitAnim="@anim/fragment_open_exit"
|
||||
app:popEnterAnim="@anim/fragment_close_enter"
|
||||
app:popExitAnim="@anim/fragment_close_exit" />
|
||||
app:enterAnim="@android:anim/fragment_open_enter"
|
||||
app:exitAnim="@android:anim/fragment_open_exit"
|
||||
app:popEnterAnim="@android:anim/fragment_close_enter"
|
||||
app:popExitAnim="@android:anim/fragment_close_exit" />
|
||||
</fragment>
|
||||
<fragment
|
||||
android:id="@+id/safetyNetAdvancedFragment"
|
||||
|
||||
Loading…
Reference in New Issue
Block a user