- CHG: Changed the height of the image section on the node details view to be more prominent.

sebastian-raubach · sebastian-raubach · commit 27747bca43be · 2017-04-19T14:55:05.000+01:00
- BUG: Fixed sizing of related items on the node details view.
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
diff --git a/.idea/misc.xml b/.idea/misc.xml
diff --git a/app/app-release.apk b/app/app-release.apk
diff --git a/app/build.gradle b/app/build.gradle
@@ -25,13 +25,13 @@ android {
     }
 
     compileSdkVersion 25
-    buildToolsVersion "25.0.0"
+    buildToolsVersion "25.0.2"
     defaultConfig {
         applicationId "uk.ac.hutton.ics.buntata"
         minSdkVersion 16
         targetSdkVersion 25
-        versionCode 9
-        versionName "0.17.04.12"
+        versionCode 10
+        versionName "0.17.04.19"
         multiDexEnabled true
     }
 
@@ -76,12 +76,12 @@ repositories {
 
 dependencies {
     compile fileTree(dir: 'libs', include: ['*.jar'])
-    compile 'com.google.android.gms:play-services-analytics:10.2.0'
-    compile 'com.android.support:appcompat-v7:25.2.0'
-    compile 'com.android.support:recyclerview-v7:25.2.0'
-    compile 'com.android.support:cardview-v7:25.2.0'
-    compile 'com.android.support:design:25.2.0'
-    compile 'com.android.support:palette-v7:25.2.0'
+    compile 'com.google.android.gms:play-services-analytics:10.2.1'
+    compile 'com.android.support:appcompat-v7:25.3.1'
+    compile 'com.android.support:recyclerview-v7:25.3.1'
+    compile 'com.android.support:cardview-v7:25.3.1'
+    compile 'com.android.support:design:25.3.1'
+    compile 'com.android.support:palette-v7:25.3.1'
     compile 'com.squareup.picasso:picasso:2.5.2'
     compile 'com.heinrichreimersoftware:material-intro:1.6'
     compile 'me.relex:circleindicator:1.2.1@aar'
diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
@@ -59,6 +59,10 @@
 				<data
 					android:host="bunta.ta"
 					android:scheme="http"/>
+				<data
+					android:host="ics.hutton.ac.uk"
+					android:scheme="https"
+					android:pathPrefix="/resources/roadshow-staff/"/>
 			</intent-filter>
 		</activity>
 		<activity android:name=".activity.AboutActivity"/>
diff --git a/app/src/main/java/uk/ac/hutton/ics/buntata/activity/NodeDetailsActivity.java b/app/src/main/java/uk/ac/hutton/ics/buntata/activity/NodeDetailsActivity.java
@@ -184,6 +184,10 @@ else if (args != null)
 			appBarLayout.setFitsSystemWindows(false);
 		}
 
+		float heightDp = getResources().getDisplayMetrics().heightPixels / 1.5f;
+		CoordinatorLayout.LayoutParams lp = (CoordinatorLayout.LayoutParams) appBarLayout.getLayoutParams();
+		lp.height = (int) heightDp;
+
 		/* Get all the attributes */
 		List<BuntataAttributeValueAdvanced> attributeValues = new AttributeValueManager(this, datasourceId).getForNode(nodeId);
 
diff --git a/app/src/main/java/uk/ac/hutton/ics/buntata/adapter/NodeAdapter.java b/app/src/main/java/uk/ac/hutton/ics/buntata/adapter/NodeAdapter.java
@@ -161,13 +161,14 @@ public void onBindViewHolder(final ViewHolder holder, int position)
 		{
 			holder.image.setTransitionName(context.getString(R.string.transition_node_view));
 		}
-//		else
-//		{
-//			viewWidth = context.getResources().getDimensionPixelSize(R.dimen.node_image_height) / 2;
-//			holder.image.setMaxHeight(viewWidth);
-//			holder.image.setMaxWidth(viewWidth);
-//			holder.layout.getLayoutParams().width = viewWidth;
-//		}
+		/* If this is within the NodeDetailsActivity, then restrict the size of the items */
+		if (context instanceof NodeDetailsActivity)
+		{
+			viewWidth = context.getResources().getDimensionPixelSize(R.dimen.node_image_height) / 2;
+			holder.image.setMaxHeight(viewWidth);
+			holder.image.setMaxWidth(viewWidth);
+			holder.layout.getLayoutParams().width = viewWidth;
+		}
 
 		holder.image.setMinimumHeight(viewWidth);
 
diff --git a/app/src/main/java/uk/ac/hutton/ics/buntata/database/manager/NodeManager.java b/app/src/main/java/uk/ac/hutton/ics/buntata/database/manager/NodeManager.java
@@ -138,7 +138,7 @@ public List<BuntataNodeAdvanced> getSimilarNodes(int sourceId)
 		{
 			open();
 
-			Cursor cursor = database.rawQuery("SELECT * FROM nodes WHERE EXISTS (SELECT 1 FROM similarities WHERE (similarities.node_a_id = nodes.id AND similarities.node_b_id = ?) OR (similarities.node_b_id = nodes.id AND similarities.node_a_id = ?)) ORDER BY nodes.name", new String[]{Integer.toString(sourceId), Integer.toString(sourceId)});
+			Cursor cursor = database.rawQuery("SELECT * FROM nodes WHERE EXISTS (SELECT 1 FROM similarities WHERE (similarities.node_a_id = ? AND similarities.node_b_id = nodes.id)) ORDER BY nodes.name", new String[]{Integer.toString(sourceId)});
 			cursor.moveToFirst();
 			while (!cursor.isAfterLast())
 			{
diff --git a/app/src/main/res/drawable/ahdb.png b/app/src/main/res/drawable/ahdb.png
diff --git a/app/src/main/res/layout/fragment_node.xml b/app/src/main/res/layout/fragment_node.xml
@@ -31,7 +31,6 @@
 		android:text="@string/node_instructions"/>
 
 	<android.support.v7.widget.RecyclerView
-		xmlns:android="http://schemas.android.com/apk/res/android"
 		android:id="@+id/node_recycler_view"
 		android:layout_width="match_parent"
 		android:layout_height="match_parent"
diff --git a/app/src/main/res/raw/changelog.xml b/app/src/main/res/raw/changelog.xml
@@ -17,6 +17,10 @@
   -->
 
 <changelog bulletedList="true">
+	<changelogversion versionName="0.17.04.19" changeDate="19/04/2017">
+		<changelogimprovement>Changed the height of the image section on the node details view to be more prominent.</changelogimprovement>
+		<changelogbug>Fixed sizing of related items on the node details view.</changelogbug>
+	</changelogversion>
 	<changelogversion versionName="0.17.04.12" changeDate="12/04/2017">
 		<changelogimprovement>Added data source update check to notify when an update is available.</changelogimprovement>
 		<changelogtext>Updated acknowledgements and team views.</changelogtext>
diff --git a/app/src/main/res/values-de/strings.xml b/app/src/main/res/values-de/strings.xml
@@ -46,7 +46,7 @@
 	<string name="generic_show">Anzeigen</string>
 	<string name="datasource_size">Mediengröße: ~%1$.1f MB (~%2$.1f MB)</string>
 	<string name="snackbar_already_downloaded">Datenquelle bereits heruntergeladen.</string>
-	<string name="snackbar_only_one_download">Nur ein Download auf einmal erlaubt.</string>
+	<string name="snackbar_only_one_download">Nur ein Download auf einmal möglich.</string>
 	<string name="snackbar_currently_downloading">Datenquelle wird gerade heruntergeladen.</string>
 	<string name="snackbar_download_successful">Datenquelle erfolgreich heruntergeladen.</string>
 	<string name="snackbar_download_unsuccessful">Fehler beim Download der Datenquelle.</string>
@@ -118,7 +118,7 @@
 	<string name="preferences_columns_portrait_summary">Anzahl Spalten im Hochformat: %1$d</string>
 	<string name="preferences_columns_landscape_title">Spalten im Querformat</string>
 	<string name="preferences_columns_landscape_summary">Anzahl Spalten im Querformat: %1$d</string>
-	<string name="preferences_ga_opt_out_title">Teilen von Statistiken</string>
+	<string name="preferences_ga_opt_out_title">Anonyme Nutzungsstatistiken senden</string>
 	<string name="preferences_ga_opt_out_message">Wir werden diese Informationen nur zur Analyse und Verbesserung der durch diese App angebotenen
 		Dienste verwenden. Mehr Informationen befinden sich in der EULA.
 	</string>
@@ -128,7 +128,8 @@
 	<string name="toast_datasource_not_found">Angeforderte Datenquellen nicht gefunden.</string>
 	<string name="toast_node_not_found">Angefordertes Element nicht gefunden.</string>
 	<string name="team_others_title">Andere</string>
-	<string name="team_others_name">Zusätzlich möchten wir uns bei John Jones, Ian Toth, Jennie Brierley, Alison Lees, Graham Cowan und Sonia Humphris
-		für ihre Hilfe beim Organizieren der Kartoffeldaten und -bilder bedanken.
+	<string name="team_others_name">Wir möchten uns bei John Jones, Ian Toth, Jennie Brierley, Alison Lees, Graham Cowan und Sonia Humphris für ihre
+		Hilfe beim Organizieren der Kartoffeldaten und -bilder bedanken. Zusätzlich würdigen wir die Bilder und Informationen die von Danny Coyne und
+		Sue Hockland bereitgestellt wurden.
 	</string>
 </resources>
diff --git a/app/src/main/res/values/strings.xml b/app/src/main/res/values/strings.xml
@@ -71,7 +71,7 @@
 	<string name="datasource_size">Media size: ~%1$.1f MB (~%2$.1f MB)</string>
 
 	<string name="snackbar_already_downloaded">Data source already downloaded.</string>
-	<string name="snackbar_only_one_download">Only one download at a time allowed.</string>
+	<string name="snackbar_only_one_download">Only one download at a time possible.</string>
 	<string name="snackbar_currently_downloading">Data source download in progress.</string>
 	<string name="snackbar_download_successful">Data source downloaded successfully.</string>
 	<string name="snackbar_download_unsuccessful">Data source download failed.</string>
@@ -138,8 +138,9 @@
 	<string name="network_intro_button_refresh">Refresh</string>
 
 	<string name="team_others_title">Others</string>
-	<string name="team_others_name">In addition, we would like to thank John Jones, Ian Toth, Jennie Brierley, Alison Lees, Graham Cowan and Sonia
-		Humphris for their help in getting the underlying potato dataset and images brought together and assembled.
+	<string name="team_others_name">We would like to thank John Jones, Ian Toth, Jennie Brierley, Alison Lees, Graham Cowan and Sonia Humphris for
+		their help in getting the underlying potato dataset and images brought together and assembled. In addition, we appreciate the images and
+		information provided by Danny Coyne and Sue Hockland.
 	</string>
 
 	<string name="eula_intro_select">In order to use Buntata we need you to agree to one of our End User Licence Agreements (EULA). We have a EULA for
@@ -169,7 +170,7 @@
 
 	<string name="node_details_similar_nodes">Similar items</string>
 
-	<string name="preferences_ga_opt_out_title">Share statistics</string>
+	<string name="preferences_ga_opt_out_title">Send anonymous usage statistics</string>
 	<string name="preferences_ga_opt_out_message">We will only use this info to analyse and improve the services offered through this app. For more
 		details see our EULA.
 	</string>

Original file line number	Diff line number	Diff line change
`@@ -184,6 +184,10 @@ else if (args != null)`
`184`	`184`	`appBarLayout.setFitsSystemWindows(false);`
`185`	`185`	`}`
`186`	`186`
	`187`	`+ float heightDp = getResources().getDisplayMetrics().heightPixels / 1.5f;`
	`188`	`+ CoordinatorLayout.LayoutParams lp = (CoordinatorLayout.LayoutParams) appBarLayout.getLayoutParams();`
	`189`	`+ lp.height = (int) heightDp;`
	`190`	`+`
`187`	`191`	`/* Get all the attributes */`
`188`	`192`	`List<BuntataAttributeValueAdvanced> attributeValues = new AttributeValueManager(this, datasourceId).getForNode(nodeId);`
`189`	`193`
Original file line number	Diff line number	Diff line change
`@@ -138,7 +138,7 @@ public List<BuntataNodeAdvanced> getSimilarNodes(int sourceId)`
`138`	`138`	`{`
`139`	`139`	`open();`
`140`	`140`
`141`		`- Cursor cursor = database.rawQuery("SELECT * FROM nodes WHERE EXISTS (SELECT 1 FROM similarities WHERE (similarities.node_a_id = nodes.id AND similarities.node_b_id = ?) OR (similarities.node_b_id = nodes.id AND similarities.node_a_id = ?)) ORDER BY nodes.name", new String[]{Integer.toString(sourceId), Integer.toString(sourceId)});`
	`141`	`+ Cursor cursor = database.rawQuery("SELECT * FROM nodes WHERE EXISTS (SELECT 1 FROM similarities WHERE (similarities.node_a_id = ? AND similarities.node_b_id = nodes.id)) ORDER BY nodes.name", new String[]{Integer.toString(sourceId)});`
`142`	`142`	`cursor.moveToFirst();`
`143`	`143`	`while (!cursor.isAfterLast())`
`144`	`144`	`{`