Style mods

Author: shvelo

build.gradle

@@ -3,7 +3,7 @@ buildscript {
         mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:0.13.+'
+        classpath 'com.android.tools.build:gradle:1.0.+'
     }
 }
 
@@ -12,7 +12,7 @@ repositories {
 }
 
 task wrapper(type: Wrapper) {
-    gradleVersion = '2.1'
+    gradleVersion = '2.2'
 }
 
 apply plugin: 'com.android.application'
@@ -25,12 +25,12 @@ dependencies {
 
 android {
     defaultConfig {
-        versionCode 21
-        versionName "2.5.0"
+        versionCode 22
+        versionName "2.6.0"
     }
 
     compileSdkVersion 21
-    buildToolsVersion "21.0.2"
+    buildToolsVersion "21.1.1"
 
     lintOptions {
       abortOnError false
@@ -44,8 +44,7 @@ android {
     buildTypes {
         release {
             debuggable false
-            runProguard false
-            proguardFile file('proguard.cfg')
+            minifyEnabled false
         }
     }
 

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Sun Oct 26 19:24:09 GET 2014
+#Mon Dec 08 04:45:09 GET 2014
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=http\://services.gradle.org/distributions/gradle-2.1-all.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-2.2.1-all.zip

res/layout/activity_schedule.xml

@@ -5,6 +5,15 @@
   android:orientation="vertical"
   android:layout_width="match_parent"
   android:layout_height="match_parent">
+    <TextView
+        android:id="@+id/nothing_found"
+        android:layout_width="fill_parent"
+        android:layout_height="wrap_content"
+        style="@style/BusListText"
+        android:gravity="center"
+        android:visibility="gone"
+        android:text="@string/nothing_found"/>
+
     <ListView android:id="@+id/busSchedule"
         android:layout_width="match_parent"
         android:layout_weight="1"

res/layout/bus_info.xml

@@ -3,36 +3,36 @@
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     style="@style/BusListItem"
     android:layout_width="fill_parent"
-    android:layout_height="fill_parent"
+    android:layout_height="50dp"
     android:orientation="horizontal" >
 
     <TextView android:id="@+id/busNumber"
-        style="@style/BusListText"
-        android:gravity="left"
+        style="@style/BusListText.Number"
+        android:gravity="center"
         android:singleLine="true"
         android:layout_width="0dip"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical|left"
+        android:layout_height="fill_parent"
+        android:layout_gravity="center_vertical"
         android:ellipsize="none"
         android:layout_weight="2"/>
     <TextView android:id="@+id/busDestination"
-        style="@style/BusListText"
+        style="@style/BusListText.Destination"
         android:singleLine="true"
         android:ellipsize="marquee"
         android:marqueeRepeatLimit ="marquee_forever"
         android:layout_width="0dip"
-        android:layout_height="wrap_content"
+        android:layout_height="fill_parent"
         android:scrollHorizontally="true"
         android:gravity="center"
-        android:layout_gravity="center"
+        android:layout_gravity="center_vertical"
         android:layout_weight="5"/>
     <TextView android:id="@+id/busArrival"
-        style="@style/BusListText"
-        android:gravity="right"
+        style="@style/BusListText.Arrival"
+        android:gravity="center"
         android:singleLine="true"
         android:layout_width="0dip"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center_vertical|right"
+        android:layout_height="fill_parent"
+        android:layout_gravity="center_vertical"
         android:ellipsize="none"
         android:layout_weight="2" />
 

res/values/style_buslist.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <style name="BusListItem">
+        <item name="android:layout_marginBottom">2dp</item>
+    </style>
+    <style name="BusListText">
+        <item name="android:padding">10dp</item>
+        <item name="android:textSize">16sp</item>
+        <item name="android:textColor">#2d2d2d</item>
+    </style>
+    <style name="BusListText.Number">
+        <item name="android:background">#f2b707</item>
+        <item name="android:textColor">#ffffff</item>
+        <item name="android:textSize">20sp</item>
+        <item name="android:textStyle">bold</item>
+    </style>
+    <style name="BusListText.Arrival">
+    </style>
+    <style name="BusListText.Destination">
+    </style>
+</resources>

res/values/styles.xml

@@ -2,13 +2,13 @@
 
 import android.os.AsyncTask;
 import android.os.Bundle;
+import android.os.Handler;
 import android.support.v7.app.ActionBar;
 import android.support.v7.app.ActionBarActivity;
 import android.view.Menu;
 import android.view.MenuItem;
+import android.view.View;
 import android.widget.ListView;
-import java.lang.Runnable;
-import android.os.Handler;
 
 import com.google.android.gms.ads.AdRequest;
 import com.google.android.gms.ads.AdView;
@@ -156,9 +156,7 @@ protected Void doInBackground(Void... voids) {
             } catch (Exception e) {
                 e.printStackTrace();
             }
-            if(newBusList.size() == 0 && busList.size() == 0)
-                busList.add(new BusInfo(0, getResources().getString(R.string.nothing_found), 0));
-            else if(newBusList.size() > 0) {
+            if(newBusList.size() > 0) {
                 busList = newBusList;
             }
             return null;
@@ -167,6 +165,11 @@ else if(newBusList.size() > 0) {
         @Override
         protected void onPostExecute(Void result) {
             adapter.update(busList);
+            if(busList.size() == 0) {
+                findViewById(R.id.nothing_found).setVisibility(View.VISIBLE);
+            } else {
+                findViewById(R.id.nothing_found).setVisibility(View.GONE);
+            }
         }
     }
 

src/com/tbilisi/bus/ScheduleActivity.java

@@ -60,7 +60,7 @@ public View getView(int i, View convertView, ViewGroup viewGroup) {
         busDestination.setTypeface(A.typeface);
         busArrival.setTypeface(A.typeface);
 
-        busNumber.setText("№" + String.valueOf(item.number));
+        busNumber.setText(String.valueOf(item.number));
         busDestination.setText(item.destination);
         busArrival.setText(String.valueOf(item.arrival) + "წთ");