1
0
mirror of https://github.com/nerzhul/ownCloud-SMS-App.git synced 2025-06-07 16:06:18 +00:00

Implement some material design

This commit is contained in:
Loic Blot 2016-01-31 01:46:44 +01:00
parent 7a0ff98658
commit bee1163c44
6 changed files with 47 additions and 35 deletions

View File

@ -30,6 +30,7 @@ dependencies {
compile project(':nrzandroidlib') compile project(':nrzandroidlib')
compile 'com.android.support:support-v13:23.+' compile 'com.android.support:support-v13:23.+'
compile 'com.android.support:appcompat-v7:23.+' compile 'com.android.support:appcompat-v7:23.+'
compile 'com.android.support:design:23.+'
compile 'in.srain.cube:ultra-ptr:1.0.11' compile 'in.srain.cube:ultra-ptr:1.0.11'
compile 'com.github.dmytrodanylyk.android-process-button:library:1.0.4' compile 'com.github.dmytrodanylyk.android-process-button:library:1.0.4'
} }

View File

@ -22,7 +22,6 @@ import android.accounts.AccountManager;
import android.animation.Animator; import android.animation.Animator;
import android.animation.AnimatorListenerAdapter; import android.animation.AnimatorListenerAdapter;
import android.annotation.TargetApi; import android.annotation.TargetApi;
import android.app.Activity;
import android.content.ContentResolver; import android.content.ContentResolver;
import android.content.Intent; import android.content.Intent;
import android.net.Uri; import android.net.Uri;
@ -30,6 +29,7 @@ import android.os.AsyncTask;
import android.os.Build; import android.os.Build;
import android.os.Bundle; import android.os.Bundle;
import android.provider.Settings; import android.provider.Settings;
import android.support.v7.app.AppCompatActivity;
import android.text.TextUtils; import android.text.TextUtils;
import android.view.KeyEvent; import android.view.KeyEvent;
import android.view.View; import android.view.View;
@ -53,7 +53,7 @@ import fr.unix_experience.owncloud_sms.enums.LoginReturnCode;
* A login screen that offers login via email/password. * A login screen that offers login via email/password.
*/ */
@TargetApi(Build.VERSION_CODES.HONEYCOMB) @TargetApi(Build.VERSION_CODES.HONEYCOMB)
public class LoginActivity extends Activity { public class LoginActivity extends AppCompatActivity {
/** /**
* Keep track of the login task to ensure we can cancel it if requested. * Keep track of the login task to ensure we can cancel it if requested.
*/ */

View File

@ -25,7 +25,6 @@ package fr.unix_experience.owncloud_sms.activities;
* SUCH DAMAGE. * SUCH DAMAGE.
*/ */
import android.app.Activity;
import android.app.Fragment; import android.app.Fragment;
import android.app.FragmentManager; import android.app.FragmentManager;
import android.content.Context; import android.content.Context;
@ -36,6 +35,7 @@ import android.provider.Settings;
import android.support.v13.app.FragmentPagerAdapter; import android.support.v13.app.FragmentPagerAdapter;
import android.support.v4.view.PagerAdapter; import android.support.v4.view.PagerAdapter;
import android.support.v4.view.ViewPager; import android.support.v4.view.ViewPager;
import android.support.v7.app.AppCompatActivity;
import android.view.LayoutInflater; import android.view.LayoutInflater;
import android.view.View; import android.view.View;
import android.view.ViewGroup; import android.view.ViewGroup;
@ -53,7 +53,7 @@ import fr.unix_experience.owncloud_sms.engine.ConnectivityMonitor;
import fr.unix_experience.owncloud_sms.engine.SmsFetcher; import fr.unix_experience.owncloud_sms.engine.SmsFetcher;
import fr.unix_experience.owncloud_sms.notifications.OCSMSNotificationManager; import fr.unix_experience.owncloud_sms.notifications.OCSMSNotificationManager;
public class MainActivity extends Activity { public class MainActivity extends AppCompatActivity {
/** /**
* The {@link android.support.v4.view.PagerAdapter} that will provide * The {@link android.support.v4.view.PagerAdapter} that will provide

View File

@ -26,7 +26,6 @@
--> -->
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools" xmlns:tools="http://schemas.android.com/tools"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
android:gravity="center_horizontal" android:gravity="center_horizontal"
@ -76,38 +75,50 @@
android:layout_height="wrap_content" android:layout_height="wrap_content"
android:entries="@array/protocol_array"> android:entries="@array/protocol_array">
</Spinner> </Spinner>
<EditText <android.support.design.widget.TextInputLayout
android:id="@+id/oc_server" android:layout_width="match_parent"
android:layout_width="fill_parent" android:layout_height="wrap_content">
android:layout_height="wrap_content" <EditText
android:hint="@string/prompt_serverURI" android:id="@+id/oc_server"
android:inputType="textUri" > android:layout_width="fill_parent"
<requestFocus /> android:layout_height="wrap_content"
</EditText> android:hint="@string/prompt_serverURI"
android:inputType="textUri" >
<requestFocus />
</EditText>
</android.support.design.widget.TextInputLayout>
</LinearLayout> </LinearLayout>
<AutoCompleteTextView <android.support.design.widget.TextInputLayout
android:id="@+id/oc_login" android:layout_width="match_parent"
android:layout_width="match_parent" android:layout_height="wrap_content">
android:layout_height="wrap_content" <AutoCompleteTextView
android:hint="@string/prompt_login" android:id="@+id/oc_login"
android:inputType="textEmailAddress" android:layout_width="match_parent"
android:maxLines="1" android:layout_height="wrap_content"
android:singleLine="true" /> android:hint="@string/prompt_login"
android:inputType="textEmailAddress"
android:maxLines="1"
android:singleLine="true" />
</android.support.design.widget.TextInputLayout>
<EditText <android.support.design.widget.TextInputLayout
android:id="@+id/oc_password" android:layout_width="match_parent"
android:layout_width="match_parent" android:layout_height="wrap_content">
android:layout_height="wrap_content" <EditText
android:hint="@string/prompt_password" android:id="@+id/oc_password"
android:imeActionId="@+id/oc_login" android:layout_width="match_parent"
android:imeActionLabel="@string/action_sign_in_short" android:layout_height="wrap_content"
android:imeOptions="actionUnspecified" android:hint="@string/prompt_password"
android:inputType="textPassword" android:imeActionId="@+id/oc_login"
android:maxLines="1" android:imeActionLabel="@string/action_sign_in_short"
android:singleLine="true" /> android:imeOptions="actionUnspecified"
android:inputType="textPassword"
android:maxLines="1"
android:singleLine="true" />
</android.support.design.widget.TextInputLayout>
<com.dd.processbutton.iml.ActionProcessButton <com.dd.processbutton.iml.ActionProcessButton
android:id="@+id/oc_signin_button" android:id="@+id/oc_signin_button"

View File

@ -27,7 +27,7 @@
<resources> <resources>
<style name="OcSmsTheme" parent="@android:style/Theme.Holo.Light.DarkActionBar"> <style name="OcSmsTheme" parent="Theme.AppCompat.Light.DarkActionBar">
<item name="android:actionBarStyle">@style/OcSmsActionBar</item> <item name="android:actionBarStyle">@style/OcSmsActionBar</item>
</style> </style>

View File

@ -26,7 +26,7 @@
--> -->
<resources> <resources>
<style name="AppBaseTheme" parent="@android:style/Theme.Holo.Light"> <style name="AppBaseTheme" parent="Theme.AppCompat.Light.DarkActionBar">
</style> </style>
<!-- Application theme. --> <!-- Application theme. -->