Merge branch 'master' into feature-panoramio-listview-end-autoloading

master
Tomasz Półgrabia 2016-09-11 22:56:52 +02:00
commit b1b5268a17
3 changed files with 18 additions and 4 deletions
app/src/main
java/pl/tpolgrabia/urbanexplorer

View File

@ -47,6 +47,7 @@ public class MainActivity extends ActionBarActivity implements GestureDetector.O
@Override
protected void onCreate(Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
Fabric.with(this, new Crashlytics());
setContentView(R.layout.activity_main);
// Toolbar toolbar = (Toolbar) findViewById(R.id.navbar);
// setSupportActionBar(toolbar);

View File

@ -24,7 +24,14 @@ public class WikiLocationsFragment extends Fragment {
public View onCreateView(LayoutInflater inflater, ViewGroup container,
Bundle savedInstanceState) {
// Inflate the layout for this fragment
return inflater.inflate(R.layout.fragment_wiki_locations, container, false);
View inflatedView = inflater.inflate(R.layout.fragment_wiki_locations, container, false);
inflatedView.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View v) {
throw new RuntimeException("FAKE BUG 2");
}
});
return inflatedView;
}
}

View File

@ -1,13 +1,19 @@
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:orientation="vertical"
android:layout_height="match_parent"
tools:context="pl.tpolgrabia.urbanexplorer.fragments.WikiLocationsFragment">
<!-- TODO: Update blank fragment layout -->
<TextView
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_height="wrap_content"
android:text="@string/hello_blank_fragment"/>
</FrameLayout>
<Button android:id="@+id/crash"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:text="Crash"/>
</LinearLayout>