Merge pull request #479 from ratan12/Update

Update Forums & support navigationdrawer

Atarashii/AndroidManifest.xml

@@ -1,7 +1,5 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="net.somethingdreadful.MAL"
-    android:versionCode="14"
-    android:versionName="1.5a0">
+    package="net.somethingdreadful.MAL">
 
     <uses-sdk
         android:minSdkVersion="14"

Atarashii/build.gradle

@@ -72,7 +72,7 @@ dependencies {
     compile 'com.android.support:cardview-v7:23.+'
     compile 'com.android.support:appcompat-v7:23.+'
     compile 'com.android.support:design:23.+'
-    compile 'com.google.code.gson:gson:2.4'
+    compile 'com.google.code.gson:gson:2.5'
     compile 'org.apache.commons:commons-lang3:3.4'
     compile 'com.squareup.okhttp:okhttp:2.5.0'
     compile 'com.squareup.retrofit:retrofit:1.9.0'

Atarashii/res/drawable/card_header.xml

@@ -1,6 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/card_header_drawable"
     android:shape="rectangle">
     <corners
         android:topLeftRadius="2dp"

Atarashii/res/layout-w720dp/activity_about.xml

@@ -10,7 +10,6 @@
         android:layout_height="fill_parent">
 
         <RelativeLayout
-            android:id="@+id/about_dialog"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:gravity="center_horizontal"

Atarashii/res/layout-w720dp/activity_detailview_details.xml

@@ -9,7 +9,6 @@
         android:id="@+id/scrollView">
 
         <RelativeLayout
-            android:id="@+id/backgroundContainer"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:padding="8dp">

Atarashii/res/layout-w720dp/activity_detailview_general.xml

@@ -9,7 +9,6 @@
         android:id="@+id/scrollView">
 
         <RelativeLayout
-            android:id="@+id/backgroundContainer"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:padding="8dp">
@@ -44,7 +43,6 @@
             </RelativeLayout>
 
             <RelativeLayout
-                android:id="@+id/container2"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_below="@id/container1"

Atarashii/res/layout-w720dp/activity_detailview_personal.xml

@@ -9,7 +9,6 @@
         android:id="@+id/scrollView">
 
         <RelativeLayout
-            android:id="@+id/backgroundContainer"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:padding="8dp">

Atarashii/res/layout-w720dp/fragment_profile_mal.xml

@@ -13,7 +13,6 @@
             android:layout_height="fill_parent">
 
             <RelativeLayout
-                android:id="@+id/profile"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:padding="8dp">

Atarashii/res/layout/activity_about.xml

@@ -10,7 +10,6 @@
         android:layout_height="fill_parent">
 
         <RelativeLayout
-            android:id="@+id/about_dialog"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:padding="8dp">

Atarashii/res/layout/activity_firstrun.xml

@@ -88,7 +88,6 @@
                 android:textSize="16sp" />
 
             <TextView
-                android:id="@+id/textView2"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:gravity="center_horizontal"
@@ -104,7 +103,6 @@
         </RelativeLayout>
 
         <RelativeLayout
-            android:id="@+id/loginForm"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:padding="8dp">

Atarashii/res/layout/activity_forum.xml

@@ -3,30 +3,19 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
-    <ViewFlipper
-        android:id="@+id/viewFlipper"
+    <WebView
+        android:id="@+id/webview"
+        android:layout_marginTop="56dp"
         android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        android:layout_marginTop="56dp">
+        android:layout_height="match_parent"/>
 
-        <fragment
-            android:id="@+id/main"
-            android:name="net.somethingdreadful.MAL.forum.ForumsMain"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-
-        <fragment
-            android:id="@+id/topics"
-            android:name="net.somethingdreadful.MAL.forum.ForumsTopics"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-
-        <fragment
-            android:id="@+id/posts"
-            android:name="net.somethingdreadful.MAL.forum.ForumsPosts"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent" />
-    </ViewFlipper>
+    <ProgressBar
+        android:id="@+id/progress1"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_gravity="center"
+        android:layout_centerInParent="true"
+        android:visibility="gone" />
 
     <include layout="@layout/theme_viewpager_notabs" />
 </RelativeLayout>

Atarashii/res/layout/activity_home.xml

@@ -1,8 +1,21 @@
 <android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/drawer_layout"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
+    android:id="@+id/drawerLayout"
     android:layout_width="match_parent"
-    android:layout_height="match_parent">
+    android:layout_height="match_parent"
+    android:fitsSystemWindows="true"
+    tools:context=".Home">
 
     <include layout="@layout/theme_viewpager" />
+
+    <android.support.design.widget.NavigationView
+        android:id="@+id/navigationView"
+        android:layout_width="wrap_content"
+        android:layout_height="match_parent"
+        android:layout_gravity="start"
+        android:fitsSystemWindows="true"
+        app:headerLayout="@layout/navdrawer_header"
+        app:menu="@menu/navdrawer" />
 </android.support.v4.widget.DrawerLayout>
 

Atarashii/res/layout/card_about_translations.xml

@@ -35,7 +35,6 @@
         android:textStyle="bold" />
 
     <TextView
-        android:id="@+id/notapproved_content"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_below="@id/notapproved"

Atarashii/res/layout/card_detailview_details_mediainfo.xml

@@ -5,7 +5,6 @@
     <TableRow>
 
         <TextView
-            android:id="@+id/typeLabel"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/card_content_media_type"
@@ -71,7 +70,6 @@
     <TableRow android:layout_marginTop="8dp">
 
         <TextView
-            android:id="@+id/statusLabel"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/card_content_media_status"
@@ -95,7 +93,6 @@
         android:id="@+id/startRow">
 
         <TextView
-            android:id="@+id/startLabel"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/card_content_start"
@@ -120,7 +117,6 @@
         android:id="@+id/endRow">
 
         <TextView
-            android:id="@+id/endLabel"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/card_content_end"
@@ -160,7 +156,6 @@
     <TableRow android:layout_marginTop="8dp">
 
         <TextView
-            android:id="@+id/genresLabel"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/card_content_genres"
@@ -182,7 +177,6 @@
         android:id="@+id/producersRow">
 
         <TextView
-            android:id="@+id/producersLabel"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:text="@string/card_content_producers"

Atarashii/res/layout/card_detailview_details_mediastats.xml

@@ -11,7 +11,6 @@
         android:textSize="16sp" />
 
     <TextView
-        android:id="@+id/scoreLabel"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_alignBaseline="@id/score"
@@ -36,7 +35,6 @@
             android:textSize="16sp" />
 
         <TextView
-            android:id="@+id/rankedLabel"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignBaseline="@id/ranked"
@@ -56,7 +54,6 @@
             android:textSize="16sp" />
 
         <TextView
-            android:id="@+id/popularityLabel"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignBaseline="@id/popularity"
@@ -76,7 +73,6 @@
             android:textSize="16sp" />
 
         <TextView
-            android:id="@+id/membersLabel"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignBaseline="@id/members"
@@ -96,7 +92,6 @@
             android:textSize="16sp" />
 
         <TextView
-            android:id="@+id/favoritesLabel"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_alignBaseline="@id/favorites"