Add changes

konradmb · konradmb · commit 66082bd7cded · 2020-10-18T21:51:58.000+02:00
diff --git a/.gitignore b/.gitignore
@@ -80,3 +80,5 @@ lint/tmp/
 # lint/reports/
 
 Snapcast/release/output.json
+
+/key.jks
diff --git a/Snapcast/.gitignore b/Snapcast/.gitignore
@@ -1 +1,3 @@
 /build
+/release
+.idea/
diff --git a/Snapcast/build.gradle b/Snapcast/build.gradle
@@ -5,7 +5,7 @@ android {
 
     defaultConfig {
         applicationId "de.badaix.snapcast"
-        minSdkVersion 16
+        minSdkVersion 10
         targetSdkVersion 30
         versionCode 2200
         versionName '0.22.0.0'
@@ -28,9 +28,10 @@ dependencies {
     implementation fileTree(include: ['*.jar'], dir: 'libs')
     testImplementation 'junit:junit:4.12'
     // https://dl.google.com/dl/android/maven2/index.html
-    implementation 'androidx.appcompat:appcompat:1.2.0'
-    implementation 'androidx.cardview:cardview:1.0.0'
-    implementation 'androidx.legacy:legacy-support-v4:1.0.0'
-    //    compile 'com.android.support:recyclerview-v7:23.1.1'
-    implementation 'com.google.android.material:material:1.0.0'
+    implementation 'com.android.support:cardview-v7:25.4.0'
+    implementation 'com.android.support:recyclerview-v7:25.4.0'
+    implementation "com.android.support:appcompat-v7:25.4.0"
+    implementation 'com.android.support:design:24.0.0'
+    implementation 'com.android.support:support-vector-drawable:23.2.0'
+    implementation 'com.android.support:animated-vector-drawable:23.2.0'
 }
diff --git a/Snapcast/src/main/java/de/badaix/snapcast/AboutActivity.java b/Snapcast/src/main/java/de/badaix/snapcast/AboutActivity.java
@@ -21,8 +21,8 @@
 import android.content.pm.PackageInfo;
 import android.content.pm.PackageManager;
 import android.os.Bundle;
-import com.google.android.material.snackbar.Snackbar;
-import androidx.appcompat.app.AppCompatActivity;
+import android.support.design.widget.Snackbar;
+import android.support.v7.app.AppCompatActivity;
 import android.webkit.WebView;
 
 public class AboutActivity extends AppCompatActivity {
@@ -43,7 +43,7 @@ protected void onCreate(Bundle savedInstanceState) {
         } catch (PackageManager.NameNotFoundException e) {
             e.printStackTrace();
         }
-        WebView wv = findViewById(R.id.webView);
+        WebView wv = (WebView) findViewById(R.id.webView);
         wv.loadUrl("file:///android_asset/" + this.getText(R.string.about_file));
     }
 }
diff --git a/Snapcast/src/main/java/de/badaix/snapcast/ClientItem.java b/Snapcast/src/main/java/de/badaix/snapcast/ClientItem.java
@@ -19,7 +19,7 @@
 package de.badaix.snapcast;
 
 import android.content.Context;
-import androidx.appcompat.widget.PopupMenu;
+import android.support.v7.widget.PopupMenu;
 import android.view.LayoutInflater;
 import android.view.Menu;
 import android.view.MenuItem;
diff --git a/Snapcast/src/main/java/de/badaix/snapcast/ClientSettingsActivity.java b/Snapcast/src/main/java/de/badaix/snapcast/ClientSettingsActivity.java
@@ -21,7 +21,7 @@
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
-import androidx.appcompat.app.AppCompatActivity;
+import android.support.v7.app.AppCompatActivity;
 import android.view.MenuItem;
 
 /**
diff --git a/Snapcast/src/main/java/de/badaix/snapcast/GroupListFragment.java b/Snapcast/src/main/java/de/badaix/snapcast/GroupListFragment.java
@@ -20,17 +20,17 @@
 
 import android.content.Context;
 import android.os.Bundle;
-import androidx.annotation.NonNull;
-import androidx.annotation.Nullable;
-import androidx.fragment.app.Fragment;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.support.v4.app.Fragment;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ArrayAdapter;
 import android.widget.ListView;
 
-import androidx.fragment.app.FragmentActivity;
+import android.support.v4.app.FragmentActivity;
 import de.badaix.snapcast.control.json.Client;
 import de.badaix.snapcast.control.json.Group;
 import de.badaix.snapcast.control.json.ServerStatus;
diff --git a/Snapcast/src/main/java/de/badaix/snapcast/GroupSettingsActivity.java b/Snapcast/src/main/java/de/badaix/snapcast/GroupSettingsActivity.java
@@ -21,7 +21,7 @@
 import android.app.Activity;
 import android.content.Intent;
 import android.os.Bundle;
-import androidx.appcompat.app.AppCompatActivity;
+import android.support.v7.app.AppCompatActivity;
 import android.view.MenuItem;
 
 /**
diff --git a/Snapcast/src/main/java/de/badaix/snapcast/MainActivity.java b/Snapcast/src/main/java/de/badaix/snapcast/MainActivity.java
@@ -32,12 +32,13 @@
 import android.os.Build;
 import android.os.Bundle;
 import android.os.IBinder;
-import androidx.coordinatorlayout.widget.CoordinatorLayout;
-import com.google.android.material.snackbar.Snackbar;
-import androidx.appcompat.app.ActionBar;
-import androidx.appcompat.app.AlertDialog;
-import androidx.appcompat.app.AppCompatActivity;
-import androidx.appcompat.widget.Toolbar;
+import android.support.design.widget.CoordinatorLayout;
+import android.support.design.widget.Snackbar;
+import android.support.v4.view.MenuItemCompat;
+import android.support.v7.app.ActionBar;
+import android.support.v7.app.AlertDialog;
+import android.support.v7.app.AppCompatActivity;
+import android.support.v7.widget.Toolbar;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.Menu;
@@ -304,7 +305,7 @@ public void onResume() {
     public void onStart() {
         super.onStart();
 
-        if (TextUtils.isEmpty(Settings.getInstance(this).getHost()))
+        if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN_MR1 && TextUtils.isEmpty(Settings.getInstance(this).getHost()))
             NsdHelper.getInstance(this).startListening("_snapcast._tcp.", SERVICE_NAME, this);
         else
             setHost(Settings.getInstance(this).getHost(), Settings.getInstance(this).getStreamPort(), Settings.getInstance(this).getControlPort());
@@ -468,14 +469,14 @@ public void updateMenuItems(final boolean connected) {
             public void run() {
                 if (connected) {
                     if (miSettings != null)
-                        miSettings.setShowAsAction(MenuItem.SHOW_AS_ACTION_NEVER);
+                        MenuItemCompat.setShowAsAction(miSettings, MenuItem.SHOW_AS_ACTION_NEVER);
                     if (miStartStop != null)
                         miStartStop.setVisible(true);
 //                    if (miRefresh != null)
 //                        miRefresh.setVisible(true);
                 } else {
                     if (miSettings != null)
-                        miSettings.setShowAsAction(MenuItem.SHOW_AS_ACTION_ALWAYS);
+                        MenuItemCompat.setShowAsAction(miSettings, MenuItem.SHOW_AS_ACTION_ALWAYS);
                     if (miStartStop != null)
                         miStartStop.setVisible(false);
 //                    if (miRefresh != null)
@@ -532,7 +533,7 @@ public void onClick(View v) {
                 groupListFragment.updateServer(serverStatus);
             }
         });
-        deleteSnackbar.addCallback(new Snackbar.Callback() {
+        deleteSnackbar.setCallback(new Snackbar.Callback() {
             boolean dismissed = false;
 
             @Override
diff --git a/Snapcast/src/main/java/de/badaix/snapcast/ServerDialogFragment.java b/Snapcast/src/main/java/de/badaix/snapcast/ServerDialogFragment.java
@@ -24,8 +24,8 @@
 import android.content.DialogInterface;
 import android.net.nsd.NsdServiceInfo;
 import android.os.Bundle;
-import androidx.fragment.app.DialogFragment;
-import androidx.appcompat.app.AlertDialog;
+import android.support.v4.app.DialogFragment;
+import android.support.v7.app.AlertDialog;
 import android.util.Log;
 import android.view.LayoutInflater;
 import android.view.View;
diff --git a/Snapcast/src/main/java/de/badaix/snapcast/SnapclientService.java b/Snapcast/src/main/java/de/badaix/snapcast/SnapclientService.java
@@ -35,8 +35,9 @@
 import android.os.Handler;
 import android.os.IBinder;
 import android.os.PowerManager;
-import androidx.core.app.NotificationCompat;
-import androidx.core.app.TaskStackBuilder;
+import android.os.SystemClock;
+import android.support.v7.app.NotificationCompat;
+import android.support.v4.app.TaskStackBuilder;
 import android.util.Log;
 
 import java.io.BufferedReader;
@@ -124,7 +125,7 @@ public int onStartCommand(Intent intent, int flags, int startId) {
             PendingIntent piStop = PendingIntent.getService(this, 0, stopIntent, 0);
 
             NotificationCompat.Builder builder =
-                    new NotificationCompat.Builder(this, NOTIFICATION_CHANNEL_ID)
+                    (NotificationCompat.Builder) new NotificationCompat.Builder(this)
                             .setSmallIcon(R.drawable.ic_media_play)
                             .setTicker(getText(R.string.ticker_text))
                             .setContentTitle(getText(R.string.notification_title))
@@ -139,6 +140,7 @@ public int onStartCommand(Intent intent, int flags, int startId) {
             // started Activity.
             // This ensures that navigating backward from the Activity leads out of
             // your application to the Home screen.
+
             TaskStackBuilder stackBuilder = TaskStackBuilder.create(this);
             // Adds the back stack for the Intent (but not the Intent itself)
             stackBuilder.addParentStack(MainActivity.class);
diff --git a/Snapcast/src/main/java/de/badaix/snapcast/control/json/Group.java b/Snapcast/src/main/java/de/badaix/snapcast/control/json/Group.java
@@ -18,7 +18,7 @@
 
 package de.badaix.snapcast.control.json;
 
-import androidx.annotation.NonNull;
+import android.support.annotation.NonNull;
 import android.text.TextUtils;
 
 import org.json.JSONArray;
diff --git a/Snapcast/src/main/res/layout/activity_main.xml b/Snapcast/src/main/res/layout/activity_main.xml
@@ -16,7 +16,7 @@
   ~     along with this program.  If not, see <http://www.gnu.org/licenses/>.
   -->
 
-<androidx.coordinatorlayout.widget.CoordinatorLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<android.support.design.widget.CoordinatorLayout 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/myCoordinatorLayout"
@@ -25,24 +25,25 @@
     android:fitsSystemWindows="true"
     tools:context="de.badaix.snapcast.MainActivity">
 
-    <com.google.android.material.appbar.AppBarLayout
+
+    <android.support.design.widget.AppBarLayout
         android:id="@+id/appbar"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:theme="@style/AppTheme.AppBarOverlay">
         <!-- android:paddingTop="@dimen/appbar_padding_top" -->
 
-        <androidx.appcompat.widget.Toolbar
+        <android.support.v7.widget.Toolbar
             android:id="@+id/toolbar"
             android:layout_width="match_parent"
             android:layout_height="?attr/actionBarSize"
             android:background="?attr/colorPrimary"
             app:popupTheme="@style/AppTheme.PopupOverlay">
             <!-- app:layout_scrollFlags="scroll|enterAlways" -->
 
-        </androidx.appcompat.widget.Toolbar>
+        </android.support.v7.widget.Toolbar>
 
-    </com.google.android.material.appbar.AppBarLayout>
+    </android.support.design.widget.AppBarLayout>
 
     <fragment
         android:id="@+id/groupListFragment"
@@ -59,5 +60,5 @@
         android:layout_gravity="center_vertical|center_horizontal"
         android:text="@string/connect" />
 
-</androidx.coordinatorlayout.widget.CoordinatorLayout>
+</android.support.design.widget.CoordinatorLayout>
 
diff --git a/Snapcast/src/main/res/layout/group_item.xml b/Snapcast/src/main/res/layout/group_item.xml
@@ -23,7 +23,8 @@
     <!--    android:descendantFocusability="afterDescendants"-->
     <!--    android:paddingRight="?android:attr/scrollbarSize"-->
     <!--    android:background="@drawable/big_card"-->
-    <androidx.cardview.widget.CardView android:id="@+id/card_view"
+
+    <android.support.v7.widget.CardView android:id="@+id/card_view"
         xmlns:card_view="http://schemas.android.com/apk/res-auto"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
@@ -113,6 +114,6 @@
                 android:layout_height="wrap_content"
                 android:orientation="vertical" />
         </LinearLayout>
-    </androidx.cardview.widget.CardView>
+    </android.support.v7.widget.CardView>
 </FrameLayout>
 
diff --git a/gradle.properties b/gradle.properties
@@ -16,5 +16,5 @@
 # This option should only be used with decoupled projects. More details, visit
 # http://www.gradle.org/docs/current/userguide/multi_project_builds.html#sec:decoupled_projects
 # org.gradle.parallel=true
-android.enableJetifier=true
-android.useAndroidX=true
+#android.enableJetifier=true
+#android.useAndroidX=true

Original file line number	Diff line number	Diff line change
`@@ -21,8 +21,8 @@`
`21`	`21`	`import android.content.pm.PackageInfo;`
`22`	`22`	`import android.content.pm.PackageManager;`
`23`	`23`	`import android.os.Bundle;`
`24`		`-import com.google.android.material.snackbar.Snackbar;`
`25`		`-import androidx.appcompat.app.AppCompatActivity;`
	`24`	`+import android.support.design.widget.Snackbar;`
	`25`	`+import android.support.v7.app.AppCompatActivity;`
`26`	`26`	`import android.webkit.WebView;`
`27`	`27`
`28`	`28`	`public class AboutActivity extends AppCompatActivity {`
`@@ -43,7 +43,7 @@ protected void onCreate(Bundle savedInstanceState) {`
`43`	`43`	`} catch (PackageManager.NameNotFoundException e) {`
`44`	`44`	`e.printStackTrace();`
`45`	`45`	`}`
`46`		`- WebView wv = findViewById(R.id.webView);`
	`46`	`+ WebView wv = (WebView) findViewById(R.id.webView);`
`47`	`47`	`wv.loadUrl("file:///android_asset/" + this.getText(R.string.about_file));`
`48`	`48`	`}`
`49`	`49`	`}`