This commit is contained in:
NekoInverter 2020-03-03 15:10:21 +08:00
parent 2cb0911a18
commit 93bbb75fb1
No known key found for this signature in database
GPG Key ID: 280D6CCCF95715F9
10 changed files with 695 additions and 722 deletions

View File

@ -6,6 +6,7 @@ import android.content.Intent;
import android.content.IntentFilter;
import android.content.SharedPreferences;
import android.content.res.Resources;
import android.content.res.TypedArray;
import android.database.Cursor;
import android.net.ConnectivityManager;
import android.net.Uri;
@ -350,11 +351,10 @@ public class DownloadActivity extends BaseActivity implements RepoLoader.RepoLis
txtStatus.setText(mContext.getString(
R.string.download_status_installed, installedVersion));
//txtStatus.setTextColor(ThemeUtil.getThemeColor(mContext, R.attr.download_status_installed));
TypedValue typedValue = new TypedValue();
Resources.Theme theme = txtStatus.getContext().getTheme();
theme.resolveAttribute(android.R.attr.textColorSecondary, typedValue, true);
@ColorInt int color = typedValue.data;
txtStatus.setTextColor(color);
TypedArray typedArray = DownloadActivity.this.getTheme().obtainStyledAttributes(new int[] { android.R.attr.textColorSecondary });
int textColor = typedArray.getColor(0, 0);
typedArray.recycle();
txtStatus.setTextColor(textColor);
txtStatus.setVisibility(View.VISIBLE);
} else {
txtStatus.setVisibility(View.GONE);

View File

@ -0,0 +1,12 @@
<ripple xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:color="?colorControlHighlight"
tools:ignore="PrivateResource">
<item android:id="@android:id/mask">
<shape android:shape="rectangle">
<solid android:color="@android:color/white" />
<corners android:radius="8dp" />
</shape>
</item>
</ripple>

View File

@ -10,33 +10,29 @@
<include layout="@layout/appbar_layout" />
<ScrollView
<androidx.core.widget.NestedScrollView
android:layout_width="match_parent"
android:layout_height="wrap_content"
app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior"
android:orientation="vertical"
app:layout_behavior="@string/appbar_scrolling_view_behavior"
tools:ignore="UseCompoundDrawables,ContentDescription">
<LinearLayout
android:id="@android:id/content"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:orientation="vertical">
android:orientation="vertical"
android:padding="8dp">
<LinearLayout
android:layout_width="match_parent"
android:layout_height="72dp"
android:orientation="horizontal"
android:padding="16dp">
android:padding="8dp">
<ImageView
android:layout_width="32dp"
android:layout_height="48dp"
android:layout_width="42dp"
android:layout_height="64dp"
android:layout_gravity="center_vertical"
android:adjustViewBounds="true"
android:contentDescription="@string/app_name"
@ -47,8 +43,8 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:paddingStart="16dp"
android:paddingEnd="16dp"
android:layout_marginStart="8dp"
android:paddingHorizontal="8dp"
android:text="@string/app_name"
android:textAppearance="@style/TextAppearance.AppCompat.Headline" />
</LinearLayout>
@ -56,14 +52,13 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
android:background="@drawable/main_item_background"
android:clickable="true"
android:focusable="true"
android:gravity="center_vertical"
android:minHeight="48dp"
android:orientation="horizontal"
android:paddingStart="16dp"
android:paddingEnd="16dp">
android:paddingHorizontal="8dp">
<ImageView
android:layout_width="24dp"
@ -99,14 +94,13 @@
android:id="@+id/changelogView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
android:background="@drawable/main_item_background"
android:clickable="true"
android:focusable="true"
android:gravity="center_vertical"
android:minHeight="48dp"
android:orientation="horizontal"
android:paddingStart="16dp"
android:paddingEnd="16dp">
android:paddingHorizontal="8dp">
<ImageView
android:layout_width="24dp"
@ -129,13 +123,12 @@
android:id="@+id/licensesView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
android:background="@drawable/main_item_background"
android:clickable="true"
android:focusable="true"
android:gravity="center_vertical"
android:orientation="horizontal"
android:paddingStart="16dp"
android:paddingEnd="16dp">
android:paddingHorizontal="8dp">
<ImageView
android:layout_width="24dp"
@ -159,14 +152,13 @@
android:id="@+id/translatorsView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
android:background="@drawable/main_item_background"
android:clickable="true"
android:focusable="true"
android:gravity="center_vertical"
android:minHeight="48dp"
android:orientation="horizontal"
android:paddingStart="16dp"
android:paddingEnd="16dp">
android:paddingHorizontal="8dp">
<ImageView
android:layout_width="24dp"
@ -202,14 +194,13 @@
android:id="@+id/tgChannelView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
android:background="@drawable/main_item_background"
android:clickable="true"
android:focusable="true"
android:gravity="center_vertical"
android:minHeight="48dp"
android:orientation="horizontal"
android:paddingStart="16dp"
android:paddingEnd="16dp">
android:paddingHorizontal="8dp">
<ImageView
android:layout_width="24dp"
@ -240,14 +231,13 @@
android:id="@+id/qqGroupView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
android:background="@drawable/main_item_background"
android:clickable="true"
android:focusable="true"
android:gravity="center_vertical"
android:minHeight="48dp"
android:orientation="horizontal"
android:paddingStart="16dp"
android:paddingEnd="16dp">
android:paddingHorizontal="8dp">
<ImageView
android:layout_width="24dp"
@ -278,14 +268,13 @@
android:id="@+id/tgGroupView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
android:background="@drawable/main_item_background"
android:clickable="true"
android:focusable="true"
android:gravity="center_vertical"
android:minHeight="48dp"
android:orientation="horizontal"
android:paddingStart="16dp"
android:paddingEnd="16dp">
android:paddingHorizontal="8dp">
<ImageView
android:layout_width="24dp"
@ -317,14 +306,13 @@
android:id="@+id/sourceCodeView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
android:background="@drawable/main_item_background"
android:clickable="true"
android:focusable="true"
android:gravity="center_vertical"
android:minHeight="48dp"
android:orientation="horizontal"
android:paddingStart="16dp"
android:paddingEnd="16dp">
android:paddingHorizontal="8dp">
<ImageView
android:layout_width="24dp"
@ -355,14 +343,13 @@
android:id="@+id/donateView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
android:background="@drawable/main_item_background"
android:clickable="true"
android:focusable="true"
android:gravity="center_vertical"
android:minHeight="48dp"
android:orientation="horizontal"
android:paddingStart="16dp"
android:paddingEnd="16dp">
android:paddingHorizontal="8dp">
<ImageView
android:layout_width="24dp"
@ -399,14 +386,13 @@
android:id="@+id/faqView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
android:background="@drawable/main_item_background"
android:clickable="true"
android:focusable="true"
android:gravity="center_vertical"
android:minHeight="48dp"
android:orientation="horizontal"
android:paddingStart="16dp"
android:paddingEnd="16dp">
android:paddingHorizontal="8dp">
<ImageView
android:layout_width="24dp"
@ -436,14 +422,13 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
android:background="@drawable/main_item_background"
android:clickable="true"
android:focusable="true"
android:gravity="center_vertical"
android:minHeight="48dp"
android:orientation="horizontal"
android:paddingStart="16dp"
android:paddingEnd="16dp">
android:paddingHorizontal="8dp">
<ImageView
android:layout_width="24dp"
@ -481,14 +466,13 @@
android:id="@+id/installerSupportView"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="?attr/selectableItemBackground"
android:background="@drawable/main_item_background"
android:clickable="true"
android:focusable="true"
android:gravity="center_vertical"
android:minHeight="48dp"
android:orientation="horizontal"
android:paddingStart="16dp"
android:paddingEnd="16dp">
android:paddingHorizontal="8dp">
<ImageView
android:layout_width="24dp"
@ -515,13 +499,6 @@
</LinearLayout>
</LinearLayout>
<LinearLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
@ -618,10 +595,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingStart="16dp"
android:paddingTop="8dp"
android:paddingEnd="16dp"
android:paddingBottom="8dp">
android:padding="8dp">
<TextView
android:layout_width="wrap_content"
@ -687,10 +661,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingStart="16dp"
android:paddingTop="8dp"
android:paddingEnd="16dp"
android:paddingBottom="8dp">
android:padding="8dp">
<TextView
android:layout_width="wrap_content"
@ -748,10 +719,7 @@
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:orientation="vertical"
android:paddingStart="16dp"
android:paddingTop="8dp"
android:paddingEnd="16dp"
android:paddingBottom="8dp">
android:padding="8dp">
<TextView
android:layout_width="wrap_content"
@ -796,7 +764,5 @@
</LinearLayout>
</LinearLayout>
</ScrollView>
</androidx.core.widget.NestedScrollView>
</androidx.coordinatorlayout.widget.CoordinatorLayout>

View File

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/snackbar"
android:layout_width="match_parent"
android:layout_height="match_parent"
@ -12,10 +13,10 @@
android:id="@+id/swipeRefreshLayout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="?attr/actionBarSize"
android:clipChildren="false"
android:clipToPadding="false"
android:orientation="vertical">
android:orientation="vertical"
app:layout_behavior="@string/appbar_scrolling_view_behavior">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerView"

View File

@ -16,7 +16,7 @@
android:clipChildren="false"
android:clipToPadding="false"
android:orientation="vertical"
app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
app:layout_behavior="@string/appbar_scrolling_view_behavior">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerView"

View File

@ -45,7 +45,7 @@
android:layout_height="match_parent"
android:clipChildren="false"
android:clipToPadding="false"
app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior">
app:layout_behavior="@string/appbar_scrolling_view_behavior">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerView"

View File

@ -53,8 +53,7 @@
android:id="@+id/activity_main_status"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginEnd="16dp"
android:layout_marginHorizontal="16dp"
android:clickable="true"
android:focusable="true"
android:foreground="?attr/selectableItemBackground"
@ -106,9 +105,8 @@
android:id="@+id/activity_main_modules"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginHorizontal="16dp"
android:layout_marginTop="10dp"
android:layout_marginEnd="16dp"
android:clickable="true"
android:focusable="true"
android:foreground="?attr/selectableItemBackground"
@ -156,9 +154,8 @@
android:id="@+id/activity_main_downloads"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginHorizontal="16dp"
android:layout_marginTop="10dp"
android:layout_marginEnd="16dp"
android:clickable="true"
android:focusable="true"
android:foreground="?attr/selectableItemBackground"
@ -206,14 +203,13 @@
android:id="@+id/activity_main_apps"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp"
android:layout_marginTop="5dp"
android:background="?attr/selectableItemBackground"
android:background="@drawable/main_item_background"
android:clickable="true"
android:focusable="true"
android:orientation="horizontal"
android:padding="16dp"
android:paddingStart="32dp"
android:paddingEnd="32dp">
android:padding="16dp">
<ImageView
android:layout_width="25dp"
@ -233,14 +229,13 @@
android:id="@+id/activity_main_logs"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp"
android:layout_marginTop="5dp"
android:background="?attr/selectableItemBackground"
android:background="@drawable/main_item_background"
android:clickable="true"
android:focusable="true"
android:orientation="horizontal"
android:padding="16dp"
android:paddingStart="32dp"
android:paddingEnd="32dp">
android:padding="16dp">
<ImageView
android:layout_width="25dp"
@ -260,14 +255,13 @@
android:id="@+id/activity_main_settings"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp"
android:layout_marginTop="5dp"
android:background="?attr/selectableItemBackground"
android:background="@drawable/main_item_background"
android:clickable="true"
android:focusable="true"
android:orientation="horizontal"
android:padding="16dp"
android:paddingStart="32dp"
android:paddingEnd="32dp">
android:padding="16dp">
<ImageView
android:layout_width="25dp"
@ -287,14 +281,13 @@
android:id="@+id/activity_main_about"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginHorizontal="16dp"
android:layout_marginTop="5dp"
android:background="?attr/selectableItemBackground"
android:background="@drawable/main_item_background"
android:clickable="true"
android:focusable="true"
android:orientation="horizontal"
android:padding="16dp"
android:paddingStart="32dp"
android:paddingEnd="32dp">
android:padding="16dp">
<ImageView
android:layout_width="25dp"

View File

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?>
<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:id="@+id/snackbar"
android:layout_width="match_parent"
android:layout_height="match_parent"
@ -12,10 +13,10 @@
android:id="@+id/swipeRefreshLayout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginTop="?attr/actionBarSize"
android:clipChildren="false"
android:clipToPadding="false"
android:orientation="vertical">
android:orientation="vertical"
app:layout_behavior="@string/appbar_scrolling_view_behavior">
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/recyclerView"

View File

@ -15,6 +15,6 @@
android:layout_height="match_parent"
android:clipChildren="false"
android:clipToPadding="false"
app:layout_behavior="com.google.android.material.appbar.AppBarLayout$ScrollingViewBehavior" />
app:layout_behavior="@string/appbar_scrolling_view_behavior" />
</androidx.coordinatorlayout.widget.CoordinatorLayout>

View File

@ -1,13 +1,13 @@
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:clipChildren="false"
android:clipToPadding="false"
android:minHeight="?attr/listPreferredItemHeight"
android:orientation="vertical"
android:paddingStart="16dp"
android:paddingTop="11dp"
android:paddingEnd="16dp"
android:clipToPadding="false"
android:clipChildren="false"
android:paddingBottom="11dp">
<LinearLayout
@ -68,8 +68,8 @@
<org.meowcat.edxposed.manager.widget.DownloadView
android:id="@+id/downloadView"
android:layout_width="match_parent"
android:clipChildren="false"
android:layout_height="wrap_content" />
android:layout_height="wrap_content"
android:clipChildren="false" />
<TextView
android:id="@+id/txtChangesTitle"