Skip to content

Commit 0c93228

Browse files
DziubaVLaDDziubaVLaD
committed
Fix bugs
1 parent c8e8a7f commit 0c93228

24 files changed

+247
-50
lines changed

‎.idea/caches/build_file_checksums.ser

0 Bytes
Binary file not shown.

‎.idea/misc.xml

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎app/build.gradle

Lines changed: 29 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -17,33 +17,33 @@ android {
1717
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
1818
}
1919
}
20-
}
2120

22-
dependencies {
23-
implementation fileTree(include: ['*.jar'], dir: 'libs')
24-
implementation 'com.google.android.gms:play-services-ads:15.0.1'
25-
// Библиотека Appmetrica SDK.
26-
implementation 'com.yandex.android:mobmetricalib:3.2.2'
27-
// Опционально. Библиотека Play Install Referrer.
28-
implementation 'com.android.installreferrer:installreferrer:1.0'
29-
implementation 'com.android.support:appcompat-v7:27.0.0'
30-
implementation "com.android.support:support-compat:27.0.0"
31-
implementation 'com.jakewharton:butterknife:6.0.0'
32-
implementation 'com.nhaarman.listviewanimations:lib-core:3.1.0@aar'
33-
implementation 'com.nhaarman.listviewanimations:lib-manipulation:3.1.0@aar'
34-
implementation 'com.nhaarman.listviewanimations:lib-core-slh:3.1.0@aar'
35-
implementation 'com.umeng.analytics:analytics:latest.integration'
36-
implementation 'com.github.gabrielemariotti.changeloglib:library:1.5.2'
37-
implementation 'com.hannesdorfmann.smoothprogressbar:library:1.0.0'
38-
implementation 'com.github.castorflex.smoothprogressbar:library-circular:1.0.0'
39-
implementation project(':library')
40-
implementation files('libs/nineoldandroids-2.4.0.jar')
41-
implementation files('libs/umeng-update-v2.5.0.jar')
42-
implementation files('libs/httpmime-4.1.3.jar')
43-
implementation files('libs/umeng_social_sdk.jar')
44-
implementation files('libs/SocialSDK_laiwang_1.jar')
45-
implementation files('libs/SocialSDK_laiwang_2.jar')
46-
implementation files('libs/SocialSDK_QQZone_1.jar')
47-
implementation 'com.android.support:support-v4:27.0.0'
48-
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
49-
}
21+
dependencies {
22+
implementation fileTree(include: ['*.jar'], dir: 'libs')
23+
implementation 'com.google.android.gms:play-services-ads:15.0.1'
24+
// Библиотека Appmetrica SDK.
25+
implementation 'com.yandex.android:mobmetricalib:3.2.2'
26+
// Опционально. Библиотека Play Install Referrer.
27+
implementation 'com.android.installreferrer:installreferrer:1.0'
28+
implementation 'com.android.support:appcompat-v7:27.0.0'
29+
implementation "com.android.support:support-compat:27.0.0"
30+
implementation 'com.jakewharton:butterknife:6.0.0'
31+
implementation 'com.nhaarman.listviewanimations:lib-core:3.1.0@aar'
32+
implementation 'com.nhaarman.listviewanimations:lib-manipulation:3.1.0@aar'
33+
implementation 'com.nhaarman.listviewanimations:lib-core-slh:3.1.0@aar'
34+
implementation 'com.umeng.analytics:analytics:latest.integration'
35+
implementation 'com.github.gabrielemariotti.changeloglib:library:1.5.2'
36+
implementation 'com.hannesdorfmann.smoothprogressbar:library:1.0.0'
37+
implementation 'com.github.castorflex.smoothprogressbar:library-circular:1.0.0'
38+
implementation project(':library')
39+
implementation files('libs/nineoldandroids-2.4.0.jar')
40+
implementation files('libs/umeng-update-v2.5.0.jar')
41+
implementation files('libs/httpmime-4.1.3.jar')
42+
implementation files('libs/umeng_social_sdk.jar')
43+
implementation files('libs/SocialSDK_laiwang_1.jar')
44+
implementation files('libs/SocialSDK_laiwang_2.jar')
45+
implementation files('libs/SocialSDK_QQZone_1.jar')
46+
implementation 'com.android.support:support-v4:27.0.0'
47+
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
48+
}
49+
}

‎app/src/main/AndroidManifest.xml

Lines changed: 5 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -31,11 +31,10 @@
3131
android:smallScreens="true" />
3232

3333
<application
34-
android:name="com.balaganovrocks.yourmastercleaner.base.BaseApplication"
34+
android:name="com.balaganovrocks.yourmastercleaner.ui.MyApp"
3535
android:allowBackup="true"
3636
android:icon="@drawable/app_icon"
3737
android:label="@string/app_name"
38-
3938
android:theme="@style/MyAppTheme">
4039
<activity
4140
android:name="com.balaganovrocks.yourmastercleaner.ui.SplishActivity"
@@ -49,22 +48,18 @@
4948
</intent-filter>
5049
</activity>
5150
<activity
52-
android:screenOrientation="portrait"
5351
android:name="com.balaganovrocks.yourmastercleaner.ui.MainActivity"
5452
android:label="@string/app_name"
5553
android:theme="@style/MyAppTheme" />
5654
<activity
57-
android:screenOrientation="portrait"
5855
android:name="com.balaganovrocks.yourmastercleaner.ui.BatterySavingActivity"
5956
android:label="@string/app_name"
6057
android:theme="@style/MyAppTheme" />
6158
<activity
62-
android:screenOrientation="portrait"
6359
android:name="com.balaganovrocks.yourmastercleaner.ui.Privacy_Policy"
6460
android:label="@string/app_name"
6561
android:theme="@style/MyAppTheme" />
6662
<activity
67-
android:screenOrientation="portrait"
6863
android:name="com.balaganovrocks.yourmastercleaner.ui.ShortCutActivity"
6964
android:excludeFromRecents="true"
7065
android:exported="true"
@@ -77,46 +72,42 @@
7772
</intent-filter>
7873
</activity>
7974
<activity
80-
android:screenOrientation="portrait"
8175
android:name="com.balaganovrocks.yourmastercleaner.ui.MemoryCleanActivity"
8276
android:label="@string/app_memory_clean"
8377
android:theme="@style/MyTranslucentAppTheme" />
8478

8579
<activity
86-
android:screenOrientation="portrait"
8780
android:name="com.balaganovrocks.yourmastercleaner.ui.settings"
8881
android:label="@string/app_memory_clean"
8982
android:theme="@style/MyTranslucentAppTheme" />
9083
<activity
91-
android:screenOrientation="portrait"
9284
android:name="com.balaganovrocks.yourmastercleaner.ui.Exit"
9385
android:label="@string/app_memory_clean"
9486
android:theme="@style/MyTranslucentAppTheme" />
87+
<activity
88+
android:name="com.balaganovrocks.yourmastercleaner.ui.ResultActivity"
89+
android:label="@string/app_memory_clean"
90+
android:theme="@style/MyTranslucentAppTheme" />
9591

9692
<activity
97-
android:screenOrientation="portrait"
9893
android:name="com.balaganovrocks.yourmastercleaner.ui.RubbishCleanActivity"
9994
android:label="@string/app_rublish_clean"
10095
android:theme="@style/MyTranslucentAppTheme" />
10196

10297
<activity
103-
android:screenOrientation="portrait"
10498
android:name="com.balaganovrocks.yourmastercleaner.ui.AutoStartManageActivity"
10599
android:label="@string/app_autostart_manage"
106100
android:theme="@style/MyTranslucentAppTheme" />
107101

108102
<activity
109-
android:screenOrientation="portrait"
110103
android:name="com.balaganovrocks.yourmastercleaner.ui.SoftwareManageActivity"
111104
android:label="@string/app_software_manage"
112105
android:theme="@style/MyTranslucentAppTheme" />
113106

114107
<activity
115-
android:screenOrientation="portrait"
116108
android:name="com.balaganovrocks.yourmastercleaner.base.FragmentContainerActivity"
117109
android:theme="@style/MyTranslucentAppTheme" />
118110
<activity
119-
android:screenOrientation="portrait"
120111
android:name="com.balaganovrocks.yourmastercleaner.ui.AboutActivity"
121112
android:theme="@style/MyTranslucentAppTheme" />
122113

‎app/src/main/java/com/balaganovrocks/yourmastercleaner/base/FragmentContainerActivity.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import android.app.Activity;
44
import android.app.Fragment;
55
import android.content.Intent;
6+
import android.content.pm.ActivityInfo;
67
import android.os.Bundle;
78
import android.text.TextUtils;
89
import android.view.MenuItem;
@@ -75,6 +76,7 @@ protected void onCreate(Bundle savedInstanceState) {
7576
finish();
7677
return;
7778
}
79+
setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
7880
}
7981

8082
super.onCreate(savedInstanceState);

‎app/src/main/java/com/balaganovrocks/yourmastercleaner/service/CleanerService.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -211,6 +211,7 @@ public void onCreate() {
211211
} catch (NoSuchMethodException e) {
212212
e.printStackTrace();
213213
}
214+
214215
}
215216

216217
@Override

‎app/src/main/java/com/balaganovrocks/yourmastercleaner/ui/AboutActivity.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
package com.balaganovrocks.yourmastercleaner.ui;
22

3+
import android.content.pm.ActivityInfo;
34
import android.os.Bundle;
45
import android.text.util.Linkify;
56
import android.widget.TextView;
@@ -27,7 +28,7 @@ protected void onCreate(Bundle savedInstanceState) {
2728
Linkify.addLinks(tv, Linkify.ALL);
2829

2930
subVersion.setText("V"+ AppUtil.getVersion(mContext));
30-
31+
setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
3132
}
3233

3334
}

‎app/src/main/java/com/balaganovrocks/yourmastercleaner/ui/AutoStartManageActivity.java

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import android.annotation.TargetApi;
44
import android.app.ActionBar;
5+
import android.content.pm.ActivityInfo;
56
import android.content.res.Resources;
67
import android.graphics.Color;
78
import android.os.Build;
@@ -65,7 +66,7 @@ protected void onCreate(Bundle savedInstanceState) {
6566

6667
tabs.setViewPager(pager);
6768
setTabsValue();
68-
69+
setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
6970
}
7071

7172

‎app/src/main/java/com/balaganovrocks/yourmastercleaner/ui/BatterySavingActivity.java

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import android.content.Context;
77
import android.content.Intent;
88
import android.content.ServiceConnection;
9+
import android.content.pm.ActivityInfo;
910
import android.os.Build;
1011
import android.os.Bundle;
1112
import android.os.IBinder;
@@ -126,6 +127,7 @@ protected void onCreate(Bundle savedInstanceState) {
126127
mInterstitialAd = new InterstitialAd(this);
127128
mInterstitialAd.setAdUnitId("ca-app-pub-3940256099942544/1033173712");
128129
mInterstitialAd.loadAd(new AdRequest.Builder().build());
130+
setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
129131
}
130132

131133
@Override
@@ -305,6 +307,8 @@ public void onAdLeftApplication() {
305307
@Override
306308
public void onAdClosed() {
307309
Log.d(TAG,"onAdClosed");
310+
Intent intent = new Intent(getBaseContext(), ResultActivity.class);
311+
startActivityForResult(intent, 0); // do something
308312
// Code to be executed when when the interstitial ad is closed.
309313
}
310314
});

‎app/src/main/java/com/balaganovrocks/yourmastercleaner/ui/Exit.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22

33
import android.app.Activity;
44
import android.content.Intent;
5+
import android.content.pm.ActivityInfo;
56
import android.os.Build;
67
import android.os.Bundle;
78
import android.support.annotation.RequiresApi;
@@ -36,5 +37,6 @@ public void onClick(View v) {
3637
};
3738
Yes_Exit.setOnClickListener(oclBtnExit);
3839
No_Exit.setOnClickListener(oclBtnNoExit);
40+
setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
3941
}
4042
}

‎app/src/main/java/com/balaganovrocks/yourmastercleaner/ui/MainActivity.java

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import android.annotation.TargetApi;
44
import android.app.ActionBar;
55
import android.app.NotificationManager;
6+
import android.content.pm.ActivityInfo;
67
import android.content.res.Configuration;
78
import android.os.Build;
89
import android.os.Bundle;
@@ -16,7 +17,10 @@
1617
import android.widget.FrameLayout;
1718

1819
import com.balaganovrocks.yourmastercleaner.base.BaseActivity;
20+
import com.google.android.gms.ads.AdListener;
1921
import com.google.android.gms.ads.AdRequest;
22+
import com.google.android.gms.ads.AdSize;
23+
import com.google.android.gms.ads.AdView;
2024
import com.google.android.gms.ads.InterstitialAd;
2125
import com.google.android.gms.ads.MobileAds;
2226
import com.ikimuhendis.ldrawer.ActionBarDrawerToggle;
@@ -56,6 +60,7 @@ public class MainActivity extends BaseActivity implements NavigationDrawerFragme
5660

5761
MainFragment mMainFragment;
5862
RelaxFragment mRelaxFragment;
63+
5964
public static final long TWO_SECOND = 2 * 1000;
6065
long preTime;
6166
@Override
@@ -73,7 +78,8 @@ protected void onCreate(Bundle savedInstanceState) {
7378
mInterstitialAd = new InterstitialAd(this);
7479
mInterstitialAd.setAdUnitId("ca-app-pub-4369038195513432/2986510514");
7580
mInterstitialAd.loadAd(new AdRequest.Builder().build());
76-
81+
MyApp myApp = new MyApp();
82+
setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
7783
}
7884

7985

@@ -116,6 +122,7 @@ public void onDrawerOpened(View drawerView) {
116122
// return true;
117123
// }
118124

125+
119126
@Override
120127
public boolean onOptionsItemSelected(MenuItem item) {
121128
// Handle action bar item clicks here. The action bar will
@@ -265,4 +272,8 @@ public boolean onKeyDown(int keyCode, KeyEvent event) {
265272

266273
return super.onKeyDown(keyCode, event);
267274
}
275+
public void listener(){
276+
277+
278+
}
268279
}

‎app/src/main/java/com/balaganovrocks/yourmastercleaner/ui/MemoryCleanActivity.java

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import android.content.Context;
77
import android.content.Intent;
88
import android.content.ServiceConnection;
9+
import android.content.pm.ActivityInfo;
910
import android.os.Build;
1011
import android.os.Bundle;
1112
import android.os.IBinder;
@@ -126,6 +127,7 @@ protected void onCreate(Bundle savedInstanceState) {
126127
mInterstitialAd = new InterstitialAd(this);
127128
mInterstitialAd.setAdUnitId("ca-app-pub-3940256099942544/1033173712");
128129
mInterstitialAd.loadAd(new AdRequest.Builder().build());
130+
setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
129131
}
130132

131133
@Override
@@ -305,10 +307,12 @@ public void onAdLeftApplication() {
305307
@Override
306308
public void onAdClosed() {
307309
Log.d(TAG,"onAdClosed");
310+
Intent intent = new Intent(getBaseContext(), ResultActivity.class);
311+
startActivityForResult(intent, 0);
308312
// Code to be executed when when the interstitial ad is closed.
309313
}
310314
});
311-
315+
// do something
312316
}
313317

314318

‎app/src/main/java/com/balaganovrocks/yourmastercleaner/ui/Privacy_Policy.java

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,7 @@
11
package com.balaganovrocks.yourmastercleaner.ui;
22

33
import android.app.Activity;
4+
import android.content.pm.ActivityInfo;
45
import android.os.Bundle;
56
import android.widget.TextView;
67

@@ -13,5 +14,6 @@ public void onCreate(Bundle savedInstanceState) {
1314
setContentView(R.layout.privacy_policy);
1415

1516
TextView Text = (TextView) findViewById(R.id.privacy_policy);
17+
setRequestedOrientation(ActivityInfo.SCREEN_ORIENTATION_PORTRAIT);
1618
}
1719
}

0 commit comments

Comments
 (0)