Browse Source

Project cleanup? Launch icon changed

Martin Herbers 4 years ago
parent
commit
d05cfb6189
57 changed files with 25 additions and 465 deletions
  1. 0 1
      app/src/main/AndroidManifest.xml
  2. 0 3
      app/src/main/java/de/tu_darmstadt/informatik/tk/olir/DrawView.java
  3. 11 21
      app/src/main/java/de/tu_darmstadt/informatik/tk/olir/HistoryActivity.java
  4. 0 157
      app/src/main/java/de/tu_darmstadt/informatik/tk/olir/MainActivity.java
  5. 0 5
      app/src/main/java/de/tu_darmstadt/informatik/tk/olir/ObjectsActivity.java
  6. 0 17
      app/src/main/java/de/tu_darmstadt/informatik/tk/olir/Parser.java
  7. 0 4
      app/src/main/java/de/tu_darmstadt/informatik/tk/olir/ResultActivity.java
  8. 0 40
      app/src/main/java/de/tu_darmstadt/informatik/tk/olir/SettingsActivity.java
  9. BIN
      app/src/main/offline_launch_icon-web.png
  10. BIN
      app/src/main/offline_launch_icons-web.png
  11. BIN
      app/src/main/res/drawable-hdpi/ic_menu_white_48dp.png
  12. BIN
      app/src/main/res/drawable-mdpi/ic_menu_white_48dp.png
  13. BIN
      app/src/main/res/drawable-xhdpi/ic_menu_white_48dp.png
  14. BIN
      app/src/main/res/drawable-xxhdpi/ic_menu_white_48dp.png
  15. BIN
      app/src/main/res/drawable-xxxhdpi/ic_menu_white_48dp.png
  16. BIN
      app/src/main/res/drawable-xxxhdpi/vorschl1.PNG
  17. 0 45
      app/src/main/res/layout/activity_main.xml
  18. 10 5
      app/src/main/res/layout/activity_objects.xml
  19. 0 91
      app/src/main/res/layout/activity_settings.xml
  20. 0 4
      app/src/main/res/menu/drawer.xml
  21. 1 1
      app/src/main/res/mipmap-anydpi-v26/offline_launch_icons.xml
  22. 1 1
      app/src/main/res/mipmap-anydpi-v26/offline_launch_icons_round.xml
  23. BIN
      app/src/main/res/mipmap-hdpi/ic_launcher.png
  24. BIN
      app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png
  25. BIN
      app/src/main/res/mipmap-hdpi/offline_icon.png
  26. BIN
      app/src/main/res/mipmap-hdpi/offline_launch_icons.png
  27. BIN
      app/src/main/res/mipmap-hdpi/offline_launch_icons_round.png
  28. BIN
      app/src/main/res/mipmap-mdpi/ic_launcher.png
  29. BIN
      app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png
  30. BIN
      app/src/main/res/mipmap-mdpi/offline_icon.png
  31. BIN
      app/src/main/res/mipmap-mdpi/offline_launch_icons.png
  32. BIN
      app/src/main/res/mipmap-mdpi/offline_launch_icons_round.png
  33. BIN
      app/src/main/res/mipmap-xhdpi/ic_launcher.png
  34. BIN
      app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png
  35. BIN
      app/src/main/res/mipmap-xhdpi/offline_icon.png
  36. BIN
      app/src/main/res/mipmap-xhdpi/offline_launch_icons.png
  37. BIN
      app/src/main/res/mipmap-xhdpi/offline_launch_icons_round.png
  38. BIN
      app/src/main/res/mipmap-xxhdpi/ic_launcher.png
  39. BIN
      app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png
  40. BIN
      app/src/main/res/mipmap-xxhdpi/offline_icon.png
  41. BIN
      app/src/main/res/mipmap-xxhdpi/offline_launch_icons.png
  42. BIN
      app/src/main/res/mipmap-xxhdpi/offline_launch_icons_round.png
  43. BIN
      app/src/main/res/mipmap-xxxhdpi/ic_launcher.png
  44. BIN
      app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png
  45. 0 0
      app/src/main/res/mipmap-xxxhdpi/load.png
  46. BIN
      app/src/main/res/mipmap-xxxhdpi/offline_icon.png
  47. BIN
      app/src/main/res/mipmap-xxxhdpi/offline_launch_icons.png
  48. BIN
      app/src/main/res/mipmap-xxxhdpi/offline_launch_icons_round.png
  49. BIN
      app/src/main/res/mipmap-xxxhdpi/rotate.png
  50. BIN
      app/src/main/res/mipmap-xxxhdpi/rotate90.png
  51. BIN
      app/src/main/res/mipmap-xxxhdpi/rotation.png
  52. BIN
      app/src/main/res/mipmap-xxxhdpi/temp_falling.png
  53. BIN
      app/src/main/res/mipmap-xxxhdpi/temp_rising.png
  54. BIN
      app/src/main/res/mipmap-xxxhdpi/temperature.png
  55. 1 1
      app/src/main/res/values/ic_launcher_background.xml
  56. 1 1
      build.gradle
  57. 0 68
      import-summary.txt

+ 0 - 1
app/src/main/AndroidManifest.xml

@@ -25,7 +25,6 @@
         </activity>
         <activity android:name=".ReadingActivity" />
         <activity android:name=".ResultActivity" />
-        <activity android:name=".SettingsActivity"></activity>
     </application>
 
 </manifest>

+ 0 - 3
app/src/main/java/de/tu_darmstadt/informatik/tk/olir/DrawView.java

@@ -1,17 +1,14 @@
 package de.tu_darmstadt.informatik.tk.olir;
 
 import android.content.Context;
-import android.content.res.Resources;
 import android.graphics.Canvas;
 import android.graphics.Color;
 import android.graphics.Paint;
 import android.os.Handler;
-import android.support.annotation.RequiresPermission;
 import android.util.AttributeSet;
 import android.util.TypedValue;
 import android.view.MotionEvent;
 import android.view.View;
-import android.view.ViewGroup;
 
 import java.util.ArrayList;
 

+ 11 - 21
app/src/main/java/de/tu_darmstadt/informatik/tk/olir/HistoryActivity.java

@@ -126,14 +126,20 @@ public class HistoryActivity extends AppCompatActivity {
 
             Drawable drawable;
 
-            if (name.toLowerCase().contains("weight")) {
-                drawable = getResources().getDrawable(R.mipmap.weight);
+            if (name.toLowerCase().contains("load")) {
+                drawable = getResources().getDrawable(R.mipmap.load);
             } else if (name.toLowerCase().contains("temperature")) {
-                drawable = getResources().getDrawable(R.mipmap.temperature);
+                if (name.toLowerCase().contains("rising")) {
+                    drawable = getResources().getDrawable(R.mipmap.temp_rising);
+                } else {
+                    drawable = getResources().getDrawable(R.mipmap.temp_falling);
+                }
             } else if (name.toLowerCase().contains("acceleration")) {
                 drawable = getResources().getDrawable(R.mipmap.acceleration);
             } else if (name.toLowerCase().contains("tilt")) {
-                drawable = getResources().getDrawable(R.mipmap.rotation);
+                drawable = getResources().getDrawable(R.mipmap.rotate90);
+            } else if (name.toLowerCase().contains("flip")) {
+                drawable = getResources().getDrawable(R.mipmap.rotate);
             } else if (name.toLowerCase().contains("squeeze")) {
                 drawable = getResources().getDrawable(R.mipmap.pressure);
             } else {
@@ -149,17 +155,6 @@ public class HistoryActivity extends AppCompatActivity {
             row.addView(textView);
 
 
-        /*    TextView result = new TextView(this);
-            result.setText("Result: Test");
-            result.setTextSize(16);
-            result.setGravity(Gravity.RIGHT);
-            TableRow.LayoutParams params2 = new TableRow.LayoutParams(TableRow.LayoutParams.WRAP_CONTENT, TableRow.LayoutParams.WRAP_CONTENT);
-            params2.weight = 1;
-            params2.gravity = Gravity.TOP;
-            result.setLayoutParams(params2);
-            row.addView(result);*/
-
-
             try {
                 SimpleDateFormat sdf = new SimpleDateFormat("yyyyMMddhhmmss");
                 Date date = sdf.parse(time);
@@ -200,11 +195,6 @@ public class HistoryActivity extends AppCompatActivity {
     }
 
 
-    public void addObject(View view) {
-        Intent intent = new Intent(this, ObjectsActivity.class);
-        startActivity(intent);
-    }
-
     @Override
     public boolean onKeyDown(int keyCode, KeyEvent event)  {
         if (keyCode == KeyEvent.KEYCODE_BACK
@@ -219,7 +209,7 @@ public class HistoryActivity extends AppCompatActivity {
 
     public void openHistoryEntry(View view) {
         TableRow row = (TableRow) view;
-        int index = Integer.valueOf((Integer) row.getTag());
+        int index = (Integer) row.getTag();
         String line = lines.get(index);
         String date = line.substring(0, line.indexOf("|"));
         line = line.substring(line.indexOf("|") + 1);

+ 0 - 157
app/src/main/java/de/tu_darmstadt/informatik/tk/olir/MainActivity.java

@@ -1,157 +0,0 @@
-package de.tu_darmstadt.informatik.tk.olir;
-
-import android.content.ContextWrapper;
-import android.content.Intent;
-import android.graphics.Color;
-import android.support.v7.app.AppCompatActivity;
-import android.os.Bundle;
-import android.view.KeyEvent;
-import android.view.Menu;
-import android.view.MenuInflater;
-import android.view.MenuItem;
-import android.view.View;
-import android.widget.LinearLayout;
-import android.widget.TableLayout;
-import android.widget.TableRow;
-import android.widget.TextView;
-
-import java.io.BufferedReader;
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.IOException;
-import java.io.InputStreamReader;
-import java.io.OutputStreamWriter;
-import java.util.ArrayList;
-
-
-public class MainActivity extends AppCompatActivity {
-
-    private ArrayList<String> lines;
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_main);
-
-        getSupportActionBar().setTitle("Previous Sensors");
-
-        parseHistory();
-    }
-
-    @Override
-    public boolean onCreateOptionsMenu(Menu menu) {
-        MenuInflater inflater = getMenuInflater();
-        inflater.inflate(R.menu.menu, menu);
-        return true;
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-
-        if (item.getItemId() == R.id.clear_history) {
-            try {
-                OutputStreamWriter writer = new OutputStreamWriter(openFileOutput("history.txt", MODE_PRIVATE));
-                String content = "";
-                writer.write(content);
-                writer.flush();
-                writer.close();
-            } catch (FileNotFoundException e) {
-                e.printStackTrace();
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-            TableLayout table = findViewById(R.id.tableLayout);
-            table.removeAllViews();
-        }
-
-        return true;
-    }
-
-    private void parseHistory() {
-        lines = new ArrayList<>();
-        ContextWrapper cw = new ContextWrapper(this);
-        File file = new File(cw.getFilesDir(), "history.txt");
-
-        TableLayout table = findViewById(R.id.tableLayout);
-
-        try {
-            if (file.exists()) {
-                FileInputStream is = new FileInputStream(file);
-
-                BufferedReader reader = new BufferedReader(new InputStreamReader(is));
-                String line = reader.readLine();
-                while (line != null) {
-                    lines.add(line);
-
-                    line = reader.readLine();
-                }
-            }
-        } catch (FileNotFoundException e) {
-            e.printStackTrace();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
-        for (int i = lines.size()-1; i >= 0; i--) {
-            String line = lines.get(i);
-
-            String name = line.substring(line.indexOf("|")+1);
-            name = name.substring(0, name.indexOf("|"));
-
-            TableRow row = new TableRow(this);
-            row.setPadding(10,30,10,30);
-            row.setTag(i);
-            row.setOnClickListener(new View.OnClickListener() {
-                @Override
-                public void onClick(View v) {
-                    openHistoryEntry(v);
-                }
-            });
-            TextView textView = new TextView(this);
-            textView.setText(name);
-            textView.setTextSize(20);
-            row.addView(textView);
-            table.addView(row);
-
-            View v = new View(this);
-            v.setLayoutParams(new LinearLayout.LayoutParams(
-                    LinearLayout.LayoutParams.MATCH_PARENT,
-                    2
-            ));
-            v.setBackgroundColor(Color.parseColor("#000000"));
-            table.addView(v);
-        }
-    }
-
-
-    public void addObject(View view) {
-        Intent intent = new Intent(this, ObjectsActivity.class);
-        startActivity(intent);
-    }
-
-    @Override
-    public boolean onKeyDown(int keyCode, KeyEvent event)  {
-        if (keyCode == KeyEvent.KEYCODE_BACK
-                && event.getRepeatCount() == 0) {
-            this.finishAffinity();
-            return true;
-        }
-        return super.onKeyDown(keyCode, event);
-    }
-
-    public void openHistoryEntry(View view) {
-        TableRow row = (TableRow) view;
-        int index = Integer.valueOf((Integer) row.getTag());
-        String line = lines.get(index);
-        String date = line.substring(0, line.indexOf("|"));
-        line = line.substring(line.indexOf("|") + 1);
-        String name = line.substring(0, line.indexOf("|"));
-        String result = line.substring(line.indexOf("|") + 1);
-
-        Intent intent = new Intent(this, ResultActivity.class);
-        intent.putExtra("time", date);
-        intent.putExtra("name", name);
-        intent.putExtra("result", Boolean.parseBoolean(result));
-        startActivity(intent);
-    }
-}

+ 0 - 5
app/src/main/java/de/tu_darmstadt/informatik/tk/olir/ObjectsActivity.java

@@ -8,8 +8,6 @@ import android.support.v4.view.GravityCompat;
 import android.support.v4.widget.DrawerLayout;
 import android.support.v7.app.AppCompatActivity;
 import android.view.KeyEvent;
-import android.view.Menu;
-import android.view.MenuInflater;
 import android.view.MenuItem;
 import android.view.View;
 
@@ -45,9 +43,6 @@ public class ObjectsActivity extends AppCompatActivity {
                         if (menuItem.getItemId() == R.id.show_history) {
                             Intent intent = new Intent(ObjectsActivity.this, HistoryActivity.class);
                             startActivity(intent);
-                        } else if (menuItem.getItemId() == R.id.settings) {
-                            Intent intent = new Intent(ObjectsActivity.this, SettingsActivity.class);
-                            startActivity(intent);
                         }
 
                         return true;

+ 0 - 17
app/src/main/java/de/tu_darmstadt/informatik/tk/olir/Parser.java

@@ -1,24 +1,7 @@
 package de.tu_darmstadt.informatik.tk.olir;
 
-import android.content.Context;
-import android.graphics.Color;
-import android.graphics.drawable.Drawable;
-import android.graphics.drawable.GradientDrawable;
-import android.support.constraint.ConstraintLayout;
-import android.support.v7.app.AppCompatActivity;
-import android.util.Log;
-import android.util.TypedValue;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import java.io.File;
-import java.io.FileNotFoundException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Scanner;
 
 /**
  * Parses an objectSpecs.txt file

+ 0 - 4
app/src/main/java/de/tu_darmstadt/informatik/tk/olir/ResultActivity.java

@@ -1,6 +1,5 @@
 package de.tu_darmstadt.informatik.tk.olir;
 
-import android.content.ContextWrapper;
 import android.content.Intent;
 import android.os.Handler;
 import android.support.v7.app.AppCompatActivity;
@@ -10,9 +9,6 @@ import android.view.MenuItem;
 import android.widget.ImageView;
 import android.widget.TextView;
 
-import java.io.File;
-import java.io.FileOutputStream;
-import java.io.IOError;
 import java.io.IOException;
 import java.io.OutputStreamWriter;
 import java.text.ParseException;

+ 0 - 40
app/src/main/java/de/tu_darmstadt/informatik/tk/olir/SettingsActivity.java

@@ -1,40 +0,0 @@
-package de.tu_darmstadt.informatik.tk.olir;
-
-import android.content.Intent;
-import android.support.v7.app.AppCompatActivity;
-import android.os.Bundle;
-import android.view.KeyEvent;
-import android.view.MenuItem;
-
-public class SettingsActivity extends AppCompatActivity {
-
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_settings);
-
-        getSupportActionBar().setDisplayHomeAsUpEnabled(true);
-        getSupportActionBar().setTitle("Settings");
-    }
-
-    @Override
-    public boolean onKeyDown(int keyCode, KeyEvent event)  {
-        if (keyCode == KeyEvent.KEYCODE_BACK
-                && event.getRepeatCount() == 0) {
-            Intent intent = new Intent(this, ObjectsActivity.class);
-            startActivity(intent);
-            return true;
-        }
-        return super.onKeyDown(keyCode, event);
-    }
-
-    @Override
-    public boolean onOptionsItemSelected(MenuItem item) {
-        if (item.getItemId() == android.R.id.home) {
-            Intent intent = new Intent(this, ObjectsActivity.class);
-            startActivity(intent);
-            return true;
-        }
-        return false;
-    }
-}

BIN
app/src/main/offline_launch_icon-web.png


BIN
app/src/main/offline_launch_icons-web.png


BIN
app/src/main/res/drawable-hdpi/ic_menu_white_48dp.png


BIN
app/src/main/res/drawable-mdpi/ic_menu_white_48dp.png


BIN
app/src/main/res/drawable-xhdpi/ic_menu_white_48dp.png


BIN
app/src/main/res/drawable-xxhdpi/ic_menu_white_48dp.png


BIN
app/src/main/res/drawable-xxxhdpi/ic_menu_white_48dp.png


BIN
app/src/main/res/drawable-xxxhdpi/vorschl1.PNG


+ 0 - 45
app/src/main/res/layout/activity_main.xml

@@ -1,45 +0,0 @@
-<?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:id="@+id/constraintLayout"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    tools:context="de.tu_darmstadt.informatik.tk.olir.MainActivity"
-    tools:layout_editor_absoluteX="0dp"
-    tools:layout_editor_absoluteY="81dp">
-
-
-    <TableLayout
-        android:id="@+id/tableLayout"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="1.0"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.0">
-
-    </TableLayout>
-
-    <android.support.design.widget.FloatingActionButton
-        android:id="@+id/floatingActionButton2"
-        android:layout_width="75dp"
-        android:layout_height="217dp"
-        android:layout_marginBottom="8dp"
-        android:layout_marginEnd="8dp"
-        android:layout_marginStart="8dp"
-        android:layout_marginTop="8dp"
-        android:clickable="true"
-        android:onClick="addObject"
-        app:backgroundTint="@color/colorPrimary"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintHorizontal_bias="0.92"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent"
-        app:layout_constraintVertical_bias="0.92"
-        app:srcCompat="@mipmap/plus" />
-
-</android.support.constraint.ConstraintLayout>

+ 10 - 5
app/src/main/res/layout/activity_objects.xml

@@ -2,6 +2,7 @@
 
 <android.support.v4.widget.DrawerLayout 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:id="@+id/drawer_layout"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -72,7 +73,7 @@
                     android:id="@+id/imageView"
                     android:layout_width="40dp"
                     android:layout_height="40dp"
-                    android:src="@mipmap/weight" />
+                    android:src="@mipmap/load" />
 
                 <TextView
                     android:layout_width="wrap_content"
@@ -107,7 +108,8 @@
                     android:id="@+id/imageView6"
                     android:layout_width="40dp"
                     android:layout_height="40dp"
-                    android:src="@mipmap/temperature" />
+                    android:src="@mipmap/temp_falling"
+                    tools:src="@mipmap/temp_rising" />
 
                 <TextView
                     android:id="@+id/textView6"
@@ -143,7 +145,8 @@
                     android:id="@+id/imageView7"
                     android:layout_width="40dp"
                     android:layout_height="40dp"
-                    android:src="@mipmap/temperature" />
+                    android:src="@mipmap/temp_rising"
+                    tools:src="@mipmap/temp_falling" />
 
                 <TextView
                     android:id="@+id/textView7"
@@ -179,7 +182,8 @@
                     android:id="@+id/imageView4"
                     android:layout_width="40dp"
                     android:layout_height="40dp"
-                    android:src="@mipmap/rotation" />
+                    android:src="@mipmap/rotate90"
+                    tools:src="@mipmap/rotate90" />
 
                 <TextView
                     android:id="@+id/textView4"
@@ -215,7 +219,8 @@
                     android:id="@+id/imageView5"
                     android:layout_width="40dp"
                     android:layout_height="40dp"
-                    android:src="@mipmap/rotation" />
+                    android:src="@mipmap/rotate"
+                    tools:src="@mipmap/rotate" />
 
                 <TextView
                     android:id="@+id/textView5"

+ 0 - 91
app/src/main/res/layout/activity_settings.xml

@@ -1,91 +0,0 @@
-<?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=".SettingsActivity">
-
-    <TableLayout
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintEnd_toEndOf="parent"
-        app:layout_constraintStart_toStartOf="parent"
-        app:layout_constraintTop_toTopOf="parent">
-
-        <TableRow
-            android:layout_width="fill_parent"
-            android:layout_height="match_parent"
-            android:padding="10dp">
-
-            <TextView
-                android:id="@+id/textView9"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="Settings1" />
-
-            <Switch
-                android:id="@+id/switch1"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_gravity="right"
-                android:layout_weight="1" />
-        </TableRow>
-
-        <TableRow
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:padding="10dp">
-
-            <TextView
-                android:id="@+id/textView10"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="Settings2" />
-
-            <Switch
-                android:id="@+id/switch2"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1" />
-        </TableRow>
-
-        <TableRow
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:padding="10dp">
-
-            <TextView
-                android:id="@+id/textView11"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="Settings3" />
-
-            <Switch
-                android:id="@+id/switch3"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1" />
-        </TableRow>
-
-        <TableRow
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:padding="10dp">
-
-            <TextView
-                android:id="@+id/textView12"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="Settings4" />
-
-            <Switch
-                android:id="@+id/switch4"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:layout_weight="1" />
-        </TableRow>
-
-    </TableLayout>
-</android.support.constraint.ConstraintLayout>

+ 0 - 4
app/src/main/res/menu/drawer.xml

@@ -5,8 +5,4 @@
     <item android:id="@+id/show_history"
         android:title="Readout History"
         app:showAsAction="never"/>
-
-    <item android:id="@+id/settings"
-        android:title="Settings"
-        app:showAsAction="never"/>
 </menu>

+ 1 - 1
app/src/main/res/mipmap-anydpi-v26/offline_launch_icons.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@mipmap/offline_icon"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>

+ 1 - 1
app/src/main/res/mipmap-anydpi-v26/offline_launch_icons_round.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <adaptive-icon xmlns:android="http://schemas.android.com/apk/res/android">
     <background android:drawable="@color/ic_launcher_background"/>
-    <foreground android:drawable="@mipmap/offline_icon"/>
+    <foreground android:drawable="@mipmap/ic_launcher_foreground"/>
 </adaptive-icon>

BIN
app/src/main/res/mipmap-hdpi/ic_launcher.png


BIN
app/src/main/res/mipmap-hdpi/ic_launcher_foreground.png


BIN
app/src/main/res/mipmap-hdpi/offline_icon.png


BIN
app/src/main/res/mipmap-hdpi/offline_launch_icons.png


BIN
app/src/main/res/mipmap-hdpi/offline_launch_icons_round.png


BIN
app/src/main/res/mipmap-mdpi/ic_launcher.png


BIN
app/src/main/res/mipmap-mdpi/ic_launcher_foreground.png


BIN
app/src/main/res/mipmap-mdpi/offline_icon.png


BIN
app/src/main/res/mipmap-mdpi/offline_launch_icons.png


BIN
app/src/main/res/mipmap-mdpi/offline_launch_icons_round.png


BIN
app/src/main/res/mipmap-xhdpi/ic_launcher.png


BIN
app/src/main/res/mipmap-xhdpi/ic_launcher_foreground.png


BIN
app/src/main/res/mipmap-xhdpi/offline_icon.png


BIN
app/src/main/res/mipmap-xhdpi/offline_launch_icons.png


BIN
app/src/main/res/mipmap-xhdpi/offline_launch_icons_round.png


BIN
app/src/main/res/mipmap-xxhdpi/ic_launcher.png


BIN
app/src/main/res/mipmap-xxhdpi/ic_launcher_foreground.png


BIN
app/src/main/res/mipmap-xxhdpi/offline_icon.png


BIN
app/src/main/res/mipmap-xxhdpi/offline_launch_icons.png


BIN
app/src/main/res/mipmap-xxhdpi/offline_launch_icons_round.png


BIN
app/src/main/res/mipmap-xxxhdpi/ic_launcher.png


BIN
app/src/main/res/mipmap-xxxhdpi/ic_launcher_foreground.png


app/src/main/res/mipmap-xxxhdpi/weight.png → app/src/main/res/mipmap-xxxhdpi/load.png


BIN
app/src/main/res/mipmap-xxxhdpi/offline_icon.png


BIN
app/src/main/res/mipmap-xxxhdpi/offline_launch_icons.png


BIN
app/src/main/res/mipmap-xxxhdpi/offline_launch_icons_round.png


BIN
app/src/main/res/mipmap-xxxhdpi/rotate.png


BIN
app/src/main/res/mipmap-xxxhdpi/rotate90.png


BIN
app/src/main/res/mipmap-xxxhdpi/rotation.png


BIN
app/src/main/res/mipmap-xxxhdpi/temp_falling.png


BIN
app/src/main/res/mipmap-xxxhdpi/temp_rising.png


BIN
app/src/main/res/mipmap-xxxhdpi/temperature.png


+ 1 - 1
app/src/main/res/values/ic_launcher_background.xml

@@ -1,4 +1,4 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
-    <color name="ic_launcher_background">#781421</color>
+    <color name="ic_launcher_background">#9B1B26</color>
 </resources>

+ 1 - 1
build.gradle

@@ -6,7 +6,7 @@ buildscript {
         google()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.1.1'
+        classpath 'com.android.tools.build:gradle:3.1.2'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files

+ 0 - 68
import-summary.txt

@@ -1,68 +0,0 @@
-ECLIPSE ANDROID PROJECT IMPORT SUMMARY
-======================================
-
-Ignored Files:
---------------
-The following files were *not* copied into the new Gradle project; you
-should evaluate whether these are still needed in your project and if
-so manually move them:
-
-* .idea\
-* .idea\aFileChooser.iml
-* .idea\compiler.xml
-* .idea\copyright\
-* .idea\copyright\profiles_settings.xml
-* .idea\misc.xml
-* .idea\modules.xml
-* .idea\workspace.xml
-* proguard.cfg
-
-Replaced Jars with Dependencies:
---------------------------------
-The importer recognized the following .jar files as third party
-libraries and replaced them with Gradle dependencies instead. This has
-the advantage that more explicit version information is known, and the
-libraries can be updated automatically. However, it is possible that
-the .jar file in your project was of an older version than the
-dependency we picked, which could render the project not compileable.
-You can disable the jar replacement in the import wizard and try again:
-
-android-support-v4.jar => com.android.support:support-v4:19.+
-
-Moved Files:
-------------
-Android Gradle projects use a different directory structure than ADT
-Eclipse projects. Here's how the projects were restructured:
-
-* AndroidManifest.xml => aFileChooser\src\main\AndroidManifest.xml
-* res\ => aFileChooser\src\main\res\
-* src\ => aFileChooser\src\main\java\
-
-Missing Android Support Repository:
------------------------------------
-Some useful libraries, such as the Android Support Library, are
-installed from a special Maven repository, which should be installed
-via the SDK manager.
-
-It looks like this library is missing from your SDK installation at:
-null
-
-To install it, open the SDK manager, and in the Extras category,
-select "Android Support Repository". You may also want to install the
-"Google Repository" if you want to use libraries like Google Play
-Services.
-
-Next Steps:
------------
-You can now build the project. The Gradle project needs network
-connectivity to download dependencies.
-
-Bugs:
------
-If for some reason your project does not build, and you determine that
-it is due to a bug or limitation of the Eclipse to Gradle importer,
-please file a bug at http://b.android.com with category
-Component-Tools.
-
-(This import summary is for your information only, and can be deleted
-after import once you are satisfied with the results.)