diff options
author | stefan-niedermann <info@niedermann.it> | 2019-03-11 20:44:18 +0300 |
---|---|---|
committer | stefan-niedermann <info@niedermann.it> | 2019-03-11 20:44:18 +0300 |
commit | ef4dde7eb4f88dcbecdc6bd02ddc053ef14a96f3 (patch) | |
tree | 40a7c91780a009026c363d246797aa067a441238 | |
parent | caf59197c718541b3d62b3182bbef027051972b1 (diff) |
Merge ViewModel-Gedöhns into edit branch
3 files changed, 17 insertions, 17 deletions
diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/model/viewmodel/FullCardViewModel.java b/app/src/main/java/it/niedermann/nextcloud/deck/model/viewmodel/FullCardViewModel.java index 204d38b8d..9163059d5 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/model/viewmodel/FullCardViewModel.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/model/viewmodel/FullCardViewModel.java @@ -1,8 +1,7 @@ package it.niedermann.nextcloud.deck.model.viewmodel; -import android.arch.lifecycle.LiveData; -import android.arch.lifecycle.ViewModel; - +import androidx.lifecycle.LiveData; +import androidx.lifecycle.ViewModel; import it.niedermann.nextcloud.deck.model.full.FullCard; public class FullCardViewModel extends ViewModel { diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/EditActivity.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/EditActivity.java index 3ca3be3d4..cee45024c 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/EditActivity.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/EditActivity.java @@ -1,14 +1,15 @@ package it.niedermann.nextcloud.deck.ui; -import android.arch.lifecycle.ViewModelProviders; -import android.databinding.DataBindingUtil; import android.os.Bundle; -import com.google.android.material.tabs.TabLayout; -import androidx.viewpager.widget.ViewPager; -import androidx.appcompat.app.AppCompatActivity; import android.widget.EditText; import android.widget.TextView; +import com.google.android.material.tabs.TabLayout; + +import androidx.appcompat.app.AppCompatActivity; +import androidx.databinding.DataBindingUtil; +import androidx.lifecycle.ViewModelProviders; +import androidx.viewpager.widget.ViewPager; import butterknife.BindView; import butterknife.ButterKnife; import butterknife.Unbinder; diff --git a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CardDetailsFragment.java b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CardDetailsFragment.java index cb4c357eb..08ddbaf67 100644 --- a/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CardDetailsFragment.java +++ b/app/src/main/java/it/niedermann/nextcloud/deck/ui/card/CardDetailsFragment.java @@ -2,19 +2,11 @@ package it.niedermann.nextcloud.deck.ui.card; import android.app.DatePickerDialog; import android.app.TimePickerDialog; -import android.arch.lifecycle.ViewModelProviders; import android.content.res.ColorStateList; -import android.databinding.DataBindingUtil; import android.graphics.Color; import android.graphics.drawable.Drawable; import android.net.Uri; import android.os.Bundle; -import androidx.annotation.NonNull; -import com.google.android.material.chip.Chip; -import com.google.android.material.chip.ChipGroup; -import androidx.fragment.app.Fragment; -import androidx.core.graphics.ColorUtils; -import androidx.core.graphics.drawable.DrawableCompat; import android.util.Log; import android.view.LayoutInflater; import android.view.View; @@ -27,6 +19,8 @@ import android.widget.TimePicker; import com.bumptech.glide.Glide; import com.bumptech.glide.request.RequestOptions; +import com.google.android.material.chip.Chip; +import com.google.android.material.chip.ChipGroup; import com.nextcloud.android.sso.exceptions.NextcloudFilesAppAccountNotFoundException; import com.nextcloud.android.sso.exceptions.NoCurrentAccountSelectedException; import com.nextcloud.android.sso.helper.SingleAccountHelper; @@ -37,6 +31,12 @@ import java.text.SimpleDateFormat; import java.util.Calendar; import java.util.Locale; +import androidx.annotation.NonNull; +import androidx.core.graphics.ColorUtils; +import androidx.core.graphics.drawable.DrawableCompat; +import androidx.databinding.DataBindingUtil; +import androidx.fragment.app.Fragment; +import androidx.lifecycle.ViewModelProviders; import butterknife.BindView; import butterknife.ButterKnife; import butterknife.Unbinder; @@ -256,7 +256,7 @@ public class CardDetailsFragment extends Fragment implements DatePickerDialog.On String uri = baseUrl + "/index.php/avatar/" + Uri.encode(user.getUid()) + "/" + px; peopleList.addView(avatar); avatar.requestLayout(); - Glide.with(this) + Glide.with(getContext()) .load(uri) .apply(RequestOptions.circleCropTransform()) .into(avatar); |