Skip to content

Commit

Permalink
Beta Release 0.1.0
Browse files Browse the repository at this point in the history
  • Loading branch information
mariogrip committed Nov 3, 2014
1 parent 5f5ea5f commit 834f2c3
Show file tree
Hide file tree
Showing 7 changed files with 14 additions and 22 deletions.
2 changes: 1 addition & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
/.idea/libraries
.DS_Store
/build
*.apk
build/*.apk
*.ap_
*.dex
*.class
Expand Down
Binary file added Beta/0.1.0/OctoDroid-0.1.0-Beta.apk
Binary file not shown.
2 changes: 1 addition & 1 deletion app/build.gradle
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ android {
minSdkVersion 14
targetSdkVersion 20
versionCode 1
versionName "1.0"
versionName "0.1.0"
}
buildTypes {
release {
Expand Down
26 changes: 8 additions & 18 deletions app/src/main/java/com/mariogrip/octodroid/Activity.java
Original file line number Diff line number Diff line change
Expand Up @@ -66,29 +66,17 @@ public class Activity extends ActionBarActivity {

@Override
protected void onCreate(Bundle savedInstanceState) {
//Just for testing, allow network access in the main thread
//NEVER use this is productive code
//StrictMode.ThreadPolicy policy = new StrictMode.
// ThreadPolicy.Builder().permitAll().build();
//StrictMode.setThreadPolicy(policy);


super.onCreate(savedInstanceState);
setContentView(R.layout.nawdraw);


mTitle = mDrawerTitle = getTitle();
nawTitle = getResources().getStringArray(R.array.nawbars);
nawlay = (DrawerLayout) findViewById(R.id.drawer_layout);
nawList = (ListView) findViewById(R.id.left_drawer);
nawList.setAdapter(new ArrayAdapter<String>(this,
R.layout.nawlist, nawTitle));
nawList.setOnItemClickListener(new DrawerItemClickListener());


getActionBar().setDisplayHomeAsUpEnabled(true);
getActionBar().setHomeButtonEnabled(true);

mDrawerToggle = new ActionBarDrawerToggle(
this,
nawlay,
Expand All @@ -111,12 +99,10 @@ public void onDrawerOpened(View drawerView) {
selectItem(0);
}
prefs = PreferenceManager.getDefaultSharedPreferences(Activity.this);

ip = prefs.getString("ip", "localhost");
key = prefs.getString("api", "0");
senderr = prefs.getBoolean("err", true);
push = prefs.getBoolean("push", true);

running = false;
AlertDialog.Builder builder = new AlertDialog.Builder(this);
builder.setTitle("Warning!");
Expand Down Expand Up @@ -345,17 +331,21 @@ protected void onActivityResult(int requestCode, int resultCode, Intent data) {
}
public void onPause(){
super.onPause();
running = false;
timerTask.cancel(); //TODO CRASH NullPointerException
if (running) {
running = false;
timerTask.cancel(); //TODO CRASH NullPointerException
}
}
public void onResume(){
super.onResume();
startrunner();
}
public void onStop(){
super.onStop();
running = false;
timerTask.cancel();
if (running) {
running = false;
timerTask.cancel();
}
}
public void onStart(){
super.onStart();
Expand Down
2 changes: 2 additions & 0 deletions app/src/main/java/com/mariogrip/octodroid/iu/controls.java
Original file line number Diff line number Diff line change
Expand Up @@ -14,6 +14,8 @@

/**
* Created by mariogrip on 31.10.14.
*
* GNU Affero General Public License http://www.gnu.org/licenses/agpl.html
*/
public class controls extends Fragment {

Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/controls.xml
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:textSize="37dp"
android:text="00:00"
android:text="00:00:00"
android:layout_centerHorizontal="true"
android:id="@+id/printTimeControls"
android:layout_below="@id/printTimeControlsText"/>
Expand Down
2 changes: 1 addition & 1 deletion app/src/main/res/layout/status_tab.xml
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@
android:layout_height="wrap_content"
android:textAppearance="?android:attr/textAppearanceLarge"
android:textSize="37dp"
android:text="00:00"
android:text="00:00:00"
android:layout_centerHorizontal="true"
android:id="@+id/textView11_time"
android:layout_below="@id/textView10"/>
Expand Down

0 comments on commit 834f2c3

Please sign in to comment.