diff --git a/.travis.yml b/.travis.yml index dd752137..05e02110 100644 --- a/.travis.yml +++ b/.travis.yml @@ -10,3 +10,13 @@ android: - android-23 script: - ./gradlew assembledebug + +deploy: + provider: releases + skip_cleanup: true + api_key: + secure: Wk41dTj7MJTw1bZA3xYMY4Bc1AbTg+x0y3B61ncCl0R60JKF0JTSEbRWssaoKl03nME1wSkQqUEH/4ytFXlr/7hFuOqluG0GnA3RzJEcjlA4KlbVpvLwtkG1jAN+88vu5nHTYQfZmAdryp3RsdjJXbUeIdH/Zg6cS6wJ4U7FYCM= + file: app/build/outputs/apk/app-debug.apk + on: + repo: grzegorznittner/chanu + tags: true diff --git a/app/build.gradle b/app/build.gradle index 666815be..b99b4935 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -8,7 +8,7 @@ android { defaultConfig { applicationId "com.chanapps.four.activity" minSdkVersion 15 - targetSdkVersion 23 + targetSdkVersion 22 } buildTypes { @@ -34,4 +34,4 @@ dependencies { compile files('libs/jackson-all-1.8.2.jar') compile files('libs/nineoldandroids-2.4.0.jar') compile 'com.android.support:support-v4:23.1.0' -} +} \ No newline at end of file diff --git a/app/libs/actionBarPullToRefresh/build.gradle b/app/libs/actionBarPullToRefresh/build.gradle index 9d101c7e..e19368d1 100644 --- a/app/libs/actionBarPullToRefresh/build.gradle +++ b/app/libs/actionBarPullToRefresh/build.gradle @@ -1,7 +1,7 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 23 + compileSdkVersion 22 buildToolsVersion "23.0.2" defaultConfig { diff --git a/app/libs/gallery/build.gradle b/app/libs/gallery/build.gradle index 16989180..75dcbae5 100644 --- a/app/libs/gallery/build.gradle +++ b/app/libs/gallery/build.gradle @@ -1,12 +1,12 @@ apply plugin: 'com.android.library' android { - compileSdkVersion 23 + compileSdkVersion 22 buildToolsVersion "23.0.2" defaultConfig { minSdkVersion 15 - targetSdkVersion 23 + targetSdkVersion 22 } buildTypes { diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 2733a8fe..b4e85e0f 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -1,11 +1,11 @@ + android:versionCode="92" + android:versionName="2.0.19"> + android:targetSdkVersion="22"/> diff --git a/app/src/main/java/com/chanapps/four/activity/PostReplyActivity.java b/app/src/main/java/com/chanapps/four/activity/PostReplyActivity.java index dd657904..331b4e29 100644 --- a/app/src/main/java/com/chanapps/four/activity/PostReplyActivity.java +++ b/app/src/main/java/com/chanapps/four/activity/PostReplyActivity.java @@ -106,7 +106,7 @@ public class PostReplyActivity extends FragmentActivity implements ChanIdentifiedActivity, ThemeSelector.ThemeActivity { public static final String TAG = PostReplyActivity.class.getSimpleName(); - private static final boolean DEBUG = true; + private static final boolean DEBUG = false; public static final String BOARD_CODE = "postReplyBoardCode"; public static final String THREAD_NO = "postReplyThreadNo"; diff --git a/app/src/main/java/com/chanapps/four/data/BoardInitializer.java b/app/src/main/java/com/chanapps/four/data/BoardInitializer.java index 84066e29..57bbf0bb 100644 --- a/app/src/main/java/com/chanapps/four/data/BoardInitializer.java +++ b/app/src/main/java/com/chanapps/four/data/BoardInitializer.java @@ -90,6 +90,7 @@ public static String[][] initBoardCodes(Context ctx) { "mlp", ctx.getString(R.string.board_mlp), "news", ctx.getString(R.string.board_news), "qa", ctx.getString(R.string.board_qa), + "wsr", ctx.getString(R.string.board_desc_wsr) }, { BoardType.ADULT.toString(), ChanBoard.META_ADULT_BOARD_CODE, ctx.getString(R.string.board_type_adult), @@ -184,6 +185,7 @@ public static String[][] initBoardCodes(Context ctx) { "w", ctx.getString(R.string.board_w), "wg", ctx.getString(R.string.board_wg), "wsg", ctx.getString(R.string.board_wsg), + "wsr", ctx.getString(R.string.board_wsr), "x", ctx.getString(R.string.board_x), "y", ctx.getString(R.string.board_y), "3", ctx.getString(R.string.board_3), @@ -260,8 +262,9 @@ public static HashMap initBoardDrawables() { boardDrawables.put("w", new int[]{ R.drawable.w, R.drawable.w_2, R.drawable.w_3 } ); boardDrawables.put("wg", new int[]{ R.drawable.wg, R.drawable.wg_2, R.drawable.wg_3 } ); boardDrawables.put("wsg", new int[]{ R.drawable.wsg, R.drawable.wsg_2, R.drawable.wsg_3 } ); - boardDrawables.put("y", new int[]{ R.drawable.y, R.drawable.y_2, R.drawable.y_3 } ); + boardDrawables.put("wsr", new int[]{ R.drawable.wsr, R.drawable.wsr, R.drawable.wsr } ); boardDrawables.put("x", new int[]{ R.drawable.x, R.drawable.x_2, R.drawable.x_3 } ); + boardDrawables.put("y", new int[]{ R.drawable.y, R.drawable.y_2, R.drawable.y_3 } ); boardDrawables.put("3", new int[]{ R.drawable.board_3, R.drawable.board_3_2, R.drawable.board_3_3 } ); boardDrawables.put("popular", new int[]{ R.drawable.popular, R.drawable.popular_2, R.drawable.popular_3 } ); diff --git a/app/src/main/res/drawable/wsr.png b/app/src/main/res/drawable/wsr.png new file mode 100644 index 00000000..0ae951eb Binary files /dev/null and b/app/src/main/res/drawable/wsr.png differ diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index fd16ea18..1ae9f11e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -447,6 +447,7 @@ Questions & Answers Current News Off-Topic + Worksafe Requests Adult @@ -528,6 +529,7 @@ J-pop and anime pics Highres non-anime Loops of humor + Worksafe Requests Aliens and spirits Homosexual anime @@ -998,7 +1000,7 @@ We will remove anything that remotely breaks this rule.

/news/ - News +

/news/ - Current News

]]> @@ -1218,7 +1220,7 @@ We will remove anything that remotely breaks this rule.

/trasb/ - Trash +

/trash/ - Off-Topic

]]> @@ -1331,6 +1333,16 @@ We will remove anything that remotely breaks this rule.

1. All worksafe GIFs welcome.

+]]> + + + + +/wsr/ - Worksafe Requests + +

1. Like /r/ but without the pink slip.

+ ]]>