diff options
Diffstat (limited to 'app/src/main/res')
| -rw-r--r-- | app/src/main/res/layout/activity_login.xml | 21 | ||||
| -rw-r--r-- | app/src/main/res/layout/activity_main.xml | 5 | ||||
| -rw-r--r-- | app/src/main/res/layout/activity_web_overlay.xml | 3 | ||||
| -rw-r--r-- | app/src/main/res/layout/login_webview.xml | 36 | ||||
| -rw-r--r-- | app/src/main/res/values/strings.xml | 7 | ||||
| -rw-r--r-- | app/src/main/res/values/styles.xml | 8 |
6 files changed, 76 insertions, 4 deletions
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml new file mode 100644 index 00000000..2c03624b --- /dev/null +++ b/app/src/main/res/layout/activity_login.xml @@ -0,0 +1,21 @@ +<?xml version="1.0" encoding="utf-8"?> +<android.support.design.widget.CoordinatorLayout 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:id="@+id/main_content" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:fitsSystemWindows="true" + tools:context=".LoginActivity"> + + <android.support.v7.widget.Toolbar + android:id="@+id/toolbar" + android:layout_width="match_parent" + android:layout_height="?attr/actionBarSize" + android:background="?attr/colorPrimary" + app:layout_scrollFlags="scroll|enterAlways" + app:popupTheme="@style/AppTheme.PopupOverlay" /> + + <include layout="@layout/login_webview" /> + +</android.support.design.widget.CoordinatorLayout> diff --git a/app/src/main/res/layout/activity_main.xml b/app/src/main/res/layout/activity_main.xml index 7f6c06c3..f6c29f8b 100644 --- a/app/src/main/res/layout/activity_main.xml +++ b/app/src/main/res/layout/activity_main.xml @@ -12,14 +12,16 @@ android:id="@+id/appbar" android:layout_width="match_parent" android:layout_height="wrap_content" + android:fitsSystemWindows="true" android:paddingTop="@dimen/appbar_padding_top" android:theme="@style/AppTheme.AppBarOverlay"> <android.support.v7.widget.Toolbar android:id="@+id/toolbar" android:layout_width="match_parent" - android:layout_height="?attr/actionBarSize" + android:layout_height="wrap_content" android:background="?attr/colorPrimary" + android:fitsSystemWindows="true" app:layout_scrollFlags="scroll|enterAlways" app:popupTheme="@style/AppTheme.PopupOverlay"> @@ -45,6 +47,7 @@ android:layout_height="wrap_content" android:layout_gravity="end|bottom" android:layout_margin="@dimen/fab_margin" + android:visibility="gone" app:srcCompat="@android:drawable/ic_dialog_email" /> </android.support.design.widget.CoordinatorLayout> diff --git a/app/src/main/res/layout/activity_web_overlay.xml b/app/src/main/res/layout/activity_web_overlay.xml index bfe177fd..f962b396 100644 --- a/app/src/main/res/layout/activity_web_overlay.xml +++ b/app/src/main/res/layout/activity_web_overlay.xml @@ -5,8 +5,9 @@ android:id="@+id/main_content" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@android:color/white" android:fitsSystemWindows="true" - tools:context=".MainActivity"> + tools:context=".WebOverlayActivity"> <android.support.v7.widget.Toolbar android:id="@+id/toolbar" diff --git a/app/src/main/res/layout/login_webview.xml b/app/src/main/res/layout/login_webview.xml new file mode 100644 index 00000000..35b5f681 --- /dev/null +++ b/app/src/main/res/layout/login_webview.xml @@ -0,0 +1,36 @@ +<?xml version="1.0" encoding="utf-8"?> +<android.support.v4.widget.SwipeRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android" + android:id="@+id/swipe_refresh" + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <RelativeLayout + android:layout_width="match_parent" + android:layout_height="match_parent"> + + <ImageView + android:id="@+id/profile" + android:layout_width="144dp" + android:layout_height="144dp" + android:layout_centerInParent="true" + android:layout_marginBottom="8dp" + android:contentDescription="Profile Picture" + android:scaleType="centerInside"/> + + <android.support.v7.widget.AppCompatTextView + android:id="@+id/textview" + android:layout_width="wrap_content" + android:layout_height="wrap_content" + android:layout_centerHorizontal="true" + android:layout_below="@id/profile" + android:visibility="gone" /> + + <com.pitchedapps.frost.web.LoginWebView + android:id="@+id/login_webview" + android:layout_width="match_parent" + android:layout_height="match_parent" + android:focusable="true" + android:focusableInTouchMode="true" + android:visibility="invisible" /> + </RelativeLayout> +</android.support.v4.widget.SwipeRefreshLayout>
\ No newline at end of file diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml index 8bf0e417..a58e995e 100644 --- a/app/src/main/res/values/strings.xml +++ b/app/src/main/res/values/strings.xml @@ -13,4 +13,11 @@ <string name="friends">Friends</string> <string name="messages">Messages</string> <string name="notifications">Notifications</string> + <string name="activity_log">Activity Log</string> + <string name="pages">Pages</string> + <string name="groups">Groups</string> + <string name="saved">Saved</string> + <string name="birthdays">Birthdays</string> + <string name="chat">Chat</string> + <string name="photos">Photos</string> </resources> diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 92c75507..ded59278 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -1,16 +1,18 @@ <resources> <!-- Base application theme. --> - <style name="AppTheme" parent="Theme.AppCompat.Light.DarkActionBar"> + <style name="AppTheme" parent="MaterialDrawerTheme.Light.DarkToolbar.ActionBar"> <!-- Customize your theme here. --> <item name="colorPrimary">@color/colorPrimary</item> <item name="colorPrimaryDark">@color/colorPrimaryDark</item> <item name="colorAccent">@color/colorAccent</item> </style> + <style name="AppTheme.NoActionBar"> <item name="windowActionBar">false</item> <item name="windowNoTitle">true</item> </style> + <style name="AppTheme.Overlay" parent="AppTheme.NoActionBar"> <item name="android:windowIsTranslucent">true</item> <item name="android:activityOpenEnterAnimation">@anim/slide_in_right</item> @@ -18,10 +20,12 @@ <item name="android:activityCloseEnterAnimation">@anim/slide_in_right</item> <item name="android:activityCloseExitAnimation">@anim/slide_out_right</item> </style> + <style name="AppTheme.AppBarOverlay" parent="ThemeOverlay.AppCompat.Dark.ActionBar" /> + <style name="AppTheme.PopupOverlay" parent="ThemeOverlay.AppCompat.Light" /> - <style name="Theme.Splash" parent="AppTheme"> + <style name="Theme.Splash" parent="Theme.AppCompat.NoActionBar"> <item name="android:windowBackground">@drawable/splash_screen</item> <item name="android:navigationBarColor">@color/splashBackground</item> <item name="colorPrimaryDark">@color/splashBackground</item> |