Merge branch 'Greznor-android-studio' into ui-experimental

.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

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'
-}
+}

app/libs/actionBarPullToRefresh/build.gradle

@@ -1,7 +1,7 @@
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 23
+    compileSdkVersion 22
     buildToolsVersion "23.0.2"
 
     defaultConfig {

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 {

app/src/main/AndroidManifest.xml

@@ -1,11 +1,11 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
           package="com.chanapps.four.activity"
-          android:versionCode="91"
-          android:versionName="2.0.17">
+          android:versionCode="92"
+          android:versionName="2.0.19">
 
     <uses-sdk
             android:minSdkVersion="15"
-            android:targetSdkVersion="23"/>
+            android:targetSdkVersion="22"/>
 
     <uses-permission android:name="android.permission.INTERNET"/>
     <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE"/>

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";

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<String, int[]> 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 } );

app/src/main/res/values/strings.xml

@@ -447,6 +447,7 @@
     <string name="board_qa">Questions &amp; Answers</string>
     <string name="board_news">Current News</string>
     <string name="board_trash">Off-Topic</string>
+    <string name="board_wsr">Worksafe Requests</string>
 
 
     <string name="board_type_adult">Adult</string>
@@ -528,6 +529,7 @@
     <string name="board_desc_w">J-pop and anime pics</string>
     <string name="board_desc_wg">Highres non-anime</string>
     <string name="board_desc_wsg">Loops of humor</string>
+    <string name="board_desc_wsr">Worksafe Requests</string>
     <string name="board_desc_x">Aliens and spirits</string>
     <string name="board_desc_y">Homosexual anime</string>
 
@@ -998,7 +1000,7 @@ We will remove anything that remotely breaks this rule.</p>
 
 <string name="board_news_rules">
 <![CDATA[
-<h3>/news/ - News</h3>
+<h3>/news/ - Current News</h3>
 
 ]]>
 </string>
@@ -1218,7 +1220,7 @@ We will remove anything that remotely breaks this rule.</p>
 
 <string name="board_trash_rules">
 <![CDATA[
-<h3>/trasb/ - Trash</h3>
+<h3>/trash/ - Off-Topic</h3>
 
 ]]>
 </string>
@@ -1331,6 +1333,16 @@ We will remove anything that remotely breaks this rule.</p>
 
 <p>1. All worksafe GIFs welcome.</p>
 
+]]>
+</string>
+
+
+    <string name="board_wsr_rules">
+<![CDATA[
+<h3>/wsr/ - Worksafe Requests</h3>
+
+<p>1. Like /r/ but without the pink slip.</p>
+
 ]]>
 </string>