From ee52ff2ba6cb6684551180d87728c0fdb31551c4 Mon Sep 17 00:00:00 2001
From: Ezerous <ezerous@gmail.com>
Date: Wed, 30 Aug 2017 10:50:42 +0300
Subject: [PATCH] Rolled back TopicAdapter changes, AboutActivity additions

---
 app/build.gradle                              |  2 +-
 .../mthmmy/activities/topic/TopicAdapter.java |  8 -----
 app/src/main/res/layout/activity_about.xml    | 33 ++++++++++++++++---
 app/src/main/res/values/strings.xml           | 16 ++++-----
 4 files changed, 37 insertions(+), 22 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 571dd5b2..caf6949a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -45,7 +45,7 @@ dependencies {
     }
     compile 'com.mikepenz:fontawesome-typeface:4.7.0.0@aar'
     compile 'pl.droidsonroids.gif:android-gif-drawable:1.2.7'
-    compile 'com.bignerdranch.android:expandablerecyclerview:3.0.0-RC1' //Deprecated!
+    compile 'com.bignerdranch.android:expandablerecyclerview:3.0.0-RC1' //TODO: Deprecated - needs replacement!
     compile 'me.zhanghai.android.materialprogressbar:library:1.4.1'
     compile 'com.jakewharton.timber:timber:4.5.1'
 }
diff --git a/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicAdapter.java b/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicAdapter.java
index cc5d596b..fd95cc71 100644
--- a/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicAdapter.java
+++ b/app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicAdapter.java
@@ -483,14 +483,6 @@ class TopicAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
         //notifyDataSetChanged();
     }
 
-    //Fix for WebView not rendering with Hardware Acceleration
-    @Override
-    public void onViewAttachedToWindow(RecyclerView.ViewHolder holder) {
-        super.onViewAttachedToWindow(holder);
-        if (holder instanceof PostViewHolder)
-            ((PostViewHolder) holder).post.reload();
-    }
-
     @Override
     public int getItemCount() {
         return postsList.size();
diff --git a/app/src/main/res/layout/activity_about.xml b/app/src/main/res/layout/activity_about.xml
index 797665a2..306d2b76 100644
--- a/app/src/main/res/layout/activity_about.xml
+++ b/app/src/main/res/layout/activity_about.xml
@@ -70,20 +70,43 @@
                 android:textStyle="italic"/>
 
             <TextView
-                android:id="@+id/header_1"
+                android:id="@+id/open_source_header"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="20dp"
                 android:textAppearance="?android:attr/textAppearanceMedium"
-                android:text="@string/libraries"
+                android:text="@string/open_source"
                 android:textColor="@color/accent"
                 android:layout_below="@+id/version"
                 android:layout_alignParentStart="true"
                 android:textStyle="bold" />
 
+            <TextView
+                android:id="@+id/open_source_text"
+                android:layout_below="@+id/open_source_header"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:autoLink="web"
+                android:text="@string/open_source_text"
+                android:textAppearance="?android:attr/textAppearanceSmall"
+                android:textColor="@color/iron"
+                android:layout_alignParentStart="true" />
+
+            <TextView
+                android:id="@+id/libraries_header"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="20dp"
+                android:textAppearance="?android:attr/textAppearanceMedium"
+                android:text="@string/libraries"
+                android:textColor="@color/accent"
+                android:layout_below="@+id/open_source_text"
+                android:layout_alignParentStart="true"
+                android:textStyle="bold" />
+
             <TextView
                 android:id="@+id/libraries_text"
-                android:layout_below="@+id/header_1"
+                android:layout_below="@+id/libraries_header"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:text="@string/libraries_text"
@@ -113,7 +136,7 @@
 
 
             <TextView
-                android:id="@+id/header_2"
+                android:id="@+id/contact_header"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginTop="20dp"
@@ -126,7 +149,7 @@
 
             <TextView
                 android:id="@+id/contact_text"
-                android:layout_below="@+id/header_2"
+                android:layout_below="@+id/contact_header"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:autoLink="email|web"
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index 5c6dc980..a9334851 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -60,20 +60,20 @@
     <!--About Activity-->
     <string name="version">v%1$s</string>
     <string name="logo">Logo</string>
-    <string name="trollPic">You should see a funny pic!</string>
-
-    <!--Bookmarks-->
-    <string name="remove_bookmark">Remove</string>
-    <string name="board_bookmarks_title">Boards</string>
-    <string name="topic_bookmarks_title">Topics</string>
-
-    <!--Licences-->
     <string name="libraries">Libraries</string>
     <string name="libraries_text">mTHMMY uses the following open-source libraries:</string>
     <string name="apache_v2_0_libraries"><u>Apache v2.0 License libraries</u></string>
     <string name="the_mit_libraries"><u>The MIT License libraries</u></string>
     <string name="contact">Contact</string>
     <string name="contact_text">Do not hesitate to contact us for any matter either by email at thmmynolife@gmail.com, or by joining our discord server at https://discord.gg/CVt3yrn.</string>
+    <string name="open_source">Open Source</string>
+    <string name="open_source_text">The source code of mTHMMY can be found on GitLab (https://gitlab.com/ThmmyNoLife/mTHMMY) along with further details of how one can contribute.</string>
+    <string name="trollPic">You should see a funny pic!</string>
+
+    <!--Bookmarks-->
+    <string name="remove_bookmark">Remove</string>
+    <string name="board_bookmarks_title">Boards</string>
+    <string name="topic_bookmarks_title">Topics</string>
 
     <!--FontAwesome strings-->
     <string name="fa_icon_star">&#xf005;</string>