Merge pull request #1496 from AllanWang/bugsnag-opt-out

Bugsnag opt out

4 files changed, 58 insertions, 2 deletions

diff --git a/app/src/main/res/layout/intro_analytics.xml b/app/src/main/res/layout/intro_analytics.xml
new file mode 100644
index 00000000..a62a0b0f
--- /dev/null
+++ b/app/src/main/res/layout/intro_analytics.xml
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="utf-8"?>
+<androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/intro_analytics_container"
+    android:layout_width="match_parent"
+    android:layout_height="match_parent">
+
+    <TextView
+        android:id="@id/intro_title"
+        style="@style/IntroTitle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/analytics"
+        app:layout_constraintBottom_toTopOf="@id/intro_image"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toTopOf="parent"
+        app:layout_constraintVertical_chainStyle="spread" />
+
+    <ImageView
+        android:id="@id/intro_image"
+        android:layout_width="120dp"
+        android:layout_height="120dp"
+        android:scaleType="fitCenter"
+        app:layout_constraintBottom_toTopOf="@id/intro_switch"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/intro_title"
+        tools:layout_editor_absoluteX="112dp" />
+
+    <Switch
+        android:id="@+id/intro_switch"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintBottom_toTopOf="@id/intro_desc"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/intro_image" />
+
+    <TextView
+        android:id="@id/intro_desc"
+        style="@style/IntroSubTitle"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="@string/analytics_desc"
+        app:layout_constraintBottom_toBottomOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintTop_toBottomOf="@id/intro_switch" />
+
+</androidx.constraintlayout.widget.ConstraintLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/intro_end.xml b/app/src/main/res/layout/intro_end.xml
index 501cf1a9..fbaa2042 100644
--- a/app/src/main/res/layout/intro_end.xml
+++ b/app/src/main/res/layout/intro_end.xml
@@ -2,8 +2,8 @@
 <androidx.constraintlayout.widget.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
-    android:layout_width="match_parent"
     android:id="@+id/intro_end_container"
+    android:layout_width="match_parent"
     android:layout_height="match_parent">
 
     <TextView
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 33f36174..90978724 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -86,11 +86,15 @@
     <style name="IntroTitle" parent="TextAppearance.AppCompat.Title">
         <item name="android:textSize">20sp</item>
         <item name="android:textAlignment">center</item>
+        <item name="android:paddingStart">@dimen/kau_activity_horizontal_margin</item>
+        <item name="android:paddingEnd">@dimen/kau_activity_horizontal_margin</item>
     </style>
 
     <style name="IntroSubTitle" parent="TextAppearance.AppCompat.Subhead">
         <item name="android:textSize">18sp</item>
         <item name="android:textAlignment">center</item>
+        <item name="android:paddingStart">@dimen/kau_activity_horizontal_margin</item>
+        <item name="android:paddingEnd">@dimen/kau_activity_horizontal_margin</item>
     </style>
 
     <style name="IntroButton" parent="TextAppearance.AppCompat.Button">
diff --git a/app/src/main/res/xml/frost_changelog.xml b/app/src/main/res/xml/frost_changelog.xml
index 01d0a6fb..09bb9d2e 100644
--- a/app/src/main/res/xml/frost_changelog.xml
+++ b/app/src/main/res/xml/frost_changelog.xml
@@ -10,7 +10,7 @@
     <version title="v2.3.2" />
     <item text="Disable auto feed refresh by default and add setting to re-enable it" />
     <item text="Update theme" />
-    <item text="" />
+    <item text="Disable bugsnag completely when opting out of analytics" />
     <item text="" />
     <item text="" />
     <item text="" />