diff --git a/app/.gitignore b/app/.gitignore
new file mode 100644
index 0000000..53e730c
--- /dev/null
+++ b/app/.gitignore
@@ -0,0 +1,86 @@
+# Built application files
+*.apk
+*.aar
+*.ap_
+*.aab
+
+# Files for the ART/Dalvik VM
+*.dex
+
+# Java class files
+*.class
+
+# Generated files
+bin/
+gen/
+out/
+# Uncomment the following line in case you need and you don't have the release build type files in your app
+# release/
+
+# Gradle files
+.gradle/
+build/
+
+# Local configuration file (sdk path, etc)
+local.properties
+
+# Proguard folder generated by Eclipse
+proguard/
+
+# Log Files
+*.log
+
+# Android Studio Navigation editor temp files
+.navigation/
+
+# Android Studio captures folder
+captures/
+
+# IntelliJ
+*.iml
+.idea/workspace.xml
+.idea/tasks.xml
+.idea/gradle.xml
+.idea/assetWizardSettings.xml
+.idea/dictionaries
+.idea/libraries
+# Android Studio 3 in .gitignore file.
+.idea/caches
+.idea/modules.xml
+# Comment next line if keeping position of elements in Navigation Editor is relevant for you
+.idea/navEditor.xml
+
+# Keystore files
+# Uncomment the following lines if you do not want to check your keystore files in.
+#*.jks
+#*.keystore
+
+# External native build folder generated in Android Studio 2.2 and later
+.externalNativeBuild
+.cxx/
+
+# Google Services (e.g. APIs or Firebase)
+# google-services.json
+
+# Freeline
+freeline.py
+freeline/
+freeline_project_description.json
+
+# fastlane
+fastlane/report.xml
+fastlane/Preview.html
+fastlane/screenshots
+fastlane/test_output
+fastlane/readme.md
+
+# Version control
+vcs.xml
+
+# lint
+lint/intermediates/
+lint/generated/
+lint/outputs/
+lint/tmp/
+# lint/reports/
+/.idea/
diff --git a/app/app.iml b/app/app.iml
deleted file mode 100644
index cd6d9d0..0000000
--- a/app/app.iml
+++ /dev/null
@@ -1,209 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- generateDebugSources
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 1d35425..b2be800 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -13,7 +13,6 @@
-
@@ -28,27 +27,44 @@
android:name=".MyApplication"
android:allowBackup="true"
android:icon="@mipmap/ic_launcher"
- android:roundIcon="@mipmap/ic_launcher"
android:label="@string/app_name"
android:launchMode="singleTask"
android:networkSecurityConfig="@xml/network"
+ android:roundIcon="@mipmap/ic_launcher"
android:supportsRtl="true"
android:theme="@style/AppTheme"
tools:ignore="GoogleAppIndexingWarning">
-
-
-
+
+
+
-
-
-
-
-
+
+
+
+
+
@@ -207,9 +223,10 @@
-
+ android:exported="true" />
diff --git a/app/src/main/java/com/appstore/uiui/MyApplication.java b/app/src/main/java/com/appstore/uiui/MyApplication.java
index 33fe0cb..b3f7477 100644
--- a/app/src/main/java/com/appstore/uiui/MyApplication.java
+++ b/app/src/main/java/com/appstore/uiui/MyApplication.java
@@ -61,7 +61,7 @@ public class MyApplication extends Application {
@NonNull
@Override
public RefreshHeader createRefreshHeader(@NonNull Context context, @NonNull RefreshLayout layout) {
- layout.setPrimaryColorsId(R.color.download, R.color.red);//全局设置主题颜色
+ layout.setPrimaryColorsId(R.color.download, R.color.default_color);//全局设置主题颜色
return new ClassicsHeader(context);//.setTimeFormat(new DynamicTimeFormat("更新于 %s"));//指定为经典Header,默认是 贝塞尔雷达Header
}
});
diff --git a/app/src/main/java/com/appstore/uiui/activity/MainActivity.java b/app/src/main/java/com/appstore/uiui/activity/MainActivity.java
index b3c90d4..f28ccd8 100644
--- a/app/src/main/java/com/appstore/uiui/activity/MainActivity.java
+++ b/app/src/main/java/com/appstore/uiui/activity/MainActivity.java
@@ -6,6 +6,7 @@ import android.content.Intent;
import android.content.IntentFilter;
import android.content.pm.PackageInfo;
import android.content.pm.PackageManager;
+import android.content.res.Configuration;
import android.os.Bundle;
import android.os.Environment;
import android.os.Handler;
@@ -77,6 +78,7 @@ public class MainActivity extends BaseActivity {
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
+ Log.e("MainActivity","onCreate");
requestPermission();
registerMessageReceiver(); // used for receive msg
String rid = JPushInterface.getRegistrationID(getApplicationContext());
@@ -100,6 +102,18 @@ public class MainActivity extends BaseActivity {
return R.layout.activity_main;
}
+ @Override
+ public void onConfigurationChanged(@NonNull Configuration newConfig) {
+ super.onConfigurationChanged(newConfig);
+ Log.e("MainActivity","onConfigurationChanged");
+ }
+ @Override
+ protected void onSaveInstanceState(Bundle outState) {
+ super.onSaveInstanceState(outState);
+ Log.e("MainActivity","onSaveInstanceState");
+ }
+
+
@Override
protected void initView() {
iv_appicon = findViewById(R.id.iv_appicon);
@@ -130,7 +144,7 @@ public class MainActivity extends BaseActivity {
private void initTabLayout() {
final List fragmentList = new ArrayList<>();
- fragmentList.add(new FeaturedFragment(this));
+ fragmentList.add(new FeaturedFragment());
// fragmentList.add(new RankFragment());
fragmentList.add(new KindFragment());
fragmentList.add(new ManageFragment());
diff --git a/app/src/main/java/com/appstore/uiui/activity/SearcherActivity.java b/app/src/main/java/com/appstore/uiui/activity/SearcherActivity.java
index 2a59c1d..e5bb30e 100644
--- a/app/src/main/java/com/appstore/uiui/activity/SearcherActivity.java
+++ b/app/src/main/java/com/appstore/uiui/activity/SearcherActivity.java
@@ -40,8 +40,8 @@ public class SearcherActivity extends BaseActivity {
search = findViewById(R.id.search);
// int id = search.getContext().getResources().getIdentifier("android:id/search_src_text", null, null);
TextView textView = search.findViewById(androidx.appcompat.R.id.search_src_text);
- textView.setTextColor(Color.WHITE);
- textView.setHintTextColor(Color.WHITE);//提示字体颜色**
+ textView.setTextColor(Color.BLACK);
+ textView.setHintTextColor(Color.GRAY);//提示字体颜色**
recyclerView = findViewById(R.id.recyclerView);
}
diff --git a/app/src/main/java/com/appstore/uiui/adapter/AppAdapter.java b/app/src/main/java/com/appstore/uiui/adapter/AppAdapter.java
index 90e1b05..2c81cc9 100644
--- a/app/src/main/java/com/appstore/uiui/adapter/AppAdapter.java
+++ b/app/src/main/java/com/appstore/uiui/adapter/AppAdapter.java
@@ -110,17 +110,17 @@ public class AppAdapter extends RecyclerView.Adapter {
if (appInfo.isInstall()) {
if (appInfo.isUpdate()) {
holder.btnDownLoad.setText("更新");
- holder.btnDownLoad.setTextColor(mContext.getColor(R.color.install));
+ holder.btnDownLoad.setTextColor(mContext.getColor(R.color.default_color));
holder.btnDownLoad.setBackground(mContext.getDrawable(R.drawable.btn_style_none));
} else {
holder.btnDownLoad.setText("打开");
- holder.btnDownLoad.setTextColor(mContext.getColor(R.color.white));
- holder.btnDownLoad.setBackground(mContext.getDrawable(R.drawable.btn_style_open));
+ holder.btnDownLoad.setTextColor(mContext.getColor(R.color.default_color));
+ holder.btnDownLoad.setBackground(mContext.getDrawable(R.drawable.btn_style_none));
}
} else {
holder.btnDownLoad.setText("安装");
- holder.btnDownLoad.setTextColor(mContext.getColor(R.color.white));
- holder.btnDownLoad.setBackground(mContext.getDrawable(R.drawable.btn_style_open));
+ holder.btnDownLoad.setTextColor(mContext.getColor(R.color.default_color));
+ holder.btnDownLoad.setBackground(mContext.getDrawable(R.drawable.btn_style_none));
if (downloadTask != null) {
holder.refresh(downloadTask.progress);
}
diff --git a/app/src/main/java/com/appstore/uiui/base/BaseActivity.java b/app/src/main/java/com/appstore/uiui/base/BaseActivity.java
index 07c59fc..a12069f 100644
--- a/app/src/main/java/com/appstore/uiui/base/BaseActivity.java
+++ b/app/src/main/java/com/appstore/uiui/base/BaseActivity.java
@@ -23,9 +23,9 @@ public abstract class BaseActivity extends AppCompatActivity {
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
// requestWindowFeature(Window.FEATURE_NO_TITLE);
- if (getRequestedOrientation() != ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE) {
- setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
- }
+// if (getRequestedOrientation() != ActivityInfo.SCREEN_ORIENTATION_LANDSCAPE) {
+// setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
+// }
setStatusBar();
setContentView(setLayoutResourceID());
initView();
diff --git a/app/src/main/java/com/appstore/uiui/fragment/FeaturedFragment.java b/app/src/main/java/com/appstore/uiui/fragment/FeaturedFragment.java
index 5ace352..a3b9fd5 100644
--- a/app/src/main/java/com/appstore/uiui/fragment/FeaturedFragment.java
+++ b/app/src/main/java/com/appstore/uiui/fragment/FeaturedFragment.java
@@ -4,12 +4,14 @@ import android.content.BroadcastReceiver;
import android.content.Context;
import android.content.Intent;
import android.content.IntentFilter;
+import android.content.res.Configuration;
import android.os.Bundle;
import android.os.Handler;
import android.os.Message;
import android.view.View;
import android.widget.ImageView;
+import androidx.recyclerview.widget.GridLayoutManager;
import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
@@ -35,6 +37,7 @@ import com.zhpan.bannerview.utils.BannerUtils;
import java.util.ArrayList;
import java.util.List;
+import java.util.Objects;
/**
@@ -56,10 +59,9 @@ public class FeaturedFragment extends LazyLoadFragment implements RefreshManager
private installReceiver myReceiver;
private Context mContext;
- public FeaturedFragment(Context context) {
- this.mContext = context;
- }
+ public FeaturedFragment() {
+ }
@Override
public int getLayoutId() {
@@ -81,6 +83,32 @@ public class FeaturedFragment extends LazyLoadFragment implements RefreshManager
@Override
public void onStart() {
super.onStart();
+ mContext = this.getActivity();
+ adapter = new AppAdapter(newAppInfoList, false, getContext());
+ adapter.setHasStableIds(true);
+ int orientation = 0;
+ orientation = mContext.getResources().getConfiguration().orientation;
+ if (orientation == Configuration.ORIENTATION_LANDSCAPE) {
+ GridLayoutManager gridLayoutManager = new GridLayoutManager(mContext, 3);
+ mRvResult.setLayoutManager(gridLayoutManager);
+ } else if (orientation == Configuration.ORIENTATION_PORTRAIT) {
+ GridLayoutManager gridLayoutManager = new GridLayoutManager(mContext, 2);
+ mRvResult.setLayoutManager(gridLayoutManager);
+ } else {
+ mRvResult.setLayoutManager(new LinearLayoutManager(getActivity()));
+ }
+ mRvResult.setAdapter(adapter);
+ mRefreshLayout.setEnableLoadMore(false);
+ mRefreshLayout.setEnableRefresh(true);
+ mRefreshLayout.setOnRefreshListener(new OnRefreshListener() {
+ @Override
+ public void onRefresh(RefreshLayout refreshlayout) {
+// initData();
+ initAPPData(handler);
+ }
+ });
+ mRefreshLayout.autoRefresh();
+
adapter.setData(checkUpdateOrInstalled(newAppInfoList));
adapter.notifyDataSetChanged();
if (myReceiver == null) {
@@ -92,6 +120,7 @@ public class FeaturedFragment extends LazyLoadFragment implements RefreshManager
filter.setPriority(IntentFilter.SYSTEM_HIGH_PRIORITY);
mContext.registerReceiver(myReceiver, filter);
}
+
}
@Override
@@ -127,21 +156,7 @@ public class FeaturedFragment extends LazyLoadFragment implements RefreshManager
isNotLoadBitmap = false;
- adapter = new AppAdapter(newAppInfoList, false, getContext());
- adapter.setHasStableIds(true);
- mRvResult.setAdapter(adapter);
- mRvResult.setLayoutManager(new LinearLayoutManager(getActivity()));
- mRefreshLayout.setEnableLoadMore(false);
- mRefreshLayout.setEnableRefresh(true);
- mRefreshLayout.setOnRefreshListener(new OnRefreshListener() {
- @Override
- public void onRefresh(RefreshLayout refreshlayout) {
-// initData();
- initAPPData(handler);
- }
- });
- mRefreshLayout.autoRefresh();
}
@Override
diff --git a/app/src/main/java/com/appstore/uiui/fragment/ManageFragment.java b/app/src/main/java/com/appstore/uiui/fragment/ManageFragment.java
index d37d5c0..0301c93 100644
--- a/app/src/main/java/com/appstore/uiui/fragment/ManageFragment.java
+++ b/app/src/main/java/com/appstore/uiui/fragment/ManageFragment.java
@@ -1,5 +1,6 @@
package com.appstore.uiui.fragment;
+import android.content.Context;
import android.content.Intent;
import android.content.pm.ApplicationInfo;
import android.content.pm.PackageInfo;
@@ -49,6 +50,7 @@ public class ManageFragment extends LazyLoadFragment {
private List packageNameList = new ArrayList<>();
private UpdateAppAdapter adapter;
private ConstraintLayout manage_cl_localapp, manage_cl_download;
+ private Context mContext;
@Override
public int getLayoutId() {
@@ -62,26 +64,25 @@ public class ManageFragment extends LazyLoadFragment {
manage_cl_localapp.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- startActivity(new Intent(getActivity(), LocalManagerActivity.class));
+ startActivity(new Intent(mContext, LocalManagerActivity.class));
}
});
manage_cl_download = view.findViewById(R.id.manage_cl_download);
manage_cl_download.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
- startActivity(new Intent(getActivity(), DownloadManagerActivity.class));
+ startActivity(new Intent(mContext, DownloadManagerActivity.class));
}
});
iv_nodata = view.findViewById(R.id.iv_nodata);
mRvLocal = view.findViewById(R.id.manage_rv_local);
updateAppInfoList = new ArrayList<>();
- adapter = new UpdateAppAdapter(updateAppInfoList, getContext());
+ adapter = new UpdateAppAdapter(updateAppInfoList, mContext);
mRvLocal.setAdapter(adapter);
- mRvLocal.setLayoutManager(new LinearLayoutManager(getActivity()));
+ mRvLocal.setLayoutManager(new LinearLayoutManager(mContext));
- initAPPData(handler);
}
@Override
@@ -89,6 +90,13 @@ public class ManageFragment extends LazyLoadFragment {
}
+ @Override
+ public void onStart() {
+ super.onStart();
+ mContext = getActivity();
+ initAPPData(handler);
+ }
+
synchronized private void initAPPData(final Handler handler) {
OKGO.getAllAppInfo(handler);
}
@@ -97,19 +105,19 @@ public class ManageFragment extends LazyLoadFragment {
List appList = new ArrayList<>();
Intent intent = new Intent(Intent.ACTION_MAIN, null);
intent.addCategory(Intent.CATEGORY_LAUNCHER);
- List resolveInfoList = getActivity().getPackageManager().queryIntentActivities(intent, 0);
+ List resolveInfoList = mContext.getPackageManager().queryIntentActivities(intent, 0);
for (int i = 0; i < resolveInfoList.size(); i++) {
LocalApp bean = new LocalApp();
- bean.setAppName(resolveInfoList.get(i).loadLabel(getActivity().getPackageManager()).toString());
+ bean.setAppName(resolveInfoList.get(i).loadLabel(mContext.getPackageManager()).toString());
String packageName = resolveInfoList.get(i).activityInfo.packageName;
bean.setPackageName(packageName);
- Drawable icon = resolveInfoList.get(i).loadIcon(getActivity().getPackageManager());
+ Drawable icon = resolveInfoList.get(i).loadIcon(mContext.getPackageManager());
bean.setIcon(icon);
try {
- PackageInfo packageInfo = getActivity().getPackageManager().getPackageInfo(packageName, 0);
- String versionCode = getActivity().getPackageManager()
+ PackageInfo packageInfo = mContext.getPackageManager().getPackageInfo(packageName, 0);
+ String versionCode = mContext.getPackageManager()
.getPackageInfo(packageName, 0).versionName;
bean.setVersion(versionCode);
bean.setVersionCode(packageInfo.versionCode);
@@ -139,7 +147,7 @@ public class ManageFragment extends LazyLoadFragment {
for (LocalApp app : localAppList) {
if (packageNameList.contains(app.getPackageName())) {
AppInfo info = list.get(packageNameList.indexOf(app.getPackageName()));
- if (ApkUtils.checkIsUpdate(getContext(), info.getApp_package(), Integer.parseInt(info.getApp_version_code()))) {
+ if (ApkUtils.checkIsUpdate(mContext, info.getApp_package(), Integer.parseInt(info.getApp_version_code()))) {
UpdateAppInfo updateAppInfo = new UpdateAppInfo();
updateAppInfo.setVersionCode(app.getVersionCode());
updateAppInfo.setVersionName(app.getVersion());
diff --git a/app/src/main/res/drawable-xhdpi/ic_back.png b/app/src/main/res/drawable-xhdpi/ic_back.png
index dbafbd0..5db22cb 100644
Binary files a/app/src/main/res/drawable-xhdpi/ic_back.png and b/app/src/main/res/drawable-xhdpi/ic_back.png differ
diff --git a/app/src/main/res/drawable-xhdpi/ic_menu_search.png b/app/src/main/res/drawable-xhdpi/ic_menu_search.png
index fcd26fb..04571d8 100644
Binary files a/app/src/main/res/drawable-xhdpi/ic_menu_search.png and b/app/src/main/res/drawable-xhdpi/ic_menu_search.png differ
diff --git a/app/src/main/res/drawable/shap_search_left.xml b/app/src/main/res/drawable/shap_search_left.xml
index dbd3ef9..a648f28 100644
--- a/app/src/main/res/drawable/shap_search_left.xml
+++ b/app/src/main/res/drawable/shap_search_left.xml
@@ -1,7 +1,7 @@
-
+
-
+
@@ -34,7 +34,7 @@
android:layout_height="wrap_content"
android:gravity="center_horizontal"
android:text="关于"
- android:textColor="#ffffff"
+ android:textColor="@color/default_text_color"
android:textSize="@dimen/activity_font_size"
android:textStyle="bold"
app:layout_constraintBottom_toBottomOf="parent"
@@ -85,7 +85,7 @@
android:layout_height="wrap_content"
android:layout_marginBottom="36dp"
android:text="版权申明"
- android:textColor="#FE6045"
+ android:textColor="@color/default_color"
android:textSize="20sp"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintEnd_toEndOf="parent"
diff --git a/app/src/main/res/layout/activity_copyright.xml b/app/src/main/res/layout-land/activity_copyright.xml
similarity index 100%
rename from app/src/main/res/layout/activity_copyright.xml
rename to app/src/main/res/layout-land/activity_copyright.xml
diff --git a/app/src/main/res/layout/activity_details.xml b/app/src/main/res/layout-land/activity_details.xml
similarity index 97%
rename from app/src/main/res/layout/activity_details.xml
rename to app/src/main/res/layout-land/activity_details.xml
index 43e2c6e..d729d30 100644
--- a/app/src/main/res/layout/activity_details.xml
+++ b/app/src/main/res/layout-land/activity_details.xml
@@ -9,7 +9,7 @@
@@ -42,6 +42,7 @@
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="1"
+ android:overScrollMode="never"
android:background="@color/white">
diff --git a/app/src/main/res/layout/activity_kind_detail.xml b/app/src/main/res/layout-land/activity_kind_detail.xml
similarity index 96%
rename from app/src/main/res/layout/activity_kind_detail.xml
rename to app/src/main/res/layout-land/activity_kind_detail.xml
index 638c124..9f8424d 100644
--- a/app/src/main/res/layout/activity_kind_detail.xml
+++ b/app/src/main/res/layout-land/activity_kind_detail.xml
@@ -11,7 +11,7 @@
diff --git a/app/src/main/res/layout/activity_local_manager.xml b/app/src/main/res/layout-land/activity_local_manager.xml
similarity index 96%
rename from app/src/main/res/layout/activity_local_manager.xml
rename to app/src/main/res/layout-land/activity_local_manager.xml
index f049bc2..85ed010 100644
--- a/app/src/main/res/layout/activity_local_manager.xml
+++ b/app/src/main/res/layout-land/activity_local_manager.xml
@@ -10,7 +10,7 @@
android:id="@+id/linearLayout2"
android:layout_width="match_parent"
android:layout_height="@dimen/activity_title_height"
- android:background="@drawable/background_title"
+ android:background="@color/white"
android:orientation="horizontal"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent">
@@ -33,7 +33,7 @@
android:gravity="center_vertical"
android:singleLine="true"
android:text="本地管理"
- android:textColor="@color/white"
+ android:textColor="@color/default_text_color"
android:textSize="17sp"
android:textStyle="bold" />
diff --git a/app/src/main/res/layout-land/activity_main.xml b/app/src/main/res/layout-land/activity_main.xml
new file mode 100644
index 0000000..5c0bfc4
--- /dev/null
+++ b/app/src/main/res/layout-land/activity_main.xml
@@ -0,0 +1,115 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_searcher.xml b/app/src/main/res/layout-land/activity_searcher.xml
similarity index 95%
rename from app/src/main/res/layout/activity_searcher.xml
rename to app/src/main/res/layout-land/activity_searcher.xml
index 99d63d7..61eb786 100644
--- a/app/src/main/res/layout/activity_searcher.xml
+++ b/app/src/main/res/layout-land/activity_searcher.xml
@@ -10,7 +10,7 @@
android:id="@+id/linearLayout3"
android:layout_width="match_parent"
android:layout_height="@dimen/activity_title_height"
- android:background="@drawable/background_title"
+ android:background="@color/white"
android:orientation="horizontal"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintTop_toTopOf="parent">
@@ -31,7 +31,7 @@
android:layout_height="match_parent"
android:layout_gravity="center_vertical"
android:layout_marginEnd="@dimen/dp_40"
- android:textColor="@color/white"
+ android:textColor="@color/default_text_color"
app:iconifiedByDefault="false"
app:queryHint="@string/search_edit"
app:searchIcon="@drawable/ic_menu_search">
diff --git a/app/src/main/res/layout/fragment_collect.xml b/app/src/main/res/layout-land/fragment_collect.xml
similarity index 100%
rename from app/src/main/res/layout/fragment_collect.xml
rename to app/src/main/res/layout-land/fragment_collect.xml
diff --git a/app/src/main/res/layout/fragment_download_record.xml b/app/src/main/res/layout-land/fragment_download_record.xml
similarity index 100%
rename from app/src/main/res/layout/fragment_download_record.xml
rename to app/src/main/res/layout-land/fragment_download_record.xml
diff --git a/app/src/main/res/layout/fragment_downloadfinish.xml b/app/src/main/res/layout-land/fragment_downloadfinish.xml
similarity index 100%
rename from app/src/main/res/layout/fragment_downloadfinish.xml
rename to app/src/main/res/layout-land/fragment_downloadfinish.xml
diff --git a/app/src/main/res/layout/fragment_downloading.xml b/app/src/main/res/layout-land/fragment_downloading.xml
similarity index 100%
rename from app/src/main/res/layout/fragment_downloading.xml
rename to app/src/main/res/layout-land/fragment_downloading.xml
diff --git a/app/src/main/res/layout/fragment_featured.xml b/app/src/main/res/layout-land/fragment_featured.xml
similarity index 100%
rename from app/src/main/res/layout/fragment_featured.xml
rename to app/src/main/res/layout-land/fragment_featured.xml
diff --git a/app/src/main/res/layout/fragment_kind.xml b/app/src/main/res/layout-land/fragment_kind.xml
similarity index 100%
rename from app/src/main/res/layout/fragment_kind.xml
rename to app/src/main/res/layout-land/fragment_kind.xml
diff --git a/app/src/main/res/layout/fragment_kind_detail.xml b/app/src/main/res/layout-land/fragment_kind_detail.xml
similarity index 100%
rename from app/src/main/res/layout/fragment_kind_detail.xml
rename to app/src/main/res/layout-land/fragment_kind_detail.xml
diff --git a/app/src/main/res/layout/fragment_localapp.xml b/app/src/main/res/layout-land/fragment_localapp.xml
similarity index 100%
rename from app/src/main/res/layout/fragment_localapp.xml
rename to app/src/main/res/layout-land/fragment_localapp.xml
diff --git a/app/src/main/res/layout/fragment_manage.xml b/app/src/main/res/layout-land/fragment_manage.xml
similarity index 100%
rename from app/src/main/res/layout/fragment_manage.xml
rename to app/src/main/res/layout-land/fragment_manage.xml
diff --git a/app/src/main/res/layout/fragment_rank.xml b/app/src/main/res/layout-land/fragment_rank.xml
similarity index 100%
rename from app/src/main/res/layout/fragment_rank.xml
rename to app/src/main/res/layout-land/fragment_rank.xml
diff --git a/app/src/main/res/layout/include_line_horizontal.xml b/app/src/main/res/layout-land/include_line_horizontal.xml
similarity index 100%
rename from app/src/main/res/layout/include_line_horizontal.xml
rename to app/src/main/res/layout-land/include_line_horizontal.xml
diff --git a/app/src/main/res/layout/include_line_vertical.xml b/app/src/main/res/layout-land/include_line_vertical.xml
similarity index 100%
rename from app/src/main/res/layout/include_line_vertical.xml
rename to app/src/main/res/layout-land/include_line_vertical.xml
diff --git a/app/src/main/res/layout/item_app.xml b/app/src/main/res/layout-land/item_app.xml
similarity index 95%
rename from app/src/main/res/layout/item_app.xml
rename to app/src/main/res/layout-land/item_app.xml
index 3f0709d..a983ea0 100644
--- a/app/src/main/res/layout/item_app.xml
+++ b/app/src/main/res/layout-land/item_app.xml
@@ -72,8 +72,8 @@
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_donwloadfinish.xml b/app/src/main/res/layout-land/item_donwloadfinish.xml
similarity index 100%
rename from app/src/main/res/layout/item_donwloadfinish.xml
rename to app/src/main/res/layout-land/item_donwloadfinish.xml
diff --git a/app/src/main/res/layout/item_donwloading.xml b/app/src/main/res/layout-land/item_donwloading.xml
similarity index 92%
rename from app/src/main/res/layout/item_donwloading.xml
rename to app/src/main/res/layout-land/item_donwloading.xml
index 4307922..98c2b3e 100644
--- a/app/src/main/res/layout/item_donwloading.xml
+++ b/app/src/main/res/layout-land/item_donwloading.xml
@@ -60,11 +60,12 @@
\ No newline at end of file
diff --git a/app/src/main/res/layout/item_download_manager.xml b/app/src/main/res/layout-land/item_download_manager.xml
similarity index 92%
rename from app/src/main/res/layout/item_download_manager.xml
rename to app/src/main/res/layout-land/item_download_manager.xml
index 11032fa..a25bbe1 100644
--- a/app/src/main/res/layout/item_download_manager.xml
+++ b/app/src/main/res/layout-land/item_download_manager.xml
@@ -103,11 +103,12 @@
+ android:textColor="@color/default_color"
+ android:background="@drawable/btn_style_none" />
@@ -116,9 +117,9 @@
diff --git a/app/src/main/res/layout/item_net.xml b/app/src/main/res/layout-land/item_net.xml
similarity index 100%
rename from app/src/main/res/layout/item_net.xml
rename to app/src/main/res/layout-land/item_net.xml
diff --git a/app/src/main/res/layout-port/activity_about.xml b/app/src/main/res/layout-port/activity_about.xml
new file mode 100644
index 0000000..0d8654b
--- /dev/null
+++ b/app/src/main/res/layout-port/activity_about.xml
@@ -0,0 +1,94 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout-port/activity_copyright.xml b/app/src/main/res/layout-port/activity_copyright.xml
new file mode 100644
index 0000000..e5c1afb
--- /dev/null
+++ b/app/src/main/res/layout-port/activity_copyright.xml
@@ -0,0 +1,9 @@
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout-port/activity_details.xml b/app/src/main/res/layout-port/activity_details.xml
new file mode 100644
index 0000000..876868e
--- /dev/null
+++ b/app/src/main/res/layout-port/activity_details.xml
@@ -0,0 +1,245 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout-port/activity_download_manager.xml b/app/src/main/res/layout-port/activity_download_manager.xml
new file mode 100644
index 0000000..762330c
--- /dev/null
+++ b/app/src/main/res/layout-port/activity_download_manager.xml
@@ -0,0 +1,69 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout-port/activity_kind_detail.xml b/app/src/main/res/layout-port/activity_kind_detail.xml
new file mode 100644
index 0000000..9f8424d
--- /dev/null
+++ b/app/src/main/res/layout-port/activity_kind_detail.xml
@@ -0,0 +1,76 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout-port/activity_local_manager.xml b/app/src/main/res/layout-port/activity_local_manager.xml
new file mode 100644
index 0000000..85ed010
--- /dev/null
+++ b/app/src/main/res/layout-port/activity_local_manager.xml
@@ -0,0 +1,78 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout-port/activity_main.xml
similarity index 95%
rename from app/src/main/res/layout/activity_main.xml
rename to app/src/main/res/layout-port/activity_main.xml
index 77af315..58107b0 100644
--- a/app/src/main/res/layout/activity_main.xml
+++ b/app/src/main/res/layout-port/activity_main.xml
@@ -15,7 +15,7 @@
@@ -59,7 +59,7 @@
android:layout_width="@dimen/dp_20"
android:layout_height="@dimen/dp_40"
android:adjustViewBounds="true"
- android:background="@color/backgroundcolor"
+ android:background="@color/search"
android:scaleType="centerInside"
android:src="@drawable/icon_search" />
@@ -98,7 +98,7 @@
app:tl_tab_space_equal="true"
app:tl_textBold="SELECT"
app:tl_textsize="@dimen/sp_15"
- app:tl_textSelectColor="@color/red"
+ app:tl_textSelectColor="@color/default_color"
app:tl_textUnselectColor="@color/install" />
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout-port/fragment_collect.xml b/app/src/main/res/layout-port/fragment_collect.xml
new file mode 100644
index 0000000..34a0bf8
--- /dev/null
+++ b/app/src/main/res/layout-port/fragment_collect.xml
@@ -0,0 +1,47 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout-port/fragment_download_record.xml b/app/src/main/res/layout-port/fragment_download_record.xml
new file mode 100644
index 0000000..6687943
--- /dev/null
+++ b/app/src/main/res/layout-port/fragment_download_record.xml
@@ -0,0 +1,47 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout-port/fragment_downloadfinish.xml b/app/src/main/res/layout-port/fragment_downloadfinish.xml
new file mode 100644
index 0000000..42599ec
--- /dev/null
+++ b/app/src/main/res/layout-port/fragment_downloadfinish.xml
@@ -0,0 +1,12 @@
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout-port/fragment_downloading.xml b/app/src/main/res/layout-port/fragment_downloading.xml
new file mode 100644
index 0000000..253a3f1
--- /dev/null
+++ b/app/src/main/res/layout-port/fragment_downloading.xml
@@ -0,0 +1,11 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout-port/fragment_featured.xml b/app/src/main/res/layout-port/fragment_featured.xml
new file mode 100644
index 0000000..9aa2067
--- /dev/null
+++ b/app/src/main/res/layout-port/fragment_featured.xml
@@ -0,0 +1,57 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout-port/fragment_kind.xml b/app/src/main/res/layout-port/fragment_kind.xml
new file mode 100644
index 0000000..18e7f17
--- /dev/null
+++ b/app/src/main/res/layout-port/fragment_kind.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout-port/fragment_kind_detail.xml b/app/src/main/res/layout-port/fragment_kind_detail.xml
new file mode 100644
index 0000000..49852c3
--- /dev/null
+++ b/app/src/main/res/layout-port/fragment_kind_detail.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout-port/fragment_localapp.xml b/app/src/main/res/layout-port/fragment_localapp.xml
new file mode 100644
index 0000000..2ba1d8f
--- /dev/null
+++ b/app/src/main/res/layout-port/fragment_localapp.xml
@@ -0,0 +1,17 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout-port/fragment_manage.xml b/app/src/main/res/layout-port/fragment_manage.xml
new file mode 100644
index 0000000..5b03d21
--- /dev/null
+++ b/app/src/main/res/layout-port/fragment_manage.xml
@@ -0,0 +1,180 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout-port/fragment_rank.xml b/app/src/main/res/layout-port/fragment_rank.xml
new file mode 100644
index 0000000..137b382
--- /dev/null
+++ b/app/src/main/res/layout-port/fragment_rank.xml
@@ -0,0 +1,19 @@
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout-port/include_line_horizontal.xml b/app/src/main/res/layout-port/include_line_horizontal.xml
new file mode 100644
index 0000000..3a20a7b
--- /dev/null
+++ b/app/src/main/res/layout-port/include_line_horizontal.xml
@@ -0,0 +1,9 @@
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout-port/include_line_vertical.xml b/app/src/main/res/layout-port/include_line_vertical.xml
new file mode 100644
index 0000000..68a6844
--- /dev/null
+++ b/app/src/main/res/layout-port/include_line_vertical.xml
@@ -0,0 +1,8 @@
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout-port/item_app.xml b/app/src/main/res/layout-port/item_app.xml
new file mode 100644
index 0000000..a983ea0
--- /dev/null
+++ b/app/src/main/res/layout-port/item_app.xml
@@ -0,0 +1,101 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout-port/item_donwloadfinish.xml b/app/src/main/res/layout-port/item_donwloadfinish.xml
new file mode 100644
index 0000000..b10d167
--- /dev/null
+++ b/app/src/main/res/layout-port/item_donwloadfinish.xml
@@ -0,0 +1,51 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout-port/item_donwloading.xml b/app/src/main/res/layout-port/item_donwloading.xml
new file mode 100644
index 0000000..d18c380
--- /dev/null
+++ b/app/src/main/res/layout-port/item_donwloading.xml
@@ -0,0 +1,71 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout-port/item_download_manager.xml b/app/src/main/res/layout-port/item_download_manager.xml
new file mode 100644
index 0000000..a25bbe1
--- /dev/null
+++ b/app/src/main/res/layout-port/item_download_manager.xml
@@ -0,0 +1,129 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/app/src/main/res/layout-port/item_image.xml b/app/src/main/res/layout-port/item_image.xml
new file mode 100644
index 0000000..a1f7746
--- /dev/null
+++ b/app/src/main/res/layout-port/item_image.xml
@@ -0,0 +1,15 @@
+
+
+
+
+
+
diff --git a/app/src/main/res/layout-port/item_kind.xml b/app/src/main/res/layout-port/item_kind.xml
new file mode 100644
index 0000000..1327b34
--- /dev/null
+++ b/app/src/main/res/layout-port/item_kind.xml
@@ -0,0 +1,46 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout-port/item_local_app.xml b/app/src/main/res/layout-port/item_local_app.xml
new file mode 100644
index 0000000..a54d8b9
--- /dev/null
+++ b/app/src/main/res/layout-port/item_local_app.xml
@@ -0,0 +1,89 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/layout-port/item_net.xml b/app/src/main/res/layout-port/item_net.xml
new file mode 100644
index 0000000..b1c059b
--- /dev/null
+++ b/app/src/main/res/layout-port/item_net.xml
@@ -0,0 +1,32 @@
+
+
+
+
+
+
+
+
\ No newline at end of file
diff --git a/app/src/main/res/mipmap-hdpi/ic_launcher.png b/app/src/main/res/mipmap-hdpi/ic_launcher.png
index e905244..b93d6ed 100644
Binary files a/app/src/main/res/mipmap-hdpi/ic_launcher.png and b/app/src/main/res/mipmap-hdpi/ic_launcher.png differ
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index bf839cc..e29016f 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -8,9 +8,11 @@
#000000
#f5f4f4
#959393
-
+ #868686
+ #4880ff
#ffffff
#ffffff
+ #F1F1F1
#d64743
#00a0e9