misc

Author: philippschumann

app/src/main/java/com/haayhappen/clockplus/BaseFragment.java

@@ -55,15 +55,4 @@ public void onDestroyView() {
         super.onDestroyView();
         ButterKnife.unbind(this); // Only for fragments!
     }
-
-    /**
-     * Callback invoked when this Fragment is part of a ViewPager and it has been
-     * selected, as indicated by {@link android.support.v4.view.ViewPager.OnPageChangeListener#onPageSelected(int)
-     * onPageSelected(int)}.
-     */
-    public void onPageSelected() {
-        // TODO: Consider making this abstract. The reason it wasn't abstract in the first place
-        // is not all Fragments in our ViewPager need to do things upon being selected. As such,
-        // those Fragments' classes would just end up stubbing this implementation.
-    }
 }

app/src/main/java/com/haayhappen/clockplus/MainActivity.java

@@ -81,7 +81,9 @@ protected void onNewIntent(Intent intent) {
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         if (requestCode == REQUEST_CODE_PICK_LOCATION) {
-            locationPicker.onLocationPicked(PlacePicker.getPlace(this, data));
+            if (data != null) {
+                locationPicker.onLocationPicked(PlacePicker.getPlace(this, data));
+            }
         }
 
 
@@ -168,5 +170,4 @@ public boolean onOptionsItemSelected(MenuItem item) {
         return super.onOptionsItemSelected(item);
     }
 
-
 }

app/src/main/java/com/haayhappen/clockplus/alarms/ui/ExpandedAlarmViewHolder.java

@@ -303,7 +303,7 @@ public void processFinish(String output) {
                 duration.setText(output);
             }
         });
-       
+
         if (!fromText.getText().equals("") && !toText.getText().equals("")) {
             try {
                 asyncTask.execute(fromText.getText().toString(), toText.getText().toString());
@@ -350,6 +350,7 @@ private void bindClearFrom(Alarm alarm) {
 
     private void bindTo(Alarm alarm) {
         toText.setText(alarm.destination().getAdress());
+        setDuration();
     }
 
     private void bindClearTo(Alarm alarm) {

app/src/main/res/layout/item_collapsed_alarm.xml

@@ -17,7 +17,7 @@
 <!-- Wrapped in a LL so the divider is full width.
  The RelativeLayout defines padding for all children, so the
  divider would be padded too. -->
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?selectableItemBackground"
@@ -27,6 +27,8 @@
     AlarmCountdown needing to be anchored to the left of
     the label. -->
     <RelativeLayout
+        android:id="@+id/rl"
+
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:paddingEnd="@dimen/item_padding_end"
@@ -71,23 +73,27 @@
             android:paddingEnd="@dimen/button_text_right_padding"
             android:text="@string/dismiss_now" />
 
-        <ImageView
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignBottom="@id/recurring_days"
-            android:layout_alignParentEnd="true"
-            android:src="@drawable/ic_chevron_down"
-            android:clickable="false"
-            android:focusable="false"
-            android:background="@android:color/transparent"
-            android:padding="8dp" />
+
 
     </RelativeLayout>
 
     <View
+        android:layout_below="@id/rl"
         style="@style/Divider.Horizontal"
         android:layout_marginTop="@dimen/item_margin_between_elements"
         android:layout_marginStart="16dp"
         android:layout_marginEnd="16dp"/>
 
-</LinearLayout>
+    <ImageView
+        android:layout_marginEnd="16dp"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_alignBottom="@id/rl"
+        android:layout_alignParentEnd="true"
+        android:src="@drawable/ic_chevron_down"
+        android:clickable="false"
+        android:focusable="false"
+        android:background="@android:color/transparent"
+        android:padding="8dp" />
+
+</RelativeLayout>