Commit e39d2567 authored by topjohnwu's avatar topjohnwu

More SDK 16 fixes

parent 949136c9
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical"
android:background="@color/flashing_background_color" android:background="@color/flashing_background_color"
tools:context="com.topjohnwu.magisk.FlashActivity"> android:orientation="vertical">
<include layout="@layout/toolbar"/> <include layout="@layout/toolbar" />
<HorizontalScrollView <HorizontalScrollView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_weight="1"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="0dp"> android:layout_height="0dp"
android:layout_weight="1">
<androidx.recyclerview.widget.RecyclerView <androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerView" android:id="@+id/recyclerView"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="match_parent" android:layout_height="match_parent"
android:paddingStart="8dp" android:paddingLeft="8dp"
android:paddingEnd="8dp" android:paddingRight="8dp"
app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
</HorizontalScrollView> </HorizontalScrollView>
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/su_popup" android:id="@+id/su_popup"
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:background="?attr/colorBackgroundFloating" android:background="?attr/colorBackgroundFloating"
android:minWidth="350dp" android:minWidth="350dp"
android:orientation="vertical" android:orientation="vertical">
tools:context=".SuRequestActivity">
<TextView <TextView
android:id="@+id/request_title" android:id="@+id/request_title"
...@@ -29,8 +27,8 @@ ...@@ -29,8 +27,8 @@
android:layout_marginTop="10dp" android:layout_marginTop="10dp"
android:layout_marginBottom="10dp" android:layout_marginBottom="10dp"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingStart="10dp" android:paddingLeft="10dp"
android:paddingEnd="10dp"> android:paddingRight="10dp">
<ImageView <ImageView
android:id="@+id/app_icon" android:id="@+id/app_icon"
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/dialog_layout" android:id="@+id/dialog_layout"
android:orientation="vertical"
android:paddingTop="5dp"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingTop="5dp">
<TextView <TextView
android:id="@+id/message" android:id="@+id/message"
style="?android:attr/textAppearanceMedium" style="?android:attr/textAppearanceMedium"
android:textColor="?android:attr/textColorPrimary"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:paddingLeft="25dp"
android:paddingTop="12dp"
android:paddingRight="25dp"
android:paddingBottom="12dp" android:paddingBottom="12dp"
android:paddingEnd="25dp" android:textColor="?android:attr/textColorPrimary" />
android:paddingStart="25dp"
android:paddingTop="12dp" />
<LinearLayout <LinearLayout
style="?android:attr/buttonBarStyle"
android:id="@+id/button_panel" android:id="@+id/button_panel"
style="?android:attr/buttonBarStyle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:minHeight="54dip"
android:measureWithLargestChild="true" android:measureWithLargestChild="true"
android:minHeight="54dp"
android:orientation="horizontal" android:orientation="horizontal"
android:paddingEnd="2dip" android:padding="2dp">
android:paddingStart="2dip"
android:paddingTop="4dip">
<Button <Button
android:id="@+id/negative" android:id="@+id/negative"
style="?android:attr/buttonBarButtonStyle" style="?android:attr/buttonBarButtonStyle"
android:layout_width="0dip" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_gravity="start" android:layout_gravity="start"
android:layout_weight="1" android:layout_weight="1"
...@@ -42,7 +39,7 @@ ...@@ -42,7 +39,7 @@
<Button <Button
android:id="@+id/neutral" android:id="@+id/neutral"
style="?android:attr/buttonBarButtonStyle" style="?android:attr/buttonBarButtonStyle"
android:layout_width="0dip" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_weight="1" android:layout_weight="1"
...@@ -51,7 +48,7 @@ ...@@ -51,7 +48,7 @@
<Button <Button
android:id="@+id/positive" android:id="@+id/positive"
style="?android:attr/buttonBarButtonStyle" style="?android:attr/buttonBarButtonStyle"
android:layout_width="0dip" android:layout_width="0dp"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_gravity="end" android:layout_gravity="end"
android:layout_weight="1" android:layout_weight="1"
......
...@@ -3,10 +3,10 @@ ...@@ -3,10 +3,10 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical" android:orientation="vertical"
android:paddingBottom="5dp" android:paddingLeft="15dp"
android:paddingEnd="15dp" android:paddingTop="5dp"
android:paddingStart="15dp" android:paddingRight="15dp"
android:paddingTop="5dp"> android:paddingBottom="5dp">
<TextView <TextView
android:layout_width="match_parent" android:layout_width="match_parent"
...@@ -14,8 +14,8 @@ ...@@ -14,8 +14,8 @@
android:layout_margin="5dp" android:layout_margin="5dp"
android:labelFor="@id/custom_url" android:labelFor="@id/custom_url"
android:text="@string/settings_update_custom_msg" android:text="@string/settings_update_custom_msg"
android:textColor="?android:textColorPrimary" android:textAppearance="?android:attr/textAppearanceMedium"
android:textAppearance="?android:attr/textAppearanceMedium" /> android:textColor="?android:textColorPrimary" />
<EditText <EditText
android:id="@+id/custom_url" android:id="@+id/custom_url"
......
<LinearLayout <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:orientation="vertical" android:orientation="vertical">
tools:context="com.topjohnwu.magisk.fragments.LogFragment">
<com.google.android.material.tabs.TabLayout <com.google.android.material.tabs.TabLayout
android:id="@+id/tab"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:background="?attr/colorPrimary" android:background="?attr/colorPrimary"
android:id="@+id/tab"
app:tabPaddingEnd="20dp"
app:tabPaddingStart="20dp"
android:elevation="4dp" android:elevation="4dp"
android:visibility="gone"> android:visibility="gone"
app:tabPaddingEnd="20dp"
app:tabPaddingStart="20dp">
</com.google.android.material.tabs.TabLayout> </com.google.android.material.tabs.TabLayout>
<androidx.viewpager.widget.ViewPager <androidx.viewpager.widget.ViewPager
android:layout_height="match_parent" android:id="@+id/container"
android:layout_width="match_parent" android:layout_width="match_parent"
android:id="@+id/container"/> android:layout_height="match_parent" />
</LinearLayout> </LinearLayout>
...@@ -23,9 +23,9 @@ ...@@ -23,9 +23,9 @@
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_marginStart="5dp" android:layout_marginLeft="5dp"
android:layout_marginTop="4dp" android:layout_marginTop="4dp"
android:layout_marginEnd="5dp" android:layout_marginRight="5dp"
android:layout_marginBottom="4dp" android:layout_marginBottom="4dp"
app:cardCornerRadius="@dimen/card_corner_radius" app:cardCornerRadius="@dimen/card_corner_radius"
app:cardElevation="@dimen/card_elevation"> app:cardElevation="@dimen/card_elevation">
...@@ -75,9 +75,9 @@ ...@@ -75,9 +75,9 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_marginStart="5dp" android:layout_marginLeft="5dp"
android:layout_marginTop="4dp" android:layout_marginTop="4dp"
android:layout_marginEnd="5dp" android:layout_marginRight="5dp"
android:layout_marginBottom="4dp" android:layout_marginBottom="4dp"
app:cardCornerRadius="@dimen/card_corner_radius" app:cardCornerRadius="@dimen/card_corner_radius"
app:cardElevation="@dimen/card_elevation"> app:cardElevation="@dimen/card_elevation">
...@@ -129,16 +129,16 @@ ...@@ -129,16 +129,16 @@
android:id="@+id/keep_force_enc" android:id="@+id/keep_force_enc"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="50dp" android:layout_marginLeft="50dp"
android:layout_marginEnd="50dp" android:layout_marginRight="50dp"
android:text="@string/keep_force_encryption" /> android:text="@string/keep_force_encryption" />
<CheckBox <CheckBox
android:id="@+id/keep_verity" android:id="@+id/keep_verity"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="50dp" android:layout_marginLeft="50dp"
android:layout_marginEnd="50dp" android:layout_marginRight="50dp"
android:text="@string/keep_dm_verity" /> android:text="@string/keep_dm_verity" />
</LinearLayout> </LinearLayout>
...@@ -152,9 +152,9 @@ ...@@ -152,9 +152,9 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_horizontal" android:layout_gravity="center_horizontal"
android:layout_marginStart="5dp" android:layout_marginLeft="5dp"
android:layout_marginTop="4dp" android:layout_marginTop="4dp"
android:layout_marginEnd="5dp" android:layout_marginRight="5dp"
android:layout_marginBottom="4dp" android:layout_marginBottom="4dp"
app:cardCornerRadius="@dimen/card_corner_radius" app:cardCornerRadius="@dimen/card_corner_radius"
app:cardElevation="@dimen/card_elevation"> app:cardElevation="@dimen/card_elevation">
...@@ -298,9 +298,9 @@ ...@@ -298,9 +298,9 @@
style="?attr/cardStyle" style="?attr/cardStyle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_marginStart="5dp" android:layout_marginLeft="5dp"
android:layout_marginTop="4dp" android:layout_marginTop="4dp"
android:layout_marginEnd="5dp" android:layout_marginRight="5dp"
android:layout_marginBottom="4dp" android:layout_marginBottom="4dp"
app:cardCornerRadius="@dimen/card_corner_radius" app:cardCornerRadius="@dimen/card_corner_radius"
app:cardElevation="@dimen/card_elevation"> app:cardElevation="@dimen/card_elevation">
...@@ -445,9 +445,9 @@ ...@@ -445,9 +445,9 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_marginStart="5dp" android:layout_marginLeft="5dp"
android:layout_marginTop="4dp" android:layout_marginTop="4dp"
android:layout_marginEnd="5dp" android:layout_marginRight="5dp"
android:layout_marginBottom="4dp" android:layout_marginBottom="4dp"
android:clickable="true" android:clickable="true"
android:focusable="true" android:focusable="true"
......
...@@ -6,9 +6,9 @@ ...@@ -6,9 +6,9 @@
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_marginStart="@dimen/card_horizontal_margin" android:layout_marginLeft="@dimen/card_horizontal_margin"
android:layout_marginTop="@dimen/card_vertical_margin" android:layout_marginTop="@dimen/card_vertical_margin"
android:layout_marginEnd="@dimen/card_horizontal_margin" android:layout_marginRight="@dimen/card_horizontal_margin"
android:layout_marginBottom="@dimen/card_vertical_margin" android:layout_marginBottom="@dimen/card_vertical_margin"
android:minHeight="?android:attr/listPreferredItemHeight" android:minHeight="?android:attr/listPreferredItemHeight"
app:cardCornerRadius="@dimen/card_corner_radius" app:cardCornerRadius="@dimen/card_corner_radius"
...@@ -24,8 +24,10 @@ ...@@ -24,8 +24,10 @@
android:layout_width="50dp" android:layout_width="50dp"
android:layout_height="50dp" android:layout_height="50dp"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
android:layout_marginLeft="8dp"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:layout_marginRight="8dp"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:gravity="end" android:gravity="end"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
...@@ -67,7 +69,9 @@ ...@@ -67,7 +69,9 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="5dp" android:layout_marginStart="5dp"
android:layout_marginLeft="5dp"
android:layout_marginEnd="5dp" android:layout_marginEnd="5dp"
android:layout_marginRight="5dp"
android:checked="false" android:checked="false"
android:focusable="false" android:focusable="false"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<androidx.cardview.widget.CardView <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
style="?attr/cardStyle" style="?attr/cardStyle"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_marginBottom="@dimen/card_vertical_margin" android:layout_marginLeft="@dimen/card_horizontal_margin"
android:layout_marginEnd="@dimen/card_horizontal_margin"
android:layout_marginStart="@dimen/card_horizontal_margin"
android:layout_marginTop="@dimen/card_vertical_margin" android:layout_marginTop="@dimen/card_vertical_margin"
android:layout_marginRight="@dimen/card_horizontal_margin"
android:layout_marginBottom="@dimen/card_vertical_margin"
android:minHeight="?android:attr/listPreferredItemHeight" android:minHeight="?android:attr/listPreferredItemHeight"
app:cardCornerRadius="@dimen/card_corner_radius" app:cardCornerRadius="@dimen/card_corner_radius"
app:cardElevation="@dimen/card_elevation"> app:cardElevation="@dimen/card_elevation">
...@@ -91,7 +90,9 @@ ...@@ -91,7 +90,9 @@
android:layout_width="wrap_content" android:layout_width="wrap_content"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="5dp" android:layout_marginStart="5dp"
android:layout_marginLeft="5dp"
android:layout_marginEnd="5dp" android:layout_marginEnd="5dp"
android:layout_marginRight="5dp"
android:focusable="false" android:focusable="false"
app:layout_constraintBottom_toTopOf="@+id/description" app:layout_constraintBottom_toTopOf="@+id/description"
app:layout_constraintEnd_toStartOf="@+id/delete" app:layout_constraintEnd_toStartOf="@+id/delete"
......
...@@ -5,9 +5,9 @@ ...@@ -5,9 +5,9 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_marginStart="@dimen/card_horizontal_margin" android:layout_marginLeft="@dimen/card_horizontal_margin"
android:layout_marginTop="@dimen/card_vertical_margin" android:layout_marginTop="@dimen/card_vertical_margin"
android:layout_marginEnd="@dimen/card_horizontal_margin" android:layout_marginRight="@dimen/card_horizontal_margin"
android:layout_marginBottom="@dimen/card_vertical_margin" android:layout_marginBottom="@dimen/card_vertical_margin"
android:minHeight="?android:attr/listPreferredItemHeight" android:minHeight="?android:attr/listPreferredItemHeight"
app:cardCornerRadius="@dimen/card_corner_radius" app:cardCornerRadius="@dimen/card_corner_radius"
...@@ -28,8 +28,10 @@ ...@@ -28,8 +28,10 @@
android:layout_width="50dp" android:layout_width="50dp"
android:layout_height="50dp" android:layout_height="50dp"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
android:layout_marginLeft="8dp"
android:layout_marginTop="8dp" android:layout_marginTop="8dp"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:layout_marginRight="8dp"
android:layout_marginBottom="8dp" android:layout_marginBottom="8dp"
android:gravity="end" android:gravity="end"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
...@@ -93,7 +95,9 @@ ...@@ -93,7 +95,9 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center_vertical" android:layout_gravity="center_vertical"
android:layout_marginStart="8dp" android:layout_marginStart="8dp"
android:layout_marginLeft="8dp"
android:layout_marginEnd="8dp" android:layout_marginEnd="8dp"
android:layout_marginRight="8dp"
android:checked="false" android:checked="false"
android:gravity="center_vertical" android:gravity="center_vertical"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
......
...@@ -5,9 +5,9 @@ ...@@ -5,9 +5,9 @@
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_marginStart="@dimen/card_horizontal_margin" android:layout_marginLeft="@dimen/card_horizontal_margin"
android:layout_marginTop="@dimen/card_vertical_margin" android:layout_marginTop="@dimen/card_vertical_margin"
android:layout_marginEnd="@dimen/card_horizontal_margin" android:layout_marginRight="@dimen/card_horizontal_margin"
android:layout_marginBottom="@dimen/card_vertical_margin" android:layout_marginBottom="@dimen/card_vertical_margin"
android:minHeight="?android:attr/listPreferredItemHeight" android:minHeight="?android:attr/listPreferredItemHeight"
app:cardCornerRadius="@dimen/card_corner_radius" app:cardCornerRadius="@dimen/card_corner_radius"
......
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<androidx.cardview.widget.CardView <androidx.cardview.widget.CardView xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:card_view="http://schemas.android.com/apk/res-auto" xmlns:card_view="http://schemas.android.com/apk/res-auto"
style="?attr/cardStyle" style="?attr/cardStyle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="center" android:layout_gravity="center"
android:layout_marginBottom="2dp" android:layout_marginLeft="@dimen/card_horizontal_margin"
android:layout_marginEnd="@dimen/card_horizontal_margin"
android:layout_marginStart="@dimen/card_horizontal_margin"
android:layout_marginTop="2dp" android:layout_marginTop="2dp"
android:layout_marginRight="@dimen/card_horizontal_margin"
android:layout_marginBottom="2dp"
card_view:cardCornerRadius="@dimen/card_corner_radius" card_view:cardCornerRadius="@dimen/card_corner_radius"
card_view:cardElevation="@dimen/card_elevation"> card_view:cardElevation="@dimen/card_elevation">
<LinearLayout <LinearLayout
android:orientation="vertical"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="wrap_content"
android:orientation="vertical">
<LinearLayout <LinearLayout
android:orientation="horizontal" android:id="@+id/info_layout"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/info_layout" android:orientation="horizontal"
android:padding="10dp"> android:padding="10dp">
<TextView <TextView
android:id="@+id/app_name" android:id="@+id/app_name"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:maxLines="1" android:layout_weight="2"
android:ellipsize="end" android:ellipsize="end"
android:maxLines="1"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorPrimary" android:textColor="?android:attr/textColorPrimary"
android:textIsSelectable="false" android:textIsSelectable="false" />
android:layout_weight="2" />
<TextView <TextView
android:id="@+id/action"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/action"
android:layout_weight="1" android:layout_weight="1"
android:gravity="center_horizontal"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorSecondary" android:textColor="?android:attr/textColorSecondary" />
android:gravity="center_horizontal" />
<TextView <TextView
android:id="@+id/time"
android:layout_width="0dp" android:layout_width="0dp"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:id="@+id/time"
android:layout_weight="1" android:layout_weight="1"
android:gravity="center_horizontal"
android:textAppearance="?android:attr/textAppearanceSmall" android:textAppearance="?android:attr/textAppearanceSmall"
android:textColor="?android:attr/textColorSecondary" android:textColor="?android:attr/textColorSecondary" />
android:gravity="center_horizontal" />
</LinearLayout> </LinearLayout>
......
...@@ -7,8 +7,8 @@ ...@@ -7,8 +7,8 @@
android:id="@+id/md_txt" android:id="@+id/md_txt"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="15dp" android:layout_marginLeft="15dp"
android:layout_marginEnd="15dp" android:layout_marginRight="15dp"
android:paddingTop="10dp" /> android:paddingTop="10dp" />
</ScrollView> </ScrollView>
\ No newline at end of file
...@@ -4,9 +4,9 @@ ...@@ -4,9 +4,9 @@
style="?attr/cardStyle" style="?attr/cardStyle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginStart="5dp" android:layout_marginLeft="5dp"
android:layout_marginTop="4dp" android:layout_marginTop="4dp"
android:layout_marginEnd="5dp" android:layout_marginRight="5dp"
android:layout_marginBottom="4dp" android:layout_marginBottom="4dp"
android:foreground="?android:attr/selectableItemBackground" android:foreground="?android:attr/selectableItemBackground"
app:cardCornerRadius="@dimen/card_corner_radius" app:cardCornerRadius="@dimen/card_corner_radius"
...@@ -23,7 +23,9 @@ ...@@ -23,7 +23,9 @@
android:layout_width="25dp" android:layout_width="25dp"
android:layout_height="25dp" android:layout_height="25dp"
android:layout_marginStart="16dp" android:layout_marginStart="16dp"
android:layout_marginLeft="16dp"
android:layout_marginEnd="16dp" android:layout_marginEnd="16dp"
android:layout_marginRight="16dp"
android:visibility="invisible" android:visibility="invisible"
app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toStartOf="@+id/status" app:layout_constraintEnd_toStartOf="@+id/status"
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
<item name="windowActionBar">false</item> <item name="windowActionBar">false</item>
<item name="windowNoTitle">true</item> <item name="windowNoTitle">true</item>
<item name="imageColorTint">@color/icon_grey</item> <item name="imageColorTint">@color/icon_grey</item>
<item name="colorControl">?android:colorControlNormal</item> <item name="colorControl">?android:attr/textColorSecondary</item>
</style> </style>
<style name="AppTheme" parent="AppTheme.Base"/> <style name="AppTheme" parent="AppTheme.Base"/>
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
<item name="windowNoTitle">true</item> <item name="windowNoTitle">true</item>
<item name="android:textColorSecondary">@color/dark_secondary_text</item> <item name="android:textColorSecondary">@color/dark_secondary_text</item>
<item name="imageColorTint">@color/dark_secondary_text</item> <item name="imageColorTint">@color/dark_secondary_text</item>
<item name="colorControl">?android:colorControlNormal</item> <item name="colorControl">?android:attr/textColorSecondary</item>
</style> </style>
<style name="AppTheme.Dark" parent="AppTheme.Dark.Base"/> <style name="AppTheme.Dark" parent="AppTheme.Dark.Base"/>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment