Merge branch 'remove_flow_mvi' into 'main'

#5444 Fix CPU consumption - remove flow-mvi dependency

See merge request e/os/advanced-privacy!74

1 files changed, 69 insertions, 68 deletions

diff --git a/app/src/main/res/layout/fragment_trackers.xml b/app/src/main/res/layout/fragment_trackers.xml
index 9828215..b6d5b7b 100644
--- a/app/src/main/res/layout/fragment_trackers.xml
+++ b/app/src/main/res/layout/fragment_trackers.xml
@@ -1,13 +1,13 @@
 <?xml version="1.0" encoding="utf-8"?>
 <layout>
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.coordinatorlayout.widget.CoordinatorLayout
+    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:background="@color/background"
     android:layout_height="match_parent"
     android:layout_width="match_parent"
     >
-
     <include layout="@layout/topbar" />
 
     <androidx.core.widget.NestedScrollView
@@ -15,73 +15,74 @@
         android:layout_width="match_parent"
         app:layout_behavior="@string/appbar_scrolling_view_behavior"
         >
-        <LinearLayout
-            android:layout_height="match_parent"
+
+<LinearLayout
+    android:layout_height="match_parent"
+    android:layout_width="match_parent"
+    android:orientation="vertical"
+    >
+    <LinearLayout
+        android:layout_height="match_parent"
+        android:layout_width="match_parent"
+        android:orientation="vertical"
+        >
+        <TextView
+            android:id="@+id/trackers_info"
+            android:layout_height="wrap_content"
             android:layout_width="match_parent"
-            android:orientation="vertical"
-            >
-            <LinearLayout
-                android:layout_height="match_parent"
-                android:layout_width="match_parent"
-                android:orientation="vertical"
-                >
-                <TextView
-                    android:id="@+id/trackers_info"
-                    android:layout_height="wrap_content"
-                    android:layout_width="match_parent"
-                    android:paddingTop="16dp"
-                    android:paddingHorizontal="16dp"
-                    android:lineSpacingExtra="5sp"
-                    android:text="@string/trackers_info"
-                    />
-                <TextView
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    android:text="@string/graph_subtitle"
-                    android:textColor="@color/secondary_text"
-                    android:textSize="14sp"
-                    android:paddingTop="24dp"
-                    android:paddingHorizontal="16dp"
-                    />
+            android:paddingTop="16dp"
+            android:paddingHorizontal="16dp"
+            android:lineSpacingExtra="5sp"
+            android:text="@string/trackers_info"
+            />
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/graph_subtitle"
+            android:textColor="@color/secondary_text"
+            android:textSize="14sp"
+            android:paddingTop="24dp"
+            android:paddingHorizontal="16dp"
+            />
+
+        <include layout="@layout/trackers_item_graph"
+            android:id="@+id/graph_day"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:period="@{@string/trackers_period_day}"
+            />
+        <include layout="@layout/trackers_item_graph"
+            android:id="@+id/graph_month"
+            android:layout_marginTop="16dp"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:period="@{@string/trackers_period_month}"
+            />
+        <include layout="@layout/trackers_item_graph"
+            android:id="@+id/graph_year"
+            android:layout_marginTop="16dp"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            app:period="@{@string/trackers_period_year}"
+            />
+        <TextView
+            android:layout_height="wrap_content"
+            android:layout_width="match_parent"
+            android:layout_marginTop="32dp"
+            android:paddingTop="16dp"
+            android:paddingHorizontal="16dp"
+            android:text="@string/trackers_applist_title"
+            />
+    </LinearLayout>
+    <androidx.recyclerview.widget.RecyclerView
+        android:id="@+id/apps"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:paddingTop="16dp"
+        android:paddingBottom="32dp"
+        />
+</LinearLayout>
 
-                <include layout="@layout/trackers_item_graph"
-                    android:id="@+id/graph_day"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    app:period="@{@string/trackers_period_day}"
-                    />
-                <include layout="@layout/trackers_item_graph"
-                    android:id="@+id/graph_month"
-                    android:layout_marginTop="16dp"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    app:period="@{@string/trackers_period_month}"
-                    />
-                <include layout="@layout/trackers_item_graph"
-                    android:id="@+id/graph_year"
-                    android:layout_marginTop="16dp"
-                    android:layout_width="match_parent"
-                    android:layout_height="wrap_content"
-                    app:period="@{@string/trackers_period_year}"
-                    />
-                <TextView
-                    android:layout_height="wrap_content"
-                    android:layout_width="match_parent"
-                    android:layout_marginTop="32dp"
-                    android:paddingTop="16dp"
-                    android:paddingHorizontal="16dp"
-                    android:text="@string/trackers_applist_title"
-                    />
-            </LinearLayout>
-            <androidx.recyclerview.widget.RecyclerView
-                android:id="@+id/apps"
-                android:layout_height="wrap_content"
-                android:layout_width="match_parent"
-                android:paddingTop="16dp"
-                android:paddingBottom="32dp"
-                tools:listitem="@layout/trackers_item_app"
-                />
-        </LinearLayout>
-    </androidx.core.widget.NestedScrollView>
+</androidx.core.widget.NestedScrollView>
 </androidx.coordinatorlayout.widget.CoordinatorLayout>
 </layout>
\ No newline at end of file