Skip to content

Commit 54a7d44

Browse files
committed
Lots of changes to MBE Style UI, remove request and partially remove wallpapers
1 parent 238a4f2 commit 54a7d44

23 files changed

+70
-913
lines changed

app/build.gradle

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,8 @@ android {
88
applicationId "space.tumeo.pixel"
99
minSdkVersion 17
1010
targetSdkVersion 27
11-
versionCode 26
12-
versionName "0.1.3"
11+
versionCode 27
12+
versionName "0.2.0"
1313
resConfigs "en", "zh-rCN"
1414
}
1515

app/src/main/AndroidManifest.xml

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
package="me.iacn.mbestyle">
33

44
<uses-permission android:name="android.permission.INTERNET" />
5-
<uses-permission android:name="android.permission.SET_WALLPAPER" />
5+
<!-- <uses-permission android:name="android.permission.SET_WALLPAPER" /> -->
66

77
<application
88
android:allowBackup="true"
@@ -153,8 +153,6 @@
153153
android:name=".ui.activity.IconViewActivity"
154154
android:theme="@style/AppTheme.Dialog" />
155155

156-
<activity android:name=".ui.activity.WallpaperActivity" />
157-
158156
<activity
159157
android:name=".ui.activity.LicenseActivity"
160158
android:theme="@android:style/Theme.Material.Light.Dialog" />

app/src/main/java/me/iacn/mbestyle/presenter/RequestPresenter.java

Lines changed: 0 additions & 181 deletions
This file was deleted.

app/src/main/java/me/iacn/mbestyle/ui/activity/MainActivity.java

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -21,10 +21,10 @@
2121
import java.util.List;
2222

2323
import me.iacn.mbestyle.R;
24+
import me.iacn.mbestyle.ui.fragment.BaseFragment;
2425
import me.iacn.mbestyle.ui.fragment.AboutFragment;
2526
import me.iacn.mbestyle.ui.fragment.ApplyFragment;
2627
import me.iacn.mbestyle.ui.fragment.IconFragment;
27-
import me.iacn.mbestyle.ui.fragment.RequestFragment;
2828
import me.iacn.mbestyle.util.ScreenUtils;
2929
import me.iacn.mbestyle.util.StatusBarUtils;
3030

@@ -38,7 +38,7 @@ public class MainActivity extends AppCompatActivity implements BottomNavigationV
3838
private Toolbar mToolbar;
3939

4040
private int mCurrentIndex = -1;
41-
private List<Fragment> mFragments;
41+
private List<BaseFragment> mFragments;
4242
private FragmentManager mFragmentManager;
4343

4444
@Override
@@ -58,7 +58,6 @@ protected void onCreate(@Nullable Bundle savedInstanceState) {
5858
mFragments = Arrays.asList(
5959
new IconFragment(),
6060
new ApplyFragment(),
61-
new RequestFragment(),
6261
new AboutFragment());
6362

6463
mFragmentManager = getFragmentManager();
@@ -81,18 +80,6 @@ public boolean onNavigationItemSelected(@NonNull MenuItem item) {
8180
return false;
8281
}
8382

84-
@Override
85-
public void onBackPressed() {
86-
if (mCurrentIndex == 2) {
87-
// 调用申请 Fragment 的 onBackPressed()
88-
// 以处理有选中时的取消操作
89-
RequestFragment fragment = (RequestFragment) mFragments.get(2);
90-
fragment.onBackPressed();
91-
} else {
92-
super.onBackPressed();
93-
}
94-
}
95-
9683
private void setBottomIconOriColor(BottomNavigationView bottomView) {
9784
try {
9885
Field mMenuViewField = BottomNavigationView.class.getDeclaredField("mMenuView");

app/src/main/java/me/iacn/mbestyle/ui/activity/WallpaperActivity.java

Lines changed: 0 additions & 112 deletions
This file was deleted.

0 commit comments

Comments
 (0)