Skip to content

Commit cd914aa

Browse files
DziubaVLaDDziubaVLaD
committed
gradle build fix
1 parent 0b4452d commit cd914aa

32 files changed

+216
-278
lines changed

‎app/app.iml

Lines changed: 9 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -117,29 +117,28 @@
117117
<orderEntry type="sourceFolder" forTests="false" />
118118
<orderEntry type="library" name="Gradle: com.github.gabrielemariotti.changeloglib:library-1.5.2" level="project" />
119119
<orderEntry type="library" name="Gradle: __local_aars__:/home/dzuba/AndroidStudioProjects/superCleanMaster/app/libs/SocialSDK_QQZone_1.jar:unspecified@jar" level="project" />
120+
<orderEntry type="library" name="Gradle: __local_aars__:/home/dzuba/AndroidStudioProjects/superCleanMaster/app/libs/SocialSDK_laiwang_1.jar:unspecified@jar" level="project" />
121+
<orderEntry type="library" name="Gradle: com.nhaarman.listviewanimations:lib-manipulation-3.1.0" level="project" />
120122
<orderEntry type="library" name="Gradle: __local_aars__:/home/dzuba/AndroidStudioProjects/superCleanMaster/app/libs/umeng_social_sdk.jar:unspecified@jar" level="project" />
123+
<orderEntry type="library" name="Gradle: __local_aars__:/home/dzuba/AndroidStudioProjects/superCleanMaster/app/libs/SocialSDK_WeiXin_1.jar:unspecified@jar" level="project" />
124+
<orderEntry type="library" name="Gradle: com.nhaarman.listviewanimations:lib-core-slh-3.1.0" level="project" />
125+
<orderEntry type="library" name="Gradle: com.github.castorflex.smoothprogressbar:library-circular-1.0.0" level="project" />
126+
<orderEntry type="library" name="Gradle: com.android.support:support-annotations:21.0.3@jar" level="project" />
121127
<orderEntry type="library" name="Gradle: __local_aars__:/home/dzuba/AndroidStudioProjects/superCleanMaster/app/libs/SocialSDK_Sina.jar:unspecified@jar" level="project" />
122128
<orderEntry type="library" name="Gradle: __local_aars__:/home/dzuba/AndroidStudioProjects/superCleanMaster/app/libs/SocialSDK_laiwang_2.jar:unspecified@jar" level="project" />
123129
<orderEntry type="library" name="Gradle: __local_aars__:/home/dzuba/AndroidStudioProjects/superCleanMaster/app/libs/SocialSDK_WeiXin_2.jar:unspecified@jar" level="project" />
124130
<orderEntry type="library" name="Gradle: com.umeng.analytics:analytics:6.1.4@jar" level="project" />
131+
<orderEntry type="library" name="Gradle: __local_aars__:/home/dzuba/AndroidStudioProjects/superCleanMaster/app/libs/nineoldandroids-2.4.0.jar:unspecified@jar" level="project" />
125132
<orderEntry type="library" name="Gradle: __local_aars__:/home/dzuba/AndroidStudioProjects/superCleanMaster/app/libs/httpmime-4.1.3.jar:unspecified@jar" level="project" />
126133
<orderEntry type="library" name="Gradle: com.android.support:appcompat-v7-21.0.3" level="project" />
127134
<orderEntry type="library" name="Gradle: com.android.support:support-v4-21.0.3" level="project" />
135+
<orderEntry type="library" name="Gradle: __local_aars__:/home/dzuba/AndroidStudioProjects/superCleanMaster/app/libs/SocialSDK_sms.jar:unspecified@jar" level="project" />
128136
<orderEntry type="library" name="Gradle: __local_aars__:/home/dzuba/AndroidStudioProjects/superCleanMaster/app/libs/umeng-update-v2.5.0.jar:unspecified@jar" level="project" />
129137
<orderEntry type="library" name="Gradle: __local_aars__:/home/dzuba/AndroidStudioProjects/superCleanMaster/app/libs/SocialSDK_QQZone_2.jar:unspecified@jar" level="project" />
130-
<orderEntry type="library" name="Gradle: com.nhaarman.listviewanimations:lib-core-3.1.0" level="project" />
131-
<orderEntry type="library" name="Gradle: com.android.support:recyclerview-v7-21.0.3" level="project" />
132-
<orderEntry type="library" name="Gradle: __local_aars__:/home/dzuba/AndroidStudioProjects/superCleanMaster/app/libs/SocialSDK_laiwang_1.jar:unspecified@jar" level="project" />
133-
<orderEntry type="library" name="Gradle: com.nhaarman.listviewanimations:lib-manipulation-3.1.0" level="project" />
134-
<orderEntry type="library" name="Gradle: __local_aars__:/home/dzuba/AndroidStudioProjects/superCleanMaster/app/libs/SocialSDK_WeiXin_1.jar:unspecified@jar" level="project" />
135-
<orderEntry type="library" name="Gradle: com.nhaarman.listviewanimations:lib-core-slh-3.1.0" level="project" />
136-
<orderEntry type="library" name="Gradle: com.github.castorflex.smoothprogressbar:library-circular-1.0.0" level="project" />
137-
<orderEntry type="library" name="Gradle: com.android.support:support-annotations:21.0.3@jar" level="project" />
138-
<orderEntry type="library" name="Gradle: __local_aars__:/home/dzuba/AndroidStudioProjects/superCleanMaster/app/libs/nineoldandroids-2.4.0.jar:unspecified@jar" level="project" />
139-
<orderEntry type="library" name="Gradle: __local_aars__:/home/dzuba/AndroidStudioProjects/superCleanMaster/app/libs/SocialSDK_sms.jar:unspecified@jar" level="project" />
140138
<orderEntry type="library" name="Gradle: com.hannesdorfmann.smoothprogressbar:library-1.0.0" level="project" />
141139
<orderEntry type="library" name="Gradle: __local_aars__:/home/dzuba/AndroidStudioProjects/superCleanMaster/app/libs/SocialSDK_QQZone_3.jar:unspecified@jar" level="project" />
142140
<orderEntry type="library" name="Gradle: com.jakewharton:butterknife:6.0.0@jar" level="project" />
141+
<orderEntry type="library" name="Gradle: com.nhaarman.listviewanimations:lib-core-3.1.0" level="project" />
143142
<orderEntry type="module" module-name="library" />
144143
</component>
145144
</module>

‎app/build.gradle

Lines changed: 19 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -20,22 +20,23 @@ android {
2020
}
2121

2222
dependencies {
23-
compile fileTree(dir: 'libs', include: ['*.jar'])
24-
compile 'com.android.support:appcompat-v7:21.0.3'
25-
compile 'com.jakewharton:butterknife:6.0.0'
26-
compile 'com.nhaarman.listviewanimations:lib-core:3.1.0@aar'
27-
compile 'com.nhaarman.listviewanimations:lib-manipulation:3.1.0@aar'
28-
compile 'com.nhaarman.listviewanimations:lib-core-slh:3.1.0@aar'
29-
compile 'com.umeng.analytics:analytics:latest.integration'
30-
compile 'com.github.gabrielemariotti.changeloglib:library:1.5.2'
31-
compile 'com.hannesdorfmann.smoothprogressbar:library:1.0.0'
32-
compile 'com.github.castorflex.smoothprogressbar:library-circular:1.0.0'
33-
compile project(':library')
34-
compile files('libs/nineoldandroids-2.4.0.jar')
35-
compile files('libs/umeng-update-v2.5.0.jar')
36-
compile files('libs/httpmime-4.1.3.jar')
37-
compile files('libs/umeng_social_sdk.jar')
38-
compile files('libs/SocialSDK_laiwang_1.jar')
39-
compile files('libs/SocialSDK_laiwang_2.jar')
40-
compile files('libs/SocialSDK_QQZone_1.jar')
23+
implementation fileTree(include: ['*.jar'], dir: 'libs')
24+
implementation 'com.android.support:appcompat-v7:21.0.3'
25+
implementation 'com.jakewharton:butterknife:6.0.0'
26+
implementation 'com.nhaarman.listviewanimations:lib-core:3.1.0@aar'
27+
implementation 'com.nhaarman.listviewanimations:lib-manipulation:3.1.0@aar'
28+
implementation 'com.nhaarman.listviewanimations:lib-core-slh:3.1.0@aar'
29+
implementation 'com.umeng.analytics:analytics:latest.integration'
30+
implementation 'com.github.gabrielemariotti.changeloglib:library:1.5.2'
31+
implementation 'com.hannesdorfmann.smoothprogressbar:library:1.0.0'
32+
implementation 'com.github.castorflex.smoothprogressbar:library-circular:1.0.0'
33+
implementation project(':library')
34+
implementation files('libs/nineoldandroids-2.4.0.jar')
35+
implementation files('libs/umeng-update-v2.5.0.jar')
36+
implementation files('libs/httpmime-4.1.3.jar')
37+
implementation files('libs/umeng_social_sdk.jar')
38+
implementation files('libs/SocialSDK_laiwang_1.jar')
39+
implementation files('libs/SocialSDK_laiwang_2.jar')
40+
implementation files('libs/SocialSDK_QQZone_1.jar')
41+
implementation 'com.android.support:support-v4:21.0.3'
4142
}

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

Lines changed: 6 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,9 @@
66
import android.view.LayoutInflater;
77
import android.view.View;
88
import android.view.ViewGroup;
9+
import android.widget.Button;
910
import android.widget.TextView;
11+
import android.widget.Toast;
1012

1113
import com.umeng.update.UmengUpdateAgent;
1214
import com.yzy.supercleanmaster.R;
@@ -42,6 +44,7 @@ public class MainFragment extends BaseFragment {
4244

4345
private Timer timer;
4446
private Timer timer2;
47+
Button CleanRubbish;
4548

4649

4750
@Override
@@ -50,6 +53,8 @@ public View onCreateView(LayoutInflater inflater,
5053
// TODO Auto-generated method stub
5154

5255
View view = inflater.inflate(R.layout.fragment_main, container, false);
56+
57+
5358
ButterKnife.inject(this, view);
5459
mContext = getActivity();
5560

@@ -155,10 +160,7 @@ void rubbishClean() {
155160
}
156161

157162

158-
@OnClick(R.id.card3)
159-
void AutoStartManage() {
160-
startActivity(AutoStartManageActivity.class);
161-
}
163+
162164

163165
@OnClick(R.id.card4)
164166
void SoftwareManage() {

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,8 +25,8 @@ public class NavigationDrawerFragment extends BaseFragment {
2525
private NavigationDrawerCallbacks mCallbacks;
2626
final int radioIds[] = {
2727
R.id.radio0,
28-
R.id.radio1,
29-
R.id.radio2
28+
//R.id.radio1,
29+
// R.id.radio2
3030

3131
};
3232
RadioButton radios[] = new RadioButton[radioIds.length];

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

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,6 @@ public class MainActivity extends BaseActivity implements NavigationDrawerFragme
4242

4343
ActionBar ab;
4444
private CharSequence mTitle;
45-
4645
private ActionBarDrawerToggle mDrawerToggle;
4746
private DrawerArrowDrawable drawerArrow;
4847
private boolean drawerArrowColor;

‎app/src/main/res/layout/about.xml

Lines changed: 3 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@
7272
android:layout_centerHorizontal="true"
7373
android:layout_marginTop="3.0dip"
7474
android:includeFontPadding="false"
75-
android:text="V1.05" />
75+
android:text="V1.00" />
7676

7777
<TextView
7878
android:id="@+id/app_information"
@@ -115,7 +115,7 @@
115115
android:paddingLeft="10.0dip"
116116
android:paddingRight="10.0dip"
117117
android:singleLine="true"
118-
android:text="作者:"
118+
android:text="Автор:"
119119
android:textSize="15sp" />
120120

121121
<TextView
@@ -129,7 +129,7 @@
129129
android:paddingLeft="10.0dip"
130130
android:paddingRight="10.0dip"
131131
android:singleLine="true"
132-
android:text="joyoyao"
132+
android:text="Dziuba"
133133
android:textSize="15sp" />
134134
</LinearLayout>
135135

@@ -141,35 +141,6 @@
141141
android:focusable="true"
142142
android:orientation="horizontal">
143143

144-
<TextView
145-
android:id="@+id/textView1"
146-
style="@style/Label.Medium"
147-
android:layout_width="0dip"
148-
android:layout_height="wrap_content"
149-
android:layout_gravity="center"
150-
android:layout_weight="1"
151-
android:duplicateParentState="true"
152-
android:gravity="center"
153-
android:paddingLeft="10.0dip"
154-
android:paddingRight="10.0dip"
155-
android:singleLine="true"
156-
android:text="Github"
157-
android:textSize="15sp" />
158-
159-
<TextView
160-
style="@style/Label.Medium"
161-
android:layout_width="0dip"
162-
android:layout_height="wrap_content"
163-
android:layout_gravity="center"
164-
android:layout_weight="3"
165-
android:duplicateParentState="true"
166-
android:gravity="center"
167-
android:linksClickable="true"
168-
android:paddingLeft="10.0dip"
169-
android:paddingRight="10.0dip"
170-
android:singleLine="true"
171-
android:text="github.com/joyoyao/superCleanMaster"
172-
android:textSize="15sp" />
173144
</LinearLayout>
174145

175146
<TextView

‎app/src/main/res/layout/activity_rublish_clean.xml

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@
5353
android:layout_width="wrap_content"
5454

5555
android:textColor="@color/white"
56-
android:text="可清理"
56+
android:text="Может быть очищен"
5757
android:textSize="@dimen/text_size_middle"
5858
android:layout_height="wrap_content" />
5959

@@ -98,14 +98,14 @@
9898

9999
<Button
100100
android:id="@+id/clear_button"
101+
android:layout_width="match_parent"
102+
android:layout_height="wrap_content"
101103
android:layout_margin="8dip"
102104
android:background="@drawable/btn_normal_green"
103-
android:textColor="@color/white"
104-
android:textSize="@dimen/text_size_large"
105-
android:layout_width="match_parent"
106105
android:gravity="center"
107-
android:text="一键清理"
108-
android:layout_height="wrap_content" />
106+
android:text="Очистить"
107+
android:textColor="@color/white"
108+
android:textSize="@dimen/text_size_large" />
109109
</LinearLayout>
110110

111111
</RelativeLayout>

‎app/src/main/res/layout/activity_splish.xml

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -18,13 +18,13 @@
1818
android:background="@drawable/entrance_bottom_bg" />
1919

2020
<LinearLayout
21-
android:layout_marginBottom="18dp"
22-
android:layout_above="@+id/title"
2321
android:layout_width="wrap_content"
22+
android:layout_height="wrap_content"
2423

25-
android:layout_centerHorizontal="true"
26-
android:orientation="horizontal"
27-
android:layout_height="wrap_content">
24+
android:layout_alignParentBottom="true"
25+
android:layout_centerHorizontal="true"
26+
android:layout_marginBottom="84dp"
27+
android:orientation="horizontal">
2828

2929
<ImageView
3030
android:layout_width="wrap_content"
@@ -37,22 +37,12 @@
3737
android:layout_width="wrap_content"
3838
android:layout_height="wrap_content"
3939
android:layout_gravity="center_vertical"
40-
android:text="一键清理 开源版"
40+
android:text="Название"
4141
android:textColor="#b3ffffff"
4242
android:textSize="20sp" />
4343

4444
</LinearLayout>
4545

4646

47-
<TextView
48-
android:id="@+id/title"
49-
android:layout_width="match_parent"
50-
android:layout_height="wrap_content"
51-
android:layout_alignParentBottom="true"
52-
android:layout_marginBottom="17dp"
53-
android:gravity="center_horizontal"
54-
android:text="春光乍泄 © 堂堂炒栗子的"
55-
android:textColor="#b3ffffff"
56-
android:textSize="9sp" />
5747

5848
</RelativeLayout>

‎app/src/main/res/layout/fragment_auto_start.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@
1313
<TextView
1414
android:id="@+id/topText"
1515
android:textColor="#787878"
16-
android:text="非系统应用建议禁止"
16+
android:text="Рекомендации по несистемному применению запрещены"
1717
android:layout_marginTop="@dimen/margin_right"
1818
android:layout_marginBottom="@dimen/margin_right"
1919
android:layout_marginLeft="@dimen/margin_left"

0 commit comments

Comments
 (0)