-
Notifications
You must be signed in to change notification settings - Fork 892
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix an audio and search bug. added sheikh qatami. added some logging.…
… bumped the version number.
- Loading branch information
Showing
23 changed files
with
647 additions
and
161 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
77 changes: 18 additions & 59 deletions
77
app/src/main/java/com/quran/labs/androidquran/HelpActivity.java
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,73 +1,32 @@ | ||
| package com.quran.labs.androidquran; | ||
|
|
||
| import android.content.Intent; | ||
| import android.content.pm.PackageInfo; | ||
| import android.os.Bundle; | ||
| import android.text.Html; | ||
| import android.view.View; | ||
| import android.view.View.OnClickListener; | ||
| import android.widget.Button; | ||
| import android.widget.TextView; | ||
|
|
||
| import com.actionbarsherlock.app.SherlockActivity; | ||
| import com.actionbarsherlock.view.MenuItem; | ||
|
|
||
| public class HelpActivity extends SherlockActivity implements OnClickListener { | ||
| protected Button mEmailButton; | ||
| protected TextView mHelpText; | ||
| public class HelpActivity extends SherlockActivity { | ||
| public void onCreate(Bundle savedInstanceState) { | ||
| setTheme(R.style.Theme_Sherlock); | ||
| super.onCreate(savedInstanceState); | ||
|
|
||
| public void onCreate(Bundle savedInstanceState) { | ||
| setTheme(R.style.Theme_Sherlock); | ||
| super.onCreate(savedInstanceState); | ||
| getSupportActionBar().setDisplayShowHomeEnabled(true); | ||
| getSupportActionBar().setDisplayHomeAsUpEnabled(true); | ||
|
|
||
| getSupportActionBar().setDisplayShowHomeEnabled(true); | ||
| getSupportActionBar().setDisplayHomeAsUpEnabled(true); | ||
| setContentView(R.layout.help); | ||
|
|
||
| setContentView(R.layout.help); | ||
| mEmailButton = (Button)findViewById(R.id.btnEmailUs); | ||
| mEmailButton.setOnClickListener(this); | ||
| TextView helpText = (TextView) findViewById(R.id.txtHelp); | ||
| helpText.setText(Html.fromHtml(getString(R.string.help))); | ||
| } | ||
|
|
||
| mHelpText = (TextView)findViewById(R.id.txtHelp); | ||
| mHelpText.setText(Html.fromHtml(getString(R.string.help))); | ||
| } | ||
|
|
||
| @Override | ||
| public void onClick(View v) { | ||
| switch (v.getId()) { | ||
| case R.id.btnEmailUs: | ||
| Intent emailIntent = new Intent(android.content.Intent.ACTION_SEND); | ||
| emailIntent.setType("plain/text"); | ||
| String body = "\n\n"; | ||
| try { | ||
| PackageInfo pInfo = getPackageManager().getPackageInfo(getPackageName(), 0); | ||
| body = pInfo.packageName + " Version: " + pInfo.versionName; | ||
| } catch (Exception e) {} | ||
|
|
||
| try { | ||
| body += "\nPhone: " + android.os.Build.MANUFACTURER + " " + android.os.Build.MODEL; | ||
| body += "\nAndroid Version: " + android.os.Build.VERSION.CODENAME + " " | ||
| + android.os.Build.VERSION.RELEASE; | ||
| } catch (Exception e) {} | ||
|
|
||
| emailIntent.putExtra(android.content.Intent.EXTRA_TEXT, body); | ||
| emailIntent.putExtra(android.content.Intent.EXTRA_SUBJECT, | ||
| getString(R.string.email_subject)); | ||
| emailIntent.putExtra(android.content.Intent.EXTRA_EMAIL, | ||
| new String[] { getString(R.string.email_to) }); | ||
| startActivity(Intent.createChooser(emailIntent, | ||
| getString(R.string.send_email))); | ||
| break; | ||
| default: | ||
| break; | ||
| } | ||
| } | ||
|
|
||
| @Override | ||
| public boolean onOptionsItemSelected(MenuItem item) { | ||
| if (item.getItemId() == android.R.id.home){ | ||
| finish(); | ||
| return true; | ||
| } | ||
| return false; | ||
| } | ||
| @Override | ||
| public boolean onOptionsItemSelected(MenuItem item) { | ||
| if (item.getItemId() == android.R.id.home) { | ||
| finish(); | ||
| return true; | ||
| } | ||
| return false; | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,36 +1,36 @@ | ||
| <?xml version="1.0" encoding="utf-8"?> | ||
| <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="match_parent"> | ||
| <ScrollView xmlns:android="http://schemas.android.com/apk/res/android" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content"> | ||
|
|
||
| <TextView android:id="@+id/txtHelpTitle" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:textAppearance="?android:attr/textAppearanceMedium" | ||
| android:textColor="#FFFFFF" | ||
| android:singleLine="true" | ||
| android:text="@string/help_title" | ||
| android:textStyle="bold" | ||
| android:padding="10dip" | ||
| android:layout_alignParentTop="true" /> | ||
| <LinearLayout android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:orientation="vertical" | ||
| android:padding="10dip"> | ||
|
|
||
| <ScrollView android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:layout_below="@id/txtHelpTitle" | ||
| android:layout_above="@+id/btnEmailUs"> | ||
| <TextView android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:textAppearance="?android:attr/textAppearanceSmall" | ||
| android:textColor="#FFFFFF" | ||
| <TextView android:id="@+id/txtHelpTitle" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:textAppearance="?android:attr/textAppearanceMedium" | ||
| android:textColor="#FFFFFF" | ||
| android:singleLine="true" | ||
| android:text="@string/help_title" | ||
| android:textStyle="bold" | ||
| android:paddingBottom="8dp" /> | ||
|
|
||
| <TextView android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:textAppearance="?android:attr/textAppearanceSmall" | ||
| android:textColor="#FFFFFF" | ||
| android:id="@+id/txtHelp" | ||
| android:textSize="16dip" | ||
| android:padding="10dip" | ||
| android:textSize="16sp" | ||
| android:paddingBottom="8dp" | ||
| android:lineSpacingExtra="4dip" /> | ||
| </ScrollView> | ||
|
|
||
| <Button android:id="@id/btnEmailUs" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:text="@string/email_quran_android" | ||
| android:layout_alignParentBottom="true" /> | ||
| </RelativeLayout> | ||
| <TextView android:id="@+id/email_us" | ||
| android:layout_width="match_parent" | ||
| android:layout_height="wrap_content" | ||
| android:autoLink="email" | ||
| android:text="@string/email_us" /> | ||
| </LinearLayout> | ||
| </ScrollView> |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -32,8 +32,6 @@ | |
| <string name="cancel">الغاء</string> | ||
| <string name="developedBy">لا تنسونا من صالح دعاءكم</string> | ||
| <string name="copyRights">حقوق الطبع محفوظة لجميع المسلمين</string> | ||
| <string name="email_subject">ردود الفعل</string> | ||
| <string name="send_email">ارسل رسالة..</string> | ||
|
|
||
| <string name="help_title">الاسئلة المتداولة</string> | ||
| <string name="help"> | ||
|
|
@@ -181,10 +179,10 @@ | |
| <string name="search_data">بيانات البحث</string> | ||
| <string name="need_translation">لم يتم تحميل أي تفسير أو ترجمة</string> | ||
| <string name="get_translations">حمّل التفسير أو الترجمة</string> | ||
| <!-- about us --> | ||
| <string name="email_quran_android">راسلنا</string> | ||
|
|
||
| <!-- help --> | ||
| <string name="email_us">اذا لم تجد اجابه سؤالكم بالاعلى فيمكنكم مراسلتنا على هذا البريد [email protected] للدعم. ونحيط بكم علما انه تصلنا كثير من الاسئله ، ولهذا قد لا نرد على جميع الرسائل.</string> | ||
|
|
||
| <!-- sura metainfo --> | ||
| <string name="makki">مكية</string> | ||
| <string name="madani">مدنية</string> | ||
|
|
||
Oops, something went wrong.