Fröhliche Weihnachten!

.gitignore

@@ -1,54 +1,8 @@
-# Copyright: Benjamin Weiss (keyboardsurfer) https://github.com/keyboardsurfer
-# Under CC-BY-SA V3.0 (https://creativecommons.org/licenses/by-sa/3.0/legalcode)
-
-# built application files
-*.apk
-*.ap_
-#*.jar
-
-# lint files
-lint.xml
-
-# files for the dex VM
-*.dex
-
-# Java class files
-*.class
-
-# generated files
-bin/
-gen/
-classes/
-gen-external-apklibs/
-
-# maven output folder
-target
-
-# Local configuration file (sdk path, etc)
-local.properties
-
-# Eclipse project files
-.classpath
-.project
-.metadata
-.settings
-
-# IntelliJ files
-.idea
 *.iml
-
-# OSX files
-.DS_Store
-
-# Windows files
-Thumbs.db
-
-# vi swap files
-*.swp
-
-# backup files
-*.bak
-
-# Gradle
 .gradle
-build
+/local.properties
+/.idea
+.DS_Store
+/build
+/captures
+.externalNativeBuild

app/.gitignore

@@ -0,0 +1 @@
+/build

src/withGCM/java/org/c_base/c_beam/build.gradle → app/build.gradle

@@ -1,28 +1,25 @@
-buildscript {
-    repositories {
-        jcenter()
-    }
-
-    dependencies {
-        classpath 'com.android.tools.build:gradle:2.3.3'
-    }
-}
-
 apply plugin: 'com.android.application'
 
-repositories {
-    mavenCentral()
-}
-
 android {
-    compileSdkVersion 23
-    buildToolsVersion '25.0.2'
-
-    lintOptions {
-          checkReleaseBuilds false
-          // Or, if you prefer, you can continue to check for errors in release builds,
-          // but continue the build even when errors are found:
-          abortOnError false
+    compileSdkVersion 22
+    buildToolsVersion '28.0.3'
+    defaultConfig {
+        applicationId "org.c_base.c_beam"
+        minSdkVersion 9
+        targetSdkVersion 22
+        versionCode 1
+        versionName "1.0"
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+    }
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+        debug {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
     }
 
     flavorDimensions "gcm"
@@ -35,15 +32,12 @@ android {
         noGCM {
             dimension "gcm"
         }
-
     }
-
 }
 
-
 dependencies {
     compile 'com.androidplot:androidplot-core:0.6.1'
-    compile 'com.android.support:support-v4:20.0.0'
+    compile 'com.android.support:support-v4:22.2.1'
     compile 'com.actionbarsherlock:actionbarsherlock:4.4.0@aar'
     compile 'com.mcxiaoke.viewpagerindicator:library:2.4.1@aar'
     compile 'com.madgag.spongycastle:core:1.51.0.0'
@@ -57,4 +51,4 @@ dependencies {
     }
     compile 'org.eclipse.paho:org.eclipse.paho.client.mqttv3:latest.integration'
     withGCMCompile fileTree(dir: 'libs', include: '*.jar')
-}
+}

app/proguard-rules.pro

@@ -0,0 +1,21 @@
+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

app/src/androidTest/java/org/c_base/c_beam/ExampleInstrumentedTest.java

@@ -0,0 +1,26 @@
+package org.c_base.c_beam;
+
+import android.content.Context;
+import android.support.test.InstrumentationRegistry;
+import android.support.test.runner.AndroidJUnit4;
+
+import org.junit.Test;
+import org.junit.runner.RunWith;
+
+import static org.junit.Assert.*;
+
+/**
+ * Instrumented test, which will execute on an Android device.
+ *
+ * @see <a href="http://d.android.com/tools/testing">Testing documentation</a>
+ */
+@RunWith(AndroidJUnit4.class)
+public class ExampleInstrumentedTest {
+    @Test
+    public void useAppContext() {
+        // Context of the app under test.
+        Context appContext = InstrumentationRegistry.getTargetContext();
+
+        assertEquals("org.c_base.c_beam", appContext.getPackageName());
+    }
+}

src/main/AndroidManifest.xml → app/src/main/AndroidManifest.xml

@@ -1,12 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="org.c_base.c_beam"
-    android:versionCode="26"
-    android:versionName="1.5.3">
-
-<uses-sdk
-        android:minSdkVersion="8"
-        android:targetSdkVersion="17" />
+    package="org.c_base.c_beam">
 
     <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
     <uses-permission android:name="android.permission.INTERNET" />

src/main/java/org/c_base/c_beam/C_beamAppWidgetProvider.java → app/src/main/java/org/c_base/c_beam/C_beamAppWidgetProvider.java

@@ -29,7 +29,7 @@
  */
 public class C_beamAppWidgetProvider extends AppWidgetProvider {
 	// log tag
-	private static final String TAG = "ExampleAppWidgetProvider";
+	private static final String TAG = "CBeamAppWidgetProvider";
 
 	@Override
 	public void onUpdate(Context context, AppWidgetManager appWidgetManager, int[] appWidgetIds) {