diff --git a/README.md b/README.ME similarity index 100% rename from README.md rename to README.ME diff --git a/app/src/main/java/com/vanced/manager/ui/MainActivity.kt b/app/src/main/java/com/vanced/manager/ui/MainActivity.kt index 989d0076..600bfd9c 100644 --- a/app/src/main/java/com/vanced/manager/ui/MainActivity.kt +++ b/app/src/main/java/com/vanced/manager/ui/MainActivity.kt @@ -34,11 +34,11 @@ class MainActivity : ThemeActivity() { navBar.setOnNavigationItemSelectedListener{ item -> when (item.itemId) { R.id.navigation_home -> { - navHost.navigate(R.id.toHomeFragment) + navHost.navigate(R.id.action_settingsFragment_to_homeFragment) return@setOnNavigationItemSelectedListener true } R.id.navigation_settings -> { - navHost.navigate(R.id.toSettingsFragment) + navHost.navigate(R.id.action_homeFragment_to_settingsFragment) return@setOnNavigationItemSelectedListener true } } diff --git a/app/src/main/res/layout/include_changelogs.xml b/app/src/main/res/layout/include_changelogs.xml index 64d5e4f2..048ed105 100644 --- a/app/src/main/res/layout/include_changelogs.xml +++ b/app/src/main/res/layout/include_changelogs.xml @@ -1,62 +1,61 @@ - - + + + android:layout_height="match_parent"> - + + + android:layout_height="wrap_content" + app:layout_constraintTop_toBottomOf="@id/changelog_text" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintEnd_toEndOf="parent" + android:layout_marginStart="8dp" + android:layout_marginEnd="8dp" + android:orientation="vertical"> - - - + android:background="?colorSurfaceVariant" + app:tabIndicatorColor="?colorPrimary" + app:tabSelectedTextColor="?colorPrimary" + app:tabTextColor="?colorPrimary" + app:layout_constraintTop_toBottomOf="@id/changelog_text" /> - + - + - + - + - - - \ No newline at end of file diff --git a/app/src/main/res/layout/include_microg.xml b/app/src/main/res/layout/include_microg.xml index 8a0de336..1fe203c8 100644 --- a/app/src/main/res/layout/include_microg.xml +++ b/app/src/main/res/layout/include_microg.xml @@ -100,7 +100,8 @@ app:layout_constraintEnd_toEndOf="parent" app:layout_constraintHorizontal_bias="1.0" app:layout_constraintStart_toEndOf="@+id/microg_title" - app:layout_constraintTop_toTopOf="parent" /> + app:layout_constraintTop_toTopOf="parent" + app:layout_constraintBottom_toTopOf="@id/microg_uninstallbtn"/> + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintTop_toBottomOf="@id/microg_installbtn"/> diff --git a/app/src/main/res/layout/include_vanced.xml b/app/src/main/res/layout/include_vanced.xml index 743bf2d9..0766efa7 100644 --- a/app/src/main/res/layout/include_vanced.xml +++ b/app/src/main/res/layout/include_vanced.xml @@ -96,6 +96,7 @@ android:textAllCaps="false" app:layout_constraintEnd_toEndOf="parent" app:layout_constraintTop_toTopOf="parent" + app:layout_constraintBottom_toTopOf="@id/vanced_uninstallbtn" app:layout_constraintHorizontal_bias="1.0" android:fontFamily="@font/exo_semibold" app:icon="@drawable/outline_cloud_download_24"/> @@ -112,7 +113,8 @@ app:backgroundTint="?attr/colorError" app:icon="@drawable/ic_delete_black_24dp" app:layout_constraintEnd_toEndOf="parent" - app:layout_constraintBottom_toBottomOf="parent" /> + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintTop_toBottomOf="@id/vanced_installbtn"/> diff --git a/app/src/main/res/navigation/mobile_navigation.xml b/app/src/main/res/navigation/mobile_navigation.xml index 3ca328c9..db9ba9e7 100644 --- a/app/src/main/res/navigation/mobile_navigation.xml +++ b/app/src/main/res/navigation/mobile_navigation.xml @@ -15,8 +15,8 @@ @@ -90,18 +90,18 @@ tools:layout="@layout/fragment_vanced_language_selection" />