cthrace/open-keychain
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

extract sweetspot activity into separate module

Browse Source
This commit is contained in:
Vincent Breitmoser
2018-11-20 16:19:31 +01:00
parent e36aab6a97
commit 365cebdc72
14 changed files with 122 additions and 57 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/CreateSecurityTokenWaitFragment.java
View File

@@ -33,6 +33,8 @@ import android.view.View.OnClickListener;
import android.view.ViewGroup;
import android.view.animation.Animation;
import de.cotech.sweetspot.NfcSweetspotData;
import de.cotech.sweetspot.ShowNfcSweetspotActivity;
import org.sufficientlysecure.keychain.Constants;
import org.sufficientlysecure.keychain.R;
import org.sufficientlysecure.keychain.securitytoken.SecurityTokenInfo;
@@ -92,7 +94,7 @@ public class CreateSecurityTokenWaitFragment extends Fragment {
public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
View view = inflater.inflate(R.layout.create_security_token_wait_fragment, container, false);
boolean showLocateSweetspot = ShowNfcSweetspotActivity.hasSweetspotData();
boolean showLocateSweetspot = NfcSweetspotData.hasSweetspotData();
View buttonLocateSweetspot = view.findViewById(R.id.button_locate_nfc);
buttonLocateSweetspot.setVisibility(showLocateSweetspot ? View.VISIBLE : View.GONE);
buttonLocateSweetspot.setOnClickListener(new OnClickListener() {

138
OpenKeychain/src/main/java/org/sufficientlysecure/keychain/ui/ShowNfcSweetspotActivity.java
View File

@@ -1,138 +0,0 @@
/*
* Copyright (C) 2017 Schürmann & Breitmoser GbR
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 3 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
package org.sufficientlysecure.keychain.ui;
import android.app.Activity;
import android.content.Intent;
import android.os.Build;
import android.os.Bundle;
import android.support.annotation.NonNull;
import android.support.annotation.Nullable;
import android.util.DisplayMetrics;
import android.util.Pair;
import android.view.MotionEvent;
import android.view.View;
import android.view.animation.DecelerateInterpolator;
import org.sufficientlysecure.keychain.R;
import org.sufficientlysecure.keychain.securitytoken.NfcSweetspotData;
import org.sufficientlysecure.keychain.securitytoken.SecurityTokenConnection;
import org.sufficientlysecure.keychain.ui.base.BaseSecurityTokenActivity;
public class ShowNfcSweetspotActivity extends BaseSecurityTokenActivity {
public static final String EXTRA_TOKEN_INFO = "token_info";
private View sweetspotIndicator;
private View sweetspotIcon;
private View sweetspotCircle1;
private View sweetspotCircle2;
private View sweetspotCircle3;
@Override
protected void onCreate(@Nullable Bundle savedInstanceState) {
super.onCreate(savedInstanceState);
overridePendingTransition(R.anim.fade_in_quick, R.anim.fade_out_quick);
setContentView(R.layout.show_nfc_sweetspot_activity);
sweetspotIndicator = findViewById(R.id.nfc_sweetspot_indicator);
Pair<Double, Double> nfcPosition = NfcSweetspotData.SWEETSPOT_DATA.get(Build.MODEL);
if (nfcPosition == null) {
throw new IllegalArgumentException("No data available for this model. This activity should not be called!");
}
DisplayMetrics displayDimensions = getDisplaySize();
final float translationX = (float) (displayDimensions.widthPixels * nfcPosition.first);
final float translationY = (float) (displayDimensions.heightPixels * nfcPosition.second);
sweetspotIndicator.post(new Runnable() {
@Override
public void run() {
sweetspotIndicator.setTranslationX(translationX - sweetspotIndicator.getWidth() / 2);
sweetspotIndicator.setTranslationY(translationY - sweetspotIndicator.getHeight() / 2);
}
});
sweetspotIcon = findViewById(R.id.nfc_sweetspot_icon);
sweetspotCircle1 = findViewById(R.id.nfc_sweetspot_circle_1);
sweetspotCircle2 = findViewById(R.id.nfc_sweetspot_circle_2);
sweetspotCircle3 = findViewById(R.id.nfc_sweetspot_circle_3);
sweetspotIcon.setAlpha(0.0f);
sweetspotCircle1.setAlpha(0.0f);
sweetspotCircle2.setAlpha(0.0f);
sweetspotCircle3.setAlpha(0.0f);
}
@Override
public void onEnterAnimationComplete() {
super.onEnterAnimationComplete();
DecelerateInterpolator interpolator = new DecelerateInterpolator();
sweetspotIcon.animate().alpha(1.0f).setInterpolator(interpolator).setDuration(300).start();
sweetspotCircle1.animate().alpha(1.0f).setInterpolator(interpolator).setDuration(500).setStartDelay(100).start();
sweetspotCircle2.animate().alpha(1.0f).setInterpolator(interpolator).setDuration(700).setStartDelay(200).start();
sweetspotCircle3.animate().alpha(1.0f).setInterpolator(interpolator).setDuration(1000).setStartDelay(300).start();
}
@Override
protected void initTheme() {
// do nothing
}
@Override
public void finish() {
super.finish();
overridePendingTransition(R.anim.fade_in_quick, R.anim.fade_out_quick);
}
@Override
protected void onSecurityTokenPostExecute(SecurityTokenConnection stConnection) {
Intent result = new Intent();
result.putExtra(EXTRA_TOKEN_INFO, tokenInfo);
setResult(Activity.RESULT_OK, result);
finish();
}
@Override
public boolean onTouchEvent(MotionEvent event) {
if (event.getActionMasked() == MotionEvent.ACTION_UP) {
setResult(Activity.RESULT_CANCELED);
finish();
return true;
}
return super.onTouchEvent(event);
}
@NonNull
private DisplayMetrics getDisplaySize() {
DisplayMetrics metrics = new DisplayMetrics();
getWindowManager().getDefaultDisplay().getMetrics(metrics);
return metrics;
}
public static boolean hasSweetspotData() {
return NfcSweetspotData.SWEETSPOT_DATA.containsKey(Build.MODEL);
}
}