Skip to content

Commit

Permalink
updated skytalks schedule and saturday night lineup
Browse files Browse the repository at this point in the history
  • Loading branch information
shortstack committed Aug 3, 2016
1 parent 95cae02 commit 100d088
Show file tree
Hide file tree
Showing 5 changed files with 7 additions and 4 deletions.
4 changes: 2 additions & 2 deletions hackertracker/src/main/AndroidManifest.xml
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
<manifest xmlns:android="http://schemas.android.com/apk/res/android"
package="com.shortstack.hackertracker"
android:installLocation="auto"
android:versionCode="57"
android:versionName="3.2.8" >
android:versionCode="59"
android:versionName="3.3.0" >

<uses-permission android:name="com.google.android.providers.gsf.permission.READ_GSERVICES"/>
<uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
Expand Down
Binary file modified hackertracker/src/main/assets/hackertracker.sqlite
Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ public class DatabaseAdapter extends SQLiteOpenHelper {

private static String DB_NAME = "hackertracker.sqlite";

private static int DB_VERSION = 330;
private static int DB_VERSION = 332;

private SQLiteDatabase myDataBase;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,7 @@ public View getView(int position, View convertView, ViewGroup parent) {
// if it's the last item, don't underline
} else if (position==data.length-1) {
holder.question.setTypeface(null, Typeface.NORMAL);
holder.question.setTextColor(context.getResources().getColor(R.color.white));
holder.question.setPadding(0,10,0,100);
holder.layout.setBackgroundResource(R.drawable.border_bottom_black);
// if it's an answer, unbold, green underline
Expand Down
4 changes: 3 additions & 1 deletion hackertracker/src/main/res/values/strings.xml
Original file line number Diff line number Diff line change
Expand Up @@ -154,7 +154,7 @@
<string name="radio_text">
Music for Hacking. The DEF CON Year-Round Channel.\n\n
Since 2013, SomaFM has provided the music for the DEF CON Chill room. That theme continues with SomaFM broadcasting this special year-round stream hosted by the DJs who entertain the DEF CON 24 chill room this year in Vegas.\n\n
Check out http://somafm.com/defcon/ to listen online, or download the Android app here: https://play.google.com/store/apps/details?id=com.somafm
Check out http://somafm.com/defcon/ to listen online, or download the Android app here: https://somafm.com/mobile/android.html
</string>

<string name="shuttle_text">
Expand Down Expand Up @@ -227,6 +227,8 @@
<string name="partners_defconparties">Your source of info for PARTIES AT DEF CON! Check them out at @defconparties!\n\n http://twitter.com/defconparties</string>

<string-array name="updates">
<item>08/03/16</item>
<item>Updated Skytalks schedule! Updated DEF CON Saturday night line-up!</item>
<item>08/03/16</item>
<item>Added Capture the Packet, Sheep City, and Packet Detective contests! Check them out in the PHV. Also, DEF CON Radio is now in the menu on the left. :)</item>
<item>08/02/16</item>
Expand Down

0 comments on commit 100d088

Please sign in to comment.