Yalantis · dmytro1morozov · Sep 20, 2022 · Sep 22, 2022
diff --git a/build.gradle b/build.gradle
@@ -2,10 +2,11 @@
 
 buildscript {
     repositories {
-        jcenter()
+        google()
+        mavenCentral()
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:2.2.0'
+        classpath 'com.android.tools.build:gradle:7.3.0'
 
         // NOTE: Do not place your application dependencies here; they belong
         // in the individual module build.gradle files
@@ -14,6 +15,7 @@ buildscript {
 
 allprojects {
     repositories {
-        jcenter()
+        google()
+        mavenCentral()
     }
 }
diff --git a/gradle.properties b/gradle.properties
@@ -15,4 +15,9 @@
 # When configured, Gradle will run in incubating parallel mode.
 # 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
+# org.gradle.parallel=true
+
+android.useAndroidX=true
+android.enableJetifier=true
+# Kotlin code style for this project: "official" or "obsolete":
+kotlin.code.style=official
diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,5 @@
-#Tue Nov 01 20:44:59 EET 2016
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-7.4-bin.zip
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-2.14.1-all.zip
diff --git a/mobile/build.gradle b/mobile/build.gradle
@@ -9,31 +9,34 @@ android {
             storePassword 'android123'
         }
     }
-    compileSdkVersion 22
-    buildToolsVersion "22.0.1"
+    compileSdkVersion 33
+    buildToolsVersion "30.0.3"
     defaultConfig {
         applicationId "com.yalantis.watchface"
         minSdkVersion 18
-        targetSdkVersion 22
-        versionCode 2
-        versionName "1.0.1"
+        targetSdkVersion 33
+        versionCode 3
+        versionName "1.0.2"
     }
     buildTypes {
         release {
             signingConfig signingConfigs.signing
             minifyEnabled false
             proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
         }
+    }
 
+    buildFeatures {
+        viewBinding true
     }
 }
 
 dependencies {
-    compile fileTree(include: ['*.jar'], dir: 'libs')
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
     wearApp project(':wear')
-    compile 'com.android.support:appcompat-v7:22.2.0'
-    compile 'com.android.support:design:22.2.1'
-    compile 'com.google.android.support:wearable:1.1.+'
-    compile 'com.jakewharton:butterknife:7.0.1'
-    compile 'com.google.android.gms:play-services:7.5.0'
+    implementation "androidx.appcompat:appcompat:1.5.1"
+    implementation "com.google.android.material:material:1.6.1"
+    compileOnly "com.google.android.wearable:wearable:2.9.0"
+    implementation "com.google.android.support:wearable:2.9.0"
+    implementation "com.google.android.gms:play-services:12.0.1"
 }
diff --git a/mobile/src/main/AndroidManifest.xml b/mobile/src/main/AndroidManifest.xml
@@ -1,53 +1,57 @@
-<manifest package="com.yalantis.watchface"
-          xmlns:android="http://schemas.android.com/apk/res/android">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.yalantis.watchface">
 
-    <uses-permission android:name="com.google.android.permission.PROVIDE_BACKGROUND"/>
-    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE"/>
-    <uses-permission android:name="android.permission.WAKE_LOCK"/>
+    <uses-permission android:name="com.google.android.permission.PROVIDE_BACKGROUND" />
+    <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
+    <uses-permission android:name="android.permission.WAKE_LOCK" />
 
     <application
+        android:name=".App"
         android:allowBackup="true"
         android:icon="@mipmap/icon"
-        android:name=".App"
         android:label="@string/app_name"
         android:theme="@style/AppTheme">
 
         <activity
             android:name=".view.configuration.ConfigurationActivity"
+            android:exported="true"
             android:label="ConfigurationWatchface">
 
             <intent-filter>
-                <action android:name="android.intent.action.MAIN"/>
-                <action android:name="com.yalantis.watchface.CONFIG_CHRON"/>
+                <action android:name="android.intent.action.MAIN" />
+                <action android:name="com.yalantis.watchface.CONFIG_CHRON" />
 
-                <category android:name="com.google.android.wearable.watchface.category.COMPANION_CONFIGURATION"/>
-                <category android:name="android.intent.category.LAUNCHER"/>
+                <category android:name="com.google.android.wearable.watchface.category.WEARABLE_CONFIGURATION" />
+                <category android:name="com.google.android.wearable.watchface.category.COMPANION_CONFIGURATION" />
+                <category android:name="android.intent.category.LAUNCHER" />
             </intent-filter>
         </activity>
 
         <activity
             android:name=".view.ticks_options.TickSetupActivity"
+            android:exported="true"
             android:label="ConfigurationWatchface">
 
             <intent-filter>
-                <action android:name="android.intent.action.TICK_SETUP"/>
-                <action android:name="com.yalantis.watchface.CONFIG_CHRON"/>
+                <action android:name="android.intent.action.TICK_SETUP" />
+                <action android:name="com.yalantis.watchface.CONFIG_CHRON" />
 
-                <category android:name="com.google.android.wearable.watchface.category.COMPANION_CONFIGURATION"/>
-                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="com.google.android.wearable.watchface.category.COMPANION_CONFIGURATION" />
+                <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
 
         <activity
             android:name=".view.configuration.ConfigurationAmbientActivity"
+            android:exported="true"
             android:label="ConfigurationWatchface">
 
             <intent-filter>
-                <action android:name="android.intent.action.AMBIENT"/>
-                <action android:name="com.yalantis.watchface.CONFIG_CHRON"/>
+                <action android:name="android.intent.action.AMBIENT" />
+                <action android:name="com.yalantis.watchface.CONFIG_CHRON" />
 
-                <category android:name="com.google.android.wearable.watchface.category.COMPANION_CONFIGURATION"/>
-                <category android:name="android.intent.category.DEFAULT"/>
+                <category android:name="com.google.android.wearable.watchface.category.COMPANION_CONFIGURATION" />
+                <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>
 

diff --git a/mobile/src/main/java/com/yalantis/watchface/manager/ConfigurationManager.java b/mobile/src/main/java/com/yalantis/watchface/manager/ConfigurationManager.java
@@ -5,9 +5,10 @@
 import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.os.Environment;
-import android.support.annotation.Nullable;
 import android.util.Log;
 
+import androidx.annotation.Nullable;
+
 import com.yalantis.watchface.Constants;
 import com.yalantis.watchface.R;
 

diff --git a/mobile/src/main/java/com/yalantis/watchface/view/BaseGoogleApiActivity.java b/mobile/src/main/java/com/yalantis/watchface/view/BaseGoogleApiActivity.java
@@ -1,7 +1,8 @@
 package com.yalantis.watchface.view;
 
 import android.os.Bundle;
-import android.support.v7.app.AppCompatActivity;
+
+import androidx.appcompat.app.AppCompatActivity;
 
 import com.google.android.gms.common.ConnectionResult;
 import com.google.android.gms.common.api.GoogleApiClient;

diff --git a/mobile/src/main/java/com/yalantis/watchface/view/configuration/ConfigurationActivity.java b/mobile/src/main/java/com/yalantis/watchface/view/configuration/ConfigurationActivity.java
@@ -3,84 +3,73 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.design.widget.Snackbar;
-import android.support.v7.widget.Toolbar;
-import android.widget.LinearLayout;
 
+import com.google.android.material.snackbar.Snackbar;
 import com.yalantis.watchface.Constants;
 import com.yalantis.watchface.R;
+import com.yalantis.watchface.databinding.ActivityConfigurationBinding;
 import com.yalantis.watchface.presenter.configuration.ConfigurationPresenter;
 import com.yalantis.watchface.presenter.configuration.ConfigurationPresenterImpl;
 import com.yalantis.watchface.view.BaseGoogleApiActivity;
 import com.yalantis.watchface.view.ticks_options.TickSetupActivity;
 
-import butterknife.Bind;
-import butterknife.ButterKnife;
-import butterknife.OnClick;
-
 /**
  * @author andrewkhristyan on 10/5/15.
  */
 public class ConfigurationActivity extends BaseGoogleApiActivity implements ConfigurationMvpView {
 
     protected ConfigurationPresenter mConfigurationPresenter = new ConfigurationPresenterImpl();
 
-    @Bind(R.id.toolbar)
-    Toolbar toolbar;
-    @Bind(R.id.linear_layout_root)
-    LinearLayout linearLayoutRoot;
+    private ActivityConfigurationBinding binding;
 
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_configuration);
-        ButterKnife.bind(this);
-        setSupportActionBar(toolbar);
+        binding = ActivityConfigurationBinding.inflate(getLayoutInflater());
+        setContentView(binding.getRoot());
+        setSupportActionBar(binding.toolbar);
         setTitle(getString(R.string.main_label));
         mConfigurationPresenter.register(this);
-    }
 
-    @Override
-    protected void onDestroy() {
-        super.onDestroy();
-        mConfigurationPresenter.unregister(this);
+        setupListeners();
     }
 
-    @OnClick(R.id.button_change_background)
-    void onClickChangeBackground() {
-        mConfigurationPresenter.changeContentImage(isConnected, Constants.BACKGROUND_CHOOSER);
-    }
+    private void setupListeners() {
+        binding.buttonChangeBackground.setOnClickListener(v ->
+                mConfigurationPresenter.changeContentImage(isConnected, Constants.BACKGROUND_CHOOSER)
+        );
 
-    @OnClick(R.id.button_change_second_tick)
-    void onClickSecondTick() {
-        mConfigurationPresenter.changeContentImage(isConnected, Constants.SECOND_CHOOSER);
-    }
+        binding.buttonChangeSecondTick.setOnClickListener(v ->
+                mConfigurationPresenter.changeContentImage(isConnected, Constants.SECOND_CHOOSER)
+        );
 
-    @OnClick(R.id.button_change_hours_ticks)
-    void onClickHourTicks() {
-        mConfigurationPresenter.changeContentImage(isConnected, Constants.HOUR_CHOOSER);
-    }
+        binding.buttonChangeHoursTicks.setOnClickListener(v ->
+                mConfigurationPresenter.changeContentImage(isConnected, Constants.HOUR_CHOOSER)
+        );
 
-    @OnClick(R.id.button_change_minute_ticks)
-    void onClickMinuteTicks() {
-        mConfigurationPresenter.changeContentImage(isConnected, Constants.MINUTE_CHOOSER);
-    }
+        binding.buttonChangeMinuteTicks.setOnClickListener(v ->
+                mConfigurationPresenter.changeContentImage(isConnected, Constants.MINUTE_CHOOSER)
+        );
 
-    @OnClick(R.id.button_change_save_configuration)
-    void onClickSaveConfig() {
-        mConfigurationPresenter.saveConfig();
-        Snackbar.make(linearLayoutRoot, getString(R.string.saved_message), Snackbar.LENGTH_SHORT)
-                .show();
-    }
+        binding.buttonChangeSaveConfiguration.setOnClickListener(v -> {
+            mConfigurationPresenter.saveConfig();
+            Snackbar.make(binding.linearLayoutRoot, getString(R.string.saved_message), Snackbar.LENGTH_SHORT)
+                    .show();
+        });
+
+        binding.buttonTicksConfiguration.setOnClickListener(v ->
+                startActivity(TickSetupActivity.newActivity(this))
+        );
 
-    @OnClick(R.id.button_ticks_configuration)
-    void onClickTicksConfiguration() {
-        startActivity(TickSetupActivity.newActivity(this));
+        binding.buttonAmbient.setOnClickListener(v ->
+                startActivity(ConfigurationAmbientActivity.newActivity(this))
+        );
     }
 
-    @OnClick(R.id.button_ambient)
-    void onClickAmbient() {
-        startActivity(ConfigurationAmbientActivity.newActivity(this));
+    @Override
+    protected void onDestroy() {
+        super.onDestroy();
+        mConfigurationPresenter.unregister(this);
     }
 
     @Override
@@ -98,7 +87,7 @@ public void startFileChooser(Intent intent, int requestCode) {
 
     @Override
     public void showStatusMessage(String message) {
-        Snackbar.make(findViewById(R.id.linear_layout_root), message, Snackbar.LENGTH_SHORT);
+        Snackbar.make(findViewById(R.id.linear_layout_root), message, Snackbar.LENGTH_SHORT).show();
     }
 
     @Override

diff --git a/...src/main/java/com/yalantis/watchface/view/configuration/ConfigurationAmbientActivity.java b/...src/main/java/com/yalantis/watchface/view/configuration/ConfigurationAmbientActivity.java
@@ -3,26 +3,21 @@
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
-import android.support.v7.widget.Toolbar;
 
 import com.yalantis.watchface.Constants;
 import com.yalantis.watchface.R;
+import com.yalantis.watchface.databinding.ActivityAmbientBinding;
 import com.yalantis.watchface.presenter.configuration.ConfigurationPresenter;
 import com.yalantis.watchface.presenter.configuration.ConfigurationPresenterImpl;
 import com.yalantis.watchface.view.BaseGoogleApiActivity;
 
-import butterknife.Bind;
-import butterknife.ButterKnife;
-import butterknife.OnClick;
 
 /**
  * @author andrewkhristyan on 10/27/15.
  */
-public class ConfigurationAmbientActivity extends BaseGoogleApiActivity implements ConfigurationMvpView{
-
-    @Bind(R.id.toolbar)
-    Toolbar toolbar;
+public class ConfigurationAmbientActivity extends BaseGoogleApiActivity implements ConfigurationMvpView {
 
+    private ActivityAmbientBinding binding;
     private ConfigurationPresenter mConfigurationPresenter = new ConfigurationPresenterImpl();
 
     public static Intent newActivity(Context context) {
@@ -33,26 +28,25 @@ public static Intent newActivity(Context context) {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        setContentView(R.layout.activity_ambient);
-        ButterKnife.bind(this);
-        setSupportActionBar(toolbar);
+        binding = ActivityAmbientBinding.inflate(getLayoutInflater());
+        setContentView(binding.getRoot());
+        setSupportActionBar(binding.toolbar);
         setTitle(getString(R.string.main_label));
         mConfigurationPresenter.register(this);
-    }
-
-    @OnClick(R.id.button_change_background)
-    void onClickChangeBackgroundAmbient() {
-        mConfigurationPresenter.changeContentImage(isConnected, Constants.BACKGROUND_AMBIENT);
-    }
 
-    @OnClick(R.id.button_change_ambient_hour)
-    void onClickChangeHourTick() {
-        mConfigurationPresenter.changeContentImage(isConnected, Constants.HOUR_AMBIENT);
+        setupListners();
     }
 
-    @OnClick(R.id.button_change_ambient_minute)
-    void onClickChangeMinuteTick() {
-        mConfigurationPresenter.changeContentImage(isConnected, Constants.MINUTE_AMBIENT);
+    private void setupListners() {
+        binding.buttonChangeBackground.setOnClickListener(v ->
+                mConfigurationPresenter.changeContentImage(isConnected, Constants.BACKGROUND_AMBIENT)
+        );
+        binding.buttonChangeAmbientHour.setOnClickListener(v ->
+                mConfigurationPresenter.changeContentImage(isConnected, Constants.HOUR_AMBIENT)
+        );
+        binding.buttonChangeAmbientMinute.setOnClickListener(v ->
+                mConfigurationPresenter.changeContentImage(isConnected, Constants.MINUTE_AMBIENT)
+        );
     }
 
     @Override