File tree Expand file tree Collapse file tree 8 files changed +29
-14
lines changed
java/com/liuguangqiang/swiplebacksample Expand file tree Collapse file tree 8 files changed +29
-14
lines changed Original file line number Diff line number Diff line change 11apply plugin : ' com.android.application'
22
33android {
4- compileSdkVersion 21
5- buildToolsVersion " 21.1 .1"
4+ compileSdkVersion 23
5+ buildToolsVersion " 23.0 .1"
66
77 defaultConfig {
88 applicationId " com.liuguangqiang.swiplebacksample"
99 minSdkVersion 14
10- targetSdkVersion 21
10+ targetSdkVersion 23
1111 versionCode 1
1212 versionName " 1.0"
1313 }
@@ -21,7 +21,7 @@ android {
2121
2222dependencies {
2323 compile fileTree(dir : ' libs' , include : [' *.jar' ])
24- compile ' com.android.support:appcompat-v7:21.0.2 '
24+ compile ' com.android.support:appcompat-v7:23.1.1 '
2525 compile ' com.github.liuguangqiang.prettyprogressbar:library:+'
2626 compile project(' :library' )
2727}
Original file line number Diff line number Diff line change 2626 <activity
2727 android : name =" .CommonActivity"
2828 android : label =" @string/title_activity_common"
29- android : theme =" @style/Theme.Swipe.Back " />
29+ android : theme =" @style/ThemeSwipeBack " />
3030 <activity
3131 android : name =" .ListViewActivity"
3232 android : label =" @string/title_activity_list_view"
33- android : theme =" @style/Theme.Swipe.Back " />
33+ android : theme =" @style/ThemeSwipeBack " />
3434 <activity
3535 android : name =" .ViewPagerActivity"
3636 android : label =" @string/title_activity_viewpager"
37- android : theme =" @style/Theme.Swipe.Back " />
37+ android : theme =" @style/ThemeSwipeBack " />
3838 <activity
39- android : name =" .WebViewActivity1 "
39+ android : name =" .WebViewActivity "
4040 android : label =" @string/title_activity_viewpager"
41- android : theme =" @style/Theme.Swipe.Back " />
41+ android : theme =" @style/ThemeSwipeBack " />
4242 </application >
4343
4444</manifest >
Original file line number Diff line number Diff line change 11package com .liuguangqiang .swiplebacksample ;
22
3+ import android .graphics .Color ;
34import android .os .Bundle ;
5+ import android .support .v7 .widget .Toolbar ;
46
57import com .liuguangqiang .swipeback .SwipeBackActivity ;
68import com .liuguangqiang .swipeback .SwipeBackLayout ;
@@ -13,6 +15,10 @@ protected void onCreate(Bundle savedInstanceState) {
1315 setContentView (R .layout .activity_common );
1416 setDragEdge (SwipeBackLayout .DragEdge .LEFT );
1517 setTitle ("Common" );
18+
19+ Toolbar toolbar = (Toolbar ) findViewById (R .id .toolbar );
20+ toolbar .setTitleTextColor (Color .WHITE );
21+ setSupportActionBar (toolbar );
1622 }
1723
1824}
Original file line number Diff line number Diff line change 1010import android .widget .SimpleAdapter ;
1111import android .widget .Toast ;
1212
13+ import com .liuguangqiang .swipeback .SwipeBackActivity ;
1314import com .liuguangqiang .swipeback .SwipeBackLayout ;
1415
1516import java .util .ArrayList ;
1617import java .util .HashMap ;
1718import java .util .List ;
1819
19- public class ListViewActivity extends ActionBarActivity {
20+ public class ListViewActivity extends SwipeBackActivity {
2021
2122 private ListView lv ;
2223
Original file line number Diff line number Diff line change @@ -37,7 +37,7 @@ public void onClick(View v) {
3737 skipActivity (ViewPagerActivity .class );
3838 break ;
3939 case R .id .btn_webview :
40- skipActivity (WebViewActivity1 .class );
40+ skipActivity (WebViewActivity .class );
4141 break ;
4242 }
4343 }
Original file line number Diff line number Diff line change 66import android .support .v7 .app .ActionBarActivity ;
77import android .support .v7 .widget .Toolbar ;
88
9+ import com .liuguangqiang .swipeback .SwipeBackActivity ;
910import com .liuguangqiang .swipeback .SwipeBackLayout ;
1011import com .liuguangqiang .swiplebacksample .adapter .TestAdapter ;
1112
1213/**
1314 * Created by Eric on 15/2/27.
1415 */
15- public class ViewPagerActivity extends ActionBarActivity {
16+ public class ViewPagerActivity extends SwipeBackActivity {
1617
1718 @ Override
1819 protected void onCreate (Bundle savedInstanceState ) {
Original file line number Diff line number Diff line change 1111/**
1212 * Created by Eric on 15/6/1.
1313 */
14- public class WebViewActivity1 extends SwipeBackActivity {
14+ public class WebViewActivity extends SwipeBackActivity {
1515
1616 private WebView webView ;
1717
Original file line number Diff line number Diff line change 22
33 <!-- Base application theme. -->
44 <style name =" AppTheme" parent =" Theme.AppCompat.Light.DarkActionBar" >
5- <!-- Customize your theme here. -->
5+ <item name =" colorPrimary" >#db4336</item >
6+ <item name =" colorPrimaryDark" >#b63120</item >
67 </style >
78
9+ <style name =" ThemeSwipeBack" parent =" Theme.Swipe.Back" >
10+ <item name =" colorPrimary" >#db4336</item >
11+ <item name =" colorPrimaryDark" >#b63120</item >
12+ </style >
13+
14+
815</resources >
You can’t perform that action at this time.
0 commit comments