-
Notifications
You must be signed in to change notification settings - Fork 11
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
- Loading branch information
Showing
14 changed files
with
420 additions
and
596 deletions.
There are no files selected for viewing
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Large diffs are not rendered by default.
Oops, something went wrong.
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
47 changes: 10 additions & 37 deletions
47
...control_app/src/main/java/com/robotca/ControlApp/Fragments/AboutFragmentRobotChooser.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,69 +1,42 @@ | ||
| package com.robotca.ControlApp.Fragments; | ||
|
|
||
| import android.annotation.SuppressLint; | ||
| import android.os.Bundle; | ||
| import android.support.v4.app.Fragment; | ||
| import android.text.Html; | ||
| import android.view.LayoutInflater; | ||
| import android.view.View; | ||
| import android.view.ViewGroup; | ||
| import android.webkit.WebView; | ||
| import android.widget.TextView; | ||
|
|
||
| import com.robotca.ControlApp.Core.Utils; | ||
| import com.robotca.ControlApp.R; | ||
|
|
||
| import java.io.ByteArrayOutputStream; | ||
| import java.io.IOException; | ||
| import java.io.InputStream; | ||
|
|
||
| /** | ||
| * About Fragment for the Robot Chooser screen. | ||
| * | ||
| * Created by Kenneth Spear on 3/15/16. | ||
| */ | ||
| public class AboutFragmentRobotChooser extends Fragment { | ||
|
|
||
| public AboutFragmentRobotChooser() { | ||
|
|
||
| } | ||
| /** | ||
| * Default Constructor. | ||
| */ | ||
| public AboutFragmentRobotChooser() {} | ||
|
|
||
| /** | ||
| * Called when the activity is created. | ||
| */ | ||
| @Override | ||
| public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) { | ||
|
|
||
| View view = inflater.inflate(R.layout.fragment_about, null); | ||
| @SuppressLint("InflateParams") View view = inflater.inflate(R.layout.fragment_about, null); | ||
|
|
||
| // TextView aboutTxt = (TextView) view.findViewById(R.id.abouttxt); | ||
| // aboutTxt.setText(Html.fromHtml(readTxt())); | ||
| WebView webView = (WebView) view.findViewById(R.id.abouttxt); | ||
| webView.loadData(readTxt(), "text/html", null); | ||
| webView.loadData(Utils.readText(getActivity(), R.raw.about), "text/html", null); | ||
|
|
||
| return view; | ||
|
|
||
|
|
||
| } | ||
|
|
||
| private String readTxt() { | ||
|
|
||
| InputStream inputStream = getResources().openRawResource(R.raw.about); | ||
|
|
||
| ByteArrayOutputStream byteArrayOutputStream = new ByteArrayOutputStream(); | ||
|
|
||
| int i; | ||
| try { | ||
| i = inputStream.read(); | ||
| while (i != -1) { | ||
| byteArrayOutputStream.write(i); | ||
| i = inputStream.read(); | ||
| } | ||
| inputStream.close(); | ||
| } | ||
| catch (IOException e) { | ||
|
|
||
| e.printStackTrace(); | ||
| } | ||
|
|
||
| return byteArrayOutputStream.toString(); | ||
|
|
||
| } | ||
| } | ||
|
|
25 changes: 0 additions & 25 deletions
25
src/android_foo/control_app/src/main/res/layout-land/fragment_overview.xml
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,45 +1,20 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
| xmlns:tools="http://schemas.android.com/tools" | ||
| android:layout_width="fill_parent" | ||
| android:layout_height="fill_parent" | ||
| android:orientation="vertical" | ||
| android:baselineAligned="false"> | ||
|
|
||
| <!--<LinearLayout--> | ||
| <!--android:layout_width="0dp"--> | ||
| <!--android:layout_height="fill_parent"--> | ||
| <!--android:layout_weight="1"--> | ||
| <!--android:orientation="vertical"--> | ||
| <!--android:weightSum="2">--> | ||
|
|
||
| <!--<FrameLayout--> | ||
| <!--android:id="@+id/hud_fragment_placeholder"--> | ||
| <!--android:layout_width="match_parent"--> | ||
| <!--android:layout_height="wrap_content"/>--> | ||
|
|
||
| <org.ros.android.view.RosImageView | ||
| android:id="@+id/camera_view" | ||
| android:layout_width="fill_parent" | ||
| android:layout_height="0dp" | ||
| android:layout_weight="1"/> | ||
|
|
||
| <!--<fragment android:name="com.robotca.ControlApp.Fragments.LaserScanFragment"--> | ||
| <!--android:id="@+id/laser_scan_fragment"--> | ||
| <!--android:layout_width="fill_parent"--> | ||
| <!--android:layout_height="fill_parent"--> | ||
| <!--android:layout_weight="1"--> | ||
| <!--tools:layout="@layout/laser_scan_view" />--> | ||
| <FrameLayout | ||
| android:id="@+id/laser_scan_placeholder" | ||
| android:layout_width="fill_parent" | ||
| android:layout_height="0dp" | ||
| android:layout_weight="1"/> | ||
| <!--<org.ros.android.view.visualization.VisualizationView--> | ||
| <!--android:id="@+id/viz_view"--> | ||
| <!--android:layout_width="fill_parent"--> | ||
| <!--android:layout_height="fill_parent"--> | ||
| <!--android:layout_weight="1" />--> | ||
|
|
||
| <!--</LinearLayout>--> | ||
| </LinearLayout> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.