Browse Source

Fixes for file downloading and login screen.

pull/24/head
Apostolos Fanakis 8 years ago
parent
commit
e7e9ba9d7f
  1. 6
      app/src/main/AndroidManifest.xml
  2. 22
      app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicAdapter.java
  3. 48
      app/src/main/res/layout/activity_login.xml
  4. 1
      app/src/main/res/values/strings.xml
  5. 1
      app/src/main/res/xml/provider_paths.xml

6
app/src/main/AndroidManifest.xml

@ -31,9 +31,11 @@
<activity <activity
android:name=".activities.LoginActivity" android:name=".activities.LoginActivity"
android:configChanges="orientation|screenSize" android:configChanges="orientation|screenSize|keyboardHidden"
android:launchMode="singleTop" android:launchMode="singleTop"
android:theme="@style/AppTheme.NoActionBar"> android:screenOrientation="portrait"
android:theme="@style/AppTheme.NoActionBar"
android:windowSoftInputMode="adjustPan">
</activity> </activity>
<activity <activity

22
app/src/main/java/gr/thmmy/mthmmy/activities/topic/TopicAdapter.java

@ -651,12 +651,13 @@ class TopicAdapter extends RecyclerView.Adapter<TopicAdapter.MyViewHolder> {
} }
@Override @Override
protected String doInBackground(ThmmyFile... files) { protected String doInBackground(ThmmyFile... file) {
try { try {
File tempFile = files[0].download(context); File tempFile = file[0].download(context);
if (tempFile != null) { if (tempFile != null) {
if (file[0].isInternal()) {
String mime = MimeTypeMap.getSingleton().getMimeTypeFromExtension( String mime = MimeTypeMap.getSingleton().getMimeTypeFromExtension(
files[0].getExtension()); file[0].getExtension());
Intent intent = new Intent(); Intent intent = new Intent();
intent.setAction(android.content.Intent.ACTION_VIEW); intent.setAction(android.content.Intent.ACTION_VIEW);
@ -668,6 +669,21 @@ class TopicAdapter extends RecyclerView.Adapter<TopicAdapter.MyViewHolder> {
intent.setFlags(FLAG_ACTIVITY_NEW_TASK); intent.setFlags(FLAG_ACTIVITY_NEW_TASK);
context.startActivity(intent); 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) { } catch (IOException e) {
Report.e(TAG, "Error while trying to download a file", e); Report.e(TAG, "Error while trying to download a file", e);

48
app/src/main/res/layout/activity_login.xml

@ -1,7 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto" xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="fill_parent" android:layout_width="fill_parent"
android:layout_height="fill_parent" android:layout_height="fill_parent"
android:background="@color/background" android:background="@color/background"
@ -10,12 +9,13 @@
<ScrollView <ScrollView
android:id="@+id/inner_scroll_view" android:id="@+id/inner_scroll_view"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent"
android:fillViewport="true"
android:isScrollContainer="false">
<LinearLayout <LinearLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_gravity="top"
android:focusableInTouchMode="true" android:focusableInTouchMode="true"
android:orientation="vertical" android:orientation="vertical"
android:paddingLeft="24dp" android:paddingLeft="24dp"
@ -23,7 +23,8 @@
<Space <Space
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="100dp"/> android:layout_height="0dp"
android:layout_weight="0.4"/>
<pl.droidsonroids.gif.GifImageView <pl.droidsonroids.gif.GifImageView
android:id="@+id/logo" android:id="@+id/logo"
@ -36,14 +37,13 @@
<Space <Space
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="50dp"/> android:layout_height="0dp"
android:layout_weight="0.45"/>
<!-- Username Label --> <!-- Username Label -->
<android.support.design.widget.TextInputLayout <android.support.design.widget.TextInputLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content">
android:layout_marginBottom="8dp"
android:layout_marginTop="8dp">
<EditText <EditText
android:id="@+id/username" android:id="@+id/username"
@ -53,12 +53,15 @@
android:inputType="textPersonName"/> android:inputType="textPersonName"/>
</android.support.design.widget.TextInputLayout> </android.support.design.widget.TextInputLayout>
<Space
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="0.16"/>
<!-- Password Label --> <!-- Password Label -->
<android.support.design.widget.TextInputLayout <android.support.design.widget.TextInputLayout
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="8dp"
android:layout_marginTop="8dp"
app:passwordToggleEnabled="true"> app:passwordToggleEnabled="true">
<EditText <EditText
@ -69,40 +72,39 @@
android:inputType="textPassword"/> android:inputType="textPassword"/>
</android.support.design.widget.TextInputLayout> </android.support.design.widget.TextInputLayout>
<Space
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="0.5"/>
<!-- Login Button --> <!-- Login Button -->
<android.support.v7.widget.AppCompatButton <android.support.v7.widget.AppCompatButton
android:id="@+id/btnLogin" android:id="@+id/btnLogin"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="30dp"
android:layout_marginTop="30dp"
android:background="@drawable/login_button_bg" android:background="@drawable/login_button_bg"
android:padding="12dp" android:padding="12dp"
android:text="@string/btn_login" android:text="@string/btn_login"
android:textSize="18sp"/> android:textSize="18sp"/>
<TextView <Space
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="0dp"
android:background="@null" android:layout_weight="0.2"/>
android:gravity="center"
android:text="@string/login_or_guest"
android:textAllCaps="false"
android:textColor="@color/secondary_text"
android:textSize="10sp"
tools:ignore="SmallSp"/>
<android.support.v7.widget.AppCompatButton <android.support.v7.widget.AppCompatButton
android:id="@+id/btnContinueAsGuest" android:id="@+id/btnContinueAsGuest"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:layout_marginBottom="24dp"
android:layout_marginTop="30dip"
android:background="@drawable/guest_button_border_bg" android:background="@drawable/guest_button_border_bg"
android:text="@string/btn_continue_as_guest" android:text="@string/btn_continue_as_guest"
android:textAllCaps="false" android:textAllCaps="false"
android:textSize="15sp"/> android:textSize="15sp"/>
<Space
android:layout_width="match_parent"
android:layout_height="0dp"
android:layout_weight="0.3"/>
</LinearLayout> </LinearLayout>
</ScrollView> </ScrollView>

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

@ -12,7 +12,6 @@
<string name="hint_username">Username</string> <string name="hint_username">Username</string>
<string name="hint_password">Password</string> <string name="hint_password">Password</string>
<string name="btn_login">LOGIN</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> <string name="btn_continue_as_guest">Don\'t have an account? Continue as guest!</string>
<!--Main Activity--> <!--Main Activity-->

1
app/src/main/res/xml/provider_paths.xml

@ -4,7 +4,6 @@
name="my_downloads" name="my_downloads"
path="Downloads/"/> path="Downloads/"/>
<files-path <files-path
name="my_downloads" name="my_downloads"
path="Downloads/"/> path="Downloads/"/>

Loading…
Cancel
Save