Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
33 changes: 20 additions & 13 deletions app/src/main/res/layout/main.xml
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,26 @@
app:titleTextColor="@android:color/white" />
</com.google.android.material.appbar.AppBarLayout>

<!--
Outside llApps on purpose: that container is hidden on the Timeline and
VPN tabs, and Timeline is where the app lands. A prompt to grant a
permission has to be visible whichever tab the user is on.
-->
<TextView
android:id="@+id/tvNotifications"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:drawableStart="@drawable/twotone_notifications_24"
android:drawablePadding="8dp"
android:drawableTint="?attr/colorError"
android:padding="8dp"
android:paddingStart="@dimen/activity_horizontal_margin"
android:paddingEnd="@dimen/activity_horizontal_margin"
android:text="@string/msg_notifications"
android:textAppearance="@style/TextSmall"
android:textColor="?attr/colorOff"
android:visibility="gone" />

<FrameLayout
android:layout_width="match_parent"
android:layout_height="0dp"
Expand Down Expand Up @@ -60,19 +80,6 @@
android:visibility="gone" />
</LinearLayout>

<TextView
android:id="@+id/tvNotifications"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:drawableStart="@drawable/twotone_notifications_24"
android:drawablePadding="8dp"
android:drawableTint="?attr/colorError"
android:padding="8dp"
android:text="@string/msg_notifications"
android:textAppearance="@style/TextSmall"
android:textColor="?attr/colorOff"
android:visibility="visible" />

<androidx.swiperefreshlayout.widget.SwipeRefreshLayout
android:id="@+id/swipeRefresh"
android:layout_width="match_parent"
Expand Down