Merge pull request #26 from RIP95/master

Disable animation for now
This commit is contained in:
Nille 2017-03-07 21:27:40 +01:00 committed by GitHub
commit 61eda4d485
3 changed files with 95 additions and 6 deletions

View File

@ -18,10 +18,9 @@ import android.widget.TextView;
import java.util.Locale;
public class LaunchActivity extends AppCompatActivity {
ImageView connect, cancel;
ImageView connect, cancel, imageViewLogo;
TextView status;
AnimationDrawable logo;
ImageView imageViewLogo;
Boolean isPressed = false;
SharedPreferences sharedPreferences;
MediaPlayer m;
@ -43,8 +42,12 @@ public class LaunchActivity extends AppCompatActivity {
cancel = (ImageView) findViewById(R.id.imageView_cancel);
status = (TextView) findViewById(R.id.textView_call);
imageViewLogo = (ImageView) findViewById(R.id.imageView_logo);
logo = (AnimationDrawable) imageViewLogo.getDrawable();
logo.start();
/*
* Reported OOM on 2K+ resolution devices.
* Looks like better to change it to static image for now.
*/
/*logo = (AnimationDrawable) imageViewLogo.getDrawable();
logo.start();*/
sharedPreferences = PreferenceManager.getDefaultSharedPreferences(getApplicationContext());
if (!isAppInstalled(LaunchActivity.this, "com.google.android.googlequicksearchbox")) {
@ -135,6 +138,8 @@ public class LaunchActivity extends AppCompatActivity {
super.onResume();
}
/* Reported OOM on 2K+ resolution devices */
/*
@Override
protected void onPause() {
//to enable the to collect the animation frames
@ -143,7 +148,7 @@ public class LaunchActivity extends AppCompatActivity {
imageViewLogo.setImageResource(R.drawable.logo39);
logo = null;
super.onPause();
}
}*/
@SuppressWarnings("deprecation")
private void setLocale(Context context, String lang) {

View File

@ -57,6 +57,6 @@
android:layout_alignParentTop="true"
android:layout_centerHorizontal="true"
android:adjustViewBounds="true"
android:src="@drawable/logo_animation" />
android:src="@drawable/logo39" />
</RelativeLayout>

View File

@ -0,0 +1,84 @@
<resources>
<string name="app_name">Amadeus</string>
<string name="call">Connect to Kurisu?</string>
<string name="connecting">Connecting…</string>
<string name="disconnected">Disconnected.</string>
<string name="google_app_error">Google App wasn\'t detected.</string>
<integer name="duration">40</integer>
<string name="line_hello">Hello.</string>
<string name="line_dont_call_me_like_that">Don\'t call me like that!</string>
<string name="line_but_i_refuse">But I refuse.</string>
<string name="line_devilish_pervert">I never thought you were such a devilish pervert. I guess I misjudged you.</string>
<string name="line_i_guess">I guess.</string>
<string name="line_nice">Nice.</string>
<string name="line_pervert_confirmed">PERVERT CONFIRMED.</string>
<string name="line_sorry">Sorry.</string>
<string name="line_sounds_tough">Sounds tough.</string>
<string name="line_this_guy_hopeless">This guy is hopeless, better do something quick.</string>
<string name="line_gah">Gah.</string>
<string name="line_dont_add_tina">Stop adding -tina!</string>
<string name="line_pervert_idiot_wanttodie">You pervert! Are you an idiot!? Do you wanna die?!</string>
<string name="line_pleased_to_meet_you">I\'m Makise Kurisu, pleased to meet you.</string>
<string name="line_who_the_hell_christina">Who the hell is Christina?</string>
<string name="line_why_christina">I am worried about it. Why am I Christina?</string>
<string name="line_christina">Christina?</string>
<string name="line_ask_me_whatever">Ask me whatever you want. I\'ll answer anything I can.</string>
<string name="line_could_i_help">Um, could I help you with that?</string>
<string name="line_what_do_you_want">What do you want?</string>
<string name="line_what_is_it">What is it?</string>
<string name="line_heheh">Hehehe.</string>
<string name="line_huh_why_say">Huh? Why do you say that?</string>
<string name="line_you_sure">You sure?</string>
<string name="line_nice_to_meet_okabe">Nice to meet you, Okabe Rintaro. I\'m Makise Kurisu.</string>
<string name="line_look_forward_to_working">I look forward to working with you.</string>
<string name="line_senpai_question">Anyway, can I ask a question?</string>
<string name="line_senpai_question_mark">Um… Senpai? Excuse me.</string>
<string name="line_senpai_what_we_talkin">Hey Senpai, about what we were just talking about…</string>
<string name="line_senpai_who_is_this">Uh, who is this?</string>
<string name="line_senpai_please_dont_tell">Senpai, please, don\'t tell the others…</string>
<string name="line_still_not_happy">I\'m still not happy about that.</string>
<string name="line_tm_nonsense">That\s pure nonsense.</string>
<string name="line_tm_not_possible">Let\'s see… My conclusion is that it\'s not possible.</string>
<string name="line_tm_scientist_no_evidence">That\'s probably because scientists haven\'t discovered something important yet.</string>
<string name="line_tm_we_dont_know">But we don\'t know for sure that it\'s impossible, I guess.</string>
<string name="line_tm_you_said">A time machine, you said?</string>
<string name="line_humans_software">Even humans speak of themselves as a combination of hardware and software, right?</string>
<string name="line_memory_complex">But memory data isn\'t like normal data. It\'s much more complex.</string>
<string name="line_secret_diary">I keep a secret diary.</string>
<string name="line_modifying_memories_impossible">Modifying my memories? It\'s theoretically possible.</string>
<string name="line_memories_christina">For example, it would be possible to make me think my name was Christina.</string>
<string name="line_gah_extended">Gah. Ah… Aaaaah.</string>
<string name="line_Leskinen_awesome">Awesome, he\'s really something!</string>
<string name="line_Leskinen_nice">Nice!</string>
<string name="line_Leskinen_oh_no">Oh no!</string>
<string name="line_Leskinen_shaman">Where are the Japanese shaman girls, Lintahlo?</string>
<string name="line_Leskinen_holy_cow">Holy Cow! So I said we should come soon.</string>
<string name="line_should_christina">Or should I have introduced myself with, \"It\'s Christina\"?</string>
<!-- Inputstrings -->
<string name="christina">クリスティーナ</string>
<string name="nullpo">ぬるぽ</string>
<string name="the_zombie">the zombie</string>
<string name="celeb17">セレブセブンティーン</string>
<string name="atchannel">アットチャンネル</string>
<string name="kurigohan">栗ご飯</string>
<string name="kamehameha">カメハメハ</string>
<string name="salieri">サリエリ</string>
<string name="maho">真帆</string>
<string name="hiyajo">比屋定</string>
<string name="time_machine">タイムマシーン</string>
<string name="cern">cern</string>
<string name="time_travel">タイムトラベル</string>
<string name="memory">メモリー</string>
<string name="amadeus">アマデウス</string>
<string name="science">サイエンス</string>
<string name="hello">ハロー</string>
<string name="good_morning">おはよう</string>
<string name="konnichiwa">こんにちは</string>
<string name="good_evening">こんばんは</string>
<string name="nice_body">ナイスボディ</string>
<string name="hot">ほっと</string>
<string name="sexy">セクシー</string>
<string name="boobies">ボビーズ</string>
<string name="oppai">おっぱい</string>
</resources>