1.Layout adjust

This commit is contained in:
ZaneYork 2020-08-05 16:45:42 +08:00
parent 4e32e188f0
commit cce3afdf1c
12 changed files with 57 additions and 44 deletions

View File

@ -1,5 +1,6 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<manifest xmlns:android="http://schemas.android.com/apk/res/android" <manifest xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:tools="http://schemas.android.com/tools"
android:installLocation="auto" android:installLocation="auto"
package="com.zane.smapiinstaller"> package="com.zane.smapiinstaller">
@ -19,7 +20,8 @@
android:supportsRtl="true" android:supportsRtl="true"
android:configChanges="orientation|keyboard|screenSize" android:configChanges="orientation|keyboard|screenSize"
android:networkSecurityConfig="@xml/network_security_config" android:networkSecurityConfig="@xml/network_security_config"
android:theme="@style/AppTheme"> android:theme="@style/AppTheme"
tools:ignore="UnusedAttribute">
<activity <activity
android:name=".MainActivity" android:name=".MainActivity"
android:label="@string/app_name" android:label="@string/app_name"

View File

@ -28,11 +28,11 @@ These Services do not address anyone under the age of 16. I do not knowingly col
<br> <br>
The only official channel for distribution of this app are: The only official channel for distribution of this app are:
<br> <br>
* <a href="https://play.google.com/store/apps/details?id=com.zane.smapiinstaller">Google Play Store</a>
<br>
* <a href="https://www.coolapk.com/apk/256582">Coolapk</a> * <a href="https://www.coolapk.com/apk/256582">Coolapk</a>
<br> <br>
* <a href="https://github.com/ZaneYork/SMAPI-Android-Installer/releases">Github</a> * <a href="https://github.com/ZaneYork/SMAPI-Android-Installer/releases">GitHub</a>
<br>
* <s>Google Play Store</s>
<br> <br>
Any other mode of distribution is not official and thus, is not maintained by the developer. Any other mode of distribution is not official and thus, is not maintained by the developer.
<br> <br>

View File

@ -28,11 +28,11 @@ Layanan ini tidak membahas siapa pun yang berusia di bawah 16 tahun. Saya tidak
<br> <br>
Satu-satunya saluran resmi untuk distribusi aplikasi ini adalah: Satu-satunya saluran resmi untuk distribusi aplikasi ini adalah:
<br> <br>
* <a href="https://play.google.com/store/apps/details?id=com.zane.smapiinstaller">Google Play Store</a>
<br>
* <a href="https://www.coolapk.com/apk/256582">Coolapk</a> * <a href="https://www.coolapk.com/apk/256582">Coolapk</a>
<br> <br>
* <a href="https://github.com/ZaneYork/SMAPI-Android-Installer/releases">Github</a> * <a href="https://github.com/ZaneYork/SMAPI-Android-Installer/releases">GitHub</a>
<br>
* <s>Google Play Store</s>
<br> <br>
Mode distribusi lainnya tidak resmi dan tidak dikelola oleh pengembang. Mode distribusi lainnya tidak resmi dan tidak dikelola oleh pengembang.
<br> <br>

View File

@ -28,11 +28,11 @@ Zane York เป็นผู้พัฒนา SMAPI Installer app. แอพล
<br> <br>
ช่องทางการเผยแพร่แอพลิเคชั่นนี้อย่างเป็นทางการ ได้แก่: ช่องทางการเผยแพร่แอพลิเคชั่นนี้อย่างเป็นทางการ ได้แก่:
<br> <br>
* <a href="https://play.google.com/store/apps/details?id=com.zane.smapiinstaller">Google Play Store</a>
<br>
* <a href="https://www.coolapk.com/apk/256582">Coolapk</a> * <a href="https://www.coolapk.com/apk/256582">Coolapk</a>
<br> <br>
* <a href="https://github.com/ZaneYork/SMAPI-Android-Installer/releases">Github</a> * <a href="https://github.com/ZaneYork/SMAPI-Android-Installer/releases">GitHub</a>
<br>
* <s>Google Play Store</s>
<br> <br>
แอพลิเคชั่นที่ถูกเผยแพร่ในแหล่งอื่นนอกจากช่องทางเหล่านี้ จะไม่ได้รับการดูแลจากผู้พัฒนา แอพลิเคชั่นที่ถูกเผยแพร่ในแหล่งอื่นนอกจากช่องทางเหล่านี้ จะไม่ได้รับการดูแลจากผู้พัฒนา
<br> <br>

View File

@ -28,11 +28,11 @@
<br> <br>
分发此应用程序的唯一官方渠道是: 分发此应用程序的唯一官方渠道是:
<br> <br>
* <a href="https://play.google.com/store/apps/details?id=com.zane.smapiinstaller">Google Play商店</a>
<br>
* <a href="https://www.coolapk.com/apk/256582">酷安</a> * <a href="https://www.coolapk.com/apk/256582">酷安</a>
<br> <br>
* <a href="https://github.com/ZaneYork/SMAPI-Android-Installer/releases">Github</a> * <a href="https://github.com/ZaneYork/SMAPI-Android-Installer/releases">GitHub</a>
<br>
* <s>Google Play Store</s>
<br> <br>
任何其他分发方式都可能不是开发者官方维护的。 任何其他分发方式都可能不是开发者官方维护的。
<br> <br>

View File

@ -169,7 +169,7 @@ public class MainActivity extends AppCompatActivity {
DialogUtils.showConfirmDialog(toolbar, R.string.settings_check_for_updates, DialogUtils.showConfirmDialog(toolbar, R.string.settings_check_for_updates,
MainActivity.this.getString(R.string.app_update_detected, dto.getVersionName()), (dialog, which) -> { MainActivity.this.getString(R.string.app_update_detected, dto.getVersionName()), (dialog, which) -> {
if (which == DialogAction.POSITIVE) { if (which == DialogAction.POSITIVE) {
CommonLogic.openInPlayStore(MainActivity.this); CommonLogic.openUrl(MainActivity.this, Constants.RELEASE_URL);
} else { } else {
ConfigUtils.saveConfig(application, appConfig); ConfigUtils.saveConfig(application, appConfig);
} }

View File

@ -30,6 +30,10 @@ public class Constants {
* DLC下载路径 * DLC下载路径
*/ */
public static final String DLC_LIST_UPDATE_URL = "http://dl.zaneyork.cn/smapi/downloadable_content_list.json"; public static final String DLC_LIST_UPDATE_URL = "http://dl.zaneyork.cn/smapi/downloadable_content_list.json";
/**
* 软件发布页
*/
public static final String RELEASE_URL = "https://github.com/ZaneYork/SMAPI-Android-Installer/releases";
/** /**
* 帮助内容下载路径 * 帮助内容下载路径
*/ */

View File

@ -40,10 +40,10 @@ public class AboutFragment extends Fragment {
@OnClick(R.id.button_release) @OnClick(R.id.button_release)
void release() { void release() {
CommonLogic.doOnNonNull(this.getContext(), (context) -> CommonLogic.openUrl(context, "https://github.com/ZaneYork/SMAPI-Android-Installer/releases")); CommonLogic.doOnNonNull(this.getContext(), (context) -> CommonLogic.openUrl(context, Constants.RELEASE_URL));
} }
@OnClick(R.id.button_gplay) // @OnClick(R.id.button_gplay)
void gplay() { void gplay() {
CommonLogic.openInPlayStore(this.getActivity()); CommonLogic.openInPlayStore(this.getActivity());
} }

View File

@ -70,33 +70,33 @@
app:srcCompat="@drawable/global" /> app:srcCompat="@drawable/global" />
</androidx.constraintlayout.widget.ConstraintLayout> </androidx.constraintlayout.widget.ConstraintLayout>
<androidx.constraintlayout.widget.ConstraintLayout <!-- <androidx.constraintlayout.widget.ConstraintLayout-->
android:layout_width="match_parent" <!-- android:layout_width="match_parent"-->
android:layout_height="wrap_content"> <!-- android:layout_height="wrap_content">-->
<Button <!-- <Button-->
android:id="@+id/button_gplay" <!-- android:id="@+id/button_gplay"-->
style="@style/Widget.AppCompat.Button.Borderless" <!-- style="@style/Widget.AppCompat.Button.Borderless"-->
android:layout_width="wrap_content" <!-- android:layout_width="wrap_content"-->
android:layout_height="wrap_content" <!-- android:layout_height="wrap_content"-->
android:gravity="center" <!-- android:gravity="center"-->
android:text="@string/button_gplay" <!-- android:text="@string/button_gplay"-->
android:textSize="24sp" <!-- android:textSize="24sp"-->
app:layout_constraintBottom_toBottomOf="parent" <!-- app:layout_constraintBottom_toBottomOf="parent"-->
app:layout_constraintEnd_toEndOf="parent" <!-- app:layout_constraintEnd_toEndOf="parent"-->
app:layout_constraintStart_toEndOf="@id/img_gplay" <!-- app:layout_constraintStart_toEndOf="@id/img_gplay"-->
app:layout_constraintTop_toTopOf="parent" /> <!-- app:layout_constraintTop_toTopOf="parent" />-->
<ImageView <!-- <ImageView-->
android:id="@+id/img_gplay" <!-- android:id="@+id/img_gplay"-->
android:layout_width="40dp" <!-- android:layout_width="40dp"-->
android:layout_height="40dp" <!-- android:layout_height="40dp"-->
android:contentDescription="@string/icon_desc" <!-- android:contentDescription="@string/icon_desc"-->
app:layout_constraintBottom_toBottomOf="parent" <!-- app:layout_constraintBottom_toBottomOf="parent"-->
app:layout_constraintStart_toStartOf="parent" <!-- app:layout_constraintStart_toStartOf="parent"-->
app:layout_constraintTop_toTopOf="parent" <!-- app:layout_constraintTop_toTopOf="parent"-->
app:srcCompat="@drawable/global" /> <!-- app:srcCompat="@drawable/global" />-->
</androidx.constraintlayout.widget.ConstraintLayout> <!-- </androidx.constraintlayout.widget.ConstraintLayout>-->
<androidx.constraintlayout.widget.ConstraintLayout <androidx.constraintlayout.widget.ConstraintLayout
android:layout_width="match_parent" android:layout_width="match_parent"

View File

@ -1,13 +1,15 @@
<?xml version="1.0" encoding="utf-8"?> <?xml version="1.0" encoding="utf-8"?>
<LinearLayout <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:android="http://schemas.android.com/apk/res/android"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="match_parent" android:layout_height="match_parent"
xmlns:app="http://schemas.android.com/apk/res-auto"
android:orientation="vertical"> android:orientation="vertical">
<com.google.android.material.tabs.TabLayout <com.google.android.material.tabs.TabLayout
android:id="@+id/main_tab_layout" android:id="@+id/main_tab_layout"
app:tabGravity="fill"
app:tabTextAppearance="@style/TabLayoutTextStyle"
android:layout_width="match_parent" android:layout_width="match_parent"
android:layout_height="wrap_content"> android:layout_height="32dp">
</com.google.android.material.tabs.TabLayout> </com.google.android.material.tabs.TabLayout>
<androidx.viewpager2.widget.ViewPager2 <androidx.viewpager2.widget.ViewPager2
android:id="@+id/main_pager" android:id="@+id/main_pager"

View File

@ -5,4 +5,5 @@
<dimen name="nav_header_vertical_spacing">8dp</dimen> <dimen name="nav_header_vertical_spacing">8dp</dimen>
<dimen name="nav_header_height">176dp</dimen> <dimen name="nav_header_height">176dp</dimen>
<dimen name="fab_margin">16dp</dimen> <dimen name="fab_margin">16dp</dimen>
<dimen name="tab_text_size">18dp</dimen>
</resources> </resources>

View File

@ -21,4 +21,8 @@
<item name="android:colorBackground">@color/colorPopupBackground</item> <item name="android:colorBackground">@color/colorPopupBackground</item>
</style> </style>
<style name="TabLayoutTextStyle">
<item name="android:textSize">@dimen/tab_text_size</item>
</style>
</resources> </resources>