Skip to content

Commit a47aeaf

Browse files
DziubaVLaDDziubaVLaD
committed
Refactor code
1 parent c7826f3 commit a47aeaf

28 files changed

+539
-71
lines changed

‎.idea/.name

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎.idea/compiler.xml

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

‎.idea/copyright/profiles_settings.xml

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

‎.idea/encodings.xml

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

‎.idea/gradle.xml

Lines changed: 2 additions & 2 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/misc.xml

Lines changed: 3 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎.idea/modules.xml

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

‎.idea/scopes/scope_settings.xml

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

‎.idea/vcs.xml

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

‎app/app.iml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@
131131
<orderEntry type="library" name="Gradle: com.android.support:support-media-compat-27.0.0" level="project" />
132132
<orderEntry type="library" name="Gradle: com.android.support:support-vector-drawable-27.0.0" level="project" />
133133
<orderEntry type="library" name="Gradle: __local_aars__:C.\Users\vladz\AndroidStudioProjects\superCleanMaster\app\libs\SocialSDK_Sina.jar:unspecified@jar" level="project" />
134+
<orderEntry type="library" name="Gradle: com.android.support.constraint:constraint-layout-1.1.3" level="project" />
134135
<orderEntry type="library" name="Gradle: __local_aars__:C.\Users\vladz\AndroidStudioProjects\superCleanMaster\app\libs\SocialSDK_laiwang_2.jar:unspecified@jar" level="project" />
135136
<orderEntry type="library" name="Gradle: com.android.support:support-core-utils-27.0.0" level="project" />
136137
<orderEntry type="library" name="Gradle: com.android.support:support-core-ui-27.0.0" level="project" />
@@ -154,6 +155,7 @@
154155
<orderEntry type="library" name="Gradle: __local_aars__:C.\Users\vladz\AndroidStudioProjects\superCleanMaster\app\libs\SocialSDK_QQZone_2.jar:unspecified@jar" level="project" />
155156
<orderEntry type="library" name="Gradle: com.android.support:customtabs-26.1.0" level="project" />
156157
<orderEntry type="library" name="Gradle: com.hannesdorfmann.smoothprogressbar:library-1.0.0" level="project" />
158+
<orderEntry type="library" name="Gradle: com.android.support.constraint:constraint-layout-solver:1.1.3@jar" level="project" />
157159
<orderEntry type="library" name="Gradle: com.jakewharton:butterknife:6.0.0@jar" level="project" />
158160
<orderEntry type="library" name="Gradle: android.arch.lifecycle:runtime-1.0.0" level="project" />
159161
<orderEntry type="module" module-name="library" />

‎app/build.gradle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,4 +40,5 @@ dependencies {
4040
implementation files('libs/SocialSDK_laiwang_2.jar')
4141
implementation files('libs/SocialSDK_QQZone_1.jar')
4242
implementation 'com.android.support:support-v4:27.0.0'
43+
implementation 'com.android.support.constraint:constraint-layout:1.1.3'
4344
}

‎app/src/main/AndroidManifest.xml

Lines changed: 18 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,14 @@
4646
<category android:name="android.intent.category.LAUNCHER" />
4747
</intent-filter>
4848
</activity>
49+
<activity
50+
android:screenOrientation="portrait"
51+
android:name=".ui.MainActivity"
52+
android:label="@string/app_name"
53+
android:theme="@style/MyAppTheme"></activity>
4954
<activity
5055
android:screenOrientation="portrait"
51-
android:name=".ui.MainActivity"
56+
android:name=".ui.Privacy_Policy"
5257
android:label="@string/app_name"
5358
android:theme="@style/MyAppTheme"></activity>
5459
<activity
@@ -64,9 +69,20 @@
6469
<category android:name="android.intent.category.DEFAULT" />
6570
</intent-filter>
6671
</activity>
72+
<activity
73+
android:screenOrientation="portrait"
74+
android:name=".ui.MemoryCleanActivity"
75+
android:label="@string/app_memory_clean"
76+
android:theme="@style/MyTranslucentAppTheme"></activity>
77+
78+
<activity
79+
android:screenOrientation="portrait"
80+
android:name=".ui.settings"
81+
android:label="@string/app_memory_clean"
82+
android:theme="@style/MyTranslucentAppTheme"></activity>
6783
<activity
6884
android:screenOrientation="portrait"
69-
android:name=".ui.MemoryCleanActivity"
85+
android:name=".ui.Exit"
7086
android:label="@string/app_memory_clean"
7187
android:theme="@style/MyTranslucentAppTheme"></activity>
7288

‎app/src/main/java/com/yzy/supercleanmaster/fragment/MainFragment.java

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import com.yzy.supercleanmaster.ui.RubbishCleanActivity;
3030
import com.yzy.supercleanmaster.ui.ShortCutActivity;
3131
import com.yzy.supercleanmaster.ui.SoftwareManageActivity;
32+
import com.yzy.supercleanmaster.ui.settings;
3233
import com.yzy.supercleanmaster.utils.AppUtil;
3334
import com.yzy.supercleanmaster.utils.StorageUtil;
3435
import com.yzy.supercleanmaster.widget.circleprogress.ArcProgress;
@@ -55,7 +56,7 @@ public class MainFragment extends BaseFragment {
5556
TextView capacity;
5657

5758
Context mContext;
58-
59+
Button BtnSettigs;
5960
private Timer timer;
6061
private Timer timer2;
6162
Button CleanRubbish;
@@ -71,8 +72,18 @@ public View onCreateView(LayoutInflater inflater,
7172

7273
ButterKnife.inject(this, view);
7374
mContext = getActivity();
74-
75+
BtnSettigs = (Button) view.findViewById(R.id.btnSettings);
76+
BtnSettigs.setOnClickListener(new View.OnClickListener()
77+
{
78+
@Override
79+
public void onClick(View v)
80+
{
81+
Intent intent = new Intent(v.getContext(), settings.class);
82+
startActivityForResult(intent, 0); // do something
83+
}
84+
});
7585
return view;
86+
7687
}
7788

7889
public void notification(){

‎app/src/main/java/com/yzy/supercleanmaster/ui/Exit.java

Lines changed: 41 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,41 @@
1+
package com.yzy.supercleanmaster.ui;
2+
3+
import android.app.Activity;
4+
import android.content.Intent;
5+
import android.os.Build;
6+
import android.os.Bundle;
7+
import android.support.annotation.RequiresApi;
8+
import android.view.View;
9+
import android.widget.Button;
10+
11+
import com.yzy.supercleanmaster.R;
12+
13+
public class Exit extends Activity {
14+
@Override
15+
public void onCreate(Bundle savedInstanceState) {
16+
super.onCreate(savedInstanceState);
17+
setContentView(R.layout.exit);
18+
19+
Button Yes_Exit = (Button) findViewById(R.id.yes_exit);
20+
Button No_Exit = (Button) findViewById(R.id.no_exit);
21+
22+
View.OnClickListener oclBtnExit = new View.OnClickListener() {
23+
@RequiresApi(api = Build.VERSION_CODES.JELLY_BEAN)
24+
@Override
25+
public void onClick(View v) {
26+
// TODO Auto-generated method stub
27+
finishAffinity();
28+
System.exit(0);
29+
}
30+
};
31+
View.OnClickListener oclBtnNoExit = new View.OnClickListener() {
32+
@Override
33+
public void onClick(View v) {
34+
Intent intent = new Intent(v.getContext(), MainActivity.class);
35+
startActivityForResult(intent, 0);
36+
}
37+
};
38+
Yes_Exit.setOnClickListener(oclBtnExit);
39+
No_Exit.setOnClickListener(oclBtnNoExit);
40+
}
41+
}

‎app/src/main/java/com/yzy/supercleanmaster/ui/MainActivity.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -67,9 +67,9 @@ protected void onCreate(Bundle savedInstanceState) {
6767

6868
onNavigationDrawerItemSelected(0);
6969
initDrawer();
70-
MobileAds.initialize(this, "ca-app-pub-3982529297840521~5735971553");
70+
MobileAds.initialize(this, "ca-app-pub-4369038195513432~6470869076");
7171
mInterstitialAd = new InterstitialAd(this);
72-
mInterstitialAd.setAdUnitId("ca-app-pub-3940256099942544/1033173712");
72+
mInterstitialAd.setAdUnitId("ca-app-pub-4369038195513432/2986510514");
7373
mInterstitialAd.loadAd(new AdRequest.Builder().build());
7474

7575
}

‎app/src/main/java/com/yzy/supercleanmaster/ui/Privacy_Policy.java

Lines changed: 17 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,17 @@
1+
package com.yzy.supercleanmaster.ui;
2+
3+
import android.app.Activity;
4+
import android.os.Bundle;
5+
import android.widget.TextView;
6+
7+
import com.yzy.supercleanmaster.R;
8+
9+
public class Privacy_Policy extends Activity {
10+
@Override
11+
public void onCreate(Bundle savedInstanceState) {
12+
super.onCreate(savedInstanceState);
13+
setContentView(R.layout.privacy_policy);
14+
15+
TextView Text = (TextView) findViewById(R.id.privacy_policy);
16+
}
17+
}

‎app/src/main/java/com/yzy/supercleanmaster/ui/SplishActivity.java

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

33
import android.content.Intent;
44
import android.graphics.BitmapFactory;
5+
import android.graphics.PorterDuff;
56
import android.os.Bundle;
7+
import android.view.MotionEvent;
68
import android.view.View;
79
import android.view.animation.Animation;
810
import android.view.animation.Animation.AnimationListener;
@@ -39,6 +41,7 @@ public class SplishActivity extends BaseActivity {
3941
protected void onCreate(Bundle savedInstanceState) {
4042
super.onCreate(savedInstanceState);
4143
setContentView(R.layout.activity_splish);
44+
4245
mImageView = (ImageView) findViewById(R.id.image);
4346
BtnStart = (Button) findViewById(R.id.start_main);
4447
//int index = new Random().nextInt(2);
@@ -48,8 +51,10 @@ protected void onCreate(Bundle savedInstanceState) {
4851
// mImageView.setImageResource(R.drawable.entrance2);
4952
//}
5053
View.OnClickListener OclBtnStart = new View.OnClickListener() {
54+
5155
@Override
5256
public void onClick(View v) {
57+
buttonEffect(BtnStart);
5358
Intent intent = new Intent(v.getContext(), MainActivity.class);
5459
startActivityForResult(intent, 0);
5560
}
@@ -66,7 +71,26 @@ public void onClick(View v) {
6671
// initAnim();
6772
// setListener();
6873
}
69-
74+
public static void buttonEffect(View button){
75+
button.setOnTouchListener(new View.OnTouchListener() {
76+
77+
public boolean onTouch(View v, MotionEvent event) {
78+
switch (event.getAction()) {
79+
case MotionEvent.ACTION_DOWN: {
80+
v.getBackground().setColorFilter(0xe0f47521, PorterDuff.Mode.SRC_ATOP);
81+
v.invalidate();
82+
break;
83+
}
84+
case MotionEvent.ACTION_UP: {
85+
v.getBackground().clearColorFilter();
86+
v.invalidate();
87+
break;
88+
}
89+
}
90+
return false;
91+
}
92+
});
93+
}
7094
private void createShortCut() {
7195
// TODO Auto-generated method stub
7296
Intent intent = new Intent();

‎app/src/main/java/com/yzy/supercleanmaster/ui/settings.java

Lines changed: 76 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,76 @@
1+
package com.yzy.supercleanmaster.ui;
2+
3+
import android.app.Activity;
4+
import android.app.Dialog;
5+
import android.content.Context;
6+
import android.content.DialogInterface;
7+
import android.content.Intent;
8+
import android.os.Bundle;
9+
import android.provider.Settings;
10+
import android.support.v7.app.AlertDialog;
11+
import android.support.v7.app.AppCompatActivity;
12+
import android.view.View;
13+
import android.view.inputmethod.InputMethodManager;
14+
import android.widget.AdapterView;
15+
import android.widget.AdapterView.OnItemSelectedListener;
16+
import android.widget.ArrayAdapter;
17+
import android.widget.Button;
18+
import android.widget.Spinner;
19+
import android.widget.Toast;
20+
21+
import com.yzy.supercleanmaster.R;
22+
23+
public class settings extends Activity {
24+
25+
String[] data = {"Русский", "Английский", "Украинский", "Белорусский", "Немецкий"};
26+
private final int IDD_THREE_BUTTONS = 0;
27+
AlertDialog.Builder ad;
28+
/** Called when the activity is first created. */
29+
@Override
30+
public void onCreate(Bundle savedInstanceState) {
31+
super.onCreate(savedInstanceState);
32+
setContentView(R.layout.settings);
33+
34+
// адаптер
35+
ArrayAdapter<String> adapter = new ArrayAdapter<String>(this, android.R.layout.simple_spinner_item, data);
36+
adapter.setDropDownViewResource(android.R.layout.simple_spinner_dropdown_item);
37+
38+
Button Exit = (Button) findViewById(R.id.exit);
39+
Button Privacy_Policy = (Button) findViewById(R.id.privacy_policy);
40+
Spinner spinner = (Spinner) findViewById(R.id.language);
41+
spinner.setAdapter(adapter);
42+
// заголовок
43+
spinner.setPrompt("Язык");
44+
// выделяем элемент
45+
spinner.setSelection(2);
46+
// устанавливаем обработчик нажатия
47+
spinner.setOnItemSelectedListener(new OnItemSelectedListener() {
48+
@Override
49+
public void onItemSelected(AdapterView<?> parent, View view,
50+
int position, long id) {
51+
// показываем позиция нажатого элемента
52+
//Toast.makeText(getBaseContext(), "Position = " + position, Toast.LENGTH_SHORT).show();
53+
}
54+
@Override
55+
public void onNothingSelected(AdapterView<?> arg0) {
56+
}
57+
});
58+
View.OnClickListener oclBtnExit = new View.OnClickListener() {
59+
@Override
60+
public void onClick(View v) {
61+
// TODO Auto-generated method stub
62+
Intent intent = new Intent(v.getContext(), Exit.class);
63+
startActivityForResult(intent, 0);
64+
}
65+
};
66+
View.OnClickListener oclBtnPrivacyPolicy = new View.OnClickListener() {
67+
@Override
68+
public void onClick(View v) {
69+
Intent intent = new Intent(v.getContext(), Privacy_Policy.class);
70+
startActivityForResult(intent, 0);
71+
}
72+
};
73+
Exit.setOnClickListener(oclBtnExit);
74+
Privacy_Policy.setOnClickListener(oclBtnPrivacyPolicy);
75+
}
76+
}

‎app/src/main/res/drawable-xhdpi/card_icon_trash.png

72.5 KB
Loading

0 commit comments

Comments
 (0)