Skip to content

Commit 362521e

Browse files
authored
Merge pull request #146 from soramitsu/rc/1.2.0
Rc/1.2.0
2 parents 003bd96 + 32dc889 commit 362521e

File tree

77 files changed

+309
-682
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

77 files changed

+309
-682
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
11
<?xml version="1.0" encoding="utf-8"?>
22
<resources>
3-
<string name="app_name" translatable="false">Fearless Dev</string>
3+
<string name="app_name" translatable="false">[Debug] Fearless</string>
44
</resources>
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<resources>
3+
<string name="app_name" translatable="false">[Dev] Fearless</string>
4+
</resources>

app/src/main/java/jp/co/soramitsu/app/root/navigation/Navigator.kt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -115,14 +115,6 @@ class Navigator : SplashRouter, OnboardingRouter, AccountRouter, WalletRouter, R
115115
navController?.navigate(R.id.action_profileFragment_to_aboutFragment)
116116
}
117117

118-
override fun openTermsScreen() {
119-
navController?.navigate(R.id.openTerms)
120-
}
121-
122-
override fun openPrivacyScreen() {
123-
navController?.navigate(R.id.openPrivacy)
124-
}
125-
126118
override fun openImportAccountScreen(selectedNetworkType: Node.NetworkType?) {
127119
navController?.navigate(R.id.importAction, ImportAccountFragment.getBundle(selectedNetworkType))
128120
}

app/src/main/res/layout/fragment_coming_soon.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
android:layout_marginBottom="35dp"
2626
android:adjustViewBounds="true"
2727
android:scaleType="fitXY"
28-
android:src="@drawable/ic_logo_about"
28+
android:src="@drawable/drawable_fearless_logo"
2929
app:layout_constraintBottom_toTopOf="@+id/comingSoonLabel"
3030
app:layout_constraintEnd_toEndOf="parent"
3131
app:layout_constraintStart_toStartOf="parent" />
1.91 KB
Loading
784 Bytes
Loading
3.66 KB
Loading
7.38 KB
Loading
9.92 KB
Loading

app/src/main/res/navigation/root_nav_graph.xml

Lines changed: 0 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -27,22 +27,6 @@
2727
app:popEnterAnim="@anim/fragment_close_enter"
2828
app:popExitAnim="@anim/fragment_close_exit" />
2929

30-
<action
31-
android:id="@+id/openPrivacy"
32-
app:destination="@id/privacyFragment"
33-
app:enterAnim="@anim/fragment_open_enter"
34-
app:exitAnim="@anim/fragment_open_exit"
35-
app:popEnterAnim="@anim/fragment_close_enter"
36-
app:popExitAnim="@anim/fragment_close_exit" />
37-
38-
<action
39-
android:id="@+id/openTerms"
40-
app:destination="@id/termsFragment"
41-
app:enterAnim="@anim/fragment_open_enter"
42-
app:exitAnim="@anim/fragment_open_exit"
43-
app:popEnterAnim="@anim/fragment_close_enter"
44-
app:popExitAnim="@anim/fragment_close_exit" />
45-
4630
<fragment
4731
android:id="@+id/splashFragment"
4832
android:name="jp.co.soramitsu.splash.presentation.SplashFragment"
@@ -72,15 +56,4 @@
7256
android:label="fragment_pincode"
7357
tools:layout="@layout/fragment_pincode" />
7458

75-
<fragment
76-
android:id="@+id/privacyFragment"
77-
android:name="jp.co.soramitsu.feature_onboarding_impl.presentation.privacy.PrivacyFragment"
78-
tools:layout="@layout/fragment_privacy" />
79-
80-
<fragment
81-
android:id="@+id/termsFragment"
82-
android:name="jp.co.soramitsu.feature_onboarding_impl.presentation.terms.TermsFragment"
83-
android:label="fragment_terms"
84-
tools:layout="@layout/fragment_terms" />
85-
8659
</navigation>

0 commit comments

Comments
 (0)