BoardActivity style changes

app/src/main/java/gr/thmmy/mthmmy/activities/board/BoardActivity.java

@@ -45,7 +45,6 @@ public class BoardActivity extends BaseActivity implements BoardAdapter.OnLoadMo
 
     private MaterialProgressBar progressBar;
     private BoardTask boardTask;
-    private RecyclerView mainContent;
     private BoardAdapter boardAdapter;
     private final ArrayList<Board> parsedSubBoards = new ArrayList<>();
     private final ArrayList<Topic> parsedTopics = new ArrayList<>();
@@ -77,7 +76,7 @@ public class BoardActivity extends BaseActivity implements BoardAdapter.OnLoadMo
         createDrawer();
 
         boardAdapter = new BoardAdapter(getApplicationContext(), parsedSubBoards, parsedTopics);
-        mainContent = (RecyclerView) findViewById(R.id.board_recycler_view);
+        RecyclerView mainContent = (RecyclerView) findViewById(R.id.board_recycler_view);
         mainContent.setAdapter(boardAdapter);
         final LinearLayoutManager layoutManager = new LinearLayoutManager(this);
         mainContent.setLayoutManager(layoutManager);
@@ -167,8 +166,7 @@ public class BoardActivity extends BaseActivity implements BoardAdapter.OnLoadMo
             ++pagesLoaded;
             //Parse was successful
             progressBar.setVisibility(ProgressBar.INVISIBLE);
-            boardAdapter = new BoardAdapter(getApplicationContext(), parsedSubBoards, parsedTopics);
-            mainContent.swapAdapter(boardAdapter, false);
+            boardAdapter.notifyDataSetChanged();
             isLoadingMore = false;
         }
 
@@ -225,15 +223,14 @@ public class BoardActivity extends BaseActivity implements BoardAdapter.OnLoadMo
                             String pTopicUrl, pSubject, pStartedBy, pLastPost, pStats;
                             boolean pLocked = false, pSticky = false;
                             Elements topicColumns = topicRow.select(">td");
-                            //if (topicColumns.size() != 7) return false;
                             {
                                 Element column = topicColumns.get(2);
                                 Element tmp = column.select("span[id^=msg_] a").first();
                                 pTopicUrl = tmp.attr("href");
                                 pSubject = tmp.text();
-                                if (topicColumns.get(1).select("img[id^=stickyicon]").first() != null)
+                                if (column.select("img[id^=stickyicon]").first() != null)
                                     pSticky = true;
-                                if (topicColumns.get(1).select("img[id^=lockicon]").first() != null)
+                                if (column.select("img[id^=lockicon]").first() != null)
                                     pLocked = true;
                             }
                             pStartedBy = topicColumns.get(3).text();

app/src/main/java/gr/thmmy/mthmmy/activities/board/BoardAdapter.java

@@ -9,6 +9,7 @@ import android.support.v7.widget.RecyclerView;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
+import android.widget.ImageButton;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
@@ -40,6 +41,8 @@ class BoardAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
     private final Context context;
     private ArrayList<Board> parsedSubBoards = new ArrayList<>();
     private ArrayList<Topic> parsedTopics = new ArrayList<>();
+    private final ArrayList<Boolean> boardExpandableVisibility = new ArrayList<>();
+    private final ArrayList<Boolean> topicExpandableVisibility = new ArrayList<>();
 
     BoardAdapter(Context context, ArrayList<Board> parsedSubBoards, ArrayList<Topic> parsedTopics) {
         this.context = context;
@@ -119,6 +122,11 @@ class BoardAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
             final Board subBoard = parsedSubBoards.get(position - 1);
             final SubBoardViewHolder subBoardViewHolder = (SubBoardViewHolder) holder;
 
+            if (boardExpandableVisibility.size() != parsedSubBoards.size()) {
+                for (int i = boardExpandableVisibility.size(); i < parsedSubBoards.size(); ++i)
+                    boardExpandableVisibility.add(false);
+            }
+
             subBoardViewHolder.boardRow.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View view) {
@@ -131,14 +139,40 @@ class BoardAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
                     context.startActivity(intent);
                 }
             });
+            if (boardExpandableVisibility.get(subBoardViewHolder.getAdapterPosition() - 1)) {
+                subBoardViewHolder.boardExpandable.setVisibility(View.VISIBLE);
+                subBoardViewHolder.showHideExpandable.setImageResource(R.drawable.ic_arrow_drop_up);
+            } else {
+                subBoardViewHolder.boardExpandable.setVisibility(View.GONE);
+                subBoardViewHolder.showHideExpandable.setImageResource(R.drawable.ic_arrow_drop_down);
+            }
+            subBoardViewHolder.showHideExpandable.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    final boolean visible = boardExpandableVisibility.get(subBoardViewHolder.getAdapterPosition() - 1);
+                    if (visible) {
+                        subBoardViewHolder.boardExpandable.setVisibility(View.GONE);
+                        subBoardViewHolder.showHideExpandable.setImageResource(R.drawable.ic_arrow_drop_down);
+                    } else {
+                        subBoardViewHolder.boardExpandable.setVisibility(View.VISIBLE);
+                        subBoardViewHolder.showHideExpandable.setImageResource(R.drawable.ic_arrow_drop_up);
+                    }
+                    boardExpandableVisibility.set(subBoardViewHolder.getAdapterPosition() - 1, !visible);
+                }
+            });
             subBoardViewHolder.boardTitle.setText(subBoard.getTitle());
-            subBoardViewHolder.boardMods.setText(context.getString(R.string.child_board_mods, subBoard.getMods()));
+            subBoardViewHolder.boardMods.setText(subBoard.getMods());
             subBoardViewHolder.boardStats.setText(subBoard.getStats());
             subBoardViewHolder.boardLastPost.setText(subBoard.getLastPost());
         } else if (holder instanceof TopicViewHolder) {
             final Topic topic = parsedTopics.get(position - parsedSubBoards.size() - 1 - 1);
             final TopicViewHolder topicViewHolder = (TopicViewHolder) holder;
 
+            if (topicExpandableVisibility.size() != parsedTopics.size()) {
+                for (int i = topicExpandableVisibility.size(); i < parsedTopics.size(); ++i)
+                    topicExpandableVisibility.add(false);
+            }
+
             topicViewHolder.topicRow.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View view) {
@@ -151,13 +185,40 @@ class BoardAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
                     context.startActivity(intent);
                 }
             });
-            topicViewHolder.topicSubject.setText(topic.getSubject());
-            String lockedSticky = "";
+            if (topicExpandableVisibility.get(topicViewHolder.getAdapterPosition() - parsedSubBoards
+                    .size() - 2)) {
+                topicViewHolder.topicExpandable.setVisibility(View.VISIBLE);
+                topicViewHolder.showHideExpandable.setImageResource(R.drawable.ic_arrow_drop_up);
+            } else {
+                topicViewHolder.topicExpandable.setVisibility(View.GONE);
+                topicViewHolder.showHideExpandable.setImageResource(R.drawable.ic_arrow_drop_down);
+            }
+            topicViewHolder.showHideExpandable.setOnClickListener(new View.OnClickListener() {
+                @Override
+                public void onClick(View view) {
+                    final boolean visible = topicExpandableVisibility.get(topicViewHolder.
+                            getAdapterPosition() - parsedSubBoards.size() - 2);
+                    if (visible) {
+                        topicViewHolder.topicExpandable.setVisibility(View.GONE);
+                        topicViewHolder.showHideExpandable.setImageResource(R.drawable.ic_arrow_drop_down);
+                    } else {
+                        topicViewHolder.topicExpandable.setVisibility(View.VISIBLE);
+                        topicViewHolder.showHideExpandable.setImageResource(R.drawable.ic_arrow_drop_up);
+                    }
+                    topicExpandableVisibility.set(topicViewHolder.getAdapterPosition() -
+                            parsedSubBoards.size() - 2, !visible);
+                }
+            });
+            topicViewHolder.topicSubject.setTypeface(Typeface.createFromAsset(context.getAssets()
+                    , "fonts/fontawesome-webfont.ttf"));
+            String lockedSticky = topic.getSubject();
             if (topic.isLocked())
-                lockedSticky += context.getResources().getString(R.string.fa_lock);
-            if (topic.isSticky())
-                lockedSticky += context.getResources().getString(R.string.fa_sticky);
-            topicViewHolder.topicLockedSticky.setText(lockedSticky);
+                lockedSticky += " " + context.getResources().getString(R.string.fa_lock);
+            if (topic.isSticky()) {
+                //topicViewHolder.topicSubject.setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_pin, 0);
+                lockedSticky += " " + context.getResources().getString(R.string.fa_sticky);
+            }
+            topicViewHolder.topicSubject.setText(lockedSticky);
             topicViewHolder.topicStartedBy.setText(context.getString(R.string.topic_started_by, topic.getStarter()));
             topicViewHolder.topicStats.setText(topic.getStats());
             topicViewHolder.topicLastPost.setText(context.getString(R.string.topic_last_post, topic.getLastPost()));
@@ -176,31 +237,36 @@ class BoardAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
     }
 
     private static class SubBoardViewHolder extends RecyclerView.ViewHolder {
-        final LinearLayout boardRow;
+        final LinearLayout boardRow, boardExpandable;
         final TextView boardTitle, boardMods, boardStats, boardLastPost;
+        final ImageButton showHideExpandable;
 
-        SubBoardViewHolder(View itemView) {
-            super(itemView);
-            boardRow = (LinearLayout) itemView.findViewById(R.id.child_board_row);
-            boardTitle = (TextView) itemView.findViewById(R.id.child_board_title);
-            boardMods = (TextView) itemView.findViewById(R.id.child_board_mods);
-            boardStats = (TextView) itemView.findViewById(R.id.child_board_stats);
-            boardLastPost = (TextView) itemView.findViewById(R.id.child_board_last_post);
+        SubBoardViewHolder(View board) {
+            super(board);
+            boardRow = (LinearLayout) board.findViewById(R.id.child_board_row);
+            boardExpandable = (LinearLayout) board.findViewById(R.id.child_board_expandable);
+            showHideExpandable = (ImageButton) board.findViewById(R.id.child_board_expand_collapse_button);
+            boardTitle = (TextView) board.findViewById(R.id.child_board_title);
+            boardMods = (TextView) board.findViewById(R.id.child_board_mods);
+            boardStats = (TextView) board.findViewById(R.id.child_board_stats);
+            boardLastPost = (TextView) board.findViewById(R.id.child_board_last_post);
         }
     }
 
     private static class TopicViewHolder extends RecyclerView.ViewHolder {
-        final LinearLayout topicRow;
-        final TextView topicSubject, topicLockedSticky, topicStartedBy, topicStats, topicLastPost;
+        final LinearLayout topicRow, topicExpandable;
+        final TextView topicSubject, topicStartedBy, topicStats, topicLastPost;
+        final ImageButton showHideExpandable;
 
-        TopicViewHolder(View itemView) {
-            super(itemView);
-            topicRow = (LinearLayout) itemView.findViewById(R.id.topic_row_linear);
-            topicSubject = (TextView) itemView.findViewById(R.id.topic_subject);
-            topicLockedSticky = (TextView) itemView.findViewById(R.id.topic_locked_sticky);
-            topicStartedBy = (TextView) itemView.findViewById(R.id.topic_started_by);
-            topicStats = (TextView) itemView.findViewById(R.id.topic_stats);
-            topicLastPost = (TextView) itemView.findViewById(R.id.topic_last_post);
+        TopicViewHolder(View topic) {
+            super(topic);
+            topicRow = (LinearLayout) topic.findViewById(R.id.topic_row_linear);
+            topicExpandable = (LinearLayout) topic.findViewById(R.id.topic_expandable);
+            showHideExpandable = (ImageButton) topic.findViewById(R.id.topic_expand_collapse_button);
+            topicSubject = (TextView) topic.findViewById(R.id.topic_subject);
+            topicStartedBy = (TextView) topic.findViewById(R.id.topic_started_by);
+            topicStats = (TextView) topic.findViewById(R.id.topic_stats);
+            topicLastPost = (TextView) topic.findViewById(R.id.topic_last_post);
         }
     }
 

app/src/main/java/gr/thmmy/mthmmy/activities/profile/latestPosts/LatestPostsAdapter.java

@@ -50,7 +50,7 @@ class LatestPostsAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
     public RecyclerView.ViewHolder onCreateViewHolder(ViewGroup parent, int viewType) {
         if (viewType == VIEW_TYPE_ITEM) {
             View view = LayoutInflater.from(parent.getContext()).
-                    inflate(R.layout.profile_fragment_latest_posts_row, parent, false);
+                    inflate(R.layout.fragment_latest_posts_row, parent, false);
             return new LatestPostViewHolder(view);
         } else if (viewType == VIEW_TYPE_LOADING) {
             View view = LayoutInflater.from(parent.getContext()).

app/src/main/java/gr/thmmy/mthmmy/activities/profile/latestPosts/LatestPostsFragment.java

@@ -87,7 +87,7 @@ public class LatestPostsFragment extends BaseFragment implements LatestPostsAdap
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
-        final View rootView = inflater.inflate(R.layout.profile_fragment_latest_posts, container, false);
+        final View rootView = inflater.inflate(R.layout.fragment_latest_posts, container, false);
         latestPostsAdapter = new LatestPostsAdapter(fragmentInteractionListener, parsedTopicSummaries);
         mainContent = (RecyclerView) rootView.findViewById(R.id.profile_latest_posts_recycler);
         mainContent.setAdapter(latestPostsAdapter);

app/src/main/java/gr/thmmy/mthmmy/activities/profile/stats/StatsFragment.java

@@ -94,7 +94,7 @@ public class StatsFragment extends Fragment {
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
-        final View rootView = inflater.inflate(R.layout.profile_fragment_stats, container, false);
+        final View rootView = inflater.inflate(R.layout.fragment_stats, container, false);
         mainContent = (LinearLayout) rootView.findViewById(R.id.main_content);
         progressBar = (MaterialProgressBar) rootView.findViewById(R.id.progressBar);
         if (haveParsed)

app/src/main/java/gr/thmmy/mthmmy/activities/profile/summary/SummaryFragment.java

@@ -78,7 +78,7 @@ public class SummaryFragment extends Fragment {
     @Override
     public View onCreateView(LayoutInflater inflater, ViewGroup container,
                              Bundle savedInstanceState) {
-        final View rootView = inflater.inflate(R.layout.profile_fragment_summary, container, false);
+        final View rootView = inflater.inflate(R.layout.fragment_summary, container, false);
         mainContent = (LinearLayout) rootView.findViewById(R.id.profile_activity_content);
         if (!parsedProfileSummaryData.isEmpty())
             populateLayout();

app/src/main/res/layout/activity_board_sub_board.xml

@@ -7,41 +7,62 @@
     android:background="@color/card_background"
     android:clickable="true"
     android:orientation="vertical"
-    android:paddingLeft="10dp"
-    android:paddingRight="10dp">
+    android:paddingLeft="16dp"
+    android:paddingRight="16dp">
 
-    <TextView
-        android:id="@+id/child_board_title"
+    <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:text="@string/child_board_title"
-        android:textColor="@color/accent"/>
+        android:layout_marginBottom="5dp"
+        android:layout_marginTop="5dp"
+        android:orientation="horizontal">
 
-    <TextView
-        android:id="@+id/child_board_mods"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
+        <TextView
+            android:id="@+id/child_board_title"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="center_vertical"
+            android:text="@string/child_board_title"
+            android:textColor="@color/accent"
+            android:textSize="22sp"/>
 
-        android:layout_marginLeft="7dp"
-        android:layout_marginRight="7dp"
-        android:text="@string/child_board_mods"
-        android:textColor="@color/secondary_text"/>
+        <ImageButton
+            android:id="@+id/child_board_expand_collapse_button"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:background="@color/card_background"
+            android:contentDescription="@string/child_board_button"
+            android:src="@drawable/ic_arrow_drop_down"/>
+    </LinearLayout>
 
-    <TextView
-        android:id="@+id/child_board_stats"
+    <LinearLayout
+        android:id="@+id/child_board_expandable"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="7dp"
-        android:layout_marginRight="7dp"
-        android:text="@string/child_board_stats"
-        android:textColor="@color/secondary_text"/>
+        android:orientation="vertical"
+        android:visibility="gone">
 
-    <TextView
-        android:id="@+id/child_board_last_post"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="7dp"
-        android:layout_marginRight="7dp"
-        android:text="@string/child_board_last_post"
-        android:textColor="@color/secondary_text"/>
+        <TextView
+            android:id="@+id/child_board_mods"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/child_board_mods"
+            android:textColor="@color/secondary_text"
+            android:textStyle="italic"/>
+
+        <TextView
+            android:id="@+id/child_board_stats"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/child_board_stats"
+            android:textColor="@color/secondary_text"/>
+
+        <TextView
+            android:id="@+id/child_board_last_post"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:text="@string/child_board_last_post"
+            android:textColor="@color/secondary_text"/>
+    </LinearLayout>
 </LinearLayout>

app/src/main/res/layout/activity_board_topic.xml

@@ -6,54 +6,61 @@
     android:layout_height="wrap_content"
     android:clickable="true"
     android:orientation="vertical"
-    android:paddingLeft="10dp"
-    android:paddingRight="10dp">
+    android:paddingLeft="16dp"
+    android:paddingRight="16dp">
 
     <LinearLayout
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
+        android:layout_marginBottom="5dp"
+        android:layout_marginTop="5dp"
         android:orientation="horizontal">
 
         <TextView
             android:id="@+id/topic_subject"
-            android:layout_width="wrap_content"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="center_vertical"
             android:text="@string/topic_subject"
-            android:textColor="@color/primary_text"/>
+            android:textColor="@color/primary_text"
+            android:textSize="18sp"/>
 
-        <TextView
-            android:id="@+id/topic_locked_sticky"
+        <ImageButton
+            android:id="@+id/topic_expand_collapse_button"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:contentDescription="@string/topic_locked_sticky"
-            android:textColor="@color/accent"/>
-
+            android:background="@color/background"
+            android:contentDescription="@string/child_board_button"
+            android:src="@drawable/ic_arrow_drop_down"/>
     </LinearLayout>
 
-    <TextView
-        android:id="@+id/topic_started_by"
-        android:layout_width="wrap_content"
+    <LinearLayout
+        android:id="@+id/topic_expandable"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="7dp"
-        android:layout_marginRight="7dp"
-        android:text="@string/topic_started_by"
-        android:textColor="@color/secondary_text"/>
+        android:orientation="vertical"
+        android:visibility="gone">
 
-    <TextView
-        android:id="@+id/topic_stats"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="7dp"
-        android:layout_marginRight="7dp"
-        android:text="@string/topic_stats"
-        android:textColor="@color/secondary_text"/>
+        <TextView
+            android:id="@+id/topic_started_by"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/topic_started_by"
+            android:textColor="@color/secondary_text"/>
 
-    <TextView
-        android:id="@+id/topic_last_post"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="7dp"
-        android:layout_marginRight="7dp"
-        android:text="@string/topic_last_post"
-        android:textColor="@color/secondary_text"/>
+        <TextView
+            android:id="@+id/topic_stats"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/topic_stats"
+            android:textColor="@color/secondary_text"/>
+
+        <TextView
+            android:id="@+id/topic_last_post"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:text="@string/topic_last_post"
+            android:textColor="@color/secondary_text"/>
+    </LinearLayout>
 </LinearLayout>

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

@@ -19,7 +19,8 @@
 
     <!--Board Activity-->
     <string name="child_board_title">Child Boards</string>
-    <string name="child_board_mods">Moderators: %1$s</string>
+    <string name="child_board_button">Exp/Coll</string>
+    <string name="child_board_mods">Moderators</string>
     <string name="child_board_stats">Stats</string>
     <string name="child_board_last_post">Last post</string>
     <string name="topic_title">Topics</string>