Skip to content

I
InstiApp
Commit b243951b authored by Varun Patil's avatar Varun Patil
Browse files
Options

Clean up drawables

parent e9f371a5
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 94 deletions
app/src/main/java/app/insti/fragment/MapFragment.java
View file @ b243951b
...@@ -160,10 +160,12 @@ public class MapFragment extends Fragment implements TextWatcher, ...@@ -160,10 +160,12 @@ public class MapFragment extends Fragment implements TextWatcher,
@Override @Override
public void onStart() { public void onStart() {
super.onStart(); super.onStart();
// setContentView(R.layout.activity_main);
// setUpActionBar();
setUpDrawer(); setUpDrawer();
/* Set title */
Toolbar toolbar = getActivity().findViewById(R.id.toolbar);
toolbar.setTitle("InstiMap");
newSmallCard = (LinearLayout) getActivity().findViewById(R.id.new_small_card); newSmallCard = (LinearLayout) getActivity().findViewById(R.id.new_small_card);
slidingLayout = (SlidingUpPanelLayout) getActivity().findViewById(R.id.sliding_layout); slidingLayout = (SlidingUpPanelLayout) getActivity().findViewById(R.id.sliding_layout);
placeNameTextView = (TextView) getActivity().findViewById(R.id.place_name); placeNameTextView = (TextView) getActivity().findViewById(R.id.place_name);
......
app/src/main/res/layout/fragment_map.xml
View file @ b243951b
...@@ -34,7 +34,8 @@ ...@@ -34,7 +34,8 @@
android:paddingTop="8dp" android:paddingTop="8dp"
android:selectAllOnFocus="true" android:selectAllOnFocus="true"
android:singleLine="true" android:singleLine="true"
android:textColor="@color/primaryTextColor" /> android:textColor="@color/primaryTextColor"
android:textColorHint="@color/primaryTextColor"/>
<TextView <TextView
android:id="@+id/settings_title" android:id="@+id/settings_title"
......
app/src/main/res/layout/map/activity_main.xml deleted 100644 → 0
View file @ e9f371a5
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:orientation="vertical"
tools:context=".MyActivity">
<android.support.v7.widget.Toolbar
android:id="@+id/toolbar"
android:layout_width="match_parent"
android:layout_height="?attr/actionBarSize"
android:background="@color/primary"
app:popupTheme="@style/Theme.AppCompat"
app:theme="@style/ToolbarTheme">
<include layout="@layout/actionbar" />
</android.support.v7.widget.Toolbar>
<android.support.v4.widget.DrawerLayout xmlns:android="http://schemas.android.com/apk/res/android"
android:id="@+id/drawer_layout"
android:layout_width="match_parent"
android:layout_height="match_parent">
<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:id="@+id/main_container"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@android:color/darker_gray"
tools:context="com.mrane.campusmap.MainActivity"
tools:ignore="MergeRootFrame">
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:focusable="true"
android:focusableInTouchMode="true"></LinearLayout>
<com.mrane.navigation.SlidingUpPanelLayout xmlns:sothree="http://schemas.android.com/apk/res-auto"
android:id="@+id/sliding_layout"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:gravity="bottom"
sothree:dragView="@+id/dragView"
sothree:panelHeight="0dp"
sothree:paralaxOffset="140dp"
sothree:shadowHeight="4dp">
<!-- MAIN CONTENT -->
<com.mrane.zoomview.CampusMapView
android:id="@+id/campusMapView"
android:layout_width="match_parent"
android:layout_height="fill_parent"
android:paddingTop="48dp" />
<!-- SLIDING LAYOUT -->
<include layout="@layout/card_layout" />
</com.mrane.navigation.SlidingUpPanelLayout>
<RelativeLayout
android:id="@+id/fragment_container"
android:layout_width="match_parent"
android:layout_height="fill_parent"
android:layout_alignParentTop="true"
android:orientation="vertical"></RelativeLayout>
</RelativeLayout>
</android.support.v4.widget.DrawerLayout>
</LinearLayout>
\ No newline at end of file
app/src/main/res/layout/map/activity_map.xml deleted 100644 → 0
View file @ e9f371a5
<?xml version="1.0" encoding="utf-8"?>
<android.support.constraint.ConstraintLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="match_parent"
tools:context=".MapActivity">
<TextView
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="Hello World!"
app:layout_constraintBottom_toBottomOf="parent"
app:layout_constraintLeft_toLeftOf="parent"
app:layout_constraintRight_toRightOf="parent"
app:layout_constraintTop_toTopOf="parent" />
</android.support.constraint.ConstraintLayout>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment