From d73ae7bcedabbef6923835ffaa0074d276757334 Mon Sep 17 00:00:00 2001
From: M66B <M66B@users.noreply.github.com>
Date: Tue, 13 Nov 2018 18:26:56 +0100
Subject: [PATCH] Moved log

---
 .../main/java/eu/faircode/email/ActivityView.java   | 11 ++++++++++-
 .../main/java/eu/faircode/email/FragmentAbout.java  | 13 -------------
 app/src/main/res/layout/fragment_about.xml          | 12 ------------
 3 files changed, 10 insertions(+), 26 deletions(-)

diff --git a/app/src/main/java/eu/faircode/email/ActivityView.java b/app/src/main/java/eu/faircode/email/ActivityView.java
index 94844d591a..e4dcc60dd4 100644
--- a/app/src/main/java/eu/faircode/email/ActivityView.java
+++ b/app/src/main/java/eu/faircode/email/ActivityView.java
@@ -218,7 +218,10 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
                         drawerLayout.closeDrawer(drawerList);
                         onMenuInbox((long) item.getData());
                         return true;
-                    case R.string.menu_about:
+                    case R.string.menu_setup:
+                        onShowLog();
+                        return true;
+                    case R.string.menu_faq:
                         onDebugInfo();
                         return true;
                     default:
@@ -779,6 +782,12 @@ public class ActivityView extends ActivityBilling implements FragmentManager.OnB
         fragmentTransaction.commit();
     }
 
+    private void onShowLog() {
+        FragmentTransaction fragmentTransaction = getSupportFragmentManager().beginTransaction();
+        fragmentTransaction.replace(R.id.content_frame, new FragmentLogs()).addToBackStack("logs");
+        fragmentTransaction.commit();
+    }
+
     private void onDebugInfo() {
         new SimpleTask<Long>() {
             @Override
diff --git a/app/src/main/java/eu/faircode/email/FragmentAbout.java b/app/src/main/java/eu/faircode/email/FragmentAbout.java
index 5265a6cb7a..3933af348d 100644
--- a/app/src/main/java/eu/faircode/email/FragmentAbout.java
+++ b/app/src/main/java/eu/faircode/email/FragmentAbout.java
@@ -23,16 +23,13 @@ import android.os.Bundle;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
-import android.widget.Button;
 import android.widget.TextView;
 
 import androidx.annotation.NonNull;
 import androidx.annotation.Nullable;
-import androidx.fragment.app.FragmentTransaction;
 
 public class FragmentAbout extends FragmentEx {
     private TextView tvVersion;
-    private Button btnLog;
 
     @Override
     @Nullable
@@ -42,19 +39,9 @@ public class FragmentAbout extends FragmentEx {
         View view = inflater.inflate(R.layout.fragment_about, container, false);
 
         tvVersion = view.findViewById(R.id.tvVersion);
-        btnLog = view.findViewById(R.id.btnLog);
 
         tvVersion.setText(getString(R.string.title_version, BuildConfig.VERSION_NAME));
 
-        btnLog.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View v) {
-                FragmentTransaction fragmentTransaction = getFragmentManager().beginTransaction();
-                fragmentTransaction.replace(R.id.content_frame, new FragmentLogs()).addToBackStack("logs");
-                fragmentTransaction.commit();
-            }
-        });
-
         return view;
     }
 }
diff --git a/app/src/main/res/layout/fragment_about.xml b/app/src/main/res/layout/fragment_about.xml
index c448c12bbb..c24b324595 100644
--- a/app/src/main/res/layout/fragment_about.xml
+++ b/app/src/main/res/layout/fragment_about.xml
@@ -46,17 +46,5 @@
             android:textAppearance="@style/TextAppearance.AppCompat.Small"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/tvCopyright" />
-
-        <Button
-            android:id="@+id/btnLog"
-            style="?android:attr/buttonStyleSmall"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="24dp"
-            android:minWidth="0dp"
-            android:minHeight="0dp"
-            android:text="@string/title_log"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toBottomOf="@id/tvEula" />
     </androidx.constraintlayout.widget.ConstraintLayout>
 </ScrollView>
\ No newline at end of file