mnalis/apps-android-commons
1
0
Fork 0
mirror of https://github.com/commons-app/apps-android-commons.git synced 2025-10-26 20:33:53 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Tutorial removed from log out state (#4479)

Browse source 
* tutorial removed from log out state

* Issue removed
This commit is contained in:
Ayan Sarkar 2021-06-29 14:42:30 +05:30 • committed by GitHub
parent e9a2c32527
commit 51d06c1ef4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 6 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

3
app/src/main/java/fr/free/nrw/commons/auth/LoginActivity.java
View file

@ -208,9 +208,6 @@ public class LoginActivity extends AccountAuthenticatorActivity {
@Override @Override
protected void onResume() { protected void onResume() {
super.onResume(); super.onResume();
if (applicationKvStore.getBoolean("firstrun", true)) {
WelcomeActivity.startYourself(this);
}
if (sessionManager.getCurrentAccount() != null if (sessionManager.getCurrentAccount() != null
&& sessionManager.isUserLoggedIn()) { && sessionManager.isUserLoggedIn()) {

6
app/src/main/java/fr/free/nrw/commons/contributions/MainActivity.java
View file

@ -21,6 +21,7 @@ import butterknife.BindView;
import butterknife.ButterKnife; import butterknife.ButterKnife;
import fr.free.nrw.commons.CommonsApplication; import fr.free.nrw.commons.CommonsApplication;
import fr.free.nrw.commons.R; import fr.free.nrw.commons.R;
import fr.free.nrw.commons.WelcomeActivity;
import fr.free.nrw.commons.auth.SessionManager; import fr.free.nrw.commons.auth.SessionManager;
import fr.free.nrw.commons.bookmarks.BookmarkFragment; import fr.free.nrw.commons.bookmarks.BookmarkFragment;
import fr.free.nrw.commons.explore.ExploreFragment; import fr.free.nrw.commons.explore.ExploreFragment;
@ -356,6 +357,11 @@ public class MainActivity extends BaseActivity
@Override @Override
protected void onResume() { protected void onResume() {
super.onResume(); super.onResume();
if ((applicationKvStore.getBoolean("firstrun", true)) &&
(!applicationKvStore.getBoolean("login_skipped"))) {
WelcomeActivity.startYourself(this);
}
} }
@Override @Override

5
app/src/main/java/fr/free/nrw/commons/navtab/MoreBottomSheetLoggedOutFragment.java
View file

@ -89,11 +89,6 @@ public class MoreBottomSheetLoggedOutFragment extends BottomSheetDialogFragment
getActivity().startActivity(intent); getActivity().startActivity(intent);
} }
@OnClick(R.id.more_tutorial)
public void onTutorialClicked() {
WelcomeActivity.startYourself(getActivity());
}
@OnClick(R.id.more_settings) @OnClick(R.id.more_settings)
public void onSettingsClicked() { public void onSettingsClicked() {
final Intent intent = new Intent(getActivity(), SettingsActivity.class); final Intent intent = new Intent(getActivity(), SettingsActivity.class);

11
app/src/main/res/layout/fragment_more_bottom_sheet_logged_out.xml
View file

@ -26,17 +26,6 @@
android:text="@string/menu_settings" android:text="@string/menu_settings"
android:textSize="18sp" /> android:textSize="18sp" />
<TextView
android:id="@+id/more_tutorial"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_margin="12dp"
android:drawableStart="@drawable/ic_help_black_24dp"
android:drawablePadding="12dp"
android:padding="8dp"
android:text="@string/navigation_item_info"
android:textSize="18sp" />
<TextView <TextView
android:id="@+id/more_feedback" android:id="@+id/more_feedback"
android:layout_width="match_parent" android:layout_width="match_parent"