mirror of
https://github.com/gitnex-org/gitnex.git
synced 2026-03-22 21:13:45 -05:00
Add attachment icon, bump version to 6.0.0 dev
This commit is contained in:
1
.gitignore
vendored
1
.gitignore
vendored
@@ -10,6 +10,7 @@
|
||||
|
||||
# Release dir
|
||||
app/release/*
|
||||
app/free/*
|
||||
|
||||
# Pro dir
|
||||
app/pro/*
|
||||
|
||||
@@ -8,8 +8,8 @@ android {
|
||||
applicationId "org.mian.gitnex"
|
||||
minSdkVersion 23
|
||||
targetSdkVersion 34
|
||||
versionCode 550
|
||||
versionName "5.5.0"
|
||||
versionCode 595
|
||||
versionName "6.0.0-dev"
|
||||
multiDexEnabled true
|
||||
testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner"
|
||||
compileSdk 34
|
||||
|
||||
@@ -168,11 +168,11 @@ public class MainActivity extends BaseActivity
|
||||
|
||||
Menu menu = navigationView.getMenu();
|
||||
navNotifications = menu.findItem(R.id.nav_notifications);
|
||||
MenuItem navDashboard = menu.findItem(R.id.nav_dashboard);
|
||||
/*MenuItem navDashboard = menu.findItem(R.id.nav_dashboard);
|
||||
|
||||
navDashboard.getActionView().findViewById(R.id.betaBadge).setVisibility(View.VISIBLE);
|
||||
TextView dashboardBetaView = navDashboard.getActionView().findViewById(R.id.betaBadge);
|
||||
dashboardBetaView.setText(R.string.beta);
|
||||
dashboardBetaView.setText(R.string.beta);*/
|
||||
|
||||
navigationView
|
||||
.getViewTreeObserver()
|
||||
|
||||
@@ -391,6 +391,29 @@
|
||||
android:background="?attr/primaryBackgroundColor"
|
||||
android:padding="@dimen/dimen8dp">
|
||||
|
||||
<com.google.android.material.card.MaterialCardView
|
||||
style="?attr/materialCardViewFilledStyle"
|
||||
android:id="@+id/attachmentsCard"
|
||||
android:layout_width="@dimen/dimen38dp"
|
||||
android:layout_height="@dimen/dimen38dp"
|
||||
android:layout_gravity="center_vertical"
|
||||
android:backgroundTint="?attr/fabColor"
|
||||
android:layout_marginEnd="@dimen/dimen8dp"
|
||||
app:cardCornerRadius="@dimen/dimen36dp">
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/attachments"
|
||||
android:layout_width="@dimen/dimen24dp"
|
||||
android:layout_height="@dimen/dimen24dp"
|
||||
android:layout_gravity="center_vertical|center_horizontal"
|
||||
android:contentDescription="@string/generalImgContentText"
|
||||
app:tint="?attr/materialCardBackgroundColor"
|
||||
android:clickable="true"
|
||||
android:src="@drawable/ic_attachment"
|
||||
android:focusable="true" />
|
||||
|
||||
</com.google.android.material.card.MaterialCardView>
|
||||
|
||||
<EditText
|
||||
android:id="@+id/comment_reply"
|
||||
android:layout_width="0dp"
|
||||
@@ -420,8 +443,8 @@
|
||||
|
||||
<ImageView
|
||||
android:id="@+id/send"
|
||||
android:layout_width="@dimen/dimen26dp"
|
||||
android:layout_height="@dimen/dimen26dp"
|
||||
android:layout_width="@dimen/dimen24dp"
|
||||
android:layout_height="@dimen/dimen24dp"
|
||||
android:layout_gravity="center_vertical|center_horizontal"
|
||||
android:contentDescription="@string/generalImgContentText"
|
||||
app:tint="?attr/materialCardBackgroundColor"
|
||||
|
||||
@@ -10,7 +10,6 @@
|
||||
<item android:id="@+id/nav_dashboard"
|
||||
android:icon="@drawable/ic_dashboard"
|
||||
android:title="@string/dashboard"
|
||||
app:actionLayout="@layout/badge_beta"
|
||||
android:visible="false"/>
|
||||
|
||||
<item android:id="@+id/nav_home"
|
||||
|
||||
@@ -1,15 +1,8 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<changelog>
|
||||
|
||||
<release version="5.5.0" versioncode="550">
|
||||
<change>New: Update user avatar</change>
|
||||
<change>New: New popup screen to add email</change>
|
||||
<change>New: Insert note to issue/pr/release description</change>
|
||||
<change>New: New reply/comment UI</change>
|
||||
<change>Improvement: Hide app contents when biometric is enabled</change>
|
||||
<change>Bugfix: Fix back button closing the app</change>
|
||||
<change>Bugfix: Fix profile fields data</change>
|
||||
<change>Bugfix: Fix text color highlighting</change>
|
||||
<release version="6.0.0-dev" versioncode="595">
|
||||
<change>Under development</change>
|
||||
</release>
|
||||
|
||||
</changelog>
|
||||
|
||||
Reference in New Issue
Block a user