Skip to content

likorn / vocabulary_notebook

Go to a project
Commit 8f98c70a by Paktalin
Options

Changed background + some other UI refactoring

parent 5ed58338
Inline Side-by-side
Showing with 31 additions and 20 deletions
.idea/assetWizardSettings.xml
...@@ -23,7 +23,7 @@ ...@@ -23,7 +23,7 @@
<PersistentState> <PersistentState>
<option name="values"> <option name="values">
<map> <map>
<entry key="url" value="jar:file:/C:/Program%20Files/Android/Android%20Studio/plugins/android/lib/android.jar!/images/material_design_icons/action/ic_done_black_24dp.xml" /> <entry key="url" value="jar:file:/C:/Program%20Files/Android/Android%20Studio/plugins/android/lib/android.jar!/images/material_design_icons/action/ic_power_settings_new_black_24dp.xml" />
</map> </map>
</option> </option>
</PersistentState> </PersistentState>
...@@ -33,8 +33,8 @@ ...@@ -33,8 +33,8 @@
</option> </option>
<option name="values"> <option name="values">
<map> <map>
<entry key="color" value="66330e" /> <entry key="color" value="4b260b" />
<entry key="outputName" value="ic_done_brown" /> <entry key="outputName" value="ic_off_brown" />
<entry key="sourceFile" value="C:\Users\litak\Desktop\baseline-sort-24px.svg" /> <entry key="sourceFile" value="C:\Users\litak\Desktop\baseline-sort-24px.svg" />
</map> </map>
</option> </option>
......
app/src/main/AndroidManifest.xml
...@@ -3,18 +3,14 @@ ...@@ -3,18 +3,14 @@
package="com.paktalin.vocabularynotebook"> package="com.paktalin.vocabularynotebook">
<!-- To auto-complete the email text field in the mLogIn form with the user's emails --> <!-- To auto-complete the email text field in the mLogIn form with the user's emails -->
<uses-permission android:name="android.permission.GET_ACCOUNTS" />
<uses-permission android:name="android.permission.READ_PROFILE" />
<uses-permission android:name="android.permission.READ_CONTACTS" />
<application <application
android:name=".appsetup.VocabularyApplication" android:name=".appsetup.VocabularyApplication"
android:icon="@mipmap/ic_launcher" android:icon="@mipmap/ic_launcher"
android:label="@string/app_name" android:label="@string/app_name"
android:supportsRtl="true" android:supportsRtl="true"
android:theme="@style/NoTextActionBar"> android:theme="@style/NoTextActionBarStyle">
<activity <activity
android:label="@string/app_name"
android:name=".ui.activities.MainActivity" android:name=".ui.activities.MainActivity"
android:windowSoftInputMode="adjustResize|stateHidden"> android:windowSoftInputMode="adjustResize|stateHidden">
<intent-filter> <intent-filter>
...@@ -27,7 +23,6 @@ ...@@ -27,7 +23,6 @@
<activity <activity
android:name=".ui.activities.LogInActivity" android:name=".ui.activities.LogInActivity"
android:windowSoftInputMode="adjustResize" android:windowSoftInputMode="adjustResize"
android:label="Vocabulary Notebook"
android:theme="@style/BasicStyle"> android:theme="@style/BasicStyle">
<intent-filter> <intent-filter>
<action android:name="android.intent.action.MAIN" /> <action android:name="android.intent.action.MAIN" />
......
app/src/main/res/drawable/ic_off_brown.xml 0 → 100644
<vector android:height="24dp" android:tint="#4B260B"
android:viewportHeight="24.0" android:viewportWidth="24.0"
android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
<path android:fillColor="#FF000000" android:pathData="M13,3h-2v10h2L13,3zM17.83,5.17l-1.42,1.42C17.99,7.86 19,9.81 19,12c0,3.87 -3.13,7 -7,7s-7,-3.13 -7,-7c0,-2.19 1.01,-4.14 2.58,-5.42L6.17,5.17C4.23,6.82 3,9.26 3,12c0,4.97 4.03,9 9,9s9,-4.03 9,-9c0,-2.74 -1.23,-5.18 -3.17,-6.83z"/>
</vector>
app/src/main/res/layout/activity_log_in.xml
...@@ -7,7 +7,7 @@ ...@@ -7,7 +7,7 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
tools:context=".ui.activities.LogInActivity" tools:context=".ui.activities.LogInActivity"
android:background="@color/background_color"> android:background="@drawable/wood">
<android.support.constraint.ConstraintLayout <android.support.constraint.ConstraintLayout
android:id="@+id/emailPasswordLayout" android:id="@+id/emailPasswordLayout"
...@@ -19,7 +19,8 @@ ...@@ -19,7 +19,8 @@
app:layout_constraintEnd_toEndOf="parent" app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toStartOf="parent" app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toTopOf="parent" app:layout_constraintTop_toTopOf="parent"
app:layout_constraintBottom_toTopOf="@+id/btnLogIn"> app:layout_constraintBottom_toTopOf="@+id/btnLogIn"
android:layout_marginTop="?android:attr/actionBarSize">
<EditText <EditText
android:id="@+id/etEmail" android:id="@+id/etEmail"
......
app/src/main/res/layout/activity_main.xml
...@@ -6,12 +6,14 @@ ...@@ -6,12 +6,14 @@
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
tools:openDrawer="start" tools:openDrawer="start"
android:background="@color/background_color"> android:background="@drawable/wood"
android:paddingTop="?android:attr/actionBarSize">
<FrameLayout <FrameLayout
android:id="@+id/container_main" android:id="@+id/container_main"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent"> android:layout_height="match_parent"
android:layout_marginTop="?android:attr/actionBarSize">
<include layout="@layout/content_main" /> <include layout="@layout/content_main" />
</FrameLayout> </FrameLayout>
......
app/src/main/res/menu/activity_main_drawer.xml
...@@ -5,8 +5,7 @@ ...@@ -5,8 +5,7 @@
<group android:checkableBehavior="single"> <group android:checkableBehavior="single">
<item <item
android:id="@+id/logOut" android:id="@+id/logOut"
android:icon="@android:drawable/ic_lock_power_off" android:icon="@drawable/ic_off_brown"
android:title="@string/log_out" /> android:title="@string/log_out" />
</group> </group>
</menu> </menu>
app/src/main/res/values/colors.xml
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<resources> <resources>
<color name="colorPrimary">#D34E21</color> <color name="colorPrimary">#D34E21</color>
<color name="colorPrimaryDark">#AD401C</color> <color name="colorPrimaryDark">#AD401C</color>
<color name="colorAccent">#D34E21</color> <color name="colorAccent">#D34E21</color>
<color name="sheet_color">#FAFAFA</color> <color name="sheet_color">#FAFAFA</color>
<color name="text_color">#000F55</color> <color name="text_color">#000F55</color>
<color name="background_color">#66330E</color> <color name="dark_brown">#4A2A14</color>
<color name="dark_brown">#4B260B</color> <color name="shadedPrimary">#99AD401C</color>
</resources> </resources>
app/src/main/res/values/strings.xml
<resources> <resources>
<string name="app_name">VocabularyNotebook</string> <string name="app_name">Fire V</string>
<string name="title_activity_login">Sign in</string> <string name="title_activity_login">Sign in</string>
<string name="btn_save">Save</string> <string name="btn_save">Save</string>
<string name="btn_cancel">Cancel</string> <string name="btn_cancel">Cancel</string>
......
app/src/main/res/values/styles.xml
...@@ -4,19 +4,27 @@ ...@@ -4,19 +4,27 @@
<item name="colorPrimary">@color/colorPrimary</item> <item name="colorPrimary">@color/colorPrimary</item>
<item name="colorPrimaryDark">@color/colorPrimaryDark</item> <item name="colorPrimaryDark">@color/colorPrimaryDark</item>
<item name="colorAccent">@color/colorAccent</item> <item name="colorAccent">@color/colorAccent</item>
<item name="windowActionBarOverlay">true</item>
<item name="actionBarStyle">@style/BasicActionBar</item>
<item name="android:actionBarStyle">@style/BasicActionBar</item>
</style> </style>
<style name="NoTextActionBar" parent="BasicStyle"> <style name="NoTextActionBarStyle" parent="BasicStyle">
<item name="actionBarStyle">@style/Widget.Styled.ActionBar</item> <item name="actionBarStyle">@style/Widget.Styled.ActionBar</item>
<item name="android:actionBarStyle">@style/Widget.Styled.ActionBar</item> <item name="android:actionBarStyle">@style/Widget.Styled.ActionBar</item>
<item name="android:actionOverflowButtonStyle">@style/MyActionButtonOverflow</item> <item name="android:actionOverflowButtonStyle">@style/MyActionButtonOverflow</item>
</style> </style>
<style name="Widget.Styled.ActionBar" parent="Widget.AppCompat.Light.ActionBar.Solid.Inverse"> <style name="Widget.Styled.ActionBar" parent="BasicActionBar">
<item name="android:displayOptions">showHome|useLogo</item> <item name="android:displayOptions">showHome|useLogo</item>
<item name="displayOptions">showHome|useLogo</item> <item name="displayOptions">showHome|useLogo</item>
</style> </style>
<style name="BasicActionBar" parent="Widget.AppCompat.Light.ActionBar.Solid.Inverse">
<item name="android:background">@color/shadedPrimary</item>
<item name="background">@color/shadedPrimary</item>
</style>
<style name="MyActionButtonOverflow" parent="android:style/Widget.Holo.Light.ActionButton.Overflow"> <style name="MyActionButtonOverflow" parent="android:style/Widget.Holo.Light.ActionButton.Overflow">
<item name="android:src">@drawable/ic_sort_brown</item> <item name="android:src">@drawable/ic_sort_brown</item>
<item name="android:background">?android:attr/actionBarItemBackground</item> <item name="android:background">?android:attr/actionBarItemBackground</item>
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or sign in to comment