UI improvements

tech-team · Apr 18, 2015 · f93ea10 · f93ea10
1 parent 1d31439
commit f93ea10
Show file tree

Hide file tree

Showing 11 changed files with 20 additions and 20 deletions.
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/app.iml b/app/app.iml
@@ -12,8 +12,9 @@
         <option name="SELECTED_TEST_ARTIFACT" value="_android_test_" />
         <option name="ASSEMBLE_TASK_NAME" value="assembleDebug" />
         <option name="COMPILE_JAVA_TASK_NAME" value="compileDebugSources" />
-        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
         <option name="SOURCE_GEN_TASK_NAME" value="generateDebugSources" />
+        <option name="ASSEMBLE_TEST_TASK_NAME" value="assembleDebugAndroidTest" />
+        <option name="COMPILE_JAVA_TEST_TASK_NAME" value="compileDebugAndroidTestSources" />
         <option name="TEST_SOURCE_GEN_TASK_NAME" value="generateDebugAndroidTestSources" />
         <option name="ALLOW_USER_CONFIGURATION" value="false" />
         <option name="MANIFEST_FILE_RELATIVE_PATH" value="/src/main/AndroidManifest.xml" />
@@ -95,5 +96,4 @@
     <orderEntry type="library" exported="" name="cardview-v7-22.0.0" level="project" />
     <orderEntry type="library" exported="" name="support-annotations-22.0.0" level="project" />
   </component>
-</module>
-
+</module>
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -25,7 +25,7 @@
         <activity
             android:name=".gui.activities.MainActivity"
             android:label="@string/app_name"
-            android:windowSoftInputMode="adjustResize">
+            android:windowSoftInputMode="adjustResize|stateHidden">
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />
                 <category android:name="android.intent.category.LAUNCHER" />

diff --git a/app/src/main/java/org/techteam/decider/gui/fragments/MainFragment.java b/app/src/main/java/org/techteam/decider/gui/fragments/MainFragment.java
@@ -181,6 +181,8 @@ public void onDrawerOpened(View drawerView) {
         mSlidingTabLayout = (SlidingTabLayout) this.activity.findViewById(R.id.sections_pager_tabs);
         mSlidingTabLayout.setDistributeEvenly(true);
         mSlidingTabLayout.setViewPager(mViewPager);
+
+        mSlidingTabLayout.setBackgroundColor(this.activity.getResources().getColor(R.color.primary));
         mSlidingTabLayout.setCustomTabColorizer(new SlidingTabLayout.TabColorizer() {
             @Override
             public int getIndicatorColor(int position) {

diff --git a/app/src/main/java/org/techteam/decider/gui/widget/SlidingTabLayout.java b/app/src/main/java/org/techteam/decider/gui/widget/SlidingTabLayout.java
@@ -215,7 +215,9 @@ private void populateTabStrip() {
             }
 
             tabTitleView.setText(adapter.getPageTitle(i));
-//            tabTitleView.setTextColor(getContext().getResources().getColor(R.color.white));
+
+            //TODO: Such change, very inside SDK almost
+            tabTitleView.setTextColor(getContext().getResources().getColor(R.color.white));
             tabView.setOnClickListener(tabClickListener);
             String desc = mContentDescriptions.get(i, null);
             if (desc != null) {

diff --git a/app/src/main/res/drawable-xxhdpi/vk.png b/app/src/main/res/drawable-xxhdpi/vk.png
diff --git a/app/src/main/res/layout/fragment_auth.xml b/app/src/main/res/layout/fragment_auth.xml
@@ -37,10 +37,10 @@
 
             <ImageButton
                 android:id="@+id/login_via_vk_button"
-                android:layout_width="wrap_content"
+                android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:src="@drawable/vk"
-                android:background="@android:color/transparent"
+                android:background="@color/vk_logo_background"
                 android:layout_marginTop="10dp"
                 android:contentDescription="@string/vk" />
 

diff --git a/app/src/main/res/layout/fragment_main.xml b/app/src/main/res/layout/fragment_main.xml
@@ -32,7 +32,8 @@
             <org.techteam.decider.gui.widget.SlidingTabLayout
                 android:id="@+id/sections_pager_tabs"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
+                android:layout_height="wrap_content"
+                />
 
             <android.support.v4.view.ViewPager
                 android:id="@+id/sections_pager"

diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
@@ -16,4 +16,6 @@
     <color name="icons">#FFFFFF</color>
     <color name="divider">#B6B6B6</color>
     <color name="white">#FFFFFF</color>
+
+    <color name="vk_logo_background">#4D75A3</color>
 </resources>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -6,8 +6,6 @@
         <item name="colorPrimaryDark">@color/primary_dark</item>
         <item name="colorPrimary">@color/primary</item>
         <item name="colorAccent">@color/accent</item>
-        <item name="android:selectableItemBackground">@color/primary</item>
-
     </style>
 
     <style name="MyActionBar">
@@ -32,9 +30,5 @@
     <style name="ActionBarPopupThemeOverlay" parent="ThemeOverlay.AppCompat.Light" >
         <!-- Want to style this? Be smart - use selector -->
     </style>
-
-    <style name="ToolbarButton">
-        <item name="android:background">?android:attr/selectableItemBackground</item>
-    </style>
-
+
 </resources>
diff --git a/decider-android.iml b/decider-android.iml
@@ -4,6 +4,7 @@
     <facet type="java-gradle" name="Java-Gradle">
       <configuration>
         <option name="BUILD_FOLDER_PATH" value="$MODULE_DIR$/build" />
+        <option name="BUILDABLE" value="false" />
       </configuration>
     </facet>
   </component>
@@ -15,5 +16,4 @@
     <orderEntry type="inheritedJdk" />
     <orderEntry type="sourceFolder" forTests="false" />
   </component>
-</module>
-
+</module>