Merge pull request #166 from braille-systems/hotfix/settings-nav

0.6.1 Hotfix/settings nav
braille-systems · May 18, 2020 · f201fd8 · f201fd8
2 parents 5c41c28 + 11ec345
commit f201fd8
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 24 deletions.
diff --git a/android/app/build.gradle b/android/app/build.gradle
@@ -24,8 +24,8 @@ android {
         applicationId "com.github.braillesystems.learnbraille"
         minSdkVersion 19
         targetSdkVersion 29
-        versionCode 1
-        versionName "0.6.0"
+        versionCode 2
+        versionName "0.6.1"
         testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
         vectorDrawables.useSupportLibrary = true
         multiDexEnabled = true

diff --git a/.../main/java/com/github/braillesystems/learnbraille/ui/screens/greeting/GreetingFragment.kt b/.../main/java/com/github/braillesystems/learnbraille/ui/screens/greeting/GreetingFragment.kt
@@ -5,7 +5,6 @@ import android.view.LayoutInflater
 import android.view.ViewGroup
 import androidx.databinding.DataBindingUtil
 import androidx.fragment.app.Fragment
-import androidx.navigation.Navigation
 import com.github.braillesystems.learnbraille.R
 import com.github.braillesystems.learnbraille.databinding.FragmentGreetingBinding
 import com.github.braillesystems.learnbraille.utils.updateTitle
@@ -26,9 +25,5 @@ class GreetingFragment : Fragment() {
 
         updateTitle(getString(R.string.greeting_title))
 
-        startButton.setOnClickListener(
-            Navigation.createNavigateOnClickListener(R.id.action_greetingFragment_to_menuFragment)
-        )
-
     }.root
 }
diff --git a/android/app/src/main/res/navigation/navigation.xml b/android/app/src/main/res/navigation/navigation.xml
@@ -5,18 +5,8 @@
     android:id="@+id/navigation"
     app:startDestination="@id/menuFragment">
 
-    <fragment
-        android:id="@+id/greetingFragment"
-        android:name="com.github.braillesystems.learnbraille.ui.screens.greeting.GreetingFragment"
-        android:label="fragment_greeting"
-        tools:layout="@layout/fragment_greeting">
-        <action
-            android:id="@+id/action_greetingFragment_to_menuFragment"
-            app:destination="@id/menuFragment"
-            app:popEnterAnim="@anim/fragment_close_enter"
-            app:popUpTo="@+id/greetingFragment"
-            app:popUpToInclusive="true" />
-    </fragment>
+    <!--    Main navigation-->
+
     <fragment
         android:id="@+id/menuFragment"
         android:name="com.github.braillesystems.learnbraille.ui.screens.menu.MenuFragment"
@@ -42,11 +32,6 @@
         android:name="com.github.braillesystems.learnbraille.ui.screens.practice.CardFragment"
         android:label="fragment_practice"
         tools:layout="@layout/fragment_practice" />
-    <fragment
-        android:id="@+id/settingsFragment"
-        android:name="com.github.braillesystems.learnbraille.ui.screens.settings.SettingsFragment"
-        android:label="fragment_exit"
-        tools:layout="@layout/fragment_exit" />
     <fragment
         android:id="@+id/helpFragment"
         android:name="com.github.braillesystems.learnbraille.ui.screens.help.HelpFragment"
@@ -57,6 +42,10 @@
             app:argType="string"
             app:nullable="true" />
     </fragment>
+    <fragment
+        android:id="@+id/settingsFragment"
+        android:name="com.github.braillesystems.learnbraille.ui.screens.settings.SettingsFragment"
+        android:label="SettingsFragment" />
 
     <action
         android:id="@+id/action_global_menuFragment"
@@ -66,6 +55,8 @@
         android:id="@+id/action_global_helpFragment"
         app:destination="@id/helpFragment" />
 
+    <!--    Step fragments-->
+
     <fragment
         android:id="@+id/infoFragment"
         android:name="com.github.braillesystems.learnbraille.ui.screens.theory.steps.InfoFragment"
@@ -123,6 +114,8 @@
             app:argType="string" />
     </fragment>
 
+    <!--    Global step actions-->
+
     <action
         android:id="@+id/action_global_showSymbolFragment"
         app:destination="@id/showSymbolFragment"