Remove extra title from Add Transfers, add Search indicator when sear…

…ching
DSteve595 · Sep 28, 2015 · 876c6e8 · 876c6e8
1 parent 48e3c7b
commit 876c6e8
Show file tree

Hide file tree

Showing 12 changed files with 17 additions and 20 deletions.
diff --git a/app/build.gradle b/app/build.gradle
@@ -6,8 +6,8 @@ android {
     defaultConfig {
         minSdkVersion 14
         targetSdkVersion 23
-        versionCode 89
-        versionName '3.1.3'
+        versionCode 90
+        versionName '3.1.4-beta1'
     }
     compileOptions {
         sourceCompatibility JavaVersion.VERSION_1_7

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -78,7 +78,8 @@
             android:theme="@style/Putio.Dialog" />
         <activity
             android:name=".activities.AddTransfers"
-            android:theme="@style/Putio.Dialog">
+            android:label="@string/add_transfers"
+            android:theme="@style/Putio.Dialog.NoTitle">
             <intent-filter>
                 <action android:name="android.intent.action.VIEW" />
 

diff --git a/app/src/main/java/com/stevenschoen/putionew/activities/AddTransfers.java b/app/src/main/java/com/stevenschoen/putionew/activities/AddTransfers.java
@@ -7,7 +7,7 @@
 import android.net.Uri;
 import android.os.Bundle;
 import android.preference.PreferenceManager;
-import android.support.v4.app.FragmentActivity;
+import android.support.v7.app.AppCompatActivity;
 import android.util.Log;
 import android.view.View;
 import android.view.View.OnClickListener;
@@ -29,7 +29,7 @@
 
 import java.io.FileNotFoundException;
 
-public class AddTransfers extends FragmentActivity {
+public class AddTransfers extends AppCompatActivity {
     public static final int TYPE_SELECTING = -1;
     public static final int TYPE_URL = 1;
     public static final int TYPE_FILE = 2;

diff --git a/app/src/main/java/com/stevenschoen/putionew/fragments/Files.java b/app/src/main/java/com/stevenschoen/putionew/fragments/Files.java
@@ -309,10 +309,10 @@ private void refreshCurrentFolderView() {
 
             textCurrentFolder.setTextSize(TypedValue.COMPLEX_UNIT_SP, 20);
             if (state.isSearch) {
-                iconCurrentFolder.setVisibility(View.GONE);
+                iconCurrentFolder.setImageResource(R.drawable.ic_currentfolder_search);
                 textCurrentFolder.setText(state.searchQuery);
             } else {
-                iconCurrentFolder.setVisibility(View.VISIBLE);
+                iconCurrentFolder.setImageResource(R.drawable.ic_putio_folder);
                 textCurrentFolder.setText(state.currentFolder.name);
             }
         } else {

diff --git a/app/src/main/res/drawable-hdpi/ic_currentfolder_search.png b/app/src/main/res/drawable-hdpi/ic_currentfolder_search.png
diff --git a/app/src/main/res/drawable-mdpi/ic_currentfolder_search.png b/app/src/main/res/drawable-mdpi/ic_currentfolder_search.png
diff --git a/app/src/main/res/drawable-xhdpi/ic_currentfolder_search.png b/app/src/main/res/drawable-xhdpi/ic_currentfolder_search.png
diff --git a/app/src/main/res/drawable-xxhdpi/ic_currentfolder_search.png b/app/src/main/res/drawable-xxhdpi/ic_currentfolder_search.png
diff --git a/app/src/main/res/drawable-xxxhdpi/ic_currentfolder_search.png b/app/src/main/res/drawable-xxxhdpi/ic_currentfolder_search.png
diff --git a/app/src/main/res/layout/dialog_addtransfer.xml b/app/src/main/res/layout/dialog_addtransfer.xml
@@ -3,24 +3,14 @@
     android:layout_height="wrap_content"
     android:orientation="vertical">
 
-    <TextView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="12dp"
-        android:layout_marginLeft="?attr/dialogPreferredPadding"
-        android:layout_marginRight="?attr/dialogPreferredPadding"
-        android:layout_marginTop="@dimen/abc_dialog_padding_top_material"
-        android:text="@string/add_transfers"
-        android:textAppearance="@style/TextAppearance.AppCompat.Title" />
-
     <LinearLayout
         android:layout_width="wrap_content"
         android:layout_height="32dp"
         android:layout_marginEnd="?attr/dialogPreferredPadding"
         android:layout_marginLeft="?attr/dialogPreferredPadding"
         android:layout_marginRight="?attr/dialogPreferredPadding"
         android:layout_marginStart="?attr/dialogPreferredPadding"
-        android:layout_marginTop="@dimen/padding_small"
+        android:layout_marginTop="12dp"
         android:gravity="center_vertical"
         android:orientation="horizontal">
 

diff --git a/app/src/main/res/layout/files.xml b/app/src/main/res/layout/files.xml
@@ -43,8 +43,8 @@
                 android:layout_width="36dp"
                 android:layout_height="36dp"
                 android:scaleType="fitCenter"
-                android:src="@drawable/ic_putio_folder"
-                android:tint="@color/primary_text_default_material_light" />
+                android:tint="@color/primary_text_default_material_light"
+                tools:src="@drawable/ic_putio_folder" />
 
             <com.stevenschoen.putionew.AutoResizeTextView
                 android:id="@+id/text_files_currentfolder"

diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
@@ -76,6 +76,12 @@
         <item name="colorPrimaryDark">@color/putio_accent_dark</item>
         <item name="colorAccent">@color/putio_accent</item>
         <item name="android:windowNoTitle">false</item>
+        <item name="windowNoTitle">false</item>
+    </style>
+
+    <style name="Putio.Dialog.NoTitle" parent="Putio.Dialog">
+        <item name="android:windowNoTitle">true</item>
+        <item name="windowNoTitle">false</item>
     </style>
 
     <style name="Putio.Dialog.Alert" parent="Theme.AppCompat.Light.Dialog.Alert">