Lots of changes to MBE Style UI, remove request and partially remove …

…wallpapers
williamd1k0 · Mar 15, 2019 · 54a7d44 · 54a7d44
1 parent 238a4f2
commit 54a7d44
Show file tree

Hide file tree

Showing 23 changed files with 70 additions and 913 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -8,8 +8,8 @@ android {
         applicationId "space.tumeo.pixel"
         minSdkVersion 17
         targetSdkVersion 27
-        versionCode 26
-        versionName "0.1.3"
+        versionCode 27
+        versionName "0.2.0"
         resConfigs "en", "zh-rCN"
     }
 

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -2,7 +2,7 @@
     package="me.iacn.mbestyle">
 
     <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.SET_WALLPAPER" />
+    <!-- <uses-permission android:name="android.permission.SET_WALLPAPER" /> -->
 
     <application
         android:allowBackup="true"
@@ -153,8 +153,6 @@
             android:name=".ui.activity.IconViewActivity"
             android:theme="@style/AppTheme.Dialog" />
 
-        <activity android:name=".ui.activity.WallpaperActivity" />
-
         <activity
             android:name=".ui.activity.LicenseActivity"
             android:theme="@android:style/Theme.Material.Light.Dialog" />

diff --git a/app/src/main/java/me/iacn/mbestyle/presenter/RequestPresenter.java b/app/src/main/java/me/iacn/mbestyle/presenter/RequestPresenter.java
diff --git a/app/src/main/java/me/iacn/mbestyle/ui/activity/MainActivity.java b/app/src/main/java/me/iacn/mbestyle/ui/activity/MainActivity.java
@@ -21,10 +21,10 @@
 import java.util.List;
 
 import me.iacn.mbestyle.R;
+import me.iacn.mbestyle.ui.fragment.BaseFragment;
 import me.iacn.mbestyle.ui.fragment.AboutFragment;
 import me.iacn.mbestyle.ui.fragment.ApplyFragment;
 import me.iacn.mbestyle.ui.fragment.IconFragment;
-import me.iacn.mbestyle.ui.fragment.RequestFragment;
 import me.iacn.mbestyle.util.ScreenUtils;
 import me.iacn.mbestyle.util.StatusBarUtils;
 
@@ -38,7 +38,7 @@ public class MainActivity extends AppCompatActivity implements BottomNavigationV
     private Toolbar mToolbar;
 
     private int mCurrentIndex = -1;
-    private List<Fragment> mFragments;
+    private List<BaseFragment> mFragments;
     private FragmentManager mFragmentManager;
 
     @Override
@@ -58,7 +58,6 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
         mFragments = Arrays.asList(
                 new IconFragment(),
                 new ApplyFragment(),
-                new RequestFragment(),
                 new AboutFragment());
 
         mFragmentManager = getFragmentManager();
@@ -81,18 +80,6 @@ public boolean onNavigationItemSelected(@NonNull MenuItem item) {
         return false;
     }
 
-    @Override
-    public void onBackPressed() {
-        if (mCurrentIndex == 2) {
-            // 调用申请 Fragment 的 onBackPressed()
-            // 以处理有选中时的取消操作
-            RequestFragment fragment = (RequestFragment) mFragments.get(2);
-            fragment.onBackPressed();
-        } else {
-            super.onBackPressed();
-        }
-    }
-
     private void setBottomIconOriColor(BottomNavigationView bottomView) {
         try {
             Field mMenuViewField = BottomNavigationView.class.getDeclaredField("mMenuView");

diff --git a/app/src/main/java/me/iacn/mbestyle/ui/activity/WallpaperActivity.java b/app/src/main/java/me/iacn/mbestyle/ui/activity/WallpaperActivity.java