hush
/
SilentDragonAndroid-old
8
0
Fork 4
Code Issues 3 Pull Requests Projects Releases 6 Wiki Activity
Browse Source

Removed T-Addr from Receive screen and updated About screen

pull/4/head
jahway603 4 years ago
parent
cb3b17f760
commit
92153e7967
3 changed files with 17 additions and 44 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 37
      app/src/main/res/layout/activity_about.xml
  2. 4
      app/src/main/res/layout/content_receive.xml
  3. 20
      app/src/main/res/values/strings.xml

37
app/src/main/res/layout/activity_about.xml
View File

@ -53,29 +53,6 @@
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/WebsiteText" />
<TextView
android:id="@+id/Discord"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:text="@string/discord"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/divider0" />
<TextView
android:id="@+id/DiscordText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="2dp"
android:text="@string/discord_link"
android:textColorLink="@android:color/white"
android:autoLink="web"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/Discord" />
<View
android:id="@+id/divider1"
android:layout_width="0dp"
@ -86,7 +63,7 @@
android:background="?android:attr/listDivider"
android:visibility="visible"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/DiscordText" />
app:layout_constraintTop_toBottomOf="@+id/WebsiteText" />
<TextView
android:id="@+id/Telegram"
@ -194,27 +171,27 @@
app:layout_constraintTop_toBottomOf="@+id/MastodonText" />
<TextView
android:id="@+id/Github"
android:id="@+id/git"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="16dp"
android:text="@string/github"
android:text="@string/git"
android:textStyle="bold"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@id/divider4" />
<TextView
android:id="@+id/GithubText"
android:id="@+id/gitText"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_marginStart="16dp"
android:layout_marginTop="2dp"
android:text="@string/github_link"
android:text="@string/git_link"
android:textColorLink="@android:color/white"
android:autoLink="web"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/Github" />
app:layout_constraintTop_toBottomOf="@+id/git" />
<View
android:id="@+id/divider5"
@ -226,7 +203,7 @@
android:background="?android:attr/listDivider"
android:visibility="visible"
app:layout_constraintStart_toStartOf="parent"
app:layout_constraintTop_toBottomOf="@+id/GithubText" />
app:layout_constraintTop_toBottomOf="@+id/gitText" />
<TextView
android:id="@+id/BugReports"

4
app/src/main/res/layout/content_receive.xml
View File

@ -45,10 +45,6 @@
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="zAddr"/>
<com.google.android.material.tabs.TabItem
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="tAddr"/>
</com.google.android.material.tabs.TabLayout>
</androidx.constraintlayout.widget.ConstraintLayout>

20
app/src/main/res/values/strings.xml
View File

@ -93,21 +93,21 @@
<!-- activity_about.xml -->
<string name="website">Visit our website</string>
<string name="website_link" translatable="false">https://www.myhush.org</string>
<string name="discord">Join our Discord</string>
<string name="discord_link" translatable="false">https://www.myhush.org/discord/</string>
<string name="website_link" translatable="false">https://hush.is</string>
<string name="telegram">Visit our Telegram</string>
<string name="telegram_link" translatable="false">https://www.myhush.org/telegram/</string>
<string name="telegram_link" translatable="false">https://hush.is/telegram/</string>
<string name="telegram_ts">Visit our Telegram Tech Support</string>
<string name="telegram_ts_link" translatable="false">https://t.me/hush8support/</string>
<string name="twitter">Twitter</string>
<string name="twitter_link" translatable="false">https://www.myhush.org/twitter/</string>
<string name="twitter_link" translatable="false">https://hush.is/twitter/</string>
<string name="mastodon">Mastodon</string>
<string name="mastodon_link" translatable="false">https://www.myhush.org/mastodon/</string>
<string name="github">GitHub</string>
<string name="github_link" translatable="false">https://github.com/MyHush/SilentDragonAndroid</string>
<string name="mastodon_link" translatable="false">https://hush.is/mastodon/</string>
<string name="git">Source</string>
<string name="git_link" translatable="false">https://git.hush.is/hush/SilentDragonAndroid</string>
<string name="bugreports">Bug Reports</string>
<string name="bugreports_link" translatable="false">https://github.com/MyHush/SilentDragonAndroid/issues/new</string>
<string name="bugreports_link" translatable="false">https://git.hush.is/hush/SilentDragonAndroid/issues/new</string>
<string name="credits">Credits</string>
<string name="credits_link" translatable="false">http://www.myhush.org/credits_SDA/</string>
<string name="credits_link" translatable="false">https://git.hush.is/hush/SilentDragonAndroid/src/branch/master/CREDITS</string>
<string name="license">License</string>
<string name="sda_version">SilentDragonAndroid version</string>
<string name="copyright">Copyright</string>

Write Preview
Loading…
Cancel
Save