From e7e9ba9d7fbbfe9945e7a1f4622174bc95792c00 Mon Sep 17 00:00:00 2001
From: Apostolof <apotwohd@gmail.com>
Date: Fri, 20 Jan 2017 22:06:11 +0200
Subject: [PATCH] Fixes for file downloading and login screen.

---
 app/src/main/AndroidManifest.xml              |  6 ++-
 .../mthmmy/activities/topic/TopicAdapter.java | 40 +++++++++++-----
 app/src/main/res/layout/activity_login.xml    | 48 ++++++++++---------
 app/src/main/res/values/strings.xml           |  1 -
 app/src/main/res/xml/provider_paths.xml       |  1 -
 5 files changed, 57 insertions(+), 39 deletions(-)

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 7b1efb2d..20248cb4 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -31,9 +31,11 @@
 
         <activity
             android:name=".activities.LoginActivity"
-            android:configChanges="orientation|screenSize"
+            android:configChanges="orientation|screenSize|keyboardHidden"
             android:launchMode="singleTop"
-            android:theme="@style/AppTheme.NoActionBar">
+            android:screenOrientation="portrait"
+            android:theme="@style/AppTheme.NoActionBar"
+            android:windowSoftInputMode="adjustPan">
         </activity>
 
         <activity
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 8b4fa82d..d93d09a5 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
@@ -651,23 +651,39 @@ class TopicAdapter extends RecyclerView.Adapter<TopicAdapter.MyViewHolder> {
         }
 
         @Override
-        protected String doInBackground(ThmmyFile... files) {
+        protected String doInBackground(ThmmyFile... file) {
             try {
-                File tempFile = files[0].download(context);
+                File tempFile = file[0].download(context);
                 if (tempFile != null) {
-                    String mime = MimeTypeMap.getSingleton().getMimeTypeFromExtension(
-                            files[0].getExtension());
+                    if (file[0].isInternal()) {
+                        String mime = MimeTypeMap.getSingleton().getMimeTypeFromExtension(
+                                file[0].getExtension());
 
-                    Intent intent = new Intent();
-                    intent.setAction(android.content.Intent.ACTION_VIEW);
-                    //intent.setDataAndType(Uri.fromFile(tempFile), mime);
+                        Intent intent = new Intent();
+                        intent.setAction(android.content.Intent.ACTION_VIEW);
+                        //intent.setDataAndType(Uri.fromFile(tempFile), mime);
 
-                    intent.setDataAndType(FileProvider.getUriForFile(context, context.
-                            getApplicationContext()
-                            .getPackageName() + ".provider", tempFile), mime);
+                        intent.setDataAndType(FileProvider.getUriForFile(context, context.
+                                getApplicationContext()
+                                .getPackageName() + ".provider", tempFile), mime);
 
-                    intent.setFlags(FLAG_ACTIVITY_NEW_TASK);
-                    context.startActivity(intent);
+                        intent.setFlags(FLAG_ACTIVITY_NEW_TASK);
+                        context.startActivity(intent);
+                    } else {
+                        String mime = MimeTypeMap.getSingleton().getMimeTypeFromExtension(
+                                file[0].getExtension());
+
+                        Intent intent = new Intent();
+                        intent.setAction(android.content.Intent.ACTION_VIEW);
+                        intent.setDataAndType(Uri.fromFile(tempFile), mime);
+
+                        /*intent.setDataAndType(FileProvider.getUriForFile(context, context.
+                                getApplicationContext()
+                                .getPackageName() + ".provider", tempFile), mime);*/
+
+                        intent.setFlags(FLAG_ACTIVITY_NEW_TASK);
+                        context.startActivity(intent);
+                    }
                 }
             } catch (IOException e) {
                 Report.e(TAG, "Error while trying to download a file", e);
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index b79c2503..52bdc281 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -1,7 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
                 xmlns:app="http://schemas.android.com/apk/res-auto"
-                xmlns:tools="http://schemas.android.com/tools"
                 android:layout_width="fill_parent"
                 android:layout_height="fill_parent"
                 android:background="@color/background"
@@ -10,12 +9,13 @@
     <ScrollView
         android:id="@+id/inner_scroll_view"
         android:layout_width="match_parent"
-        android:layout_height="match_parent">
+        android:layout_height="match_parent"
+        android:fillViewport="true"
+        android:isScrollContainer="false">
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_gravity="top"
             android:focusableInTouchMode="true"
             android:orientation="vertical"
             android:paddingLeft="24dp"
@@ -23,7 +23,8 @@
 
             <Space
                 android:layout_width="match_parent"
-                android:layout_height="100dp"/>
+                android:layout_height="0dp"
+                android:layout_weight="0.4"/>
 
             <pl.droidsonroids.gif.GifImageView
                 android:id="@+id/logo"
@@ -36,14 +37,13 @@
 
             <Space
                 android:layout_width="match_parent"
-                android:layout_height="50dp"/>
+                android:layout_height="0dp"
+                android:layout_weight="0.45"/>
 
             <!--  Username Label -->
             <android.support.design.widget.TextInputLayout
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginBottom="8dp"
-                android:layout_marginTop="8dp">
+                android:layout_height="wrap_content">
 
                 <EditText
                     android:id="@+id/username"
@@ -53,12 +53,15 @@
                     android:inputType="textPersonName"/>
             </android.support.design.widget.TextInputLayout>
 
+            <Space
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="0.16"/>
+
             <!--  Password Label -->
             <android.support.design.widget.TextInputLayout
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="8dp"
-                android:layout_marginTop="8dp"
                 app:passwordToggleEnabled="true">
 
                 <EditText
@@ -69,40 +72,39 @@
                     android:inputType="textPassword"/>
             </android.support.design.widget.TextInputLayout>
 
+            <Space
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="0.5"/>
+
             <!-- Login Button -->
             <android.support.v7.widget.AppCompatButton
                 android:id="@+id/btnLogin"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="30dp"
-                android:layout_marginTop="30dp"
                 android:background="@drawable/login_button_bg"
                 android:padding="12dp"
                 android:text="@string/btn_login"
                 android:textSize="18sp"/>
 
-            <TextView
+            <Space
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:background="@null"
-                android:gravity="center"
-                android:text="@string/login_or_guest"
-                android:textAllCaps="false"
-                android:textColor="@color/secondary_text"
-                android:textSize="10sp"
-                tools:ignore="SmallSp"/>
+                android:layout_height="0dp"
+                android:layout_weight="0.2"/>
 
             <android.support.v7.widget.AppCompatButton
                 android:id="@+id/btnContinueAsGuest"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="24dp"
-                android:layout_marginTop="30dip"
                 android:background="@drawable/guest_button_border_bg"
                 android:text="@string/btn_continue_as_guest"
                 android:textAllCaps="false"
                 android:textSize="15sp"/>
 
+            <Space
+                android:layout_width="match_parent"
+                android:layout_height="0dp"
+                android:layout_weight="0.3"/>
         </LinearLayout>
     </ScrollView>
 
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
index dccbf7e3..86d8cf67 100644
--- a/app/src/main/res/values/strings.xml
+++ b/app/src/main/res/values/strings.xml
@@ -12,7 +12,6 @@
     <string name="hint_username">Username</string>
     <string name="hint_password">Password</string>
     <string name="btn_login">LOGIN</string>
-    <string name="login_or_guest">- OR -</string>
     <string name="btn_continue_as_guest">Don\'t have an account? Continue as guest!</string>
 
     <!--Main Activity-->
diff --git a/app/src/main/res/xml/provider_paths.xml b/app/src/main/res/xml/provider_paths.xml
index d056e2a0..a0b81b43 100644
--- a/app/src/main/res/xml/provider_paths.xml
+++ b/app/src/main/res/xml/provider_paths.xml
@@ -4,7 +4,6 @@
         name="my_downloads"
         path="Downloads/"/>
 
-
     <files-path
         name="my_downloads"
         path="Downloads/"/>